feature 安全积分相关逻辑提交

qhse-common/src/main/java/com/rongwei/bscommon/system/service/impl/ExcelImportServiceImpl.java

@@ -73,8 +73,6 @@ public class ExcelImportServiceImpl implements ExcelImportService {
 
         List<QhseContractWorkersDo> qhseContractWorkersDos = qhseContractWorkersService
                 .list(new LambdaQueryWrapper<QhseContractWorkersDo>()
-                        .select(QhseContractWorkersDo::getId, QhseContractWorkersDo::getWorknumber,
-                                QhseContractWorkersDo::getWorkertype, QhseContractWorkersDo::getWorkername)
                         .eq(BaseDo::getDeleted, 0)
                         .in(QhseContractWorkersDo::getWorknumber, personCodes));
         // 人员工号校验
@@ -89,10 +87,10 @@ public class ExcelImportServiceImpl implements ExcelImportService {
         });
         List<QhsePointsRecordUserDo> mainTableData = qhsePointsRecordUserService.list(searchWrapper);
         List<String> collect = mainTableData.parallelStream().map(data -> data.getPointyear() + data.getHolderaccount()).collect(Collectors.toList());
-        String errorMsg = analysisDataList.parallelStream().filter(data -> !collect.contains(data.getPointsyear() + data.getPointscode()))
-                .map(data -> data.getPointsyear() + data.getPointscode()).collect(Collectors.joining(";"));
+        String errorMsg = analysisDataList.parallelStream().filter(data -> !collect.contains(data.getPointsyear() + data.getPersoncode()))
+                .map(data -> data.getPointsyear() + data.getPersoncode()).collect(Collectors.joining(";"));
         if (StringUtils.isNotBlank(errorMsg)) {
-            throw new RuntimeException("以下用户在对应年份没有想对应的积分记录信息" + errorMsg);
+            throw new RuntimeException("以下用户在对应年份没有对应的积分记录信息" + errorMsg);
         }
         //校验数据是否在数据库中存在
         checkDataRepeat(analysisDataList, qhseContractWorkersDos);
@@ -148,7 +146,7 @@ public class ExcelImportServiceImpl implements ExcelImportService {
         // excel 中的数据
         List<String> checkExistsData = analysisDataList.stream().map(data -> data.getPersoncode() + data.getDescription() + sdf.format(data.getHappentime()))
                 .collect(Collectors.toList());
-        String errorMsg = dataBaseDatas.parallelStream().filter(checkExistsData::contains).collect(Collectors.joining(";"));
+        String errorMsg = checkExistsData.parallelStream().filter(dataBaseDatas::contains).collect(Collectors.joining(";"));
         if (StringUtils.isNotBlank(errorMsg)) {
             throw new RuntimeException("excel中以下数据" + errorMsg + "已存在");
         }

qhse-common/src/main/java/com/rongwei/bscommon/system/service/impl/PointServiceImpl.java

@@ -144,7 +144,7 @@ public class PointServiceImpl implements PointService {
                         else return 0;  // 等于0
                     }, Collectors.summingInt(QhsePointsDetailsUserDo::getPoints)));
             UserPointRegister userPointRegister = new UserPointRegister();
-            int currentUserPoint = ponitList.stream().mapToInt(QhsePointsDetailsUserDo::getPointsyear).sum();
+            int currentUserPoint = ponitList.stream().mapToInt(QhsePointsDetailsUserDo::getPoints).sum();
             userPointRegister.setId(mainId);
             userPointRegister.setPoint(currentUserPoint);
             userPointRegister.setBonusPoint(dataGroupByPointType.getOrDefault(1, 0));

qhse-common/src/main/resources/mybatis/system/QhsePointsDetailsUserDao.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.system.dao.QhsePointsDetailsUserDao">
     <select id="checkExistsData" resultType="java.lang.String">
-        select  CONCAT_WS('-', PERSONCODE, DESCRIPTION,  DATE_FORMAT(HAPPENTIME, '%Y-%m-%d'))   from qhse_points_details_user
+        select  CONCAT_WS('', PERSONCODE, DESCRIPTION,  DATE_FORMAT(HAPPENTIME, '%Y-%m-%d'))   from qhse_points_details_user
         <where>
             DELETED='0'
             and PERSONID in

qhse-server/src/main/java/com/rongwei/controller/ExcelImportController.java

@@ -30,7 +30,7 @@ public class ExcelImportController {
      */
     @PostMapping("/user/point")
     public R userPointsRegistration(@RequestParam("file") MultipartFile file) {
-        log.info("开始用户积分兑换");
+        log.info("开始用户积分导入");
         return excelImportService.userPointsRegistration(file);
     }
 }