1

src/main/java/com/chinaitop/depot/tempWarn/mapper/StorageUseReplacementAlarmMapper.xml

@@ -276,6 +276,9 @@
       <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
         and ura.yjsj between #{startTime} and #{endTime}
       </if>
+      <if test="cfmc != null">
+        and ura.cfmc like #{cfmc,jdbcType=VARCHAR}
+      </if>
     </where>
   </select>
 </mapper>

src/main/java/com/chinaitop/depot/tempWarn/param/StorageUseReplacementAlarmPageParam.java

@@ -18,4 +18,6 @@ public class StorageUseReplacementAlarmPageParam extends PageParam {
     private String kqbm; // 库区编码
 
     private String yjsj;// 预警时间(yyyy-MM-dd)
+
+    private String cfmc;//仓房名称
 }

src/main/java/com/chinaitop/depot/tempWarn/service/impl/StorageUseReplacementAlarmServiceImpl.java

@@ -34,6 +34,9 @@ public class StorageUseReplacementAlarmServiceImpl implements StorageUseReplacem
             map.put("startTime", String.format("%s%s", pageParam.getYjsj(), DateUtil.startTime));
             map.put("endTime", String.format("%s%s", pageParam.getYjsj(), DateUtil.endTime));
         }
+        if (StringUtils.hasText(pageParam.getCfmc())) {
+        	map.put("cfmc", "%"+pageParam.getCfmc()+"%");
+        }
         return replacementAlarmMapper.selectByMap(map);
     }
 }

src/main/java/com/chinaitop/depot/yjbj/mapper/YjbjMapper.xml

@@ -129,7 +129,7 @@
   <!-- 空进空出预警数据查询 -->
   <select id="selectKjkcyj" resultType="com.chinaitop.depot.yjbj.model.Kjkcyj" parameterType="map">
     select 
-  		id,rkcl,first_czzl firstCzzl, second_czzl secondCzzl, bjsj, org_id orgId
+  		id,rkcl,first_czzl firstCzzl, second_czzl secondCzzl, bjsj, org_id orgId, zylx, clr, clsj, cjjg
 	from storage_alarm_empty_in_out 
     <where>
       <if test="obj.rkcl != null">

src/main/java/com/chinaitop/depot/yjbj/model/Kjkcyj.java

@@ -21,4 +21,9 @@ public class Kjkcyj {
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date bjsj;//报警时间
 	private Integer orgId;//库ID
+	private String zylx;//作业类型, 入库称皮重/出库称毛重
+	private String clr;//处理人
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date clsj;//处理时间
+	private String cjjg;//处理结果
 }