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-22 19:03:37 +08:00
parent 76390545c8
commit 0cf07ee2c5
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java
View File

@ -1833,7 +1833,7 @@ public class SltAgreementInfoController extends BaseController {
List<String> headersScrap = receiveDetailsHeader(4,1); List<String> headersScrap = receiveDetailsHeader(4,1);
List<String> headersReduction = receiveDetailsHeader(5,1); List<String> headersReduction = receiveDetailsHeader(5,1);
fileName = agreementInfo.getAgreementCode() + "-" + unitName + "-" + projectName ; fileName = agreementInfo.getAgreementCode() + "-" + unitName + "-" + projectName+ "_结算单.xls" ;
// 导出单个Excel文件 // 导出单个Excel文件
String filePath = tempDir + File.separator + fileName; String filePath = tempDir + File.separator + fileName;
try (FileOutputStream fos = new FileOutputStream(filePath)) { try (FileOutputStream fos = new FileOutputStream(filePath)) {

9
bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
View File

@ -1293,7 +1293,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE WHERE
sai.is_slt = 0 sai.is_slt = 0
AND sai.end_time IS NULL AND sai.end_time IS NULL
AND bp.external_id = #{proId} <if test="proIds != null and proIds.size() > 0">
AND bp.external_id IN
<foreach collection="proIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="isStatics != null"> <if test="isStatics != null">
AND mt2.is_statics = #{isStatics} AND mt2.is_statics = #{isStatics}
</if> </if>
@ -1303,6 +1308,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="typeModelName != null and typeModelName !=''"> <if test="typeModelName != null and typeModelName !=''">
AND mt.type_name like concat ('%', #{typeModelName}, '%') AND mt.type_name like concat ('%', #{typeModelName}, '%')
</if> </if>
GROUP BY mt.type_id GROUP BY bp.pro_name,mt.type_id
</select> </select>
</mapper> </mapper>