From 53adca0c4cf475dffdc1fd9a36535003f0cdd6f7 Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Mon, 8 Dec 2025 18:26:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=BB=B4=E4=BF=AE=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/PeriodCostResultVo.java | 2 ++ .../mapper/SltAgreementInfoMapper.java | 4 ++++ .../com/bonus/material/task/domain/TmTask.java | 6 ++++++ .../settlement/SltAgreementInfoMapper.xml | 12 ++++++++++++ .../mapper/material/task/TmTaskMapper.xml | 18 +++++++++++++++++- 5 files changed, 41 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/PeriodCostResultVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/PeriodCostResultVo.java index 1aea7501..6fa9a356 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/PeriodCostResultVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/PeriodCostResultVo.java @@ -114,4 +114,6 @@ public class PeriodCostResultVo { @ApiModelProperty(value = "是否是消耗性物资 0否 1是") private Integer comsumable; + + private String settlementStatus; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementInfoMapper.java index 2d866d80..97db8246 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementInfoMapper.java @@ -13,6 +13,8 @@ import com.bonus.material.settlement.domain.dto.PeriodCostQueryDto; import com.bonus.material.task.domain.TmTask; import org.apache.ibatis.annotations.Param; +import javax.validation.constraints.NotNull; + /** * 结算信息Mapper接口 * @@ -347,4 +349,6 @@ public interface SltAgreementInfoMapper { List getSltRepairDetailsList(SltAgreementInfo info); List getSltScrapDetailsList(SltAgreementInfo info); + + PeriodCostResultVo selectSltStatus(@NotNull(message = "查询条件不能为空") PeriodCostQueryDto queryDto); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTask.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTask.java index bef7c74a..5a4c4875 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTask.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTask.java @@ -67,6 +67,12 @@ public class TmTask extends BaseEntity { @ApiModelProperty(value = "任务当月序号 例如:1 插入及查询时请携带任务类型") private Integer monthOrder; + /** + * 结算物资类型 1工器具 2安全工器具 + */ + @Excel(name = "结算类型",sort = 4,readConverterExp = "1=工器具,2=安全工器具,0=其他") + private Integer settlementType; + public TmTask(Long taskId, Integer taskType, Integer taskStatus, Long companyId, Integer monthOrder, String code) { this.taskId = taskId; this.taskType = taskType; diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml index 6baaf243..ac827081 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml @@ -1735,6 +1735,9 @@ tm_task tt left join tm_task_agreement tta on tta.task_id = tt.task_id left join sys_dict_data sdd on sdd.dict_value = tt.task_status and sdd.dict_type = 'repair_task_status' + LEFT JOIN repair_apply_details rad on tt.task_id = rad.task_id + LEFT JOIN ma_type mt on rad.type_id = mt.type_id + where tta.agreement_id = #{agreementId} and tt.task_type = 4 and tt.task_status != 1 and tt.task_id not in ( @@ -1743,13 +1746,22 @@ from tm_task tt left join tm_task_agreement tta on tta.task_id = tt.task_id left join repair_apply_details rad on tt.task_id = rad.task_id and is_ds =1 + LEFT JOIN ma_type mt on rad.type_id = mt.type_id where tta.agreement_id = #{agreementId} and tt.task_type = 4 and tt.task_status != 1 AND IFNULL(rad.repaired_num,0) > 0 + + AND mt.jiju_type = #{settlementType} + + ) and tt.code like concat('%', #{repairCode}, '%') + + AND mt.jiju_type = #{settlementType} + + GROUP BY tt.task_id