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

优化

This commit is contained in:
mashuai 2025-07-31 18:25:38 +08:00
parent a0f3649173
commit 3888e72842
3 changed files with 18 additions and 6 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/common/service/impl/SelectServiceImpl.java
View File

@ -221,7 +221,7 @@ public class SelectServiceImpl implements SelectService {
ProjectTreeBuild treeBuild = new ProjectTreeBuild(list); ProjectTreeBuild treeBuild = new ProjectTreeBuild(list);
// 原查询结果转换树形结构 // 原查询结果转换树形结构
groupList = treeBuild.buildTree(); groupList = treeBuild.buildTree();
// 获取已授权班组，进行数据拼接 // 获取班组，进行数据拼接
List<ProjectTreeNode> newList = mapper.getTeamList(bean); List<ProjectTreeNode> newList = mapper.getTeamList(bean);
if (CollectionUtils.isNotEmpty(newList)) { if (CollectionUtils.isNotEmpty(newList)) {
groupList.addAll(newList); groupList.addAll(newList);

12
bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java
View File

@ -83,10 +83,10 @@ public class UseMaintenanceWarningBean extends BaseEntity {
private Long projectId; private Long projectId;
/** /**
* 超期天数 * 临检天数
*/ */
@ApiModelProperty(value = "超期时长（天）") @ApiModelProperty(value = "临检天数")
@Excel(name = "超期时长（天）") @Excel(name = "临检天数")
private Long overDays; private Long overDays;
@ApiModelProperty(value = "开始时间") @ApiModelProperty(value = "开始时间")
@ -97,4 +97,10 @@ public class UseMaintenanceWarningBean extends BaseEntity {
@ApiModelProperty(value = "关键字") @ApiModelProperty(value = "关键字")
private String keyWord; private String keyWord;
@ApiModelProperty(value = "三级类型id")
private Long thirdTypeId;
@ApiModelProperty(value = "类型id")
private Long typeId;
} }

10
bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml
View File

@ -14,7 +14,7 @@
bu.unit_name as unitName, bu.unit_name as unitName,
bp.pro_name as projectName, bp.pro_name as projectName,
bai.agreement_code as agreementCode, bai.agreement_code as agreementCode,
DATEDIFF(CURDATE(), mm.next_check_time) AS overDays DATEDIFF(mm.next_check_time, CURDATE()) AS overDays
FROM FROM
ma_machine mm ma_machine mm
LEFT JOIN ma_type mt on mt.type_id=mm.type_id LEFT JOIN ma_type mt on mt.type_id=mm.type_id
@ -29,7 +29,7 @@
WHERE WHERE
mm.ma_status='2' mm.ma_status='2'
and bp.pro_name is not null and bp.pro_name is not null
AND mm.next_check_time &lt; CURDATE() AND mm.next_check_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 1 MONTH)
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
and (mt2.type_name like concat('%', #{keyWord}, '%') or and (mt2.type_name like concat('%', #{keyWord}, '%') or
mt.type_name like concat('%', #{keyWord}, '%') or mt.type_name like concat('%', #{keyWord}, '%') or
@ -42,6 +42,12 @@
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND DATE_FORMAT( mm.next_check_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} AND DATE_FORMAT( mm.next_check_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
</if> </if>
<if test="typeId != null">
AND mt.type_id = #{typeId}
</if>
<if test="thirdTypeId != null">
AND mt2.type_id = #{thirdTypeId}
</if>
ORDER BY mm.next_check_time ASC ORDER BY mm.next_check_time ASC
</select> </select>