feature 代码提交

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

@@ -42,8 +42,8 @@ public class KC101ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
-        assembleData.add(setOrdinaryDate("INDEXID", JtGsjtbsj::getId));
+        assembleData.add(setOrdinaryData("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryData("INDEXID", JtGsjtbsj::getId));
         /*******************附件*********************/
         assembleData.add(setFileInfo("jschfjglzd", JtGsjtbsj::getJschfjglzd, true));
         assembleData.add(setFileInfo("kcsjmbbxzn", JtGsjtbsj::getKcsjmbbxzn, true));
@@ -69,29 +69,29 @@ public class KC101ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         assembleData.add(setFileInfo("cgzhqdfbwj", JtGsjtbsj::getCgzhqdfbwj, true));
         assembleData.add(setFileInfo("zgcsrmwjhtwj", JtGsjtbsj::getZgcsrmwjhtwj, true));
         /******************说明**************************/
-        assembleData.add(setOrdinaryDate("jschfjglzdwzsm", JtGsjtbsj::getJschfjglzdwzsm));
-        assembleData.add(setOrdinaryDate("kcsjmbbxznwzsm", JtGsjtbsj::getKcsjmbbxznwzsm));
-        assembleData.add(setOrdinaryDate("gzdgzdsmbbxznwzsm", JtGsjtbsj::getGzdgzdsmbbxznwzsm));
-        assembleData.add(setOrdinaryDate("ztfapslcfjflzdwzsm", JtGsjtbsj::getZtfapslcfjflzdwzsm));
-        assembleData.add(setOrdinaryDate("yjbhglwzsm", JtGsjtbsj::getYjbhglwzsm));
-        assembleData.add(setOrdinaryDate("glhgxlcfjflzdwzsm", JtGsjtbsj::getGlhgxlcfjflzdwzsm));
-        assembleData.add(setOrdinaryDate("wtbhglwzsm", JtGsjtbsj::getWtbhglwzsm));
-        assembleData.add(setOrdinaryDate("scbhglwzsm", JtGsjtbsj::getScbhglwzsm));
-        assembleData.add(setOrdinaryDate("epcfaschgxwzsm", JtGsjtbsj::getEpcfaschgxwzsm));
-        assembleData.add(setOrdinaryDate("sjjdkzmwzsm", JtGsjtbsj::getSjjdkzmwzsm));
-        assembleData.add(setOrdinaryDate("bgglzdwzsm", JtGsjtbsj::getBgglzdwzsm));
-        assembleData.add(setOrdinaryDate("ndjhwzsm", JtGsjtbsj::getNdjhwzsm));
-        assembleData.add(setOrdinaryDate("szhgzmbwzsm", JtGsjtbsj::getSzhgzmbwzsm));
-        assembleData.add(setOrdinaryDate("zyywcpszhfgl", JtGsjtbsj::getZyywcpszhfgl));
-        assembleData.add(setOrdinaryDate("rjxtsjwzsm", JtGsjtbsj::getRjxtsjwzsm));
-        assembleData.add(setOrdinaryDate("ssdwfysl", JtGsjtbsj::getSsdwfysl));
-        assembleData.add(setOrdinaryDate("xcjhwzsm", JtGsjtbsj::getXcjhwzsm));
-        assembleData.add(setOrdinaryDate("zjfjflglzdwzsm", JtGsjtbsj::getZjfjflglzdwzsm));
-        assembleData.add(setOrdinaryDate("zjzr", JtGsjtbsj::getZjzr));
-        assembleData.add(setOrdinaryDate("bndkhsjdwsl", JtGsjtbsj::getBndkhsjdwsl));
-        assembleData.add(setOrdinaryDate("ssdwjsglkhwzsm", JtGsjtbsj::getSsdwjsglkhwzsm));
-        assembleData.add(setOrdinaryDate("cgzlgdfjflglzdwzsm", JtGsjtbsj::getJszlgdfjflglzdwzsm));
-        assembleData.add(setOrdinaryDate("zgcsrmwjhtwjwzsm", JtGsjtbsj::getZgcsrmwjhtwjwzsm));
+        assembleData.add(setOrdinaryData("jschfjglzdwzsm", JtGsjtbsj::getJschfjglzdwzsm));
+        assembleData.add(setOrdinaryData("kcsjmbbxznwzsm", JtGsjtbsj::getKcsjmbbxznwzsm));
+        assembleData.add(setOrdinaryData("gzdgzdsmbbxznwzsm", JtGsjtbsj::getGzdgzdsmbbxznwzsm));
+        assembleData.add(setOrdinaryData("ztfapslcfjflzdwzsm", JtGsjtbsj::getZtfapslcfjflzdwzsm));
+        assembleData.add(setOrdinaryData("yjbhglwzsm", JtGsjtbsj::getYjbhglwzsm));
+        assembleData.add(setOrdinaryData("glhgxlcfjflzdwzsm", JtGsjtbsj::getGlhgxlcfjflzdwzsm));
+        assembleData.add(setOrdinaryData("wtbhglwzsm", JtGsjtbsj::getWtbhglwzsm));
+        assembleData.add(setOrdinaryData("scbhglwzsm", JtGsjtbsj::getScbhglwzsm));
+        assembleData.add(setOrdinaryData("epcfaschgxwzsm", JtGsjtbsj::getEpcfaschgxwzsm));
+        assembleData.add(setOrdinaryData("sjjdkzmwzsm", JtGsjtbsj::getSjjdkzmwzsm));
+        assembleData.add(setOrdinaryData("bgglzdwzsm", JtGsjtbsj::getBgglzdwzsm));
+        assembleData.add(setOrdinaryData("ndjhwzsm", JtGsjtbsj::getNdjhwzsm));
+        assembleData.add(setOrdinaryData("szhgzmbwzsm", JtGsjtbsj::getSzhgzmbwzsm));
+        assembleData.add(setOrdinaryData("zyywcpszhfgl", JtGsjtbsj::getZyywcpszhfgl));
+        assembleData.add(setOrdinaryData("rjxtsjwzsm", JtGsjtbsj::getRjxtsjwzsm));
+        assembleData.add(setOrdinaryData("ssdwfysl", JtGsjtbsj::getSsdwfysl));
+        assembleData.add(setOrdinaryData("xcjhwzsm", JtGsjtbsj::getXcjhwzsm));
+        assembleData.add(setOrdinaryData("zjfjflglzdwzsm", JtGsjtbsj::getZjfjflglzdwzsm));
+        assembleData.add(setOrdinaryData("zjzr", JtGsjtbsj::getZjzr));
+        assembleData.add(setOrdinaryData("bndkhsjdwsl", JtGsjtbsj::getBndkhsjdwsl));
+        assembleData.add(setOrdinaryData("ssdwjsglkhwzsm", JtGsjtbsj::getSsdwjsglkhwzsm));
+        assembleData.add(setOrdinaryData("cgzlgdfjflglzdwzsm", JtGsjtbsj::getJszlgdfjflglzdwzsm));
+        assembleData.add(setOrdinaryData("zgcsrmwjhtwjwzsm", JtGsjtbsj::getZgcsrmwjhtwjwzsm));
         JtGsjtbsj jtGsjtbsj = jtGsjtbsjService.getById(id);
         return assembleApiData(jtGsjtbsj, assembleData);
     }

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtFjglxmServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtFjglxm;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
@@ -43,16 +42,16 @@ public class KC103ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id, String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("DATAID", JtFjglxm::getDataid));
-        assembleData.add(setOrdinaryDate("INDEXID", JtFjglxm::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtFjglxm::getXmzsjbm));
-        assembleData.add(setOrdinaryDate("xmmc", JtFjglxm::getXmmc));
-        assembleData.add(setOrdinaryDate("zbzt", JtFjglxm::getZbztdw));
-        assembleData.add(setOrdinaryDate("zbztdj", JtFjglxm::getZbztdj));
-        assembleData.add(setOrdinaryDate("xmdw", JtFjglxm::getXmdw));
-        assembleData.add(setOrdinaryDate("sfsyxxywxm", JtFjglxm::getSfxxyw));
-        assembleData.add(setOrdinaryDate("sfzdxm", JtFjglxm::getSfzdxm));
-        assembleData.add(setOrdinaryDate("zfsjsggl", JtFjglxm::getSfsjsggl));
+        assembleData.add(setOrdinaryData("DATAID", JtFjglxm::getDataid));
+        assembleData.add(setOrdinaryData("INDEXID", JtFjglxm::getId));
+        assembleData.add(setOrdinaryData("xmbh", JtFjglxm::getXmzsjbm));
+        assembleData.add(setOrdinaryData("xmmc", JtFjglxm::getXmmc));
+        assembleData.add(setOrdinaryData("zbzt", JtFjglxm::getZbztdw));
+        assembleData.add(setOrdinaryData("zbztdj", JtFjglxm::getZbztdj));
+        assembleData.add(setOrdinaryData("xmdw", JtFjglxm::getXmdw));
+        assembleData.add(setOrdinaryData("sfsyxxywxm", JtFjglxm::getSfxxyw));
+        assembleData.add(setOrdinaryData("sfzdxm", JtFjglxm::getSfzdxm));
+        assembleData.add(setOrdinaryData("zfsjsggl", JtFjglxm::getSfsjsggl));
         assembleData.add(setDatePattern("jhkssj", JtFjglxm::getJhkssj, DATE_PATTERN_YMD));
         assembleData.add(setDatePattern("jhwcsj", JtFjglxm::getJhwcsj, DATE_PATTERN_YMD));
         assembleData.add(setDatePattern("cgzljhgdsj", JtFjglxm::getCgzljhgdsj, DATE_PATTERN_YMD));

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

@@ -3,14 +3,11 @@ package com.rongwei.bscommon.sys.strategy.api;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtKcsjxmServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtFjglxm;
 import com.rongwei.bsentity.domain.JtKcsjxm;
 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;
 
@@ -45,15 +42,15 @@ public class KC105ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id, String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("DATAID", JtKcsjxm::getDataid));
-        assembleData.add(setOrdinaryDate("INDEXID", JtKcsjxm::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtKcsjxm::getXmzsjbm));
-        assembleData.add(setOrdinaryDate("xmmc", JtKcsjxm::getXmmc));
-        assembleData.add(setOrdinaryDate("qdbh", JtKcsjxm::getQdbh));
-        assembleData.add(setOrdinaryDate("qdmc", JtKcsjxm::getQdmc));
-        assembleData.add(setOrdinaryDate("rwhjbh", JtKcsjxm::getRwhjbh));
-        assembleData.add(setOrdinaryDate("rwhjmc", JtKcsjxm::getRwhjmc));
-        assembleData.add(setOrdinaryDate("rwhjzrr", JtKcsjxm::getRwhjzrr));
+        assembleData.add(setOrdinaryData("DATAID", JtKcsjxm::getDataid));
+        assembleData.add(setOrdinaryData("INDEXID", JtKcsjxm::getId));
+        assembleData.add(setOrdinaryData("xmbh", JtKcsjxm::getXmzsjbm));
+        assembleData.add(setOrdinaryData("xmmc", JtKcsjxm::getXmmc));
+        assembleData.add(setOrdinaryData("qdbh", JtKcsjxm::getQdbh));
+        assembleData.add(setOrdinaryData("qdmc", JtKcsjxm::getQdmc));
+        assembleData.add(setOrdinaryData("rwhjbh", JtKcsjxm::getRwhjbh));
+        assembleData.add(setOrdinaryData("rwhjmc", JtKcsjxm::getRwhjmc));
+        assembleData.add(setOrdinaryData("rwhjzrr", JtKcsjxm::getRwhjzrr));
         assembleData.add(setDatePattern("hjjhwcsj", JtKcsjxm::getHjjhwcsj, DATE_PATTERN_YMD));
         JtKcsjxm jtKcsjxm = jtKcsjxmService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtKcsjxm, assembleData);

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

@@ -3,15 +3,11 @@ package com.rongwei.bscommon.sys.strategy.api;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtGzdgServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.domain.JtGzdg;
-import com.rongwei.bsentity.domain.JtKcsjxm;
 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;
 
@@ -46,12 +42,12 @@ public class KC107ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id, String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("DATAID", JtGzdg::getDataid));
-        assembleData.add(setOrdinaryDate("INDEXID", JtGzdg::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtGzdg::getXmzsjbm));
-        assembleData.add(setOrdinaryDate("xmmc", JtGzdg::getXmmc));
-        assembleData.add(setOrdinaryDate("lx", JtGzdg::getType));
-        assembleData.add(setOrdinaryDate("sdzrr", JtGzdg::getSdzrr));
+        assembleData.add(setOrdinaryData("DATAID", JtGzdg::getDataid));
+        assembleData.add(setOrdinaryData("INDEXID", JtGzdg::getId));
+        assembleData.add(setOrdinaryData("xmbh", JtGzdg::getXmzsjbm));
+        assembleData.add(setOrdinaryData("xmmc", JtGzdg::getXmmc));
+        assembleData.add(setOrdinaryData("lx", JtGzdg::getType));
+        assembleData.add(setOrdinaryData("sdzrr", JtGzdg::getSdzrr));
         assembleData.add(setDatePattern("sdsj", JtGzdg::getSdsj, DATE_PATTERN_YMD));
         JtGzdg jkCompanyAssessment = jtGzdgService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jkCompanyAssessment, assembleData);

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

@@ -3,14 +3,11 @@ package com.rongwei.bscommon.sys.strategy.api;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtZtfapsServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGzdg;
 import com.rongwei.bsentity.domain.JtZtfaps;
 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;
 
@@ -45,13 +42,13 @@ public class KC109ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id, String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("DATAID", JtZtfaps::getDataid));
-        assembleData.add(setOrdinaryDate("INDEXID", JtZtfaps::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtZtfaps::getXmzsjbm));
-        assembleData.add(setOrdinaryDate("xmmc", JtZtfaps::getXmmc));
-        assembleData.add(setOrdinaryDate("fabh", JtZtfaps::getFabh));
-        assembleData.add(setOrdinaryDate("famc", JtZtfaps::getFamc));
-        assembleData.add(setOrdinaryDate("lzpswjzrr", JtZtfaps::getLzpswjzrr));
+        assembleData.add(setOrdinaryData("DATAID", JtZtfaps::getDataid));
+        assembleData.add(setOrdinaryData("INDEXID", JtZtfaps::getId));
+        assembleData.add(setOrdinaryData("xmbh", JtZtfaps::getXmzsjbm));
+        assembleData.add(setOrdinaryData("xmmc", JtZtfaps::getXmmc));
+        assembleData.add(setOrdinaryData("fabh", JtZtfaps::getFabh));
+        assembleData.add(setOrdinaryData("famc", JtZtfaps::getFamc));
+        assembleData.add(setOrdinaryData("lzpswjzrr", JtZtfaps::getLzpswjzrr));
         assembleData.add(setDatePattern("lzpswjpzsj", JtZtfaps::getLzpswjpzsj, DATE_PATTERN_YMD));
         JtZtfaps jtZtfaps = jtZtfapsService.getById(id);
         return assembleApiData(jtZtfaps, assembleData);

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

@@ -42,13 +42,13 @@ public class KC111ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id, String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("DATAID", JtWyys::getDataid));
-        assembleData.add(setOrdinaryDate("INDEXID", JtWyys::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtWyys::getXmzsjbm));
-        assembleData.add(setOrdinaryDate("xmmc", JtWyys::getXmmc));
-        assembleData.add(setOrdinaryDate("yzlx", JtWyys::getYzlx));
-        assembleData.add(setOrdinaryDate("kcclswqxzlyzzrr", JtWyys::getZlyzzrr));
-        assembleData.add(setOrdinaryDate("xckcclyzzrr", JtWyys::getXcyzzrr));
+        assembleData.add(setOrdinaryData("DATAID", JtWyys::getDataid));
+        assembleData.add(setOrdinaryData("INDEXID", JtWyys::getId));
+        assembleData.add(setOrdinaryData("xmbh", JtWyys::getXmzsjbm));
+        assembleData.add(setOrdinaryData("xmmc", JtWyys::getXmmc));
+        assembleData.add(setOrdinaryData("yzlx", JtWyys::getYzlx));
+        assembleData.add(setOrdinaryData("kcclswqxzlyzzrr", JtWyys::getZlyzzrr));
+        assembleData.add(setOrdinaryData("xckcclyzzrr", JtWyys::getXcyzzrr));
         assembleData.add(setDatePattern("kcclswqxzlyzsj", JtWyys::getZlyzsj, DATE_PATTERN_YMD));
         assembleData.add(setDatePattern("xckcclyzsj", JtWyys::getXcyzsj, DATE_PATTERN_YMD));
         JtWyys jtWyys = jtWyysService.getById(id);

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

@@ -3,14 +3,11 @@ package com.rongwei.bscommon.sys.strategy.api;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.JtYjbhglService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtWyys;
 import com.rongwei.bsentity.domain.JtYjbhgl;
 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;
 import java.util.ArrayList;
@@ -48,14 +45,14 @@ public class KC113ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("DATAID", JtYjbhgl::getDataid));
-        assembleData.add(setOrdinaryDate("INDEXID", JtYjbhgl::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtYjbhgl::getXmzsjbm));
-        assembleData.add(setOrdinaryDate("xmmc", JtYjbhgl::getXmmc));
-        assembleData.add(setOrdinaryDate("yjtcr", JtYjbhgl::getYjtcr));
+        assembleData.add(setOrdinaryData("DATAID", JtYjbhgl::getDataid));
+        assembleData.add(setOrdinaryData("INDEXID", JtYjbhgl::getId));
+        assembleData.add(setOrdinaryData("xmbh", JtYjbhgl::getXmzsjbm));
+        assembleData.add(setOrdinaryData("xmmc", JtYjbhgl::getXmmc));
+        assembleData.add(setOrdinaryData("yjtcr", JtYjbhgl::getYjtcr));
         assembleData.add(setDatePattern("yjtcsj", JtYjbhgl::getYjtcsj,DATE_PATTERN_YMD));
         assembleData.add(setDatePattern("zgfksj", JtYjbhgl::getZgfksj,DATE_PATTERN_YMD));
-        assembleData.add(setOrdinaryDate("zgfkzrr", JtYjbhgl::getZgfkzrr));
+        assembleData.add(setOrdinaryData("zgfkzrr", JtYjbhgl::getZgfkzrr));
         JtYjbhgl jtYjbhgl1 = jtYjbhglService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtYjbhgl1, assembleData);
         return stringObjectMap;

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

@@ -3,15 +3,11 @@ package com.rongwei.bscommon.sys.strategy.api;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.JtScsdlService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.domain.JtScsdl;
-import com.rongwei.bsentity.domain.JtYjbhgl;
 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;
 
@@ -49,16 +45,16 @@ public class KC115ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("DATAID", JtScsdl::getDataid));
-        assembleData.add(setOrdinaryDate("INDEXID", JtScsdl::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtScsdl::getXmzsjbm));
-        assembleData.add(setOrdinaryDate("xmmc", JtScsdl::getXmmc));
-        assembleData.add(setOrdinaryDate("qdbh", JtScsdl::getQdbh));
-        assembleData.add(setOrdinaryDate("qdmc", JtScsdl::getQdmc));
-        assembleData.add(setOrdinaryDate("rwhjbh", JtScsdl::getRwhjbh));
-        assembleData.add(setOrdinaryDate("rwhjmc", JtScsdl::getRwhjmc));
-        assembleData.add(setOrdinaryDate("zzjdsdzrr", JtScsdl::getZzjdsdzrr));
-        assembleData.add(setOrdinaryDate("dzqmyyjdmc", JtScsdl::getQmmc));
+        assembleData.add(setOrdinaryData("DATAID", JtScsdl::getDataid));
+        assembleData.add(setOrdinaryData("INDEXID", JtScsdl::getId));
+        assembleData.add(setOrdinaryData("xmbh", JtScsdl::getXmzsjbm));
+        assembleData.add(setOrdinaryData("xmmc", JtScsdl::getXmmc));
+        assembleData.add(setOrdinaryData("qdbh", JtScsdl::getQdbh));
+        assembleData.add(setOrdinaryData("qdmc", JtScsdl::getQdmc));
+        assembleData.add(setOrdinaryData("rwhjbh", JtScsdl::getRwhjbh));
+        assembleData.add(setOrdinaryData("rwhjmc", JtScsdl::getRwhjmc));
+        assembleData.add(setOrdinaryData("zzjdsdzrr", JtScsdl::getZzjdsdzrr));
+        assembleData.add(setOrdinaryData("dzqmyyjdmc", JtScsdl::getQmmc));
         assembleData.add(setDatePattern("pzsj", JtScsdl::getPzsj,DATE_PATTERN_YMD));
         assembleData.add(setDatePattern("zgcshsqrqzgzsj", JtScsdl::getQzsj,DATE_PATTERN_YMD));
 

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

@@ -2,18 +2,12 @@ package com.rongwei.bscommon.sys.strategy.api;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.JtWtbhglService;
-import com.rongwei.bscommon.sys.service.JtWtbhglService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
-import com.rongwei.bsentity.domain.JtScsdl;
-import com.rongwei.bsentity.domain.JtWtbhgl;
 import com.rongwei.bsentity.domain.JtWtbhgl;
 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;
 
@@ -51,12 +45,12 @@ public class KC117ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("DATAID", JtWtbhgl::getDataid));
-        assembleData.add(setOrdinaryDate("INDEXID", JtWtbhgl::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtWtbhgl::getXmzsjbm));
-        assembleData.add(setOrdinaryDate("xmmc", JtWtbhgl::getXmmc));
-        assembleData.add(setOrdinaryDate("wtfkfzr", JtWtbhgl::getWtfkfzr));
-        assembleData.add(setOrdinaryDate("wttcr", JtWtbhgl::getWttcr));
+        assembleData.add(setOrdinaryData("DATAID", JtWtbhgl::getDataid));
+        assembleData.add(setOrdinaryData("INDEXID", JtWtbhgl::getId));
+        assembleData.add(setOrdinaryData("xmbh", JtWtbhgl::getXmzsjbm));
+        assembleData.add(setOrdinaryData("xmmc", JtWtbhgl::getXmmc));
+        assembleData.add(setOrdinaryData("wtfkfzr", JtWtbhgl::getWtfkfzr));
+        assembleData.add(setOrdinaryData("wttcr", JtWtbhgl::getWttcr));
         assembleData.add(setDatePattern("wtfkrq", JtWtbhgl::getWtfkrq,DATE_PATTERN_YMD));
         assembleData.add(setDatePattern("wttcrq", JtWtbhgl::getWttcrq,DATE_PATTERN_YMD));
         JtWtbhgl jtWtbhgl = jtWtbhglService.getById(id);

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

@@ -44,12 +44,12 @@ public class KC119ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id, String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("DATAID", JtScbhgl::getDataid));
-        assembleData.add(setOrdinaryDate("INDEXID", JtScbhgl::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtScbhgl::getXmzsjbm));
-        assembleData.add(setOrdinaryDate("xmmc", JtScbhgl::getXmmc));
-        assembleData.add(setOrdinaryDate("wbhfyjfzr", JtScbhgl::getWbhfyjfzr));
-        assembleData.add(setOrdinaryDate("yjtcr", JtScbhgl::getYjtcr));
+        assembleData.add(setOrdinaryData("DATAID", JtScbhgl::getDataid));
+        assembleData.add(setOrdinaryData("INDEXID", JtScbhgl::getId));
+        assembleData.add(setOrdinaryData("xmbh", JtScbhgl::getXmzsjbm));
+        assembleData.add(setOrdinaryData("xmmc", JtScbhgl::getXmmc));
+        assembleData.add(setOrdinaryData("wbhfyjfzr", JtScbhgl::getWbhfyjfzr));
+        assembleData.add(setOrdinaryData("yjtcr", JtScbhgl::getYjtcr));
         assembleData.add(setDatePattern("hfsj", JtScbhgl::getHfsj, DATE_PATTERN_YMD));
         assembleData.add(setDatePattern("yjtcsj", JtScbhgl::getYjtcsj, DATE_PATTERN_YMD));
         JtScbhgl jtScbhgl = jtScbhglService.getById(id);

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

@@ -2,18 +2,12 @@ package com.rongwei.bscommon.sys.strategy.api;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.JtSjjdqdService;
-import com.rongwei.bscommon.sys.service.JtSjjdqdService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
-import com.rongwei.bsentity.domain.JtScbhgl;
-import com.rongwei.bsentity.domain.JtSjjdqd;
 import com.rongwei.bsentity.domain.JtSjjdqd;
 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;
 
@@ -51,11 +45,11 @@ public class KC121ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("DATAID", JtSjjdqd::getDataid));
-        assembleData.add(setOrdinaryDate("INDEXID", JtSjjdqd::getId));
-        assembleData.add(setOrdinaryDate("xmbh", JtSjjdqd::getXmzsjbm));
-        assembleData.add(setOrdinaryDate("xmmc", JtSjjdqd::getXmmc));
-        assembleData.add(setOrdinaryDate("sjjdbghyjymc", JtSjjdqd::getName));
+        assembleData.add(setOrdinaryData("DATAID", JtSjjdqd::getDataid));
+        assembleData.add(setOrdinaryData("INDEXID", JtSjjdqd::getId));
+        assembleData.add(setOrdinaryData("xmbh", JtSjjdqd::getXmzsjbm));
+        assembleData.add(setOrdinaryData("xmmc", JtSjjdqd::getXmmc));
+        assembleData.add(setOrdinaryData("sjjdbghyjymc", JtSjjdqd::getName));
         assembleData.add(setDatePattern("jhjdsj", JtSjjdqd::getJhjdsj,DATE_PATTERN_YMD));
         assembleData.add(setDatePattern("hykzzsj", JtSjjdqd::getHykzsj,DATE_PATTERN_YMD));
         JtSjjdqd jtSjjdqd = jtSjjdqdService.getById(id);

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtSjbgqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtSjbgqd;
-import com.rongwei.bsentity.domain.JtSjjdqd;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
@@ -16,8 +15,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.*;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
 
 /**
  * AssembleK34ApiData class
@@ -39,19 +38,20 @@ public class KC123ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public void setJtXcjhqdServiceImpl(JtSjbgqdServiceImpl jtSjbgqdService) {
         KC123ApiRequestAndProcessing.jtSjbgqdService = jtSjbgqdService;
     }
+
     @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(setOrdinaryDate("INDEXID", JtSjbgqd::getId));
-        assembleData.add(setOrdinaryDate("DATAID", JtSjbgqd::getDataid));
-        assembleData.add(setOrdinaryDate("xmbh", JtSjbgqd::getXmzsjbm));
-        assembleData.add(setOrdinaryDate("xmmc", JtSjbgqd::getXmmc));
-        assembleData.add(setFileInfo("bgsxmc", JtSjbgqd::getBgsxmc,true));
-        assembleData.add(setOrdinaryDate("bgtcr", JtSjbgqd::getBgtcr));
-        assembleData.add(setOrdinaryDate("bgtcsj", JtSjbgqd::getBgtcsj));
-        assembleData.add(setOrdinaryDate("bgfzr", JtSjbgqd::getBgfzr));
-        assembleData.add(setOrdinaryDate("bgpzsj", JtSjbgqd::getBgpzsj));
-        assembleData.add(setFileInfo("sjgcsshzj", JtSjbgqd::getSjgcsshzj,true));
+        assembleData.add(setOrdinaryData("INDEXID", JtSjbgqd::getId));
+        assembleData.add(setOrdinaryData("DATAID", JtSjbgqd::getDataid));
+        assembleData.add(setOrdinaryData("xmbh", JtSjbgqd::getXmzsjbm));
+        assembleData.add(setOrdinaryData("xmmc", JtSjbgqd::getXmmc));
+        assembleData.add(setFileInfo("bgsxmc", JtSjbgqd::getBgsxmc, true));
+        assembleData.add(setOrdinaryData("bgtcr", JtSjbgqd::getBgtcr));
+        assembleData.add(setOrdinaryData("bgtcsj", JtSjbgqd::getBgtcsj));
+        assembleData.add(setOrdinaryData("bgfzr", JtSjbgqd::getBgfzr));
+        assembleData.add(setDatePattern("bgpzsj", JtSjbgqd::getBgpzsj, DATE_PATTERN_YMD));
+        assembleData.add(setFileInfo("sjgcsshzj", JtSjbgqd::getSjgcsshzj, true));
         JtSjbgqd jtSjbgqd = jtSjbgqdService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtSjbgqd, assembleData);
         return stringObjectMap;
@@ -67,7 +67,7 @@ public class KC123ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
         jtSjbgqdService.update(new LambdaUpdateWrapper<JtSjbgqd>()
                 .eq(JtSjbgqd::getId, id)
-                .set(JtSjbgqd::getSyncstate,    apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(JtSjbgqd::getSyncstate, apiReturnDto.isSuccessful() ? "20" : "40")
                 .set(JtSjbgqd::getDataid, realDataId));
         return R.ok();
     }

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

@@ -3,7 +3,6 @@ package com.rongwei.bscommon.sys.strategy.api;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtZbrygwjzrfgqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtSjbgqd;
 import com.rongwei.bsentity.domain.JtZbrygwjzrfgqd;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
@@ -17,7 +16,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.setOrdinaryDate;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryData;
 
 /**
  * AssembleK34ApiData class
@@ -43,11 +42,11 @@ public class KC125ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("INDEXID", JtZbrygwjzrfgqd::getId));
-        assembleData.add(setOrdinaryDate("DATAID", JtZbrygwjzrfgqd::getDataid));
-        assembleData.add(setOrdinaryDate("glryxm", JtZbrygwjzrfgqd::getGlryxm));
-        assembleData.add(setOrdinaryDate("glrygwzz", JtZbrygwjzrfgqd::getGlrygwzz));
-        assembleData.add(setOrdinaryDate("jsgljd", JtZbrygwjzrfgqd::getJsgljd));
+        assembleData.add(setOrdinaryData("INDEXID", JtZbrygwjzrfgqd::getId));
+        assembleData.add(setOrdinaryData("DATAID", JtZbrygwjzrfgqd::getDataid));
+        assembleData.add(setOrdinaryData("glryxm", JtZbrygwjzrfgqd::getGlryxm));
+        assembleData.add(setOrdinaryData("glrygwzz", JtZbrygwjzrfgqd::getGlrygwzz));
+        assembleData.add(setOrdinaryData("jsgljd", JtZbrygwjzrfgqd::getJsgljd));
         JtZbrygwjzrfgqd jtZbrygwjzrfgqd = jtZbrygwjzrfgqdService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtZbrygwjzrfgqd, assembleData);
         return stringObjectMap;

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

@@ -1,24 +1,16 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
-import com.rongwei.bscommon.sys.service.impl.JtJsglcgqdServiceImpl;
 import com.rongwei.bscommon.sys.service.impl.JtZbrygwjzrfgqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-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.setOrdinaryDate;
-
 /**
  * AssembleK34ApiData class
  *

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtPxjhqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtPxjhqd;
-import com.rongwei.bsentity.domain.JtZbrygwjzrfgqd;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
@@ -16,8 +15,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.setOrdinaryDate;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.*;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
 
 /**
  * AssembleK34ApiData class
@@ -43,16 +42,16 @@ public class KC127ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("INDEXID", JtPxjhqd::getId));
-        assembleData.add(setOrdinaryDate("DATAID", JtPxjhqd::getDataid));
-        assembleData.add(setOrdinaryDate("pxbh", JtPxjhqd::getPxbh));
-        assembleData.add(setOrdinaryDate("pxmc", JtPxjhqd::getPxmc));
-        assembleData.add(setOrdinaryDate("pxmd", JtPxjhqd::getPxmd));
-        assembleData.add(setOrdinaryDate("pxfl", JtPxjhqd::getPxfl));
-        assembleData.add(setOrdinaryDate("jhpxsj", JtPxjhqd::getJhpxsj));
-        assembleData.add(setOrdinaryDate("pxkzsj", JtPxjhqd::getPxkzsj));
-        assembleData.add(setOrdinaryDate("pxhytz", JtPxjhqd::getPxhytz));
-        assembleData.add(setOrdinaryDate("xxywpxryqd", JtPxjhqd::getXxywpxryqd));
+        assembleData.add(setOrdinaryData("INDEXID", JtPxjhqd::getId));
+        assembleData.add(setOrdinaryData("DATAID", JtPxjhqd::getDataid));
+        assembleData.add(setOrdinaryData("pxbh", JtPxjhqd::getPxbh));
+        assembleData.add(setOrdinaryData("pxmc", JtPxjhqd::getPxmc));
+        assembleData.add(setOrdinaryData("pxmd", JtPxjhqd::getPxmd));
+        assembleData.add(setOrdinaryData("pxfl", JtPxjhqd::getPxfl));
+        assembleData.add(setDatePattern("jhpxsj", JtPxjhqd::getJhpxsj,DATE_PATTERN_YMD));
+        assembleData.add(setDatePattern("pxkzsj", JtPxjhqd::getPxkzsj,DATE_PATTERN_YMD));
+        assembleData.add(setOrdinaryData("pxhytz", JtPxjhqd::getPxhytz));
+        assembleData.add(setOrdinaryData("xxywpxryqd", JtPxjhqd::getXxywpxryqd));
         JtPxjhqd jtPxjhqd = jtPxjhqdService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtPxjhqd, assembleData);
         return stringObjectMap;

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

@@ -1,24 +1,16 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
-import com.rongwei.bscommon.sys.service.impl.JtJsglcgqdServiceImpl;
 import com.rongwei.bscommon.sys.service.impl.JtPxjhqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-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.setOrdinaryDate;
-
 /**
  * AssembleK34ApiData class
  *

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtNdjhqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtNdjhqd;
-import com.rongwei.bsentity.domain.JtPxjhqd;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
@@ -16,8 +15,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.setOrdinaryDate;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.*;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
 
 /**
  * AssembleK34ApiData class
@@ -43,13 +42,13 @@ public class KC129ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("INDEXID", JtNdjhqd::getId));
-        assembleData.add(setOrdinaryDate("DATAID", JtNdjhqd::getDataid));
-        assembleData.add(setOrdinaryDate("jhbh", JtNdjhqd::getJhbh));
-        assembleData.add(setOrdinaryDate("jhmc", JtNdjhqd::getJhmc));
-        assembleData.add(setOrdinaryDate("jhlxsfhgjsbzh", JtNdjhqd::getJhlxsfhgjsbzh));
-        assembleData.add(setOrdinaryDate("jhwcsj", JtNdjhqd::getJhwcsj));
-        assembleData.add(setOrdinaryDate("sjwcsj", JtNdjhqd::getSjwcsj));
+        assembleData.add(setOrdinaryData("INDEXID", JtNdjhqd::getId));
+        assembleData.add(setOrdinaryData("DATAID", JtNdjhqd::getDataid));
+        assembleData.add(setOrdinaryData("jhbh", JtNdjhqd::getJhbh));
+        assembleData.add(setOrdinaryData("jhmc", JtNdjhqd::getJhmc));
+        assembleData.add(setOrdinaryData("jhlxsfhgjsbzh", JtNdjhqd::getJhlxsfhgjsbzh));
+        assembleData.add(setDatePattern("jhwcsj", JtNdjhqd::getJhwcsj,DATE_PATTERN_YMD));
+        assembleData.add(setDatePattern("sjwcsj", JtNdjhqd::getSjwcsj,DATE_PATTERN_YMD));
         JtNdjhqd jtNdjhqd = jtNdjhqdService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtNdjhqd, assembleData);
         return stringObjectMap;

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

@@ -2,22 +2,15 @@ package com.rongwei.bscommon.sys.strategy.api;
 
 import com.rongwei.bscommon.sys.service.impl.JtNdjhqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-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.setOrdinaryDate;
-
 /**
  * AssembleK34ApiData class
  *

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

@@ -3,7 +3,6 @@ package com.rongwei.bscommon.sys.strategy.api;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtZdxmszmnServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtNdjhqd;
 import com.rongwei.bsentity.domain.JtZdxmszmn;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
@@ -42,10 +41,10 @@ public class KC131ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("INDEXID", JtZdxmszmn::getId));
-        assembleData.add(setOrdinaryDate("DATAID", JtZdxmszmn::getDataid));
-        assembleData.add(setOrdinaryDate("xmbh", JtZdxmszmn::getXmzsjbm));
-        assembleData.add(setOrdinaryDate("xmmc", JtZdxmszmn::getXmmc));
+        assembleData.add(setOrdinaryData("INDEXID", JtZdxmszmn::getId));
+        assembleData.add(setOrdinaryData("DATAID", JtZdxmszmn::getDataid));
+        assembleData.add(setOrdinaryData("xmbh", JtZdxmszmn::getXmzsjbm));
+        assembleData.add(setOrdinaryData("xmmc", JtZdxmszmn::getXmmc));
         assembleData.add(setFileInfo("szmncl", JtZdxmszmn::getSzmncl,true));
         JtZdxmszmn jtZdxmszmn = jtZdxmszmnService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtZdxmszmn, assembleData);

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

@@ -2,22 +2,15 @@ package com.rongwei.bscommon.sys.strategy.api;
 
 import com.rongwei.bscommon.sys.service.impl.JtZdxmszmnServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtGsjtbsj;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-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.setOrdinaryDate;
-
 /**
  * AssembleK34ApiData class
  *

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

@@ -16,8 +16,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.setOrdinaryDate;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.*;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
 
 /**
  * AssembleK34ApiData class
@@ -42,19 +42,19 @@ public class KC133ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("INDEXID", JtXcjhqd::getId));
-        assembleData.add(setOrdinaryDate("DATAID", JtXcjhqd::getDataid));
-        assembleData.add(setOrdinaryDate("xmbh", JtXcjhqd::getXmzsjbm));
-        assembleData.add(setOrdinaryDate("xcxmmc", JtXcjhqd::getXmmc));
-        assembleData.add(setOrdinaryDate("xcbh", JtXcjhqd::getXcbh));
-        assembleData.add(setOrdinaryDate("bxcdw", JtXcjhqd::getBxcdw));
-        assembleData.add(setOrdinaryDate("xctzwj", JtXcjhqd::getXctzwj));
-        assembleData.add(setOrdinaryDate("xczt", JtXcjhqd::getXczt));
-        assembleData.add(setOrdinaryDate("wtzgrq", JtXcjhqd::getWtzgrq));
-        assembleData.add(setOrdinaryDate("zgfkwj", JtXcjhqd::getZgfkwj));
-        assembleData.add(setOrdinaryDate("xctbwj", JtXcjhqd::getXctbwj));
-        assembleData.add(setOrdinaryDate("jhkzsj", JtXcjhqd::getJhkzsj));
-        assembleData.add(setOrdinaryDate("sjkzsj", JtXcjhqd::getSjkzsj));
+        assembleData.add(setOrdinaryData("INDEXID", JtXcjhqd::getId));
+        assembleData.add(setOrdinaryData("DATAID", JtXcjhqd::getDataid));
+        assembleData.add(setOrdinaryData("xmbh", JtXcjhqd::getXmzsjbm));
+        assembleData.add(setOrdinaryData("xcxmmc", JtXcjhqd::getXmmc));
+        assembleData.add(setOrdinaryData("xcbh", JtXcjhqd::getXcbh));
+        assembleData.add(setOrdinaryData("bxcdw", JtXcjhqd::getBxcdw));
+        assembleData.add(setOrdinaryData("xctzwj", JtXcjhqd::getXctzwj));
+        assembleData.add(setOrdinaryData("xczt", JtXcjhqd::getXczt));
+        assembleData.add(setDatePattern("wtzgrq", JtXcjhqd::getWtzgrq,DATE_PATTERN_YMD));
+        assembleData.add(setOrdinaryData("zgfkwj", JtXcjhqd::getZgfkwj));
+        assembleData.add(setOrdinaryData("xctbwj", JtXcjhqd::getXctbwj));
+        assembleData.add(setDatePattern("jhkzsj", JtXcjhqd::getJhkzsj,DATE_PATTERN_YMD));
+        assembleData.add(setDatePattern("sjkzsj", JtXcjhqd::getSjkzsj,DATE_PATTERN_YMD));
         JtXcjhqd jtXcjhqd = jtXcjhqdService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtXcjhqd, assembleData);
         return stringObjectMap;

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

@@ -3,14 +3,11 @@ package com.rongwei.bscommon.sys.strategy.api;
 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.JtXcjhqd;
 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;
 
@@ -19,7 +16,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.setOrdinaryDate;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryData;
 
 /**
  * AssembleK34ApiData class
@@ -45,12 +42,12 @@ public class KC135ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("INDEXID", JtZjfjflqd::getId));
-        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));
+        assembleData.add(setOrdinaryData("INDEXID", JtZjfjflqd::getId));
+        assembleData.add(setOrdinaryData("DATAID", JtZjfjflqd::getDataid));
+        assembleData.add(setOrdinaryData("zjxm", JtZjfjflqd::getZjxm));
+        assembleData.add(setOrdinaryData("zjdj", JtZjfjflqd::getZjdj));
+        assembleData.add(setOrdinaryData("zjfl", JtZjfjflqd::getZjfl));
+        assembleData.add(setOrdinaryData("sfwxxywzj", JtZjfjflqd::getSfwxxywzj));
         JtZjfjflqd jtGsjtbsj = jtZjfjflqdService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
         return stringObjectMap;

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/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.setOrdinaryDate;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryData;
 
 /**
  * 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(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryData("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

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

@@ -4,13 +4,10 @@ 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.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;
 
@@ -45,10 +42,10 @@ public class KC137ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("INDEXID", JtJscgpyqd::getId));
-        assembleData.add(setOrdinaryDate("DATAID", JtJscgpyqd::getDataid));
-        assembleData.add(setOrdinaryDate("cgpyhdmc", JtJscgpyqd::getCgpyhdmc));
-        assembleData.add(setOrdinaryDate("pyfl", JtJscgpyqd::getPyfl));
+        assembleData.add(setOrdinaryData("INDEXID", JtJscgpyqd::getId));
+        assembleData.add(setOrdinaryData("DATAID", JtJscgpyqd::getDataid));
+        assembleData.add(setOrdinaryData("cgpyhdmc", JtJscgpyqd::getCgpyhdmc));
+        assembleData.add(setOrdinaryData("pyfl", JtJscgpyqd::getPyfl));
         assembleData.add(setDatePattern("kzsj", JtJscgpyqd::getKzsj,DATE_PATTERN_YMD));
         assembleData.add(setFileInfo("zmwjtzgg", JtJscgpyqd::getZmwjtzgg,true));
         JtJscgpyqd jtGsjtbsj = jtJscgpyqdService.getById(id);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/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.setOrdinaryDate;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryData;
 
 /**
  * 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(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryData("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

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

@@ -42,10 +42,10 @@ public class KC139ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("INDEXID", JtYxwjfbqd::getId));
-        assembleData.add(setOrdinaryDate("DATAID", JtYxwjfbqd::getDataid));
-        assembleData.add(setOrdinaryDate("fbwjmc", JtYxwjfbqd::getFbwjmc));
-        assembleData.add(setOrdinaryDate("wjlb", JtYxwjfbqd::getWjlb));
+        assembleData.add(setOrdinaryData("INDEXID", JtYxwjfbqd::getId));
+        assembleData.add(setOrdinaryData("DATAID", JtYxwjfbqd::getDataid));
+        assembleData.add(setOrdinaryData("fbwjmc", JtYxwjfbqd::getFbwjmc));
+        assembleData.add(setOrdinaryData("wjlb", JtYxwjfbqd::getWjlb));
         assembleData.add(setDatePattern("fbsj", JtYxwjfbqd::getFbsj, DATE_PATTERN_YMD));
         JtYxwjfbqd jtGsjtbsj = jtYxwjfbqdService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/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.setOrdinaryDate;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryData;
 
 /**
  * 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(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryData("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

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

@@ -42,18 +42,18 @@ public class KC141ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("INDEXID", JtJsglcgqd::getId));
-        assembleData.add(setOrdinaryDate("DATAID", JtJsglcgqd::getDataid));
-        assembleData.add(setOrdinaryDate("xmmc", JtJsglcgqd::getXmmc));
-        assembleData.add(setOrdinaryDate("jxmc", JtJsglcgqd::getJxmc));
-        assembleData.add(setOrdinaryDate("jxlb", JtJsglcgqd::getJxlb));
-        assembleData.add(setOrdinaryDate("jxjb", JtJsglcgqd::getJxjb));
-        assembleData.add(setOrdinaryDate("jxdj", JtJsglcgqd::getJxdj));
+        assembleData.add(setOrdinaryData("INDEXID", JtJsglcgqd::getId));
+        assembleData.add(setOrdinaryData("DATAID", JtJsglcgqd::getDataid));
+        assembleData.add(setOrdinaryData("xmmc", JtJsglcgqd::getXmmc));
+        assembleData.add(setOrdinaryData("jxmc", JtJsglcgqd::getJxmc));
+        assembleData.add(setOrdinaryData("jxlb", JtJsglcgqd::getJxlb));
+        assembleData.add(setOrdinaryData("jxjb", JtJsglcgqd::getJxjb));
+        assembleData.add(setOrdinaryData("jxdj", JtJsglcgqd::getJxdj));
         assembleData.add(setDatePattern("hjsj", JtJsglcgqd::getHjsj, DATE_PATTERN_YMD));
-        assembleData.add(setOrdinaryDate("cyqk", JtJsglcgqd::getCyqk));
+        assembleData.add(setOrdinaryData("cyqk", JtJsglcgqd::getCyqk));
         assembleData.add(setFileInfo("mgjxdhjcl", JtJsglcgqd::getMgjxdhjcl, true));
-        assembleData.add(setOrdinaryDate("sfzddw", JtJsglcgqd::getSfzddw));
-        assembleData.add(setOrdinaryDate("hjpm", JtJsglcgqd::getHjpm));
+        assembleData.add(setOrdinaryData("sfzddw", JtJsglcgqd::getSfzddw));
+        assembleData.add(setOrdinaryData("hjpm", JtJsglcgqd::getHjpm));
         JtJsglcgqd jtGsjtbsj = jtJsglcgqdService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
         return stringObjectMap;

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/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.setOrdinaryDate;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryData;
 
 /**
  * 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(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryData("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);

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

@@ -41,9 +41,9 @@ public class KC143ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     @Override
     public Map<String, Object> assembleData(String id, String dataId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-        assembleData.add(setOrdinaryDate("INDEXID", JtXysjyq::getId));
-        assembleData.add(setOrdinaryDate("DATAID", JtXysjyq::getDataid));
-        assembleData.add(setOrdinaryDate("yxzgcspxbyxgcbzpxbdpxhzhyxgrsl", JtXysjyq::getYxzgcspxbyxgcbzpxbdpxhzhyxgrsl));
+        assembleData.add(setOrdinaryData("INDEXID", JtXysjyq::getId));
+        assembleData.add(setOrdinaryData("DATAID", JtXysjyq::getDataid));
+        assembleData.add(setOrdinaryData("yxzgcspxbyxgcbzpxbdpxhzhyxgrsl", JtXysjyq::getYxzgcspxbyxgcbzpxbdpxhzhyxgrsl));
         assembleData.add(setFileInfo("jsfabzhsscl", JtXysjyq::getJsfabzhsscl, true));
         assembleData.add(setFileInfo("gjbzxdnltsxdfa", JtXysjyq::getGjbzxdnltsxdfa, true));
         assembleData.add(setFileInfo("lxsbhjtzjcl", JtXysjyq::getLxsbhjtzjcl, true));

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/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.setOrdinaryDate;
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryData;
 
 /**
  * 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(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
+        assembleData.add(setOrdinaryData("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 setOrdinaryDate(String key, Function<T, Object> getDataFunction) {
+    public static <T> OrgApiDataConfigDTO setOrdinaryData(String key, Function<T, Object> getDataFunction) {
         OrgApiDataConfigDTO excelFieldDescDTO = new OrgApiDataConfigDTO();
         excelFieldDescDTO.setKey(key);
         excelFieldDescDTO.setDataFunction(getDataFunction);

jsglkh-entity/src/main/java/com/rongwei/bsentity/domain/JtJsglcgqd.java

@@ -69,13 +69,13 @@ public class JtJsglcgqd extends BaseDo implements Serializable {
      * 奖项类别
      */
     @TableField(value = "JXLB")
-    private Integer jxlb;
+    private String jxlb;
 
     /**
      * 奖项级别
      */
     @TableField(value = "JXJB")
-    private Integer jxjb;
+    private String jxjb;
 
     /**
      * 奖项等级