化验不合格车辆再入库预警

src/main/java/com/chinaitop/depot/yjbj/controller/YjbjController.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.chinaitop.depot.unissoft.model.ResponseEntity;
+import com.chinaitop.depot.yjbj.model.Hybhgclzrkyj;
 import com.chinaitop.depot.yjbj.model.Jksbgz;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.service.YjbjService;
@@ -77,4 +78,27 @@ public class YjbjController {
 			return ResponseEntity.failed("查询失败:" + e.getMessage());
 		}
 	}
+
+	@RequestMapping(value="/getHybhgclzrkyjPageList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value="查询同号牌入库预警列表", notes = "支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+        @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+        @ApiImplicitParam(name = "rkcl", value = "入库车辆", paramType = "query"),
+        @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query")
+	})
+	public ResponseEntity getHybhgclzrkyjPageList(Integer pageNum, Integer pageSize, String rkcl, Integer orgId) {
+		PageInfo<Hybhgclzrkyj> pageInfo = null;
+		try {
+			if (pageNum != null && pageSize != null) {
+	            PageHelper.startPage(pageNum, pageSize);
+	        }
+			List<Hybhgclzrkyj> list = yjbjService.selectHybhgclzrkyj(orgId, rkcl);
+			pageInfo = new PageInfo<>(list);
+			return ResponseEntity.ok(pageInfo);
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			return ResponseEntity.failed("查询失败:" + e.getMessage());
+		}
+	}
 }

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.chinaitop.depot.yjbj.model.Hybhgclzrkyj;
 import com.chinaitop.depot.yjbj.model.Jksbgz;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 
@@ -22,4 +23,11 @@ public interface YjbjMapper {
 	 * @return
 	 */
 	List<Thprkyj> selectThprkyj(@Param("obj") Thprkyj obj);
+
+	/**
+	 * 化验不合格车辆再入库预警数据查询
+	 * @param obj
+	 * @return
+	 */
+	List<Hybhgclzrkyj> selectHybhgclzrkyj(@Param("obj") Hybhgclzrkyj obj);
 }

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

@@ -31,4 +31,21 @@
     </where>
     order by bjsj desc
   </select>
+  <!-- 化验不合格车辆再入库预警数据查询 -->
+  <select id="selectHybhgclzrkyj" resultType="com.chinaitop.depot.yjbj.model.Hybhgclzrkyj" parameterType="map">
+    select 
+	  id, kqmc, rkcl, pzmc, scrk_kqmc scrkKqmc, scrk_jysj scrkJysj, 
+	  sfrmdj, rkdj_username rkdjUsername, rkdj_sj rkdjSj, 
+	  bjsj, org_id orgId 
+	from storage_alarm_unqualified_vehicles 
+    <where>
+      <if test="obj.rkcl != null">
+        and rkcl like #{obj.rkcl,jdbcType=VARCHAR}
+      </if>
+      <if test="obj.orgId != null">
+        and org_id = #{obj.orgId,jdbcType=INTEGER}
+      </if>
+    </where>
+    order by bjsj desc
+  </select>
 </mapper>

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

@@ -0,0 +1,31 @@
+package com.chinaitop.depot.yjbj.model;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+/**
+ * 化验不合格车辆再入库预警
+ * @author fxw
+ *
+ */
+@Data
+public class Hybhgclzrkyj {
+
+	private String id;//主键ID
+	private String kqmc;//库区名称
+	private String rkcl;//入库车辆
+	private String pzmc;//品种名称
+	private String scrkKqmc;//上次入库库区名称
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date scrkJysj;//上次入库检验时间
+	private Integer sfrmdj;//是否入门登记 :0-未登记 1-登记
+	private String rkdjUsername;//入库登记人
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date rkdjSj;//入库登记时间
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date bjsj;//报警时间
+	private Integer orgId;//库ID
+}

src/main/java/com/chinaitop/depot/yjbj/service/YjbjService.java

@@ -2,6 +2,7 @@ package com.chinaitop.depot.yjbj.service;
 
 import java.util.List;
 
+import com.chinaitop.depot.yjbj.model.Hybhgclzrkyj;
 import com.chinaitop.depot.yjbj.model.Jksbgz;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 
@@ -24,4 +25,13 @@ public interface YjbjService {
 	 * @throws Exception
 	 */
 	List<Thprkyj> selectThprkyj(Integer orgId, String rkcl) throws Exception;
+
+	/**
+	 * 化验不合格车辆再入库预警数据查询
+	 * @param orgId 库ID
+	 * @param rkcl 入库车辆
+	 * @return
+	 * @throws Exception
+	 */
+	List<Hybhgclzrkyj> selectHybhgclzrkyj(Integer orgId, String rkcl) throws Exception;
 }

src/main/java/com/chinaitop/depot/yjbj/service/impl/YjbjServiceImpl.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import com.chinaitop.depot.yjbj.mapper.YjbjMapper;
+import com.chinaitop.depot.yjbj.model.Hybhgclzrkyj;
 import com.chinaitop.depot.yjbj.model.Jksbgz;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.service.YjbjService;
@@ -38,4 +39,14 @@ public class YjbjServiceImpl implements YjbjService {
 		return yjbjMapper.selectThprkyj(obj);
 	}
 
+	@Override
+	public List<Hybhgclzrkyj> selectHybhgclzrkyj(Integer orgId, String rkcl) throws Exception {
+		Hybhgclzrkyj obj = new Hybhgclzrkyj();
+		obj.setOrgId(orgId);
+		if (StringUtils.isNotBlank(rkcl)) {
+			obj.setRkcl("%"+rkcl+"%");
+		}
+		return yjbjMapper.selectHybhgclzrkyj(obj);
+	}
+
 }