1

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

@@ -254,12 +254,12 @@ public class PayServiceImpl implements PayService {
 
             dataList = ydService.queryFormData_all(_initLYParam()
                     .formUuid("FORM-651D1713A25E423FB4EC1A5A06A7A741QWEY")
-                    .searchFieldJson(JSON.toJSONString(UtilMap.map("selectField_mjgj9non", "下属公司")))
+                    .searchFieldJson(JSON.toJSONString(UtilMap.map("selectField_mjgj9non, radioField_mjgsdrat", "下属公司","开启")))
                     .build());
         }else {
             dataList = ydService.queryFormData_all(_initLYParam()
                     .formUuid("FORM-651D1713A25E423FB4EC1A5A06A7A741QWEY")
-                    .searchFieldJson(JSON.toJSONString(UtilMap.map("departmentSelectField_mjgqcjsw", department.get(0))))
+                    .searchFieldJson(JSON.toJSONString(UtilMap.map("departmentSelectField_mjgqcjsw, radioField_mjgsdrat", department.get(0),"开启")))
                     .build());
         }
         dataList.forEach(e->{
@@ -274,6 +274,8 @@ public class PayServiceImpl implements PayService {
             formData.put("employeeField_mji9tann",UtilMap.getList(formData, "employeeField_mji9tann_id"));
             formData.put("employeeField_mji9tany",UtilMap.getList(formData, "employeeField_mji9tany_id"));
             formData.put("employeeField_mji9tao9",UtilMap.getList(formData, "employeeField_mji9tao9_id"));
+            formData.put("departmentSelectField_mkkjlg1x",UtilMap.getList(formData, "departmentSelectField_mkkjlg1x_id"));
+            formData.put("departmentSelectField_mkkjlg1y",UtilMap.getList(formData, "departmentSelectField_mkkjlg1y_id"));
             formData.put(EMPLOYEE_ENUM.get(UtilMap.getString(e,"selectField_mjgj9non")),issueEmployee);
             /*发起流程*/
             if (depType.equals("班组")){
@@ -285,7 +287,7 @@ public class PayServiceImpl implements PayService {
 
                 final String[] content = {""};
                 if (mapList1.size()>0 && ObjectUtil.isNotNull(mapList1)){
-                    content[0] = content[0] + "（一）运行控制 ";
+                    content[0] = content[0] + "（一）运行控制 \n";
                     mapList1.forEach(e1->{
                         e1.forEach((k,v)->{
                             content[0] = content[0] + v;
@@ -293,7 +295,7 @@ public class PayServiceImpl implements PayService {
                     });
                 }
                 if (mapList2.size()>0 && ObjectUtil.isNotNull(mapList2)) {
-                    content[0] = content[0] + "（二）安全生产 ";
+                    content[0] = content[0] + "\n（二）安全生产 \n";
                     mapList2.forEach(e1 -> {
                         e1.forEach((k, v) -> {
                             content[0] = content[0] + v;
@@ -301,7 +303,7 @@ public class PayServiceImpl implements PayService {
                     });
                 }
                 if (mapList3.size()>0 && ObjectUtil.isNotNull(mapList3)) {
-                    content[0] = content[0] + "（三）质量控制 ";
+                    content[0] = content[0] + "\n（三）质量控制 \n";
                     mapList3.forEach(e1 -> {
                         e1.forEach((k, v) -> {
                             content[0] = content[0] + v;
@@ -318,6 +320,11 @@ public class PayServiceImpl implements PayService {
                         .formDataJson(JSON.toJSONString(formData))
                         .build(), YDConf.FORM_OPERATION.start);
             }else {
+                if(depType.equals("下属公司")){
+                    formData.put("departmentSelectField_mkkjlg1x",issueDepartment);
+                }else if(depType.equals("一线部门")){
+                    formData.put("departmentSelectField_mkkjlg1y",issueDepartment);
+                }
                 ydClient.operateData(_initLYParam()
                         .formUuid("FORM-609926407D9D4CABB771228200AEE57EKGSE")
                         .formDataJson(JSON.toJSONString(formData))
@@ -335,13 +342,13 @@ public class PayServiceImpl implements PayService {
         log.info("开始执行插入AI表格");
         LocalDate today = LocalDate.now();
         String dateStr = today.format(formatter);
-        List<Map> mapList1 = (List<Map>) formData.get(OPERATION_CONTROL.get("投资公司"));
-        List<Map> mapList2 = (List<Map>) formData.get(WORK_SAFETY.get("投资公司"));
-        List<Map> mapList3 = (List<Map>) formData.get(QUALITY_CONTROL.get("投资公司"));
+        List<Map> mapList1 = UtilMap.getList(formData,OPERATION_CONTROL.get("投资公司"));
+        List<Map> mapList2 = UtilMap.getList(formData,WORK_SAFETY.get("投资公司"));
+        List<Map> mapList3 = UtilMap.getList(formData,QUALITY_CONTROL.get("投资公司"));
 
         final String[] content = {""};
         if (mapList1.size()>0 && ObjectUtil.isNotNull(mapList1)){
-            content[0] = content[0] + "（一）运行控制 ";
+            content[0] = content[0] + "（一）运行控制 \n";
             mapList1.forEach(e->{
                 e.forEach((k,v)->{
                     content[0] = content[0] + v;
@@ -349,7 +356,7 @@ public class PayServiceImpl implements PayService {
             });
         }
         if (mapList2.size()>0 && ObjectUtil.isNotNull(mapList2)) {
-            content[0] = content[0] + "（二）安全生产 ";
+            content[0] = content[0] + "\n（二）安全生产 \n";
             mapList2.forEach(e -> {
                 e.forEach((k, v) -> {
                     content[0] = content[0] + v;
@@ -357,7 +364,7 @@ public class PayServiceImpl implements PayService {
             });
         }
         if (mapList3.size()>0 && ObjectUtil.isNotNull(mapList3)) {
-            content[0] = content[0] + "（三）质量控制 ";
+            content[0] = content[0] + "\n（三）质量控制 \n";
             mapList3.forEach(e -> {
                 e.forEach((k, v) -> {
                     content[0] = content[0] + v;

mjava-hangshi/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
 # 环境配置
 server:
-  port: 8108
+  port: 9000
   servlet:
     context-path: /api/hangshi