结算维修单修改

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;
 }

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<SltAgreementInfo> getSltRepairDetailsList(SltAgreementInfo info);
 
     List<SltAgreementInfo> getSltScrapDetailsList(SltAgreementInfo info);
+
+    PeriodCostResultVo selectSltStatus(@NotNull(message = "查询条件不能为空") PeriodCostQueryDto queryDto);
 }

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;

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
+        <if test="settlementType !=  null ">
+            AND mt.jiju_type = #{settlementType}
+        </if>
+
         )
         <if test="repairCode != null">
             and tt.code like concat('%', #{repairCode}, '%')
         </if>
+        <if test="settlementType !=  null ">
+            AND mt.jiju_type = #{settlementType}
+        </if>
+        GROUP BY tt.task_id
     </select>
 
     <select id="getLeaseSltDetails" resultType="com.bonus.material.settlement.domain.SltAgreementInfo">

bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml

@@ -284,6 +284,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         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
+                 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 (	  select
@@ -291,11 +296,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         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 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
+        <if test="settlementType !=  null ">
+            AND mt.jiju_type = #{settlementType}
+        </if>
+
+        GROUP BY tt.task_id
 				)
 
+        <if test="settlementType !=  null ">
+            AND mt.jiju_type = #{settlementType}
+        </if>
+
+        GROUP BY tt.task_id
     </select>
 
     <select id="selectPurchaseInfo" resultType="java.lang.Long">