feature 安全积分相关逻辑提交

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

@@ -9,7 +9,6 @@ import com.rongwei.bscommon.system.service.PointService;
 import com.rongwei.bscommon.system.service.QhsePointsRedemptionService;
 import com.rongwei.bscommon.system.utils.QHSEUtils;
 import com.rongwei.bsentity.domain.*;
-import com.rongwei.bsentity.domain.*;
 import com.rongwei.bsentity.dto.UserPointRegister;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.BaseDo;
@@ -181,7 +180,7 @@ public class PointServiceImpl implements PointService {
     public R userPointRemove(List<String> ids) {
         List<QhsePointsDetailsUserDo> qhsePointsDetailsUserDos = qhsePointsDetailsUserService.list(new LambdaQueryWrapper<QhsePointsDetailsUserDo>()
                 .eq(QhsePointsDetailsUserDo::getState, 1).in(QhsePointsDetailsUserDo::getId, ids));
-        if(qhsePointsDetailsUserDos.isEmpty()){
+        if (qhsePointsDetailsUserDos.isEmpty()) {
             log.error("无法获取用户积分信息");
             return R.error("参数异常");
         }
@@ -239,7 +238,7 @@ public class PointServiceImpl implements PointService {
 
         // 用户扣分记录删除
         qhsePointsDetailsUserService.removeByIds(ids);
-        if(!dataUpdateList.isEmpty()){
+        if (!dataUpdateList.isEmpty()) {
             qhsePointsRecordUserService.getBaseMapper().updateDataAfterDeletion(dataUpdateList);
         }
         return R.ok();
@@ -264,7 +263,6 @@ public class PointServiceImpl implements PointService {
             QHSEUtils.initModelGeneralParameters(qhsePointsUnitRecordDo, currentUser);
             qhsePointsUnitRecordDo.setSubcontractorid(uninitializedDatum.getId());
             qhsePointsUnitRecordDo.setPointsyear(year);
-            qhsePointsUnitRecordDo.setUnitcode(uninitializedDatum.getUnitcode());
             qhsePointsUnitRecordDo.setId(SecurityUtil.getUUID());
             saveList.add(qhsePointsUnitRecordDo);
         }

qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhsePointsUnitRecordDo.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * 单位积分清单(QhsePointsUnitRecord)表实体类
  *
@@ -15,53 +13,52 @@ import java.util.Date;
  */
 @SuppressWarnings("serial")
 @Data
-@TableName(value ="qhse_points_unit_record")
+@TableName(value = "qhse_points_unit_record")
 
 public class QhsePointsUnitRecordDo extends BaseDo {
-
-
-//主键
+    /**
+     * 主键
+     */
     private String id;
-//租户ID
+    /**
+     * 租户ID
+     */
     private String tenantid;
-//扩展json格式配置
+    /**
+     * 扩展json格式配置
+     */
     private String roption;
-//是否删除Y/N
-    private String deleted;
-//备注
-    private String remark;
-//创建时间
-    private Date createdate;
-//创建用户ID
-    private String createuserid;
-//修改日期
-    private Date modifydate;
-//修改用户ID
-    private String modifyuserid;
-//创建人名称
-    private String createusername;
-//修改人名称
-    private String modifyusername;
-//积分编号
+    /**
+     * 积分编号
+     */
     private String pointscode;
-//积分年度
+    /**
+     * 积分年度
+     */
     private Integer pointsyear;
-//分包商ID
+    /**
+     * 分包商ID
+     */
     private String subcontractorid;
-//加分
+    /**
+     * 加分
+     */
     private Integer bonuspoints;
-//加分描述
+    /**
+     * 加分描述
+     */
     private String bonusdescription;
-//扣分
+    /**
+     * 扣分
+     */
     private Integer deductionpoints;
-//扣分描述
+    /**
+     * 扣分描述
+     */
     private String deductiondescription;
-//累计分值
+    /**
+     * 累计分值
+     */
     private Integer cumulativescore;
-
-
-
-
-
 }