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.RkzygcPageParam;
 import com.chinaitop.depot.yjbj.service.StorageAlarmRecordService;
 import com.chinaitop.depot.yjbj.service.YjbjService;
 import com.github.pagehelper.PageHelper;
@@ -310,16 +311,20 @@ public class YjbjController {
 		@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 = "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")
 	})
-	public ResponseEntity getRkzygcPageList(Integer pageNum, Integer pageSize, Integer orgId, String rkcl) {
+	public ResponseEntity getRkzygcPageList(RkzygcPageParam pageParam) {
 
 		PageInfo<Rkzygc> 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<Rkzygc> list = yjbjService.selectRkzygc(orgId, rkcl);
+			List<Rkzygc> list = yjbjService.selectRkzygc(pageParam);
 			pageInfo = new PageInfo<>(list);
 			return ResponseEntity.ok(pageInfo);
 		} catch (Exception e) {

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

@@ -199,6 +199,18 @@
     <if test="obj.orgId != null">
       and org_id = #{obj.orgId,jdbcType=INTEGER}
     </if>
+    <if test="obj.bjsj != null">
+      and to_date(bjsj, 'yyyy-MM-dd HH24:mi:ss') between #{obj.startTime,jdbcType=VARCHAR} and #{obj.endTime,jdbcType=VARCHAR}
+    </if>
+    <if test="obj.lyxzdm != null">
+      and lyxzdm = #{obj.lyxzdm,jdbcType=VARCHAR}
+    </if>
+    <if test="obj.pzdm != null">
+      and pzdm = #{obj.pzdm,jdbcType=VARCHAR}
+    </if>
+    <if test="obj.czhj != null">
+      and czhj = #{obj.czhj,jdbcType=VARCHAR}
+    </if>
     order by bjsj desc
   </select>
   <!-- 存储过程数据查询 -->

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

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

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

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

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

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

@@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import com.chinaitop.depot.utils.DateUtil;
+import com.chinaitop.depot.utils.ParameterUtil;
 import com.chinaitop.depot.yjbj.mapper.YjbjMapper;
 import com.chinaitop.depot.yjbj.model.Ccgc;
 import com.chinaitop.depot.yjbj.model.Chbj;
@@ -24,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.RkzygcPageParam;
 import com.chinaitop.depot.yjbj.service.YjbjService;
 
 @Service
@@ -177,11 +179,25 @@ public class YjbjServiceImpl implements YjbjService {
 	}
 
 	@Override
-	public List<Rkzygc> selectRkzygc(Integer orgId, String rkcl) throws Exception {
+	public List<Rkzygc> selectRkzygc(RkzygcPageParam pageParam) throws Exception {
 		Rkzygc obj = new Rkzygc();
-		obj.setOrgId(orgId);
-		if (StringUtils.isNotBlank(rkcl)) {
-			obj.setRkcl("%"+rkcl+"%");
+		obj.setOrgId(pageParam.getOrgId());
+		if (StringUtils.isNotBlank(pageParam.getRkcl())) {
+			obj.setRkcl("%"+pageParam.getRkcl()+"%");
+		}
+		if (StringUtils.isNotBlank(pageParam.getBjsj())) {
+			obj.setBjsj(ParameterUtil.string2date(pageParam.getBjsj()));
+			obj.setStartTime(pageParam.getBjsj()+" 00:00:00");
+			obj.setEndTime(pageParam.getBjsj()+" 23:59:59");
+		}
+		if (StringUtils.isNotBlank(pageParam.getPzdm())) {
+			obj.setPzdm(pageParam.getPzdm());
+		}
+		if (StringUtils.isNotBlank(pageParam.getLyxzdm())) {
+			obj.setLyxzdm(pageParam.getLyxzdm());
+		}
+		if (StringUtils.isNotBlank(pageParam.getCzhj())) {
+			obj.setRkcl(pageParam.getCzhj());
 		}
 		return yjbjMapper.selectRkzygc(obj);
 	}