From b8143b7e1577e93449c42dbc11279939e8f5d79d Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 21 Aug 2024 15:36:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BpmPurchaseAcceptController.java | 10 +++---- .../mapper/BpmPurchaseAcceptMapper.java | 8 +++--- .../service/BpmPurchaseAcceptService.java | 6 ++--- .../impl/BpmPurchaseAcceptServiceImpl.java | 26 +++++++++---------- ...{PurchaseVo.java => PurchaseAcceptVo.java} | 13 +++++++--- .../mapper/BpmPurchaseAcceptMapper.xml | 12 ++++----- 6 files changed, 40 insertions(+), 35 deletions(-) rename bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/{PurchaseVo.java => PurchaseAcceptVo.java} (85%) diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseAcceptController.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseAcceptController.java index 69794fd..4cebbb1 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseAcceptController.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseAcceptController.java @@ -7,7 +7,7 @@ import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.purchase.dto.PurchaseDto; import com.bonus.purchase.service.BpmPurchaseAcceptService; -import com.bonus.purchase.vo.PurchaseVo; +import com.bonus.purchase.vo.PurchaseAcceptVo; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -34,7 +34,7 @@ public class BpmPurchaseAcceptController extends BaseController { @RequiresPermissions("purchase:purchaseDto:query") public TableDataInfo getList(PurchaseDto purchaseDto) { startPage(); - List list = purchaseAcceptService.selectAll(purchaseDto); + List list = purchaseAcceptService.selectAll(purchaseDto); return getDataTable(list); } @@ -48,7 +48,7 @@ public class BpmPurchaseAcceptController extends BaseController { @RequiresPermissions("purchase:purchaseDto:query") public TableDataInfo getDetails(PurchaseDto purchaseDto) { startPage(); - List list = purchaseAcceptService.getDetails(purchaseDto); + List list = purchaseAcceptService.getDetails(purchaseDto); return getDataTable(list); } @@ -84,8 +84,8 @@ public class BpmPurchaseAcceptController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, PurchaseDto purchaseDto) { - List list = purchaseAcceptService.selectAll(purchaseDto); - ExcelUtil util = new ExcelUtil<>(PurchaseVo.class); + List list = purchaseAcceptService.selectAll(purchaseDto); + ExcelUtil util = new ExcelUtil<>(PurchaseAcceptVo.class); util.exportExcel(response, list, "新购验证列表"); } } diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseAcceptMapper.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseAcceptMapper.java index 8a3a9eb..48341cc 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseAcceptMapper.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseAcceptMapper.java @@ -1,7 +1,7 @@ package com.bonus.purchase.mapper; import com.bonus.purchase.dto.PurchaseDto; -import com.bonus.purchase.vo.PurchaseVo; +import com.bonus.purchase.vo.PurchaseAcceptVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,14 +17,14 @@ public interface BpmPurchaseAcceptMapper { * @param purchaseDto * @return */ - List selectAll(PurchaseDto purchaseDto); + List selectAll(PurchaseDto purchaseDto); /** * 查询详情 * @param purchaseDto * @return */ - List getDetails(PurchaseDto purchaseDto); + List getDetails(PurchaseDto purchaseDto); /** * 查询状态 @@ -53,7 +53,7 @@ public interface BpmPurchaseAcceptMapper { * @param split * @return */ - List select(@Param("array") String[] split); + List select(@Param("array") String[] split); /** * 更新采购数量 diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseAcceptService.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseAcceptService.java index 7a8e3a5..26655ca 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseAcceptService.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseAcceptService.java @@ -2,7 +2,7 @@ package com.bonus.purchase.service; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.purchase.dto.PurchaseDto; -import com.bonus.purchase.vo.PurchaseVo; +import com.bonus.purchase.vo.PurchaseAcceptVo; import java.util.List; @@ -17,14 +17,14 @@ public interface BpmPurchaseAcceptService { * @param purchaseDto * @return */ - List selectAll(PurchaseDto purchaseDto); + List selectAll(PurchaseDto purchaseDto); /** * 查询详情 * @param purchaseDto * @return */ - List getDetails(PurchaseDto purchaseDto); + List getDetails(PurchaseDto purchaseDto); /** * 批量验收合格 diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java index a83d30e..0273cce 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java @@ -6,7 +6,7 @@ import com.bonus.purchase.dto.PurchaseDto; import com.bonus.purchase.mapper.BpmPurchaseAcceptMapper; import com.bonus.purchase.service.BpmPurchaseAcceptService; import com.bonus.purchase.utils.Constants; -import com.bonus.purchase.vo.PurchaseVo; +import com.bonus.purchase.vo.PurchaseAcceptVo; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,7 +32,7 @@ public class BpmPurchaseAcceptServiceImpl implements BpmPurchaseAcceptService { * @return */ @Override - public List selectAll(PurchaseDto purchaseDto) { + public List selectAll(PurchaseDto purchaseDto) { return mapper.selectAll(purchaseDto); } @@ -42,7 +42,7 @@ public class BpmPurchaseAcceptServiceImpl implements BpmPurchaseAcceptService { * @return */ @Override - public List getDetails(PurchaseDto purchaseDto) { + public List getDetails(PurchaseDto purchaseDto) { return mapper.getDetails(purchaseDto); } @@ -78,9 +78,9 @@ public class BpmPurchaseAcceptServiceImpl implements BpmPurchaseAcceptService { List taskIds = purchaseDto.getTaskIds(); for (Integer taskId : taskIds) { purchaseDto.setId(taskId); - List details = mapper.getDetails(purchaseDto); + List details = mapper.getDetails(purchaseDto); //根据查询的采购数量，更新验收数量 - for (PurchaseVo purchaseVo : details) { + for (PurchaseAcceptVo purchaseVo : details) { result = mapper.updateCheckNum(purchaseVo.getId(), purchaseVo.getPurchaseNum()); } } @@ -99,18 +99,18 @@ public class BpmPurchaseAcceptServiceImpl implements BpmPurchaseAcceptService { //根据采购单id查询详情id for (int i = 0; i < split.length; i++) { purchaseDto.setPurchaseId(split[i]); - List details = mapper.getDetails(purchaseDto); - for (PurchaseVo purchaseVo : details) { + List details = mapper.getDetails(purchaseDto); + for (PurchaseAcceptVo purchaseVo : details) { result = mapper.updateCheckNum(purchaseVo.getId(), purchaseVo.getPurchaseNum()); } } //根据详情id查询详情状态，更新任务表状态 - List statusList = mapper.select(split); + List statusList = mapper.select(split); // 使用流 API 按 id 分组，并提取 status Map> groupedByIdStatus = statusList.stream() .collect(Collectors.groupingBy( - PurchaseVo::getId, - Collectors.mapping(PurchaseVo::getStatus, Collectors.toList()) + PurchaseAcceptVo::getId, + Collectors.mapping(PurchaseAcceptVo::getStatus, Collectors.toList()) )); for (Map.Entry> entry : groupedByIdStatus.entrySet()) { Integer id = entry.getKey(); @@ -155,12 +155,12 @@ public class BpmPurchaseAcceptServiceImpl implements BpmPurchaseAcceptService { try { result = mapper.updateDetails(split, purchaseDto.getStatus()); //根据详情id查询详情状态，更新任务表状态 - List statusList = mapper.select(split); + List statusList = mapper.select(split); // 使用流 API 按 id 分组，并提取 status Map> groupedByIdStatus = statusList.stream() .collect(Collectors.groupingBy( - PurchaseVo::getId, - Collectors.mapping(PurchaseVo::getStatus, Collectors.toList()) + PurchaseAcceptVo::getId, + Collectors.mapping(PurchaseAcceptVo::getStatus, Collectors.toList()) )); for (Map.Entry> entry : groupedByIdStatus.entrySet()) { Integer id = entry.getKey(); diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseVo.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseAcceptVo.java similarity index 85% rename from bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseVo.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseAcceptVo.java index d4d0266..525af27 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseVo.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseAcceptVo.java @@ -1,16 +1,19 @@ package com.bonus.purchase.vo; import com.bonus.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** - * 新购验收一级列表返回vo + * 新购验收列表返回vo * @Author ma_sh * @create 2024/8/19 17:36 */ @Data -public class PurchaseVo { +public class PurchaseAcceptVo { @ApiModelProperty(value="任务id") private Integer id; @@ -28,11 +31,13 @@ public class PurchaseVo { private String supplierName; @ApiModelProperty(value="出厂日期") - private String productDate; + @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") + private Date productDate; @ApiModelProperty(value="到货时间") + @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") @Excel(name = "到货时间") - private String arrivalTime; + private Date arrivalTime; @ApiModelProperty(value="采购单号") @Excel(name = "采购单号") diff --git a/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml b/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml index ee03191..fca43cc 100644 --- a/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml +++ b/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bp.id = #{id} - SELECT bt.id AS id, bt.arrival_time AS arrivalTime, @@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE bp.is_active = '1' - AND bt.arrival_time BETWEEN #{startTime} AND #{endTime} + AND ( @@ -72,9 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bt.arrival_time DESC - SELECT - bp.id AS id, + bp.id AS purchaseId, mt1.`name` AS materialName, mt.`name` AS specificationCode, sda.dict_label AS unitName, @@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND bs.id = #{supplierId} - AND bp.product_date = #{productDate} + AND bp.task_id = #{id} @@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select task_id as id, status as status from bpm_purchase_info bp