报工单工时调整

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

@@ -157,10 +157,10 @@ public class ScheduleTask {
     }
 
     /**
-     * 23点20分全量同步账龄表
+     * 20点20分全量同步账龄表
      */
     @Async
-    @Scheduled(cron = "0 20 23 * * ?")
+    @Scheduled(cron = "0 20 20 * * ?")
     void syncAgingTask(){
         log.info("全量同步账龄表");
         fService.syncAgingSchedule();

mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/WorkServiceImpl.java

@@ -77,13 +77,23 @@ public class WorkServiceImpl implements WorkService {
     @Override
     public void getMonthWorkOrder() {
         Date beginOfMonth = DateUtil.beginOfMonth(DateUtil.lastMonth());
-        Date endOfMonth = DateUtil.endOfMonth(DateUtil.date());
+        Date endOfMonth = DateUtil.endOfMonth(DateUtil.lastMonth());
         String[] dateList = new String[2];
         dateList[0] = String.valueOf(beginOfMonth.getTime());
-//        dateList[0] = String.valueOf(1767196800000L);
         dateList[1] = String.valueOf(endOfMonth.getTime());
+//        dateList[0] = String.valueOf(1767196800000L);
 //        dateList[1] = String.valueOf(1769875199000L);
         //获取当月所有报工单
+        extracted(dateList);
+
+        beginOfMonth = DateUtil.beginOfMonth(DateUtil.date());
+        endOfMonth = DateUtil.endOfMonth(DateUtil.date());
+        dateList[0] = String.valueOf(beginOfMonth.getTime());
+        dateList[1] = String.valueOf(endOfMonth.getTime());
+        extracted(dateList);
+    }
+
+    private void extracted(String[] dateList) {
         List<Map> dataList = ydService.queryFormData_all(_initLYParam()
                 .formUuid("FORM-C9543719A88F4D99A8E197FD6F9DE182ZOW9")
                 .searchFieldJson(JSON.toJSONString(UtilMap.map("dateField_lrn734i2", (Object) dateList)))
@@ -352,10 +362,22 @@ public class WorkServiceImpl implements WorkService {
     @Override
     public void getMonthWorkSummary() {
         Date beginOfMonth = DateUtil.beginOfMonth(DateUtil.lastMonth());
-        Date endOfMonth = DateUtil.endOfMonth(DateUtil.date());
+        Date endOfMonth = DateUtil.endOfMonth(DateUtil.lastMonth());
         String[] dateList = new String[2];
         dateList[0] = String.valueOf(beginOfMonth.getTime());
         dateList[1] = String.valueOf(endOfMonth.getTime());
+//        dateList[0] = String.valueOf(1767196800000L);
+//        dateList[1] = String.valueOf(1769875199000L);
+        extracted1(dateList);
+
+        beginOfMonth = DateUtil.beginOfMonth(DateUtil.date());
+        endOfMonth = DateUtil.endOfMonth(DateUtil.date());
+        dateList[0] = String.valueOf(beginOfMonth.getTime());
+        dateList[1] = String.valueOf(endOfMonth.getTime());
+        extracted1(dateList);
+    }
+
+    private void extracted1(String[] dateList) {
         //获取当月所有报工单
         List<Map> dataList = ydService.queryFormData_all(YDParam.builder()
                 .appType("APP_FKRD7416H19LDAIN348Y")
@@ -631,20 +653,20 @@ public class WorkServiceImpl implements WorkService {
         conDateList.add(String.valueOf(firstDayTimestamp));
         conDateList.add(String.valueOf(lastDayTimestamp));
         //先清空已存在的数据
-        List<Map> deleteList = ydService.queryFormData_all(YDParam.builder()
-                .appType("APP_ERBDTFS82HOVBPL3NFH0")
-                .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
-                .formUuid("FORM-97BA6C6C8C50416A9E5854F2F4B5C3F3R4WC")
-                .searchFieldJson(JSON.toJSONString(UtilMap.map("dateField_mfo3dvpr", conDateList)))
-                .build());
-        deleteList.forEach(d->{
-            ydClient.operateData(YDParam.builder()
-                    .appType("APP_TKO2FYGFQYQQMQFUTUU5")
-                    .systemToken("2IF66SC1XCSY45IUBXA0X9WYE09G3W8GGNEFM7T4")
-                    .formUuid("FORM-C17DA3AEA3064A3D9CA118BBB3116BF6NLUB")
-                    .formInstanceId(UtilMap.getString(d,"formInstanceId"))
-                    .build(), YDConf.FORM_OPERATION.delete);
-        });
+//        List<Map> deleteList = ydService.queryFormData_all(YDParam.builder()
+//                .appType("APP_ERBDTFS82HOVBPL3NFH0")
+//                .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
+//                .formUuid("FORM-97BA6C6C8C50416A9E5854F2F4B5C3F3R4WC")
+//                .searchFieldJson(JSON.toJSONString(UtilMap.map("dateField_mfo3dvpr", conDateList)))
+//                .build());
+//        deleteList.forEach(d->{
+//            ydClient.operateData(YDParam.builder()
+//                    .appType("APP_TKO2FYGFQYQQMQFUTUU5")
+//                    .systemToken("2IF66SC1XCSY45IUBXA0X9WYE09G3W8GGNEFM7T4")
+//                    .formUuid("FORM-C17DA3AEA3064A3D9CA118BBB3116BF6NLUB")
+//                    .formInstanceId(UtilMap.getString(d,"formInstanceId"))
+//                    .build(), YDConf.FORM_OPERATION.delete);
+//        });
 
         //项目点数据
         List<Map> projectList = ydService.queryFormData_all(YDParam.builder()
@@ -1295,7 +1317,7 @@ public class WorkServiceImpl implements WorkService {
                 Double rgdcl =UtilMap.getDouble(dataMap,"numberField_mfenmehw") == 0.0 ? 0 :
                         UtilMap.getDouble(dataMap,"numberField_mfenmei5") / UtilMap.getDouble(dataMap,"numberField_mfenmehw");//人工达成率
                 if (rgdcl < 1){
-                    if (25 * (1 + (1 - rgdcl)) > 10){
+                    if (25 * (1 + (1 - rgdcl)) >= 35){
                         dataMap.put("numberField_mfenmelq", 35);
                     }else {
                         dataMap.put("numberField_mfenmelq", 25 * (1 + (1 - rgdcl)));
@@ -1371,7 +1393,7 @@ public class WorkServiceImpl implements WorkService {
                 Double wldcl = UtilMap.getDouble(dataMap,"numberField_mfenmeih") == 0.0 ? 0.0 :
                         UtilMap.getDouble(dataMap,"numberField_mfenmeii") / UtilMap.getDouble(dataMap,"numberField_mfenmeih");
                 if (wldcl < 1){
-                    if (20 * (1+(1-wldcl))>30){
+                    if (20 * (1+(1-wldcl))>=30){
                         dataMap.put("numberField_mfenmelr",30);
                     }
                     dataMap.put("numberField_mfenmelr",20 * (1+(1-wldcl)));