航食0128问题调整

mjava-hangshi/src/main/java/com/malk/hangshi/schedule/ScheduleTask.java

@@ -21,14 +21,14 @@ public class ScheduleTask {
     @Autowired
     private PayService payService;
 
-    /**
-     * 每天15，16点尝试下发流程
-     */
-    @Scheduled(cron = "0 0 15-16 * * ?")
-    void updateUseCar(){
-        log.info("每天15，16点尝试下发流程");
-        payService.getInvestmentCompany(false);
-    }
+//    /**
+//     * 每天15，16点尝试下发流程
+//     */
+//    @Scheduled(cron = "0 0 15-16 * * ?")
+//    void updateUseCar(){
+//        log.info("每天15，16点尝试下发流程");
+//        payService.getInvestmentCompany(false);
+//    }
 
     /**
      * 每天17点推送最终版

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

@@ -68,7 +68,7 @@ public class PayServiceImpl implements PayService {
     private static  String CROPID = "";
     private ConcurrentHashMap<String, LocalDateTime> formInstanceIdStore = new ConcurrentHashMap<>();
 
-    //所有的枚举
+    //所有的人员控件枚举
     private static final Map<String, String> EMPLOYEE_ENUM = new HashMap<>();
 
     static {
@@ -104,6 +104,7 @@ public class PayServiceImpl implements PayService {
 //        QUALITY_CONTROL.put("一线部门","tableField_mji9tao7");
 //        QUALITY_CONTROL.put("室","tableField_mji9taoi");
     }
+
     private YDParam.YDParamBuilder _initLYParam() {
         return YDParam.builder()
                 .appType("APP_PG9VWQVT23CRFBOOOG6Y")
@@ -156,24 +157,47 @@ public class PayServiceImpl implements PayService {
 
         //整合子表
         List<List<Map>> lastList = new ArrayList<>();
-        extracted(formData, lastList, OPERATION_CONTROL, "（一）运行控制");
-        extracted(formData, lastList, WORK_SAFETY, "（二）安全生产");
-        extracted(formData, lastList, QUALITY_CONTROL, "（三）质量控制");
+//        extracted(formData, lastList, OPERATION_CONTROL, "（一）运行控制");
+//        extracted(formData, lastList, WORK_SAFETY, "（二）安全生产");
+//        extracted(formData, lastList, QUALITY_CONTROL, "（三）质量控制");
+        extracted(formData, lastList);
 
         String meetingTitle = UtilMap.getString(formData, "textField_mjsiv3xl");
+        String ClassContent = UtilMap.getString(formData, "textareaField_mkg9hebk");
         List banzus = UtilMap.getList(formData, "departmentSelectField_mjb7ixr6");//班组
         List yixianbumen = UtilMap.getList(formData, "departmentSelectField_mjb7ixr6");//一线部门
 
+        List attachments = UtilMap.getList(formData, "attachmentField_mkv4ln1q");
+
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        if (ObjectUtil.isNotNull(attachments) && attachments.size() > 0){
+            log.info("开始处理附件上传");
+            attachments.forEach(e->{
+                JSONObject value = (JSONObject) JSONObject.parse(e.toString());
+                String[] split = UtilMap.getString(value, "name").split("\\.");
+                String downLoadUrl = UtilMap.getString(value, "downLoadUrl");
+                String fileName = split[0];
+                String type = split[1];
+                Map map = ddService.uploadFileFormUrlForOverflow(ddClient.getAccessToken(), "957340835", downLoadUrl, fileName, type);
+                Map<String, Object> result = UtilMap.map("spaceId, fileName, fileSize, fileType, fileId", UtilMap.getString(map, "spaceId"), fileName,
+                        UtilMap.getString(map, "size"), UtilMap.getString(map, "extension"), UtilMap.getString(map, "id"));
+                resultList.add(result);
+            });
+        }
+
         try {
             workingEmployeeIds.forEach(e->{
                 List<Map> formValue = new ArrayList<>();
                 List<String> empList = new ArrayList<>();
                 empList.add(e);
+
+                formValue.add(UtilMap.map("name, value","附件",JSON.toJSONString(resultList)));
 //                empList.add("153620324221442254");
                 formValue.add(UtilMap.map("name, value","流水号",serial));
                 formValue.add(UtilMap.map("name, value","宣讲明细",JSON.toJSONString(lastList)));
                 formValue.add(UtilMap.map("name, value","宜搭班组会id",formInstanceId));
                 formValue.add(UtilMap.map("name, value","班组会会议主题",meetingTitle));
+                formValue.add(UtilMap.map("name, value","班组宣贯内容",ClassContent));
                 formValue.add(UtilMap.map("name, value","creator",e));
 //                formValue.add(UtilMap.map("name, value","creator","153620324221442254"));
                 formValue.add(UtilMap.map("name, value","联系人", JSON.toJSONString(empList)));
@@ -214,6 +238,86 @@ public class PayServiceImpl implements PayService {
         lastList.add(details);
 
     }
+    private static void extracted(Map formData, List<List<Map>> lastList) {
+        List<Map> details = new ArrayList<>();
+
+        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> mapList4 = (List<Map>) formData.get(OPERATION_CONTROL.get("下属公司"));
+        List<Map> mapList5 = (List<Map>) formData.get(OPERATION_CONTROL.get("一线部门"));
+        List<Map> mapList6 = (List<Map>) formData.get(OPERATION_CONTROL.get("室"));
+
+        if (mapList1.size()>0 && ObjectUtil.isNotNull(mapList1)){
+            final String[] content = {""};
+            mapList1.forEach(e1->{
+                e1.forEach((k,v)->{
+                    content[0] = content[0] + v;
+                });
+            });
+            details.add(UtilMap.map("name, value","内容",content[0]));
+            details.add(UtilMap.map("name, value","类型","（一）运行控制"));
+            lastList.add(details);
+        }
+        if (mapList2.size()>0 && ObjectUtil.isNotNull(mapList2)) {
+            final String[] content = {""};
+            mapList2.forEach(e1 -> {
+                e1.forEach((k, v) -> {
+                    content[0] = content[0] + v;
+                });
+            });
+            details.add(UtilMap.map("name, value","内容",content[0]));
+            details.add(UtilMap.map("name, value","类型","（二）安全生产"));
+            lastList.add(details);
+        }
+        if (mapList3.size()>0 && ObjectUtil.isNotNull(mapList3)) {
+            final String[] content = {""};
+            mapList3.forEach(e1 -> {
+                e1.forEach((k, v) -> {
+                    content[0] = content[0] + v;
+                });
+            });
+            details.add(UtilMap.map("name, value","内容",content[0]));
+            details.add(UtilMap.map("name, value","类型","（三）质量控制"));
+            lastList.add(details);
+        }
+        if (mapList4.size()>0 && ObjectUtil.isNotNull(mapList4)) {
+            final String[] content = {""};
+            mapList4.forEach(e1 -> {
+                e1.forEach((k, v) -> {
+                    content[0] = content[0] + v;
+                });
+            });
+            details.add(UtilMap.map("name, value","内容",content[0]));
+            details.add(UtilMap.map("name, value","类型","下属公司"));
+            lastList.add(details);
+        }
+        if (mapList5.size()>0 && ObjectUtil.isNotNull(mapList5)) {
+            final String[] content = {""};
+            mapList5.forEach(e1 -> {
+                e1.forEach((k, v) -> {
+                    content[0] = content[0] + v;
+                });
+            });
+            details.add(UtilMap.map("name, value","内容",content[0]));
+            details.add(UtilMap.map("name, value","类型","一线部门"));
+            lastList.add(details);
+        }
+        if (mapList6.size()>0 && ObjectUtil.isNotNull(mapList6)) {
+            final String[] content = {""};
+            mapList6.forEach(e1 -> {
+                e1.forEach((k, v) -> {
+                    content[0] = content[0] + v;
+                });
+            });
+            details.add(UtilMap.map("name, value","内容",content[0]));
+            details.add(UtilMap.map("name, value","类型","室"));
+            lastList.add(details);
+        }
+        details.add(UtilMap.map("name, value","内容",UtilMap.getString(formData, "textareaField_mkg9hebk")));
+        details.add(UtilMap.map("name, value","类型","班组"));
+        lastList.add(details);
+    }
 
     /**
      * 终止流程
@@ -270,6 +374,7 @@ public class PayServiceImpl implements PayService {
             formData.put("selectField_mjavj2ry",depType);
             formData.put("departmentSelectField_mjb7ixr6",issueDepartment);
             formData.put("dateField_mjb860nt",System.currentTimeMillis());
+            formData.put("textField_mkv4ln1p",UtilMap.getString(formData, "serialNumberField_mkv4ln1o"));
 
             formData.put("employeeField_mji9tann",UtilMap.getList(formData, "employeeField_mji9tann_id"));
             formData.put("employeeField_mji9tany",UtilMap.getList(formData, "employeeField_mji9tany_id"));
@@ -284,8 +389,11 @@ public class PayServiceImpl implements PayService {
                 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> mapList4 = (List<Map>) formData.get(OPERATION_CONTROL.get("下属公司"));
+                List<Map> mapList5 = (List<Map>) formData.get(OPERATION_CONTROL.get("一线部门"));
+                List<Map> mapList6 = (List<Map>) formData.get(OPERATION_CONTROL.get("室"));
 
-                final String[] content = {""};
+                final String[] content = {"投资公司 \n"};
                 if (mapList1.size()>0 && ObjectUtil.isNotNull(mapList1)){
                     content[0] = content[0] + "（一）运行控制 \n";
                     mapList1.forEach(e1->{
@@ -310,6 +418,30 @@ public class PayServiceImpl implements PayService {
                         });
                     });
                 }
+                if (mapList4.size()>0 && ObjectUtil.isNotNull(mapList4)) {
+                    content[0] = content[0] + "下属公司 \n";
+                    mapList4.forEach(e1 -> {
+                        e1.forEach((k, v) -> {
+                            content[0] = content[0] + v;
+                        });
+                    });
+                }
+                if (mapList5.size()>0 && ObjectUtil.isNotNull(mapList5)) {
+                    content[0] = content[0] + "\n一线部门 \n";
+                    mapList5.forEach(e1 -> {
+                        e1.forEach((k, v) -> {
+                            content[0] = content[0] + v;
+                        });
+                    });
+                }
+                if (mapList6.size()>0 && ObjectUtil.isNotNull(mapList6)) {
+                    content[0] = content[0] + "\n室 \n";
+                    mapList6.forEach(e1 -> {
+                        e1.forEach((k, v) -> {
+                            content[0] = content[0] + v;
+                        });
+                    });
+                }
                 formData.put("textField_mjkuqqx4",issueDepartment.get(0));
                 formData.put("numberField_mjqsi2ut",0);
                 formData.put("radioField_mke10pcc",classType);//是否外包
@@ -403,7 +535,7 @@ public class PayServiceImpl implements PayService {
                 .searchFieldJson(JSON.toJSONString(UtilMap.map("textField_mjjo82fr","否")))
                 .build());
         log.info("日期:{},条数:{}",dateStr,dataList.size());
-        if (isLastTime || (ObjectUtil.isNotNull(dataList) && dataList.size() >= 3)){
+        if ((isLastTime && dataList.size() != 0) || (ObjectUtil.isNotNull(dataList) && dataList.size() >= 3)){
             Map<String, Object> formData = new HashMap<>();
             formData.put("selectField_mjavj2ry","投资公司");
             formData.put("dateField_mjb860nt",System.currentTimeMillis());