退料单查询审核人

bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java

@@ -34,6 +34,8 @@ public class BackApplyInfo implements Serializable {
     @ApiModelProperty(value = "登录用户id")
     private Long userId;
 
+    private Long deptId;
+
     /** ID */
     private Long id;
 

bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java

@@ -189,23 +189,54 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
                 processBackApplyDetailsSimple(details, typeNumMap, typeCodeMap, allFileInfoMap, newCodeList, maIdCodeMap);
             }
 
-            //获取审核人
+            if (backApplyDetailsList.size()>0){
-            List<LeaseOutSign> approveSignList = backApplyDetailsList.stream()
+                //获取审核人--设备类型绑定的库管班班长
-                    .filter(detail -> detail.getSignUrl() != null)
+                BackApplyInfo backApplyInfo2 = mapper.selectCheckPerson(backApplyDetailsList.get(0));
-                    .map(detail -> new LeaseOutSign(detail.getSignType(), detail.getSignUrl()))
+                if (backApplyInfo2!=null){
-                    .distinct()  // 去重操作
+                    BackApplyDetails backApplyDetails = null;
-                    .collect(Collectors.toList());
+                    if (backApplyInfo2.getDeptId()==107){
-            if (!org.springframework.util.CollectionUtils.isEmpty(approveSignList)) {
+                        //李勇
-                for (LeaseOutSign leaseOutSign : approveSignList) {
+                        //查询人员签名
-                    if (StringUtils.isNotBlank(leaseOutSign.getOutSignUrl())) {
+                        backApplyDetails = mapper.selectSignUrlByUserId(118);
-                        if (!leaseOutSign.getOutSignUrl().startsWith("http")) {
+                    } else if (backApplyInfo2.getDeptId()==336){
-                            leaseOutSign.setOutSignUrl("data:image/png;base64," + leaseOutSign.getOutSignUrl());
+                        //王国宝
+                        backApplyDetails = mapper.selectSignUrlByUserId(455);
+                    } else if (backApplyInfo2.getDeptId()==106 || backApplyInfo2.getDeptId()==335){
+                        //刘春杰
+                        backApplyDetails = mapper.selectSignUrlByUserId(1549);
+                    }
+                    if (backApplyDetails != null && backApplyDetails.getSignUrl() != null) {
+                        List<LeaseOutSign> approveSignList = new ArrayList<>();
+                        approveSignList.add(new LeaseOutSign(backApplyDetails.getSignType(), backApplyDetails.getSignUrl()));
+                        for (LeaseOutSign leaseOutSign : approveSignList) {
+                            if (StringUtils.isNotBlank(leaseOutSign.getOutSignUrl())) {
+                                if (!leaseOutSign.getOutSignUrl().startsWith("http")) {
+                                    leaseOutSign.setOutSignUrl("data:image/png;base64," + leaseOutSign.getOutSignUrl());
+                                }
+                            }
                         }
+                        backApplyRequestVo.getBackApplyInfo().setApproveSignList(approveSignList);
                     }
                 }
-                backApplyRequestVo.getBackApplyInfo().setApproveSignList(approveSignList);
             }
 
+//            //获取审核人
+//            List<LeaseOutSign> approveSignList = backApplyDetailsList.stream()
+//                    .filter(detail -> detail.getSignUrl() != null)
+//                    .map(detail -> new LeaseOutSign(detail.getSignType(), detail.getSignUrl()))
+//                    .distinct()  // 去重操作
+//                    .collect(Collectors.toList());
+//            if (!org.springframework.util.CollectionUtils.isEmpty(approveSignList)) {
+//                for (LeaseOutSign leaseOutSign : approveSignList) {
+//                    if (StringUtils.isNotBlank(leaseOutSign.getOutSignUrl())) {
+//                        if (!leaseOutSign.getOutSignUrl().startsWith("http")) {
+//                            leaseOutSign.setOutSignUrl("data:image/png;base64," + leaseOutSign.getOutSignUrl());
+//                        }
+//                    }
+//                }
+//                backApplyRequestVo.getBackApplyInfo().setApproveSignList(approveSignList);
+//            }
+
             backApplyRequestVo.setBackApplyDetailsList(backApplyDetailsList);
         }
 
@@ -310,25 +341,56 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
             for (BackApplyDetails details : backApplyDetailsList) {
                 processBackApplyDetailsSimple(details, typeNumMap, typeCodeMap, allFileInfoMap, newCodeList, maIdCodeMap);
             }
-
+            if (backApplyDetailsList.size()>0){
-            //获取审核人
+                //获取审核人--设备类型绑定的库管班班长
-            List<LeaseOutSign> approveSignList = backApplyDetailsList.stream()
+                BackApplyInfo backApplyInfo2 = mapper.selectCheckPerson(backApplyDetailsList.get(0));
-                    .filter(detail -> detail.getSignUrl() != null)
+                if (backApplyInfo2!=null){
-                    .map(detail -> new LeaseOutSign(detail.getSignType(), detail.getSignUrl()))
+                    BackApplyDetails backApplyDetails = null;
-                    .distinct()  // 去重操作
+                    if (backApplyInfo2.getDeptId()==107){
-                    .collect(Collectors.toList());
+                        //李勇
-            if (!org.springframework.util.CollectionUtils.isEmpty(approveSignList)) {
+                        //查询人员签名
-                for (LeaseOutSign leaseOutSign : approveSignList) {
+                        backApplyDetails = mapper.selectSignUrlByUserId(118);
-                    if (StringUtils.isNotBlank(leaseOutSign.getOutSignUrl())) {
+                    } else if (backApplyInfo2.getDeptId()==336){
-                        if (!leaseOutSign.getOutSignUrl().startsWith("http")) {
+                        //王国宝
-                            leaseOutSign.setOutSignUrl("data:image/png;base64," + leaseOutSign.getOutSignUrl());
+                        backApplyDetails = mapper.selectSignUrlByUserId(455);
+                    } else if (backApplyInfo2.getDeptId()==106 || backApplyInfo2.getDeptId()==335){
+                        //刘春杰
+                        backApplyDetails = mapper.selectSignUrlByUserId(1549);
+                    }
+                    if (backApplyDetails != null && backApplyDetails.getSignUrl() != null) {
+                        List<LeaseOutSign> approveSignList = new ArrayList<>();
+                        approveSignList.add(new LeaseOutSign(backApplyDetails.getSignType(), backApplyDetails.getSignUrl()));
+                        for (LeaseOutSign leaseOutSign : approveSignList) {
+                            if (StringUtils.isNotBlank(leaseOutSign.getOutSignUrl())) {
+                                if (!leaseOutSign.getOutSignUrl().startsWith("http")) {
+                                    leaseOutSign.setOutSignUrl("data:image/png;base64," + leaseOutSign.getOutSignUrl());
+                                }
+                            }
                         }
+                        backApplyRequestVo.getBackApplyInfo().setApproveSignList(approveSignList);
                     }
                 }
-                backApplyRequestVo.getBackApplyInfo().setApproveSignList(approveSignList);
             }
 
 
+//            //获取审核人
+//            List<LeaseOutSign> approveSignList = backApplyDetailsList.stream()
+//                    .filter(detail -> detail.getSignUrl() != null)
+//                    .map(detail -> new LeaseOutSign(detail.getSignType(), detail.getSignUrl()))
+//                    .distinct()  // 去重操作
+//                    .collect(Collectors.toList());
+//            if (!org.springframework.util.CollectionUtils.isEmpty(approveSignList)) {
+//                for (LeaseOutSign leaseOutSign : approveSignList) {
+//                    if (StringUtils.isNotBlank(leaseOutSign.getOutSignUrl())) {
+//                        if (!leaseOutSign.getOutSignUrl().startsWith("http")) {
+//                            leaseOutSign.setOutSignUrl("data:image/png;base64," + leaseOutSign.getOutSignUrl());
+//                        }
+//                    }
+//                }
+//                backApplyRequestVo.getBackApplyInfo().setApproveSignList(approveSignList);
+//            }
+
+
             backApplyRequestVo.setBackApplyDetailsList(backApplyDetailsList);
         }
 

bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java

@@ -3,6 +3,7 @@ package com.bonus.material.common.mapper;
 import com.bonus.common.biz.domain.ProjectTreeNode;
 import com.bonus.common.biz.domain.TreeNode;
 import com.bonus.common.biz.domain.TypeTreeNode;
+import com.bonus.material.back.domain.BackApplyDetails;
 import com.bonus.material.back.domain.BackApplyInfo;
 import com.bonus.material.basic.domain.BmProject;
 import com.bonus.material.basic.domain.BmUnit;
@@ -380,4 +381,7 @@ public interface SelectMapper {
      */
     List<String> getUnsettledProId();
 
+    BackApplyInfo selectCheckPerson(BackApplyDetails details);
+
+    BackApplyDetails selectSignUrlByUserId(int userId);
 }

bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml

@@ -1193,4 +1193,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--            )-->
 <!--          AND bp.pro_id IS NOT NULL-->
     </select>
+    <select id="selectCheckPerson" resultType="com.bonus.material.back.domain.BackApplyInfo">
+        SELECT
+            mtr.user_id as userId,
+            su.dept_id as deptId
+        FROM
+            ma_type_repair mtr
+                LEFT JOIN sys_user su on su.user_id=mtr.user_id
+        WHERE
+            mtr.type_id=#{typeId}
+          and (su.dept_id='107' or su.dept_id='336' or su.dept_id='106' or su.dept_id='335')
+        GROUP BY su.dept_id
+            LIMIT 1
+    </select>
+    <select id="selectSignUrlByUserId" resultType="com.bonus.material.back.domain.BackApplyDetails">
+        SELECT
+            sign_url as signUrl,
+            sign_type as signType
+        FROM
+            sys_user
+        WHERE
+            user_id=#{userId}
+    </select>
 </mapper>