采购申请审批任务标题修改

huigou-xt/src/main/webapp/system/configtool/ProcessManage.js

@@ -233,7 +233,7 @@ function initializeGrid() {
         updateHandler: showUpdateDialog,
         moveHandler: moveHandler,
         deleteHandler: deleteHandler,
-        saveSortIDHandler: updateSequence,
+        //saveSortIDHandler: updateSequence,
         importProcUnit: {
             id: 'importProcUnit',
             text: '导入流程环节',
@@ -272,13 +272,13 @@ function initializeGrid() {
                 type: "string",
                 align: "left"
             },
-            {
-                display: "排序号", name: "sequence", width: 60, minWidth: 60, type: "int", align: "left",
-                render: function (item) {
-                    item.id = item.id; //只为了能够更新sequence
-                    return UICtrl.sequenceRender(item);
-                }
-            },
+            // {
+            //     display: "排序号", name: "sequence", width: 60, minWidth: 60, type: "int", align: "left",
+            //     render: function (item) {
+            //         item.id = item.id; //只为了能够更新sequence
+            //         return UICtrl.sequenceRender(item);
+            //     }
+            // },
             {
                 display: "状态", name: "status", width: 60, minWidth: 60, type: "string", align: "left",
                 render: function (item) {
@@ -292,9 +292,9 @@ function initializeGrid() {
         parms: {
             parentId: 1, inculdeProcUnit: 1
         },
-        usePager: false,
+        usePager: true,
         sortName: "sequence",
-        SortOrder: "asc",
+        sortOrder: "asc",
         toolbar: toolbarOptions,
         width: '99.8%',
         height: '100%',

topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java

@@ -409,8 +409,18 @@ public class ResourceSearchController {
     public Map<String, Object> getBankInfo(SDO sdo) throws IOException {
         String param = sdo.getString("paramValue");
         String BANKS = sdo.getString("BANKS");
+        String noContain = sdo.getString("noContain");
         List<Map<String, String>> mapList = new ArrayList<>();
         mapList = sapBankInfoApplication.getBankInfo(BANKS);
+        if (StringUtil.isNotBlank(noContain)){//固定条件过滤，不包含
+            String[] split = noContain.split(",");
+            for (String s : split) {
+                mapList = mapList
+                        .stream()
+                        .filter(map -> map.values().stream().noneMatch(value->value.contains(s)))
+                        .collect(Collectors.toList());
+            }
+        }
         return sapDictionaryApplication.initEasySearchModel( mapList, param, sdo);
     }
 

topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalApplicationImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.huigou.cache.DictUtil;
 import com.huigou.cache.SystemCache;
 import com.huigou.context.Operator;
 import com.huigou.context.OrgUnit;
@@ -92,7 +93,25 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
         return sapPurchaseApproval.getId();
     }
 
+    @Override
+    protected void setTaskDescription(DelegateTask delegateTask) {
+        String bizId = delegateTask.getExecution().getProcessBusinessKey();
+        delegateTask.setDescription(this.getApprovalSubjectName(bizId));
+    }
 
+    /**
+     * 获取任务标题
+     *
+     * @param bizId
+     * @return
+     */
+    private String getApprovalSubjectName(String bizId) {
+        SapPurchaseApproval sapPurchaseApproval = this.sapPurchaseApprovalRepository.findOne(bizId);
+        //查询 单据日期
+        String fillinDateStr = DateUtil.getDateFormat("yyyy-MM-dd HH:mm:ss", sapPurchaseApproval.getFillinDate());
+        //设置标题
+        return String.format("%s-%s(%s)", sapPurchaseApproval.getBatxt(), sapPurchaseApproval.getBanfn(), fillinDateStr);
+    }
 
     @Override
     protected Map<String, Object> getProcessBizParams(String bizId) {