fanxw 11 月之前
父節點
當前提交
489d9da7e3

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

@@ -197,9 +197,9 @@ public class YjbjController {
197
         @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
197
         @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
198
         @ApiImplicitParam(name = "cfmc", value = "仓房或油罐名称", paramType = "query"),
198
         @ApiImplicitParam(name = "cfmc", value = "仓房或油罐名称", paramType = "query"),
199
         @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query"),
199
         @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query"),
200
-        @ApiImplicitParam(name = "crklx", value = "出入库类型(0:入库,1:出库,2:强检)", required=true, paramType = "query")
200
+        @ApiImplicitParam(name = "crklx", value = "出入库类型(0:入库,1:出库,2:强检)", paramType = "query")
201
 	})
201
 	})
202
-	public ResponseEntity getZlbjPageList(Integer pageNum, Integer pageSize, String cfmc, Integer orgId, Integer crklx) {
202
+	public ResponseEntity getZlbjPageList(Integer pageNum, Integer pageSize, String cfmc, Integer orgId, String crklx) {
203
 		PageInfo<Zlbj> pageInfo = null;
203
 		PageInfo<Zlbj> pageInfo = null;
204
 		try {
204
 		try {
205
 			if (pageNum != null && pageSize != null) {
205
 			if (pageNum != null && pageSize != null) {

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

@@ -121,7 +121,7 @@
121
         and org_id = #{obj.orgId,jdbcType=INTEGER}
121
         and org_id = #{obj.orgId,jdbcType=INTEGER}
122
       </if>
122
       </if>
123
       <if test="obj.crklx != null">
123
       <if test="obj.crklx != null">
124
-        and crklx = #{obj.crklx,jdbcType=INTEGER}
124
+        and crklx = #{obj.crklx,jdbcType=VARCHAR}
125
       </if>
125
       </if>
126
     </where>
126
     </where>
127
     order by bjsj desc
127
     order by bjsj desc

+ 1 - 1
src/main/java/com/chinaitop/depot/yjbj/model/Zlbj.java

@@ -14,7 +14,7 @@ public class Zlbj {
14
 	private String hwmc;//货位名称
14
 	private String hwmc;//货位名称
15
 	private String pzmc;//品种名称
15
 	private String pzmc;//品种名称
16
 	private String lyxzmc;//粮油性质名称
16
 	private String lyxzmc;//粮油性质名称
17
-	private Integer crklx;//出入库类型(0:入库,1:出库,2:强检)
17
+	private String crklx;//出入库类型(0:入库,1:出库,2:强检)
18
 	private String yjxx;//预警信息
18
 	private String yjxx;//预警信息
19
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
19
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
20
 	private Date bjsj;//报警时间
20
 	private Date bjsj;//报警时间

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

@@ -85,7 +85,7 @@ public interface YjbjService {
85
 	 * @return
85
 	 * @return
86
 	 * @throws Exception
86
 	 * @throws Exception
87
 	 */
87
 	 */
88
-	List<Zlbj> selectZlbj(Integer orgId, String cfmc, Integer crklx) throws Exception;
88
+	List<Zlbj> selectZlbj(Integer orgId, String cfmc, String crklx) throws Exception;
89
 
89
 
90
 	/**
90
 	/**
91
 	 * 空进空出预警数据查询
91
 	 * 空进空出预警数据查询

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

@@ -105,13 +105,13 @@ public class YjbjServiceImpl implements YjbjService {
105
 	}
105
 	}
106
 
106
 
107
 	@Override
107
 	@Override
108
-	public List<Zlbj> selectZlbj(Integer orgId, String cfmc, Integer crklx) throws Exception {
108
+	public List<Zlbj> selectZlbj(Integer orgId, String cfmc, String crklx) throws Exception {
109
 		Zlbj obj = new Zlbj();
109
 		Zlbj obj = new Zlbj();
110
 		obj.setOrgId(orgId);
110
 		obj.setOrgId(orgId);
111
 		if (StringUtils.isNotBlank(cfmc)) {
111
 		if (StringUtils.isNotBlank(cfmc)) {
112
 			obj.setCfmc("%"+cfmc+"%");
112
 			obj.setCfmc("%"+cfmc+"%");
113
 		}
113
 		}
114
-		if (null != crklx) {
114
+		if (StringUtils.isNotBlank(crklx)) {
115
 			obj.setCrklx(crklx);
115
 			obj.setCrklx(crklx);
116
 		}
116
 		}
117
 		return yjbjMapper.selectZlbj(obj);
117
 		return yjbjMapper.selectZlbj(obj);