新购接口优化

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

@@ -87,6 +87,11 @@ public class PurchaseDto {
     @ApiModelProperty(value = "数据所属组织")
     private Long companyId;
 
+    /** 验收结论 */
+    //@Excel(name = "验收结论")
+    @ApiModelProperty(value = "验收结论")
+    private String checkResult;
+
     private String createBy;
 
     private Date createTime;

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

@@ -80,7 +80,7 @@ public interface PurchaseCheckDetailsMapper {
      * @param taskId 任务id
      * @param newTaskStatus 新状态
      */
-    int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus);
+    int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus, @Param("checkResult") String checkResult);
 
     int updatePurchaseDetails(PurchaseCheckDetails details);
 

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

@@ -63,7 +63,7 @@ public interface IPurchaseCheckDetailsService {
      * @param taskId 任务id
      * @param newTaskStatus 新状态
      */
-    int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus);
+    int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus, String checkResult);
 
     /**
      * 批量删除新购验收任务详细

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

@@ -121,8 +121,8 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer
      * @param newTaskStatus 新状态
      */
     @Override
-    public int batchUpdateDetailsTaskStatus(Long taskId, Integer newTaskStatus) {
+    public int batchUpdateDetailsTaskStatus(Long taskId, Integer newTaskStatus, String checkResult) {
-        return purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId, newTaskStatus);
+        return purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId, newTaskStatus, checkResult);
     }
 
     /**

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

@@ -235,7 +235,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
                 ) > 0;
                 if (updateResult) {
                     result = purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId,
-                            purchaseDto.getStatus()
+                            purchaseDto.getStatus(), purchaseDto.getCheckResult()
                     ) > 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,7 @@ public class PurchaseNoticePersonServiceImpl implements IPurchaseNoticePersonSer
                 // 修改采购明细的任务状态
                 purchaseCheckDetailsService.batchUpdateDetailsTaskStatus(
                         purchaseNoticePersonDto.getTaskId(),
-                        PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_CHECK.getTaskStatusValue()
+                        PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_CHECK.getTaskStatusValue(), ""
                 );
 
                 return AjaxResult.success("短信发送成功:" + sendResult);

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

@@ -264,7 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update
             purchase_check_details
         set
-            `status` = #{newTaskStatus}
+            `status` = #{newTaskStatus}, check_result = #{checkResult}
         where
             1=1
         <if test="taskId != null">
@@ -279,7 +279,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update
             purchase_check_details
         set
-            `status` = #{status}
+            `status` = #{status}, check_result = #{checkResult}
         where
             1=1
             <if test="taskId != null">