验收接口优化

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java

@@ -11,6 +11,7 @@ import com.bonus.common.log.enums.OperaType;
 import com.bonus.material.common.annotation.PreventRepeatSubmit;
 import com.bonus.material.purchase.domain.PurchaseCheckDetails;
 import com.bonus.material.purchase.domain.dto.PurchaseCheckDto;
+import com.bonus.material.purchase.domain.dto.PurchaseDto;
 import com.bonus.material.purchase.domain.dto.PurchaseQueryDto;
 import com.bonus.material.purchase.domain.vo.PurchaseCheckFormVo;
 import io.swagger.annotations.Api;
@@ -94,17 +95,18 @@ public class PurchaseCheckInfoController extends BaseController {
     }
 
     /**
-     * 验收合格API
+     * 验收API
      */
-    @ApiOperation(value = "外层批量验收合格API")
+    @ApiOperation(value = "外层批量验收API")
     @PreventRepeatSubmit
     //@RequiresPermissions("purchase:info:edit")
-    @SysLog(title = "新购验收任务", businessType = OperaType.UPDATE, module = "物资新购->外层批量验收合格API")
+    @SysLog(title = "新购验收任务", businessType = OperaType.UPDATE, module = "物资新购->外层批量验收API")
-    @PutMapping("/acceptance")
+    @PutMapping("/verify")
-    public AjaxResult acceptance(@RequestBody @NotEmpty(message = "任务id集合不能为空") List<Long> taskIds) {
+    public AjaxResult verify(@RequestBody PurchaseDto purchaseDto) {
-        return purchaseCheckInfoService.acceptance(taskIds);
+        return purchaseCheckInfoService.verify(purchaseDto);
     }
 
+
     /**
      * 根据任务id查询验收单
      */

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java

@@ -54,7 +54,7 @@ public class PurchaseDto {
     private List<String> purchaseIdList;
 
     @ApiModelProperty(value = "id列表")
-    private List<Integer> taskIds;
+    private List<Long> taskIds;
 
     @ApiModelProperty(value = "机具编号")
     private String maCode;

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java

@@ -78,10 +78,9 @@ public interface PurchaseCheckDetailsMapper {
     /**
      * 批量修改新购验收任务详细状态 -- 批量、限制状态
      * @param taskId 任务id
-     * @param oldTaskStatus 旧状态
      * @param newTaskStatus 新状态
      */
-    int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("oldTaskStatus") Integer oldTaskStatus, @Param("newTaskStatus") Integer newTaskStatus);
+    int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus);
 
     /**
      * 删除新购验收任务详细

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java

@@ -61,10 +61,9 @@ public interface IPurchaseCheckDetailsService {
     /**
      * 批量修改新购验收任务详细状态 -- 批量、限制状态
      * @param taskId 任务id
-     * @param oldTaskStatus 旧状态
      * @param newTaskStatus 新状态
      */
-    int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("oldTaskStatus") Integer oldTaskStatus, @Param("newTaskStatus") Integer newTaskStatus);
+    int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus);
 
     /**
      * 批量删除新购验收任务详细

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java

@@ -6,6 +6,7 @@ import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.material.purchase.domain.PurchaseCheckDetails;
 import com.bonus.material.purchase.domain.PurchaseCheckInfo;
 import com.bonus.material.purchase.domain.dto.PurchaseCheckDto;
+import com.bonus.material.purchase.domain.dto.PurchaseDto;
 import com.bonus.material.purchase.domain.dto.PurchaseQueryDto;
 import com.bonus.material.purchase.domain.vo.PurchaseCheckFormVo;
 
@@ -41,11 +42,13 @@ public interface IPurchaseCheckInfoService {
      */
     AjaxResult insertPurchaseCheckInfo(PurchaseCheckDto purchaseCheckDto);
 
-    /**
+//    /**
-     * 验收通过
+//     * 验收通过
-     * @param taskId 新购验收任务id
+//     * @param taskId 新购验收任务id
-     */
+//     */
-    AjaxResult acceptance(List<Long> taskId);
+//    AjaxResult acceptance(List<Long> taskId);
+
+    AjaxResult verify(PurchaseDto purchaseDto);
 
     /**
      * 根据任务id查询验收单

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java

@@ -118,12 +118,11 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer
      * 批量修改新购验收任务详细状态 -- 批量、限制状态
      *
      * @param taskId        任务id
-     * @param oldTaskStatus 旧状态
      * @param newTaskStatus 新状态
      */
     @Override
-    public int batchUpdateDetailsTaskStatus(Long taskId, Integer oldTaskStatus, Integer newTaskStatus) {
+    public int batchUpdateDetailsTaskStatus(Long taskId, Integer newTaskStatus) {
-        return purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId, oldTaskStatus, newTaskStatus);
+        return purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId, newTaskStatus);
     }
 
     /**

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java

@@ -8,7 +8,6 @@ import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
-
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
@@ -18,6 +17,7 @@ import com.bonus.material.basic.mapper.BmFileInfoMapper;
 import com.bonus.material.purchase.config.PurchaseTaskEnum;
 import com.bonus.material.purchase.domain.PurchaseCheckDetails;
 import com.bonus.material.purchase.domain.dto.PurchaseCheckDto;
+import com.bonus.material.purchase.domain.dto.PurchaseDto;
 import com.bonus.material.purchase.domain.dto.PurchaseQueryDto;
 import com.bonus.material.purchase.mapper.PurchaseCheckDetailsMapper;
 import com.bonus.material.purchase.domain.vo.PurchaseCheckFormVo;
@@ -32,7 +32,6 @@ import com.bonus.material.purchase.service.IPurchaseCheckInfoService;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-
 import javax.annotation.Resource;
 
 /**
@@ -224,30 +223,19 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
         }
     }
 
-    /**
-     * 验收通过
-     *
-     * @param taskIds 新购验收任务id
-     */
     @Override
-    public AjaxResult acceptance(List<Long> taskIds) {
+    public AjaxResult verify(PurchaseDto purchaseDto) {
         try {
-            // 定义返回对象
             AjaxResult result = new AjaxResult();
-            // 数据过滤
+            purchaseDto.getTaskIds().removeIf(Objects::isNull);
-            taskIds.removeIf(Objects::isNull);
+            for (Long taskId : purchaseDto.getTaskIds()) {
-            // 执行业务逻辑
-            for (Long taskId : taskIds) {
-                // 修改tm_task任务状态
                 boolean updateResult = tmTaskMapper.updateTmTaskStatusByTaskId(taskId,
-                        PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_CHECK.getTaskStatusValue(),
+                        purchaseDto.getStatus()
-                        PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_BIND.getTaskStatusValue()
                 ) > 0;
 
                 if (updateResult) {
                     result = purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId,
-                            PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_CHECK.getTaskStatusValue(),
+                            purchaseDto.getStatus()
-                            PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_BIND.getTaskStatusValue()
                     ) > 0 ? AjaxResult.success("验收通过，修改任务状态成功") : AjaxResult.error("修改任务明细失败");
                 } else {
                     result = AjaxResult.error("SQL未报错，但修改任务0条");

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java

@@ -85,7 +85,6 @@ public class PurchaseNoticePersonServiceImpl implements IPurchaseNoticePersonSer
                 // 修改采购明细的任务状态
                 purchaseCheckDetailsService.batchUpdateDetailsTaskStatus(
                         purchaseNoticePersonDto.getTaskId(),
-                        PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_NOTICE.getTaskStatusCode(),
                         PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_CHECK.getTaskStatusCode()
                 );
 

bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java

@@ -55,10 +55,9 @@ public interface TmTaskMapper {
     /**
      * 根据任务id更新任务状态 -- 批量、限制状态
      * @param taskId 任务id  必传
-     * @param oldTaskStatus 旧状态：限制条件、限制影响边界
      * @param newTaskStatus 新状态
      */
-    int updateTmTaskStatusByTaskId(@Param("taskId") Long taskId, @Param("oldTaskStatus") Integer oldTaskStatus, @Param("newTaskStatus") Integer newTaskStatus);
+    int updateTmTaskStatusByTaskId(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus);
 
     /**
      * 删除任务

bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml

@@ -268,6 +268,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where
             del_flag = '0'
             and task_id = #{taskId}
-            and status = #{oldTaskStatus}
     </select>
 </mapper>

bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml

@@ -112,6 +112,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="updateTmTaskStatusByTaskId">
         update tm_task set task_status = #{newTaskStatus}
-        where task_id = #{taskId} and task_status = #{oldTaskStatus}
+        where task_id = #{taskId}
     </update>
 </mapper>