自动发起采购订单部分字段更新遗漏

各项目经营分析添加工时字段

mjava-lanyun/src/main/java/com/malk/lanyun/Mapper/ProjectAnalysisMapper.java

@@ -39,6 +39,9 @@ public class ProjectAnalysisMapper implements RowMapper<ProjectAnalysis> {
         projectAnalysis.setNetMargin(resultSet.getString("net_margin"));
 //        projectAnalysis.setFormat(resultSet.getString("format"));
 //        projectAnalysis.setCustomerSystem(resultSet.getString("customer_system"));
+        projectAnalysis.setActualWorkHours(resultSet.getBigDecimal("actual_work_hours"));
+        projectAnalysis.setOutWorkHours(resultSet.getBigDecimal("out_work_hours"));
+        projectAnalysis.setOutPersonCost(resultSet.getBigDecimal("out_person_cost"));
         if (hasColumn(resultSet,"profit_loss")) {
             projectAnalysis.setProfitLoss(resultSet.getString("profit_loss"));
         }

mjava-lanyun/src/main/java/com/malk/lanyun/entity/ProjectAnalysis.java

@@ -1,10 +1,12 @@
 package com.malk.lanyun.entity;
 
 import lombok.Data;
+import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 
+@Component
 @Data
 public class ProjectAnalysis implements Serializable {
     private static final long serialVersionUID = 4820142670157009063L;
@@ -28,6 +30,9 @@ public class ProjectAnalysis implements Serializable {
     private BigDecimal overhead;
     private BigDecimal corporateIncomeTax;
     private BigDecimal netProfit;
+    private BigDecimal actualWorkHours;
+    private BigDecimal outWorkHours;
+    private BigDecimal outPersonCost;
     private String netMargin;
     private String format;
     private String customerSystem;

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

@@ -44,7 +44,7 @@ public class NCTask {
     /**
      * 每月1日凌晨5点30跑批NC-部门费用达成明细
      */
-    @Scheduled(cron = "0 30 5 * * ?")
+    @Scheduled(cron = "0 30 5 18 * ?")
     void departmentCost() {
         log.info("开始跑批更新NC-部门费用达成明细");
         ncService.getNcCollection();

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

@@ -36,26 +36,26 @@ public class ScheduleTask {
     private WorkService workService;
 
     /**
-     * 每月1日凌晨1点自动执行
+     * 每周一凌晨1点自动执行
      */
-    @Scheduled(cron = "0 0 1 1 * ?")
+    @Scheduled(cron = "0 0 1 ? * SUN")
     public void syncDingTalkFailedList() {
         timerService.updateYuedudinge();
         log.info("定时方法执行时间 :" + new Date());
     }
     /**
-     * 每月1日凌晨1点自动执行
+     * 每周一凌晨2点自动执行
      */
-    @Scheduled(cron = "0 0 2 1 * ?")
+    @Scheduled(cron = "0 0 2 ? * SUN")
     public void syncDingTalkFailedList2() {
         timerService.updateYuedudinge();
         log.info("定时方法执行时间 :" + new Date());
     }
 
     /**
-     * 每月16日凌晨6点30自动执行更新项目点档案子表产值预估
+     * 每日8点30自动执行更新项目点档案子表产值预估
      */
-    @Scheduled(cron = "0 30 20 15 * ?")
+    @Scheduled(cron = "0 0 8 * * SUN")
     public void updateOutputPredict() {
         log.info("定时方法执行时间 :" + new Date());
 

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

@@ -213,7 +213,7 @@ public class FImplService implements FService {
 
         List<Map> dataList = ydService.queryFormData_all(_initLYParam()
                 .formUuid("FORM-6603375ED27B4D059CBB919C2BEFA44BZVOL")
-//                .searchFieldJson(JSON.toJSONString(UtilMap.map("textField_lvdosccc", "KP_2024120201435")))
+//                .searchFieldJson(JSON.toJSONString(UtilMap.map("textField_lvdosccc", "KP_2025112402589")))
                 .build());
 
         // 合同业务类型: 日保一次性与小业主一致

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

@@ -134,7 +134,7 @@ public class TimerServiceImpl implements TimerService {
                         }
                         //明细合计
                         currentRow.put("numberField_lryopn7o", UtilMap.getFloat(currentRow, "numberField_lrru2tnz") + UtilMap.getFloat(currentRow, "numberField_lrru2to0") + UtilMap.getFloat(currentRow, "numberField_lrru2to1"));
-                        currentRow.put("numberField_m1hhyqiv", UtilMap.getFloat(currentRow, "numberField_lrru2tnz") + UtilMap.getFloat(currentRow, "numberField_lrru2to0") + UtilMap.getFloat(currentRow, "numberField_lrru2to1"));
+//                        currentRow.put("numberField_m1hhyqiv", UtilMap.getFloat(currentRow, "numberField_lrru2tnz") + UtilMap.getFloat(currentRow, "numberField_lrru2to0") + UtilMap.getFloat(currentRow, "numberField_lrru2to1"));
 
                         price += UtilMap.getFloat(formData, "numberField_lutjev0u");
                         log.info("price, {}", price);
@@ -438,6 +438,9 @@ public class TimerServiceImpl implements TimerService {
                     " SUM( overhead ) overhead, " +
                     " SUM( corporate_income_tax ) corporate_income_tax, " +
                     " SUM( net_profit ) net_profit, " +
+                    " SUM( actual_work_hours ) actual_work_hours, " +
+                    " SUM( out_work_hours ) out_work_hours, " +
+                    " SUM( out_person_cost ) out_person_cost, " +
                     " CONCAT(ROUND(SUM( net_profit )/ SUM( income )*100,2),'%') net_margin  " +
                     "FROM " +
                     " lanyun_project_analysis  " +
@@ -461,6 +464,9 @@ public class TimerServiceImpl implements TimerService {
                     " SUM( overhead ) overhead, " +
                     " SUM( corporate_income_tax ) corporate_income_tax, " +
                     " SUM( net_profit ) net_profit, " +
+                    " SUM( actual_work_hours ) actual_work_hours, " +
+                    " SUM( out_work_hours ) out_work_hours, " +
+                    " SUM( out_person_cost ) out_person_cost, " +
                     " CONCAT(ROUND(SUM( net_profit )/ SUM( income )*100,2),'%') net_margin  " +
                     "FROM " +
                     " lanyun_project_analysis  " +
@@ -507,6 +513,9 @@ public class TimerServiceImpl implements TimerService {
                     "  overhead, " +
                     "  corporate_income_tax, " +
                     "  net_profit, " +
+                    "  actual_work_hours, " +
+                    "  out_work_hours, " +
+                    "  out_person_cost, " +
                     "  CONCAT(ROUND(net_margin*100,2),'%') net_margin  " +
                     "FROM " +
                     " lanyun_project_analysis " +
@@ -530,6 +539,9 @@ public class TimerServiceImpl implements TimerService {
                     " SUM( overhead ) overhead, " +
                     " SUM( corporate_income_tax ) corporate_income_tax, " +
                     " SUM( net_profit ) net_profit, " +
+                    " SUM( actual_work_hours ) actual_work_hours, " +
+                    " SUM( out_work_hours ) out_work_hours, " +
+                    " SUM( out_person_cost ) out_person_cost, " +
                     " CONCAT(ROUND(SUM( net_profit )/ SUM( income )*100,2),'%') net_margin " +
                     " FROM " +
                     " lanyun_project_analysis  " +
@@ -624,7 +636,8 @@ public class TimerServiceImpl implements TimerService {
                 String sql = "INSERT INTO `lanyun_project_analysis`(`project_name`, `belong_project`, `month`, " +
                         "`status`, `predict_income`, `open`, `income`, `person`, `person_cost`, `material`, `other_cost`, " +
                         "`cost_sum`, `taxes`, `gross_profit`, `gross_margin`, `overhead`, `corporate_income_tax`, `net_profit`, " +
-                        "`net_margin`, `format`, `customer_system`, `profit_loss`, `approach_date`, `level`, `notes`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);";
+                        "`net_margin`, `format`, `customer_system`, `profit_loss`, `approach_date`, `level`, `notes`," +
+                        "`actual_work_hours`, `out_work_hours`, `out_person_cost`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);";
 
                 ps = connection.prepareStatement(sql);
                 DecimalFormat df = new DecimalFormat("#.0000");
@@ -673,6 +686,9 @@ public class TimerServiceImpl implements TimerService {
                     ps.setObject(23,dataList.get(i).get("dateField_ji5yfvf"));
                     ps.setObject(24,dataList.get(i).get("textField_h2qx5nz"));
                     ps.setObject(25,dataList.get(i).get("textField_35paoph"));
+                    ps.setObject(26,dataList.get(i).get("numberField_midxu53t"));
+                    ps.setObject(27,dataList.get(i).get("numberField_midxu53v"));
+                    ps.setObject(28,dataList.get(i).get("numberField_midxu53w"));
                     ps.addBatch();
                     if (i%500==0){
                         ps.executeBatch();
@@ -1073,7 +1089,9 @@ public class TimerServiceImpl implements TimerService {
                     "`net_profit` = '"+ data.get("numberField_lz6mt3xr")+"', `net_margin` = '"+ data.get("numberField_lz9n3fma")+"', " +
                     "`format` = '"+ data.get("textField_tpb3m2f")+"', `customer_system` = '"+ data.get("textField_2adicsn")+"', `profit_loss` = '"+ data.get("textField_1yw4mx4")+"', " +
                     "`approach_date` = '"+ data.get("dateField_ji5yfvf")+"', " +
-                    "`level` = '"+ data.get("textField_h2qx5nz")+"', `notes` = '"+ data.get("textField_35paoph")+"'" +
+                    "`level` = '"+ data.get("textField_h2qx5nz")+"', `notes` = '"+ data.get("textField_35paoph")+"'," +
+                    "`actual_work_hours` = '"+ data.get("numberField_midxu53t")+"', `out_work_hours` = '"+ data.get("numberField_midxu53v")+"'," +
+                    "`out_person_cost` = '"+ data.get("numberField_midxu53w")+"'"+
                     " WHERE `project_name` = '"+ data.get("textField_dliiyul")+"' AND `month` = "+data.get("dateField_lcwv382")+";\n";
             PreparedStatement ps = connection.prepareStatement(updateSql);
             ps.executeUpdate();
@@ -1358,6 +1376,9 @@ public class TimerServiceImpl implements TimerService {
                     " SUM( overhead ) overhead, " +
                     " SUM( corporate_income_tax ) corporate_income_tax, " +
                     " SUM( net_profit ) net_profit, " +
+                    " SUM( actual_work_hours ) actual_work_hours, " +
+                    " SUM( out_work_hours ) out_work_hours, " +
+                    " SUM( out_person_cost ) out_person_cost, " +
                     " CONCAT(ROUND(SUM( net_profit )/ SUM( income )*100,2),'%') net_margin  " +
                     "FROM " +
                     " lanyun_project_analysis_copy1  " +
@@ -1381,6 +1402,9 @@ public class TimerServiceImpl implements TimerService {
                     " SUM( overhead ) overhead, " +
                     " SUM( corporate_income_tax ) corporate_income_tax, " +
                     " SUM( net_profit ) net_profit, " +
+                    " SUM( actual_work_hours ) actual_work_hours, " +
+                    " SUM( out_work_hours ) out_work_hours, " +
+                    " SUM( out_person_cost ) out_person_cost, " +
                     " CONCAT(ROUND(SUM( net_profit )/ SUM( income )*100,2),'%') net_margin  " +
                     "FROM " +
                     " lanyun_project_analysis_copy1  " +
@@ -1427,6 +1451,9 @@ public class TimerServiceImpl implements TimerService {
                     "  overhead, " +
                     "  corporate_income_tax, " +
                     "  net_profit, " +
+                    "  actual_work_hours, " +
+                    "  out_work_hours, " +
+                    "  out_person_cost, " +
                     "  CONCAT(ROUND(net_margin*100,2),'%') net_margin  " +
                     "FROM " +
                     " lanyun_project_analysis_copy1 " +
@@ -1450,6 +1477,9 @@ public class TimerServiceImpl implements TimerService {
                     " SUM( overhead ) overhead, " +
                     " SUM( corporate_income_tax ) corporate_income_tax, " +
                     " SUM( net_profit ) net_profit, " +
+                    " SUM( actual_work_hours ) actual_work_hours, " +
+                    " SUM( out_work_hours ) out_work_hours, " +
+                    " SUM( out_person_cost ) out_person_cost, " +
                     " CONCAT(ROUND(SUM( net_profit )/ SUM( income )*100,2),'%') net_margin " +
                     " FROM " +
                     " lanyun_project_analysis_copy1  " +
@@ -1546,6 +1576,9 @@ public class TimerServiceImpl implements TimerService {
                     " SUM( overhead ) overhead, " +
                     " SUM( corporate_income_tax ) corporate_income_tax, " +
                     " SUM( net_profit ) net_profit, " +
+                    " SUM( actual_work_hours ) actual_work_hours, " +
+                    " SUM( out_work_hours ) out_work_hours, " +
+                    " SUM( out_person_cost ) out_person_cost, " +
                     " CONCAT(ROUND(SUM( net_profit )/ SUM( income )*100,2),'%') net_margin  " +
                     "FROM " +
                     " lanyun_project_analysis_salary  " +
@@ -1569,6 +1602,9 @@ public class TimerServiceImpl implements TimerService {
                     " SUM( overhead ) overhead, " +
                     " SUM( corporate_income_tax ) corporate_income_tax, " +
                     " SUM( net_profit ) net_profit, " +
+                    " SUM( actual_work_hours ) actual_work_hours, " +
+                    " SUM( out_work_hours ) out_work_hours, " +
+                    " SUM( out_person_cost ) out_person_cost, " +
                     " CONCAT(ROUND(SUM( net_profit )/ SUM( income )*100,2),'%') net_margin  " +
                     "FROM " +
                     " lanyun_project_analysis_salary  " +
@@ -1615,6 +1651,9 @@ public class TimerServiceImpl implements TimerService {
                     "  overhead, " +
                     "  corporate_income_tax, " +
                     "  net_profit, " +
+                    "  actual_work_hours, " +
+                    "  out_work_hours, " +
+                    "  out_person_cost, " +
                     "  CONCAT(ROUND(net_margin*100,2),'%') net_margin  " +
                     "FROM " +
                     " lanyun_project_analysis_salary " +
@@ -1638,6 +1677,9 @@ public class TimerServiceImpl implements TimerService {
                     " SUM( overhead ) overhead, " +
                     " SUM( corporate_income_tax ) corporate_income_tax, " +
                     " SUM( net_profit ) net_profit, " +
+                    " SUM( actual_work_hours ) actual_work_hours, " +
+                    " SUM( out_work_hours ) out_work_hours, " +
+                    " SUM( out_person_cost ) out_person_cost, " +
                     " CONCAT(ROUND(SUM( net_profit )/ SUM( income )*100,2),'%') net_margin " +
                     " FROM " +
                     " lanyun_project_analysis_salary  " +
@@ -1974,6 +2016,9 @@ public class TimerServiceImpl implements TimerService {
                 "  profit_loss, " +
                 "  format, " +
                 "  customer_system, " +
+                "  actual_work_hours, " +
+                "  out_work_hours, " +
+                "  out_person_cost, " +
                 "  CONCAT(ROUND(net_margin*100,2),'%') net_margin  " +
                 "FROM " +
                 " lanyun_project_analysis_copy1 " +
@@ -2053,13 +2098,16 @@ public class TimerServiceImpl implements TimerService {
                 "\tAVG( overhead )*10000 overhead,\n" +
                 "\tAVG( corporate_income_tax )*10000 corporate_income_tax,\n" +
                 "\tAVG( net_profit )*10000 net_profit,\n" +
+                "\tAVG( actual_work_hours ) actual_work_hours,\n" +
+                "\tAVG( out_work_hours ) out_work_hours,\n" +
+                "\tAVG( out_person_cost ) out_person_cost,\n" +
                 "\tCONCAT( ROUND( SUM( net_profit )/ SUM( income )* 100, 2 ), '%' ) net_margin \n" +
                 "FROM\n" +
                 "\tlanyun_project_analysis\n" +
                 "\tWHERE 1=1 \n" +
                 "\tAND CAST(`month` AS CHAR) < '"+lastTime+"'\n" +
                 "\tAND CAST(`month` AS CHAR) >= '"+lastTimestamp.get(0)+"'\n" +
-                "\tAND project_name in "+names+"";
+                "\tAND belong_project in "+names+"";
 
         List<ProjectAnalysis> analysisList = jdbcTemplate.query(sql, new ProjectAnalysisMapper());
 
@@ -2106,11 +2154,12 @@ public class TimerServiceImpl implements TimerService {
                     .formInstanceId(data.get("formInstanceId").toString())
                     .useLatestVersion(true)
                     .updateFormDataJson(JSON.toJSONString(UtilMap.map("numberField_ly418zpc, numberField_ly418zq9, numberField_m60tn0xu, numberField_mi2jiyv5, numberField_mi2jiyvf",
-                            analysisList.get(0).getPersonCost(),analysisList.get(0).getMaterial(),analysisList.get(0).getFoldingRepair(),analysisList.get(0).getPredictIncome(),workHour[0] / months.size())))
+                            analysisList.get(0).getPersonCost(),analysisList.get(0).getMaterial(),analysisList.get(0).getFoldingRepair(),analysisList.get(0).getPredictIncome(),analysisList.get(0).getActualWorkHours())))
+//                    workHour[0] / months.size()
                     .build(), YDConf.FORM_OPERATION.update);
         }
         return UtilMap.map("numberField_ly418zpc, numberField_ly418zq9, numberField_m60tn0xu, numberField_mi2jiyv5, numberField_mi2jiyvf",
-                analysisList.get(0).getPersonCost(),analysisList.get(0).getMaterial(),analysisList.get(0).getFoldingRepair(),analysisList.get(0).getPredictIncome(),workHour[0] / months.size());
+                analysisList.get(0).getPersonCost(),analysisList.get(0).getMaterial(),analysisList.get(0).getFoldingRepair(),analysisList.get(0).getPredictIncome(),analysisList.get(0).getActualWorkHours());
 
     }
 
@@ -2212,6 +2261,9 @@ public class TimerServiceImpl implements TimerService {
                 "  net_profit," +
                 "  monthString," +
                 "  level, " +
+                "  actual_work_hours, " +
+                "  out_work_hours, " +
+                "  out_person_cost, " +
                 "  status, " +
                 "  profit_loss, " +
                 "  format, " +

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

@@ -18,9 +18,12 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -167,24 +170,47 @@ public class purchaseServiceImpl implements PurchaseService {
     @Override
     public void startPurchaseOrderNew(String formInstanceId) {
 
-        LocalDateTime firstDay = LocalDateTime.now().plusYears(-1).plusMonths(-11).withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0).withNano(0);
-        // 获取月份的最后一天
-        LocalDateTime lastDay =  LocalDateTime.now().plusYears(-1).plusMonths(1).withDayOfMonth(LocalDate.now().lengthOfMonth())
-                .withHour(23).withMinute(59).withSecond(59).withNano(999999999);
-        // 转换回时间戳
-        long firstDayTimestamp = firstDay.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
-        long lastDayTimestamp = lastDay.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
-
-        List<String> dateList = new ArrayList<>();
-        dateList.add(String.valueOf(firstDayTimestamp));
-        dateList.add(String.valueOf(lastDayTimestamp));
-        //项目点数据
+        Map formData = ydClient.queryData(YDParam.builder()
+                        .appType("APP_ERBDTFS82HOVBPL3NFH0")
+                        .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
+                        .formInstanceId(formInstanceId)
+                        .build(),
+                YDConf.FORM_QUERY.retrieve_id).getFormData();
+        List dateList = UtilMap.getList(formData, "cascadeDateField_miybkcsm");
+        long timestamp = Long.parseLong(dateList.get(1).toString());
+        // 转换为Instant，再转为LocalDateTime
+        LocalDateTime dateTime = LocalDateTime.ofInstant(
+                Instant.ofEpochMilli(timestamp),
+                ZoneId.systemDefault()
+        );
+        // 获取当月最后一天
+        LocalDateTime lastDay = dateTime.with(TemporalAdjusters.lastDayOfMonth());
+        dateList.add(1,lastDay.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
         List<Map> dataList = ydService.queryFormData_all(YDParam.builder()
                 .appType("APP_ERBDTFS82HOVBPL3NFH0")
                 .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
                 .formUuid("FORM-A8064C8333E24DEA88618D018DE0AE84WJPQ")
-                .searchFieldJson(JSON.toJSONString(UtilMap.map("dateField_ltxstp81",dateList)))
+                .searchFieldJson(JSON.toJSONString(UtilMap.map("dateField_ltxstp81, selectField_mgswtsqu", dateList,"是")))
                 .build());
+
+//        LocalDateTime firstDay = LocalDateTime.now().plusYears(-1).plusMonths(-11).withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0).withNano(0);
+//        // 获取月份的最后一天
+//        LocalDateTime lastDay =  LocalDateTime.now().plusYears(-1).plusMonths(1).withDayOfMonth(LocalDate.now().lengthOfMonth())
+//                .withHour(23).withMinute(59).withSecond(59).withNano(999999999);
+//        // 转换回时间戳
+//        long firstDayTimestamp = firstDay.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+//        long lastDayTimestamp = lastDay.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+//
+//        List<String> dateList = new ArrayList<>();
+//        dateList.add(String.valueOf(firstDayTimestamp));
+//        dateList.add(String.valueOf(lastDayTimestamp));
+//        //项目点数据
+//        List<Map> dataList = ydService.queryFormData_all(YDParam.builder()
+//                .appType("APP_ERBDTFS82HOVBPL3NFH0")
+//                .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
+//                .formUuid("FORM-A8064C8333E24DEA88618D018DE0AE84WJPQ")
+//                .searchFieldJson(JSON.toJSONString(UtilMap.map("dateField_ltxstp81, selectField_mgswtsqu",UtilMap.getList(formData,"cascadeDateField_miybkcsm"),"是")))
+//                .build());
         //过滤参与批量发起为否的数据
         dataList = dataList.stream().filter(map -> "是".equals(map.get("selectField_mgswtsqu")) && UtilMap.getInt(map,"numberField_ltxyjf0s") > 0).collect(Collectors.toList());
 
@@ -294,6 +320,7 @@ public class purchaseServiceImpl implements PurchaseService {
                                 cbzz[0] = UtilMap.getString(c,"textField_lus384vk");
                                 cbzz[1] = UtilMap.getString(c,"selectField_ltxstp89");
                                 extracted(totalCount, amountSum, tableList, c);
+                                successCount[0]++;
                             });
                         }
                         /*发起流程*/
@@ -302,11 +329,15 @@ public class purchaseServiceImpl implements PurchaseService {
                                 .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
                                 .formUuid("FORM-70F543E10887467188485B1E8AB3FFFDJUGK")
                                 .formDataJson(JSON.toJSONString(UtilMap.map("selectField_lr26l3h7, textField_lus384vk, selectField_lr26l3h8, " +
-                                                "textField_lr26l3hf, textField_lwg62y7o, numberField_lr26l3hq, numberField_lr26l3hr, tableField_ltxug6h1",
-                                        cbzz[1], cbzz[0], "物耗/配件", gys[0], gysAss, totalCount[0], amountSum[0], tableList)))
+                                                "textField_lr26l3hf, associationFormField_lr26l3he, textField_lwg62y7o, numberField_lr26l3hq, numberField_lr26l3hr, tableField_ltxug6h1, " +
+                                                "employeeField_lvz29gxt, textField_lvvs6x8v, textField_lw7sg8hq, textField_lw8we1wc, departmentSelectField_lxe98xep, employeeField_lr26l3h0, " +
+                                                "textField_luhs0cni",
+                                        cbzz[1], cbzz[0], "物耗/配件", gys[0], gysAss, UtilMap.getString(gysList.get(0),"textField_lrhgjspc"), totalCount[0], amountSum[0], tableList,
+                                        UtilMap.getString(gysList.get(0),"employeeField_lvz29gxt_id"), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM")), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM")),
+                                        LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy")), UtilMap.getString(formData,"departmentSelectField_mjchgs8l_id"), UtilMap.getString(formData,"employeeField_mhdgj164_id"),
+                                        UtilMap.getString(formData,"textField_mjchgs8n"))))
                                 .build(), YDConf.FORM_OPERATION.start);
 //                    }
-                    successCount[0]++;
                     } catch (Exception ex) {
                         errorCount[0]++;
                         ex.printStackTrace();

mjava/src/main/java/com/malk/server/aliwork/YDParam.java

@@ -69,6 +69,11 @@ public class YDParam extends BaseDto {
 
     // 修改结束时间, ppExt: 需要同时传递开始和就结束才会生效; 其次日期格式yyyy-MM-dd, 但默认是0点, 结束日期j建议加1
     private String modifiedToTimeGMT;
+    // 创建开始时间, ppExt: 需要同时传递开始和就结束才会生效; 其次日期格式yyyy-MM-dd, 但默认是0点, 结束日期j建议加1
+    private String createFromTimeGMT;
+
+    // 创建结束时间, ppExt: 需要同时传递开始和就结束才会生效; 其次日期格式yyyy-MM-dd, 但默认是0点, 结束日期j建议加1
+    private String createToTimeGMT;
 
     @NotNull(message = "实例ID不能为空", groups = {Update.class, Delete.class, Retrieve_FormInstId.class})
     private String formInstId;