fanxw hace 11 meses
padre
commit
63a6a50879

+ 10 - 5
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.RkzygcPageParam;
27
 import com.chinaitop.depot.yjbj.service.StorageAlarmRecordService;
28
 import com.chinaitop.depot.yjbj.service.StorageAlarmRecordService;
28
 import com.chinaitop.depot.yjbj.service.YjbjService;
29
 import com.chinaitop.depot.yjbj.service.YjbjService;
29
 import com.github.pagehelper.PageHelper;
30
 import com.github.pagehelper.PageHelper;
@@ -310,16 +311,20 @@ public class YjbjController {
310
 		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
311
 		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
311
         @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
312
         @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
312
         @ApiImplicitParam(name = "rkcl", value = "入库车辆", paramType = "query"),
313
         @ApiImplicitParam(name = "rkcl", value = "入库车辆", paramType = "query"),
313
-        @ApiImplicitParam(name = "orgId", value = "库ID", required=true, 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")
314
 	})
319
 	})
315
-	public ResponseEntity getRkzygcPageList(Integer pageNum, Integer pageSize, Integer orgId, String rkcl) {
320
+	public ResponseEntity getRkzygcPageList(RkzygcPageParam pageParam) {
316
 
321
 
317
 		PageInfo<Rkzygc> pageInfo = null;
322
 		PageInfo<Rkzygc> pageInfo = null;
318
 		try {
323
 		try {
319
-			if (pageNum != null && pageSize != null) {
320
-	            PageHelper.startPage(pageNum, pageSize);
324
+			if (pageParam.getPageNum() != null && pageParam.getPageSize() != null) {
325
+	            PageHelper.startPage(pageParam.getPageNum(), pageParam.getPageSize());
321
 	        }
326
 	        }
322
-			List<Rkzygc> list = yjbjService.selectRkzygc(orgId, rkcl);
327
+			List<Rkzygc> list = yjbjService.selectRkzygc(pageParam);
323
 			pageInfo = new PageInfo<>(list);
328
 			pageInfo = new PageInfo<>(list);
324
 			return ResponseEntity.ok(pageInfo);
329
 			return ResponseEntity.ok(pageInfo);
325
 		} catch (Exception e) {
330
 		} catch (Exception e) {

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

@@ -199,6 +199,18 @@
199
     <if test="obj.orgId != null">
199
     <if test="obj.orgId != null">
200
       and org_id = #{obj.orgId,jdbcType=INTEGER}
200
       and org_id = #{obj.orgId,jdbcType=INTEGER}
201
     </if>
201
     </if>
202
+    <if test="obj.bjsj != null">
203
+      and to_date(bjsj, 'yyyy-MM-dd HH24:mi:ss') between #{obj.startTime,jdbcType=VARCHAR} and #{obj.endTime,jdbcType=VARCHAR}
204
+    </if>
205
+    <if test="obj.lyxzdm != null">
206
+      and lyxzdm = #{obj.lyxzdm,jdbcType=VARCHAR}
207
+    </if>
208
+    <if test="obj.pzdm != null">
209
+      and pzdm = #{obj.pzdm,jdbcType=VARCHAR}
210
+    </if>
211
+    <if test="obj.czhj != null">
212
+      and czhj = #{obj.czhj,jdbcType=VARCHAR}
213
+    </if>
202
     order by bjsj desc
214
     order by bjsj desc
203
   </select>
215
   </select>
204
   <!-- 存储过程数据查询 -->
216
   <!-- 存储过程数据查询 -->

+ 5 - 0
src/main/java/com/chinaitop/depot/yjbj/model/Rkzygc.java

@@ -18,7 +18,9 @@ public class Rkzygc {
18
 	private Integer orgId;//库ID
18
 	private Integer orgId;//库ID
19
 	private String rkcl;//入库车辆
19
 	private String rkcl;//入库车辆
20
 	private String cfmc;//仓房名称
20
 	private String cfmc;//仓房名称
21
+	private String lyxzdm;//粮油性质代码
21
 	private String lyxz;//粮油性质
22
 	private String lyxz;//粮油性质
23
+	private String pzdm;//品种代码
22
 	private String pzmc;//品种
24
 	private String pzmc;//品种
23
 	private String scnf;//生产年份
25
 	private String scnf;//生产年份
24
 	private String hdcr;//核定仓容
26
 	private String hdcr;//核定仓容
@@ -26,4 +28,7 @@ public class Rkzygc {
26
 	private String bjnr;//报警内容
28
 	private String bjnr;//报警内容
27
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
29
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
28
 	private Date bjsj;//报警时间
30
 	private Date bjsj;//报警时间
31
+	private String czhj;//称重环节
32
+	private String startTime;
33
+	private String endTime;
29
 }
34
 }

+ 24 - 0
src/main/java/com/chinaitop/depot/yjbj/param/RkzygcPageParam.java

@@ -0,0 +1,24 @@
1
+package com.chinaitop.depot.yjbj.param;
2
+
3
+import com.chinaitop.depot.common.PageParam;
4
+import lombok.Getter;
5
+import lombok.Setter;
6
+
7
+/**
8
+ * @author qingsong.han
9
+ * @description:
10
+ * @create 2024-12-09 15:26
11
+ */
12
+@Getter @Setter
13
+public class RkzygcPageParam extends PageParam {
14
+    private static final long serialVersionUID = -1075425239865367024L;
15
+
16
+    private Integer orgId;// 机构id
17
+    private String rkcl;// 入库车辆
18
+    private Integer dataFlag;// 0:市平台预警数据,1:库平台预警数据
19
+    private String lyxzdm;//粮油性质代码
20
+    private String pzdm;//品种代码
21
+    private String bjsj;//报警时间
22
+    private String czhj;//称重环节
23
+    
24
+}

+ 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.RkzygcPageParam;
18
 
19
 
19
 public interface YjbjService {
20
 public interface YjbjService {
20
 
21
 
@@ -121,11 +122,10 @@ public interface YjbjService {
121
 
122
 
122
 	/**
123
 	/**
123
 	 * 入库作业过程
124
 	 * 入库作业过程
124
-	 * @param orgId 库ID
125
-	 * @param rkcl 入库车辆
125
+	 * @param pageParam 条件参数
126
 	 * @return
126
 	 * @return
127
 	 */
127
 	 */
128
-	List<Rkzygc> selectRkzygc(Integer orgId, String rkcl) throws Exception;
128
+	List<Rkzygc> selectRkzygc(RkzygcPageParam pageParam) throws Exception;
129
 
129
 
130
 	/**
130
 	/**
131
 	 * 存储过程
131
 	 * 存储过程

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

@@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils;
10
 import org.springframework.stereotype.Service;
10
 import org.springframework.stereotype.Service;
11
 
11
 
12
 import com.chinaitop.depot.utils.DateUtil;
12
 import com.chinaitop.depot.utils.DateUtil;
13
+import com.chinaitop.depot.utils.ParameterUtil;
13
 import com.chinaitop.depot.yjbj.mapper.YjbjMapper;
14
 import com.chinaitop.depot.yjbj.mapper.YjbjMapper;
14
 import com.chinaitop.depot.yjbj.model.Ccgc;
15
 import com.chinaitop.depot.yjbj.model.Ccgc;
15
 import com.chinaitop.depot.yjbj.model.Chbj;
16
 import com.chinaitop.depot.yjbj.model.Chbj;
@@ -24,6 +25,7 @@ import com.chinaitop.depot.yjbj.model.Thprkyj;
24
 import com.chinaitop.depot.yjbj.model.Zkycbj;
25
 import com.chinaitop.depot.yjbj.model.Zkycbj;
25
 import com.chinaitop.depot.yjbj.model.Zlbj;
26
 import com.chinaitop.depot.yjbj.model.Zlbj;
26
 import com.chinaitop.depot.yjbj.model.Zqlyj;
27
 import com.chinaitop.depot.yjbj.model.Zqlyj;
28
+import com.chinaitop.depot.yjbj.param.RkzygcPageParam;
27
 import com.chinaitop.depot.yjbj.service.YjbjService;
29
 import com.chinaitop.depot.yjbj.service.YjbjService;
28
 
30
 
29
 @Service
31
 @Service
@@ -177,11 +179,25 @@ public class YjbjServiceImpl implements YjbjService {
177
 	}
179
 	}
178
 
180
 
179
 	@Override
181
 	@Override
180
-	public List<Rkzygc> selectRkzygc(Integer orgId, String rkcl) throws Exception {
182
+	public List<Rkzygc> selectRkzygc(RkzygcPageParam pageParam) throws Exception {
181
 		Rkzygc obj = new Rkzygc();
183
 		Rkzygc obj = new Rkzygc();
182
-		obj.setOrgId(orgId);
183
-		if (StringUtils.isNotBlank(rkcl)) {
184
-			obj.setRkcl("%"+rkcl+"%");
184
+		obj.setOrgId(pageParam.getOrgId());
185
+		if (StringUtils.isNotBlank(pageParam.getRkcl())) {
186
+			obj.setRkcl("%"+pageParam.getRkcl()+"%");
187
+		}
188
+		if (StringUtils.isNotBlank(pageParam.getBjsj())) {
189
+			obj.setBjsj(ParameterUtil.string2date(pageParam.getBjsj()));
190
+			obj.setStartTime(pageParam.getBjsj()+" 00:00:00");
191
+			obj.setEndTime(pageParam.getBjsj()+" 23:59:59");
192
+		}
193
+		if (StringUtils.isNotBlank(pageParam.getPzdm())) {
194
+			obj.setPzdm(pageParam.getPzdm());
195
+		}
196
+		if (StringUtils.isNotBlank(pageParam.getLyxzdm())) {
197
+			obj.setLyxzdm(pageParam.getLyxzdm());
198
+		}
199
+		if (StringUtils.isNotBlank(pageParam.getCzhj())) {
200
+			obj.setRkcl(pageParam.getCzhj());
185
 		}
201
 		}
186
 		return yjbjMapper.selectRkzygc(obj);
202
 		return yjbjMapper.selectRkzygc(obj);
187
 	}
203
 	}