bonus
/
ahdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
wcy 2024-08-21 17:12:05 +08:00
parent 7588a16f16 b8143b7e15
commit 2be560f744
6 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseAcceptController.java
View File

@ -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<PurchaseVo> list = purchaseAcceptService.selectAll(purchaseDto);
List<PurchaseAcceptVo> 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<PurchaseVo> list = purchaseAcceptService.getDetails(purchaseDto);
List<PurchaseAcceptVo> 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<PurchaseVo> list = purchaseAcceptService.selectAll(purchaseDto);
ExcelUtil<PurchaseVo> util = new ExcelUtil<>(PurchaseVo.class);
List<PurchaseAcceptVo> list = purchaseAcceptService.selectAll(purchaseDto);
ExcelUtil<PurchaseAcceptVo> util = new ExcelUtil<>(PurchaseAcceptVo.class);
util.exportExcel(response, list, "新购验证列表");
}
}

8
bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseAcceptMapper.java
View File

@ -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<PurchaseVo> selectAll(PurchaseDto purchaseDto);
List<PurchaseAcceptVo> selectAll(PurchaseDto purchaseDto);
/**
* 查询详情
* @param purchaseDto
* @return
*/
List<PurchaseVo> getDetails(PurchaseDto purchaseDto);
List<PurchaseAcceptVo> getDetails(PurchaseDto purchaseDto);
/**
* 查询状态
@ -53,7 +53,7 @@ public interface BpmPurchaseAcceptMapper {
* @param split
* @return
*/
List<PurchaseVo> select(@Param("array") String[] split);
List<PurchaseAcceptVo> select(@Param("array") String[] split);
/**
* 更新采购数量

6
bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseAcceptService.java
View File

@ -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<PurchaseVo> selectAll(PurchaseDto purchaseDto);
List<PurchaseAcceptVo> selectAll(PurchaseDto purchaseDto);
/**
* 查询详情
* @param purchaseDto
* @return
*/
List<PurchaseVo> getDetails(PurchaseDto purchaseDto);
List<PurchaseAcceptVo> getDetails(PurchaseDto purchaseDto);
/**
* 批量验收合格

26
bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java
View File

@ -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<PurchaseVo> selectAll(PurchaseDto purchaseDto) {
public List<PurchaseAcceptVo> selectAll(PurchaseDto purchaseDto) {
return mapper.selectAll(purchaseDto);
}
@ -42,7 +42,7 @@ public class BpmPurchaseAcceptServiceImpl implements BpmPurchaseAcceptService {
* @return
*/
@Override
public List<PurchaseVo> getDetails(PurchaseDto purchaseDto) {
public List<PurchaseAcceptVo> getDetails(PurchaseDto purchaseDto) {
return mapper.getDetails(purchaseDto);
}
@ -78,9 +78,9 @@ public class BpmPurchaseAcceptServiceImpl implements BpmPurchaseAcceptService {
List<Integer> taskIds = purchaseDto.getTaskIds();
for (Integer taskId : taskIds) {
purchaseDto.setId(taskId);
List<PurchaseVo> details = mapper.getDetails(purchaseDto);
List<PurchaseAcceptVo> 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<PurchaseVo> details = mapper.getDetails(purchaseDto);
for (PurchaseVo purchaseVo : details) {
List<PurchaseAcceptVo> details = mapper.getDetails(purchaseDto);
for (PurchaseAcceptVo purchaseVo : details) {
result = mapper.updateCheckNum(purchaseVo.getId(), purchaseVo.getPurchaseNum());
}
}
//根据详情id查询详情状态，更新任务表状态
List<PurchaseVo> statusList = mapper.select(split);
List<PurchaseAcceptVo> statusList = mapper.select(split);
// 使用流 API 按 id 分组，并提取 status
Map<Integer, List<Integer>> 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<Integer, List<Integer>> 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<PurchaseVo> statusList = mapper.select(split);
List<PurchaseAcceptVo> statusList = mapper.select(split);
// 使用流 API 按 id 分组，并提取 status
Map<Integer, List<Integer>> 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<Integer, List<Integer>> entry : groupedByIdStatus.entrySet()) {
Integer id = entry.getKey();

13
bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseVo.java → bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseAcceptVo.java
View File

@ -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 = "采购单号")

12
bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml
View File

@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bp.id = #{id}
</update>
<select id="selectAll" resultType="com.bonus.purchase.vo.PurchaseVo">
<select id="selectAll" resultType="com.bonus.purchase.vo.PurchaseAcceptVo">
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'
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND bt.arrival_time BETWEEN #{startTime} AND #{endTime}
<![CDATA[ AND DATE_FORMAT( bt.arrival_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
</if>
<if test="keyWord != null and keyWord != ''">
AND (
@ -72,9 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bt.arrival_time DESC
</select>
<select id="getDetails" resultType="com.bonus.purchase.vo.PurchaseVo">
<select id="getDetails" resultType="com.bonus.purchase.vo.PurchaseAcceptVo">
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}
</if>
<if test="productDate != null and productDate != ''">
AND bp.product_date = #{productDate}
<![CDATA[ AND DATE_FORMAT( bp.product_date, '%Y-%m-%d' ) = #{productDate} ]]>
</if>
<if test="id != null and id != ''">
AND bp.task_id = #{id}
@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</select>
<select id="select" resultType="com.bonus.purchase.vo.PurchaseVo">
<select id="select" resultType="com.bonus.purchase.vo.PurchaseAcceptVo">
select task_id as id,
status as status
from bpm_purchase_info bp