履职登记簿检查项排序

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/ResumptionPdf.java

@@ -13,4 +13,5 @@ public class ResumptionPdf implements Serializable {
     private String submitName;
     @ApiModelProperty(value = "执行结果")
     private Integer resValue;
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/vo/ResumptionPlanVo.java

@@ -115,4 +115,9 @@ public class ResumptionPlanVo {
      */
     private List<AppResumptionDataRemarkimg> imgs = new ArrayList<>();
 
+    /**
+     * 要点排序值
+     */
+    private Integer sort = 0;
+
 }

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

@@ -1955,10 +1955,12 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                 tem.setSubmitName(String.valueOf(submitName));
                 //null：未执行  0:正常 1：异常
                 tem.setResValue(result);
+                tem.setSort(vo.getSort());
                 befs.add(tem);
             }
 
         }
+        befs.sort(Comparator.comparing(ResumptionPdf::getSort));
         return befs;
     }
 

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

@@ -256,6 +256,7 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
             temp.setItemId(x.getItemId());
             temp.setExecuteResult(StringUtils.EMPTY);
             temp.setSubmitName(StringUtils.EMPTY);
+            temp.setSort(x.getSort());
             result.add(temp);
         });
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/resumptionRecord/AppResumptionDataInfoVo.java

@@ -49,6 +49,7 @@ public class AppResumptionDataInfoVo {
 
     @ApiModelProperty(value = "状态")
     private Integer executeStatus;
+
     @ApiModelProperty(value = "检查要点id")
     private Long itemId;
 
@@ -58,4 +59,7 @@ public class AppResumptionDataInfoVo {
 
     private List<ResumptionDataProtectionVo> protections;
 
+    @ApiModelProperty(value = "要点排序值",notes = "如果没有设置排序,那么放在最后")
+    private Integer sort=999;
+
 }

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

@@ -417,7 +417,8 @@
                q.plan_id,
                q.point_scan,
                q.required,
-               q.business_type as pointDataSource
+               q.business_type as pointDataSource,
+               q.sort
         from (select c.id     as item_id,
                      c.`name` as item_name,
                      b.id     as point_id,
@@ -431,7 +432,8 @@
                      b.check_id,
                      a.plan_id,
                      a.point_scan,
-                     a.required
+                     a.required,
+                     b.sort
               from core_resumption_plan_to_point a
                        LEFT JOIN core_resumption_rule_point b on a.point_id = b.id
                        LEFT JOIN core_resumption_rule_item c on b.item_id = c.id

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

@@ -284,7 +284,8 @@
                d.id                                                AS dataId,
                d.item_id,
                d.res_value,
-               d.submit_name
+               d.submit_name,
+               p.sort
         FROM core_resumption_data d
                  INNER JOIN core_resumption_rule_point p ON d.item_id = p.id
                  LEFT JOIN sys_area a ON a.id = d.area_id