diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java index d63050d6..524a5bb2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java @@ -656,6 +656,11 @@ public class ComplexQueryServiceImpl implements ComplexQueryService { @Override public List getStatisticsList(ProjUsingRecord bean) { try { + /** + * jsk + */ + Long companyId=iTypeService.getUserDeptId(); + bean.setCompanyId(companyId.intValue()); // 1、查询工程对应的物资名称、型号、需求数量、已供数量 List list = complexQueryMapper.getStatisticsList(bean); @@ -876,6 +881,11 @@ public class ComplexQueryServiceImpl implements ComplexQueryService { */ @Override public List getFinishNoReturnList(MachineInfoBean bean) { + /** + * jsk + */ + Long companyId=iTypeService.getUserDeptId(); + bean.setCompanyId(companyId); return complexQueryMapper.getFinishNoReturnList(bean); } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java index 7924d7a8..76589021 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java @@ -69,4 +69,5 @@ public class MachineInfoBean { //租赁价格 private String leasePrice; + private Long companyId; } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml index 2ec3bf2d..d6f659ad 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml @@ -641,6 +641,9 @@ sai.is_slt = '0' and bp.pro_name is not null and mt.del_flag='0' + + and mt.company_id=#{companyId} + AND DATE_FORMAT( sai.start_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} @@ -696,6 +699,9 @@ and mt.del_flag=0 and tt.task_type = '2' and tt.task_status in (3, 4) + + and mt.company_id=#{companyId} + AND DATE_FORMAT( lad.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} @@ -747,6 +753,9 @@ bp.pro_name is not null and mt.del_flag='0' and tt.task_type = '19' + + and mt.company_id=#{companyId} + AND DATE_FORMAT( lpd.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} @@ -2171,6 +2180,9 @@ and bai.is_show = 1 and mt.jiju_type = 1 and mt2.is_statics != 1 + + and mt.company_id=#{companyId} + and sd.dept_name = #{deptName}