diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java index 21356b9a..3266ee74 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java @@ -138,4 +138,7 @@ public class BmProject extends BaseEntity @ApiModelProperty(value = "所属项目中心") @Size(max=60, message = "所属项目中心长度不能超过60") private String proCenter; + + @ApiModelProperty(value = "往来单位id") + private Long unitId; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java index 414bd429..922436a5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java @@ -81,5 +81,7 @@ public class BmUnit extends BaseEntity @ApiModelProperty(value = "绑定人员名称") private String userName; + @ApiModelProperty(value = "工程id") + private Long projectId; } 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 8290b048..13a6baa1 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 @@ -18,7 +18,7 @@ public interface SelectMapper { /** * 往来单位下拉选 * @param bmUnit - * @return List + * @return List * @description 往来单位 * @author cwchen * @date 2023/12/20 14:23 @@ -28,7 +28,7 @@ public interface SelectMapper { /** * 工程下拉选 * @param bmProject - * @return List + * @return List * @description 工程 * @author cwchen * @date 2023/12/20 15:05 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 7c903e85..467d803e 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 @@ -6,15 +6,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" /*根据往来单位id关联协议查询工程*/ - + SELECT DISTINCT bp.pro_id AS projectId, bp.lot_name AS projectName FROM bm_unit bu LEFT JOIN bm_agreement_info bai ON bui.unit_id = bai.unit_id AND bai.`status` = '1' LEFT JOIN bm_project bp ON bai.project_id = bp.pro_id AND bp.del_flag = '0' - WHERE bu.unit_id = #{id} AND bu.del_flag = '0' + WHERE bu.unit_id = #{unitId} AND bu.del_flag = '0' - + SELECT lot_id AS projectId, lot_name AS projectName FROM bm_project