综合安保评价规则代码提交

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/safetyindex/dto/CoreSafetyIndexCalculateRuleInsertDto.java

@@ -8,8 +8,6 @@ import java.util.List;
 @Data
 public class CoreSafetyIndexCalculateRuleInsertDto {
 
-    private Long id;
-
     @ApiModelProperty("机构类型")
     private Integer orgType;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/service/impl/CoreSafetyIndexCalculateRuleServiceImpl.java

@@ -3,6 +3,7 @@ package com.xunmei.core.safetyindex.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyDict;
@@ -132,10 +133,11 @@ public class CoreSafetyIndexCalculateRuleServiceImpl extends ServiceImpl<CoreSaf
         calculateRule.setCreateBy(SecurityUtils.getUserId().toString());
         calculateRule.setUpdateBy(SecurityUtils.getUserId().toString());
         calculateRule.setCreateTime(new Date());
-
+        calculateRule.setId(IdWorker.getId());
         List<CoreSafetyIndexCalculateRuleItemInsertDto> itemList = coreSafetyIndexCalculateRule.getItemList();
         List<CoreSafetyIndexCalculateRuleItem> properties = BeanHelper.copyProperties(itemList, CoreSafetyIndexCalculateRuleItem.class);
         properties.forEach(r->{
+            r.setRuleId(calculateRule.getId());
             r.setCreateBy(SecurityUtils.getUserId().toString());
             r.setUpdateBy(SecurityUtils.getUserId().toString());
             r.setCreateTime(new Date());

soc-modules/soc-modules-core/src/main/resources/mapper/safetyindex/CoreSafetyIndexCalculateRuleMapper.xml

@@ -167,7 +167,7 @@
             resultType="com.xunmei.common.core.domain.safetyindex.vo.CoreSafetyIndexCalculateRulePageVo"
     parameterType="com.xunmei.common.core.domain.safetyindex.dto.CoreSafetyIndexCalculateRulePageDto">
         select t.id, t.org_type,t.type_code,t.project_code,t.point_code,t.deduction_type,t.score from core_safety_index_calculate_rule t
-        <where>
+        where  t.deleted=0
             <if test="request.orgType !=null">
                 and t.org_type = #{request.orgType}
             </if>
@@ -177,7 +177,6 @@
             <if test="request.pointCode !=null">
                 and t.point_code = #{request.pointCode}
             </if>
-        </where>
 
     </select>
 </mapper>