对接修改

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsMaterialsCheckRecord.java

@@ -60,6 +60,9 @@ public class IsMaterialsCheckRecord extends BaseBean
     @Excel(name = "异常原因")
     private String reason;
 
+    @ApiModelProperty(value = "措施")
+    private String measure;
+
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/checkRecord/IsMaterialsCheckRecordVO.java

@@ -79,6 +79,9 @@ public class IsMaterialsCheckRecordVO extends BaseBean
     @Excel(name = "异常原因", readConverterExp = "0=破损,1=丢失,2=过期")
     private String reason;
 
+    @ApiModelProperty(value = "措施")
+    private String measure;
+
     @ApiModelProperty(value = "检察员")
     @Excel(name = "检察员")
     private String checkUserName;

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsMaterialsCheckPlanServiceImpl.java

@@ -173,6 +173,10 @@ public class IsMaterialsCheckPlanServiceImpl extends ServiceImpl<IsMaterialsChec
         Assert.notNull(dto.getPlanDate(), "检查日期不可为空!");
         Assert.notNull(dto.getCheckUserId(), "检查员不可为空!");
         Assert.isFalse(dto.getCabinetIds().isEmpty(), "请选择需要检查的柜子!");
+        List<IsMaterialsCheckPlan> list = list(Wrappers.<IsMaterialsCheckPlan>lambdaQuery()
+                .eq(IsMaterialsCheckPlan::getPlanName, dto.getPlanName())
+                .ne(IsMaterialsCheckPlan::getPlanId, dto.getPlanId()));
+        Assert.isTrue(list.isEmpty(), "该名称已被使用!");
         // 2.开始新增计划
         IsMaterialsCheckPlan materialsCheckPlan = BeanUtils.toBean(dto, IsMaterialsCheckPlan.class);
         updateById(materialsCheckPlan);

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

@@ -127,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialsRfid != null">materials_rfid = #{materialsRfid},</if>
             <if test="supplier != null and supplier != ''">supplier = #{supplier},</if>
             <if test="expirationDate != null">expiration_date = #{expirationDate},</if>
+            <if test="expirationDate == null">expiration_date = null,</if>
             <if test="properties != null and properties != ''">properties = #{properties},</if>
         </trim>
         where materials_id = #{materialsId}

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

@@ -9,7 +9,7 @@
         left join is_materials_property p on v.property_id = p.property_id
         <where>
             <if test="isMaterialsPropertyValue.valueName != null and isMaterialsPropertyValue.valueName.trim != ''">
-                and v.value_name = #{isMaterialsPropertyValue.valueName}
+                and v.value_name like concat('%',#{isMaterialsPropertyValue.valueName},'%')
             </if>
             <if test="isMaterialsPropertyValue.propertyId != null">
                 and v.property_id = #{isMaterialsPropertyValue.propertyId}