소스 검색

优化修改

lvzhikai 4 년 전
부모
커밋
75eb090f92

+ 10 - 1
src/main/java/com/chinaitop/depot/agent/bgz/controller/BusinessAgentBgmxzController.java

@@ -192,6 +192,14 @@ public class BusinessAgentBgmxzController {
192 192
 		if(ParameterUtil.isnotnull(bgmxz.getFssj())){
193 193
 			paramMap.put("fssj", bgmxz.getFssj());
194 194
 		}
195
+		if (bgmxz.getStartDate() != null && !"".equals(bgmxz.getStartDate())) {
196
+			Date start_rq = ParameterUtil.string2datetime(bgmxz.getStartDate()+" 00:00:00");
197
+			paramMap.put("start_rq", start_rq);
198
+		}
199
+		if (bgmxz.getEndDate() != null && !"".equals(bgmxz.getEndDate())) {
200
+			Date end_rq = ParameterUtil.string2datetime(bgmxz.getEndDate()+" 23:59:59");
201
+			paramMap.put("end_rq", end_rq);
202
+		}
195 203
 		/* 分页 */
196 204
 		if(ParameterUtil.isnotnull(pageNum) && ParameterUtil.isnotnull(pageSize)){
197 205
 			PageHelper.startPage(pageNum, pageSize);
@@ -239,6 +247,7 @@ public class BusinessAgentBgmxzController {
239 247
 					bgmxz.setOrgId(orgId);
240 248
 					Integer dckId = Integer.parseInt(job.get("unitid")+"");
241 249
 					BusinessAgentDepot businessAgentDepot = bgmxzService.selectAgentDepotObj(orgId, dckId);
250
+					System.out.println("businessAgentDepot = " + businessAgentDepot);
242 251
 					bgmxz.setAgentId(Integer.parseInt(businessAgentDepot.getAgentId()));
243 252
 					bgmxz.setSzlkOrgId(businessAgentDepot.getId());
244 253
 					bgmxz.setHouseId(job.get("ch")+"");
@@ -260,7 +269,7 @@ public class BusinessAgentBgmxzController {
260 269
 					bgmxz.setCreateDate(fssj);
261 270
 
262 271
 					//插入代储点的保管明细账表
263
-					bgmxzService.insert(bgmxz);
272
+					//bgmxzService.insert(bgmxz);
264 273
 				}
265 274
 				//修改代储点货位表的保管明细账最后同步时间
266 275
 				bgmxzService.updateAgentDepot(orgId);

+ 6 - 0
src/main/java/com/chinaitop/depot/agent/bgz/mapper/BusinessAgentBgmxzMapper.xml

@@ -531,6 +531,12 @@
531 531
     <if test="fssj != null">
532 532
         AND datas.fssj = #{fssj}
533 533
     </if>
534
+    <if test="start_rq != null">
535
+        AND datas.fssj >= #{start_rq, jdbcType=VARCHAR}
536
+    </if>
537
+    <if test="end_rq != null">
538
+        AND datas.fssj &lt;= #{end_rq, jdbcType=VARCHAR}
539
+    </if>
534 540
 	ORDER BY datas.fssj DESC
535 541
   </select>
536 542
 

+ 18 - 0
src/main/java/com/chinaitop/depot/agent/bgz/model/BusinessAgentBgmxz.java

@@ -42,6 +42,9 @@ public class BusinessAgentBgmxz {
42 42
 
43 43
     private Date updatetime;
44 44
 
45
+    private String startDate;
46
+    private String endDate;
47
+
45 48
     /**
46 49
      * 主键
47 50
      * @return id 主键
@@ -387,4 +390,19 @@ public class BusinessAgentBgmxz {
387 390
 		this.wareName = wareName;
388 391
 	}
389 392
 
393
+    public String getStartDate() {
394
+        return startDate;
395
+    }
396
+
397
+    public void setStartDate(String startDate) {
398
+        this.startDate = startDate;
399
+    }
400
+
401
+    public String getEndDate() {
402
+        return endDate;
403
+    }
404
+
405
+    public void setEndDate(String endDate) {
406
+        this.endDate = endDate;
407
+    }
390 408
 }