bonus
/
yn_digital_gadgets_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

禅道bug修复

This commit is contained in:
马三炮 2026-02-05 17:00:28 +08:00
parent fc2df2797c
commit 624502ec2e
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-business/src/main/java/com/bonus/digital/dao/ExecutionPlanVo.java
View File

@ -59,6 +59,11 @@ public class ExecutionPlanVo {
*/ */
private String inspectionStationName; private String inspectionStationName;
/**
* 运检站名称
*/
private Integer inspectionStationId;
/** /**
* 作业内容 * 作业内容
*/ */

3
bonus-business/src/main/resources/mapper/SettlementMapper.xml
View File

@ -178,6 +178,9 @@
AND (tmp.inspection_station_name like concat('%', #{keyWord}, '%') AND (tmp.inspection_station_name like concat('%', #{keyWord}, '%')
or tmp.project_name like concat('%', #{keyWord}, '%')) or tmp.project_name like concat('%', #{keyWord}, '%'))
</if> </if>
<if test="inspectionStationId!= null " >
AND tmp.inspection_station_id = #{inspectionStationId}
</if>
</select> </select>
<select id="getNum" resultType="com.bonus.digital.dao.DayPlanVo"> <select id="getNum" resultType="com.bonus.digital.dao.DayPlanVo">
select sum(actual_proficient_personnel) as actualProficientPersonnel, select sum(actual_proficient_personnel) as actualProficientPersonnel,