1.6代码提交

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdDeliveryServiceImpl.java

@@ -16,6 +16,7 @@ import com.malk.server.aliwork.YDParam;
 import com.malk.server.dingtalk.DDR_New;
 import com.malk.service.aliwork.YDClient;
 import com.malk.utils.UtilMap;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +31,7 @@ import java.util.*;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author LQY
@@ -44,6 +45,7 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
     private KdYdDeliveryMapper kdYdDeliveryMapper;
     @Autowired
     private KdYdDeliveryDetailMapper kdYdDeliveryDetailMapper;
+
     @Override
     public void insertDelivery(Map map) {
         MDC.put("MDC_KEY_PID", "1003");
@@ -70,8 +72,8 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
         String kh = UtilMap.getString(formData, "textField_mejnamf2");
         String jsbb = UtilMap.getString(formData, "selectField_mg3fuqvn");
         String djbh = UtilMap.getString(formData, "serialNumberField_mheazm7w");
-        if("2".equals(type)){
-             djbh = UtilMap.getString(formData, "textField_miwwha1a");
+        if ("2".equals(type)) {
+            djbh = UtilMap.getString(formData, "textField_miwwha1a");
         }
         String xsbm = UtilMap.getString(formData, "textField_krnn5bmr");
 //        String xsy = UtilMap.getString(formData, "employeeField_mejowmng").replace("[\"", "").replace("\"]", "").trim();
@@ -120,7 +122,7 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
         }
 
         Long id = kdYdDelivery.getId();
-        System.out.println("id:"+id);
+        System.out.println("id:" + id);
 //        int count = 1;
         for (Map item : tableField) {
             String wlbm = safeGetString(item, "textField_mejnamff");
@@ -258,15 +260,14 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
             // 2. 添加需要特殊处理的主表字段
             updateMap.put("associationFormField_mejmml36", sealjsonlist);
 //            updateMap.put("associationFormField_mfavc4ve", khjsonlist);
-            updateMap.put("associationFormField_mk0gzflu", Arrays.asList(getfhdAss(fhtzd,formInstId)));
+            updateMap.put("associationFormField_mk0gzflu", Arrays.asList(getfhdAss(fhtzd, formInstId)));
             updateMap.put("employeeField_krbgloal", sqr);
             updateMap.put("employeeField_mejnamf3", xsy);
             updateMap.put("textField_mjzk47so", fhtzd);
-
             // 3. 添加处理后的子表数据
             updateMap.put("tableField_mejnamfd", newSubTable);
             String sqrid = sqr.substring(2, sqr.length() - 2);
-            System.out.println("sqrid=="+sqrid);
+            System.out.println("sqrid==" + sqrid);
             // 创建新表单实例
             try {
                 ydClient.operateData(
@@ -319,6 +320,7 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
             return null;
         }
     }
+
     private static int parseInt(String str, int defaultValue) {
         if (str == null || str.trim().isEmpty()) {
             return defaultValue;
@@ -329,10 +331,12 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
             return defaultValue;
         }
     }
+
     private String safeGetString(Map formData, String key) {
         Object val = formData.get(key);
         return val == null ? "" : String.valueOf(val);
     }
+
     public static BigDecimal toBigDecimal(String str) {
         if (str == null || str.trim().isEmpty()) {
             return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);

mjava-huagao/src/main/java/com/malk/huagao/service/impl/YdHuaGaoServiceImpl.java

@@ -407,7 +407,7 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
 
                     List<Map> ddlist = (List<Map>) ydClient.queryData(
                             YDParam.builder()
-                                    .formUuid("FORM-A7F03ACEE01D4F609550C86BF7FE87D35M6I")
+                                    .formUuid("FORM-FAE2575E112644ED914CAB4FEC9309F32AVR")
                                     .appType("APP_VQDMMWS6OR1VHL8VMFD3")
                                     .systemToken("XE766X81JHKXK4Z27SYOI86CPCLQ3J1LV7ODMH2")
                                     .searchCondition(JSON.toJSONString(UtilMap.map("serialNumberField_mheazm7w", deliveryId)))
@@ -442,7 +442,7 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
                 updateMap.put("tableField_mips137b", tableListxlh);
                 if (fhdbh != null && fhdformInstanceId != null) {
                     updateMap.put("associationFormField_mejmml36",
-                            Arrays.asList(getfhdAss(fhdbh, fhdformInstanceId)));
+                            Arrays.asList(getfhdAss(fhdformInstanceId,fhdbh)));
                 }
                 updateMap.put("dateField_krbgloam", kdYdOutbound.getDateTime() != null ? String.valueOf(kdYdOutbound.getDateTime().atZone(java.time.ZoneId.systemDefault()).toInstant().toEpochMilli()) : "");
                 updateMap.put("textField_krnn5bmr", kdYdOutbound.getXsDept());
@@ -1475,15 +1475,15 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
                     List<Map<String, Object>> ddlist = (List<Map<String, Object>>) ydClient.queryData(
                             YDParam.builder()
                                     .formUuid("FORM-B62CAE3075CE4098B17BB86C90FFA21C9B7C")
-                                    .searchCondition(JSON.toJSONString(UtilMap.map("serialNumberField_mheazm7w", fhtzdbh)))
+                                    .searchCondition(JSON.toJSONString(UtilMap.map("textField_mjs6fuwo", xsddbh)))
                                     .build(),
                             YDConf.FORM_QUERY.retrieve_list_all
                     ).getData();
 
                     List<Map<String, Object>> fhdlist = (List<Map<String, Object>>) ydClient.queryData(
                             YDParam.builder()
-                                    .formUuid("FORM-A7F03ACEE01D4F609550C86BF7FE87D35M6I")
-                                    .searchCondition(JSON.toJSONString(UtilMap.map("textField_mjs6fuwo", xsddbh)))
+                                    .formUuid("FORM-FAE2575E112644ED914CAB4FEC9309F32AVR")
+                                    .searchCondition(JSON.toJSONString(UtilMap.map("serialNumberField_mheazm7w", fhtzdbh)))
                                     .build(),
                             YDConf.FORM_QUERY.retrieve_list_all
                     ).getData();