diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialSltAgreementInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialSltAgreementInfo.java index 6e0c1322..0df6d911 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialSltAgreementInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialSltAgreementInfo.java @@ -268,4 +268,10 @@ public class MaterialSltAgreementInfo extends BaseEntity { private BigDecimal reduceNum; private String wsProId; + + @ApiModelProperty(value = "分公司") + private String impUnitName; + + @ApiModelProperty(value = "项目部") + private String departName; } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml index 6237edfc..f112217b 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml @@ -56,6 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bai.agreement_id as agreementId, bai.agreement_code as agreementCode, bui.unit_id as unitId,bui.unit_name as unitName, bp.pro_id as projectId , bp.pro_name as projectName, saa.remark,bai.protocol,saa.cost as costs, + sd.dept_name AS impUnitName, + df.project_dept AS departName, case when (saa.id is null or saa.status = '0') then '0' when saa.status = '1' then '1' when saa.status = '2' then '2' when saa.status = '3' then '3' end as sltStatus FROM @@ -63,9 +65,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN clz_bm_agreement_info bai ON bai.agreement_id = sai.agreement_id LEFT JOIN bm_project bp ON bp.pro_id = bai.project_id LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id + LEFT JOIN sys_dept sd ON sd.dept_id = bp.imp_unit + LEFT JOIN data_center.dx_fb_son df ON bp.external_id = df.id LEFT JOIN clz_slt_agreement_apply saa on saa.agreement_id = bai.agreement_id where bai.status = '1' + + AND sd.dept_name = #{impUnitName} + + + AND bp.pro_center LIKE CONCAT('%', #{departName}, '%') + and bui.unit_id in