1

mjava-aiwei/src/main/java/com/malk/aiwei/service/impl/AWImplClient.java

@@ -1841,7 +1841,10 @@ public class AWImplClient implements AWClint {
                     errmsg = errmsg + "需求编号于父需求编号不能相同；";
                 }
                 dataList.get(i).put("selectField_lr4y2xcj",cj + "级");
-                dataList.get(i).put("multiSelectField_lw678e43_str",JSONObject.toJSONString(item.get("multiSelectField_lw678e43")));
+                if(String.valueOf(item.get("multiSelectField_lw678e43")).length()>0){
+                    List multi=UtilMap.getList(item,"multiSelectField_lw678e43");
+                    dataList.get(i).put("multiSelectField_lw678e43_str",multi==null||multi.size()<1?"":String.join(",",multi));
+                }
             }
             if(errmsg!=""){
                 dataList.get(i).put("result",errmsg);
@@ -1866,11 +1869,11 @@ public class AWImplClient implements AWClint {
                     dataList.get(i).put("selectField_lr4y2xcj",level + "级");
                     // 根据层级查询序号
                     String noNew="";
-                    Map reMap=getMaxValue(list,level + "级",category);
                     // 处理结果
                     if(level>1){
                         fno=getCodeNo(categoryNew,noCP(UtilMap.getString(item,"textField_m0afm8pd"), categoryNew));
                     }
+                    Map reMap=getMaxValue(list,level + "级",category,fno);
                     if(reMap!=null){
                         String id=UtilMap.getString(reMap,"id");
                         noNew=incrementLastPart(id);
@@ -1888,6 +1891,7 @@ public class AWImplClient implements AWClint {
                     mapNew.put("radioField_lroozhse","是");
                     mapNew.put("textField_m0m3dyk4",fno);
                     mapNew.put("textField_lyqpt99s",codeNo);
+                    mapNew.put("radioField_m0ow50wn","是"); // 是否草稿
                     String id=(String) ydClient.operateData(YDParam.builder().appType("APP_YQY0OH7953OKBTM57PLL")
                             .systemToken("PGC66MB1H2RLXMFQ7XKW4BC3BDFJ2UDM909XL18")
                             .formUuid("FORM-7A52930D0E834522AD65A4CFE2C0818F1KQO")
@@ -1938,11 +1942,12 @@ public class AWImplClient implements AWClint {
         return category+paddedBeforeDot + afterDot;
     }
 
-    private Map getMaxValue(List<Map> list, String level, String category){
+    private Map getMaxValue(List<Map> list, String level, String category,String fno){
         // 查找符合条件的最大 id
         List<Map> list1=list.stream()
-                .filter(map -> UtilMap.getString(map, "selectField_lr4y2xcj").equals(level))
-                .filter(map -> UtilMap.getString(map, "selectField_lronu2g3").equals(category)).collect(Collectors.toList());
+                .filter(map -> UtilMap.getString(map, "selectField_lr4y2xcj").equals(level)) // 层级
+                .filter(map -> UtilMap.getString(map, "textField_lt2d2x79").contains(fno)) // 父编号查询编号
+                .filter(map -> UtilMap.getString(map, "selectField_lronu2g3").equals(category)).collect(Collectors.toList()); // 前缀
         Optional<Map> maxMap = list1.stream()
                 .max(Comparator.comparing(map -> UtilMap.getString(map,"id")));
         return maxMap.orElse(null);