From 44ad0681c342f0fca05e8f6947f6487756b9beb4 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 22 Jul 2025 08:57:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RepairInputDetailsController.java | 2 +- .../repair/domain/RepairAuditDetails.java | 3 + .../impl/RepairAuditDetailsServiceImpl.java | 2 +- .../material/back/BackApplyInfoMapper.xml | 2 +- .../repair/RepairAuditDetailsMapper.xml | 149 +++++++++++++----- .../repair/RepairInputDetailsMapper.xml | 65 +++++++- 6 files changed, 179 insertions(+), 44 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairInputDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairInputDetailsController.java index 45dbd6e7..f8c40be1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairInputDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairInputDetailsController.java @@ -133,7 +133,7 @@ public class RepairInputDetailsController extends BaseController { @ApiOperation(value = "入库或批量入库操作") @PreventRepeatSubmit // @RequiresPermissions("purchase:storage:add") -// @StoreLog(title = "修试后入库", module = "修试入库->修试后入库") + @StoreLog(title = "修试后入库", module = "修试入库->修试后入库") @PostMapping("/warehouse") public AjaxResult warehouse(@RequestBody RepairInputDetails repairInputDetails) { return repairInputDetailsService.warehouse(repairInputDetails); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java index ef986171..8ff74d37 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java @@ -146,4 +146,7 @@ public class RepairAuditDetails extends BaseEntity { @ApiModelProperty(value = "一级类型id") private Long firstId; + + @ApiModelProperty(value = "单位") + private String unitName; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java index 41eb0faa..ca13f497 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java @@ -148,7 +148,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService } // 获取所有需要查询的 taskId、过滤空的 List repairQuestList = repairAuditDetailsMapper.selectRepairQuestList(repairAuditDetails); - if (!CollectionUtil.isNotEmpty(repairQuestList)) { + if (CollectionUtil.isNotEmpty(repairQuestList)) { if (CollectionUtil.isNotEmpty(typeIdList)) { // 使用流过滤符合条件的元素 repairQuestList = repairQuestList.stream() diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml index 114c8357..08aec840 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml @@ -206,7 +206,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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 - JOIN ma_type_repair mtr ON mtr.type_id = bad.type_id AND mtr.user_id = #{userId} + JOIN ma_type_repair mtr ON mtr.type_id = ba.type_id AND mtr.user_id = #{userId} WHERE ba.parent_id = #{id} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml index 55e0977d..b266a461 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml @@ -38,7 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rad.ma_id as maId ,mt.manage_type as manageType, su.nick_name as auditName, - mt4.type_id as firstId + mt4.type_id as firstId, + mt.unit_name as unitName from repair_audit_details rad left join ma_type mt on rad.type_id = mt.type_id @@ -316,23 +317,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + SELECT * FROM ( SELECT rd.task_id AS taskId, tt1.CODE AS repairCode, @@ -64,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" JOIN ma_type_repair mtr ON mtr.type_id = rd.type_id AND mtr.user_id = #{userId} + rd.create_time < '2025-07-19 00:00:00' AND tt.CODE = #{inputCode} @@ -81,7 +83,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY rd.task_id - order by rd.create_time desc + + UNION + + SELECT + rd.task_id AS taskId, + tt1.CODE AS repairCode, + rd.create_time AS createTime, + tt.task_status AS taskStatus, + CASE tt.task_status + WHEN '0' THEN '入库进行中' + WHEN '1' THEN '入库完成' + WHEN '2' THEN '入库驳回' + ELSE '未知状态' + END AS statusName, + rd.remark AS remark, + bui.unit_name AS backUnit, + bpi.pro_name AS backPro, + su.nick_name AS createBy, + tt.CODE AS inputCode, + GROUP_CONCAT(DISTINCT mt2.type_name) AS materialType, + tta.agreement_id as agreementId, + GROUP_CONCAT( DISTINCT mt4.type_id) as firstId + FROM + repair_input_details rd + 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 tm_task tt on rd.task_id = tt.task_id + LEFT JOIN repair_apply_details rad ON rad.id = rd.repair_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 bm_agreement_info bai2 ON tta.agreement_id = bai2.agreement_id + LEFT JOIN bm_unit bui ON bai2.unit_id = bui.unit_id + LEFT JOIN bm_project bpi ON bai2.project_id = bpi.pro_id and bpi.del_flag = '0' + left join sys_user su on rd.create_by = su.user_id + left join ma_type mt3 ON mt2.parent_id = mt3.type_id and mt3.del_flag = '0' + left join ma_type mt4 ON mt3.parent_id = mt4.type_id and mt4.del_flag = '0' + + JOIN ma_type_repair mtr ON mtr.type_id = rd.type_id AND mtr.user_id = #{userId} + + + rd.create_time >= '2025-07-19 00:00:00' + + AND tt.CODE = #{inputCode} + + + AND tt.task_status = #{taskStatus} + + + and tt.task_status = #{appTaskStatus} + + + and (tt.task_status = 1 or tt.task_status = 2) + + + + + + GROUP BY rd.task_id + ) AS combined_results + ORDER BY + taskStatus, + createTime DESC;