diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java index 2c735d32..9454dfe6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java +++ b/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; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java index f2234773..8a985216 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java +++ b/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); } - //获取审核人 - List 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()); + if (backApplyDetailsList.size()>0){ + //获取审核人--设备类型绑定的库管班班长 + BackApplyInfo backApplyInfo2 = mapper.selectCheckPerson(backApplyDetailsList.get(0)); + if (backApplyInfo2!=null){ + BackApplyDetails backApplyDetails = null; + if (backApplyInfo2.getDeptId()==107){ + //李勇 + //查询人员签名 + backApplyDetails = mapper.selectSignUrlByUserId(118); + } else if (backApplyInfo2.getDeptId()==336){ + //王国宝 + backApplyDetails = mapper.selectSignUrlByUserId(455); + } else if (backApplyInfo2.getDeptId()==106 || backApplyInfo2.getDeptId()==335){ + //刘春杰 + backApplyDetails = mapper.selectSignUrlByUserId(1549); + } + if (backApplyDetails != null && backApplyDetails.getSignUrl() != null) { + List 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 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); } - - //获取审核人 - List 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()); + if (backApplyDetailsList.size()>0){ + //获取审核人--设备类型绑定的库管班班长 + BackApplyInfo backApplyInfo2 = mapper.selectCheckPerson(backApplyDetailsList.get(0)); + if (backApplyInfo2!=null){ + BackApplyDetails backApplyDetails = null; + if (backApplyInfo2.getDeptId()==107){ + //李勇 + //查询人员签名 + backApplyDetails = mapper.selectSignUrlByUserId(118); + } else if (backApplyInfo2.getDeptId()==336){ + //王国宝 + backApplyDetails = mapper.selectSignUrlByUserId(455); + } else if (backApplyInfo2.getDeptId()==106 || backApplyInfo2.getDeptId()==335){ + //刘春杰 + backApplyDetails = mapper.selectSignUrlByUserId(1549); + } + if (backApplyDetails != null && backApplyDetails.getSignUrl() != null) { + List 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 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); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java index 9bf7cd24..9fb66b52 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java +++ b/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 getUnsettledProId(); + BackApplyInfo selectCheckPerson(BackApplyDetails details); + + BackApplyDetails selectSignUrlByUserId(int userId); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml index aefd71f0..5697092b 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml @@ -1193,4 +1193,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +