Merge remote-tracking branch 'origin/master' into master

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/JkAnnualplanMapper.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.JkAnnualplan;
+import com.rongwei.bsentity.domain.JkTrainingplan;
+
+/**
+ * @Entity com.rongwei.bsentity.domain.JtKcsjxm
+ */
+public interface JkAnnualplanMapper extends BaseMapper<JkAnnualplan> {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/JkAssessmentApprovalRecordMapper.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.JkAssessmentApprovalRecord;
+import com.rongwei.bsentity.domain.JkTrainingplan;
+
+/**
+ * @Entity com.rongwei.bsentity.domain.JtKcsjxm
+ */
+public interface JkAssessmentApprovalRecordMapper extends BaseMapper<JkAssessmentApprovalRecord> {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/JkCompanyAssessmentMapper.java

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.JkCompanyAssessment;
+
+/**
+ * @Entity com.rongwei.bsentity.domain.JtKcsjxm
+ */
+public interface JkCompanyAssessmentMapper extends BaseMapper<JkCompanyAssessment> {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/JkCompanyAssessmentSyncMapper.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.JkCompanyAssessmentSync;
+import com.rongwei.bsentity.domain.JkTrainingplan;
+
+/**
+ * @Entity com.rongwei.bsentity.domain.JtKcsjxm
+ */
+public interface JkCompanyAssessmentSyncMapper extends BaseMapper<JkCompanyAssessmentSync> {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/JkEffectiveDocumentMapper.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.JkEffectiveDocument;
+import com.rongwei.bsentity.domain.JkTechnicalaward;
+
+/**
+ * @Entity com.rongwei.bsentity.domain.JtKcsjxm
+ */
+public interface JkEffectiveDocumentMapper extends BaseMapper<JkEffectiveDocument> {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/JkExpertgradeMapper.java

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.JkExpertgrade;
+
+/**
+ * @Entity com.rongwei.bsentity.domain.JtKcsjxm
+ */
+public interface JkExpertgradeMapper extends BaseMapper<JkExpertgrade> {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/JkPersonnelresponsibilityMapper.java

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.JkPersonnelresponsibility;
+
+/**
+ * @Entity com.rongwei.bsentity.domain.JtKcsjxm
+ */
+public interface JkPersonnelresponsibilityMapper extends BaseMapper<JkPersonnelresponsibility> {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/JkTechnicalAchievementsMapper.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.JkEffectiveDocument;
+import com.rongwei.bsentity.domain.JkTechnicalAchievements;
+
+/**
+ * @Entity com.rongwei.bsentity.domain.JtKcsjxm
+ */
+public interface JkTechnicalAchievementsMapper extends BaseMapper<JkTechnicalAchievements> {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/JkTechnicalawardMapper.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.JkTechnicalaward;
+import com.rongwei.bsentity.domain.JkTrainingplan;
+
+/**
+ * @Entity com.rongwei.bsentity.domain.JtKcsjxm
+ */
+public interface JkTechnicalawardMapper extends BaseMapper<JkTechnicalaward> {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/JkTrainingplanMapper.java

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.JkTrainingplan;
+
+/**
+ * @Entity com.rongwei.bsentity.domain.JtKcsjxm
+ */
+public interface JkTrainingplanMapper extends BaseMapper<JkTrainingplan> {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/JkAnnualplanService.java

@@ -0,0 +1,12 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.JkAnnualplan;
+import com.rongwei.bsentity.domain.JkTrainingplan;
+
+/**
+ *
+ */
+public interface JkAnnualplanService extends IService<JkAnnualplan> {
+
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/JkAssessmentApprovalRecordService.java

@@ -0,0 +1,12 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.JkAssessmentApprovalRecord;
+import com.rongwei.bsentity.domain.JkTechnicalAchievements;
+
+/**
+ *
+ */
+public interface JkAssessmentApprovalRecordService extends IService<JkAssessmentApprovalRecord> {
+
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/JkCompanyAssessmentService.java

@@ -0,0 +1,12 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.JkCompanyAssessment;
+import com.rongwei.bsentity.domain.JtFjglxm;
+
+/**
+ *
+ */
+public interface JkCompanyAssessmentService extends IService<JkCompanyAssessment> {
+
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/JkCompanyAssessmentSyncService.java

@@ -0,0 +1,12 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.JkCompanyAssessment;
+import com.rongwei.bsentity.domain.JkCompanyAssessmentSync;
+
+/**
+ *
+ */
+public interface JkCompanyAssessmentSyncService extends IService<JkCompanyAssessmentSync> {
+
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/JkEffectiveDocumentService.java

@@ -0,0 +1,12 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.JkEffectiveDocument;
+import com.rongwei.bsentity.domain.JkTechnicalaward;
+
+/**
+ *
+ */
+public interface JkEffectiveDocumentService extends IService<JkEffectiveDocument> {
+
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/JkExpertgradeService.java

@@ -0,0 +1,12 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.JkExpertgrade;
+import com.rongwei.bsentity.domain.JkPersonnelresponsibility;
+
+/**
+ *
+ */
+public interface JkExpertgradeService extends IService<JkExpertgrade> {
+
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/JkPersonnelresponsibilityService.java

@@ -0,0 +1,12 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.JkPersonnelresponsibility;
+import com.rongwei.bsentity.domain.JtFjglxm;
+
+/**
+ *
+ */
+public interface JkPersonnelresponsibilityService extends IService<JkPersonnelresponsibility> {
+
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/JkTechnicalAchievementsService.java

@@ -0,0 +1,12 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.JkPersonnelresponsibility;
+import com.rongwei.bsentity.domain.JkTechnicalAchievements;
+
+/**
+ *
+ */
+public interface JkTechnicalAchievementsService extends IService<JkTechnicalAchievements> {
+
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/JkTechnicalawardService.java

@@ -0,0 +1,12 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.JkAnnualplan;
+import com.rongwei.bsentity.domain.JkTechnicalaward;
+
+/**
+ *
+ */
+public interface JkTechnicalawardService extends IService<JkTechnicalaward> {
+
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/JkTrainingplanService.java

@@ -0,0 +1,12 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.JkExpertgrade;
+import com.rongwei.bsentity.domain.JkTrainingplan;
+
+/**
+ *
+ */
+public interface JkTrainingplanService extends IService<JkTrainingplan> {
+
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/JkAnnualplanServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.JkAnnualplanMapper;
+import com.rongwei.bscommon.sys.dao.JkTrainingplanMapper;
+import com.rongwei.bscommon.sys.service.JkAnnualplanService;
+import com.rongwei.bscommon.sys.service.JkTrainingplanService;
+import com.rongwei.bsentity.domain.JkAnnualplan;
+import com.rongwei.bsentity.domain.JkTrainingplan;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class JkAnnualplanServiceImpl extends ServiceImpl<JkAnnualplanMapper, JkAnnualplan>
+        implements JkAnnualplanService {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/JkAssessmentApprovalRecordServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.JkAssessmentApprovalRecordMapper;
+import com.rongwei.bscommon.sys.dao.JkTechnicalAchievementsMapper;
+import com.rongwei.bscommon.sys.service.JkAssessmentApprovalRecordService;
+import com.rongwei.bscommon.sys.service.JkTechnicalAchievementsService;
+import com.rongwei.bsentity.domain.JkAssessmentApprovalRecord;
+import com.rongwei.bsentity.domain.JkTechnicalAchievements;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class JkAssessmentApprovalRecordServiceImpl extends ServiceImpl<JkAssessmentApprovalRecordMapper, JkAssessmentApprovalRecord>
+        implements JkAssessmentApprovalRecordService {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/JkCompanyAssessmentServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.JkCompanyAssessmentMapper;
+import com.rongwei.bscommon.sys.dao.JtFjglxmMapper;
+import com.rongwei.bscommon.sys.service.JkCompanyAssessmentService;
+import com.rongwei.bscommon.sys.service.JtFjglxmService;
+import com.rongwei.bsentity.domain.JkCompanyAssessment;
+import com.rongwei.bsentity.domain.JtFjglxm;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class JkCompanyAssessmentServiceImpl extends ServiceImpl<JkCompanyAssessmentMapper, JkCompanyAssessment>
+        implements JkCompanyAssessmentService {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/JkCompanyAssessmentSyncServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.JkCompanyAssessmentMapper;
+import com.rongwei.bscommon.sys.dao.JkCompanyAssessmentSyncMapper;
+import com.rongwei.bscommon.sys.service.JkCompanyAssessmentService;
+import com.rongwei.bscommon.sys.service.JkCompanyAssessmentSyncService;
+import com.rongwei.bsentity.domain.JkCompanyAssessment;
+import com.rongwei.bsentity.domain.JkCompanyAssessmentSync;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class JkCompanyAssessmentSyncServiceImpl extends ServiceImpl<JkCompanyAssessmentSyncMapper, JkCompanyAssessmentSync>
+        implements JkCompanyAssessmentSyncService {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/JkEffectiveDocumentServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.JkEffectiveDocumentMapper;
+import com.rongwei.bscommon.sys.dao.JkTrainingplanMapper;
+import com.rongwei.bscommon.sys.service.JkEffectiveDocumentService;
+import com.rongwei.bscommon.sys.service.JkTrainingplanService;
+import com.rongwei.bsentity.domain.JkEffectiveDocument;
+import com.rongwei.bsentity.domain.JkTrainingplan;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class JkEffectiveDocumentServiceImpl extends ServiceImpl<JkEffectiveDocumentMapper, JkEffectiveDocument>
+        implements JkEffectiveDocumentService {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/JkExpertgradeServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.JkExpertgradeMapper;
+import com.rongwei.bscommon.sys.dao.JkPersonnelresponsibilityMapper;
+import com.rongwei.bscommon.sys.service.JkExpertgradeService;
+import com.rongwei.bscommon.sys.service.JkPersonnelresponsibilityService;
+import com.rongwei.bsentity.domain.JkExpertgrade;
+import com.rongwei.bsentity.domain.JkPersonnelresponsibility;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class JkExpertgradeServiceImpl extends ServiceImpl<JkExpertgradeMapper, JkExpertgrade>
+        implements JkExpertgradeService {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/JkPersonnelresponsibilityServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.JkCompanyAssessmentMapper;
+import com.rongwei.bscommon.sys.dao.JkPersonnelresponsibilityMapper;
+import com.rongwei.bscommon.sys.service.JkCompanyAssessmentService;
+import com.rongwei.bscommon.sys.service.JkPersonnelresponsibilityService;
+import com.rongwei.bsentity.domain.JkCompanyAssessment;
+import com.rongwei.bsentity.domain.JkPersonnelresponsibility;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class JkPersonnelresponsibilityServiceImpl extends ServiceImpl<JkPersonnelresponsibilityMapper, JkPersonnelresponsibility>
+        implements JkPersonnelresponsibilityService {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/JkTechnicalAchievementsServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.JkPersonnelresponsibilityMapper;
+import com.rongwei.bscommon.sys.dao.JkTechnicalAchievementsMapper;
+import com.rongwei.bscommon.sys.service.JkPersonnelresponsibilityService;
+import com.rongwei.bscommon.sys.service.JkTechnicalAchievementsService;
+import com.rongwei.bsentity.domain.JkPersonnelresponsibility;
+import com.rongwei.bsentity.domain.JkTechnicalAchievements;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class JkTechnicalAchievementsServiceImpl extends ServiceImpl<JkTechnicalAchievementsMapper, JkTechnicalAchievements>
+        implements JkTechnicalAchievementsService {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/JkTechnicalawardServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.JkTechnicalawardMapper;
+import com.rongwei.bscommon.sys.dao.JkTrainingplanMapper;
+import com.rongwei.bscommon.sys.service.JkTechnicalawardService;
+import com.rongwei.bscommon.sys.service.JkTrainingplanService;
+import com.rongwei.bsentity.domain.JkTechnicalaward;
+import com.rongwei.bsentity.domain.JkTrainingplan;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class JkTechnicalawardServiceImpl extends ServiceImpl<JkTechnicalawardMapper, JkTechnicalaward>
+        implements JkTechnicalawardService {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/JkTrainingplanServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.JkPersonnelresponsibilityMapper;
+import com.rongwei.bscommon.sys.dao.JkTrainingplanMapper;
+import com.rongwei.bscommon.sys.service.JkPersonnelresponsibilityService;
+import com.rongwei.bscommon.sys.service.JkTrainingplanService;
+import com.rongwei.bsentity.domain.JkPersonnelresponsibility;
+import com.rongwei.bsentity.domain.JkTrainingplan;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class JkTrainingplanServiceImpl extends ServiceImpl<JkTrainingplanMapper, JkTrainingplan>
+        implements JkTrainingplanService {
+
+}
+
+
+
+

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

@@ -1,7 +1,12 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.rongwei.bscommon.sys.service.impl.JkCompanyAssessmentServiceImpl;
+import com.rongwei.bscommon.sys.service.impl.JtPxjhqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
+import com.rongwei.bsentity.domain.JkCompanyAssessment;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtPxjhqd;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
@@ -24,17 +29,33 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC101ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JkCompanyAssessmentServiceImpl jkCompanyAssessmentService;
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC101ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
 
+    @Autowired
+    public void setjkCompanyAssessmentServiceImpl(JkCompanyAssessmentServiceImpl jkCompanyAssessmentService) {
+        KC101ApiRequestAndProcessing.jkCompanyAssessmentService = jkCompanyAssessmentService;
+    }
     @Override
-    public Map<String, Object> assembleData(String id,String dateId, String code) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+        assembleData.add(setOrdinaryDate("year", JkCompanyAssessment::getYear));
+        assembleData.add(setOrdinaryDate("managementunit", JkCompanyAssessment::getManagementunit));
+        assembleData.add(setOrdinaryDate("mainbusinessdigitalcoverage", JkCompanyAssessment::getMainbusinessdigitalcoverage));
+        assembleData.add(setOrdinaryDate("subunitcount", JkCompanyAssessment::getSubunitcount));
+        assembleData.add(setOrdinaryDate("thirdlevelunitcount", JkCompanyAssessment::getThirdlevelunitcount));
+        assembleData.add(setOrdinaryDate("attachmentuploadstatus", JkCompanyAssessment::getAttachmentuploadstatus));
+        assembleData.add(setOrdinaryDate("predictedtotalscore", JkCompanyAssessment::getPredictedtotalscore));
+        assembleData.add(setOrdinaryDate("approvalstatus", JkCompanyAssessment::getApprovalstatus));
+        assembleData.add(setOrdinaryDate("datacode", JkCompanyAssessment::getDatacode));
+        assembleData.add(setOrdinaryDate("syncstatus", JkCompanyAssessment::getSyncstatus));
+        JkCompanyAssessment jkCompanyAssessment = jkCompanyAssessmentService.getById(id);
+        Map<String, Object> stringObjectMap = assembleApiData(jkCompanyAssessment, assembleData);
         return stringObjectMap;
     }
 

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

@@ -1,5 +1,7 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.impl.JtYxwjfbqdServiceImpl;
+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.dto.ApiCallDto;
@@ -24,8 +26,17 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC102ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtZjfjflqdServiceImpl jtZjfjflqdService;
+
+
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC102ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setJtXcjhqdServiceImpl(JtZjfjflqdServiceImpl jtZjfjflqdService) {
+        KC102ApiRequestAndProcessing.jtZjfjflqdService = jtZjfjflqdService;
+    }
 
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
@@ -45,6 +56,7 @@ public class KC102ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
+        jtZjfjflqdService.removeById(id);
         return R.ok();
     }
 }

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

@@ -1,6 +1,8 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.impl.JkCompanyAssessmentServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
+import com.rongwei.bsentity.domain.JkCompanyAssessment;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
@@ -24,17 +26,33 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC103ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JkCompanyAssessmentServiceImpl jkCompanyAssessmentService;
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC103ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
 
+    @Autowired
+    public void setjkCompanyAssessmentServiceImpl(JkCompanyAssessmentServiceImpl jkCompanyAssessmentService) {
+        KC103ApiRequestAndProcessing.jkCompanyAssessmentService = jkCompanyAssessmentService;
+    }
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+        assembleData.add(setOrdinaryDate("year", JkCompanyAssessment::getYear));
+        assembleData.add(setOrdinaryDate("managementunit", JkCompanyAssessment::getManagementunit));
+        assembleData.add(setOrdinaryDate("mainbusinessdigitalcoverage", JkCompanyAssessment::getMainbusinessdigitalcoverage));
+        assembleData.add(setOrdinaryDate("subunitcount", JkCompanyAssessment::getSubunitcount));
+        assembleData.add(setOrdinaryDate("thirdlevelunitcount", JkCompanyAssessment::getThirdlevelunitcount));
+        assembleData.add(setOrdinaryDate("attachmentuploadstatus", JkCompanyAssessment::getAttachmentuploadstatus));
+        assembleData.add(setOrdinaryDate("predictedtotalscore", JkCompanyAssessment::getPredictedtotalscore));
+        assembleData.add(setOrdinaryDate("approvalstatus", JkCompanyAssessment::getApprovalstatus));
+        assembleData.add(setOrdinaryDate("datacode", JkCompanyAssessment::getDatacode));
+        assembleData.add(setOrdinaryDate("syncstatus", JkCompanyAssessment::getSyncstatus));
+        JkCompanyAssessment jkCompanyAssessment = jkCompanyAssessmentService.getById(id);
+        Map<String, Object> stringObjectMap = assembleApiData(jkCompanyAssessment, assembleData);
         return stringObjectMap;
     }
 

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

@@ -1,5 +1,6 @@
 package com.rongwei.bscommon.sys.strategy;
 
+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.dto.ApiCallDto;
@@ -24,9 +25,17 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC104ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
-    @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtZjfjflqdServiceImpl jtZjfjflqdService;
+
 
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC104ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtZjfjflqdServiceImpl jtZjfjflqdService) {
+        KC104ApiRequestAndProcessing.jtZjfjflqdService = jtZjfjflqdService;
+    }
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
@@ -45,6 +54,7 @@ public class KC104ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
+        jtZjfjflqdService.removeById(id);
         return R.ok();
     }
 }

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

@@ -1,6 +1,8 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.impl.JkCompanyAssessmentServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
+import com.rongwei.bsentity.domain.JkCompanyAssessment;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
@@ -24,17 +26,33 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC105ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JkCompanyAssessmentServiceImpl jkCompanyAssessmentService;
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC105ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
 
+    @Autowired
+    public void setjkCompanyAssessmentServiceImpl(JkCompanyAssessmentServiceImpl jkCompanyAssessmentService) {
+        KC105ApiRequestAndProcessing.jkCompanyAssessmentService = jkCompanyAssessmentService;
+    }
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+        assembleData.add(setOrdinaryDate("year", JkCompanyAssessment::getYear));
+        assembleData.add(setOrdinaryDate("managementunit", JkCompanyAssessment::getManagementunit));
+        assembleData.add(setOrdinaryDate("mainbusinessdigitalcoverage", JkCompanyAssessment::getMainbusinessdigitalcoverage));
+        assembleData.add(setOrdinaryDate("subunitcount", JkCompanyAssessment::getSubunitcount));
+        assembleData.add(setOrdinaryDate("thirdlevelunitcount", JkCompanyAssessment::getThirdlevelunitcount));
+        assembleData.add(setOrdinaryDate("attachmentuploadstatus", JkCompanyAssessment::getAttachmentuploadstatus));
+        assembleData.add(setOrdinaryDate("predictedtotalscore", JkCompanyAssessment::getPredictedtotalscore));
+        assembleData.add(setOrdinaryDate("approvalstatus", JkCompanyAssessment::getApprovalstatus));
+        assembleData.add(setOrdinaryDate("datacode", JkCompanyAssessment::getDatacode));
+        assembleData.add(setOrdinaryDate("syncstatus", JkCompanyAssessment::getSyncstatus));
+        JkCompanyAssessment jkCompanyAssessment = jkCompanyAssessmentService.getById(id);
+        Map<String, Object> stringObjectMap = assembleApiData(jkCompanyAssessment, assembleData);
         return stringObjectMap;
     }
 

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

@@ -1,5 +1,6 @@
 package com.rongwei.bscommon.sys.strategy;
 
+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.dto.ApiCallDto;
@@ -24,9 +25,17 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC106ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
-    @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtZjfjflqdServiceImpl jtZjfjflqdService;
+
 
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC106ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtZjfjflqdServiceImpl jtZjfjflqdService) {
+        KC106ApiRequestAndProcessing.jtZjfjflqdService = jtZjfjflqdService;
+    }
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
@@ -45,6 +54,7 @@ public class KC106ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
+        jtZjfjflqdService.removeById(id);
         return R.ok();
     }
 }

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

@@ -1,6 +1,8 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.impl.JkCompanyAssessmentServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
+import com.rongwei.bsentity.domain.JkCompanyAssessment;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
@@ -24,17 +26,33 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC107ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JkCompanyAssessmentServiceImpl jkCompanyAssessmentService;
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC107ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
 
+    @Autowired
+    public void setjkCompanyAssessmentServiceImpl(JkCompanyAssessmentServiceImpl jkCompanyAssessmentService) {
+        KC107ApiRequestAndProcessing.jkCompanyAssessmentService = jkCompanyAssessmentService;
+    }
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+        assembleData.add(setOrdinaryDate("year", JkCompanyAssessment::getYear));
+        assembleData.add(setOrdinaryDate("managementunit", JkCompanyAssessment::getManagementunit));
+        assembleData.add(setOrdinaryDate("mainbusinessdigitalcoverage", JkCompanyAssessment::getMainbusinessdigitalcoverage));
+        assembleData.add(setOrdinaryDate("subunitcount", JkCompanyAssessment::getSubunitcount));
+        assembleData.add(setOrdinaryDate("thirdlevelunitcount", JkCompanyAssessment::getThirdlevelunitcount));
+        assembleData.add(setOrdinaryDate("attachmentuploadstatus", JkCompanyAssessment::getAttachmentuploadstatus));
+        assembleData.add(setOrdinaryDate("predictedtotalscore", JkCompanyAssessment::getPredictedtotalscore));
+        assembleData.add(setOrdinaryDate("approvalstatus", JkCompanyAssessment::getApprovalstatus));
+        assembleData.add(setOrdinaryDate("datacode", JkCompanyAssessment::getDatacode));
+        assembleData.add(setOrdinaryDate("syncstatus", JkCompanyAssessment::getSyncstatus));
+        JkCompanyAssessment jkCompanyAssessment = jkCompanyAssessmentService.getById(id);
+        Map<String, Object> stringObjectMap = assembleApiData(jkCompanyAssessment, assembleData);
         return stringObjectMap;
     }
 

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

@@ -1,5 +1,6 @@
 package com.rongwei.bscommon.sys.strategy;
 
+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.dto.ApiCallDto;
@@ -24,9 +25,17 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC108ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
-    @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtZjfjflqdServiceImpl jtZjfjflqdService;
+
 
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC108ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtZjfjflqdServiceImpl jtZjfjflqdService) {
+        KC108ApiRequestAndProcessing.jtZjfjflqdService = jtZjfjflqdService;
+    }
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
@@ -45,6 +54,7 @@ public class KC108ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
+        jtZjfjflqdService.removeById(id);
         return R.ok();
     }
 }

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

@@ -1,6 +1,8 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.impl.JkCompanyAssessmentServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
+import com.rongwei.bsentity.domain.JkCompanyAssessment;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
@@ -24,17 +26,33 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC109ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JkCompanyAssessmentServiceImpl jkCompanyAssessmentService;
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC109ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
 
+    @Autowired
+    public void setjkCompanyAssessmentServiceImpl(JkCompanyAssessmentServiceImpl jkCompanyAssessmentService) {
+        KC109ApiRequestAndProcessing.jkCompanyAssessmentService = jkCompanyAssessmentService;
+    }
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+        assembleData.add(setOrdinaryDate("year", JkCompanyAssessment::getYear));
+        assembleData.add(setOrdinaryDate("managementunit", JkCompanyAssessment::getManagementunit));
+        assembleData.add(setOrdinaryDate("mainbusinessdigitalcoverage", JkCompanyAssessment::getMainbusinessdigitalcoverage));
+        assembleData.add(setOrdinaryDate("subunitcount", JkCompanyAssessment::getSubunitcount));
+        assembleData.add(setOrdinaryDate("thirdlevelunitcount", JkCompanyAssessment::getThirdlevelunitcount));
+        assembleData.add(setOrdinaryDate("attachmentuploadstatus", JkCompanyAssessment::getAttachmentuploadstatus));
+        assembleData.add(setOrdinaryDate("predictedtotalscore", JkCompanyAssessment::getPredictedtotalscore));
+        assembleData.add(setOrdinaryDate("approvalstatus", JkCompanyAssessment::getApprovalstatus));
+        assembleData.add(setOrdinaryDate("datacode", JkCompanyAssessment::getDatacode));
+        assembleData.add(setOrdinaryDate("syncstatus", JkCompanyAssessment::getSyncstatus));
+        JkCompanyAssessment jkCompanyAssessment = jkCompanyAssessmentService.getById(id);
+        Map<String, Object> stringObjectMap = assembleApiData(jkCompanyAssessment, assembleData);
         return stringObjectMap;
     }
 

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

@@ -1,5 +1,6 @@
 package com.rongwei.bscommon.sys.strategy;
 
+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.dto.ApiCallDto;
@@ -24,9 +25,17 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC110ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
-    @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtZjfjflqdServiceImpl jtZjfjflqdService;
+
 
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC110ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtZjfjflqdServiceImpl jtZjfjflqdService) {
+        KC110ApiRequestAndProcessing.jtZjfjflqdService = jtZjfjflqdService;
+    }
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
@@ -45,6 +54,7 @@ public class KC110ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
+        jtZjfjflqdService.removeById(id);
         return R.ok();
     }
 }

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

@@ -1,5 +1,7 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.JtWyysService;
+import com.rongwei.bscommon.sys.service.impl.JtXcjhqdServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
@@ -8,13 +10,9 @@ 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.List;
+import java.util.HashMap;
 import java.util.Map;
 
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -24,17 +22,32 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC112ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtWyysService jtWyysService;
+
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC112ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtWyysService jtWyysService) {
+        KC112ApiRequestAndProcessing.jtWyysService = jtWyysService;
+    }
 
-    @Override
-    public Map<String, Object> assembleData(String id,String dateId, String code) {
-        List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+
+    @Override
+    public Map<String, Object> assembleData(String id,String dataId, String code) {
+        Map<String, Object> stringObjectMap = new HashMap<String, Object>() {{
+            put("INDEXID", id);
+            put("DATAID", dataId);
+        }};
         return stringObjectMap;
     }
 
@@ -43,7 +56,9 @@ public class KC112ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
-        ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        ApiReturnDto apiReturnDto = this.attendanceAssessmentSdk.apiCall(paramVo);
+        // 后续逻辑处理
+        jtWyysService.removeById(id);
         // 后续逻辑处理
         return R.ok();
     }

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

@@ -1,20 +1,23 @@
 package com.rongwei.bscommon.sys.strategy;
 
+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.JtGsjtbsj;
+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;
 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
@@ -24,17 +27,36 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC113ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtYjbhglService jtYjbhglService;
+
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC113ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtYjbhglService jtYjbhglService) {
+        KC113ApiRequestAndProcessing.jtYjbhglService = jtYjbhglService;
+    }
 
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+        assembleData.add(setOrdinaryDate("DATAID", JtYjbhgl::getDataid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtYjbhgl::getId));
+        assembleData.add(setOrdinaryDate("xmbh", JtYjbhgl::getXmbh));
+        assembleData.add(setOrdinaryDate("xmmc", JtYjbhgl::getXmmc));
+        assembleData.add(setOrdinaryDate("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));
+        JtYjbhgl jtYjbhgl1 = jtYjbhglService.getById(id);
+        Map<String, Object> stringObjectMap = assembleApiData(jtYjbhgl1, assembleData);
         return stringObjectMap;
     }
 
@@ -45,6 +67,16 @@ public class KC113ApiRequestAndProcessing 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");
+        }
+
+
+
+        jtYjbhglService.update(new LambdaUpdateWrapper<JtYjbhgl>()
+                .eq(JtYjbhgl::getId, id).set(JtYjbhgl::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -1,5 +1,7 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.JtWyysService;
+import com.rongwei.bscommon.sys.service.JtYjbhglService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
@@ -10,11 +12,10 @@ 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
@@ -24,17 +25,32 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC114ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+
+
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtYjbhglService jtYjbhglService;
+
+
+
+    @Autowired
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC114ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setJtXcjhqdServiceImpl(JtYjbhglService jtYjbhglService) {
+        KC114ApiRequestAndProcessing.jtYjbhglService = jtYjbhglService;
+    }
 
-    @Override
-    public Map<String, Object> assembleData(String id,String dateId, String code) {
-        List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+    @Override
+    public Map<String, Object> assembleData(String id,String dataId, String code) {
+        Map<String, Object> stringObjectMap = new HashMap<String, Object>() {{
+            put("INDEXID", id);
+            put("DATAID", dataId);
+        }};
         return stringObjectMap;
     }
 
@@ -45,6 +61,7 @@ public class KC114ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         paramVo.setApiCode(code);
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
+        jtYjbhglService.removeById(id);
         return R.ok();
     }
 }

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

@@ -1,11 +1,17 @@
 package com.rongwei.bscommon.sys.strategy;
 
+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;
 
@@ -13,8 +19,9 @@ 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.ApiDataOrgUtil.setDatePattern;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
 
 /**
  * AssembleK34ApiData class
@@ -24,17 +31,39 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC115ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtScsdlService jtScsdlService;
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC115ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtScsdlService jtScsdlService) {
+        KC115ApiRequestAndProcessing.jtScsdlService = jtScsdlService;
+    }
 
     @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::getXmbh));
+        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(setDatePattern("pzsj", JtScsdl::getPzsj,DATE_PATTERN_YMD));
+        assembleData.add(setDatePattern("zgcshsqrqzgzsj", JtScsdl::getQzsj,DATE_PATTERN_YMD));
 
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+        JtScsdl jtScsdl= jtScsdlService.getById(id);
+        Map<String, Object> stringObjectMap = assembleApiData(jtScsdl, assembleData);
         return stringObjectMap;
     }
 
@@ -45,6 +74,14 @@ public class KC115ApiRequestAndProcessing 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");
+        }
+        jtScsdlService.update(new LambdaUpdateWrapper<JtScsdl>()
+                .eq(JtScsdl::getId, id).set(JtScsdl::getDataid, realDataId));
         return R.ok();
     }
 }
+

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

@@ -1,5 +1,7 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.JtScsdlService;
+import com.rongwei.bscommon.sys.service.JtWyysService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
@@ -10,12 +12,9 @@ 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
  *
@@ -24,17 +23,31 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC116ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtScsdlService jtScsdlService;
+
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC116ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtScsdlService jtScsdlService) {
+        KC116ApiRequestAndProcessing.jtScsdlService = jtScsdlService;
+    }
 
-    @Override
-    public Map<String, Object> assembleData(String id,String dateId, String code) {
-        List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+
+    @Override
+    public Map<String, Object> assembleData(String id,String dataId, String code) {
+        Map<String, Object> stringObjectMap = new HashMap<String, Object>() {{
+            put("INDEXID", id);
+            put("DATAID", dataId);
+        }};
         return stringObjectMap;
     }
 
@@ -43,7 +56,9 @@ public class KC116ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
-        ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        ApiReturnDto apiReturnDto = this.attendanceAssessmentSdk.apiCall(paramVo);
+        // 后续逻辑处理
+        jtScsdlService.removeById(id);
         // 后续逻辑处理
         return R.ok();
     }

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

@@ -1,11 +1,18 @@
 package com.rongwei.bscommon.sys.strategy;
 
+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.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;
 
@@ -13,8 +20,9 @@ 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.ApiDataOrgUtil.setDatePattern;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
 
 /**
  * AssembleK34ApiData class
@@ -24,17 +32,34 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC117ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtWtbhglService jtWtbhglService;
+
+
+    @Autowired
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC117ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setJtXcjhqdServiceImpl(JtWtbhglService jtWtbhglService) {
+        KC117ApiRequestAndProcessing.jtWtbhglService = jtWtbhglService;
+    }
 
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+        assembleData.add(setOrdinaryDate("DATAID", JtWtbhgl::getDataid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtWtbhgl::getId));
+        assembleData.add(setOrdinaryDate("xmbh", JtWtbhgl::getXmbh));
+        assembleData.add(setOrdinaryDate("xmmc", JtWtbhgl::getXmmc));
+        assembleData.add(setOrdinaryDate("wtfkfzr", JtWtbhgl::getWtfkfzr));
+        assembleData.add(setOrdinaryDate("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);
+        Map<String, Object> stringObjectMap = assembleApiData(jtWtbhgl, assembleData);
         return stringObjectMap;
     }
 
@@ -45,6 +70,14 @@ public class KC117ApiRequestAndProcessing 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");
+        }
+        jtWtbhglService.update(new LambdaUpdateWrapper<JtWtbhgl>()
+                .eq(JtWtbhgl::getId, id).set(JtWtbhgl::getDataid, realDataId));
         return R.ok();
     }
 }
+

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

@@ -1,5 +1,7 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.JtWtbhglService;
+import com.rongwei.bscommon.sys.service.JtWyysService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
@@ -10,11 +12,10 @@ 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
@@ -24,17 +25,31 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC118ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtWtbhglService jtWtbhglService;
+
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC118ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtWtbhglService jtWtbhglService) {
+        KC118ApiRequestAndProcessing.jtWtbhglService = jtWtbhglService;
+    }
 
-    @Override
-    public Map<String, Object> assembleData(String id,String dateId, String code) {
-        List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+
+    @Override
+    public Map<String, Object> assembleData(String id,String dataId, String code) {
+        Map<String, Object> stringObjectMap = new HashMap<String, Object>() {{
+            put("INDEXID", id);
+            put("DATAID", dataId);
+        }};
         return stringObjectMap;
     }
 
@@ -43,7 +58,9 @@ public class KC118ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
-        ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        ApiReturnDto apiReturnDto = this.attendanceAssessmentSdk.apiCall(paramVo);
+        // 后续逻辑处理
+        jtWtbhglService.removeById(id);
         // 后续逻辑处理
         return R.ok();
     }

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

@@ -1,11 +1,18 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.rongwei.bscommon.sys.service.JtScbhglService;
+import com.rongwei.bscommon.sys.service.JtScbhglService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtScbhgl;
+import com.rongwei.bsentity.domain.JtScbhgl;
 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 +20,9 @@ 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.ApiDataOrgUtil.setDatePattern;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
 
 /**
  * AssembleK34ApiData class
@@ -24,17 +32,34 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC119ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtScbhglService jtScbhglService;
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC119ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtScbhglService jtScbhglService) {
+        KC119ApiRequestAndProcessing.jtScbhglService = jtScbhglService;
+    }
 
     @Override
     public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
-
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
-
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+        assembleData.add(setOrdinaryDate("DATAID", JtScbhgl::getDataid));
+        assembleData.add(setOrdinaryDate("INDEXID", JtScbhgl::getId));
+        assembleData.add(setOrdinaryDate("xmbh", JtScbhgl::getXmbh));
+        assembleData.add(setOrdinaryDate("xmmc", JtScbhgl::getXmmc));
+        assembleData.add(setOrdinaryDate("wbhfyjfzr", JtScbhgl::getWbhfyjfzr));
+        assembleData.add(setOrdinaryDate("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);
+        Map<String, Object> stringObjectMap = assembleApiData(jtScbhgl, assembleData);
         return stringObjectMap;
     }
 
@@ -45,6 +70,13 @@ public class KC119ApiRequestAndProcessing 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");
+        }
+        jtScbhglService.update(new LambdaUpdateWrapper<JtScbhgl>()
+                .eq(JtScbhgl::getId, id).set(JtScbhgl::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -1,5 +1,7 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.JtScbhglService;
+import com.rongwei.bscommon.sys.service.JtWyysService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
@@ -10,11 +12,10 @@ 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
@@ -24,17 +25,31 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC120ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtScbhglService jtScbhglService;
+
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC120ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtScbhglService jtScbhglService) {
+        KC120ApiRequestAndProcessing.jtScbhglService = jtScbhglService;
+    }
 
-    @Override
-    public Map<String, Object> assembleData(String id,String dateId, String code) {
-        List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+
+    @Override
+    public Map<String, Object> assembleData(String id,String dataId, String code) {
+        Map<String, Object> stringObjectMap = new HashMap<String, Object>() {{
+            put("INDEXID", id);
+            put("DATAID", dataId);
+        }};
         return stringObjectMap;
     }
 
@@ -43,7 +58,9 @@ public class KC120ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
-        ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        ApiReturnDto apiReturnDto = this.attendanceAssessmentSdk.apiCall(paramVo);
+        // 后续逻辑处理
+        jtScbhglService.removeById(id);
         // 后续逻辑处理
         return R.ok();
     }

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

@@ -1,11 +1,18 @@
 package com.rongwei.bscommon.sys.strategy;
 
+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.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;
 
@@ -13,8 +20,9 @@ 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.ApiDataOrgUtil.setDatePattern;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
 
 /**
  * AssembleK34ApiData class
@@ -24,27 +32,50 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC121ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtSjjdqdService jtSjjdqdService;
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC121ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
 
-    @Override
-    public Map<String, Object> assembleData(String id,String dataId,String code) {
-        List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtSjjdqdService jtSjjdqdService) {
+        KC121ApiRequestAndProcessing.jtSjjdqdService = jtSjjdqdService;
+    }
 
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+    @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::getXmbh));
+        assembleData.add(setOrdinaryDate("xmmc", JtSjjdqd::getXmmc));
+        assembleData.add(setOrdinaryDate("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);
+        Map<String, Object> stringObjectMap = assembleApiData(jtSjjdqd, assembleData);
         return stringObjectMap;
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id,String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         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");
+        }
+        jtSjjdqdService.update(new LambdaUpdateWrapper<JtSjjdqd>()
+                .eq(JtSjjdqd::getId, id).set(JtSjjdqd::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -1,20 +1,15 @@
 package com.rongwei.bscommon.sys.strategy;
 
+import com.rongwei.bscommon.sys.service.JtSjjdqdService;
 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.List;
+import java.util.HashMap;
 import java.util.Map;
 
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.assembleApiData;
-import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
 
 /**
  * AssembleK34ApiData class
@@ -24,26 +19,42 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDate;
  */
 @Component
 public class KC122ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtSjjdqdService jtSjjdqdService;
+
+
+
     @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC122ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
+
+
+    @Autowired
+    public void setJtXcjhqdServiceImpl(JtSjjdqdService jtSjjdqdService) {
+        KC122ApiRequestAndProcessing.jtSjjdqdService = jtSjjdqdService;
+    }
 
-    @Override
-    public Map<String, Object> assembleData(String id,String dataId,String code) {
-        List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
-        assembleData.add(setOrdinaryDate("DATAID", JtGsjtbsj::getDataid));
 
-        JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+
+    @Override
+    public Map<String, Object> assembleData(String id,String dataId, String code) {
+        Map<String, Object> stringObjectMap = new HashMap<String, Object>() {{
+            put("INDEXID", id);
+            put("DATAID", dataId);
+        }};
         return stringObjectMap;
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id,String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
-        ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
+        ApiReturnDto apiReturnDto = this.attendanceAssessmentSdk.apiCall(paramVo);
+        // 后续逻辑处理
+        jtSjjdqdService.removeById(id);
         // 后续逻辑处理
         return R.ok();
     }

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

@@ -83,7 +83,6 @@ public class AttendanceAssessmentSdk {
         this.businessDataMap.put("APPID", this.appId);
         this.businessDataMap.put("SECRET", this.secret);
         this.apiVirtualDirectoryMap = JSONUtil.toBean(apiReturnJson.getJSONObject("api_virtual_directory"), Map.class);
-        System.out.println("黑名单系统对接配置初始化完毕");
     }
 
     public ApiReturnDto apiCall(ApiCallDto paramVo) {

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

@@ -9,126 +9,132 @@ import java.util.Date;
 import lombok.Data;
 
 /**
- * 
+ *
  * @TableName jk_annualplan
  */
 @TableName(value ="jk_annualplan")
 @Data
 public class JkAnnualplan implements Serializable {
     /**
-     * 
+     * 主键
      */
     @TableField(value = "ID")
     private Integer id;
 
     /**
-     * 
+     * 集团数据编码
      */
     @TableField(value = "GROUPCODE")
     private String groupcode;
 
     /**
-     * 
+     *年份
      */
     @TableField(value = "YEAR")
     private Integer year;
 
     /**
-     * 
+     *管理单位
      */
     @TableField(value = "MANAGEMENTUNIT")
     private String managementunit;
 
     /**
-     * 
+     *计划编号
      */
     @TableField(value = "PLANCODE")
     private String plancode;
 
     /**
-     * 
+     *计划名称
      */
     @TableField(value = "PLANNAME")
     private String planname;
 
     /**
-     * 
+     *是否涵盖技术标准化，TRUE表示是，FALSE表示否
      */
     @TableField(value = "INCLUDENTECHNICALSTANDARDIZATION")
     private String includentechnicalstandardization;
 
     /**
-     * 
+     *计划完成时间
      */
     @TableField(value = "PLANNEDCOMPLETIONDATE")
     private Date plannedcompletiondate;
 
     /**
-     * 
+     *实际完成时间，可以为空
      */
     @TableField(value = "ACTUALCOMPLETIONDATE")
     private Date actualcompletiondate;
 
     /**
-     * 
+     *租户id
      */
     @TableField(value = "TENANTID")
     private String tenantid;
 
     /**
-     * 
+     *扩展json格式配置
      */
     @TableField(value = "ROPTION")
     private String roption;
 
     /**
-     * 
+     *是否删除Y/N
      */
     @TableField(value = "DELETED")
     private String deleted;
 
     /**
-     * 
+     *备注
      */
     @TableField(value = "REMARK")
     private String remark;
 
     /**
-     * 
+     *创建时间
      */
     @TableField(value = "CREATEDATE")
     private Date createdate;
 
     /**
-     * 
+     *创建用户ID
      */
     @TableField(value = "CREATEUSERID")
     private String createuserid;
 
     /**
-     * 
+     *修改时间
      */
     @TableField(value = "MODIFYDATE")
     private Date modifydate;
 
     /**
-     * 
+     *修改用户ID
      */
     @TableField(value = "MODIFYUSERID")
     private String modifyuserid;
 
     /**
-     * 
+     *创建人
      */
     @TableField(value = "CREATEUSERNAME")
     private String createusername;
 
     /**
-     * 
+     *修改人
      */
     @TableField(value = "MODIFYUSERNAME")
     private String modifyusername;
 
+    /**
+     *同步状态
+     */
+    @TableField(value = "SYNCSTATE")
+    private String syncstate;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

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

@@ -9,134 +9,134 @@ import java.util.Date;
 import lombok.Data;
 
 /**
- * 
+ *
  * @TableName jk_company_assessment
  */
 @TableName(value ="jk_company_assessment")
 @Data
 public class JkCompanyAssessment implements Serializable {
     /**
-     * 
+     *
      */
     @TableField(value = "ID")
     private Integer id;
 
     /**
-     * 
+     * 年份
      */
     @TableField(value = "YEAR")
     private Integer year;
 
     /**
-     * 
+     * 管理单位
      */
     @TableField(value = "MANAGEMENTUNIT")
     private String managementunit;
 
     /**
-     * 
+     *主营业务产品数字化覆盖率
      */
     @TableField(value = "MAINBUSINESSDIGITALCOVERAGE")
     private Double mainbusinessdigitalcoverage;
 
     /**
-     * 
+     *所属单位/分院数量
      */
     @TableField(value = "SUBUNITCOUNT")
     private Integer subunitcount;
 
     /**
-     * 
+     *本年度考核三级单位数量
      */
     @TableField(value = "THIRDLEVELUNITCOUNT")
     private Integer thirdlevelunitcount;
 
     /**
-     * 
+     *附件上传情况
      */
     @TableField(value = "ATTACHMENTUPLOADSTATUS")
     private String attachmentuploadstatus;
 
     /**
-     * 
+     *预测总评分
      */
     @TableField(value = "PREDICTEDTOTALSCORE")
     private Double predictedtotalscore;
 
     /**
-     * 
+     *审批状态
      */
     @TableField(value = "APPROVALSTATUS")
     private String approvalstatus;
 
     /**
-     * 
+     *数据编码
      */
     @TableField(value = "DATACODE")
     private String datacode;
 
     /**
-     * 
+     *同步状态
      */
     @TableField(value = "SYNCSTATUS")
     private String syncstatus;
 
     /**
-     * 
+     *租户 id
      */
     @TableField(value = "TENANTID")
     private String tenantid;
 
     /**
-     * 
+     *扩展json格式配置
      */
     @TableField(value = "ROPTION")
     private String roption;
 
     /**
-     * 
+     *是否删除Y/N
      */
     @TableField(value = "DELETED")
     private String deleted;
 
     /**
-     * 
+     *备注
      */
     @TableField(value = "REMARK")
     private String remark;
 
     /**
-     * 
+     *
      */
     @TableField(value = "CREATEDATE")
     private Date createdate;
 
     /**
-     * 
+     *
      */
     @TableField(value = "CREATEUSERID")
     private String createuserid;
 
     /**
-     * 
+     *
      */
     @TableField(value = "MODIFYDATE")
     private Date modifydate;
 
     /**
-     * 
+     *
      */
     @TableField(value = "MODIFYUSERID")
     private String modifyuserid;
 
     /**
-     * 
+     *
      */
     @TableField(value = "CREATEUSERNAME")
     private String createusername;
 
     /**
-     * 
+     *
      */
     @TableField(value = "MODIFYUSERNAME")
     private String modifyusername;

pom.xml

@@ -37,6 +37,12 @@
             <version>8.1.1.193</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>sqljdbc4</artifactId>
+            <version>4.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>