Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java

@@ -1,6 +1,7 @@
 package com.bonus.sgzb.app.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import com.bonus.sgzb.app.mapper.TmTaskMapper;
 import com.bonus.sgzb.base.api.domain.BackApplyInfo;
 import com.bonus.sgzb.app.domain.BmAgreementInfo;
 import com.bonus.sgzb.app.domain.TmTask;
@@ -39,6 +40,8 @@ public class BackApplyController extends BaseController {
      */
     @Resource
     private TmTaskService tmTaskService;
+    @Resource
+    private TmTaskMapper tmTaskMapper;
 
     /**
      * 退料申请列表
@@ -222,6 +225,11 @@ public class BackApplyController extends BaseController {
                 if (!re) {
                     return AjaxResult.error("退料任务明细插入失败");
                 }
+                // 更新任务状态
+                TmTask tmTask = new TmTask();
+                tmTask.setTaskId(record.getTaskId().longValue());
+                tmTask.setTaskStatus(38);
+                tmTaskMapper.updateTmTaskAuditStatus(tmTask);
             }
             return AjaxResult.success("退料任务明细插入成功,已完成");
         } catch (Exception e) {

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

@@ -229,7 +229,7 @@
       type_id,
     </if>
     <if test="preNum != null">
-      pre_num,
+      pre_num,audit_num,
     </if>
     status,
     <if test="createBy != null and createBy != ''">
@@ -255,7 +255,7 @@
       #{typeId},
     </if>
     <if test="preNum != null">
-      #{preNum},
+      #{preNum}, #{preNum},
     </if>
     '0',
     <if test="createBy != null and createBy != ''">
@@ -389,6 +389,7 @@
   <select id="getbackList" resultType="com.bonus.sgzb.base.api.domain.BackApplyInfo">
     SELECT
       bai.id,
+      bai.task_id,
       bai.`code`,
       bai.back_person as backPerson,
       bai.phone,