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

退料和修试bug修复

This commit is contained in:
hongchao 2025-08-29 18:05:14 +08:00
parent c997c888be
commit f840f0841c
3 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/warning/ScheduledCheckWarning.java
View File

@ -43,9 +43,7 @@ public class ScheduledCheckWarning {
/** /**
* 定时任务执行频率，每周三/五天上午9点执行一次 * 定时任务执行频率，每周三/五天上午9点执行一次
*/ */
// private String cronExpression = "0 0 9 ? * WED,FRI"; private String cronExpression = "0 0 9 ? * WED,FRI";
private String cronExpression = "0 0 17 ? * WED,FRI";
/** /**
@ -73,8 +71,7 @@ public class ScheduledCheckWarning {
private String getCronFromDatabase() { private String getCronFromDatabase() {
// 这里假设从数据库中获取 cron 表达式 // 这里假设从数据库中获取 cron 表达式
//return "0 */1 * * * ?"; //return "0 */1 * * * ?";
return "0 0 17 ? * WED,FRI"; return "0 0 9 ? * WED,FRI";
// return "0 0 9 ? * WED,FRI";
} }
/** /**

34
bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
View File

@ -197,39 +197,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBackApplyDetailsListByTaskId" resultType="com.bonus.material.back.domain.BackApplyDetails"> <select id="selectBackApplyDetailsListByTaskId" resultType="com.bonus.material.back.domain.BackApplyDetails">
SELECT SELECT
ba.id AS id, bai.CODE AS CODE,
ba.CODE AS CODE, bcd.parent_id AS parentId,
ba.parent_id AS parentId, bcd.type_id AS typeId,
ba.type_id AS typeId,
mt2.type_name AS materialType, mt2.type_name AS materialType,
mt.type_name AS typeModel, mt.type_name AS typeModel,
mt1.type_name AS typeName, mt1.type_name AS typeName,
mt.unit_name AS unitName, mt.unit_name AS unitName,
mt.unit_value AS unitValue, mt.unit_value AS unitValue,
mt.manage_type AS manageType, mt.manage_type AS manageType,
ba.pre_num AS preNum, sum(bcd.bad_num)as badNum,
ba.use_num AS num, sum(bcd.good_num)as goodNum,
ba.STATUS AS STATUS, sum(bcd.back_num)as preNum,
ba.create_by AS createBy, bcd.create_by AS createBy,
ba.create_time AS createTime, bcd.create_time AS createTime,
ba.update_by AS updateBy, bcd.remark AS remark,
ba.update_time AS updateTime,
ba.remark AS remark,
ba.ap_detection AS apDetection,
ba.bad_num AS badNum,
ba.good_num AS goodNum,
mt.manage_type AS manageType, mt.manage_type AS manageType,
mt3.type_id AS firstId mt3.type_id AS firstId
FROM FROM
back_apply_details ba back_check_details bcd
LEFT JOIN ma_type mt ON mt.type_id = ba.type_id and mt.del_flag = 0 LEFT JOIN back_apply_info bai ON bcd.parent_id = bai.id
LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id and mt.del_flag = 0
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id and mt1.del_flag = 0 LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id and mt1.del_flag = 0
LEFT JOIN ma_type mt2 ON mt1.parent_id = mt2.type_id and mt2.del_flag = 0 LEFT JOIN ma_type mt2 ON mt1.parent_id = mt2.type_id and mt2.del_flag = 0
LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id and mt3.del_flag = 0 LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id and mt3.del_flag = 0
<if test="userId != null"> <if test="userId != null">
JOIN ma_type_repair mtr ON mtr.type_id = ba.type_id AND mtr.user_id = #{userId} JOIN ma_type_repair mtr ON mtr.type_id = bcd.type_id AND mtr.user_id = #{userId}
</if> </if>
WHERE ba.parent_id = #{id} WHERE bcd.parent_id = #{id}
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
and ( and (
mt1.type_name like concat('%', #{keyWord}, '%') or mt1.type_name like concat('%', #{keyWord}, '%') or
@ -237,6 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt2.type_name like concat('%', #{keyWord}, '%') mt2.type_name like concat('%', #{keyWord}, '%')
) )
</if> </if>
group by bcd.type_id
</select> </select>
<select id="selectByCode" resultType="com.bonus.material.back.domain.vo.MaCodeVo"> <select id="selectByCode" resultType="com.bonus.material.back.domain.vo.MaCodeVo">

2
bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
View File

@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt on rd.type_id = mt.type_id LEFT JOIN ma_type mt on rd.type_id = mt.type_id
LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
LEFT JOIN tm_task tt on rd.task_id = tt.task_id LEFT JOIN tm_task tt on rd.task_id = tt.task_id
LEFT JOIN repair_apply_details rad ON rad.id = rd.repair_id LEFT JOIN repair_apply_details rad ON rad.task_id = rd.repair_id
LEFT JOIN tm_task tt1 on rad.task_id = tt1.task_id LEFT JOIN tm_task tt1 on rad.task_id = tt1.task_id
LEFT JOIN tm_task_agreement tta ON rd.task_id = tta.task_id LEFT JOIN tm_task_agreement tta ON rd.task_id = tta.task_id
LEFT JOIN bm_agreement_info bai2 ON tta.agreement_id = bai2.agreement_id LEFT JOIN bm_agreement_info bai2 ON tta.agreement_id = bai2.agreement_id