jsk 业务办理-装卸单 权限数据改造
This commit is contained in:
parent
d3f5e75133
commit
7fc24398ad
|
|
@ -81,4 +81,6 @@ public class HandlingOrder implements Serializable {
|
||||||
|
|
||||||
private String signUrl;
|
private String signUrl;
|
||||||
|
|
||||||
|
private Long companyId;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,7 @@ import com.bonus.material.common.domain.vo.AgreementVo;
|
||||||
import com.bonus.material.common.mapper.SelectMapper;
|
import com.bonus.material.common.mapper.SelectMapper;
|
||||||
import com.bonus.material.lease.mapper.LeaseApplyInfoMapper;
|
import com.bonus.material.lease.mapper.LeaseApplyInfoMapper;
|
||||||
import com.bonus.material.ma.mapper.MachineMapper;
|
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.purchase.config.RemoteConfig;
|
||||||
import com.bonus.material.settlement.domain.SltAgreementInfo;
|
import com.bonus.material.settlement.domain.SltAgreementInfo;
|
||||||
import com.bonus.material.settlement.mapper.SltAgreementInfoMapper;
|
import com.bonus.material.settlement.mapper.SltAgreementInfoMapper;
|
||||||
|
|
@ -96,6 +97,9 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
|
||||||
@Resource
|
@Resource
|
||||||
private BmUnitMapper bmUnitMapper;
|
private BmUnitMapper bmUnitMapper;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private ITypeService iTypeService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询退料任务 - 性能优化版
|
* 查询退料任务 - 性能优化版
|
||||||
*
|
*
|
||||||
|
|
@ -2229,6 +2233,11 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<HandlingOrder> getHandlingOrderList(HandlingOrder bean) {
|
public List<HandlingOrder> getHandlingOrderList(HandlingOrder bean) {
|
||||||
|
/**
|
||||||
|
* jsk
|
||||||
|
*/
|
||||||
|
Long companyId=iTypeService.getUserDeptId();
|
||||||
|
bean.setCompanyId(companyId);
|
||||||
List<HandlingOrder> list = backApplyInfoMapper.getHandlingOrderList(bean);
|
List<HandlingOrder> list = backApplyInfoMapper.getHandlingOrderList(bean);
|
||||||
if (list.size()>0){
|
if (list.size()>0){
|
||||||
for (HandlingOrder handlingOrder : list){
|
for (HandlingOrder handlingOrder : list){
|
||||||
|
|
|
||||||
|
|
@ -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 bm_project bp on bp.pro_id = bho.pro_id
|
||||||
LEFT JOIN sys_user su on su.user_id=bho.update_by
|
LEFT JOIN sys_user su on su.user_id=bho.update_by
|
||||||
WHERE bho.is_active = '1'
|
WHERE bho.is_active = '1'
|
||||||
|
<if test="companyId !=null and companyId !=''">
|
||||||
|
and bp.company_id=#{companyId}
|
||||||
|
</if>
|
||||||
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
|
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
|
||||||
and bho.reserve_date BETWEEN #{startTime} AND #{endTime}
|
and bho.reserve_date BETWEEN #{startTime} AND #{endTime}
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue