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

问题修复

This commit is contained in:
hongchao 2025-10-14 21:42:07 +08:00
parent 434a330191
commit bab678f32d
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java
View File

@ -581,7 +581,7 @@ public class PoiOutPage {
* 丢失费用明细
*/
// 填充标题行
rowNum = createTitleRowStyleCost(sheet, rowNum, "丢失费用明细", titleStyle, listLose.size());
rowNum = createTitleRowStyleCost(sheet, rowNum, "未归还费用明细", titleStyle, listLose.size());
// 填充表头
rowNum = createHeaderRow(sheet, rowNum, listLose, headerStyle);
// 填充数据行

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java
View File

@ -246,7 +246,7 @@ public class ClzSltAgreementInfoController extends BaseController {
*/
@ApiOperation(value = "导出材料站结算信息列表")
@PreventRepeatSubmit
@SysLog(title = "结算信息", businessType = OperaType.EXPORT, logType = 1,module = "结算管理->导出材料站租赁明细")
@SysLog(title = "结算信息", businessType = OperaType.EXPORT, logType = 1,module = "结算管理->导出材料站丢失明细")
@PostMapping("/exportLose")
public void exportLose(HttpServletResponse response, @RequestParam("params") String params) {
try {
@ -330,7 +330,7 @@ public class ClzSltAgreementInfoController extends BaseController {
}
}
String fileName = "丢失费用明细表";
String fileName = "未归还费用明细表";
String projectName = handleData(projectNames);
String unitName = handleData(unitNames);
String actualTimeAndName = handleData(actualTimeAndNames);
@ -878,7 +878,7 @@ public class ClzSltAgreementInfoController extends BaseController {
list.add("计量单位");
list.add("丢失数量");
list.add("原值（元）");
list.add("丢失费用（元）");
list.add("未归还费用（元）");
}else{
list.add("单位名称");
list.add("设备名称");
@ -886,7 +886,7 @@ public class ClzSltAgreementInfoController extends BaseController {
list.add("计量单位");
list.add("丢失数量");
list.add("原值（元）");
list.add("丢失费用（元）");
list.add("未归还费用（元）");
list.add(" ");
list.add(" ");
list.add(" ");

1
bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml
View File

@ -364,6 +364,7 @@
left join sys_dept sd on sd.dept_id = bp.imp_unit
WHERE
1=1
and bp.pro_id not in (3414,1192,3321,3595)
<if test="impUnitName != null and impUnitName != ''">
and sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
</if>

2
bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml
View File

@ -575,6 +575,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
where
1=1
and bp.pro_id not in (3414,1192,3321,3595)
<if test="impUnitName != null and impUnitName != ''">
and sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
</if>
@ -1252,6 +1253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
JOIN ma_type_keeper mtk ON mtk.type_id = lpd.type_id AND mtk.user_id = #{userId}
</if>
where 1 = 1
and bp.pro_id not in (3414,1192,3321,3595)
<if test="impUnitName != null and impUnitName != ''">
and sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
</if>

12
bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
View File

@ -788,6 +788,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND mm.ma_status = 2
AND sai.ma_id IS NOT NULL
AND mt2.type_id not in (6032,6008,6270,6012,6761)
and bp.pro_id not in (3414,1192,3321,3595)
<if test="impUnitName != null and impUnitName != ''">
and sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
</if>
@ -868,6 +869,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND bz.bzmc = bu.unit_name
WHERE
sai.`status` = 0 and bu.type_id = 1731 and bp.pro_id is not null
and bp.pro_id not in (3414,1192,3321,3595)
<if test="keyWord != null and keyWord != ''">
and (
bu.unit_name like concat('%',#{keyWord},'%') or
@ -1334,6 +1336,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND bp.external_id IS NOT NULL
AND bu.type_id = 36
and sd.dept_id not in (342,345,347,348,101)
and bp.pro_id not in (3414,1192,3321,3595)
<if test="impUnitName != null and impUnitName != ''">
AND sd.dept_name = #{impUnitName}
</if>
@ -1406,6 +1409,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND sai.end_time IS NULL
AND sai.back_id IS NULL
and sd.dept_id not in (342,345,347,348,101)
and bp.pro_id not in (3414,1192,3321,3595)
<if test="impUnitName != null and impUnitName != ''">
AND sd.dept_name like concat('%',#{impUnitName},'%')
</if>
@ -1500,6 +1504,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND bu.unit_name is not null
AND bp.external_id is not NULL
and sd.dept_id not in (342,345,347,348,101)
and bp.pro_id not in (3414,1192,3321,3595)
<if test="impUnitName != null and impUnitName != ''">
AND sd.dept_name = #{impUnitName}
</if>
@ -1611,7 +1616,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sbd_audit.sg_project_department sp ON sd.company_code = sp.parent_id
WHERE
sp.`name` IS NOT NULL
and sp.`name` not in ('第一项目管理部（金上）','第十项目管理部（川渝）')
and sp.`name` not in ('第一项目管理部（金上）','第十项目管理部（川渝）','第十项目管理部','运维管理部（2023年度合肥公司220kV输电线路线路瓷绝缘子清扫与检测）')
<if test="impUnitName != null and impUnitName != ''">
AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
</if>
@ -1651,7 +1656,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE
bp.pro_center IS NOT NULL
AND bp.external_id IS NOT NULL
and bp.pro_id not in (3414,1192)
and bp.pro_id not in (3414,1192,3321,3595)
<if test="impUnitName != null and impUnitName != ''">
AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
</if>
@ -2046,6 +2051,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE
sai.is_slt = '0'
AND bp.external_id IS NOT NULL
and bp.pro_id not in (3414,1192,3321,3595)
<if test="impUnitName != null and impUnitName != ''">
AND sd.dept_name = #{impUnitName}
</if>
@ -2120,6 +2126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sai.`status` = '0'
AND sai.end_time IS NULL
AND sai.back_id IS NULL
and bp.pro_id not in (3414,1192,3321,3595)
<if test="impUnitName != null and impUnitName != ''">
AND sd.dept_name = #{impUnitName}
</if>
@ -2381,6 +2388,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND sai.back_id IS NULL
AND bp.external_id IS NOT NULL
AND bu.type_id in(32,33)
and bp.pro_id not in (3414,1192,3321,3595)
<if test="impUnitName != null and impUnitName != ''">
AND sd.dept_name = #{impUnitName}
</if>