fanxw vor 11 Monaten
Ursprung
Commit
f7e37ddcea

+ 6 - 12
src/main/java/com/chinaitop/depot/yjbj/controller/YjbjController.java

@@ -24,6 +24,7 @@ import com.chinaitop.depot.yjbj.model.Thprkyj;
24
 import com.chinaitop.depot.yjbj.model.Zkycbj;
24
 import com.chinaitop.depot.yjbj.model.Zkycbj;
25
 import com.chinaitop.depot.yjbj.model.Zlbj;
25
 import com.chinaitop.depot.yjbj.model.Zlbj;
26
 import com.chinaitop.depot.yjbj.model.Zqlyj;
26
 import com.chinaitop.depot.yjbj.model.Zqlyj;
27
+import com.chinaitop.depot.yjbj.param.CcgcPageParam;
27
 import com.chinaitop.depot.yjbj.param.RkzygcPageParam;
28
 import com.chinaitop.depot.yjbj.param.RkzygcPageParam;
28
 import com.chinaitop.depot.yjbj.service.StorageAlarmRecordService;
29
 import com.chinaitop.depot.yjbj.service.StorageAlarmRecordService;
29
 import com.chinaitop.depot.yjbj.service.YjbjService;
30
 import com.chinaitop.depot.yjbj.service.YjbjService;
@@ -308,14 +309,7 @@ public class YjbjController {
308
 	@RequestMapping(value="/getRkzygcPageList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
309
 	@RequestMapping(value="/getRkzygcPageList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
309
 	@ApiOperation(value="查询入库作业过程列表", notes = "支持分页")
310
 	@ApiOperation(value="查询入库作业过程列表", notes = "支持分页")
310
 	@ApiImplicitParams({
311
 	@ApiImplicitParams({
311
-		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
312
-        @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
313
-        @ApiImplicitParam(name = "rkcl", value = "入库车辆", paramType = "query"),
314
-        @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query"),
315
-        @ApiImplicitParam(name = "lyxzdm", value = "粮油性质代码", paramType = "query"),
316
-        @ApiImplicitParam(name = "pzdm", value = "品种代码", paramType = "query"),
317
-        @ApiImplicitParam(name = "bjsj", value = "报警时间", paramType = "query"),
318
-        @ApiImplicitParam(name = "czhj", value = "称重环节", paramType = "query")
312
+        @ApiImplicitParam(name = "pageParam", value = "参数对象", paramType = "query")
319
 	})
313
 	})
320
 	public ResponseEntity getRkzygcPageList(RkzygcPageParam pageParam) {
314
 	public ResponseEntity getRkzygcPageList(RkzygcPageParam pageParam) {
321
 
315
 
@@ -341,14 +335,14 @@ public class YjbjController {
341
         @ApiImplicitParam(name = "cfmc", value = "仓房名称", paramType = "query"),
335
         @ApiImplicitParam(name = "cfmc", value = "仓房名称", paramType = "query"),
342
         @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query")
336
         @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query")
343
 	})
337
 	})
344
-	public ResponseEntity getCcgcPageList(Integer pageNum, Integer pageSize, Integer orgId, String cfmc) {
338
+	public ResponseEntity getCcgcPageList(CcgcPageParam pageParam) {
345
 
339
 
346
 		PageInfo<Ccgc> pageInfo = null;
340
 		PageInfo<Ccgc> pageInfo = null;
347
 		try {
341
 		try {
348
-			if (pageNum != null && pageSize != null) {
349
-	            PageHelper.startPage(pageNum, pageSize);
342
+			if (pageParam.getPageNum() != null && pageParam.getPageSize() != null) {
343
+	            PageHelper.startPage(pageParam.getPageNum(), pageParam.getPageSize());
350
 	        }
344
 	        }
351
-			List<Ccgc> list = yjbjService.selectCcgc(orgId, cfmc);
345
+			List<Ccgc> list = yjbjService.selectCcgc(pageParam);
352
 			pageInfo = new PageInfo<>(list);
346
 			pageInfo = new PageInfo<>(list);
353
 			return ResponseEntity.ok(pageInfo);
347
 			return ResponseEntity.ok(pageInfo);
354
 		} catch (Exception e) {
348
 		} catch (Exception e) {

+ 12 - 0
src/main/java/com/chinaitop/depot/yjbj/mapper/YjbjMapper.xml

@@ -226,6 +226,18 @@
226
     <if test="obj.orgId != null">
226
     <if test="obj.orgId != null">
227
       and o.org_id = #{obj.orgId,jdbcType=INTEGER}
227
       and o.org_id = #{obj.orgId,jdbcType=INTEGER}
228
     </if>
228
     </if>
229
+    <if test="obj.pzmx != null">
230
+      and a.pzmx like #{obj.pzmx,jdbcType=VARCHAR}
231
+    </if>
232
+    <if test="obj.lyxzdm != null">
233
+      and a.lyxzdm = #{obj.lyxzdm,jdbcType=VARCHAR}
234
+    </if>
235
+    <if test="obj.bjsj != null">
236
+      and a.bjsj = #{obj.bjsj,jdbcType=VARCHAR}
237
+    </if>
238
+    <if test="obj.shztbm != null">
239
+      and a.shztbm in ${obj.Shztbm}
240
+    </if>
229
     order by a.bjsj desc
241
     order by a.bjsj desc
230
   </select>
242
   </select>
231
 </mapper>
243
 </mapper>

+ 4 - 0
src/main/java/com/chinaitop/depot/yjbj/model/Ccgc.java

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

+ 19 - 0
src/main/java/com/chinaitop/depot/yjbj/param/CcgcPageParam.java

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

+ 3 - 3
src/main/java/com/chinaitop/depot/yjbj/service/YjbjService.java

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

+ 27 - 4
src/main/java/com/chinaitop/depot/yjbj/service/impl/YjbjServiceImpl.java

@@ -25,6 +25,7 @@ import com.chinaitop.depot.yjbj.model.Thprkyj;
25
 import com.chinaitop.depot.yjbj.model.Zkycbj;
25
 import com.chinaitop.depot.yjbj.model.Zkycbj;
26
 import com.chinaitop.depot.yjbj.model.Zlbj;
26
 import com.chinaitop.depot.yjbj.model.Zlbj;
27
 import com.chinaitop.depot.yjbj.model.Zqlyj;
27
 import com.chinaitop.depot.yjbj.model.Zqlyj;
28
+import com.chinaitop.depot.yjbj.param.CcgcPageParam;
28
 import com.chinaitop.depot.yjbj.param.RkzygcPageParam;
29
 import com.chinaitop.depot.yjbj.param.RkzygcPageParam;
29
 import com.chinaitop.depot.yjbj.service.YjbjService;
30
 import com.chinaitop.depot.yjbj.service.YjbjService;
30
 
31
 
@@ -203,11 +204,33 @@ public class YjbjServiceImpl implements YjbjService {
203
 	}
204
 	}
204
 
205
 
205
 	@Override
206
 	@Override
206
-	public List<Ccgc> selectCcgc(Integer orgId, String cfmc) throws Exception {
207
+	public List<Ccgc> selectCcgc(CcgcPageParam pageParam) throws Exception {
207
 		Ccgc obj = new Ccgc();
208
 		Ccgc obj = new Ccgc();
208
-		obj.setOrgId(orgId);
209
-		if (StringUtils.isNotBlank(cfmc)) {
210
-			obj.setCfmc("%"+cfmc+"%");
209
+		obj.setOrgId(pageParam.getOrgId());
210
+		if (StringUtils.isNotBlank(pageParam.getCfmc())) {
211
+			obj.setCfmc("%"+pageParam.getCfmc()+"%");
212
+		}
213
+		if (StringUtils.isNotBlank(pageParam.getPzmx())) {
214
+			obj.setPzmx("%"+pageParam.getPzmx()+"%");
215
+		}
216
+		if (StringUtils.isNotBlank(pageParam.getLyxzdm())) {
217
+			obj.setLyxzdm(pageParam.getLyxzdm());
218
+		}
219
+		if (StringUtils.isNotBlank(pageParam.getBjsj())) {
220
+			obj.setBjsj(ParameterUtil.string2date(pageParam.getBjsj()));
221
+		}
222
+		if (StringUtils.isNotBlank(pageParam.getClzt())) {
223
+			if (pageParam.getClzt().equals("1")) {
224
+				obj.setShztbm("('140200','140203')");
225
+			} else if (pageParam.getClzt().equals("2")) {
226
+				obj.setShztbm("('140201')");
227
+			} else if (pageParam.getClzt().equals("3")) {
228
+				obj.setShztbm("('120200','120203')");
229
+			} else if (pageParam.getClzt().equals("4")) {
230
+				obj.setShztbm("('120201')");
231
+			} else if (pageParam.getClzt().equals("5")) {
232
+				obj.setShztbm("('999999')");
233
+			}
211
 		}
234
 		}
212
 		return yjbjMapper.selectCcgc(obj);
235
 		return yjbjMapper.selectCcgc(obj);
213
 	}
236
 	}