领料审核增加任务状态筛选

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<String> userIds;
+
+    public List<String> getUserIds() {
+        return userIds;
+    }
+
+    public void setUserIds(List<String> userIds) {
+        this.userIds = userIds;
+    }
+
     /**
      * 类型管理方式
      */

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<PurchaseMacodeInfo> selectPurchaseMacodeInfoListDetails(PurchaseMacodeInfo purchaseMacodeInfo);
+
+    List<String> selectKeepUser(Integer typeId);
 }

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<PurchaseMacodeInfo> selectPutinDetails(PurchaseMacodeInfo purchaseMacodeInfo) {
-        return purchaseMacodeInfoMapper.selectPutinDetails(purchaseMacodeInfo);
+        List<PurchaseMacodeInfo> purchaseMacodeInfos = purchaseMacodeInfoMapper.selectPutinDetails(purchaseMacodeInfo);
+        for (PurchaseMacodeInfo macodeInfo : purchaseMacodeInfos) {
+            List<String> userIds = purchaseMacodeInfoMapper.selectKeepUser(macodeInfo.getTypeId().intValue());
+            userIds.add("1");
+            macodeInfo.setUserIds(userIds);
+        }
+        return purchaseMacodeInfos;
     }
 
     @Override

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
     </select>
+    <select id="selectKeepUser" resultType="java.lang.String">
+        SELECT user_id FROM ma_type_keeper WHERE type_id = #{typeId}
+    </select>
 
     <update id="updateTypeByTypeId">
         update ma_type set num = #{num} where type_id = #{typeId}