diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialLeaseInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialLeaseInfoController.java index 9ee305ec..29486e3a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialLeaseInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialLeaseInfoController.java @@ -83,7 +83,7 @@ public class MaterialLeaseInfoController extends BaseController { } ExcelUtil util = new ExcelUtil<>(MaterialLeaseApplyDetailExport.class); // 获取当前年月日时分秒导出时间，用括号拼接在后面 - String title = "材料站领料记录" + "（" + DateUtils.getTime() + "）"; + String title = "材料站领料记录" + "（" + "导出时间：" + DateUtils.getTime() + "）"; util.exportExcel(response, list, fileName, title); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialMachineController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialMachineController.java index b7543c24..b90e4262 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialMachineController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialMachineController.java @@ -286,7 +286,7 @@ public class MaterialMachineController extends BaseController { } ExcelUtil util = new ExcelUtil<>(SafeMaterialEquipmentInfo.class); // 获取当前年月日导出时间，用括号拼接在后面 - String title = "工器具预警记录" + "（" + DateUtils.getTime() + "）"; + String title = "工器具预警记录" + "（导出时间：" + DateUtils.getTime() + "）"; util.exportExcel(response, list, fileName, title); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialBackInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialBackInfoMapper.java index c2bba6b0..ac12ae89 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialBackInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialBackInfoMapper.java @@ -264,8 +264,8 @@ public interface MaterialBackInfoMapper { /** * 查询退料协议电子签名 - * @param externalId + * @param backApplyInfo * @return */ - List getLeaseOutSignList(String externalId); + List getLeaseOutSignList(MaterialBackApplyInfo backApplyInfo); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java index 5d3eb3b5..a6916e61 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java @@ -186,13 +186,6 @@ public interface MaterialMachineMapper { */ Integer selectTeamNum(MaterialRetainedEquipmentInfo bean); - /** - * 获取站内库存，在用量，保有量 - * @param bean - * @return - */ - List getRetainTotalInfo(MaterialRetainedEquipmentInfo bean); - /** * 库存量 * @param bean diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialBackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialBackApplyInfoServiceImpl.java index 881440e5..d6d8b4a6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialBackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialBackApplyInfoServiceImpl.java @@ -361,7 +361,7 @@ public class MaterialBackApplyInfoServiceImpl implements MaterialBackApplyInfoSe } } // 根据i8工程ID查询材料员 - List leaseOutSignList = materialBackInfoMapper.getLeaseOutSignList(backApplyInfo.getExternalId()); + List leaseOutSignList = materialBackInfoMapper.getLeaseOutSignList(backApplyInfo); if (CollectionUtils.isNotEmpty(leaseOutSignList)) { for (LeaseOutSign leaseOutSign : leaseOutSignList) { if (!leaseOutSign.getOutSignUrl().startsWith("http")) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java index 96b83095..421cbcb4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java @@ -884,7 +884,7 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { BigDecimal inRopeNum = BigDecimal.ZERO; // 获取在用量 - List useInfoList = materialMachineMapper.getRetainTotalInfo(bean); + List useInfoList = materialMachineMapper.getUsInfoList(bean); // 分别获取useInfoList中以unitValue分组的usNum数量,展示出来 if (!CollectionUtils.isEmpty(useInfoList)) { // 过滤掉不在未结算工程集合内的设备 @@ -893,14 +893,23 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { useCountNum = useInfoList.stream() .filter(item -> "0".equals(item.getUnitValue())) - .map(MaterialRetainedEquipmentInfo::getUsNum) + .map(MaterialRetainedEquipmentInfo::getAllNum) .reduce(BigDecimal::add) .orElse(BigDecimal.ZERO); useRopeNum = useInfoList.stream() .filter(item -> "1".equals(item.getUnitValue())) - .map(MaterialRetainedEquipmentInfo::getUsNum) + .map(MaterialRetainedEquipmentInfo::getAllNum) .reduce(BigDecimal::add) .orElse(BigDecimal.ZERO); + + // 获取usList中的班组id，且去重的数量 + info.setTeamNum((int) useInfoList.stream() + .map(MaterialRetainedEquipmentInfo::getTeamId) + .filter(Objects::nonNull) + .distinct() + .count()); + } else { + info.setTeamNum(0); } //查询目前还有库存的设备 @@ -920,15 +929,6 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { .map(MaterialRetainedEquipmentInfo::getAllNum) .reduce(BigDecimal::add) .orElse(BigDecimal.ZERO); - - // 获取到recordList中externalId不为null且去重的总数（转换为Integer类型） - info.setProNum((int) recordList.stream() - .map(MaterialRetainedEquipmentInfo::getProName) - .filter(Objects::nonNull) - .distinct() - .count()); - } else { - info.setProNum(0); } // 查询分包商领用数据，不作为库存，作为再用数据 @@ -950,28 +950,33 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { .reduce(BigDecimal::add) .orElse(BigDecimal.ZERO); } - // 查询目前在用的设备信息 - List usList = materialMachineMapper.getUsInfoList(bean); - if (CollectionUtils.isNotEmpty(usList)) { - // 过滤掉不在未结算工程集合内的设备 - // 如果 proId 不在未结算集合中，则移除 - usList.removeIf(infos -> infos.getProId() == null || !unsettledProjectIds.contains(infos.getProId())); - // 获取usList中的班组id，且去重的数量 - info.setTeamNum((int) usList.stream() - .map(MaterialRetainedEquipmentInfo::getTeamId) + // 数据合并 + if (!CollectionUtils.isEmpty(recordList)) { + useInfoList.addAll(recordList); + } + if (!CollectionUtils.isEmpty(subList)) { + useInfoList.addAll(subList); + } + // 获取项目部和工程数量 + if (CollectionUtils.isNotEmpty(useInfoList)) { + // 获取到recordList中externalId不为null且去重的总数（转换为Integer类型） + info.setProNum((int) useInfoList.stream() + .map(MaterialRetainedEquipmentInfo::getProName) + .filter(Objects::nonNull) + .distinct() + .count()); + // 获取到recordList中externalId不为null且去重的总数（转换为Integer类型） + info.setDepartNum((int) useInfoList.stream() + .map(MaterialRetainedEquipmentInfo::getDepartName) .filter(Objects::nonNull) .distinct() .count()); } else { - info.setTeamNum(0); - } - List departNameList = materialMachineMapper.getDepartNameList(bean); - if (CollectionUtils.isNotEmpty(departNameList)) { - info.setDepartNum(departNameList.size()); - } else { + info.setProNum(0); info.setDepartNum(0); } + // 获取在库数量 info.setInCountNum(inCountNum); // 获取在用数量 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java index dec91c2d..e4849252 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java @@ -230,7 +230,7 @@ public class SelectServiceImpl implements SelectService { @Override public AjaxResult getTeamList(ProAuthorizeInfo bean) { - List groupList = new ArrayList<>(); + /*List groupList = new ArrayList<>(); List list; try { list = mapper.getUnitListPro(bean); @@ -252,9 +252,9 @@ public class SelectServiceImpl implements SelectService { } catch (Exception e) { log.error("单位类型树-查询失败", e); } - return AjaxResult.success(groupList); - /*List newList = mapper.getTeamNewList(bean); - return AjaxResult.success(newList);*/ + return AjaxResult.success(groupList);*/ + List newList = mapper.getTeamNewList(bean); + return AjaxResult.success(newList); } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/DirectRotationController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/DirectRotationController.java index 1dd93aed..d26a36bf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/DirectRotationController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/DirectRotationController.java @@ -200,6 +200,19 @@ public class DirectRotationController extends BaseController { return toAjax(service.delData(id)); } - + /** + * 查看审核签名详情 + * @param sltAgreementInfo + * @return + */ + @ApiOperation(value = "查看详情") + @GetMapping("/getApproveList") + public AjaxResult getApproveList(SltAgreementInfo sltAgreementInfo) { + try { + return AjaxResult.success(service.getApproveList(sltAgreementInfo)); + } catch (Exception e) { + return AjaxResult.success(new DirectApplyInfo()); + } + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplySignInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplySignInfo.java new file mode 100644 index 00000000..0555c3a0 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplySignInfo.java @@ -0,0 +1,25 @@ +package com.bonus.material.ma.domain; + +import com.bonus.common.biz.domain.lease.LeaseOutSign; +import com.bonus.common.core.web.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + * @author ：梁超 + * direct_apply_info 工地直转信息 + */ +@EqualsAndHashCode(callSuper = false) +@Data +@Accessors(chain = true) +public class DirectApplySignInfo extends BaseEntity { + + /** + * 审核人签名集合 + */ + private List approveSignList; + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/DirectRotationMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/DirectRotationMapper.java index 76c89bf7..f9cf2f46 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/DirectRotationMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/DirectRotationMapper.java @@ -1,5 +1,6 @@ package com.bonus.material.ma.mapper; +import com.bonus.common.biz.domain.lease.LeaseOutSign; import com.bonus.material.ma.domain.DirectApplyDetails; import com.bonus.material.ma.domain.DirectApplyExportInfo; import com.bonus.material.ma.domain.DirectApplyInfo; @@ -83,4 +84,11 @@ public interface DirectRotationMapper { List getUseringDataByClz(@Param("projectId") Integer projectId); Integer getprojectId(SltAgreementInfo sltAgreementInfo); + + /** + * 获取审批列表 + * @param sltAgreementInfo + * @return + */ + List getApproveList(SltAgreementInfo sltAgreementInfo); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/DirectRotationService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/DirectRotationService.java index f65a77a4..3ec50418 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/DirectRotationService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/DirectRotationService.java @@ -5,6 +5,7 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.ma.domain.DirectApplyExportInfo; import com.bonus.material.ma.domain.DirectApplyInfo; import com.bonus.material.ma.domain.DirectApplyInfoDetails; +import com.bonus.material.ma.domain.DirectApplySignInfo; import com.bonus.material.settlement.domain.SltAgreementInfo; import org.apache.ibatis.annotations.Param; @@ -84,4 +85,11 @@ public interface DirectRotationService { List getUseringDataByClz(@Param("projectId") Integer projectId); Integer getprojectId(SltAgreementInfo sltAgreementInfo); + + /** + * 查看审核签名详情 + * @param sltAgreementInfo + * @return + */ + DirectApplySignInfo getApproveList(SltAgreementInfo sltAgreementInfo); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/WorkSiteDirectManageService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/WorkSiteDirectManageService.java index 0134bccf..3ccf2f7b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/WorkSiteDirectManageService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/WorkSiteDirectManageService.java @@ -33,4 +33,18 @@ public interface WorkSiteDirectManageService { DirectApplyInfo getInfoById(SltAgreementInfo sltAgreementInfo); int passDirectApplyInfoDetails(DirectPassApplyInfoDetails directApplyInfoDetails); + + /** + * 根据退料协议ID查询该协议是否还有未审核单据待处理 + * @param directApplyInfo + * @return + */ + int checkLeaseApply(DirectApplyInfo directApplyInfo); + + /** + * 根据退料协议ID查询该协议是否还有未审核单据待处理 + * @param directApplyInfos + * @return + */ + List getDirectList(DirectApplyInfo directApplyInfos); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java index 94bd0801..28b44a1e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java @@ -2,9 +2,11 @@ package com.bonus.material.ma.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.nacos.common.utils.CollectionUtils; +import com.alibaba.nacos.common.utils.StringUtils; import com.bonus.common.biz.constant.MaterialConstants; import com.bonus.common.biz.domain.lease.LeaseApplyInfo; import com.bonus.common.biz.domain.lease.LeaseOutDetails; +import com.bonus.common.biz.domain.lease.LeaseOutSign; import com.bonus.common.biz.enums.BackTaskStatusEnum; import com.bonus.common.biz.enums.LeaseTaskStatusEnum; import com.bonus.common.biz.enums.TmTaskTypeEnum; @@ -141,6 +143,11 @@ public class DirectRotationImpl implements DirectRotationService { DirectApplyInfo directApplyInfos = directApplyInfoDetails.getDirectApplyInfo(); if (directApplyInfos.getBackAgreementId()==directApplyInfos.getLeaseAgreementId()){ return AjaxResult.error("申请失败，不能转入同单位同工程"); + } + // 根据退料协议ID查询该协议是否还有未审核单据待处理，若有，则无法申请 + int result = workSiteDirectManageService.checkLeaseApply(directApplyInfos); + if (result > 0) { + return AjaxResult.error("申请失败，该转出单位和转出工程下有未审核单据待处理，请处理完毕后再重新提交"); } code = workSiteDirectManageService.genderLeaseCode(); directApplyInfos.setCode(code); @@ -228,6 +235,15 @@ public class DirectRotationImpl implements DirectRotationService { if (directApplyInfos.getBackAgreementId()==directApplyInfos.getLeaseAgreementId()){ return AjaxResult.error("申请失败，不能转入同单位同工程"); } + // 根据退料协议ID查询该协议是否还有未审核单据待处理，若有，则无法申请 + /*List list = workSiteDirectManageService.getDirectList(directApplyInfos); + if (CollectionUtils.isNotEmpty(list)) { + // 剔除list中ID为当前ID的 + list.removeIf(item -> item.getId().equals(directApplyInfos.getId())); + if (CollectionUtils.isNotEmpty(list)) { + return AjaxResult.error("申请失败，该转出单位和转出工程下有未审核单据待处理，请处理完毕后再重新提交"); + } + }*/ directApplyInfos.setUpdateTime(new Date()); List urls = new ArrayList<>(); if (directApplyInfoDetails.getDirectApplyInfo().getDirUrls() != null) { @@ -444,6 +460,28 @@ public class DirectRotationImpl implements DirectRotationService { return mapper.getprojectId(sltAgreementInfo); } + /** + * 获取审批签名列表 + * @param sltAgreementInfo + * @return + */ + @Override + public DirectApplySignInfo getApproveList(SltAgreementInfo sltAgreementInfo) { + DirectApplySignInfo directApplySignInfo = new DirectApplySignInfo(); + List list = mapper.getApproveList(sltAgreementInfo); + if (CollectionUtils.isNotEmpty(list)) { + for (LeaseOutSign leaseOutSign : list) { + if (leaseOutSign != null && StringUtils.isNotBlank(leaseOutSign.getOutSignUrl())) { + if (!leaseOutSign.getOutSignUrl().startsWith("http")) { + leaseOutSign.setOutSignUrl("data:image/png;base64," + leaseOutSign.getOutSignUrl()); + } + } + } + directApplySignInfo.setApproveSignList(list); + } + return directApplySignInfo; + } + /** * 生成退料单号 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WorkSiteDirectManageImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WorkSiteDirectManageImpl.java index da13f4fe..8a6ed9da 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WorkSiteDirectManageImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WorkSiteDirectManageImpl.java @@ -14,6 +14,7 @@ import com.bonus.material.ma.service.WorkSiteDirectManageService; import com.bonus.material.settlement.domain.SltAgreementInfo; import com.bonus.material.task.domain.TmTask; import com.bonus.material.task.service.ITmTaskService; +import com.bonus.material.work.mapper.DirectAuditMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +43,9 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { @Resource private ILeaseApplyInfoService leaseApplyService; + @Resource + private DirectAuditMapper directAuditMapper; + // @Resource // private BackRecordMapper backRecordMapper; // @@ -379,6 +383,26 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { } return res; } + + /** + * 检测领料信息 + * @param directApplyInfo + * @return + */ + @Override + public int checkLeaseApply(DirectApplyInfo directApplyInfo) { + return directAuditMapper.checkLeaseApply(directApplyInfo); + } + + /** + * 根据退料协议ID查询该协议是否还有未审核单据待处理 + * @param directApplyInfos + * @return + */ + @Override + public List getDirectList(DirectApplyInfo directApplyInfos) { + return directAuditMapper.getDirectList(directApplyInfos); + } // // private int createtBackApplyInfoAndDetails(BackApplyInfo backApplyInfo) { // int res = 0; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowNode.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowNode.java index 2fb34878..4e261573 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowNode.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowNode.java @@ -126,4 +126,9 @@ public class SysWorkflowNode { private Integer nextNodeId; private String nextRoleIds; + + /** + * 下一节点审核人id + */ + private String nextAuditById; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/DirectAuditMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/DirectAuditMapper.java index 12078042..4c5f6e43 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/DirectAuditMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/DirectAuditMapper.java @@ -71,4 +71,18 @@ public interface DirectAuditMapper { * @return */ String getDeptId(String externalId); + + /** + * 获取项目信息 + * @param directApplyInfo + * @return + */ + int checkLeaseApply(DirectApplyInfo directApplyInfo); + + /** + * 根据退料协议ID查询该协议是否还有未审核单据待处理 + * @param directApplyInfos + * @return + */ + List getDirectList(DirectApplyInfo directApplyInfos); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowNodeMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowNodeMapper.java index fc0b992d..1684b453 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowNodeMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowNodeMapper.java @@ -1,7 +1,7 @@ package com.bonus.material.work.mapper; import com.bonus.material.work.domain.SysWorkflowNode; -import com.bonus.material.work.domain.SysWorkflowType; +import com.bonus.material.work.domain.SysWorkflowRecordHistory; import java.util.List; @@ -20,4 +20,11 @@ public interface SysWorkflowNodeMapper { SysWorkflowNode selectSysWorkflowNodeById(Integer nodeId); List getTaskIdByProId(SysWorkflowNode sysWorkflowNode); + + /** + * 查询下一节点审核人员 + * @param sysWorkflowRecordHistory + * @return + */ + SysWorkflowNode selectNextApprovePerson(SysWorkflowRecordHistory sysWorkflowRecordHistory); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java index d7aff8e2..c75686a5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java @@ -176,6 +176,13 @@ public class SysWorkflowNodeServiceImpl implements SysWorkflowNodeService { } } } + } else { + // 查询下一节点审核人员，页面展示 + SysWorkflowNode nextWorkflowInfo = sysWorkflowNodeMapper.selectNextApprovePerson(sysWorkflowRecordHistory); + if (nextWorkflowInfo != null) { + forSysWorkflowNode.setNextAuditById(nextWorkflowInfo.getNextAuditById()); + forSysWorkflowNode.setAuditBy(nextWorkflowInfo.getAuditBy()); + } } } return sysWorkflowNodeList; diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml index b50ff05d..f96805ba 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml @@ -190,9 +190,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND bu.del_flag = '0' LEFT JOIN bm_project bp ON ba.project_id = bp.pro_id AND bp.del_flag = '0' - LEFT JOIN sys_user su ON su.user_id = bai.create_by + LEFT JOIN sys_user su ON ( + (bai.create_by REGEXP '^[0-9]+$' AND su.user_id = bai.create_by) -- 数字ID关联 + OR + (NOT bai.create_by REGEXP '^[0-9]+$' AND su.nick_name = bai.create_by) -- 汉字昵称关联 + ) WHERE bai.id = #{id} + LIMIT 1 diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml index 8349e0f8..b6940acd 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml @@ -1259,7 +1259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and lpd.lease_person LIKE CONCAT('%', #{leasePerson}, '%') - and lai.code LIKE CONCAT('%', #{code}, '%') + and lpd.code LIKE CONCAT('%', #{code}, '%') and bu.unit_name LIKE CONCAT('%', #{leaseUnit}, '%') diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml index d17674c1..cc75d612 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml @@ -1194,86 +1194,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - SELECT DISTINCT - bu.unit_id AS id, - bzgl_bz.bzmc AS name - FROM bm_unit bu - LEFT JOIN `micro-tool`.bzgl_bz bzgl_bz ON bzgl_bz.bzmc = bu.unit_name - WHERE bu.del_flag = '0' - AND bzgl_bz.bz_status = 3 - AND bzgl_bz.sfjs = 0 - AND bzgl_bz.project_id = #{externalId} - GROUP BY bzgl_bz.bzmc + unit_id AS id, + unit_name AS NAME + FROM + bm_unit + WHERE + del_flag = '0' + AND project_id = #{externalId} + GROUP BY + unit_id + + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml index 24ebb46d..aae4059b 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml @@ -64,7 +64,10 @@ bui.unit_name like concat('%', #{keyWord}, '%') or bpl.pro_name like concat('%', #{keyWord}, '%') or bui1.unit_name like concat('%', #{keyWord}, '%') or - bpl1.pro_name like concat('%', #{keyWord}, '%')) + bpl1.pro_name like concat('%', #{keyWord}, '%') or + swr.task_code like concat('%', #{keyWord}, '%') or + dai.lease_man like concat('%', #{keyWord}, '%') + ) and bpl.pro_id = #{lotId} @@ -236,6 +239,29 @@ id = #{externalId} + + + + update sys_workflow_record set workflow_status = #{flowStatus} where id = #{id} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowNodeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowNodeMapper.xml index 720ef703..72c4b785 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowNodeMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowNodeMapper.xml @@ -137,5 +137,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY tt.create_time desc +