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 423707b9..0b2e12b4 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 @@ -89,7 +89,7 @@ public class PurchaseBindController extends BaseController { @ApiOperation(value = "二维码生成下载") @PostMapping(value = "/downloadQrCode") @PreventRepeatSubmit - //@RequiresPermissions("purchase:bind:download") + @RequiresPermissions("purchase:bind:download") public void downloadQrCode(HttpServletResponse response, PurchaseDto purchaseDto) { purchaseBindService.downloadQrCode(response, purchaseDto); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java index 6e9cdfac..6aa90310 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java @@ -80,4 +80,12 @@ public interface PurchaseBindMapper { * @param purchaseId */ void updateStatusById(@Param("updatedStatus") Integer updatedStatus, @Param("id") String purchaseId); + + /** + * 更新数量 + * @param dto + * @param num + * @return + */ + int updateNum(@Param("dto") PurchaseDto dto, @Param("num") int num); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java index 2905a499..79fdac7d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java @@ -154,8 +154,20 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { purchaseDto.setCreateTime(DateUtils.getNowDate()); purchaseDto.setTaskId(dto.getTaskId()); purchaseDto.setTypeId(dto.getTypeId()); + purchaseDto.setStatus(0); result += purchaseBindMapper.add(purchaseDto); } + //根据前端传参更新绑定数量 + result += purchaseBindMapper.updateNum(dto, dto.getDtoList().size()); + //根据任务id和类型id查询状态 + List voList = purchaseBindMapper.selectPurchaseCheckInfoById(dto); + if (CollectionUtils.isNotEmpty(voList)) { + for (PurchaseVo purchaseVo : voList) { + if (purchaseVo.getBindNum().equals(purchaseVo.getCheckNum())) { + + } + } + } if (result > 0) { return AjaxResult.success("绑定成功"); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml index b7f9f0e8..c8c04404 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml @@ -88,9 +88,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UPDATE purchase_check_details - SET input_num = #{purchaseNum} - WHERE - id = #{id} + SET bind_num = bind_num + COALESCE(#{num}, 0) + WHERE task_id = #{dto.taskId} + AND type_id = #{dto.typeId} + AND #{num} IS NOT NULL @@ -171,6 +172,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pcd.production_time AS productDate, pm.qr_code AS qrCode, pm.qr_url AS qrUrl, + pcd.check_num AS purchaseNum, + pcd.check_num AS checkNum, + pcd.bind_num AS bindNum, pcd.status AS status FROM purchase_macode_info pm @@ -245,7 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM purchase_macode_info WHERE - DATE_FORMAT(create_time, '%Y-%m') = #{genMonth} + DATE_FORMAT(create_time, '%Y-%m') = #{genMonth} and ma_code is not null ORDER BY qr_code DESC