退料接收新增报废图片和报废原因

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java

@@ -198,4 +198,19 @@ public class BackApplyInfo {
      * 报废数量
      */
     private Integer bfNum;
+
+    /**
+     * 报废原因
+     */
+    private String scrapReason;
+
+    /**
+     * 报废类型0：自然报废，1人为报废
+     */
+    private String scrapType;
+
+    /**
+     * 图片地址
+     */
+    private String fileUrl;
 }

sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml

@@ -312,6 +312,15 @@
     <if test="remark != null and remark != ''">
       remark,
     </if>
+    <if test="scrapReason != null and scrapReason != ''">
+      scrap_reason,
+    </if>
+    <if test="scrapType != null and scrapType != ''">
+      scrap_type,
+    </if>
+    <if test="fileUrl != null and fileUrl != ''">
+      file_url,
+    </if>
     <if test="companyId != null">
       company_id,
     </if>
@@ -343,6 +352,15 @@
     <if test="remark != null and remark != ''">
       #{remark},
     </if>
+    <if test="scrapReason != null and scrapReason != ''">
+      #{scrapReason},
+    </if>
+    <if test="scrapType != null and scrapType != ''">
+      #{scrapType},
+    </if>
+    <if test="fileUrl != null and fileUrl != ''">
+      #{fileUrl},
+    </if>
     <if test="companyId != null">
       #{companyId},
     </if>
@@ -512,6 +530,15 @@
     <if test="companyId != null">
       company_id,
     </if>
+    <if test="scrapReason != null and scrapReason != ''">
+      audit_remark,
+    </if>
+    <if test="scrapType != null and scrapType != ''">
+      scrap_type,
+    </if>
+    <if test="fileUrl != null and fileUrl != ''">
+      file_url,
+    </if>
     create_time
     )
     values (
@@ -538,6 +565,15 @@
     <if test="companyId != null">
       #{companyId},
     </if>
+    <if test="scrapReason != null and scrapReason != ''">
+      #{scrapReason},
+    </if>
+    <if test="scrapType != null and scrapType != ''">
+      #{scrapType},
+    </if>
+    <if test="fileUrl != null and fileUrl != ''">
+      #{fileUrl},
+    </if>
     NOW()
     )
   </insert>
@@ -749,7 +785,10 @@
       bcd.parent_id as parentId,
       bcd.create_by as createBy,
       bcd.ma_id as maId,
-      bai.company_id as companyId
+      bai.company_id as companyId,
+      bcd.scrap_reason as scrapReason,
+      bcd.scrap_type as scrapType,
+      bcd.file_url as fileUrl
     FROM
       back_check_details bcd
         LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id

sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml

@@ -669,7 +669,7 @@
         tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
         bpi.lot_id as proId,   bpi.pro_id as  projectId,bpi.lot_name as proName,
         bui.unit_id as unitId,bui.unit_name as unitName,
-        tt.create_by as applyFor,d.`name` as taskName,
+        su.nick_name as applyFor,d.`name` as taskName,
 
         su2.user_name as companyAuditBy,
         lai.company_audit_time as companyAuditTime,
@@ -691,7 +691,7 @@
         bai.agreement_id as agreementId
       FROM
         tm_task tt
-          LEFT JOIN sys_user su ON tt.create_by = su.user_name
+          LEFT JOIN sys_user su ON tt.create_by = su.user_id
           LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id
           LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id
           LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id