新增关联表单控件

mjava-aosikang/src/main/java/com/malk/aosikang/Boot.java

@@ -1,6 +1,7 @@
 package com.malk.aosikang;
 
 import com.querydsl.jpa.impl.JPAQueryFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;

mjava-aosikang/src/main/java/com/malk/aosikang/controller/DLController.java

@@ -39,8 +39,18 @@ public class DLController {
     }
 
     @PostMapping(value = "testGet")
-    McR testGet(@RequestBody Map data) {
-        payService.testGet(data.get("id").toString());
+    McR testGet(String id,boolean isAgree) {
+        payService.testGet(id,isAgree);
+        return McR.success();
+    }
+    @PostMapping(value = "testSuccess")
+    McR testSuccess(String id,boolean isAgree) {
+        payService.testSuccess(id,isAgree);
+        return McR.success();
+    }
+    @PostMapping(value = "testError")
+    McR testError(String id,boolean isAgree) {
+        payService.testError(id,isAgree);
         return McR.success();
     }
     /**

mjava-aosikang/src/main/java/com/malk/aosikang/delegate/DDDelegate.java

@@ -23,10 +23,10 @@ public class DDDelegate implements DDEvent {
     PayService payService;
     // 审批任务回调执行业务逻辑
 
-    private static final String DXCPXS = "PROC-BA558102-6DA9-4F02-9E0A-BE4272362C06";
-    private static final String NDKJXS = "PROC-452744BC-BDA4-4641-AA5B-B5D68A47242B";
-    private static final String YPSQ = "PROC-82FE4028-CA69-47A6-8D9C-16239BC4006F";
-    private static final String KS = "PROC-89069560-F910-4048-9DC2-8F82DE724F4C";
+    private static final String DXCPXS = "PROC-3F7AC816-B41B-4A48-8CFD-CE9FF92B05AB";
+    private static final String NDKJXS = "PROC-A9F9C430-5947-4B4F-9D8A-2591207E6153";
+    private static final String YPSQ = "PROC-B6CCD0BE-E74D-4FCD-8B3A-B68F7827C5AC";
+    private static final String KS = "PROC-B5937B5F-7883-4BAD-932A-F54A5113576C";
 
     @Async
     @Override
@@ -59,7 +59,8 @@ public class DDDelegate implements DDEvent {
     public void executeEvent_Instance_Finish(String processInstanceId, String processCode, boolean isAgree, boolean isTerminate, String staffId) {
         log.info("executeEvent_Instance_Finish");
         String approveResult = isAgree ? "agree" : "refuse";
-//        if (isTerminate) approveResult = "terminated";
+//        if (isTerminate) approveResult = "terminated"
+        log.info("agree:{},terminate:{}",isAgree,isTerminate);
         if  (isAgree){
             if (processCode.equals(DXCPXS)){
                 payService.approveUpdateCRM(processInstanceId,"DXCPXS","审批通过", isAgree);
@@ -70,8 +71,6 @@ public class DDDelegate implements DDEvent {
             }else if (processCode.equals(KS)){
                 payService.approveUpdateCRM(processInstanceId,"KS","审批通过", isAgree);
             }
-        }else if (isTerminate) {
-            return;
         }else {
             if (processCode.equals(DXCPXS)){
                 payService.approveUpdateCRM(processInstanceId,"DXCPXS","审批拒绝", isAgree);

mjava-aosikang/src/main/java/com/malk/aosikang/service/Impl/PayServiceImpl.java

@@ -170,6 +170,7 @@ public class PayServiceImpl implements PayService {
     private Map _getMeta() {
         if (ObjectUtil.isNull(MATE)) {
             MATE = (Map) UtilFile.readJsonObjectFromResource("static/json/form.json"); // 本地匹配宜搭组件ID
+//            MATE = (Map) UtilFile.readJsonObjectFromResource("static/json/formtest.json"); // 本地匹配宜搭组件ID
         }
         return MATE;
     }
@@ -313,6 +314,12 @@ public class PayServiceImpl implements PayService {
                         Object value = data.get(component.get(key));
                         formData.put("name", key);
                         formData.put("value",value.toString());
+                        if ("RelatedReceipt".equals(component.get(key))){
+                            List<String> ids = new ArrayList<>();
+                            ids.add(value.toString());
+                            formData.put("name", key);
+                            formData.put("value",JSON.toJSONString(ids));
+                        }
                         if (ALLENUM.containsKey(value.toString())){
                             formData.put("value",ALLENUM.get(value.toString()));
                         }
@@ -378,6 +385,18 @@ public class PayServiceImpl implements PayService {
         return UtilMap.map("result",isOk);
     }
 
+    @Override
+    public void testSuccess(String processInstanceId, boolean isAgree) {
+        approveUpdateCRM(processInstanceId,"DXCPXS","审批通过", isAgree);
+
+    }
+
+    @Override
+    public void testError(String processInstanceId, boolean isAgree) {
+        approveUpdateCRM(processInstanceId,"DXCPXS","审批拒绝", isAgree);
+
+    }
+
     /**
      * 更新表单实例
      * @param code 单据类型
@@ -542,34 +561,17 @@ public class PayServiceImpl implements PayService {
 
     @Override
     public void testToken() {
-        Map processData = ddClient_workflow.getProcessInstanceId(ddClient.getAccessToken(APP_EKY, APP_SECRET), "9aUyg-MhQOaWMIu6KIMt3A03891762254188");
-        List<Map> operationRecords = (List<Map>) processData.get("operationRecords");
-        final String[] remark = {""};
-        operationRecords.forEach(o->{
-            if(!"NONE".equals(o.get("result"))){
-                remark[0] = UtilMap.getString(o,"remark");
-            }
-        });
-        approveUpdateCRM("QHtdZ0DyTQq-elLLjmic9g03891762329654","DXCPXS","审批拒绝", false);
-        System.out.println(remark[0]);
-//        Map token = getToken();
-//        List<String> mapList = new ArrayList<>();
-//        mapList.add("manager3269");
-//        List<String> numberByUserId = getNumberByUserId(mapList);
-//        numberByUserId.forEach(e->{
-//            String trim = e;
-//            if (e.contains("-")){
-//                String[] split = e.split("-");
-//                trim = split[1].trim();
-//            }
-//            String userFormByNumber = getUserFormByNumber(trim, token.get("corpId").toString(), token.get("token").toString());
-//
-//        });
+//        approveUpdateCRM(processInstanceId,"DXCPXS","审批拒绝", isAgree);
     }
 
     @Override
-    public void testGet(String id) {
-        approveUpdateCRM("K977PURCR0SATrmOoPfTAg03891761641697","KS","审批拒绝",false);
+    public void testGet(String id,boolean isAgree) {
+        System.out.println(id);
+        if (isAgree){
+            System.out.println("11111");
+            log.info("isAgree:{},",isAgree);
+        }
+        log.info("id:{},",id);
     }
 
     /**

mjava-aosikang/src/main/java/com/malk/aosikang/service/PayService.java

@@ -9,7 +9,7 @@ public interface PayService {
     void approveUpdateCRM(String processInstanceId, String code, String result, boolean isAgree);
 
     void testToken();
-    void testGet(String id);
+    void testGet(String id,boolean isAgree);
 
     void synchronousAndPush(String processInstanceId);
 
@@ -20,6 +20,9 @@ public interface PayService {
 
     Map terminateProcess(Map data);
 
+    void testSuccess(String processInstanceId,boolean isAgree);
+    void testError(String processInstanceId,boolean isAgree);
+
 
     boolean updateProcess(String code, Map data);
 

mjava-aosikang/src/main/resources/static/json/form.json

@@ -1,7 +1,7 @@
 {
   "DXCPXS": {
-    "processCode1": "PROC-3F7AC816-B41B-4A48-8CFD-CE9FF92B05AB",
-    "processCode": "PROC-BA558102-6DA9-4F02-9E0A-BE4272362C06",
+    "processCode": "PROC-3F7AC816-B41B-4A48-8CFD-CE9FF92B05AB",
+    "processCode1": "PROC-BA558102-6DA9-4F02-9E0A-BE4272362C06",
     "creator": "proposerCode",
     "attachmentUrl": {
       "downloadUrl": "downloadUrl",
@@ -23,12 +23,13 @@
       "合同总价是否为固定金额": "isFixed",
       "原币类型": "currencyType",
       "原币金额": "currencyAmount",
-      "人民币金额（元）": "RMBAmount"
+      "人民币金额（元）": "RMBAmount",
+      "关联审批单": "RelatedReceipt"
     }
   },
   "NDKJXS": {
-    "processCode1": "PROC-A9F9C430-5947-4B4F-9D8A-2591207E6153",
-    "processCode": "PROC-452744BC-BDA4-4641-AA5B-B5D68A47242B",
+    "processCode": "PROC-A9F9C430-5947-4B4F-9D8A-2591207E6153",
+    "processCode1": "PROC-452744BC-BDA4-4641-AA5B-B5D68A47242B",
     "creator": "proposerCode",
     "attachmentUrl": {
       "downloadUrl": "downloadUrl",
@@ -50,8 +51,8 @@
     }
   },
   "YPSQ": {
-    "processCode1": "PROC-B6CCD0BE-E74D-4FCD-8B3A-B68F7827C5AC",
-    "processCode": "PROC-82FE4028-CA69-47A6-8D9C-16239BC4006F",
+    "processCode": "PROC-B6CCD0BE-E74D-4FCD-8B3A-B68F7827C5AC",
+    "processCode1": "PROC-82FE4028-CA69-47A6-8D9C-16239BC4006F",
     "creator": "proposerCode",
     "attachmentUrl": {
       "downloadUrl": "downloadUrl",
@@ -87,8 +88,8 @@
     }
   },
   "KS": {
-    "processCode1": "PROC-B5937B5F-7883-4BAD-932A-F54A5113576C",
-    "processCode": "PROC-89069560-F910-4048-9DC2-8F82DE724F4C",
+    "processCode": "PROC-B5937B5F-7883-4BAD-932A-F54A5113576C",
+    "processCode1": "PROC-89069560-F910-4048-9DC2-8F82DE724F4C",
     "creator": "proposerCode",
     "attachmentUrl": {
       "downloadUrl": "downloadUrl",

mjava-aosikang/src/main/resources/static/json/formtest.json

@@ -0,0 +1,107 @@
+{
+  "DXCPXS": {
+    "processCode1": "PROC-3F7AC816-B41B-4A48-8CFD-CE9FF92B05AB",
+    "processCode": "PROC-BA558102-6DA9-4F02-9E0A-BE4272362C06",
+    "creator": "proposerCode",
+    "attachmentUrl": {
+      "downloadUrl": "downloadUrl",
+      "name": "name"
+    },
+    "compIds": {
+      "crmId": "crmId",
+      "合同描述": "contractContent",
+      "名称": "name",
+      "签署法人实体": "signingLegal",
+      "区域": "region",
+      "合同事宜": "contractIssue",
+      "合同编号": "contractCode",
+      "甲方信息": "partyAInfo",
+      "乙方信息": "partyBInfo",
+      "合同签订日期": "contractSignDate",
+      "是否涉及法人章": "involveCorporateSeal",
+      "是否涉密": "isConfidential",
+      "合同总价是否为固定金额": "isFixed",
+      "原币类型": "currencyType",
+      "原币金额": "currencyAmount",
+      "人民币金额（元）": "RMBAmount",
+      "关联审批单": "RelatedReceipt"
+    }
+  },
+  "NDKJXS": {
+    "processCode1": "PROC-A9F9C430-5947-4B4F-9D8A-2591207E6153",
+    "processCode": "PROC-452744BC-BDA4-4641-AA5B-B5D68A47242B",
+    "creator": "proposerCode",
+    "attachmentUrl": {
+      "downloadUrl": "downloadUrl",
+      "name": "name"
+    },
+    "compIds": {
+      "crmId": "crmId",
+      "名称": "name",
+      "签署法人实体": "signingLegal",
+      "是否加盖公章": "isSealUsed",
+      "合同描述": "contractContent",
+      "合同编号": "contractCode",
+      "甲方信息": "partyAInfo",
+      "乙方信息": "partyBInfo",
+      "合同签订日期": "contractSignDate",
+      "合同事宜": "contractIssue",
+      "是否涉及法人章": "involveCorporateSeal",
+      "是否涉密": "isConfidential"
+    }
+  },
+  "YPSQ": {
+    "processCode1": "PROC-B6CCD0BE-E74D-4FCD-8B3A-B68F7827C5AC",
+    "processCode": "PROC-82FE4028-CA69-47A6-8D9C-16239BC4006F",
+    "creator": "proposerCode",
+    "attachmentUrl": {
+      "downloadUrl": "downloadUrl",
+      "name": "name"
+    },
+    "products" : "样品信息",
+    "cellLines" : "细胞株信息",
+    "compIds": {
+      "crmId": "crmId",
+      "区域": "region",
+      "申请原因": "reason",
+      "申请类型": "type",
+      "客户名称": "customerName",
+      "收货人": "receiverName",
+      "收货地址": "address",
+      "收货人电话": "receiverPhone",
+      "产品数量": "productNum",
+      "实际发出数量": "actualNum",
+      "tableField_products": {
+        "产品名称": "productName",
+        "产品规格": "productSpecs",
+        "有效期": "validityPeriod",
+        "产品批号": "productLot",
+        "包装数量": "quantity"
+      },
+      "tableField_cellLines": {
+        "细胞株名称": "cellLineName",
+        "细胞株类型": "cellLineType",
+        "数量": "quantity",
+        "温度": "temperature",
+        "储存和运输条件": "condition"
+      }
+    }
+  },
+  "KS": {
+    "processCode1": "PROC-B5937B5F-7883-4BAD-932A-F54A5113576C",
+    "processCode": "PROC-89069560-F910-4048-9DC2-8F82DE724F4C",
+    "creator": "proposerCode",
+    "attachmentUrl": {
+      "downloadUrl": "downloadUrl",
+      "name": "name"
+    },
+    "compIds": {
+      "crmId": "crmId",
+      "售后管理": "afterSales",
+      "详情": "issueDescription",
+      "投诉等级": "level",
+      "客户是否要求赔偿": "isNeedCompensation",
+      "赔偿金额（元）": "amount"
+    }
+  }
+}

mjava-aosikang/src/test/java/test.java

@@ -40,7 +40,7 @@ public class test {
     @Test
     public void sonUpdateTest(){
 
-        Map processData = ddClient_workflow.getProcessInstanceId(ddClient.getAccessToken(APP_EKY, APP_SECRET), "uSyw345fTtqr8ZiY5eNDbw03891762224757");
+        Map processData = ddClient_workflow.getProcessInstanceId(ddClient.getAccessToken(APP_EKY, APP_SECRET), "Zd7HDIdGTkiGFFtsoHkg3A03891763390051");
 
         System.out.println(processData);
     }