feature 代码提交

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

@@ -1,12 +1,12 @@
 package com.rongwei.bscommon.sys.dao;
 
-import com.rongwei.bsentity.domain.JtJscgpyqd;
+import com.rongwei.bsentity.domain.JtJslcgpy;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @Entity com.rongwei.bsentity.domain.JtJscgpyqd
  */
-public interface JtJscgpyqdMapper extends BaseMapper<JtJscgpyqd> {
+public interface JtJslcgpyMapper extends BaseMapper<JtJslcgpy> {
 
 }
 

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

@@ -1,11 +1,11 @@
 package com.rongwei.bscommon.sys.service;
 
-import com.rongwei.bsentity.domain.JtJscgpyqd;
+import com.rongwei.bsentity.domain.JtJslcgpy;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  *
  */
-public interface JtJscgpyqdService extends IService<JtJscgpyqd> {
+public interface JtJslcgpyService extends IService<JtJslcgpy> {
 
 }

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

@@ -1,20 +0,0 @@
-package com.rongwei.bscommon.sys.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bsentity.domain.JtJscgpyqd;
-import com.rongwei.bscommon.sys.service.JtJscgpyqdService;
-import com.rongwei.bscommon.sys.dao.JtJscgpyqdMapper;
-import org.springframework.stereotype.Service;
-
-/**
- *
- */
-@Service
-public class JtJscgpyqdServiceImpl extends ServiceImpl<JtJscgpyqdMapper, JtJscgpyqd>
-implements JtJscgpyqdService{
-
-}
-
-
-
-

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

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bsentity.domain.JtJslcgpy;
+import com.rongwei.bscommon.sys.service.JtJslcgpyService;
+import com.rongwei.bscommon.sys.dao.JtJslcgpyMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class JtJslcgpyServiceImpl extends ServiceImpl<JtJslcgpyMapper, JtJslcgpy>
+implements JtJslcgpyService {
+
+}
+
+
+
+

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

@@ -68,7 +68,7 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
     @Autowired
     private JtZjfjflqdServiceImpl jtZjfjflqdService;
     @Autowired
-    private JtJscgpyqdServiceImpl jtJscgpyqdService;
+    private JtJslcgpyServiceImpl jtJscgpyqdService;
     @Autowired
     private JtYxwjfbqdServiceImpl jtYxwjfbqdService;
     @Autowired
@@ -286,10 +286,10 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
         }
 
         //技术成果评优 KC137
-        List<JtJscgpyqd> jtJscgpyqdList = jtJscgpyqdService.list(new LambdaQueryWrapper<JtJscgpyqd>().eq(JtJscgpyqd::getMainid, ids).eq(BaseDo::getDeleted, "0"));
-        if (!jtJscgpyqdList.isEmpty()) {
+        List<JtJslcgpy> jtJslcgpyList = jtJscgpyqdService.list(new LambdaQueryWrapper<JtJslcgpy>().eq(JtJslcgpy::getMainid, ids).eq(BaseDo::getDeleted, "0"));
+        if (!jtJslcgpyList.isEmpty()) {
             // 遍历每一行数据
-            for (JtJscgpyqd jtZdxmszmn : jtJscgpyqdList) {
+            for (JtJslcgpy jtZdxmszmn : jtJslcgpyList) {
                 String id = jtZdxmszmn.getId();
                 this.pushDataSync(id, "KC137");
             }
@@ -320,9 +320,9 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
             this.pushDataSync(JtZjfjflqdList.stream().map(JtZjfjflqd::getId).collect(Collectors.joining(",")), "KC135");
         }
         //技术成果评优 KC137
-        List<JtJscgpyqd> JtJscgpyqdList = jtJscgpyqdService.list(new LambdaQueryWrapper<JtJscgpyqd>().eq(JtJscgpyqd::getMainid, id).eq(BaseDo::getDeleted, "0"));
-        if (!JtJscgpyqdList.isEmpty()) {
-            this.pushDataSync(JtJscgpyqdList.stream().map(JtJscgpyqd::getId).collect(Collectors.joining(",")), "KC137");
+        List<JtJslcgpy> jtJslcgpyList = jtJscgpyqdService.list(new LambdaQueryWrapper<JtJslcgpy>().eq(JtJslcgpy::getMainid, id).eq(BaseDo::getDeleted, "0"));
+        if (!jtJslcgpyList.isEmpty()) {
+            this.pushDataSync(jtJslcgpyList.stream().map(JtJslcgpy::getId).collect(Collectors.joining(",")), "KC137");
         }
         //有效文件 KC139
         List<JtYxwjfbqd> JtYxwjfbqdList = jtYxwjfbqdService.list(new LambdaQueryWrapper<JtYxwjfbqd>().eq(JtYxwjfbqd::getMainid, id).eq(BaseDo::getDeleted, "0"));
@@ -381,10 +381,10 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
             this.deleteDataSync(ids, dataIds, "KC136");
         }
         //技术成果评优 KC138
-        List<JtJscgpyqd> JtJscgpyqdList = jtJscgpyqdService.list(new LambdaQueryWrapper<JtJscgpyqd>().eq(JtJscgpyqd::getMainid, id).eq(BaseDo::getDeleted, "0"));
-        if (!JtJscgpyqdList.isEmpty()) {
-            List<String> ids = JtJscgpyqdList.stream().map(JtJscgpyqd::getId).collect(Collectors.toList());
-            List<String> dataIds = JtJscgpyqdList.stream().map(data -> data.getDataid() == null ? " " : data.getDataid()).collect(Collectors.toList());
+        List<JtJslcgpy> jtJslcgpyList = jtJscgpyqdService.list(new LambdaQueryWrapper<JtJslcgpy>().eq(JtJslcgpy::getMainid, id).eq(BaseDo::getDeleted, "0"));
+        if (!jtJslcgpyList.isEmpty()) {
+            List<String> ids = jtJslcgpyList.stream().map(JtJslcgpy::getId).collect(Collectors.toList());
+            List<String> dataIds = jtJslcgpyList.stream().map(data -> data.getDataid() == null ? " " : data.getDataid()).collect(Collectors.toList());
             this.deleteDataSync(ids, dataIds, "KC138");
         }
         //有效文件 KC140
@@ -430,13 +430,6 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
             List<String> dataIds = jtNdjhqdList.stream().map(data -> data.getDataid() == null ? " " : data.getDataid()).collect(Collectors.toList());
             this.deleteDataSync(ids, dataIds, "KC129");
         }
-        //技术成果评优 KC137
-        List<JtJscgpyqd> jtJscgpyqdList = jtJscgpyqdService.list(new LambdaQueryWrapper<JtJscgpyqd>().eq(JtJscgpyqd::getMainid, id).eq(BaseDo::getDeleted, "0"));
-        if (!JtJscgpyqdList.isEmpty()) {
-            List<String> ids = jtNdjhqdList.stream().map(JtNdjhqd::getId).collect(Collectors.toList());
-            List<String> dataIds = jtNdjhqdList.stream().map(data -> data.getDataid() == null ? " " : data.getDataid()).collect(Collectors.toList());
-            this.deleteDataSync(ids, dataIds, "KC137");
-        }
         return R.ok();
     }
 

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

@@ -1,9 +1,9 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.rongwei.bscommon.sys.service.impl.JtJscgpyqdServiceImpl;
+import com.rongwei.bscommon.sys.service.impl.JtJslcgpyServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
-import com.rongwei.bsentity.domain.JtJscgpyqd;
+import com.rongwei.bsentity.domain.JtJslcgpy;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
@@ -28,7 +28,7 @@ import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTE
 @Component
 public class KC137ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
     private static AttendanceAssessmentSdk attendanceAssessmentSdk;
-    private static JtJscgpyqdServiceImpl jtJscgpyqdService;
+    private static JtJslcgpyServiceImpl jtJscgpyqdService;
 
     @Autowired
     public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
@@ -36,20 +36,20 @@ public class KC137ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Autowired
-    public void setJtXcjhqdServiceImpl(JtJscgpyqdServiceImpl jtJscgpyqdService) {
+    public void setJtXcjhqdServiceImpl(JtJslcgpyServiceImpl jtJscgpyqdService) {
         KC137ApiRequestAndProcessing.jtJscgpyqdService = jtJscgpyqdService;
     }
 
     @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(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);
+        assembleData.add(setOrdinaryData("INDEXID", JtJslcgpy::getId));
+        assembleData.add(setOrdinaryData("DATAID", JtJslcgpy::getDataid));
+        assembleData.add(setOrdinaryData("cgpyhdmc", JtJslcgpy::getCgpyhdmc));
+        assembleData.add(setOrdinaryData("pyfl", JtJslcgpy::getPyfl));
+        assembleData.add(setDatePattern("kzsj", JtJslcgpy::getKzsj, DATE_PATTERN_YMD));
+        assembleData.add(setFileInfo("zmwjtzgg", JtJslcgpy::getZmwj, true));
+        JtJslcgpy jtGsjtbsj = jtJscgpyqdService.getById(id);
         Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
         return stringObjectMap;
     }
@@ -62,10 +62,10 @@ public class KC137ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
         String realDataId = this.apiCallSuffixGetSyncStateHandle(apiReturnDto);
-        jtJscgpyqdService.update(new LambdaUpdateWrapper<JtJscgpyqd>()
-                .eq(JtJscgpyqd::getId, id)
-                .set(JtJscgpyqd::getSyncstate,  apiReturnDto.isSuccessful() ? "20" : "40")
-                .set(StringUtils.isNotBlank(realDataId),JtJscgpyqd::getDataid, realDataId));
+        jtJscgpyqdService.update(new LambdaUpdateWrapper<JtJslcgpy>()
+                .eq(JtJslcgpy::getId, id)
+                .set(JtJslcgpy::getSyncstate, apiReturnDto.isSuccessful() ? "20" : "40")
+                .set(StringUtils.isNotBlank(realDataId), JtJslcgpy::getDataid, realDataId));
         return R.ok();
     }
 }

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

@@ -1,6 +1,6 @@
 package com.rongwei.bscommon.sys.strategy.api;
 
-import com.rongwei.bscommon.sys.service.impl.JtJscgpyqdServiceImpl;
+import com.rongwei.bscommon.sys.service.impl.JtJslcgpyServiceImpl;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.domain.JtGsjtbsj;
 import com.rongwei.bsentity.dto.ApiCallDto;
@@ -26,7 +26,7 @@ import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryData;
 @Component
 public class KC138ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
     private static AttendanceAssessmentSdk attendanceAssessmentSdk;
-    private static JtJscgpyqdServiceImpl jtJscgpyqdService;
+    private static JtJslcgpyServiceImpl jtJscgpyqdService;
 
     @Autowired
     public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
@@ -34,7 +34,7 @@ public class KC138ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Autowired
-    public void setJtXcjhqdServiceImpl(JtJscgpyqdServiceImpl jtJscgpyqdService) {
+    public void setJtXcjhqdServiceImpl(JtJslcgpyServiceImpl jtJscgpyqdService) {
         KC138ApiRequestAndProcessing.jtJscgpyqdService = jtJscgpyqdService;
     }
 

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

@@ -1,7 +1,7 @@
 package com.rongwei.bscommon.sys.strategy.scoreCalculation;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.rongwei.bscommon.sys.service.JtJscgpyqdService;
+import com.rongwei.bscommon.sys.service.JtJslcgpyService;
 import com.rongwei.bsentity.domain.*;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
 @Service
 public class ScoreCalculationServiceNum32 implements ScoreCalculationService {
     @Autowired
-    private JtJscgpyqdService jtJscgpyqdService;
+    private JtJslcgpyService jtJslcgpyService;
 
     /**
      * 识别填报的评优分类，大于等于3类，不扣分，少一类扣1分。
@@ -41,8 +41,8 @@ public class ScoreCalculationServiceNum32 implements ScoreCalculationService {
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
         String errorMsg = "";
-        List<JtJscgpyqd> list = jtJscgpyqdService.list(new LambdaQueryWrapper<JtJscgpyqd>().eq(JtJscgpyqd::getDeleted, "0").eq(JtJscgpyqd::getMainid, jtGsjtbsj.getId()));
-        Set<String> collect = list.stream().map(JtJscgpyqd::getPyfl).collect(Collectors.toSet());
+        List<JtJslcgpy> list = jtJslcgpyService.list(new LambdaQueryWrapper<JtJslcgpy>().eq(JtJslcgpy::getDeleted, "0").eq(JtJslcgpy::getMainid, jtGsjtbsj.getId()));
+        Set<String> collect = list.stream().map(JtJslcgpy::getPyfl).collect(Collectors.toSet());
         if (collect.size() >= 3) {
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         } else {

jsglkh-common/src/main/resources/mybatis/sys/JtJscgpyqdMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.rongwei.bscommon.sys.dao.JtJscgpyqdMapper">
+<mapper namespace="com.rongwei.bscommon.sys.dao.JtJslcgpyMapper">
 
-    <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtJscgpyqd">
+    <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtJslcgpy">
             <id property="id" column="ID" jdbcType="VARCHAR"/>
             <result property="dataid" column="DATAID" jdbcType="VARCHAR"/>
             <result property="indexid" column="INDEXID" jdbcType="VARCHAR"/>

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

@@ -1,89 +1,71 @@
 package com.rongwei.bsentity.domain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 技术成果评优清单
- * @TableName jt_jscgpyqd
+ * @TableName jt_jslcgpy
  */
-@TableName(value ="jt_jscgpyqd")
+@TableName(value = "jt_jslcgpy")
 @Data
-public class JtJscgpyqd extends BaseDo implements Serializable {
+public class JtJslcgpy extends BaseDo implements Serializable {
+    private static final long serialVersionUID = 1L;
     /**
      * 主键ID
      */
-    @TableId(value = "ID")
     private String id;
-
     /**
      * 数据编码
      */
-    @TableField(value = "DATAID")
     private String dataid;
-
     /**
      * 数据主键
      */
-    @TableField(value = "INDEXID")
     private String indexid;
-
     /**
      * 租户id
      */
-    @TableField(value = "TENANTID")
     private String tenantid;
-
     /**
      * 扩展json格式配置
      */
-    @TableField(value = "ROPTION")
     private String roption;
-
-
     /**
      * 成果评优活动名称
      */
-    @TableField(value = "CGPYHDMC")
     private String cgpyhdmc;
-
     /**
      * 评优分类
      */
-    @TableField(value = "PYFL")
     private String pyfl;
-
     /**
-     * 开展时间
+     * 同步状态
      */
-    @TableField(value = "KZSJ")
-    private Date kzsj;
-
+    private String syncstate;
     /**
-     * 证明文件（通知公告）
+     * 年份
      */
-    @TableField(value = "ZMWJTZGG")
-    private String zmwjtzgg;
-
+    private String year;
     /**
-     * 同步状态
+     * 管理单位
      */
-    @TableField(value = "SYNCSTATE")
-    private String syncstate;
-
+    private String gldw;
     /**
-     * 主表ID
+     * 公司考核管理ID
      */
-    @TableField(value = "MAINID")
     private String mainid;
+    /**
+     * 开展时间
+     */
+    private Date kzsj;
+    /**
+     * 证明文件
+     */
+    private String zmwj;
 
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
 }