Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,98 @@
+package com.rongwei.bscommon.sys.strategy.scoreCalculation;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.rongwei.bscommon.sys.service.JtFjglxmService;
+import com.rongwei.bscommon.sys.service.JtNdjhqdService;
+import com.rongwei.bsentity.domain.*;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+import com.rongwei.rwcommon.base.BaseDo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.LinkedList;
+import java.util.List;
+
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.THREE_SOURCE;
+import static com.rongwei.bscommon.sys.utils.JXKHUtils.CALCULATE_Y3;
+
+
+/**
+ * ScoreCalculationServiceNum1 class
+ *
+ * @author XH
+ * @date 2024/12/09
+ */
+@Service
+public class ScoreCalculationServiceNum22 implements ScoreCalculationService {
+    @Autowired
+    private JtNdjhqdService jtNdjhqdService;
+    @Autowired
+    private JtFjglxmService jtFjglxmService;
+
+    /**
+     * 年度计划为空扣3分。
+     * 计划完成时间不为空，实际完成时间为空扣1分/项。
+     * 若存在“是否属于新兴业务项目”=是（分级管理-项目清单），技术类型（是否涵盖技术标准化）字段没有“是”的数据，扣1分。
+     *
+     * @param khbmList
+     * @param jtKhxmList
+     * @param jtGsjtbsj
+     * @param jkAssessmentRules
+     * @return
+     */
+    @Override
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+                                          JkAssessmentRules jkAssessmentRules,
+                                          SysUserVo currentUser) {
+        // 考核得分
+        BigDecimal finalScore = jkAssessmentRules.getWeight();
+        // 扣分细则
+        String errorMsg = "";
+
+        //年度计划为空扣3分。
+        if (ObjectUtil.isEmpty(jtGsjtbsj.getNdjh())) {
+            finalScore = finalScore.subtract(THREE_SOURCE);
+            errorMsg = "公司级：年度计划为空";
+            return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
+        }
+
+        List<JtNdjhqd> list = jtNdjhqdService.list(new LambdaQueryWrapper<JtNdjhqd>()
+                .eq(JtNdjhqd::getDeleted, "0")
+                .in(JtNdjhqd::getMainid, jtGsjtbsj.getId()));
+        //计划完成时间不为空，实际完成时间为空扣1分/项。
+        List<String> jhmcList = new LinkedList<>();
+        for (JtNdjhqd jtNdjhqd : list) {
+            if (jhmcList.contains(jtNdjhqd.getJhmc())) {
+                continue;
+            }
+            jhmcList.add(jtNdjhqd.getJhmc());
+            if (ObjectUtil.isNotEmpty(jtNdjhqd.getJhwcsj()) && ObjectUtil.isEmpty(jtNdjhqd.getSjwcsj())) {
+                finalScore = finalScore.subtract(BigDecimal.ONE);
+                errorMsg = "公司级：" + jtNdjhqd.getJhmc() + "的计划完成时间不为空，实际完成时间为空";
+            }
+        }
+        //若存在“是否属于新兴业务项目”=是（分级管理-项目清单），技术类型（是否涵盖技术标准化）字段没有“是”的数据，扣1分。
+        List<JtFjglxm> list2 = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>()
+                .eq(BaseDo::getDeleted, "0")
+                .eq(JtFjglxm::getSfxxyw, "0")
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId)));
+        if (!list2.isEmpty()){
+            long count = list.stream().filter(item -> ObjectUtil.isNotEmpty(item.getJhlxsfhgjsbzh()) && item.getJhlxsfhgjsbzh().equals("0")).count();
+            if (count == 0) {
+                finalScore = finalScore.subtract(BigDecimal.ONE);
+                errorMsg = "公司级：存在“是否属于新兴业务项目”=是（分级管理-项目清单），技术类型（是否涵盖技术标准化）字段没有“是”的数据";
+            }
+        }
+
+        if (finalScore.compareTo(BigDecimal.ZERO) < 0) {
+            finalScore = BigDecimal.ZERO;
+        }
+        if (finalScore.compareTo(jkAssessmentRules.getWeight()) > 0) {
+            finalScore = jkAssessmentRules.getWeight();
+        }
+        return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
+    }
+}

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

@@ -0,0 +1,86 @@
+package com.rongwei.bscommon.sys.strategy.scoreCalculation;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.rongwei.bscommon.sys.service.JtNdjhqdService;
+import com.rongwei.bsentity.domain.*;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.FIVE_SOURCE;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.THREE_SOURCE;
+import static com.rongwei.bscommon.sys.utils.JXKHUtils.CALCULATE_Y3;
+
+
+/**
+ * ScoreCalculationServiceNum1 class
+ *
+ * @author XH
+ * @date 2024/12/09
+ */
+@Service
+public class ScoreCalculationServiceNum23 implements ScoreCalculationService {
+    @Autowired
+    private JtNdjhqdService jtNdjhqdService;
+
+    /**
+     * （）计算规则
+     * 计划执行率=实际时间在计划完成时间内数量/计划数量
+     * 实际时间在计划完成时间内数量：年度计划列表中实际完成时间小于等于计划完成时间的计划数量。
+     * 计划数量：年度计划列表中数量。
+     * 结果取小数点后一位。
+     * （）评分规则
+     * 计划执行率≥80%，不扣分。
+     * 其他数值线性计算得分，得分取小数点后三位。
+     *
+     * @param khbmList
+     * @param jtKhxmList
+     * @param jtGsjtbsj
+     * @param jkAssessmentRules
+     * @return
+     */
+    @Override
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+                                          JkAssessmentRules jkAssessmentRules,
+                                          SysUserVo currentUser) {
+        // 考核得分
+        BigDecimal finalScore = jkAssessmentRules.getWeight();
+        // 扣分细则
+        String errorMsg = "";
+
+        List<JtNdjhqd> list = jtNdjhqdService.list(new LambdaQueryWrapper<JtNdjhqd>()
+                .eq(JtNdjhqd::getDeleted, "0")
+                .in(JtNdjhqd::getMainid, jtGsjtbsj.getId()));
+        //实际时间在计划完成时间内数量：年度计划列表中实际完成时间小于等于计划完成时间的计划数量。
+        long goodCount = list.stream().filter(item -> ObjectUtil.isNotNull(item.getSjwcsj())
+                && ObjectUtil.isNotNull(item.getJhwcsj())
+                && item.getSjwcsj().compareTo(item.getJhwcsj()) <= 0).count();
+        //计划数量：年度计划列表中数量。
+        long totalCount = list.size();
+        //计划执行率=实际时间在计划完成时间内数量/计划数量 结果取小数点后一位。
+        BigDecimal planExecutionRate = new BigDecimal(goodCount).divide(new BigDecimal(totalCount), 1, RoundingMode.HALF_UP);
+        //计划执行率≥80%，不扣分。
+        //其他数值线性计算得分，得分取小数点后三位。
+        if (planExecutionRate.compareTo(new BigDecimal("0.8")) >= 0) {
+            //不扣分
+            errorMsg = "公司级：计划执行率≥80%";
+        } else {
+            //扣分
+            finalScore = finalScore.subtract(CALCULATE_Y3(BigDecimal.valueOf(0), jkAssessmentRules.getWeight(), BigDecimal.valueOf(0.8), BigDecimal.ZERO, planExecutionRate));
+            errorMsg = "公司级：计划执行率<80%";
+        }
+
+        if (finalScore.compareTo(BigDecimal.ZERO) < 0) {
+            finalScore = BigDecimal.ZERO;
+        }
+        if (finalScore.compareTo(jkAssessmentRules.getWeight()) > 0) {
+            finalScore = jkAssessmentRules.getWeight();
+        }
+        return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.rongwei.bscommon.sys.strategy.scoreCalculation;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.rongwei.bsentity.domain.*;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.FIVE_SOURCE;
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.THREE_SOURCE;
+import static com.rongwei.bscommon.sys.utils.JXKHUtils.CALCULATE_Y3;
+
+
+/**
+ * ScoreCalculationServiceNum1 class
+ *
+ * @author XH
+ * @date 2024/12/09
+ */
+@Service
+public class ScoreCalculationServiceNum24 implements ScoreCalculationService {
+
+    /**
+     * 数字化工作目标为空，扣5分。
+     * 主营业务产品数字化覆盖率大于等于0.30得满分，其他分值内插。
+     *
+     * @param khbmList
+     * @param jtKhxmList
+     * @param jtGsjtbsj
+     * @param jkAssessmentRules
+     * @return
+     */
+    @Override
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+                                          JkAssessmentRules jkAssessmentRules,
+                                          SysUserVo currentUser) {
+        // 考核得分
+        BigDecimal finalScore = jkAssessmentRules.getWeight();
+        // 扣分细则
+        String errorMsg = "";
+
+        //数字化工作目标为空，扣5分。
+        if (ObjectUtil.isEmpty(jtGsjtbsj.getSzhgzmb())) {
+            finalScore = finalScore.subtract(FIVE_SOURCE);
+            errorMsg = "公司级：数字化工作目标为空";
+            return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
+        }
+        //主营业务产品数字化覆盖率大于等于0.30得满分，其他分值内插。
+        if (ObjectUtil.isNotEmpty(jtGsjtbsj.getZyywcpszhfgl())) {
+            if (jtGsjtbsj.getZyywcpszhfgl().compareTo(BigDecimal.valueOf(0.3)) < 0) {
+                finalScore = CALCULATE_Y3(BigDecimal.valueOf(0), BigDecimal.valueOf(0), BigDecimal.valueOf(0.3), FIVE_SOURCE, jtGsjtbsj.getZyywcpszhfgl());
+                errorMsg = "公司级：主营业务产品数字化覆盖率小于0.30";
+            } else {
+                finalScore = FIVE_SOURCE;
+                errorMsg = "公司级：主营业务产品数字化覆盖率大于等于0.30";
+            }
+        }
+
+        if (finalScore.compareTo(BigDecimal.ZERO) < 0) {
+            finalScore = BigDecimal.ZERO;
+        }
+        if (finalScore.compareTo(jkAssessmentRules.getWeight()) > 0) {
+            finalScore = jkAssessmentRules.getWeight();
+        }
+        return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
+    }
+}

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

@@ -0,0 +1,56 @@
+package com.rongwei.bscommon.sys.strategy.scoreCalculation;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.rongwei.bscommon.sys.service.JtFjglxmService;
+import com.rongwei.bscommon.sys.service.JtZdxmszmnService;
+import com.rongwei.bsentity.domain.*;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.LinkedList;
+import java.util.List;
+
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.THREE_SOURCE;
+
+
+/**
+ * ScoreCalculationServiceNum1 class
+ *
+ * @author XH
+ * @date 2024/12/09
+ */
+@Service
+public class ScoreCalculationServiceNum25 implements ScoreCalculationService {
+
+    /**
+     * 推广文件为空，扣3分。
+     *
+     * @param khbmList
+     * @param jtKhxmList
+     * @param jtGsjtbsj
+     * @param jkAssessmentRules
+     * @return
+     */
+    @Override
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+                                          JkAssessmentRules jkAssessmentRules,
+                                          SysUserVo currentUser) {
+        // 考核得分
+        BigDecimal finalScore = jkAssessmentRules.getWeight();
+        // 扣分细则
+        String errorMsg = "";
+
+        if (ObjectUtil.isEmpty(jtGsjtbsj.getRjxtsjtgwj())){
+            finalScore = finalScore.subtract(THREE_SOURCE);
+            errorMsg = "公司级：推广文件为空";
+        }
+
+        if (finalScore.compareTo(BigDecimal.ZERO) < 0) {
+            finalScore = BigDecimal.ZERO;
+        }
+        return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
+    }
+}

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

@@ -0,0 +1,78 @@
+package com.rongwei.bscommon.sys.strategy.scoreCalculation;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.rongwei.bscommon.sys.service.JtFjglxmService;
+import com.rongwei.bscommon.sys.service.JtXcjhqdService;
+import com.rongwei.bscommon.sys.service.JtZdxmszmnService;
+import com.rongwei.bsentity.domain.*;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.LinkedList;
+import java.util.List;
+
+import static com.rongwei.bscommon.sys.utils.JXKHUtils.CALCULATE_Y3;
+
+
+/**
+ * ScoreCalculationServiceNum1 class
+ *
+ * @author XH
+ * @date 2024/12/09
+ */
+@Service
+public class ScoreCalculationServiceNum26 implements ScoreCalculationService {
+    @Autowired
+    private JtFjglxmService jtFjglxmService;
+    @Autowired
+    private JtZdxmszmnService jtZdxmszmnService;
+
+    /**
+     * 若“是否重点项目”=是（分级管理-项目清单），数值模拟材料为空扣1分/项。
+     *
+     * @param khbmList
+     * @param jtKhxmList
+     * @param jtGsjtbsj
+     * @param jkAssessmentRules
+     * @return
+     */
+    @Override
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+                                          JkAssessmentRules jkAssessmentRules,
+                                          SysUserVo currentUser) {
+        // 考核得分
+        BigDecimal finalScore = jkAssessmentRules.getWeight();
+        // 扣分细则
+        String errorMsg = "";
+
+        List<JtFjglxm> list = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>()
+                .eq(JtFjglxm::getDeleted, "0")
+                .eq(JtFjglxm::getSfzdxm, "0")
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId)));
+        if (!list.isEmpty()) {
+            List<JtZdxmszmn> list2 = jtZdxmszmnService.list(new LambdaQueryWrapper<JtZdxmszmn>()
+                    .eq(JtZdxmszmn::getDeleted, "0")
+                    .in(JtZdxmszmn::getMainid, khbmList.stream().map(JtXmkh::getId)));
+            List<String> xmcmList = new LinkedList<>();
+            for (JtZdxmszmn jtZdxmszmn : list2) {
+                if (xmcmList.contains(jtZdxmszmn.getXmmc())) {
+                    continue;
+                }
+                xmcmList.add(jtZdxmszmn.getXmmc());
+                if (ObjectUtil.isEmpty(jtZdxmszmn.getSzmncl())) {
+                    finalScore = finalScore.subtract(BigDecimal.ONE);
+                    errorMsg += "项目级：" + jtZdxmszmn.getXmmc() + "，数值模拟材料为空。";
+                }
+            }
+        }
+
+        if (finalScore.compareTo(BigDecimal.ZERO) < 0) {
+            finalScore = BigDecimal.ZERO;
+        }
+        return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
+    }
+}

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

@@ -0,0 +1,82 @@
+package com.rongwei.bscommon.sys.strategy.scoreCalculation;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.rongwei.bscommon.sys.service.JtXcjhqdService;
+import com.rongwei.bsentity.domain.*;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+
+import static com.rongwei.bscommon.sys.utils.JXKHUtils.CALCULATE_Y3;
+
+
+/**
+ * ScoreCalculationServiceNum1 class
+ *
+ * @author XH
+ * @date 2024/12/09
+ */
+@Service
+public class ScoreCalculationServiceNum27 implements ScoreCalculationService {
+    @Autowired
+    private JtXcjhqdService jtXcjhqdService;
+
+    /**
+     * （）计算规则
+     * 覆盖率=计划被巡查单位数量/所属单位数量
+     * 计划被巡查单位数量：巡查清单中被巡查单位的数量。
+     * 所属单位数量：“所属单位/分院”字段值。
+     * 结果取小数点后一位。
+     * （）评分规则
+     * 计划被巡查单位数量与所属单位/分院数量对比，少一个或者没有对应的巡查计划时间扣2分。
+     * 覆盖率≥90%，不扣分。
+     * 覆盖率≤60%，扣2分。
+     * 其他数值线性计算得分，得分取小数点后三位。
+     * 若项目符合“是否属于新兴业务项目”=是（分级管理-项目清单），巡查计划清单中不存在记录扣1分。
+     *TODO: 未完成，待确认覆盖率和计划被巡查单位数量
+     * @param khbmList
+     * @param jtKhxmList
+     * @param jtGsjtbsj
+     * @param jkAssessmentRules
+     * @return
+     */
+    @Override
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+                                          JkAssessmentRules jkAssessmentRules,
+                                          SysUserVo currentUser) {
+        // 考核得分
+        BigDecimal finalScore = jkAssessmentRules.getWeight();
+        // 扣分细则
+        String errorMsg = "";
+
+        List<JtXcjhqd> list = jtXcjhqdService.list(new LambdaQueryWrapper<JtXcjhqd>()
+                .eq(JtXcjhqd::getDeleted, "0")
+                .in(JtXcjhqd::getMainid, khbmList.stream().map(JtXmkh::getId)));
+        //已巡查项目数量：问题整改日期非空的项目数量。
+        long checkedCount = list.stream().filter(info -> ObjectUtil.isNotEmpty(info.getWtzgrq())).count();
+        //计划巡查数量：巡查清单的项目数量。
+        long planCount = list.size();
+        //计划执行率=已巡查项目数量/计划巡查数量 结果取小数点后一位。
+        BigDecimal planExecutionRate = new BigDecimal(checkedCount).divide(new BigDecimal(planCount), 1, RoundingMode.HALF_UP);
+        if (planExecutionRate.compareTo(new BigDecimal("0.9")) >= 0) {
+            //不扣分
+        } else if (planExecutionRate.compareTo(new BigDecimal("0.6")) <= 0) {
+            //扣3分
+            finalScore = finalScore.subtract(new BigDecimal(3));
+            errorMsg = "公司级：计划执行率小于60%";
+        } else {
+            //线性计算得分，得分取小数点后三位。
+            finalScore = finalScore.subtract(CALCULATE_Y3(BigDecimal.valueOf(1), BigDecimal.valueOf(3), BigDecimal.valueOf(0.6), BigDecimal.ZERO, planExecutionRate));
+        }
+
+        if (finalScore.compareTo(BigDecimal.ZERO) < 0) {
+            finalScore = BigDecimal.ZERO;
+        }
+        return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
+    }
+}

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

@@ -40,7 +40,7 @@ public class ScoreCalculationServiceNum31 implements ScoreCalculationService {
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
         String errorMsg = "";
-
+        //TODO:未完成，待确认覆盖率和计划被巡查单位数量
         return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
     }
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 import com.rongwei.rwcommon.base.BaseDo;
@@ -207,7 +208,7 @@ public class JtGsjtbsj extends BaseDo implements Serializable {
      * 主营业务产品数字化覆盖率
      */
     @TableField(value = "ZYYWCPSZHFGL")
-    private String zyywcpszhfgl;
+    private BigDecimal zyywcpszhfgl;
 
     /**
      * 推广文件

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

@@ -1,22 +1,20 @@
 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;
 
 /**
  * 年度计划清单
  * @TableName jt_ndjhqd
  */
-@TableName(value ="jt_ndjhqd")
+@TableName(value = "jt_ndjhqd")
 @Data
-public class JtNdjhqd extends BaseDo implements Serializable {
+public class JtNdjhqd implements Serializable {
     /**
      * 主键ID
      */
@@ -47,6 +45,54 @@ public class JtNdjhqd extends BaseDo implements Serializable {
     @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;
+
     /**
      * 计划编号
      */
@@ -83,6 +129,24 @@ public class JtNdjhqd extends BaseDo implements Serializable {
     @TableField(value = "SYNCSTATE")
     private String syncstate;
 
+    /**
+     * 年度
+     */
+    @TableField(value = "YEAR")
+    private String year;
+
+    /**
+     * 管理单位
+     */
+    @TableField(value = "GLDW")
+    private String gldw;
+
+    /**
+     * 公司考核管理ID
+     */
+    @TableField(value = "MAINID")
+    private String mainid;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }