feature 代码提交

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

@@ -4,13 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtWyysServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtWyys;
-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;
 
@@ -29,10 +26,18 @@ import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTE
  */
 @Component
 public class KC111ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtWyysServiceImpl jtWyysService;
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC111ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
     @Autowired
-    private JtWyysServiceImpl jtWyysService;
+    public void setJtXcjhqdServiceImpl(JtWyysServiceImpl jtWyysService) {
+        KC111ApiRequestAndProcessing.jtWyysService = jtWyysService;
+    }
 
     @Override
     public Map<String, Object> assembleData(String id, String dateId, String code) {

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

@@ -17,7 +17,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.*;
 
 /**
  * AssembleK34ApiData class
@@ -46,12 +46,12 @@ public class KC123ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         assembleData.add(setOrdinaryDate("DATAID", JtSjbgqd::getDataid));
         assembleData.add(setOrdinaryDate("xmbh", JtSjbgqd::getXmzsjbm));
         assembleData.add(setOrdinaryDate("xmmc", JtSjbgqd::getXmmc));
-        assembleData.add(setOrdinaryDate("bgsxmc", JtSjbgqd::getBgsxmc));
+        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(setOrdinaryDate("sjgcsshzj", JtSjbgqd::getSjgcsshzj));
+        assembleData.add(setFileInfo("sjgcsshzj", JtSjbgqd::getSjgcsshzj,true));
         JtSjbgqd jtSjbgqd = jtSjbgqdService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtSjbgqd, assembleData);
         return stringObjectMap;

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

@@ -16,8 +16,7 @@ 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.*;
 
 /**
  * AssembleK34ApiData class
@@ -47,7 +46,7 @@ public class KC131ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         assembleData.add(setOrdinaryDate("DATAID", JtZdxmszmn::getDataid));
         assembleData.add(setOrdinaryDate("xmbh", JtZdxmszmn::getXmzsjbm));
         assembleData.add(setOrdinaryDate("xmmc", JtZdxmszmn::getXmmc));
-        assembleData.add(setOrdinaryDate("szmncl", JtZdxmszmn::getSzmncl));
+        assembleData.add(setFileInfo("szmncl", JtZdxmszmn::getSzmncl,true));
         JtZdxmszmn jtZdxmszmn = jtZdxmszmnService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtZdxmszmn, assembleData);
         return stringObjectMap;

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.sys.service.impl.JtXcjhqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtXcjhqd;
-import com.rongwei.bsentity.domain.JtZdxmszmn;
+
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;