diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java index e006732b..5ead504b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java @@ -8,6 +8,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; import java.math.BigDecimal; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -117,6 +118,18 @@ public class PurchaseMacodeInfo extends BaseEntity @ApiModelProperty(value = "单位名称") private String unitName; + /** 审核员用户id */ + @ApiModelProperty(value = "审核员用户id") + private List userIds; + + public List getUserIds() { + return userIds; + } + + public void setUserIds(List userIds) { + this.userIds = userIds; + } + /** * 类型管理方式 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java index 9d8f7232..7d58e759 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java @@ -282,4 +282,6 @@ public interface PurchaseMacodeInfoMapper { int updateMaTypeNum(MachinePart wholeSetDetail); List selectPurchaseMacodeInfoListDetails(PurchaseMacodeInfo purchaseMacodeInfo); + + List selectKeepUser(Integer typeId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java index 02d3fa20..3b850d0b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java @@ -427,7 +427,13 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService */ @Override public List selectPutinDetails(PurchaseMacodeInfo purchaseMacodeInfo) { - return purchaseMacodeInfoMapper.selectPutinDetails(purchaseMacodeInfo); + List purchaseMacodeInfos = purchaseMacodeInfoMapper.selectPutinDetails(purchaseMacodeInfo); + for (PurchaseMacodeInfo macodeInfo : purchaseMacodeInfos) { + List userIds = purchaseMacodeInfoMapper.selectKeepUser(macodeInfo.getTypeId().intValue()); + userIds.add("1"); + macodeInfo.setUserIds(userIds); + } + return purchaseMacodeInfos; } @Override diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml index 14d02896..d78130ca 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml @@ -540,6 +540,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND pcd.`status` != 3 AND pcd.`status` != 5 + update ma_type set num = #{num} where type_id = #{typeId}