内部审核添加审核状态

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

@@ -271,19 +271,23 @@ public class TmTaskController extends BaseController {
 
 
     /**
-     * 查询机具领料审核列表 - 后台
+     * 查询机具领料审核列表
      *
      * @param task 筛选条件
+     * @param souceBy app为1
      * @return 列表
      */
-    @Log(title = "查询机具领料审核列表- 后台", businessType = BusinessType.QUERY)
+    @Log(title = "查询机具领料审核列表", businessType = BusinessType.QUERY)
     @GetMapping(value = "getLeaseAuditListAll")
-    public AjaxResult getLeaseAuditListAll(TmTask task) {
+    public AjaxResult getLeaseAuditListAll(TmTask task, Integer souceBy) {
         if (StringUtils.isNull(task)) {
             return AjaxResult.error("参数错误");
         }
-        startPage();
         List<TmTask> leaseAuditList = tmTaskService.getLeaseAuditList(task);
+        if (souceBy == 1) {
+            return AjaxResult.success(leaseAuditList);
+        }
+        startPage();
         return AjaxResult.success(getDataTable(leaseAuditList));
     }
 
@@ -310,12 +314,12 @@ public class TmTaskController extends BaseController {
 
 
     /**
-     * 查询机具领料审核列表 - app
+     * 查询机具领料出库列表 - app
      *
      * @param task 筛选条件
      * @return 列表
      */
-    @Log(title = "查询机具领料审核列表- app", businessType = BusinessType.QUERY)
+    @Log(title = "查询机具领料出库列表- app", businessType = BusinessType.QUERY)
     @GetMapping(value = "getLeaseAuditList")
     public AjaxResult getLeaseAuditList(TmTask task, String role) {
         if (StringUtils.isNull(task)) {
@@ -350,7 +354,7 @@ public class TmTaskController extends BaseController {
                             }
                         }
                         List<LeaseApplyDetails> leaseApplyDetails = leaseAuditList.get(i).getLeaseApplyInfoList().get(0).getLeaseApplyDetails();
-                        if (leaseApplyDetails != null){
+                        if (leaseApplyDetails != null) {
                             List<LeaseApplyDetails> list1 = new ArrayList<>();
                             for (int l = 0; l < leaseApplyDetails.size(); l++) {
                                 if (leaseApplyDetails.get(l).getCount() == 1) {
@@ -372,12 +376,12 @@ public class TmTaskController extends BaseController {
 
 
     /**
-     * 查询机具领料审核列表 - app
+     * 查询单个领料出库详情 - app
      *
      * @param task 筛选条件
      * @return 列表
      */
-    @Log(title = "查询单条机具领料审核列表- app", businessType = BusinessType.QUERY)
+    @Log(title = "查询单个领料出库详情- app", businessType = BusinessType.QUERY)
     @GetMapping(value = "getLeaseAuditListDetail")
     public AjaxResult getLeaseAuditListDetail(TmTask task) {
         if (StringUtils.isNull(task)) {

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

@@ -189,6 +189,9 @@ public class BackApplyInfo extends BaseEntity {
     @ApiModelProperty(value="退料任务实体集合")
     private List<BackApplyInfo> backApplyDetails;
 
+    @ApiModelProperty(value="同一退料单中不同器具状态")
+    private String status;
+
     private String guigeCn;
     private String preNum;
     private String typeCn;

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

@@ -253,7 +253,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UPDATE tm_task tt
             LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id
             LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
-        SET tt.task_status = '38',bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='1',bai.direct_audit_time=NOW()
+        <if test="taskStatus == 107">
+            SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='5',bai.direct_audit_time=NOW()
+        </if>
+        <if test="taskStatus == 109">
+            SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='7',bai.direct_audit_time=NOW()
+        </if>
+        <if test="taskStatus == 103">
+            SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='1',bai.direct_audit_time=NOW()
+        </if>
+        <if test="taskStatus == 105">
+            SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='3',bai.direct_audit_time=NOW()
+        </if>
         WHERE
             bai.id = #{id}
     </update>
@@ -262,7 +273,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UPDATE tm_task tt
             LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id
             LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
-        SET tt.task_status = '37',bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='3',bai.direct_audit_time=NOW()
+        <if test="taskStatus == 108">
+            SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='6',bai.direct_audit_time=NOW()
+        </if>
+        <if test="taskStatus == 110">
+            SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='8',bai.direct_audit_time=NOW()
+        </if>
+        <if test="taskStatus == 104">
+            SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='2',bai.direct_audit_time=NOW()
+        </if>
+        <if test="taskStatus == 106">
+            SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='4',bai.direct_audit_time=NOW()
+        </if>
         WHERE
             bai.id = #{id}
     </update>
@@ -301,7 +323,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tt.task_status as taskStatus,
             tta.agreement_id as agreementId,
             GROUP_CONCAT(DISTINCT bad.type_id) as typeId,
-            GROUP_CONCAT(mt2.type_name) AS typeName
+            GROUP_CONCAT(mt2.type_name) AS typeName,
+            GROUP_CONCAT(bad.status) AS status
         FROM
             back_apply_info bai
                 LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
@@ -338,6 +361,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="time != null  and time != ''">
             and bai.back_time =#{time}
         </if>
+        and bad.company_id = #{companyId}
         GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time
         ORDER BY bai.create_time desc
     </select>