履职手册添加序号（检查项和检查内容）

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/AppRuleItemController.java

@@ -76,4 +76,10 @@ public class AppRuleItemController extends BaseController {
         TableDataInfo data = appRuleItemService.pointSelectionPage(dto);
         return data;
     }
+
+    @ApiOperation(value = "是否有相同履职项排序")
+    @PostMapping("hasSameSort")
+       public AjaxResult hasSameSort(@RequestBody AppRuleItemDto appRuleItemDto) {
+        return success(appRuleItemService.hasSameSort(appRuleItemDto));
+    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppRuleItem.java

@@ -43,4 +43,8 @@ public class AppRuleItem 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/resumption/dto/ruleItem/AppRuleItemDetailDto.java

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

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/ruleItem/AppRuleItemDto.java

@@ -34,4 +34,7 @@ public class AppRuleItemDto {
 
     @ApiModelProperty(value = "履职内容")
     private List<AppRulePointDto> pointDtoList;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/rulePoint/AppRulePointDetailDto.java

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

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/rulePoint/AppRulePointDto.java

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

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/AppRuleItemMapper.java

@@ -9,6 +9,8 @@ import com.xunmei.core.resumption.vo.appRuleItem.AppRuleItemPageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * Mapper 接口
@@ -33,4 +35,6 @@ public interface AppRuleItemMapper extends BaseMapper<AppRuleItem> {
 //    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<AppRuleItem> getByRuleId(@Param("ruleId") Long ruleId);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/IAppRuleItemService.java

@@ -31,6 +31,8 @@ public interface IAppRuleItemService extends IService<AppRuleItem> {
 
     List<RuleTreeItem> getRuleTree(Long orgId);
 
+    boolean hasSameSort(AppRuleItemDto appRuleItemDto);
+
     /**
      * 获取履职内容选择框的翻页列表
      * @param dto

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppRuleItemServiceImpl.java

@@ -252,6 +252,19 @@ public class AppRuleItemServiceImpl extends ServiceImpl<AppRuleItemMapper, AppRu
         return item;
     }
 
+    @Override
+    public boolean hasSameSort(AppRuleItemDto appRuleItemDto) {
+        boolean flag = false;
+        List<AppRuleItem> itemList = baseMapper.getByRuleId(appRuleItemDto.getRuleId());
+        for (AppRuleItem ruleItem : itemList) {
+            if (ObjectUtil.equal(appRuleItemDto.getSort(),ruleItem.getSort())){
+                flag = true;
+                break;
+            }
+        }
+        return flag;
+    }
+
     /**
      * 获取履职内容选择框的翻页列表
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appRuleItem/AppRuleItemPageVo.java

@@ -26,4 +26,7 @@ public class AppRuleItemPageVo {
     private Integer pointNums;
     @ApiModelProperty(value = "检查点")
     private List<AppRulePointDetailDto> pointDtoList;
+
+    //排序
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppRuleItemMapper.xml

@@ -20,7 +20,7 @@
                 and i.id in (select item_id from core_resumption_rule_point  where rule_id= #{itemPageDto.ruleId} and `name` like concat('%',#{itemPageDto.pointName},'%'))
             </if>
         </where>
-        order by  id desc
+        order by  i.sort asc
     </select>
 
 <!--    <select id="selectDataTypeList" resultType="com.isp.dict.dto.SecBookDtInstDto">-->
@@ -51,4 +51,7 @@
             and id != #{id}
         </if>
     </select>
+    <select id="getByRuleId" resultType="com.xunmei.core.resumption.domain.AppRuleItem">
+        select * from core_resumption_rule_item where rule_id = #{ruleId} and deleted=0
+    </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppRulePointMapper.xml

@@ -11,6 +11,7 @@
         <if test="pointName!=null and pointName!=''">
             and p.name like concat('%',#{pointName},'%')
         </if>
+        order by p.sort asc
     </select>
 
 <!--    <select id="selectDataListByIdList" resultType="com.xunmei.core.resumption.dto.rulePoint.AppRulePointInfoDto"-->