bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jsk 综合查询 -供应统计报表 -竣工未归还查询 权限数据改造

This commit is contained in:
jiask 2026-01-09 11:15:38 +08:00
parent de622211a4
commit d3f5e75133
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java
View File

@ -656,6 +656,11 @@ public class ComplexQueryServiceImpl implements ComplexQueryService {
@Override
public List<ProjUsingRecord> getStatisticsList(ProjUsingRecord bean) {
try {
/**
* jsk
*/
Long companyId=iTypeService.getUserDeptId();
bean.setCompanyId(companyId.intValue());
// 1、查询工程对应的物资名称、型号、需求数量、已供数量
List<ProjUsingRecord> list = complexQueryMapper.getStatisticsList(bean);
@ -876,6 +881,11 @@ public class ComplexQueryServiceImpl implements ComplexQueryService {
*/
@Override
public List<MachineInfoBean> getFinishNoReturnList(MachineInfoBean bean) {
/**
* jsk
*/
Long companyId=iTypeService.getUserDeptId();
bean.setCompanyId(companyId);
return complexQueryMapper.getFinishNoReturnList(bean);
}
}

1
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java
View File

@ -69,4 +69,5 @@ public class MachineInfoBean {
//租赁价格
private String leasePrice;
private Long companyId;
}

12
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
View File

@ -641,6 +641,9 @@
sai.is_slt = '0'
and bp.pro_name is not null
and mt.del_flag='0'
<if test="companyId != null and companyId != ''">
and mt.company_id=#{companyId}
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND DATE_FORMAT( sai.start_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
</if>
@ -696,6 +699,9 @@
and mt.del_flag=0
and tt.task_type = '2'
and tt.task_status in (3, 4)
<if test="companyId != null and companyId != ''">
and mt.company_id=#{companyId}
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND DATE_FORMAT( lad.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
</if>
@ -747,6 +753,9 @@
bp.pro_name is not null
and mt.del_flag='0'
and tt.task_type = '19'
<if test="companyId != null and companyId != ''">
and mt.company_id=#{companyId}
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND DATE_FORMAT( lpd.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
</if>
@ -2171,6 +2180,9 @@
and bai.is_show = 1
and mt.jiju_type = 1
and mt2.is_statics != 1
<if test="companyId != null and companyId != ''">
and mt.company_id=#{companyId}
</if>
<if test="deptName != null and deptName != ''">
and sd.dept_name = #{deptName}
</if>