diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/HandlingOrder.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/HandlingOrder.java index b345c3ca..c1f17de6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/HandlingOrder.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/HandlingOrder.java @@ -81,4 +81,6 @@ public class HandlingOrder implements Serializable { private String signUrl; + private Long companyId; + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java index 74122b4d..64acec3f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java @@ -34,6 +34,7 @@ import com.bonus.material.common.domain.vo.AgreementVo; import com.bonus.material.common.mapper.SelectMapper; import com.bonus.material.lease.mapper.LeaseApplyInfoMapper; import com.bonus.material.ma.mapper.MachineMapper; +import com.bonus.material.ma.service.ITypeService; import com.bonus.material.purchase.config.RemoteConfig; import com.bonus.material.settlement.domain.SltAgreementInfo; import com.bonus.material.settlement.mapper.SltAgreementInfoMapper; @@ -96,6 +97,9 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { @Resource private BmUnitMapper bmUnitMapper; + @Resource + private ITypeService iTypeService; + /** * 查询退料任务 - 性能优化版 * @@ -2229,6 +2233,11 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { @Override public List getHandlingOrderList(HandlingOrder bean) { + /** + * jsk + */ + Long companyId=iTypeService.getUserDeptId(); + bean.setCompanyId(companyId); List list = backApplyInfoMapper.getHandlingOrderList(bean); if (list.size()>0){ for (HandlingOrder handlingOrder : list){ 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 afc00bcd..0a78952f 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 @@ -1129,6 +1129,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN bm_project bp on bp.pro_id = bho.pro_id LEFT JOIN sys_user su on su.user_id=bho.update_by WHERE bho.is_active = '1' + + and bp.company_id=#{companyId} + and bho.reserve_date BETWEEN #{startTime} AND #{endTime}