1. 续报修改成取消办结

2. 待办任务按照完成时间排序

tc-public/task-api/src/main/java/com/minto/app/task/enums/TaskEnum.java

@@ -2978,7 +2978,7 @@ public final class TaskEnum {
         /* 这个续报是暂停的事项继续 */
         ReOpen(1017,"续报",TaskActionType.BusinessManagement),
         /* 这个是已完成的事项继续汇报 */
-        GoOnTask(1018,"续报",TaskActionType.BusinessManagement),
+        GoOnTask(1018,"取消办结",TaskActionType.BusinessManagement),
         GenerateReport(1019,"生成报告",TaskActionType.BusinessManagement),
         Sign(1020,"签收",TaskActionType.BusinessProcess),
         SignReject(1021,"拒签",TaskActionType.BusinessProcess),

tc-service/tap-task/src/main/resources/META-INF/module/task/i18n/task_zh_CN.properties

@@ -59,7 +59,7 @@ task.escalation.plan=\u4E0A\u62A5\u8BA1\u5212
 task.release.plan=\u53D1\u5E03\u8BA1\u5212
 task.sign.for=\u7B7E\u6536
 task.refusal=\u62D2\u7B7E
-task.renew=\u7EED\u62A5
+task.renew=\u53d6\u6d88\u529e\u7ed3
 task.apply=\u7533\u8BF7
 task.extension=\u7533\u8BF7\u5EF6\u671F
 task.apply.for.settlement=\u7533\u8BF7\u529E\u7ED3

tip-api/src/main/java/com/minto/app/task/enums/TaskEnum.java

@@ -2978,7 +2978,7 @@ public final class TaskEnum {
         /* 这个续报是暂停的事项继续 */
         ReOpen(1017,"续报",TaskActionType.BusinessManagement),
         /* 这个是已完成的事项继续汇报 */
-        GoOnTask(1018,"续报",TaskActionType.BusinessManagement),
+        GoOnTask(1018,"取消办结",TaskActionType.BusinessManagement),
         GenerateReport(1019,"生成报告",TaskActionType.BusinessManagement),
         Sign(1020,"签收",TaskActionType.BusinessProcess),
         SignReject(1021,"拒签",TaskActionType.BusinessProcess),

tip-bff/src/main/java/com/minto/tip/affair/service/impl/AffairServiceImpl.java

@@ -492,7 +492,9 @@ public class AffairServiceImpl implements AffairService {
 //                String nowMonth = DateUtil.getDate(DateUtil.now(),"YYYY-MM");
 //                criterion = Restrictions.and(criterion,Restrictions.sqlRestriction(" to_char(summary_time,'YYYY-MM') = '" + nowMonth + "' "));
 //            }
-            ListObject<TipAffair> listObject = affairManager.findByCriterion(criterion, info.getOffset(), info.getPageSize(), Order.desc("createDate"));
+            Order order = AffairEnum.SubTypeEnum.SuperviseBusiness.equals(subTypeEnum) ? Order.desc("endTime") : Order.desc("createDate");
+            ListObject<TipAffair> listObject = affairManager.findByCriterion(criterion, info.getOffset(), info.getPageSize(), order);
+
             List<TipAffair> list = listObject.getList();
             count = listObject.getCount();
             //集中处理不同类型待办分类数据

tip-front/src/main/java/com/minto/app/task/controller/TaskByTypeProcessController.java

@@ -4067,33 +4067,39 @@ public class TaskByTypeProcessController extends BaseController {
             //更新阶段信息
             //List<TaskPhase> phases = TaskByTypeUtil.pakTaskPhase(ReqUtil.getString(request,"freqs"),taskId,pid);
             // todo 去除历史阶段，只获取新增的阶段
+
+//          2024-7-3 14:53:30, 注释对阶段信息的校验 start
             // 前台传过来的阶段信息
-            String freqs = ReqUtil.getString(request,"freqs");
-            List<Map> jObjects = JsonUtil.parseArray(freqs,Map.class);
-            // 该list用于存储新增的阶段信息
-            List<Map> jObjectNew = new ArrayList<>();
-            for (Map job:jObjects) {
-                if(ParameterUtil.getLong(job, "id")==null){
-                    jObjectNew.add(job);
-                }
-            }
+//            String freqs = ReqUtil.getString(request,"freqs");
+//            List<Map> jObjects = JsonUtil.parseArray(freqs,Map.class);
+//            // 该list用于存储新增的阶段信息
+//            List<Map> jObjectNew = new ArrayList<>();
+//            for (Map job:jObjects) {
+//                if(ParameterUtil.getLong(job, "id")==null){
+//                    jObjectNew.add(job);
+//                }
+//            }
             // todo end
-            if(jObjectNew.size()!=0){
-                List<TaskPhase> phases = TaskWebUtil.pakTaskPhases(request,taskId,jObjectNew);
-                if (CollectionUtil.isEmpty(phases)) {
-                    result.put("state","fail");
-                    result.put("message","请至少增加一个阶段！");
-                    throw new Exception("请至少增加一个阶段！");
-                }else {
-                    taskEditManager.saveReopenTaskWithNewPhase(taskId,pid,phases);
-                    result.put("state","success");
-                    result.put("message","续报成功！");
-                }
-            }else{
-                result.put("state","fail");
-                result.put("message","请至少增加一个阶段！");
-                throw new Exception("请至少增加一个阶段！");
-            }
+//            if(jObjectNew.size()!=0){
+//                List<TaskPhase> phases = TaskWebUtil.pakTaskPhases(request,taskId,jObjectNew);
+//                if (CollectionUtil.isEmpty(phases)) {
+//                    result.put("state","fail");
+//                    result.put("message","请至少增加一个阶段！");
+//                    throw new Exception("请至少增加一个阶段！");
+//                }else {
+//                    taskEditManager.saveReopenTaskWithNewPhase(taskId,pid,phases);
+//                    result.put("state","success");
+//                    result.put("message","续报成功！");
+//                }
+//            }else{
+//                result.put("state","fail");
+//                result.put("message","请至少增加一个阶段！");
+//                throw new Exception("请至少增加一个阶段！");
+//            }
+//          2024-7-3 14:53:30, 注释对阶段信息的校验 end
+
+            result.put("state","success");
+            result.put("message","取消办结成功！");
 
             //更新事项状态
             ITaskInfoManager taskInfoManager = AppContext.getBean(ITaskInfoManager.class);

tip-front/src/main/webapp/tc_suite/minto/task/js/detail.component.js

@@ -1779,8 +1779,9 @@ Vue.component("detail-button-group",{
                 case "Withdraw":
                     return "撤回";
                 case "ReOpen":
-                case "GoOnTask":
                     return "续报";
+                case "GoOnTask":
+                    return "取消办结";
                 case "Pigeonhole":
                     return "归档";
                 case "PushToLeader":

tip-front/src/main/webapp/tc_suite/minto/task/js/listShow.js

@@ -249,7 +249,7 @@ var TaskSummaryListBusinessEnum = {
             }]
         },{
             id:"",
-            name:"续报",
+            name:"取消办结",
             click:function(){
                 TC.task.table.invoke('reopenTask',this);
             },
@@ -1180,17 +1180,17 @@ var TaskSummaryListBusinessEnum = {
                     });
                 });
             },
-            // 续报
+            // 取消办结
             reopenTask :function(){
                 var id = TC.task.table.getTableChecked();
                 if (id.length==0) {
-                    $.alert("请先选中要续报的事项！");
+                    $.alert("请先选中要取消办结的事项！");
                     return ;
                 } else if (id.length > 1) {
                     $.alert("一次只能操作一个事项！");
                     return ;
                 }
-                TC.ui.openTab("/taskByType/reopenTaskWithNewPhase?taskType="+TC.task.table.getTaskType()+"&id="+id[0],"续报");
+                TC.ui.openTab("/taskByType/reopenTaskWithNewPhase?taskType="+TC.task.table.getTaskType()+"&id="+id[0],"取消办结");
                 // $.dialog({
                 //     title : "续报",
                 //     max: false,

tip-front/src/main/webapp/tc_suite/minto/task/js/newListShow.js

@@ -387,7 +387,7 @@ var TaskSummaryListBusinessEnum = {
         },
         {
             id:"",
-            name:$.i18n("task.renew"),//续报
+            name:$.i18n("task.renew"),//取消办结
             click:function(){
                 TC.task.table.invoke('reopenTask',this);
             },
@@ -1812,19 +1812,19 @@ var TaskSummaryListBusinessEnum = {
                     });
                 });
             },
-            // 续报
+            // 取消办结
             reopenTask :function(){
                 var id = TC.task.table.getTableChecked();
                 if (id.length==0) {
-                    $.alert($.i18n("task.to.be.renewed.first"));//"请先选中要续报的事项！"
+                    $.alert($.i18n("task.to.be.renewed.first"));//"请先选中要取消办结的事项！"
                     return ;
                 } else if (id.length > 1) {
                     $.alert($.i18n("task.one.thing.can.be.done"));//"一次只能操作一个事项！"
                     return ;
                 }
-                TC.ui.openTab("/taskByType/reopenTaskWithNewPhase?taskType="+TC.task.table.getTaskType()+"&id="+id[0],"续报");
+                TC.ui.openTab("/taskByType/reopenTaskWithNewPhase?taskType="+TC.task.table.getTaskType()+"&id="+id[0],"取消办结");
                 // $.dialog({
-                //     title : "续报",
+                //     title : "取消办结",
                 //     max: false,
                 //     min: false,
                 //     content : "url:"+TC.config.baseUrl+"/taskByType/reopenTaskWithNewPhase?taskType="+TC.task.table.getTaskType()+"&id="+id[0],

tip-front/src/main/webapp/tc_suite/minto/task/listShowTable.jsp

@@ -2311,7 +2311,7 @@
     }
 
     /**
-     * 打开续报界面
+     * 打开取消办结界面
      * @param id
      */
     function openReopen(id) {

tip-front/src/main/webapp/tc_suite/taskmt/byType/byTypeIndex.jsp

@@ -819,7 +819,7 @@
                     </div>
                 </c:if>
                 <c:if test="${listType=='done' and fn:contains(roles,'100001003')}">
-                    <button class="mt-btn" id="reopen_task_np">续报</button>
+                    <button class="mt-btn" id="reopen_task_np">取消办结</button>
                 </c:if>
                 <!--wangq 2018-02-07 修改领导账号yys登录,任意模块导出，看不到导出下拉选项bug start  -->
                 <c:if test="${not empty listType and (listType eq 'leaderAllTask' or listType eq 'leaderDo' or listType eq 'byDep' or  listType eq'leaderDone')}">
@@ -2247,7 +2247,7 @@
                 return ;
             }
             $.dialog({
-                title : "续报",
+                title : "取消办结",
                 max: false,
                 min: false,
                 content : "url:${path}/taskByType/reopenTaskWithNewPhase?taskType=${param.taskType}&id="+id[0],

tip-front/src/main/webapp/tc_suite/taskmt/byType/js/list.js

@@ -339,7 +339,7 @@
                                     // 已完成
                                     case 3:
                                     case 11:
-                                        // 续报
+                                        // 取消办结
                                         roleAction.push("ReOpen");
                                         break;
                                 }
@@ -517,7 +517,7 @@
                                     // 已完成
                                     case 3:
                                     case 11:
-                                        // 续报
+                                        // 取消办结
                                         roleAction.push("ReOpen");
 
                                         break;
@@ -1252,7 +1252,7 @@
                                 // 已完成
                                 case 3:
                                 case 11:
-                                    // 续报
+                                    // 取消办结
                                     roleAction.push("ReOpen");
                                     break;
                             }
@@ -1543,7 +1543,7 @@
         return $send_li;
     };
     w.createReOpenOp = function (id) {
-        var opName = $.i18n("task.renew");//续报
+        var opName = $.i18n("task.renew");//取消办结
         var $edit_li = $('<li><a class="mt-btn-font"  href="javascript:openReopen(\'' + id + '\');">[' + opName + ']</a></li>');
         return $edit_li;
     };

tip-front/src/main/webapp/tc_suite/taskmt/byType/reopenTaskWithNewPhase.jsp

@@ -221,68 +221,68 @@
                         <input style="height: 25px;width:170px;" id="endDate" value="${endDate}" class="Wdate" onclick="WdatePicker({dateFmt:'yyyy-MM-dd'})">
                     </td>
                 </tr>
-                <tr class="selectTr">
-                    <td style="width:80px;text-align:right;"><span class="tdSpan">${tc:i18n("task.cycle")}:</span></td>
-                    <td style="padding-top:5px;text-align:left;" >
-                        <select id="reportFrequency" name="reportFrequency"  style="width:100px;border:1px solid #ccc;height:27px;display: none;" disabled>
-                            <option value="3" >自定义</option>
-                            <option value="2" >月</option>
-                            <option value="1" >季</option>
-                            <option value="4" >年</option>
-                        </select>
-                        <span id="userDefine" style="margin:-2px 0 0 0px;vertical-align:middle;">
-                            <%--<button type="button" class='btn btn-default ' id="addFrequency" onclick="com.minto.taskPhase.addUserFrequency()">增加阶段</button>--%>
-                            <div class="btn-group">
-                              <button type="button" class="btn btn-default" style="margin-right: 0;" id="addFrequency" onclick="com.minto.taskPhase.createDefaultFrequency('','0')">${tc:i18n("task.increase.phase")}</button>
-                              <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                <span class="caret"></span>
-                                <span class="sr-only">Toggle Dropdown</span>
-                              </button>
-                              <ul class="dropdown-menu">
-                                <li><a href="javascript:;" onclick="com.minto.taskPhase.changePhaseByType('2',false);">${tc:i18n("task.by.month")}</a></li>
-                                <li><a href="javascript:;" onclick="com.minto.taskPhase.changePhaseByType('1',false);">${tc:i18n("task.quarterly")}</a></li>
-                                <li><a href="javascript:;" onclick="com.minto.taskPhase.changePhaseByType('4',false);">${tc:i18n("task.by.year")}</a></li>
-                              </ul>
-                            </div>
-                        </span>
-                    </td>
-                </tr>
-                <tr id="frequencyDetail" style="display: none;">
-                    <td colspan="2" style="padding:10px;">
-                        <table id = "frequencies" class="data-table" style="width:100%;overflow:auto;">
-                            <thead>
-                            <tr>
-                                <td>${tc:i18n("task.phase")}</td>
-                                <td>${tc:i18n("task.phase.requirements")}</td>
-                                <td>${tc:i18n("task.starting.time")}</td>
-                                <td>${tc:i18n("task.phase.deadline")}</td>
-                                <td>${tc:i18n("task.reporting.time")}</td>
-                                <%--<td>提醒提前时间</td>--%>
-                                <td>${tc:i18n("common.table.operating.label")}</td>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            <c:forEach items="${phases}" var="ph">
-                                <tr phase-id="${ph.id}">
-                                    <td style="width:150px;"><input class="mt-input" style="width:100%;" value="${ph.label}" disabled></td>
-                                    <td><input style="width: 100%;" value="${ph.phaseDetail}" disabled></td>
-                                    <td class="hide">
-                                        <input class="manager mt-input" readonly style="width: 95%;" onclick="com.minto.taskPhase.choosePhaseManager(this)">
-                                        <input type="hidden" name="manager"/>
-                                    </td>
-                                    <td style="width:110px;"><input style="width:190px;" value="${ph.startDate}" class="Wdate mt-input" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" disabled></td>
-                                    <td style="width:110px;"><input style="width:190px;" value="${ph.endDate}" class="Wdate mt-input" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" disabled><input type="hidden" value="${ph.startDate}"></td>
-                                    <td style="width:110px;text-align: center;">
-                                        <span disabled class="mt-btn-font font_del" onclick="com.minto.taskPhase.toReportConfig(this)">[${tc:i18n("common.button.set.label")}]<input type="hidden" value=""></span>
-                                    </td>
-                                    <%--<td style="width:100px;"><input style="width:56px;" value="${ph.remindForward}" disabled>小时</td>--%>
-                                    <td style="width:100px;text-align: center;"><span disabled class="mt-btn-font font_del">[${tc:i18n("common.button.delete.label")}]</span></td>
-                                </tr>
-                            </c:forEach>
-                            </tbody>
-                        </table>
-                    </td>
-                </tr>
+<%--                <tr class="selectTr">--%>
+<%--                    <td style="width:80px;text-align:right;"><span class="tdSpan">${tc:i18n("task.cycle")}:</span></td>--%>
+<%--                    <td style="padding-top:5px;text-align:left;" >--%>
+<%--                        <select id="reportFrequency" name="reportFrequency"  style="width:100px;border:1px solid #ccc;height:27px;display: none;" disabled>--%>
+<%--                            <option value="3" >自定义</option>--%>
+<%--                            <option value="2" >月</option>--%>
+<%--                            <option value="1" >季</option>--%>
+<%--                            <option value="4" >年</option>--%>
+<%--                        </select>--%>
+<%--                        <span id="userDefine" style="margin:-2px 0 0 0px;vertical-align:middle;">--%>
+<%--                            &lt;%&ndash;<button type="button" class='btn btn-default ' id="addFrequency" onclick="com.minto.taskPhase.addUserFrequency()">增加阶段</button>&ndash;%&gt;--%>
+<%--                            <div class="btn-group">--%>
+<%--                              <button type="button" class="btn btn-default" style="margin-right: 0;" id="addFrequency" onclick="com.minto.taskPhase.createDefaultFrequency('','0')">${tc:i18n("task.increase.phase")}</button>--%>
+<%--                              <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">--%>
+<%--                                <span class="caret"></span>--%>
+<%--                                <span class="sr-only">Toggle Dropdown</span>--%>
+<%--                              </button>--%>
+<%--                              <ul class="dropdown-menu">--%>
+<%--                                <li><a href="javascript:;" onclick="com.minto.taskPhase.changePhaseByType('2',false);">${tc:i18n("task.by.month")}</a></li>--%>
+<%--                                <li><a href="javascript:;" onclick="com.minto.taskPhase.changePhaseByType('1',false);">${tc:i18n("task.quarterly")}</a></li>--%>
+<%--                                <li><a href="javascript:;" onclick="com.minto.taskPhase.changePhaseByType('4',false);">${tc:i18n("task.by.year")}</a></li>--%>
+<%--                              </ul>--%>
+<%--                            </div>--%>
+<%--                        </span>--%>
+<%--                    </td>--%>
+<%--                </tr>--%>
+<%--                <tr id="frequencyDetail" style="display: none;">--%>
+<%--                    <td colspan="2" style="padding:10px;">--%>
+<%--                        <table id = "frequencies" class="data-table" style="width:100%;overflow:auto;">--%>
+<%--                            <thead>--%>
+<%--                            <tr>--%>
+<%--                                <td>${tc:i18n("task.phase")}</td>--%>
+<%--                                <td>${tc:i18n("task.phase.requirements")}</td>--%>
+<%--                                <td>${tc:i18n("task.starting.time")}</td>--%>
+<%--                                <td>${tc:i18n("task.phase.deadline")}</td>--%>
+<%--                                <td>${tc:i18n("task.reporting.time")}</td>--%>
+<%--                                &lt;%&ndash;<td>提醒提前时间</td>&ndash;%&gt;--%>
+<%--                                <td>${tc:i18n("common.table.operating.label")}</td>--%>
+<%--                            </tr>--%>
+<%--                            </thead>--%>
+<%--                            <tbody>--%>
+<%--                            <c:forEach items="${phases}" var="ph">--%>
+<%--                                <tr phase-id="${ph.id}">--%>
+<%--                                    <td style="width:150px;"><input class="mt-input" style="width:100%;" value="${ph.label}" disabled></td>--%>
+<%--                                    <td><input style="width: 100%;" value="${ph.phaseDetail}" disabled></td>--%>
+<%--                                    <td class="hide">--%>
+<%--                                        <input class="manager mt-input" readonly style="width: 95%;" onclick="com.minto.taskPhase.choosePhaseManager(this)">--%>
+<%--                                        <input type="hidden" name="manager"/>--%>
+<%--                                    </td>--%>
+<%--                                    <td style="width:110px;"><input style="width:190px;" value="${ph.startDate}" class="Wdate mt-input" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" disabled></td>--%>
+<%--                                    <td style="width:110px;"><input style="width:190px;" value="${ph.endDate}" class="Wdate mt-input" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" disabled><input type="hidden" value="${ph.startDate}"></td>--%>
+<%--                                    <td style="width:110px;text-align: center;">--%>
+<%--                                        <span disabled class="mt-btn-font font_del" onclick="com.minto.taskPhase.toReportConfig(this)">[${tc:i18n("common.button.set.label")}]<input type="hidden" value=""></span>--%>
+<%--                                    </td>--%>
+<%--                                    &lt;%&ndash;<td style="width:100px;"><input style="width:56px;" value="${ph.remindForward}" disabled>小时</td>&ndash;%&gt;--%>
+<%--                                    <td style="width:100px;text-align: center;"><span disabled class="mt-btn-font font_del">[${tc:i18n("common.button.delete.label")}]</span></td>--%>
+<%--                                </tr>--%>
+<%--                            </c:forEach>--%>
+<%--                            </tbody>--%>
+<%--                        </table>--%>
+<%--                    </td>--%>
+<%--                </tr>--%>
                 </tbody>
             </table>
         </div>
@@ -318,13 +318,13 @@
     $(document).ready(function(){
         //初始化值
         if (!!"${reportConfig.reportFrequency}") {
-            $("#reportFrequency").val("${reportConfig.reportFrequency}");
+           // $("#reportFrequency").val("${reportConfig.reportFrequency}");
             com.minto.taskPhase.showDetailTrByType("${reportConfig.reportFrequency}");
         }
         //阶段表格操作事件
-        $("#frequencies").on("click",".del-f",function(){
-            $(this).parent().parent().remove();
-        });
+        // $("#frequencies").on("click",".del-f",function(){
+        //     $(this).parent().parent().remove();
+        // });
 
         // Iframe重设高度影响其他页面
         // setTimeout(function () {
@@ -422,9 +422,6 @@
     }
 
     function save(callback) {
-        if(!checkTr()){
-            return;
-        }
         var progressBar = $.startProc("正在保存，请稍后...");
         // 调用后台保存
         var param = {};

tip-front/src/main/webapp/tc_suite/taskmt/js/list.category.js

@@ -46,7 +46,7 @@ var ListMenu = {
     ,edit:"编辑"
     ,remove:"删除"
     ,remind:"催办"
-    ,proceedReport:"续报"
+    ,proceedReport:"取消办结"
     ,export:"导出"
     ,pigeonhole:"归档"
 };