对接修改维修

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/change/ChangeRecordDTO.java

@@ -46,4 +46,7 @@ public class ChangeRecordDTO
     @ApiModelProperty(value = "检查记录id")
     private Long recordId;
 
+    @ApiModelProperty(value = "操作类型(3-维修 4-更换)")
+    private String operateType;
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/change/ChangeRecordVO.java

@@ -92,4 +92,7 @@ public class ChangeRecordVO extends BaseBean
     @Excel(name = "更换人")
     private String changeUserName;
 
+    @ApiModelProperty(value = "操作类型(0-取出 1-放入 2-替换 3-维修)")
+    private String operateType;
+
 }

ktg-iscs/src/main/resources/mapper/IsMaterialsChangeRecordMapper.xml

@@ -56,6 +56,12 @@
             <if test="dto.newMaterialsRfid != null and dto.newMaterialsRfid.trim != ''">
                 and c.new_materials_rfid like concat('%',#{dto.newMaterialsRfid},'%')
             </if>
+            <if test="dto.operateType != null and dto.operateType.trim != '' and dto.operateType == 3">
+                and c.operate_type = '3'
+            </if>
+            <if test="dto.operateType != null and dto.operateType.trim != '' and dto.operateType == 4">
+                and c.operate_type != '3'
+            </if>
         </where>
         order by c.change_id desc
     </select>