健辉upsert精准匹配

mjava-jianhui/src/main/java/com/malk/jianhui/controller/JianhuiController.java

@@ -92,8 +92,8 @@ public class JianhuiController {
         return jianhuiService.syncInspectionOrder();
     }
 
-    //每天0点同步所有数据
-    @Scheduled(cron = "0 0 0 * * ?")
+    //每天1点同步所有数据
+    @Scheduled(cron = "0 0 1 * * ?")
     @GetMapping("/syncData")
     public McR syncData(){
         return jianhuiService.syncData();

mjava-jianhui/src/main/java/com/malk/jianhui/service/impl/JianhuiServiceImpl.java

@@ -10,6 +10,7 @@ import com.malk.jianhui.entity.*;
 import com.malk.jianhui.service.JianhuiService;
 import com.malk.server.aliwork.YDConf;
 import com.malk.server.aliwork.YDParam;
+import com.malk.server.aliwork.YDSearch;
 import com.malk.server.common.McR;
 import com.malk.server.dingtalk.DDConf;
 import com.malk.server.dingtalk.DDR_New;
@@ -369,7 +370,7 @@ public class JianhuiServiceImpl implements JianhuiService {
 
                 ydClient.operateData(YDParam.builder()
                         .formUuid("FORM-C3E9A165EEAB4232BD2F04F536E195D1WINH")
-                        .searchFieldJson(JSONObject.toJSONString(UtilMap.map("textField_m67c6m6f",customer.get("FNumber"))))
+                        .searchFieldJson(JSONObject.toJSONString(Arrays.asList(new YDSearch("textField_m67c6m6f",customer.get("FNumber"),"客户编码", YDSearch.Type.TEXT_FIELD,YDSearch.Operator.EQ))))
                         .formDataJson(JSONObject.toJSONString(formData))
                         .build(), YDConf.FORM_OPERATION.upsert);
 
@@ -440,7 +441,7 @@ public class JianhuiServiceImpl implements JianhuiService {
 
                 ydClient.operateData(YDParam.builder()
                         .formUuid("FORM-250CD995257D4CB08F99786E47D8D51BCUDP")
-                        .searchFieldJson(JSONObject.toJSONString(UtilMap.map("textField_m67pb4tn",operator.get("FNumber"))))
+                        .searchFieldJson(JSONObject.toJSONString(Arrays.asList(new YDSearch("textField_m67pb4tn",operator.get("FNumber"),"业务员编码", YDSearch.Type.TEXT_FIELD,YDSearch.Operator.EQ))))
                         .formDataJson(JSONObject.toJSONString(formData))
                         .build(), YDConf.FORM_OPERATION.upsert);
             }
@@ -472,10 +473,11 @@ public class JianhuiServiceImpl implements JianhuiService {
 
 //            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FModifyDate","39","2025-03-12 00:00:00","","","0"));//修改日期大于等于xx
 //            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FModifyDate","16","2025-03-14 00:00:00","","","0"));//修改日期小于等于xx
-//            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FCreateDate","39","2024-12-31 00:00:00","","","0"));//创建日期大于等于xx
-//            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FCreateDate","16","2025-01-01 00:00:00","","","0"));//创建日期小于等于xx
+//            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FCreateDate","39","2025-06-28 00:00:00","","","0"));//创建日期大于等于xx
+//            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FCreateDate","16","2025-07-07 00:00:00","","","0"));//创建日期小于等于xx
 //            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","39","2025-03-14 00:00:00","","","0"));//审核日期大于等于xx
 //            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FNumber","67","Y0070002","","","0"));//编码等于xx
+//            filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FNumber","17","0001","","","0"));//编码包含xx
 
 
             billQuery.setFilterString(filterString);
@@ -518,9 +520,10 @@ public class JianhuiServiceImpl implements JianhuiService {
                     formData.put("textField_m6ak641d",unitCode);//单位编码
                 }
 
+
                 ydClient.operateData(YDParam.builder()
                         .formUuid("FORM-2A5CAB7EB91D493AAFC90D8C7479A7F5KPR7")
-                        .searchFieldJson(JSONObject.toJSONString(UtilMap.map("textField_m6ak640v",material.get("FNumber"))))
+                        .searchFieldJson(JSONObject.toJSONString(Arrays.asList(new YDSearch("textField_m6ak640v",material.get("FNumber"),"编码", YDSearch.Type.TEXT_FIELD,YDSearch.Operator.EQ))))
                         .formDataJson(JSONObject.toJSONString(formData))
                         .build(), YDConf.FORM_OPERATION.upsert);
 
@@ -855,7 +858,7 @@ public class JianhuiServiceImpl implements JianhuiService {
 
                 ydClient.operateData(YDParam.builder()
                         .formUuid("FORM-1DAEA1675CAE47F49BE1F86A034D695191W1")
-                        .searchFieldJson(JSONObject.toJSONString(UtilMap.map("textField_m6yuw4iw",operator.get("FNumber"))))
+                        .searchFieldJson(JSONObject.toJSONString(Arrays.asList(new YDSearch("textField_m6yuw4iw",operator.get("FNumber"),"编码", YDSearch.Type.TEXT_FIELD,YDSearch.Operator.EQ))))
                         .formDataJson(JSONObject.toJSONString(formData))
                         .build(), YDConf.FORM_OPERATION.upsert);
             }

mjava-jianhui/src/main/resources/application-dev.yml

@@ -8,7 +8,7 @@ enable:
   scheduling: false
 logging:
   config: classpath:logback-spring.xml
-  path: /home/server/jianhui/log/
+  path: d:\\jianhui_cloudpure\logs\
   level:
     com.malk.*: debug
 

mjava-jianhui/src/main/resources/application-prod.yml

@@ -8,7 +8,7 @@ enable:
   scheduling: false
 logging:
   config: classpath:logback-spring.xml
-  path: /home/server/jianhui/log/
+  path: d:\\jianhui_cloudpure\logs\
   level:
     com.malk.*: INFO
 

mjava-jianhui/src/main/resources/logback-spring.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false" scanPeriod="60 seconds">
-    <springProperty scope="context" name="LOG_HOME" source="logging.path" defaultValue="/home/server/log/"/>
+    <springProperty scope="context" name="LOG_HOME" source="logging.path" defaultValue="d:\\jianhui_cloudpure\logs\"/>
     <property name="FileNamePattern" value="${LOG_HOME}%d{yyyyMM}/%d{dd}"/>
 
     <!-- 定义控制台输出 -->