From d8247d5f385441da26499896475cd6ca8e9577f3 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 8 Nov 2024 09:39:07 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PurchaseBindController.java | 2 +- .../PurchaseCheckInfoController.java | 31 ++++++++++++++----- .../mapper/PurchaseCheckDetailsMapper.java | 3 ++ .../service/IPurchaseCheckInfoService.java | 3 ++ .../impl/PurchaseCheckInfoServiceImpl.java | 10 ++++++ .../purchase/PurchaseCheckDetailsMapper.xml | 26 ++++++++++++++++ 6 files changed, 66 insertions(+), 9 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java index 83687b5c..6feea098 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java @@ -50,7 +50,7 @@ public class PurchaseBindController extends BaseController { * @return */ @ApiOperation(value = "获取新购绑定二级明细列表") - @RequiresPermissions("purchase:bind:details") + @RequiresPermissions("purchase:bind:query") @GetMapping("/details") public TableDataInfo getDetails(PurchaseDto dto) { startPage(); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java index eb9ed653..81192cfe 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java @@ -9,6 +9,7 @@ import javax.validation.constraints.NotNull; 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.PurchaseQueryDto; import com.bonus.material.purchase.domain.vo.PurchaseCheckFormVo; @@ -41,7 +42,7 @@ public class PurchaseCheckInfoController extends BaseController { * 查询新购验收任务列表 */ @ApiOperation(value = "查询新购验收任务列表") - @RequiresPermissions("purchase:info:list") + //@RequiresPermissions("purchase:info:list") @GetMapping("/list") public TableDataInfo list(PurchaseCheckInfo purchaseCheckInfo) { startPage(); @@ -54,7 +55,7 @@ public class PurchaseCheckInfoController extends BaseController { * 获取新购验收任务详细信息 */ @ApiOperation(value = "获取新购验收任务详细信息") - @RequiresPermissions("purchase:info:query") + //@RequiresPermissions("purchase:info:query") @GetMapping(value = "/getInfo") public AjaxResult getInfo(@NotNull(message = "请求对象不能为空") PurchaseQueryDto purchaseQueryDto) { return success(purchaseCheckInfoService.selectPurchaseCheckInfoById(purchaseQueryDto)); @@ -65,7 +66,7 @@ public class PurchaseCheckInfoController extends BaseController { */ @ApiOperation(value = "新增新购验收任务") @PreventRepeatSubmit - @RequiresPermissions("purchase:info:add") + //@RequiresPermissions("purchase:info:add") @SysLog(title = "新购验收任务", businessType = OperaType.INSERT, module = "物资新购->新增新购验收任务") @PostMapping public AjaxResult add(@Valid @NotNull @RequestBody PurchaseCheckDto purchaseCheckDto) { @@ -81,7 +82,7 @@ public class PurchaseCheckInfoController extends BaseController { */ @ApiOperation(value = "修改新购验收任务") @PreventRepeatSubmit - @RequiresPermissions("purchase:info:edit") + //@RequiresPermissions("purchase:info:edit") @SysLog(title = "新购验收任务", businessType = OperaType.UPDATE, module = "物资新购->修改新购验收任务") @PutMapping public AjaxResult edit(@RequestBody PurchaseCheckDto purchaseCheckDto) { @@ -97,7 +98,7 @@ public class PurchaseCheckInfoController extends BaseController { */ @ApiOperation(value = "外层批量验收合格API") @PreventRepeatSubmit - @RequiresPermissions("purchase:info:edit") + //@RequiresPermissions("purchase:info:edit") @SysLog(title = "新购验收任务", businessType = OperaType.UPDATE, module = "物资新购->外层批量验收合格API") @PutMapping("/acceptance") public AjaxResult acceptance(@RequestBody @NotEmpty(message = "任务id集合不能为空") List taskIds) { @@ -108,7 +109,7 @@ public class PurchaseCheckInfoController extends BaseController { * 根据任务id查询验收单 */ @ApiOperation(value = "根据任务id查询验收单--taskId") - @RequiresPermissions("purchase:info:query") + //@RequiresPermissions("purchase:info:query") @SysLog(title = "新购验收任务", businessType = OperaType.UPDATE, module = "物资新购->查询验收单API") @GetMapping("/getPurchaseCheckFormByTaskId/{taskId}") public AjaxResult getPurchaseCheckFormByTaskId(@PathVariable("taskId") Long taskId) { @@ -123,7 +124,7 @@ public class PurchaseCheckInfoController extends BaseController { */ @ApiOperation(value = "删除新购验收任务") @PreventRepeatSubmit - @RequiresPermissions("purchase:info:remove") + //@RequiresPermissions("purchase:info:remove") @SysLog(title = "新购验收任务", businessType = OperaType.DELETE, module = "物资新购->删除新购验收任务") @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { @@ -137,7 +138,7 @@ public class PurchaseCheckInfoController extends BaseController { */ @ApiOperation(value = "导出新购验收任务列表") @PreventRepeatSubmit - @RequiresPermissions("purchase:info:export") + //@RequiresPermissions("purchase:info:export") @SysLog(title = "新购验收任务", businessType = OperaType.EXPORT, module = "物资新购->导出新购验收任务") @PostMapping("/export") public void export(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) { @@ -145,4 +146,18 @@ public class PurchaseCheckInfoController extends BaseController { ExcelUtil util = new ExcelUtil(PurchaseCheckInfo.class); util.exportExcel(response, list, "新购验收任务数据"); } + + /** + * 导出新购验收任务详细列表 + */ + @ApiOperation(value = "导出新购验收任务详细列表") + @PreventRepeatSubmit + //@RequiresPermissions("purchase:details:export") + @SysLog(title = "新购验收任务详细", businessType = OperaType.EXPORT, logType = 1,module = "物资新购->导出新购验收任务详细") + @PostMapping("/exportDetails") + public void exportDetails(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) { + List list = purchaseCheckInfoService.selectPurchaseCheckDetailsList(purchaseCheckInfo); + ExcelUtil util = new ExcelUtil(PurchaseCheckDetails.class); + util.exportExcel(response, list, "新购验收任务详细数据"); + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java index 62c4a007..aa6da6f8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java @@ -2,6 +2,7 @@ package com.bonus.material.purchase.mapper; import java.util.List; import com.bonus.material.purchase.domain.PurchaseCheckDetails; +import com.bonus.material.purchase.domain.PurchaseCheckInfo; import com.bonus.material.purchase.domain.dto.PurchaseQueryDto; import org.apache.ibatis.annotations.Param; @@ -50,6 +51,8 @@ public interface PurchaseCheckDetailsMapper { */ List selectPurchaseCheckDetailsList(PurchaseCheckDetails purchaseCheckDetails); + List selectPurchaseCheckDetailsListFromInfo(PurchaseCheckInfo purchaseCheckInfo); + /** * 新增新购验收任务详细 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java index b5775f58..a2e08601 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java @@ -3,6 +3,7 @@ package com.bonus.material.purchase.service; import java.util.List; 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.PurchaseQueryDto; @@ -30,6 +31,8 @@ public interface IPurchaseCheckInfoService { */ List selectPurchaseCheckInfoList(PurchaseCheckInfo purchaseCheckInfo); + List selectPurchaseCheckDetailsList(PurchaseCheckInfo purchaseCheckInfo); + /** * 新增新购验收任务 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index ff9a259f..1471aef4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -144,6 +144,16 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { return purchaseCheckInfos; } + /** + * 查询新购验收任务详细列表 + * + * @param purchaseCheckInfo 新购验收任务详细 + * @return 新购验收任务详细 + */ + @Override + public List selectPurchaseCheckDetailsList(PurchaseCheckInfo purchaseCheckInfo) { + return purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListFromInfo(purchaseCheckInfo); + } /** * 含税价格计算 diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml index 8060596d..46da9440 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml @@ -74,6 +74,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and fix_code = #{fixCode} + + - - and task_id = #{taskId} - and type_id = #{typeId} - and purchase_price = #{purchasePrice} - and purchase_tax_price = #{purchaseTaxPrice} - and purchase_num = #{purchaseNum} - and check_num = #{checkNum} - and bind_num = #{bindNum} - and check_result = #{checkResult} - and supplier_id = #{supplierId} - and status = #{status} - and production_time = #{productionTime} - and check_url_name like concat('%', #{checkUrlName}, '%') - and check_url = #{checkUrl} - and input_num = #{inputNum} - and input_status = #{inputStatus} - and input_time = #{inputTime} - and file_name like concat('%', #{fileName}, '%') - and file_url = #{fileUrl} - and company_id = #{companyId} - and fix_code = #{fixCode} - + where task_id = #{taskId} \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml index bf40a252..32aad615 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml +++ b/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 tm_task set task_status = #{newTaskStatus} - where task_id = #{taskId} and task_status = #{oldTaskStatus} + where task_id = #{taskId} \ No newline at end of file From 89f79f9181eefc39506f72735ea8ed502bb855ee Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 8 Nov 2024 12:51:46 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E5=86=85=E5=AD=98=E9=AA=8C=E6=94=B6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseCheckInfoController.java | 22 +++++++++---- .../purchase/domain/dto/PurchaseDto.java | 2 +- .../mapper/PurchaseCheckDetailsMapper.java | 4 ++- .../service/IPurchaseCheckInfoService.java | 4 ++- .../impl/PurchaseCheckInfoServiceImpl.java | 31 ++++++++++++++++--- .../material/task/mapper/TmTaskMapper.java | 2 +- .../purchase/PurchaseCheckDetailsMapper.xml | 10 ++++++ 7 files changed, 61 insertions(+), 14 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java index 0fb8b7c6..9687d5bd 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java @@ -4,7 +4,6 @@ import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import com.bonus.common.log.enums.OperaType; @@ -18,7 +17,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import com.bonus.common.log.annotation.SysLog; -import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.material.purchase.domain.PurchaseCheckInfo; import com.bonus.material.purchase.service.IPurchaseCheckInfoService; import com.bonus.common.core.web.controller.BaseController; @@ -95,15 +93,27 @@ public class PurchaseCheckInfoController extends BaseController { } /** - * 验收API + * 外层批量验收API */ @ApiOperation(value = "外层批量验收API") @PreventRepeatSubmit //@RequiresPermissions("purchase:info:edit") @SysLog(title = "新购验收任务", businessType = OperaType.UPDATE, module = "物资新购->外层批量验收API") - @PutMapping("/verify") - public AjaxResult verify(@RequestBody PurchaseDto purchaseDto) { - return purchaseCheckInfoService.verify(purchaseDto); + @PutMapping("/outerVerify") + public AjaxResult outerVerify(@RequestBody PurchaseDto purchaseDto) { + return purchaseCheckInfoService.outVerify(purchaseDto); + } + + /** + * 外层批量验收API + */ + @ApiOperation(value = "内层批量验收API") + @PreventRepeatSubmit + //@RequiresPermissions("purchase:info:edit") + @SysLog(title = "新购验收任务", businessType = OperaType.UPDATE, module = "物资新购->内层批量验收API") + @PutMapping("/innerVerify") + public AjaxResult innerVerify(@RequestBody PurchaseCheckDto purchaseCheckDto) { + return purchaseCheckInfoService.innerVerify(purchaseCheckDto); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java index 2b9c9fdd..c52a2f7f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java @@ -42,7 +42,7 @@ public class PurchaseDto { private String keyWord; @ApiModelProperty(value = "状态") - private Integer status; + private Long status; @ApiModelProperty(value = "出厂日期") private String productDate; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java index 283d6d6a..a81d0e11 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java @@ -80,7 +80,9 @@ 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") Long newTaskStatus); + + int getCountOfNoneThisStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Long newTaskStatus); /** * 删除新购验收任务详细 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java index 181d197a..297365a6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java @@ -48,7 +48,9 @@ public interface IPurchaseCheckInfoService { // */ // AjaxResult acceptance(List taskId); - AjaxResult verify(PurchaseDto purchaseDto); + AjaxResult outVerify(PurchaseDto purchaseDto); + + AjaxResult innerVerify(PurchaseCheckDto purchaseCheckDto); /** * 根据任务id查询验收单 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index ef321adf..f6f9943d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -224,7 +224,8 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { } @Override - public AjaxResult verify(PurchaseDto purchaseDto) { + @Transactional + public AjaxResult outVerify(PurchaseDto purchaseDto) { try { AjaxResult result = new AjaxResult(); purchaseDto.getTaskIds().removeIf(Objects::isNull); @@ -232,18 +233,40 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { boolean updateResult = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, purchaseDto.getStatus() ) > 0; - if (updateResult) { result = purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId, purchaseDto.getStatus() - ) > 0 ? AjaxResult.success("验收通过，修改任务状态成功") : AjaxResult.error("修改任务明细失败"); + ) > 0 ? AjaxResult.success("验收状态更改成功") : AjaxResult.error("验收状态更改失败"); } else { result = AjaxResult.error("SQL未报错，但修改任务0条"); } } return result; } catch (Exception e) { - return AjaxResult.error("修改任务失败,SQL异常报错:" + e.getMessage()); + return AjaxResult.error("验收状态更改失败,异常报错:" + e.getMessage()); + } + } + + @Override + @Transactional + public AjaxResult innerVerify(PurchaseCheckDto purchaseCheckDto) { + try { + AjaxResult result = new AjaxResult(); + Long taskId = purchaseCheckDto.getPurchaseCheckInfo().getTaskId(); + Long status = purchaseCheckDto.getPurchaseCheckDetailsList().get(0).getStatus(); + for (PurchaseCheckDetails details : purchaseCheckDto.getPurchaseCheckDetailsList()) { + result = purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId, + details.getStatus() + ) > 0 ? AjaxResult.success("details验收状态更改成功") : AjaxResult.error("details验收状态更改失败"); + } + //查询是否这个taskId是否已全部验收通过，如果是的，更新整个task的任务状态 + int count = purchaseCheckDetailsMapper.getCountOfNoneThisStatus(taskId, status); + if (count == 0) { + result = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, status) > 0 ? AjaxResult.success("task验收状态更改成功") : AjaxResult.error("task验收状态更改失败"); + } + return result; + } catch (Exception e) { + return AjaxResult.error("验收状态更改失败,异常报错:" + e.getMessage()); } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java index e6e5dc82..7be92a9f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java @@ -57,7 +57,7 @@ public interface TmTaskMapper { * @param taskId 任务id 必传 * @param newTaskStatus 新状态 */ - int updateTmTaskStatusByTaskId(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus); + int updateTmTaskStatusByTaskId(@Param("taskId") Long taskId, @Param("newTaskStatus") Long newTaskStatus); /** * 删除任务 diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml index be669c17..149d0326 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml @@ -269,4 +269,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" del_flag = '0' and task_id = #{taskId} + + \ No newline at end of file From 05a0fe410a1589756b09d1b0325afe94e2c5edfc Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 8 Nov 2024 13:08:26 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E5=86=85=E5=AD=98=E9=AA=8C=E6=94=B6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/material/purchase/domain/PurchaseCheckDetails.java | 2 +- .../com/bonus/material/purchase/domain/dto/PurchaseDto.java | 2 +- .../material/purchase/mapper/PurchaseCheckDetailsMapper.java | 4 ++-- .../purchase/service/impl/PurchaseCheckInfoServiceImpl.java | 2 +- .../java/com/bonus/material/task/mapper/TmTaskMapper.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java index 0a595f2b..d154ae60 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java @@ -88,7 +88,7 @@ public class PurchaseCheckDetails extends BaseEntity { /** 0-未验收,1-已验收,2-待通知,3-验收不通过,4-已入库,5-入库驳回,6-综合服务中心审核通过，7-综合服务中心不通过 */ @Excel(name = "0-未验收,1-已验收,2-待通知,3-验收不通过,4-已入库,5-入库驳回,6-综合服务中心审核通过，7-综合服务中心不通过") @ApiModelProperty(value = "0-未验收,1-已验收,2-待通知,3-验收不通过,4-已入库,5-入库驳回,6-综合服务中心审核通过，7-综合服务中心不通过") - private Long status; + private Integer status; /** 出厂日期 */ @ApiModelProperty(value = "出厂日期") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java index c52a2f7f..2b9c9fdd 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java @@ -42,7 +42,7 @@ public class PurchaseDto { private String keyWord; @ApiModelProperty(value = "状态") - private Long status; + private Integer status; @ApiModelProperty(value = "出厂日期") private String productDate; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java index a81d0e11..e44dd9f0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java @@ -80,9 +80,9 @@ public interface PurchaseCheckDetailsMapper { * @param taskId 任务id * @param newTaskStatus 新状态 */ - int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Long newTaskStatus); + int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus); - int getCountOfNoneThisStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Long newTaskStatus); + int getCountOfNoneThisStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus); /** * 删除新购验收任务详细 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index f6f9943d..16763e7d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -253,7 +253,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { try { AjaxResult result = new AjaxResult(); Long taskId = purchaseCheckDto.getPurchaseCheckInfo().getTaskId(); - Long status = purchaseCheckDto.getPurchaseCheckDetailsList().get(0).getStatus(); + Integer status = purchaseCheckDto.getPurchaseCheckDetailsList().get(0).getStatus(); for (PurchaseCheckDetails details : purchaseCheckDto.getPurchaseCheckDetailsList()) { result = purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId, details.getStatus() diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java index 7be92a9f..e6e5dc82 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java @@ -57,7 +57,7 @@ public interface TmTaskMapper { * @param taskId 任务id 必传 * @param newTaskStatus 新状态 */ - int updateTmTaskStatusByTaskId(@Param("taskId") Long taskId, @Param("newTaskStatus") Long newTaskStatus); + int updateTmTaskStatusByTaskId(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus); /** * 删除任务 From 38ba88e5d3601a875b5aa37b68760ba5c2755b64 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 8 Nov 2024 13:47:58 +0800 Subject: [PATCH 07/13] 24.11.0-SNAPSHOT --- bonus-common-biz/pom.xml | 2 +- bonus-modules/bonus-material-screen/pom.xml | 2 +- bonus-modules/bonus-material/pom.xml | 4 +-- bonus-modules/pom.xml | 2 +- pom.xml | 4 +-- scripts_244/deploy.sh | 2 +- scripts_244/kill-ps.sh | 12 ++++----- scripts_56/deploy.sh | 30 ++++++++++----------- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/bonus-common-biz/pom.xml b/bonus-common-biz/pom.xml index 30315ab2..2a557ec6 100644 --- a/bonus-common-biz/pom.xml +++ b/bonus-common-biz/pom.xml @@ -5,7 +5,7 @@ com.bonus bonus - 24.10.0-SNAPSHOT + 24.11.0-SNAPSHOT 4.0.0 diff --git a/bonus-modules/bonus-material-screen/pom.xml b/bonus-modules/bonus-material-screen/pom.xml index 8d29e979..2f05b800 100644 --- a/bonus-modules/bonus-material-screen/pom.xml +++ b/bonus-modules/bonus-material-screen/pom.xml @@ -5,7 +5,7 @@ com.bonus bonus-modules - 24.10.0-SNAPSHOT + 24.11.0-SNAPSHOT 4.0.0 diff --git a/bonus-modules/bonus-material/pom.xml b/bonus-modules/bonus-material/pom.xml index 7b41cdb9..3e73b1cc 100644 --- a/bonus-modules/bonus-material/pom.xml +++ b/bonus-modules/bonus-material/pom.xml @@ -5,7 +5,7 @@ com.bonus bonus-modules - 24.10.0-SNAPSHOT + 24.11.0-SNAPSHOT 4.0.0 @@ -97,7 +97,7 @@ com.bonus bonus-common-biz - 24.10.0-SNAPSHOT + 24.11.0-SNAPSHOT compile diff --git a/bonus-modules/pom.xml b/bonus-modules/pom.xml index 0a6b6521..ba129e61 100644 --- a/bonus-modules/pom.xml +++ b/bonus-modules/pom.xml @@ -4,7 +4,7 @@ com.bonus bonus - 24.10.0-SNAPSHOT + 24.11.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 043f9122..848801ed 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.bonus bonus - 24.10.0-SNAPSHOT + 24.11.0-SNAPSHOT bonus http://www.ahbonus.cn 博诺思微服务系统 - 24.10.0-SNAPSHOT + 24.11.0-SNAPSHOT UTF-8 UTF-8 1.8 diff --git a/scripts_244/deploy.sh b/scripts_244/deploy.sh index 9f3d40b5..d2bcc0aa 100644 --- a/scripts_244/deploy.sh +++ b/scripts_244/deploy.sh @@ -1,6 +1,6 @@ #!/bin/bash suffix="-material" -jar_version="24.10.0-SNAPSHOT" +jar_version="24.11.0-SNAPSHOT" export deploy_path=/opt/webapps/bonus-material export app_workspace=/opt/builds/releases/Bonus-Cloud/${jar_version} diff --git a/scripts_244/kill-ps.sh b/scripts_244/kill-ps.sh index 8d46cfa7..2e122e5f 100644 --- a/scripts_244/kill-ps.sh +++ b/scripts_244/kill-ps.sh @@ -1,9 +1,9 @@ -AUTH_RESOURCE_NAME=bonus-auth-24.10.0-SNAPSHOT-material.jar -GATEWAY_RESOURCE_NAME=bonus-gateway-24.10.0-SNAPSHOT-material.jar -SYS_RESOURCE_NAME=bonus-system-24.10.0-SNAPSHOT-material.jar -JOB_RESOURCE_NAME=bonus-job-24.10.0-SNAPSHOT-material.jar -FILE_RESOURCE_NAME=bonus-file-24.10.0-SNAPSHOT-material.jar -MONITOR_RESOURCE_NAME=bonus-visual-monitor-24.10.0-SNAPSHOT-material.jar +AUTH_RESOURCE_NAME=bonus-auth-24.11.0-SNAPSHOT-material.jar +GATEWAY_RESOURCE_NAME=bonus-gateway-24.11.0-SNAPSHOT-material.jar +SYS_RESOURCE_NAME=bonus-system-24.11.0-SNAPSHOT-material.jar +JOB_RESOURCE_NAME=bonus-job-24.11.0-SNAPSHOT-material.jar +FILE_RESOURCE_NAME=bonus-file-24.11.0-SNAPSHOT-material.jar +MONITOR_RESOURCE_NAME=bonus-visual-monitor-24.11.0-SNAPSHOT-material.jar MATERIAL_RESOURCE_NAME=bonus-material.jar diff --git a/scripts_56/deploy.sh b/scripts_56/deploy.sh index ba2988fa..4f67f751 100644 --- a/scripts_56/deploy.sh +++ b/scripts_56/deploy.sh @@ -2,20 +2,20 @@ export deploy_path=/opt/webapps/bonus-material -export app_workspace=/opt/builds/releases/Bonus-Cloud/24.10.0-SNAPSHOT +export app_workspace=/opt/builds/releases/Bonus-Cloud/24.11.0-SNAPSHOT export biz_workspace=/home/jenkins/workspace/Bonus-Cloud-Material suffix="-material" app_source_jars=( - "bonus-auth-24.10.0-SNAPSHOT.jar" - "bonus-gateway-24.10.0-SNAPSHOT.jar" - #"bonus-file-24.10.0-SNAPSHOT.jar" - #"bonus-gen-24.10.0-SNAPSHOT.jar" - #"bonus-job-24.10.0-SNAPSHOT.jar" - "bonus-system-24.10.0-SNAPSHOT.jar" - "bonus-visual-monitor-24.10.0-SNAPSHOT.jar" + "bonus-auth-24.11.0-SNAPSHOT.jar" + "bonus-gateway-24.11.0-SNAPSHOT.jar" + #"bonus-file-24.11.0-SNAPSHOT.jar" + #"bonus-gen-24.11.0-SNAPSHOT.jar" + #"bonus-job-24.11.0-SNAPSHOT.jar" + "bonus-system-24.11.0-SNAPSHOT.jar" + "bonus-visual-monitor-24.11.0-SNAPSHOT.jar" ) #for source_jar in "${app_source_jars[@]}"; do @@ -41,13 +41,13 @@ cp -f ${biz_workspace}/"bonus-modules/bonus-material/target/bonus-material.jar" echo "copied ${app_workspace}/${source_jar} to $deploy_path" # Define an array of JAR files to run -jars=("bonus-auth-24.10.0-SNAPSHOT-material.jar --spring.config.location=file:auth_bootstrap.yml" -"bonus-gateway-24.10.0-SNAPSHOT-material.jar --spring.config.location=file:gateway_bootstrap.yml" -"bonus-system-24.10.0-SNAPSHOT-material.jar --spring.config.location=file:system_bootstrap.yml" -#"bonus-gen-24.10.0-SNAPSHOT-material.jar --spring.config.location=file:gen_bootstrap.yml" -#"bonus-job-24.10.0-SNAPSHOT-material.jar --spring.config.location=file:job_bootstrap.yml" -#"bonus-file-24.10.0-SNAPSHOT-material.jar --spring.config.location=file:file_bootstrap.yml" -#"bonus-visual-24.10.0-SNAPSHOT-monitor-material.jar --spring.config.location=file:visual_bootstrap.yml" +jars=("bonus-auth-24.11.0-SNAPSHOT-material.jar --spring.config.location=file:auth_bootstrap.yml" +"bonus-gateway-24.11.0-SNAPSHOT-material.jar --spring.config.location=file:gateway_bootstrap.yml" +"bonus-system-24.11.0-SNAPSHOT-material.jar --spring.config.location=file:system_bootstrap.yml" +#"bonus-gen-24.11.0-SNAPSHOT-material.jar --spring.config.location=file:gen_bootstrap.yml" +#"bonus-job-24.11.0-SNAPSHOT-material.jar --spring.config.location=file:job_bootstrap.yml" +#"bonus-file-24.11.0-SNAPSHOT-material.jar --spring.config.location=file:file_bootstrap.yml" +#"bonus-visual-24.11.0-SNAPSHOT-monitor-material.jar --spring.config.location=file:visual_bootstrap.yml" "bonus-material.jar --spring.config.location=file:material_bootstrap.yml") # 遍历数组并检查每个JAR文件的进程 From 538b15ada122b95626229aaed3b094c7f7ed273f Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 8 Nov 2024 13:49:47 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/domain/PurchaseCheckDetails.java | 19 ++++++++++--------- .../purchase/domain/PurchaseCheckInfo.java | 2 -- .../impl/PurchaseNoticePersonServiceImpl.java | 2 +- .../purchase/PurchaseCheckDetailsMapper.xml | 11 +++++------ 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java index d154ae60..2aa046a9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java @@ -72,21 +72,22 @@ public class PurchaseCheckDetails extends BaseEntity { private Long bindNum; /** 验收结论 */ - @Excel(name = "验收结论") + //@Excel(name = "验收结论") @ApiModelProperty(value = "验收结论") private String checkResult; /** 物资厂家id */ - @Excel(name = "物资厂家id") + //@Excel(name = "物资厂家id") @ApiModelProperty(value = "物资厂家id") private Long supplierId; /** 物资厂家名称 */ @ApiModelProperty(value = "物资厂家名称") + @Excel(name = "物资厂家名称") private String supplierName; /** 0-未验收,1-已验收,2-待通知,3-验收不通过,4-已入库,5-入库驳回,6-综合服务中心审核通过，7-综合服务中心不通过 */ - @Excel(name = "0-未验收,1-已验收,2-待通知,3-验收不通过,4-已入库,5-入库驳回,6-综合服务中心审核通过，7-综合服务中心不通过") + //@Excel(name = "0-未验收,1-已验收,2-待通知,3-验收不通过,4-已入库,5-入库驳回,6-综合服务中心审核通过，7-综合服务中心不通过") @ApiModelProperty(value = "0-未验收,1-已验收,2-待通知,3-验收不通过,4-已入库,5-入库驳回,6-综合服务中心审核通过，7-综合服务中心不通过") private Integer status; @@ -97,12 +98,12 @@ public class PurchaseCheckDetails extends BaseEntity { private Date productionTime; /** 验收图片 */ - @Excel(name = "验收图片") + //@Excel(name = "验收图片") @ApiModelProperty(value = "验收图片") private String checkUrlName; /** 验收图片名称 */ - @Excel(name = "验收图片名称") + //@Excel(name = "验收图片名称") @ApiModelProperty(value = "验收图片名称") private String checkUrl; @@ -123,17 +124,17 @@ public class PurchaseCheckDetails extends BaseEntity { private Date inputTime; /** 验收附件名称 */ - @Excel(name = "验收附件名称") + //@Excel(name = "验收附件名称") @ApiModelProperty(value = "验收附件名称") private String fileName; /** 验收附件 */ - @Excel(name = "验收附件") + //@Excel(name = "验收附件") @ApiModelProperty(value = "验收附件") private String fileUrl; /** 数据所属组织 */ - @Excel(name = "数据所属组织") + //@Excel(name = "数据所属组织") @ApiModelProperty(value = "数据所属组织") private Long companyId; @@ -142,7 +143,7 @@ public class PurchaseCheckDetails extends BaseEntity { private String fixCode; /** 验收附件列表 */ - @Excel(name = "验收附件列表") + //@Excel(name = "验收附件列表") @ApiModelProperty(value = "验收附件列表") private List bmFileInfos; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java index 9bd53852..c21e32ed 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java @@ -42,7 +42,6 @@ public class PurchaseCheckInfo extends BaseEntity { /** 采购日期 */ @ApiModelProperty(value = "采购日期") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @Excel(name = "采购日期", width = 30, dateFormat = "yyyy-MM-dd") private Date purchaseTime; /** 到货日期 */ @@ -69,7 +68,6 @@ public class PurchaseCheckInfo extends BaseEntity { /** 数据所属组织 */ @Excel(name = "数据所属组织") - @ApiModelProperty(value = "数据所属组织") private Long companyId; /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java index 97b39737..b46d7e61 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java @@ -73,7 +73,7 @@ public class PurchaseNoticePersonServiceImpl implements IPurchaseNoticePersonSer public AjaxResult batchSendSms(PurchaseNoticePersonDto purchaseNoticePersonDto) { String splitPhoneNumber = String.join(",", purchaseNoticePersonDto.getPhoneNumbers()); try { - String sendResult = SmsUtils.smsToken(splitPhoneNumber, purchaseNoticePersonDto.getContent(), null); + String sendResult = SmsUtils.smsToken(splitPhoneNumber, purchaseNoticePersonDto.getContent(), "60"); if (sendResult != null) { // 发送短信后修改任务状态 tmTaskMapper.updateTmTask(new TmTask() diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml index 149d0326..2a983551 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml @@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -260,17 +260,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + task_id = #{taskId} + - select count(1) from purchase_check_details From 46d3116c5b2886505d612cb2f5e57591e31f6b2b Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 8 Nov 2024 14:34:03 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ma/controller/MachineController.java | 2 +- .../mapper/PurchaseCheckDetailsMapper.java | 2 ++ .../impl/PurchaseCheckInfoServiceImpl.java | 4 +--- .../impl/PurchaseNoticePersonServiceImpl.java | 4 ++-- .../purchase/PurchaseCheckDetailsMapper.xml | 23 ++++++++++++++++++- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java index 02bf727a..916706d9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java @@ -57,7 +57,7 @@ public class MachineController extends BaseController { * 查询机具设备管理列表 */ @ApiOperation(value = "查询机具设备管理列表") - @RequiresPermissions("ma:machine:typeList") + //@RequiresPermissions("ma:machine:typeList") @GetMapping("/getTypeList") public AjaxResult list(Type type) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java index e44dd9f0..8d722514 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java @@ -82,6 +82,8 @@ public interface PurchaseCheckDetailsMapper { */ int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus); + int updatePurchaseDetails(PurchaseCheckDetails details); + int getCountOfNoneThisStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus); /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index 16763e7d..7352dbfe 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -255,9 +255,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { Long taskId = purchaseCheckDto.getPurchaseCheckInfo().getTaskId(); Integer status = purchaseCheckDto.getPurchaseCheckDetailsList().get(0).getStatus(); for (PurchaseCheckDetails details : purchaseCheckDto.getPurchaseCheckDetailsList()) { - result = purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId, - details.getStatus() - ) > 0 ? AjaxResult.success("details验收状态更改成功") : AjaxResult.error("details验收状态更改失败"); + result = purchaseCheckDetailsMapper.updatePurchaseDetails(details) > 0 ? AjaxResult.success("details验收状态更改成功") : AjaxResult.error("details验收状态更改失败"); } //查询是否这个taskId是否已全部验收通过，如果是的，更新整个task的任务状态 int count = purchaseCheckDetailsMapper.getCountOfNoneThisStatus(taskId, status); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java index b46d7e61..f4741902 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java @@ -79,13 +79,13 @@ public class PurchaseNoticePersonServiceImpl implements IPurchaseNoticePersonSer tmTaskMapper.updateTmTask(new TmTask() .setTaskId(purchaseNoticePersonDto.getTaskId()) .setTaskType(PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_CHECK.getTaskTypeId()) - .setTaskStatus(PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_CHECK.getTaskStatusCode()) + .setTaskStatus(PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_CHECK.getTaskStatusValue()) ); // 修改采购明细的任务状态 purchaseCheckDetailsService.batchUpdateDetailsTaskStatus( purchaseNoticePersonDto.getTaskId(), - PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_CHECK.getTaskStatusCode() + PurchaseTaskEnum.PURCHASE_TASK_STATUS_WAIT_CHECK.getTaskStatusValue() ); return AjaxResult.success("短信发送成功:" + sendResult); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml index 2a983551..1acec6cb 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml @@ -266,7 +266,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" set `status` = #{newTaskStatus} where - task_id = #{taskId} + 1=1 + + and task_id = #{taskId} + + + and type_id = #{typeId} + + + + + update + purchase_check_details + set + `status` = #{status} + where + 1=1 + + and task_id = #{taskId} + + + and type_id = #{typeId} + - - where pcd.task_id = #{taskId} + where 1=1 + + and pcd.status = #{status} + + + and pcd.task_id = #{taskId} + From 454a69b7ae507045cdb571de4afd8122fd7c8427 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 8 Nov 2024 17:18:38 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PurchaseBindController.java | 32 +- .../PurchaseCheckDetailsController.java | 276 +++++++++--------- .../PurchaseCheckInfoController.java | 6 +- .../controller/PurchaseStorageController.java | 32 +- .../service/IPurchaseCheckInfoService.java | 2 +- .../impl/PurchaseCheckInfoServiceImpl.java | 22 +- .../purchase/PurchaseCheckDetailsMapper.xml | 8 +- 7 files changed, 187 insertions(+), 191 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java index 6feea098..92fd8bdb 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java @@ -35,28 +35,28 @@ public class PurchaseBindController extends BaseController { /** * 一级分页查询 */ - @ApiOperation(value = "查询新购验收绑定详细列表") - @RequiresPermissions("purchase:bind:list") - @GetMapping(value = "/list") - public TableDataInfo getList(PurchaseDto dto) { - startPage(); - List list = purchaseBindService.selectAll(dto); - return getDataTable(list); - } +// @ApiOperation(value = "查询新购验收绑定详细列表") +// @RequiresPermissions("purchase:bind:list") +// @GetMapping(value = "/list") +// public TableDataInfo getList(PurchaseDto dto) { +// startPage(); +// List list = purchaseBindService.selectAll(dto); +// return getDataTable(list); +// } /** * 获取新购绑定二级明细列表 * @param * @return */ - @ApiOperation(value = "获取新购绑定二级明细列表") - @RequiresPermissions("purchase:bind:query") - @GetMapping("/details") - public TableDataInfo getDetails(PurchaseDto dto) { - startPage(); - List list = purchaseBindService.getDetails(dto); - return getDataTable(list); - } +// @ApiOperation(value = "获取新购绑定二级明细列表") +// @RequiresPermissions("purchase:bind:query") +// @GetMapping("/details") +// public TableDataInfo getDetails(PurchaseDto dto) { +// startPage(); +// List list = purchaseBindService.getDetails(dto); +// return getDataTable(list); +// } /** * 绑定 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java index 5152bf8f..94ce4e5d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java @@ -1,138 +1,138 @@ -package com.bonus.material.purchase.controller; - -import java.util.List; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - -import com.bonus.common.log.enums.OperaType; -import com.bonus.material.common.annotation.PreventRepeatSubmit; -import com.bonus.material.purchase.domain.dto.PurchaseCheckFileDto; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; -import com.bonus.common.log.annotation.SysLog; -import com.bonus.common.security.annotation.RequiresPermissions; -import com.bonus.material.purchase.domain.PurchaseCheckDetails; -import com.bonus.material.purchase.service.IPurchaseCheckDetailsService; -import com.bonus.common.core.web.controller.BaseController; -import com.bonus.common.core.web.domain.AjaxResult; -import com.bonus.common.core.utils.poi.ExcelUtil; -import com.bonus.common.core.web.page.TableDataInfo; - -/** - * 新购验收任务详细Controller - * @author syruan - */ -@Api(tags = "新购验收任务详细接口") -@RestController -@RequestMapping("/purchase_check_details") -public class PurchaseCheckDetailsController extends BaseController { - - @Resource - private IPurchaseCheckDetailsService purchaseCheckDetailsService; - - /** - * 查询新购验收任务详细列表 - */ - @ApiOperation(value = "查询新购验收任务详细列表") - @RequiresPermissions("purchase:details:list") - @GetMapping("/list") - public TableDataInfo list(PurchaseCheckDetails purchaseCheckDetails) { - startPage(); - List list = purchaseCheckDetailsService.selectPurchaseCheckDetailsList(purchaseCheckDetails); - return getDataTable(list); - } - - /** - * 导出新购验收任务详细列表 - */ - @ApiOperation(value = "导出新购验收任务详细列表") - @PreventRepeatSubmit - @RequiresPermissions("purchase:details:export") - @SysLog(title = "新购验收任务详细", businessType = OperaType.EXPORT, logType = 1,module = "物资新购->导出新购验收任务详细") - @PostMapping("/export") - public void export(HttpServletResponse response, PurchaseCheckDetails purchaseCheckDetails) { - List list = purchaseCheckDetailsService.selectPurchaseCheckDetailsList(purchaseCheckDetails); - ExcelUtil util = new ExcelUtil(PurchaseCheckDetails.class); - util.exportExcel(response, list, "新购验收任务详细数据"); - } - - /** - * 获取新购验收任务详细详细信息 - */ - @ApiOperation(value = "获取新购验收任务详细详细信息") - @RequiresPermissions("purchase:details:query") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(purchaseCheckDetailsService.selectPurchaseCheckDetailsById(id)); - } - - /** - * 新增新购验收任务详细 - */ - @ApiOperation(value = "新增新购验收任务详细") - @PreventRepeatSubmit - @RequiresPermissions("purchase:details:add") - @SysLog(title = "新购验收任务详细", businessType = OperaType.INSERT, logType = 1,module = "物资新购->新增新购验收任务详细") - @PostMapping - public AjaxResult add(@RequestBody PurchaseCheckDetails purchaseCheckDetails) { - try { - return toAjax(purchaseCheckDetailsService.insertPurchaseCheckDetails(purchaseCheckDetails)); - } catch (Exception e) { - return error("系统错误, " + e.getMessage()); - } - } - - /** - * 修改新购验收任务详细 - */ - @ApiOperation(value = "修改新购验收任务详细") - @PreventRepeatSubmit - @RequiresPermissions("purchase:details:edit") - @SysLog(title = "新购验收任务详细", businessType = OperaType.UPDATE, module = "物资新购->修改新购验收任务详细") - @PutMapping - public AjaxResult edit(@RequestBody PurchaseCheckDetails purchaseCheckDetails) { - try { - return toAjax(purchaseCheckDetailsService.updatePurchaseCheckDetails(purchaseCheckDetails)); - } catch (Exception e) { - return error("系统错误, " + e.getMessage()); - } - } - - /** - * 删除新购验收任务详细 - */ - @ApiOperation(value = "删除新购验收任务详细") - @PreventRepeatSubmit - @RequiresPermissions("purchase:details:remove") - @SysLog(title = "新购验收任务详细", businessType = OperaType.DELETE, logType = 1,module = "物资新购->删除新购验收任务详细") - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(purchaseCheckDetailsService.deletePurchaseCheckDetailsByIds(ids)); - } - - /** - * 根据任务id查询报告附件 - */ - @ApiOperation(value = "根据任务id查询报告附件") - @RequiresPermissions("purchase:details:query") - @GetMapping("/fileList") - @SysLog(title = "新购验收任务明细报告查询", businessType = OperaType.QUERY, module = "物资新购->根据任务id查询物资报告附件") - public AjaxResult getFileList(PurchaseCheckFileDto purchaseCheckFileDto) { - return success(purchaseCheckDetailsService.selectPurchaseCheckFileListByTaskType(purchaseCheckFileDto.getTaskType(), purchaseCheckFileDto.getTypeId())); - } - - - @ApiOperation(value = "上传报告附件") - @PreventRepeatSubmit - @RequiresPermissions("purchase:details:add") - @SysLog(title = "上传报告附件", businessType = OperaType.INSERT, logType = 1,module = "物资新购->上传物资报告附件") - @PostMapping("/uploadFile") - public AjaxResult uploadFile(@RequestBody @NotNull @Valid PurchaseCheckFileDto purchaseCheckFileDto) { - return purchaseCheckDetailsService.insertPurchaseCheckFile(purchaseCheckFileDto); - } - - -} +//package com.bonus.material.purchase.controller; +// +//import java.util.List; +//import javax.annotation.Resource; +//import javax.servlet.http.HttpServletResponse; +//import javax.validation.Valid; +//import javax.validation.constraints.NotNull; +// +//import com.bonus.common.log.enums.OperaType; +//import com.bonus.material.common.annotation.PreventRepeatSubmit; +//import com.bonus.material.purchase.domain.dto.PurchaseCheckFileDto; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +//import org.springframework.web.bind.annotation.*; +//import com.bonus.common.log.annotation.SysLog; +//import com.bonus.common.security.annotation.RequiresPermissions; +//import com.bonus.material.purchase.domain.PurchaseCheckDetails; +//import com.bonus.material.purchase.service.IPurchaseCheckDetailsService; +//import com.bonus.common.core.web.controller.BaseController; +//import com.bonus.common.core.web.domain.AjaxResult; +//import com.bonus.common.core.utils.poi.ExcelUtil; +//import com.bonus.common.core.web.page.TableDataInfo; +// +///** +// * 新购验收任务详细Controller +// * @author syruan +// */ +//@Api(tags = "新购验收任务详细接口") +//@RestController +//@RequestMapping("/purchase_check_details") +//public class PurchaseCheckDetailsController extends BaseController { +// +// @Resource +// private IPurchaseCheckDetailsService purchaseCheckDetailsService; +// +// /** +// * 查询新购验收任务详细列表 +// */ +// @ApiOperation(value = "查询新购验收任务详细列表") +// @RequiresPermissions("purchase:details:list") +// @GetMapping("/list") +// public TableDataInfo list(PurchaseCheckDetails purchaseCheckDetails) { +// startPage(); +// List list = purchaseCheckDetailsService.selectPurchaseCheckDetailsList(purchaseCheckDetails); +// return getDataTable(list); +// } +// +// /** +// * 导出新购验收任务详细列表 +// */ +// @ApiOperation(value = "导出新购验收任务详细列表") +// @PreventRepeatSubmit +// @RequiresPermissions("purchase:details:export") +// @SysLog(title = "新购验收任务详细", businessType = OperaType.EXPORT, logType = 1,module = "物资新购->导出新购验收任务详细") +// @PostMapping("/export") +// public void export(HttpServletResponse response, PurchaseCheckDetails purchaseCheckDetails) { +// List list = purchaseCheckDetailsService.selectPurchaseCheckDetailsList(purchaseCheckDetails); +// ExcelUtil util = new ExcelUtil(PurchaseCheckDetails.class); +// util.exportExcel(response, list, "新购验收任务详细数据"); +// } +// +// /** +// * 获取新购验收任务详细详细信息 +// */ +// @ApiOperation(value = "获取新购验收任务详细详细信息") +// @RequiresPermissions("purchase:details:query") +// @GetMapping(value = "/{id}") +// public AjaxResult getInfo(@PathVariable("id") Long id) { +// return success(purchaseCheckDetailsService.selectPurchaseCheckDetailsById(id)); +// } +// +// /** +// * 新增新购验收任务详细 +// */ +// @ApiOperation(value = "新增新购验收任务详细") +// @PreventRepeatSubmit +// @RequiresPermissions("purchase:details:add") +// @SysLog(title = "新购验收任务详细", businessType = OperaType.INSERT, logType = 1,module = "物资新购->新增新购验收任务详细") +// @PostMapping +// public AjaxResult add(@RequestBody PurchaseCheckDetails purchaseCheckDetails) { +// try { +// return toAjax(purchaseCheckDetailsService.insertPurchaseCheckDetails(purchaseCheckDetails)); +// } catch (Exception e) { +// return error("系统错误, " + e.getMessage()); +// } +// } +// +// /** +// * 修改新购验收任务详细 +// */ +// @ApiOperation(value = "修改新购验收任务详细") +// @PreventRepeatSubmit +// @RequiresPermissions("purchase:details:edit") +// @SysLog(title = "新购验收任务详细", businessType = OperaType.UPDATE, module = "物资新购->修改新购验收任务详细") +// @PutMapping +// public AjaxResult edit(@RequestBody PurchaseCheckDetails purchaseCheckDetails) { +// try { +// return toAjax(purchaseCheckDetailsService.updatePurchaseCheckDetails(purchaseCheckDetails)); +// } catch (Exception e) { +// return error("系统错误, " + e.getMessage()); +// } +// } +// +// /** +// * 删除新购验收任务详细 +// */ +// @ApiOperation(value = "删除新购验收任务详细") +// @PreventRepeatSubmit +// @RequiresPermissions("purchase:details:remove") +// @SysLog(title = "新购验收任务详细", businessType = OperaType.DELETE, logType = 1,module = "物资新购->删除新购验收任务详细") +// @DeleteMapping("/{ids}") +// public AjaxResult remove(@PathVariable Long[] ids) { +// return toAjax(purchaseCheckDetailsService.deletePurchaseCheckDetailsByIds(ids)); +// } +// +// /** +// * 根据任务id查询报告附件 +// */ +// @ApiOperation(value = "根据任务id查询报告附件") +// @RequiresPermissions("purchase:details:query") +// @GetMapping("/fileList") +// @SysLog(title = "新购验收任务明细报告查询", businessType = OperaType.QUERY, module = "物资新购->根据任务id查询物资报告附件") +// public AjaxResult getFileList(PurchaseCheckFileDto purchaseCheckFileDto) { +// return success(purchaseCheckDetailsService.selectPurchaseCheckFileListByTaskType(purchaseCheckFileDto.getTaskType(), purchaseCheckFileDto.getTypeId())); +// } +// +// +// @ApiOperation(value = "上传报告附件") +// @PreventRepeatSubmit +// @RequiresPermissions("purchase:details:add") +// @SysLog(title = "上传报告附件", businessType = OperaType.INSERT, logType = 1,module = "物资新购->上传物资报告附件") +// @PostMapping("/uploadFile") +// public AjaxResult uploadFile(@RequestBody @NotNull @Valid PurchaseCheckFileDto purchaseCheckFileDto) { +// return purchaseCheckDetailsService.insertPurchaseCheckFile(purchaseCheckFileDto); +// } +// +// +//} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java index 9687d5bd..ab1621bc 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java @@ -29,7 +29,7 @@ import com.bonus.common.core.web.page.TableDataInfo; * * @author syruan */ -@Api(tags = "新购验收任务接口") +@Api(tags = "新购管理接口") @RestController @RequestMapping("/purchase_check_info") public class PurchaseCheckInfoController extends BaseController { @@ -112,8 +112,8 @@ public class PurchaseCheckInfoController extends BaseController { //@RequiresPermissions("purchase:info:edit") @SysLog(title = "新购验收任务", businessType = OperaType.UPDATE, module = "物资新购->内层批量验收API") @PutMapping("/innerVerify") - public AjaxResult innerVerify(@RequestBody PurchaseCheckDto purchaseCheckDto) { - return purchaseCheckInfoService.innerVerify(purchaseCheckDto); + public AjaxResult innerVerify(@RequestBody List purchaseCheckDetailsList) { + return purchaseCheckInfoService.innerVerify(purchaseCheckDetailsList); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java index 53f507e2..3f40109a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java @@ -35,28 +35,28 @@ public class PurchaseStorageController extends BaseController { /** * 一级分页查询 */ - @ApiOperation(value = "查询新购验收入库详细列表") - @RequiresPermissions("purchase:storage:list") - @GetMapping(value = "/list") - public TableDataInfo getList(PurchaseDto dto) { - startPage(); - List list = purchaseStorageService.selectAll(dto); - return getDataTable(list); - } +// @ApiOperation(value = "查询新购验收入库详细列表") +// @RequiresPermissions("purchase:storage:list") +// @GetMapping(value = "/list") +// public TableDataInfo getList(PurchaseDto dto) { +// startPage(); +// List list = purchaseStorageService.selectAll(dto); +// return getDataTable(list); +// } /** * 获取新购入库二级明细列表 * @param * @return */ - @ApiOperation(value = "获取新购入库二级明细列表") - @RequiresPermissions("purchase:storage:details") - @GetMapping("/details") - public TableDataInfo getDetails(PurchaseDto dto) { - startPage(); - List list = purchaseStorageService.getDetails(dto); - return getDataTable(list); - } +// @ApiOperation(value = "获取新购入库二级明细列表") +// @RequiresPermissions("purchase:storage:details") +// @GetMapping("/details") +// public TableDataInfo getDetails(PurchaseDto dto) { +// startPage(); +// List list = purchaseStorageService.getDetails(dto); +// return getDataTable(list); +// } /** * 入库或批量入库 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java index 297365a6..64364460 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java @@ -50,7 +50,7 @@ public interface IPurchaseCheckInfoService { AjaxResult outVerify(PurchaseDto purchaseDto); - AjaxResult innerVerify(PurchaseCheckDto purchaseCheckDto); + AjaxResult innerVerify(List purchaseCheckDetailsList); /** * 根据任务id查询验收单 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index 422b7cf4..4f0ff090 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -235,18 +235,20 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { @Override @Transactional - public AjaxResult innerVerify(PurchaseCheckDto purchaseCheckDto) { + public AjaxResult innerVerify(List purchaseCheckDetailsList) { try { AjaxResult result = new AjaxResult(); - Long taskId = purchaseCheckDto.getPurchaseCheckInfo().getTaskId(); - Integer status = purchaseCheckDto.getPurchaseCheckDetailsList().get(0).getStatus(); - for (PurchaseCheckDetails details : purchaseCheckDto.getPurchaseCheckDetailsList()) { - result = purchaseCheckDetailsMapper.updatePurchaseDetails(details) > 0 ? AjaxResult.success("details验收状态更改成功") : AjaxResult.error("details验收状态更改失败"); - } - //查询是否这个taskId是否已全部验收通过，如果是的，更新整个task的任务状态 - int count = purchaseCheckDetailsMapper.getCountOfNoneThisStatus(taskId, status); - if (count == 0) { - result = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, status) > 0 ? AjaxResult.success("task验收状态更改成功") : AjaxResult.error("task验收状态更改失败"); + if (!CollectionUtils.isEmpty(purchaseCheckDetailsList)) { + Long taskId = purchaseCheckDetailsList.get(0).getTaskId(); + Integer status = purchaseCheckDetailsList.get(0).getStatus(); + for (PurchaseCheckDetails details : purchaseCheckDetailsList) { + result = purchaseCheckDetailsMapper.updatePurchaseDetails(details) > 0 ? AjaxResult.success("details验收状态更改成功") : AjaxResult.error("details验收状态更改失败"); + } + //查询是否这个taskId是否已全部验收通过，如果是的，更新整个task的任务状态 + int count = purchaseCheckDetailsMapper.getCountOfNoneThisStatus(taskId, status); + if (count == 0) { + result = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, status) > 0 ? AjaxResult.success("task验收状态更改成功") : AjaxResult.error("task验收状态更改失败"); + } } return result; } catch (Exception e) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml index 6280c4c4..cf6df590 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml @@ -278,13 +278,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" set `status` = #{newTaskStatus}, check_result = #{checkResult} where - 1=1 - - and task_id = #{taskId} - - - and type_id = #{typeId} - + task_id = #{taskId} From 36adb269e9a143c9de803aafdda98034e23cb768 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 8 Nov 2024 17:22:16 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/material/basic/mapper/BmConfigMapper.java | 2 ++ .../material/basic/service/impl/BmConfigServiceImpl.java | 1 + .../main/resources/mapper/material/basic/BmConfigMapper.xml | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmConfigMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmConfigMapper.java index 067fb38b..593fc8cf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmConfigMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmConfigMapper.java @@ -66,4 +66,6 @@ public interface BmConfigMapper * @return 结果 */ public int deleteBmConfigByIds(Long[] ids); + + public int deleteBmConfigByName(String itemName); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmConfigServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmConfigServiceImpl.java index 714337f6..80f0f158 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmConfigServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmConfigServiceImpl.java @@ -72,6 +72,7 @@ public class BmConfigServiceImpl implements IBmConfigService public int insertBmConfig(BmConfig bmConfig) { bmConfig.setCreateTime(DateUtils.getNowDate()); + bmConfigMapper.deleteBmConfigByName(bmConfig.getItemName()); return bmConfigMapper.insertBmConfig(bmConfig); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmConfigMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmConfigMapper.xml index c22a6be1..1759b889 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmConfigMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmConfigMapper.xml @@ -78,4 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + + delete from bm_config where item_name = #{itemName} + \ No newline at end of file