航食0206问题调整

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

@@ -33,7 +33,7 @@ public class ScheduleTask {
     /**
      * 每天17点推送最终版
      */
-    @Scheduled(cron = "0 0 17 * * ?")
+    @Scheduled(cron = "0 30 16 * * ?")
     void updateUseCarLast(){
         log.info("每天17点尝试下发流程");
         payService.getInvestmentCompany(true);

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

@@ -243,14 +243,14 @@ public class PayServiceImpl implements PayService {
     }
     private static void extracted(Map formData, List<List<Map>> lastList) {
 
-        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("室"));
+        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("投资公司"));
+        List<Map> mapList4 = UtilMap.getList(formData,OPERATION_CONTROL.get("下属公司"));
+        List<Map> mapList5 = UtilMap.getList(formData,OPERATION_CONTROL.get("一线部门"));
+        List<Map> mapList6 = UtilMap.getList(formData,OPERATION_CONTROL.get("室"));
 
-        if (mapList1.size()>0 && ObjectUtil.isNotNull(mapList1)){
+        if (ObjectUtil.isNotNull(mapList1) && mapList1.size()>0){
             final String[] content = {""};
             mapList1.forEach(e1->{
                 e1.forEach((k,v)->{
@@ -262,7 +262,7 @@ public class PayServiceImpl implements PayService {
             details.add(UtilMap.map("name, value","类型","（一）运行控制"));
             lastList.add(details);
         }
-        if (mapList2.size()>0 && ObjectUtil.isNotNull(mapList2)) {
+        if (ObjectUtil.isNotNull(mapList2) && mapList2.size()>0) {
             final String[] content = {""};
             mapList2.forEach(e1 -> {
                 e1.forEach((k, v) -> {
@@ -274,7 +274,7 @@ public class PayServiceImpl implements PayService {
             details.add(UtilMap.map("name, value","类型","（二）安全生产"));
             lastList.add(details);
         }
-        if (mapList3.size()>0 && ObjectUtil.isNotNull(mapList3)) {
+        if (ObjectUtil.isNotNull(mapList3) && mapList3.size()>0) {
             final String[] content = {""};
             mapList3.forEach(e1 -> {
                 e1.forEach((k, v) -> {
@@ -286,7 +286,7 @@ public class PayServiceImpl implements PayService {
             details.add(UtilMap.map("name, value","类型","（三）质量控制"));
             lastList.add(details);
         }
-        if (mapList4.size()>0 && ObjectUtil.isNotNull(mapList4)) {
+        if (ObjectUtil.isNotNull(mapList4) && mapList4.size()>0) {
             final String[] content = {""};
             mapList4.forEach(e1 -> {
                 e1.forEach((k, v) -> {
@@ -298,7 +298,7 @@ public class PayServiceImpl implements PayService {
             details.add(UtilMap.map("name, value","类型","下属公司"));
             lastList.add(details);
         }
-        if (mapList5.size()>0 && ObjectUtil.isNotNull(mapList5)) {
+        if (ObjectUtil.isNotNull(mapList5) && mapList5.size()>0) {
             final String[] content = {""};
             mapList5.forEach(e1 -> {
                 e1.forEach((k, v) -> {
@@ -310,7 +310,7 @@ public class PayServiceImpl implements PayService {
             details.add(UtilMap.map("name, value","类型","一线部门"));
             lastList.add(details);
         }
-        if (mapList6.size()>0 && ObjectUtil.isNotNull(mapList6)) {
+        if (ObjectUtil.isNotNull(mapList6) && mapList6.size()>0) {
             final String[] content = {""};
             mapList6.forEach(e1 -> {
                 e1.forEach((k, v) -> {
@@ -395,15 +395,15 @@ public class PayServiceImpl implements PayService {
             if (depType.equals("班组")){
                 String classType = UtilMap.getString(e,"radioField_mke10pcc");
 
-                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("室"));
+                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("投资公司"));
+                List<Map> mapList4 = UtilMap.getList(formData,OPERATION_CONTROL.get("下属公司"));
+                List<Map> mapList5 = UtilMap.getList(formData,OPERATION_CONTROL.get("一线部门"));
+                List<Map> mapList6 = UtilMap.getList(formData,OPERATION_CONTROL.get("室"));
 
                 final String[] content = {"投资公司 \n"};
-                if (mapList1.size()>0 && ObjectUtil.isNotNull(mapList1)){
+                if (ObjectUtil.isNotNull(mapList1) && mapList1.size()>0){
                     content[0] = content[0] + "（一）运行控制 \n";
                     mapList1.forEach(e1->{
                         e1.forEach((k,v)->{
@@ -411,7 +411,7 @@ public class PayServiceImpl implements PayService {
                         });
                     });
                 }
-                if (mapList2.size()>0 && ObjectUtil.isNotNull(mapList2)) {
+                if (ObjectUtil.isNotNull(mapList2) && mapList2.size()>0) {
                     content[0] = content[0] + "\n（二）安全生产 \n";
                     mapList2.forEach(e1 -> {
                         e1.forEach((k, v) -> {
@@ -419,7 +419,7 @@ public class PayServiceImpl implements PayService {
                         });
                     });
                 }
-                if (mapList3.size()>0 && ObjectUtil.isNotNull(mapList3)) {
+                if (ObjectUtil.isNotNull(mapList3) && mapList3.size()>0) {
                     content[0] = content[0] + "\n（三）质量控制 \n";
                     mapList3.forEach(e1 -> {
                         e1.forEach((k, v) -> {
@@ -427,7 +427,7 @@ public class PayServiceImpl implements PayService {
                         });
                     });
                 }
-                if (mapList4.size()>0 && ObjectUtil.isNotNull(mapList4)) {
+                if (ObjectUtil.isNotNull(mapList4) && mapList4.size()>0 ) {
                     content[0] = content[0] + "\n下属公司 \n";
                     mapList4.forEach(e1 -> {
                         e1.forEach((k, v) -> {
@@ -435,7 +435,7 @@ public class PayServiceImpl implements PayService {
                         });
                     });
                 }
-                if (mapList5.size()>0 && ObjectUtil.isNotNull(mapList5)) {
+                if (ObjectUtil.isNotNull(mapList5) && mapList5.size()>0) {
                     content[0] = content[0] + "\n一线部门 \n";
                     mapList5.forEach(e1 -> {
                         e1.forEach((k, v) -> {
@@ -443,7 +443,7 @@ public class PayServiceImpl implements PayService {
                         });
                     });
                 }
-                if (mapList6.size()>0 && ObjectUtil.isNotNull(mapList6)) {
+                if (ObjectUtil.isNotNull(mapList6) && mapList6.size()>0) {
                     content[0] = content[0] + "\n室 \n";
                     mapList6.forEach(e1 -> {
                         e1.forEach((k, v) -> {
@@ -522,7 +522,7 @@ public class PayServiceImpl implements PayService {
                 DDR.doPost("https://api.dingtalk.com/v1.0/notable/bases/XPwkYGxZV3yb9pLrsg2e2ZRZ8AgozOKL/sheets/数据表/records?operatorId=HFfiiOvDDoszFVOKmtiShJQwiEiE", DDConf.initTokenHeader(ddClient.getAccessToken()), null, body);
             } catch (Exception e) {
                 log.info("返回值映射问题，不必理会");
-                e.printStackTrace();
+//                e.printStackTrace();
             }
 
         }