安全检查手册添加检查项和检查内容排序

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/SafetyCheckRuleItemController.java

@@ -80,4 +80,11 @@ public class SafetyCheckRuleItemController extends BaseController {
         TableDataInfo data = safetyCheckRuleItemService.pointSelectionPage(dto);
         return data;
     }
+
+    @ApiOperation(value = "是否有相同履职项排序")
+    @PostMapping("hasSameSort")
+    public AjaxResult hasSameSort(@RequestBody SafetyCheckRuleItemDto safetyCheckRuleItemDto) {
+
+        return success(safetyCheckRuleItemService.hasSameSort(safetyCheckRuleItemDto));
+    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/SafetyCheckRuleItem.java

@@ -41,4 +41,8 @@ public class SafetyCheckRuleItem extends BaseEntity {
     @TableLogic(value = "0", delval = "1")
     @ApiModelProperty(value = "是否删除 1是 0否")
     private int deleted;
+
+    @ApiModelProperty(value = "检查项序号")
+    @TableField("sort")
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/SafetyCheckRulePoint.java

@@ -57,4 +57,8 @@ public class SafetyCheckRulePoint extends BaseEntity {
     @ApiModelProperty(value = "是否扫描NFC 1扫描，0不扫描")
     @TableField(exist = false)
     private boolean pointScan;
+
+    @ApiModelProperty(value = "检查内容排序")
+    @TableField("sort")
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/dto/ruleItem/SafetyCheckRuleItemDetailDto.java

@@ -30,4 +30,7 @@ public class SafetyCheckRuleItemDetailDto {
 
     @ApiModelProperty(value = "检查点")
     private List<SafetyCheckRulePointDetailDto> pointDtoList;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/dto/ruleItem/SafetyCheckRuleItemDto.java

@@ -34,4 +34,7 @@ public class SafetyCheckRuleItemDto {
 
     @ApiModelProperty(value = "履职内容")
     private List<SafetyCheckRulePointDto> pointDtoList;
+
+    @ApiModelProperty(value = "检查项排序号")
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/dto/rulePoint/SafetyCheckRulePointDetailDto.java

@@ -70,4 +70,7 @@ public class SafetyCheckRulePointDetailDto {
 
     @ApiModelProperty(value = "要点关联的业务类型")
     private String businessType;
+
+    @ApiModelProperty(value = "排序号")
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/dto/rulePoint/SafetyCheckRulePointDto.java

@@ -59,4 +59,7 @@ public class SafetyCheckRulePointDto {
     @ApiModelProperty(value = "要点关联的业务类型")
     private String businessType;
 
+    @ApiModelProperty(value = "检查内容排序号")
+    private Integer sort;
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/mapper/SafetyCheckRuleItemMapper.java

@@ -12,6 +12,8 @@ import com.xunmei.core.safetyCheck.vo.ruleItem.SafetyCheckRuleItemPageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * Mapper 接口
@@ -36,4 +38,6 @@ public interface SafetyCheckRuleItemMapper extends BaseMapper<SafetyCheckRuleIte
 //    Integer checkItemNumRepeat(@Param("id") Long id, @Param("ruleId") Long ruleId, @Param("itemNum") Integer itemNum);
 
     Integer checkItemNameRepeat(@Param("id") Long id, @Param("ruleId") Long ruleId, @Param("itemName") String itemName);
+
+    List<SafetyCheckRuleItem> getByRuleId(@Param("ruleId") Long ruleId);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/ISafetyCheckRuleItemService.java

@@ -2,6 +2,7 @@ package com.xunmei.core.safetyCheck.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.resumption.dto.ruleItem.AppRuleItemDto;
 import com.xunmei.core.resumption.vo.appRuleItem.RuleTreeItem;
 import com.xunmei.core.safetyCheck.domain.SafetyCheckRuleItem;
 import com.xunmei.core.safetyCheck.dto.ruleItem.SafetyCheckRuleItemDetailDto;
@@ -45,5 +46,6 @@ public interface ISafetyCheckRuleItemService extends IService<SafetyCheckRuleIte
 
 
 //    JsonResponse<?> checkRepeat(AppRuleItemCheckDto checkDto);
+    boolean hasSameSort(SafetyCheckRuleItemDto safetyCheckRuleItemDto);
 
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRuleItemServiceImpl.java

@@ -10,6 +10,8 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.resumption.domain.AppRuleItem;
+import com.xunmei.core.resumption.dto.ruleItem.AppRuleItemDto;
 import com.xunmei.core.resumption.vo.appRuleItem.RuleTreeItem;
 import com.xunmei.core.safetyCheck.domain.SafetyCheckRule;
 import com.xunmei.core.safetyCheck.domain.SafetyCheckRuleItem;
@@ -316,4 +318,18 @@ public class SafetyCheckRuleItemServiceImpl
 //        }
 //        return JsonResponse.success();
 //    }
+
+
+    @Override
+    public boolean hasSameSort(SafetyCheckRuleItemDto safetyCheckRuleItemDto) {
+        boolean flag = false;
+        List<SafetyCheckRuleItem> itemList = safetyCheckRuleItemMapper.getByRuleId(safetyCheckRuleItemDto.getRuleId());
+        for (SafetyCheckRuleItem ruleItem : itemList) {
+            if (ObjectUtil.equal(safetyCheckRuleItemDto.getSort(),ruleItem.getSort())){
+                flag = true;
+                break;
+            }
+        }
+        return flag;
+    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/ruleItem/SafetyCheckRuleItemPageVo.java

@@ -27,4 +27,6 @@ public class SafetyCheckRuleItemPageVo {
     private Integer pointNums;
     @ApiModelProperty(value = "检查点")
     private List<SafetyCheckRulePointDetailDto> pointDtoList;
+
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/ruleItem/SafetyCheckRulePointSelectVo.java

@@ -42,4 +42,6 @@ public class SafetyCheckRulePointSelectVo {
     private  String areaName;
 
     private String businessType;
+
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/ruleItem/SafetyCheckRulePointVo.java

@@ -40,4 +40,5 @@ public class SafetyCheckRulePointVo {
     private String businessType;
     private boolean pointScan;
     private boolean required;
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/SafetyCheckRuleItemMapper.xml

@@ -20,7 +20,7 @@
                 and i.id in (select item_id from core_safetycheck_rule_point  where rule_id= #{itemPageDto.ruleId} and `name` like concat('%',#{itemPageDto.pointName},'%'))
             </if>
         </where>
-        order by i.id desc
+        order by i.sort asc
     </select>
 
     <select id="checkItemNameRepeat" resultType="java.lang.Integer">
@@ -29,4 +29,7 @@
             and id != #{id}
         </if>
     </select>
+    <select id="getByRuleId" resultType="com.xunmei.core.safetyCheck.domain.SafetyCheckRuleItem">
+        select * from core_safetycheck_rule_item where rule_id = #{ruleId} and deleted=0
+    </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/SafetyCheckRulePointMapper.xml

@@ -10,6 +10,7 @@
         <if test="pointName!=null and pointName!=''">
             and p.name like concat('%',#{pointName},'%')
         </if>
+        order by p.sort asc
     </select>
 <!--    <select id="findPointByPlan" parameterType="Long" resultType="com.xunmei.core.safetyCheck.vo.ruleItem.SafetyCheckRulePointTaskVo">-->
 <!--        SELECT a.*, b.point_scan-->