1

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

@@ -24,6 +24,7 @@ import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.model.Zkycbj;
 import com.chinaitop.depot.yjbj.model.Zlbj;
 import com.chinaitop.depot.yjbj.model.Zqlyj;
+import com.chinaitop.depot.yjbj.param.CcgcPageParam;
 import com.chinaitop.depot.yjbj.param.RkzygcPageParam;
 import com.chinaitop.depot.yjbj.service.StorageAlarmRecordService;
 import com.chinaitop.depot.yjbj.service.YjbjService;
@@ -308,14 +309,7 @@ public class YjbjController {
 	@RequestMapping(value="/getRkzygcPageList", 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"),
-        @ApiImplicitParam(name = "lyxzdm", value = "粮油性质代码", paramType = "query"),
-        @ApiImplicitParam(name = "pzdm", value = "品种代码", paramType = "query"),
-        @ApiImplicitParam(name = "bjsj", value = "报警时间", paramType = "query"),
-        @ApiImplicitParam(name = "czhj", value = "称重环节", paramType = "query")
+        @ApiImplicitParam(name = "pageParam", value = "参数对象", paramType = "query")
 	})
 	public ResponseEntity getRkzygcPageList(RkzygcPageParam pageParam) {
 
@@ -341,14 +335,14 @@ public class YjbjController {
         @ApiImplicitParam(name = "cfmc", value = "仓房名称", paramType = "query"),
         @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query")
 	})
-	public ResponseEntity getCcgcPageList(Integer pageNum, Integer pageSize, Integer orgId, String cfmc) {
+	public ResponseEntity getCcgcPageList(CcgcPageParam pageParam) {
 
 		PageInfo<Ccgc> pageInfo = null;
 		try {
-			if (pageNum != null && pageSize != null) {
-	            PageHelper.startPage(pageNum, pageSize);
+			if (pageParam.getPageNum() != null && pageParam.getPageSize() != null) {
+	            PageHelper.startPage(pageParam.getPageNum(), pageParam.getPageSize());
 	        }
-			List<Ccgc> list = yjbjService.selectCcgc(orgId, cfmc);
+			List<Ccgc> list = yjbjService.selectCcgc(pageParam);
 			pageInfo = new PageInfo<>(list);
 			return ResponseEntity.ok(pageInfo);
 		} catch (Exception e) {

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

@@ -226,6 +226,18 @@
     <if test="obj.orgId != null">
       and o.org_id = #{obj.orgId,jdbcType=INTEGER}
     </if>
+    <if test="obj.pzmx != null">
+      and a.pzmx like #{obj.pzmx,jdbcType=VARCHAR}
+    </if>
+    <if test="obj.lyxzdm != null">
+      and a.lyxzdm = #{obj.lyxzdm,jdbcType=VARCHAR}
+    </if>
+    <if test="obj.bjsj != null">
+      and a.bjsj = #{obj.bjsj,jdbcType=VARCHAR}
+    </if>
+    <if test="obj.shztbm != null">
+      and a.shztbm in ${obj.Shztbm}
+    </if>
     order by a.bjsj desc
   </select>
 </mapper>

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

@@ -19,6 +19,7 @@ public class Ccgc {
 	private Integer orgId;//库ID
 	private String cfmc;//仓房名称
 	private String lyxz;//粮油性质
+	private String lyxzdm;//粮油性质代码
 	private String pzmx;//品种
 	private String scnf;//生产年份
 	private BigDecimal hdcr;//核定仓容
@@ -26,4 +27,7 @@ public class Ccgc {
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date bjsj;//报警时间
 	private String shzt;//状态
+	private String shztbm;//审核状态编码
+	private String startTime;
+	private String endTime;
 }

src/main/java/com/chinaitop/depot/yjbj/param/CcgcPageParam.java

@@ -0,0 +1,19 @@
+package com.chinaitop.depot.yjbj.param;
+
+import com.chinaitop.depot.common.PageParam;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter @Setter
+public class CcgcPageParam extends PageParam {
+
+	private static final long serialVersionUID = 3063897904938706186L;
+
+	private Integer orgId;// 机构id
+	private String cfmc;//仓房名称
+	private String pzmx;//明细品种名称
+	private String lyxzdm;//粮油性质代码
+	private String clzt;//处理状态
+	private String bjsj;//报警时间
+}

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

@@ -15,6 +15,7 @@ import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.model.Zkycbj;
 import com.chinaitop.depot.yjbj.model.Zlbj;
 import com.chinaitop.depot.yjbj.model.Zqlyj;
+import com.chinaitop.depot.yjbj.param.CcgcPageParam;
 import com.chinaitop.depot.yjbj.param.RkzygcPageParam;
 
 public interface YjbjService {
@@ -129,9 +130,8 @@ public interface YjbjService {
 
 	/**
 	 * 存储过程
-	 * @param orgId 库ID
-	 * @param cfmc 入库车辆
+	 * @param pageParam 参数对象
 	 * @return
 	 */
-	List<Ccgc> selectCcgc(Integer orgId, String cfmc) throws Exception;
+	List<Ccgc> selectCcgc(CcgcPageParam pageParam) throws Exception;
 }

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

@@ -25,6 +25,7 @@ import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.model.Zkycbj;
 import com.chinaitop.depot.yjbj.model.Zlbj;
 import com.chinaitop.depot.yjbj.model.Zqlyj;
+import com.chinaitop.depot.yjbj.param.CcgcPageParam;
 import com.chinaitop.depot.yjbj.param.RkzygcPageParam;
 import com.chinaitop.depot.yjbj.service.YjbjService;
 
@@ -203,11 +204,33 @@ public class YjbjServiceImpl implements YjbjService {
 	}
 
 	@Override
-	public List<Ccgc> selectCcgc(Integer orgId, String cfmc) throws Exception {
+	public List<Ccgc> selectCcgc(CcgcPageParam pageParam) throws Exception {
 		Ccgc obj = new Ccgc();
-		obj.setOrgId(orgId);
-		if (StringUtils.isNotBlank(cfmc)) {
-			obj.setCfmc("%"+cfmc+"%");
+		obj.setOrgId(pageParam.getOrgId());
+		if (StringUtils.isNotBlank(pageParam.getCfmc())) {
+			obj.setCfmc("%"+pageParam.getCfmc()+"%");
+		}
+		if (StringUtils.isNotBlank(pageParam.getPzmx())) {
+			obj.setPzmx("%"+pageParam.getPzmx()+"%");
+		}
+		if (StringUtils.isNotBlank(pageParam.getLyxzdm())) {
+			obj.setLyxzdm(pageParam.getLyxzdm());
+		}
+		if (StringUtils.isNotBlank(pageParam.getBjsj())) {
+			obj.setBjsj(ParameterUtil.string2date(pageParam.getBjsj()));
+		}
+		if (StringUtils.isNotBlank(pageParam.getClzt())) {
+			if (pageParam.getClzt().equals("1")) {
+				obj.setShztbm("('140200','140203')");
+			} else if (pageParam.getClzt().equals("2")) {
+				obj.setShztbm("('140201')");
+			} else if (pageParam.getClzt().equals("3")) {
+				obj.setShztbm("('120200','120203')");
+			} else if (pageParam.getClzt().equals("4")) {
+				obj.setShztbm("('120201')");
+			} else if (pageParam.getClzt().equals("5")) {
+				obj.setShztbm("('999999')");
+			}
 		}
 		return yjbjMapper.selectCcgc(obj);
 	}