feature 代码提交

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC101ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC101ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC102ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC102ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC103ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC103ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC104ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC104ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC105ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC105ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC106ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC106ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC107ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC107ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC108ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC108ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC109ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC109ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC110ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC110ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC111ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC111ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id, String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC112ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC112ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC113ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC113ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC114ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC114ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC115ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC115ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC116ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC116ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC117ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC117ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC118ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC118ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC119ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC119ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC120ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC120ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC121ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC121ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC122ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC122ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC123ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC123ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC124ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC124ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC125ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC125ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC126ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC126ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC127ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC127ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC128ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC128ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC129ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC129ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC130ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC130ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC131ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC131ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC132ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC132ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC133ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC133ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC135ApiRequestAndProcessing.java

@@ -1,11 +1,15 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.impl.JtZjfjflqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtZjfjflqd;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
 import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.base.exception.CustomException;
+import com.rongwei.rwcommon.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -14,7 +18,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -24,16 +28,29 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePatte
  */
 @Component
 public class KC135ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtZjfjflqdServiceImpl jtZjfjflqdService;
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC135ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtZjfjflqdServiceImpl jtZjfjflqdService) {
+        KC135ApiRequestAndProcessing.jtZjfjflqdService = jtZjfjflqdService;
+    }
 
     @Override
-    public Map<String, Object> assembleData(String id,String dataId,String code) {
+    public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
+        assembleData.add(setOrdinaryDate("INDEXID", JtZjfjflqd::getIndexid));
+        assembleData.add(setOrdinaryDate("DATAID", JtZjfjflqd::getDataid));
+        assembleData.add(setOrdinaryDate("zjxm", JtZjfjflqd::getZjxm));
+        assembleData.add(setOrdinaryDate("zjdj", JtZjfjflqd::getZjdj));
+        assembleData.add(setOrdinaryDate("zjfl", JtZjfjflqd::getZjfl));
+        assembleData.add(setOrdinaryDate("sfwxxywzj", JtZjfjflqd::getSfwxxywzj));
+        JtZjfjflqd jtGsjtbsj = jtZjfjflqdService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
         return stringObjectMap;
     }
@@ -45,6 +62,13 @@ public class KC135ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
+        Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
+        String realDataId = apiReturnData.getOrDefault("DATAID", "").toString();
+        if (StringUtils.isBlank(realDataId)) {
+            throw new CustomException("接口请求成功,但无法获取dataId");
+        }
+        jtZjfjflqdService.update(new LambdaUpdateWrapper<JtZjfjflqd>()
+                .eq(JtZjfjflqd::getId, id).set(JtZjfjflqd::getDataid, realDataId));
         return R.ok();
     }
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC136ApiRequestAndProcessing.java

@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -42,7 +42,7 @@ public class KC136ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC137ApiRequestAndProcessing.java

@@ -1,11 +1,16 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.impl.JtJscgpyqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtJscgpyqd;
+import com.rongwei.bsentity.domain.JtZjfjflqd;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
 import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.base.exception.CustomException;
+import com.rongwei.rwcommon.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -13,8 +18,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.*;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
 
 /**
  * AssembleK34ApiData class
@@ -24,16 +29,29 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePatte
  */
 @Component
 public class KC137ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtJscgpyqdServiceImpl jtJscgpyqdService;
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC137ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtJscgpyqdServiceImpl jtJscgpyqdService) {
+        KC137ApiRequestAndProcessing.jtJscgpyqdService = jtJscgpyqdService;
+    }
 
     @Override
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
+        assembleData.add(setOrdinaryDate("INDEXID", JtJscgpyqd::getIndexid));
+        assembleData.add(setOrdinaryDate("DATAID", JtJscgpyqd::getDataid));
+        assembleData.add(setOrdinaryDate("cgpyhdmc", JtJscgpyqd::getCgpyhdmc));
+        assembleData.add(setOrdinaryDate("pyfl", JtJscgpyqd::getPyfl));
+        assembleData.add(setDatePattern("kzsj", JtJscgpyqd::getKzsj,DATE_PATTERN_YMD));
+        assembleData.add(setFileInfo("zmwjtzgg", JtJscgpyqd::getZmwjtzgg,true));
+        JtJscgpyqd jtGsjtbsj = jtJscgpyqdService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
         return stringObjectMap;
     }
@@ -45,6 +63,13 @@ public class KC137ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
+        Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
+        String realDataId = apiReturnData.getOrDefault("DATAID", "").toString();
+        if (StringUtils.isBlank(realDataId)) {
+            throw new CustomException("接口请求成功,但无法获取dataId");
+        }
+        jtJscgpyqdService.update(new LambdaUpdateWrapper<JtJscgpyqd>()
+                .eq(JtJscgpyqd::getId, id).set(JtJscgpyqd::getDataid, realDataId));
         return R.ok();
     }
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC138ApiRequestAndProcessing.java

@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -42,7 +42,7 @@ public class KC138ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC139ApiRequestAndProcessing.java

@@ -1,11 +1,15 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.impl.JtYxwjfbqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtYxwjfbqd;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
 import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.base.exception.CustomException;
+import com.rongwei.rwcommon.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -13,8 +17,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.*;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
 
 /**
  * AssembleK34ApiData class
@@ -24,16 +28,28 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePatte
  */
 @Component
 public class KC139ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtYxwjfbqdServiceImpl jtYxwjfbqdService;
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC139ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtYxwjfbqdServiceImpl jtYxwjfbqdService) {
+        KC139ApiRequestAndProcessing.jtYxwjfbqdService = jtYxwjfbqdService;
+    }
 
     @Override
-    public Map<String, Object> assembleData(String id,String dataId,String code) {
+    public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
+        assembleData.add(setOrdinaryDate("INDEXID", JtYxwjfbqd::getIndexid));
+        assembleData.add(setOrdinaryDate("DATAID", JtYxwjfbqd::getDataid));
+        assembleData.add(setOrdinaryDate("fbwjmc", JtYxwjfbqd::getFbwjmc));
+        assembleData.add(setOrdinaryDate("wjlb", JtYxwjfbqd::getWjlb));
+        assembleData.add(setDatePattern("fbsj", JtYxwjfbqd::getFbsj, DATE_PATTERN_YMD));
+        JtYxwjfbqd jtGsjtbsj = jtYxwjfbqdService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
         return stringObjectMap;
     }
@@ -45,6 +61,12 @@ public class KC139ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
+        Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
+        String realDataId = apiReturnData.getOrDefault("DATAID", "").toString();
+        if (StringUtils.isBlank(realDataId)) {
+            throw new CustomException("接口请求成功,但无法获取dataId");
+        }
+        jtYxwjfbqdService.update(new LambdaUpdateWrapper<JtYxwjfbqd>().eq(JtYxwjfbqd::getId, id).set(JtYxwjfbqd::getDataid, realDataId));
         return R.ok();
     }
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC140ApiRequestAndProcessing.java

@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -42,7 +42,7 @@ public class KC140ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC141ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC141ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC142ApiRequestAndProcessing.java

@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -42,7 +42,7 @@ public class KC142ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC143ApiRequestAndProcessing.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -31,7 +31,7 @@ public class KC143ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC144ApiRequestAndProcessing.java

@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -42,7 +42,7 @@ public class KC144ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/utils/ApiDataOrgUtil.java

@@ -97,7 +97,7 @@ public class ApiDataOrgUtil {
         return renturnObj;
     }
 
-    public static <T> OrgApiDataConfigDTO setOrdinaryDatePattern(String key, Function<T, Object> getDataFunction) {
+    public static <T> OrgApiDataConfigDTO setOrdinaryDate(String key, Function<T, Object> getDataFunction) {
         OrgApiDataConfigDTO excelFieldDescDTO = new OrgApiDataConfigDTO();
         excelFieldDescDTO.setKey(key);
         excelFieldDescDTO.setDataFunction(getDataFunction);