From 85f91ac8d77aa02256ac522bd06037b5896c7a0b Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 7 Nov 2025 16:52:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/domain/lease/LeaseApplyInfo.java | 14 +++- .../common/controller/SelectController.java | 15 +++- .../material/common/mapper/SelectMapper.java | 21 +++++ .../common/service/SelectService.java | 10 +++ .../service/impl/SelectServiceImpl.java | 24 ++++-- .../mapper/material/common/SelectMapper.xml | 76 ++++++++++++++++++- 6 files changed, 146 insertions(+), 14 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java index 551bac85..890f4e73 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java @@ -41,7 +41,7 @@ public class LeaseApplyInfo extends BaseEntity{ @Excel(name = "申请时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date createTime; - @Excel(name = "申请人") + //@Excel(name = "申请人") @ApiModelProperty(value = "申请人") private String createBy; @@ -357,4 +357,16 @@ public class LeaseApplyInfo extends BaseEntity{ @ApiModelProperty(value = "发布数量") private BigDecimal publishNum; + + @ApiModelProperty(value = "新签署领料人id") + private Long signId; + + @ApiModelProperty(value = "新签署领料人签名URL") + private String signUrl; + + @ApiModelProperty(value = "新签署领料人签名类型") + private int signType; + + @ApiModelProperty(value = "项目部名称") + private String departName; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/controller/SelectController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/controller/SelectController.java index f1641b6e..53d323d5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/controller/SelectController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/controller/SelectController.java @@ -6,6 +6,7 @@ import com.bonus.material.back.domain.BackApplyInfo; import com.bonus.material.basic.domain.BmProject; import com.bonus.material.basic.domain.BmUnit; import com.bonus.material.basic.mapper.BmUnitMapper; +import com.bonus.material.clz.domain.vo.MaterialRetainedEquipmentInfo; import com.bonus.material.common.domain.dto.SelectDto; import com.bonus.material.common.service.SelectService; import com.bonus.material.materialStation.domain.ProAuthorizeInfo; @@ -15,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; /** * @author 10488 @@ -29,8 +31,17 @@ public class SelectController { @Resource(name = "SelectService") private SelectService service; - @Resource - private BmUnitMapper bmUnitMapper; + /** + * 获取分公司下拉选 + * @param bean + * @return + */ + @ApiOperation(value = "获取分公司下拉选") + @GetMapping("/getImpUnitNameList") + public AjaxResult getImpUnitNameList(MaterialRetainedEquipmentInfo bean) { + List list = service.getImpUnitNameList(bean); + return AjaxResult.success(list); + } @ApiOperation(value = "往来单位下拉选") @PostMapping("getUnitList") 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 ddff410c..1f80ff25 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 @@ -443,4 +443,25 @@ public interface SelectMapper { * @return */ List getMaterialTypeList(BmProject bmProject); + + /** + * 根据用户名查询是否为技术员或项目总工 + * @param username + * @return + */ + List getDepartList(String username); + + /** + * 根据项目部名称查询工程信息 + * @param departName + * @return + */ + List getProjectByDepartName(String departName); + + /** + * 获取分公司下拉选 + * @param bean + * @return + */ + List getImpUnitNameList(MaterialRetainedEquipmentInfo bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/SelectService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/SelectService.java index a3abc443..a6f78763 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/SelectService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/SelectService.java @@ -4,9 +4,12 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.back.domain.BackApplyInfo; import com.bonus.material.basic.domain.BmProject; import com.bonus.material.basic.domain.BmUnit; +import com.bonus.material.clz.domain.vo.MaterialRetainedEquipmentInfo; import com.bonus.material.common.domain.dto.SelectDto; import com.bonus.material.materialStation.domain.ProAuthorizeInfo; +import java.util.List; + /** * @author 10488 * 统一下拉选 @@ -287,4 +290,11 @@ public interface SelectService { * @return */ AjaxResult getMaterialTypeList(BmProject bmProject); + + /** + * 获取分公司下拉选 + * @param bean + * @return + */ + List getImpUnitNameList(MaterialRetainedEquipmentInfo bean); } 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 7d111897..a61e5e30 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 @@ -39,12 +39,6 @@ public class SelectServiceImpl implements SelectService { @Resource(name = "SelectMapper") private SelectMapper mapper; - @Resource - private BmUnitMapper bmUnitMapper; - - @Resource - private MaterialLeaseInfoService materialLeaseInfoService; - /** * 单位下拉类型树 * @param bmUnit @@ -538,8 +532,14 @@ public class SelectServiceImpl implements SelectService { // 判断是否开启过滤 if (Objects.nonNull(bmProject) && Objects.nonNull(bmProject.getEnableFilter()) && bmProject.getEnableFilter()) { bmProject.setDeptId(thisLoginUserDeptId); + // 根据项目部名称查询工程信息 + if (StringUtils.isNotBlank(bmProject.getDepartName())) { + List projectIdList = mapper.getProjectByDepartName(bmProject.getDepartName()); + if (!CollectionUtils.isEmpty(projectIdList)) { + bmProject.setProjectIdList(projectIdList); + } + } } - List groupList = new ArrayList<>(); List list = new ArrayList<>(); try { @@ -596,6 +596,16 @@ public class SelectServiceImpl implements SelectService { } } + /** + * 获取分公司下拉选 + * @param bean + * @return + */ + @Override + public List getImpUnitNameList(MaterialRetainedEquipmentInfo bean) { + return mapper.getImpUnitNameList(bean); + } + @Override public AjaxResult getDeviceTypeTree(SelectDto dto) { List groupList = new ArrayList<>(); 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 430d9afc..052c0c41 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 @@ -1023,8 +1023,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sd.del_flag = '0' AND sd.`status` = '0' AND bmp.del_flag = '0' - - AND bmp.imp_unit = #{deptId} + AND bmp.pro_id IN ( + SELECT bai.project_id + FROM bm_agreement_info bai + INNER JOIN slt_agreement_info sai ON bai.agreement_id = sai.agreement_id + WHERE sai.is_slt = 0 + and bai.is_show != 0 + ) + + AND bmp.external_id in + + #{item} + UNION SELECT DISTINCT @@ -1040,8 +1050,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND sd.del_flag = '0' AND sd.`status` = '0' AND bmp.del_flag = '0' - - AND bmp.imp_unit = #{deptId} + AND bmp.pro_id IN ( + SELECT bai.project_id + FROM bm_agreement_info bai + INNER JOIN slt_agreement_info sai ON bai.agreement_id = sai.agreement_id + WHERE sai.is_slt = 0 + and bai.is_show != 0 + ) + + AND bmp.external_id in + + #{item} + ) a ORDER BY @@ -1329,4 +1349,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + +