修改

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairAuditDetails.java

@@ -7,6 +7,7 @@ import com.bonus.sgzb.common.core.web.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.bonus.sgzb.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -16,6 +17,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author bonus
  * @date 2023-12-16
  */
+@Data
 public class RepairAuditDetails extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -81,6 +83,9 @@ public class RepairAuditDetails extends BaseEntity
     @ApiModelProperty(value = "机具编号")
     private String maCode;
 
+    @ApiModelProperty(value = "试检状态")
+    private String taskStatus;
+
 
     // 传入参数
     @ApiModelProperty(value = "单位id")

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapApplyDetails.java

@@ -7,6 +7,7 @@ import com.bonus.sgzb.common.core.web.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.bonus.sgzb.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -16,6 +17,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author bonus
  * @date 2023-12-15
  */
+@Data
 public class ScrapApplyDetails extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -101,6 +103,8 @@ public class ScrapApplyDetails extends BaseEntity
     @ApiModelProperty(value = "维修单号")
     private Integer backCode;
 
+    @ApiModelProperty(value = "数据状态")
+    private Integer repairStatus;
 
 
     public void setId(Long id) 

sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml

@@ -123,8 +123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectRepairQuestList" resultType="com.bonus.sgzb.material.vo.ScrapApplyDetailsVO">
-        select tk.code scrapNum,tk.task_status taskStatus, dic.name taskStatusName, bui.unit_name unitName,bpl.lot_name projectName,
+        select DISTINCT tk.task_id taskId,tk.code scrapNum,tk.task_status taskStatus, dic.name taskStatusName, bui.unit_name unitName,bpl.lot_name projectName,
-               tk.create_by createBy, tk.create_time createTime, tk.remark ,tk.code repairNum,tk.task_id taskId
+               tk.create_by createBy, tk.create_time createTime, tk.remark ,tk.code repairNum
         from tm_task tk
         left join tm_task_agreement tta on tk.task_id = tta.task_id
         left join bm_agreement_info bai on tta.agreement_id = bai.agreement_id
@@ -138,6 +138,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="backUnit != null">
             and bui.unit_id = #{backUnit}
         </if>
+        <if test="taskStatus != null">
+            and tk.task_status = #{taskStatus}
+        </if>
         <if test="backPro != null">
             and bpl.lot_id = #{backPro}
         </if>

sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml

@@ -48,6 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="backUnit != null">
             and bui.unit_id = #{backUnit}
         </if>
+        <if test="repairStatus != null">
+            and tk.task_status = #{repairStatus}
+        </if>
         <if test="backPro != null">
             and bpl.lot_id = #{backPro}
         </if>