修饰审核驳回优化

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java

@@ -229,7 +229,7 @@ public class RepairAuditDetailsController extends BaseController {
      */
     @ApiOperation(value = "(内层)批量修改修试审核详细")
     @PreventRepeatSubmit
-    @RequiresPermissions("repair:details:edit")
+    //@RequiresPermissions("repair:details:edit")
     @SysLog(title = "批量修试审核详细", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->批量修改修试审核详细")
     @PostMapping("/innerAudit")
     public AjaxResult edit(@RequestBody @NotNull List<RepairAuditDetails> repairAuditDetails) {

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairApplyDetailsMapper.java

@@ -101,4 +101,11 @@ public interface RepairApplyDetailsMapper {
      * @return
      */
     int updateRepairApplyDetailsAfterAudit(RepairAuditDetails dto);
+
+    /**
+     * 根据back_id获取最大level
+     * @param backId
+     * @return
+     */
+    RepairTaskDetails getMaxLevel(Long backId);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java

@@ -549,7 +549,11 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                     String level = null;
                     if (!CollectionUtils.isEmpty(detailsList)) {
                         backId = detailsList.get(0).getBackId();
-                        level = detailsList.get(0).getLevel();
+                        // 根据backId查询最大级level
+                        RepairTaskDetails details = repairApplyDetailsMapper.getMaxLevel(backId);
+                        if (details != null) {
+                            level = details.getLevel();
+                        }
                     }
                     /*if (Objects.nonNull(preTmTaskInfo) && Objects.nonNull(preTmTaskInfo.getPreTaskId())) {
                         taskMapper.updateTaskStatus(String.valueOf(preTmTaskInfo.getPreTaskId()), RepairTaskStatusEnum.TASK_STATUS_PROCESSING.getStatus());
@@ -662,13 +666,39 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
             final Long agreementId = taskAgreementMapper.selectAgreementIdByTaskId(auditDetails1.getTaskId());
             batchInsertRepairInputDetails(scrapApplyDetails,repairAuditDetails, agreementId);
         } else if ("2".equals(status)) {
-            for (final RepairAuditDetails auditDetails : repairAuditDetails) {
+            RepairTask task = new RepairTask();
-                repairApplyDetailsMapper.updateRepairApplyDetailsAfterReject(
+            task.setTaskId(dto.getTaskId());
-                        ObjectUtils.defaultIfNull(auditDetails.getRepairedNum(),0).longValue(),
+            Long agreementId = repairMapper.getAgreementId(task);
-                        ObjectUtils.defaultIfNull(auditDetails.getScrapNum(),0).longValue(), auditDetails.getRepairId());
+            // 插入任务表
-                repairApplyDetailsMapper.updateStatus(auditDetails.getRepairId(), RepairTaskStatusEnum.TASK_STATUS_PROCESSING.getStatus());
+            Long newTaskId = insertWxTt(SecurityUtils.getLoginUser().getSysUser().getNickName());
+            // 插入协议任务表
+            insertTta(newTaskId, agreementId);
+            // 处理 -- 修饰审核任务状态
+            //taskMapper.updateTaskStatus(String.valueOf(dto.getTaskId()), RepairTaskStatusEnum.TASK_STATUS_NO_REVIEW.getStatus());
+            List<RepairTaskDetails> detailsList = repairApplyDetailsMapper.getRepairDetailsWhichNotSent(dto.getTaskId());
+            Long backId = null;
+            String level = null;
+            if (!CollectionUtils.isEmpty(detailsList)) {
+                backId = detailsList.get(0).getBackId();
+                // 根据backId查询最大级level
+                RepairTaskDetails details = repairApplyDetailsMapper.getMaxLevel(backId);
+                if (details != null) {
+                    level = details.getLevel();
+                }
+            }
+            for (RepairAuditDetails repairAuditDetail : repairAuditDetails) {
+                RepairTaskDetails repairTaskDetails = new RepairTaskDetails();
+                repairTaskDetails.setNewTaskId(newTaskId);
+                repairTaskDetails.setMaId(repairAuditDetail.getMaId() == null ? null : repairAuditDetail.getMaId().toString());
+                repairTaskDetails.setTypeId(repairAuditDetail.getTypeId().toString());
+                repairTaskDetails.setRepairNum(repairAuditDetail.getRepairNum());
+                repairTaskDetails.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
+                repairTaskDetails.setBackId(backId);
+                if(StringUtils.isNotBlank( level)) {
+                    repairTaskDetails.setLevel(String.valueOf(Integer.parseInt(level) + 1));
+                }
+                repairMapper.insertRepaired(repairTaskDetails);
             }
-            taskMapper.updateTaskStatus(dto.getTaskId().toString(), RepairTaskStatusEnum.TASK_STATUS_PROCESSING.getStatus());
         }
 
         try {

bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairApplyDetailsMapper.xml

@@ -214,6 +214,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{repairId}
     </select>
 
+    <select id="getMaxLevel" resultType="com.bonus.material.repair.domain.RepairTaskDetails">
+        SELECT
+            rad.id AS id,
+            rad.ma_id AS maId,
+            rad.type_id AS typeId,
+            rad.repair_num AS repairNum,
+            rad.this_repaired_num,
+            rad.this_scrap_num,
+            rad.repaired_num AS repairedNum,
+            rad.this_repaired_num AS thisRepairedNum,
+            rad.scrap_num AS scrapNum,
+            rad.this_scrap_num AS thisScrapNum,
+            rad.company_id AS companyId,
+            tt.task_id AS taskId,
+            tt.CODE AS taskCode,
+            rad.back_id AS backId,
+            rad.STATUS AS STATUS,
+            rad.LEVEL AS LEVEL,
+            tt.CODE AS taskCode
+        FROM
+            repair_apply_details rad
+                LEFT JOIN tm_task tt ON rad.task_id = tt.task_id
+        WHERE
+            rad.back_id = #{backId}
+          AND rad.is_ds = 0
+        ORDER BY
+        rad.`level` DESC
+        LIMIT 1
+    </select>
+
     <delete id="deleteRepairApplyDetailsById" parameterType="Long">
         delete from repair_apply_details where id = #{id}
     </delete>

bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml

@@ -374,7 +374,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectRepairAuditDetailsByTaskId" resultMap="RepairAuditDetailsResult">
         <include refid="selectRepairAuditDetailsVo"/>
-        where task_id = #{taskId}
+        where task_id = #{taskId} and `status` = '0'
     </select>
 
     <select id="selectNotAuditByTaskId" resultMap="RepairAuditDetailsResult">

bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml

@@ -297,7 +297,7 @@
                 AND tt.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
             </if>
             <if test="appTaskStatus != null and appTaskStatus == 0">
-                and tt.task_status = 4
+                and (tt.task_status = 3 or tt.task_status = 4)
             </if>
             <if test="appTaskStatus != null and appTaskStatus == 1">
                 and (tt.task_status = 1 or tt.task_status = 2)