Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/controller/BizDayworkController.java

@@ -692,6 +692,7 @@ public class BizDayworkController extends BaseController {
         //修改报工信息的废弃表
         QueryWrapper<BizDayworkItemReject> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("daywork_item_id", bizDayworkItem.getId());
+        queryWrapper.eq("process_inspection_id", 0);
         queryWrapper.eq("deleted", 0);
         List<BizDayworkItemReject> oldList = bizDayworkItemRejectService.list(queryWrapper);
         saveOrUpdateBatch(bizDayworkItemRejectService, bizDayworkItem.getGroupRejectList(), oldList);

src/main/java/cn/ezhizao/project/business/domain/BizDayworkItem.java

@@ -262,6 +262,7 @@ public class BizDayworkItem extends BaseEntity {
     @Excel(name = "总工时",sort = 10)
     @TableField(exist = false)
     private String totalTime;
+    private Integer isSort;
     public BizDayworkItem() {}
 
     public BizDayworkItem(BizDayworkItem copy) {

src/main/java/cn/ezhizao/project/business/domain/BizDayworkItemReject.java

@@ -101,7 +101,8 @@ public class BizDayworkItemReject extends BaseEntity
     private String technologyVersion;
     private String checkStandard;
     private String checkResult;
-
+    private Integer type;
+    private Long inspectionInstructionId;
 
 
 }

src/main/resources/mybatis/business/BizDayworkItemRejectMapper.xml

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getList" parameterType="BizDayworkItemReject" resultMap="BizDayworkItemRejectResult">
         SELECT * FROM biz_daywork_item_reject
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-            deleted = 0
+            deleted = 0 and process_inspection_id = 0
             <if test="dayworkItemId != null "> AND daywork_item_id = #{dayworkItemId}</if>
             <if test="dayworkId != null "> AND daywork_id = #{dayworkId}</if>
             <if test="reason != null  and reason != ''"> AND reason = #{reason}</if>