wlxxpt / customAnalysis · 提交

转到一个项目

作者 朱兆平
提交 ce0af34b246682b02077031429d7b200aa74ba4d 1 个父辈 ff5e7939

新舱单辅助管理-直接改配优化

内嵌 并排对比
正在显示 4 个修改的文件 包含 67 行增加 和 17 行删除
1 package com.tianbo.analysis.controller; 1 package com.tianbo.analysis.controller;
2 import com.github.pagehelper.PageInfo; 2 import com.github.pagehelper.PageInfo;
3 import com.tianbo.analysis.annotation.UserPermissionCheck; 3 import com.tianbo.analysis.annotation.UserPermissionCheck;
  4 +import com.tianbo.analysis.dao.DOMTRANSITMapper;
4 import com.tianbo.analysis.model.DOMTRANSIT; 5 import com.tianbo.analysis.model.DOMTRANSIT;
5 import com.tianbo.analysis.model.ResultJson; 6 import com.tianbo.analysis.model.ResultJson;
6 import com.tianbo.analysis.service.DomTransitService; 7 import com.tianbo.analysis.service.DomTransitService;
@@ -13,7 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired; @@ -13,7 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.validation.annotation.Validated; 14 import org.springframework.validation.annotation.Validated;
14 import org.springframework.web.bind.annotation.*; 15 import org.springframework.web.bind.annotation.*;
15 16
16 -import java.util.Date; 17 +import javax.annotation.Resource;
  18 +import java.util.LinkedHashMap;
  19 +import java.util.List;
17 20
18 /** 21 /**
19 * 国内转运接口 22 * 国内转运接口
@@ -25,6 +28,9 @@ public class DomTransController { @@ -25,6 +28,9 @@ public class DomTransController {
25 @Autowired 28 @Autowired
26 DomTransitService domTransitService; 29 DomTransitService domTransitService;
27 30
  31 + @Resource
  32 + DOMTRANSITMapper domtransitMapper;
  33 +
28 @ApiOperation(value = "添加转运申请") 34 @ApiOperation(value = "添加转运申请")
29 @PostMapping("dom") 35 @PostMapping("dom")
30 @UserPermissionCheck 36 @UserPermissionCheck
@@ -72,8 +78,10 @@ public class DomTransController { @@ -72,8 +78,10 @@ public class DomTransController {
72 @RequestParam(value = "originMasterwaybill",required = false) String awba, 78 @RequestParam(value = "originMasterwaybill",required = false) String awba,
73 @RequestParam(value = "originHousewaybill",required = false) String awbh, 79 @RequestParam(value = "originHousewaybill",required = false) String awbh,
74 @RequestParam(value = "originFlightdate",required = false) String flightDate, 80 @RequestParam(value = "originFlightdate",required = false) String flightDate,
  81 + @RequestParam(value = "originFlightdateEnd",required = false) String originFlightdateEnd,
75 @RequestParam(value = "originFlightno",required = false) String flightNo, 82 @RequestParam(value = "originFlightno",required = false) String flightNo,
76 @RequestParam(value = "transType",required = false) String transType, 83 @RequestParam(value = "transType",required = false) String transType,
  84 + @RequestParam(value = "agentName",required = false) String agentName,
77 @CookieValue("username") String username, 85 @CookieValue("username") String username,
78 @CookieValue("userid") String userid){ 86 @CookieValue("userid") String userid){
79 DOMTRANSIT domtransit = new DOMTRANSIT(); 87 DOMTRANSIT domtransit = new DOMTRANSIT();
@@ -81,13 +89,15 @@ public class DomTransController { @@ -81,13 +89,15 @@ public class DomTransController {
81 domtransit.setOriginHousewaybill(awbh); 89 domtransit.setOriginHousewaybill(awbh);
82 domtransit.setOriginFlightno(flightNo); 90 domtransit.setOriginFlightno(flightNo);
83 domtransit.setTransitType(transType); 91 domtransit.setTransitType(transType);
  92 + domtransit.setAgentName(agentName);
84 93
85 //todo:权限校验,有管理权限的 显示全部数据 94 //todo:权限校验,有管理权限的 显示全部数据
86 if (!"admin".equals(username)){ 95 if (!"admin".equals(username)){
87 domtransit.setUserName(username); 96 domtransit.setUserName(username);
88 } 97 }
89 - if(StringUtils.isNotEmpty(flightDate)){ 98 + if(StringUtils.isNotEmpty(flightDate) && StringUtils.isNotEmpty(originFlightdateEnd)){
90 domtransit.setOriginFlightdate(DateUtil.parseDate(flightDate,"yyyy-MM-dd")); 99 domtransit.setOriginFlightdate(DateUtil.parseDate(flightDate,"yyyy-MM-dd"));
  100 + domtransit.setOriginFlightdateEnd(DateUtil.parseDate(originFlightdateEnd,"yyyy-MM-dd"));
91 } 101 }
92 return new ResultJson<PageInfo<DOMTRANSIT>>("200","success",domTransitService.selectList(domtransit,pageNum,pageSize)); 102 return new ResultJson<PageInfo<DOMTRANSIT>>("200","success",domTransitService.selectList(domtransit,pageNum,pageSize));
93 } 103 }
@@ -102,4 +112,14 @@ public class DomTransController { @@ -102,4 +112,14 @@ public class DomTransController {
102 int i = domTransitService.updateByAudit(domtransit); 112 int i = domTransitService.updateByAudit(domtransit);
103 return i >0 ?new ResultJson("200", "审核通过"):new ResultJson("403", "审核失败"); 113 return i >0 ?new ResultJson("200", "审核通过"):new ResultJson("403", "审核失败");
104 } 114 }
  115 +
  116 +
  117 + @ApiOperation(value = "今日转运统计接口",notes = "开始日期为今日,结束日期为今日加一")
  118 + @GetMapping("analysisTodayWeight")
  119 + public ResultJson analysisTodayWeight( @RequestParam(value = "startDate") String startDate,
  120 + @RequestParam(value = "endDate") String endDate){
  121 + List<LinkedHashMap> result = domtransitMapper.analysisTodayWeight(startDate,endDate);
  122 +
  123 + return new ResultJson("200","success",result);
  124 + }
105 } 125 }
1 package com.tianbo.analysis.dao; 1 package com.tianbo.analysis.dao;
2 2
3 import com.tianbo.analysis.model.DOMTRANSIT; 3 import com.tianbo.analysis.model.DOMTRANSIT;
  4 +import org.apache.ibatis.annotations.Param;
4 5
  6 +import java.util.LinkedHashMap;
5 import java.util.List; 7 import java.util.List;
6 8
7 public interface DOMTRANSITMapper { 9 public interface DOMTRANSITMapper {
@@ -13,6 +15,8 @@ public interface DOMTRANSITMapper { @@ -13,6 +15,8 @@ public interface DOMTRANSITMapper {
13 15
14 DOMTRANSIT selectByPrimaryKey(String id); 16 DOMTRANSIT selectByPrimaryKey(String id);
15 17
  18 + List<LinkedHashMap> analysisTodayWeight(@Param("startDate") String var1, @Param("endDate")String var2);
  19 +
16 List<DOMTRANSIT> selectList(DOMTRANSIT record); 20 List<DOMTRANSIT> selectList(DOMTRANSIT record);
17 21
18 int updateByPrimaryKeySelective(DOMTRANSIT record); 22 int updateByPrimaryKeySelective(DOMTRANSIT record);
@@ -51,6 +51,8 @@ public class DOMTRANSIT { @@ -51,6 +51,8 @@ public class DOMTRANSIT {
51 @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") 51 @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
52 private Date originFlightdate; 52 private Date originFlightdate;
53 53
  54 + private Date originFlightdateEnd;
  55 +
54 @NotNull(message="转运后主运单号不能为空",groups=ValidateInsert.class) 56 @NotNull(message="转运后主运单号不能为空",groups=ValidateInsert.class)
55 private String transMasterwaybill; 57 private String transMasterwaybill;
56 58
@@ -320,4 +322,12 @@ public class DOMTRANSIT { @@ -320,4 +322,12 @@ public class DOMTRANSIT {
320 public void setApproverResoult(String approverResoult) { 322 public void setApproverResoult(String approverResoult) {
321 this.approverResoult = approverResoult == null ? null : approverResoult.trim(); 323 this.approverResoult = approverResoult == null ? null : approverResoult.trim();
322 } 324 }
  325 +
  326 + public Date getOriginFlightdateEnd() {
  327 + return originFlightdateEnd;
  328 + }
  329 +
  330 + public void setOriginFlightdateEnd(Date originFlightdateEnd) {
  331 + this.originFlightdateEnd = originFlightdateEnd;
  332 + }
323 } 333 }
@@ -14,11 +14,11 @@ @@ -14,11 +14,11 @@
14 <result column="ORIGIN_MASTERWAYBILL" property="originMasterwaybill" jdbcType="VARCHAR" /> 14 <result column="ORIGIN_MASTERWAYBILL" property="originMasterwaybill" jdbcType="VARCHAR" />
15 <result column="ORIGIN_HOUSEWAYBILL" property="originHousewaybill" jdbcType="VARCHAR" /> 15 <result column="ORIGIN_HOUSEWAYBILL" property="originHousewaybill" jdbcType="VARCHAR" />
16 <result column="ORIGIN_FLIGHTNO" property="originFlightno" jdbcType="VARCHAR" /> 16 <result column="ORIGIN_FLIGHTNO" property="originFlightno" jdbcType="VARCHAR" />
17 - <result column="ORIGIN_FLIGHTDATE" property="originFlightdate" jdbcType="TIMESTAMP" /> 17 + <result column="ORIGIN_FLIGHTDATE" property="originFlightdate" jdbcType="DATE" />
18 <result column="TRANS_MASTERWAYBILL" property="transMasterwaybill" jdbcType="VARCHAR" /> 18 <result column="TRANS_MASTERWAYBILL" property="transMasterwaybill" jdbcType="VARCHAR" />
19 <result column="TRANS_HOUSEWAYBILL" property="transHousewaybill" jdbcType="VARCHAR" /> 19 <result column="TRANS_HOUSEWAYBILL" property="transHousewaybill" jdbcType="VARCHAR" />
20 <result column="TRANS_FLIGHTNO" property="transFlightno" jdbcType="VARCHAR" /> 20 <result column="TRANS_FLIGHTNO" property="transFlightno" jdbcType="VARCHAR" />
21 - <result column="TRANS_FLIGHTDATE" property="transFlightdate" jdbcType="TIMESTAMP" /> 21 + <result column="TRANS_FLIGHTDATE" property="transFlightdate" jdbcType="DATE" />
22 <result column="CREATE_DATE" property="createDate" jdbcType="TIMESTAMP" /> 22 <result column="CREATE_DATE" property="createDate" jdbcType="TIMESTAMP" />
23 <result column="MODIFY_TIME" property="modifyTime" jdbcType="TIMESTAMP" /> 23 <result column="MODIFY_TIME" property="modifyTime" jdbcType="TIMESTAMP" />
24 <result column="MODIFY_NAME" property="modifyName" jdbcType="VARCHAR" /> 24 <result column="MODIFY_NAME" property="modifyName" jdbcType="VARCHAR" />
@@ -45,6 +45,22 @@ @@ -45,6 +45,22 @@
45 from DOMTRANSIT 45 from DOMTRANSIT
46 where ID = #{id,jdbcType=VARCHAR} 46 where ID = #{id,jdbcType=VARCHAR}
47 </select> 47 </select>
  48 + <select id="analysisTodayWeight" resultType="java.util.LinkedHashMap">
  49 + SELECT
  50 + ORIGIN_FLIGHTNO,
  51 + SUM(WEIGHT) as weightcount,
  52 + SUM(PIECE) as piececount,
  53 + ORIGIN_FLIGHTDATE
  54 +FROM
  55 + DOMTRANSIT
  56 +WHERE
  57 + TRANSIT_TYPE = 'dom'
  58 + AND CREATE_DATE
  59 + BETWEEN TO_DATE( #{startDate,jdbcType=VARCHAR}, 'yyyy-MM-dd' )
  60 + AND TO_DATE(#{endDate,jdbcType=VARCHAR},'yyyy-MM-dd')
  61 + GROUP BY ORIGIN_FLIGHTNO,ORIGIN_FLIGHTDATE
  62 +
  63 + </select>
48 <select id="selectList" resultMap="BaseResultMap" parameterType="com.tianbo.analysis.model.DOMTRANSIT" > 64 <select id="selectList" resultMap="BaseResultMap" parameterType="com.tianbo.analysis.model.DOMTRANSIT" >
49 select 65 select
50 <include refid="Base_Column_List" /> 66 <include refid="Base_Column_List" />
@@ -62,8 +78,8 @@ @@ -62,8 +78,8 @@
62 <if test="originFlightno !=null and originFlightno !=''"> 78 <if test="originFlightno !=null and originFlightno !=''">
63 AND ORIGIN_FLIGHTNO = #{originFlightno,jdbcType=VARCHAR} 79 AND ORIGIN_FLIGHTNO = #{originFlightno,jdbcType=VARCHAR}
64 </if> 80 </if>
65 - <if test="originFlightdate != null and originFlightdate !=''">  
66 - AND ORIGIN_FLIGHTDATE = to_date(#{originFlightdate}, 'YYYY-MM-DD') 81 + <if test="originFlightdate != null and originFlightdateEnd != null">
  82 + AND ORIGIN_FLIGHTDATE between #{originFlightdate,jdbcType=DATE} and #{originFlightdateEnd,jdbcType=DATE}
67 </if> 83 </if>
68 <if test="transMasterwaybill != null and transMasterwaybill !='' "> 84 <if test="transMasterwaybill != null and transMasterwaybill !='' ">
69 AND TRANS_MASTERWAYBILL = #{transMasterwaybill,jdbcType=VARCHAR} 85 AND TRANS_MASTERWAYBILL = #{transMasterwaybill,jdbcType=VARCHAR}
@@ -74,8 +90,8 @@ @@ -74,8 +90,8 @@
74 <if test="transFlightno !=null and originFltransFlightnoightno !=''"> 90 <if test="transFlightno !=null and originFltransFlightnoightno !=''">
75 AND ORIGIN_FLIGHTNO = #{transFlightno,jdbcType=VARCHAR} 91 AND ORIGIN_FLIGHTNO = #{transFlightno,jdbcType=VARCHAR}
76 </if> 92 </if>
77 - <if test="transFlightdate !=null and transFlightdate !=''">  
78 - AND TRANS_FLIGHTDATE = to_date(#{transFlightdate}, 'YYYY-MM-DD') 93 + <if test="transFlightdate !=null">
  94 + AND TRANS_FLIGHTDATE = #{transFlightdate,jdbcType=DATE}
79 </if> 95 </if>
80 <if test="userName !=null and userName !=''"> 96 <if test="userName !=null and userName !=''">
81 AND USER_NAME = #{userName,jdbcType=VARCHAR} 97 AND USER_NAME = #{userName,jdbcType=VARCHAR}
@@ -84,7 +100,7 @@ @@ -84,7 +100,7 @@
84 AND AGENT_CODE = #{agentCode,jdbcType=VARCHAR} 100 AND AGENT_CODE = #{agentCode,jdbcType=VARCHAR}
85 </if> 101 </if>
86 <if test="agentName !=null and agentName !=''"> 102 <if test="agentName !=null and agentName !=''">
87 - AND AGENT_NAME like CONCAT('%',#{agentName,jdbcType=VARCHAR},'%') 103 + AND AGENT_NAME = #{agentName,jdbcType=VARCHAR}
88 </if> 104 </if>
89 </where> 105 </where>
90 order by CREATE_DATE desc 106 order by CREATE_DATE desc
@@ -109,8 +125,8 @@ @@ -109,8 +125,8 @@
109 #{weight,jdbcType=DECIMAL}, #{originStation,jdbcType=VARCHAR}, #{destinationStation,jdbcType=VARCHAR}, 125 #{weight,jdbcType=DECIMAL}, #{originStation,jdbcType=VARCHAR}, #{destinationStation,jdbcType=VARCHAR},
110 #{goodsdesen,jdbcType=VARCHAR}, #{goodsdescn,jdbcType=VARCHAR}, #{pack,jdbcType=VARCHAR}, 126 #{goodsdesen,jdbcType=VARCHAR}, #{goodsdescn,jdbcType=VARCHAR}, #{pack,jdbcType=VARCHAR},
111 #{originMasterwaybill,jdbcType=VARCHAR}, #{originHousewaybill,jdbcType=VARCHAR}, 127 #{originMasterwaybill,jdbcType=VARCHAR}, #{originHousewaybill,jdbcType=VARCHAR},
112 - #{originFlightno,jdbcType=VARCHAR}, #{originFlightdate,jdbcType=TIMESTAMP}, #{transMasterwaybill,jdbcType=VARCHAR},  
113 - #{transHousewaybill,jdbcType=VARCHAR}, #{transFlightno,jdbcType=VARCHAR}, #{transFlightdate,jdbcType=TIMESTAMP}, 128 + #{originFlightno,jdbcType=VARCHAR}, #{originFlightdate,jdbcType=DATE}, #{transMasterwaybill,jdbcType=VARCHAR},
  129 + #{transHousewaybill,jdbcType=VARCHAR}, #{transFlightno,jdbcType=VARCHAR}, #{transFlightdate,jdbcType=DATE},
114 #{createDate,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyName,jdbcType=VARCHAR}, 130 #{createDate,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyName,jdbcType=VARCHAR},
115 #{agentName,jdbcType=VARCHAR}, #{agentCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 131 #{agentName,jdbcType=VARCHAR}, #{agentCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR},
116 #{userRealName,jdbcType=VARCHAR}, #{userTel,jdbcType=VARCHAR}, #{status,jdbcType=DECIMAL}, 132 #{userRealName,jdbcType=VARCHAR}, #{userTel,jdbcType=VARCHAR}, #{status,jdbcType=DECIMAL},
@@ -246,7 +262,7 @@ @@ -246,7 +262,7 @@
246 #{originFlightno,jdbcType=VARCHAR}, 262 #{originFlightno,jdbcType=VARCHAR},
247 </if> 263 </if>
248 <if test="originFlightdate != null" > 264 <if test="originFlightdate != null" >
249 - #{originFlightdate,jdbcType=TIMESTAMP}, 265 + #{originFlightdate,jdbcType=DATE},
250 </if> 266 </if>
251 <if test="transMasterwaybill != null" > 267 <if test="transMasterwaybill != null" >
252 #{transMasterwaybill,jdbcType=VARCHAR}, 268 #{transMasterwaybill,jdbcType=VARCHAR},
@@ -258,7 +274,7 @@ @@ -258,7 +274,7 @@
258 #{transFlightno,jdbcType=VARCHAR}, 274 #{transFlightno,jdbcType=VARCHAR},
259 </if> 275 </if>
260 <if test="transFlightdate != null" > 276 <if test="transFlightdate != null" >
261 - #{transFlightdate,jdbcType=TIMESTAMP}, 277 + #{transFlightdate,jdbcType=DATE},
262 </if> 278 </if>
263 <if test="createDate != null" > 279 <if test="createDate != null" >
264 #{createDate,jdbcType=TIMESTAMP}, 280 #{createDate,jdbcType=TIMESTAMP},
@@ -335,7 +351,7 @@ @@ -335,7 +351,7 @@
335 ORIGIN_FLIGHTNO = #{originFlightno,jdbcType=VARCHAR}, 351 ORIGIN_FLIGHTNO = #{originFlightno,jdbcType=VARCHAR},
336 </if> 352 </if>
337 <if test="originFlightdate != null" > 353 <if test="originFlightdate != null" >
338 - ORIGIN_FLIGHTDATE = #{originFlightdate,jdbcType=TIMESTAMP}, 354 + ORIGIN_FLIGHTDATE = #{originFlightdate,jdbcType=DATE},
339 </if> 355 </if>
340 <if test="transMasterwaybill != null" > 356 <if test="transMasterwaybill != null" >
341 TRANS_MASTERWAYBILL = #{transMasterwaybill,jdbcType=VARCHAR}, 357 TRANS_MASTERWAYBILL = #{transMasterwaybill,jdbcType=VARCHAR},
@@ -347,7 +363,7 @@ @@ -347,7 +363,7 @@
347 TRANS_FLIGHTNO = #{transFlightno,jdbcType=VARCHAR}, 363 TRANS_FLIGHTNO = #{transFlightno,jdbcType=VARCHAR},
348 </if> 364 </if>
349 <if test="transFlightdate != null" > 365 <if test="transFlightdate != null" >
350 - TRANS_FLIGHTDATE = #{transFlightdate,jdbcType=TIMESTAMP}, 366 + TRANS_FLIGHTDATE = #{transFlightdate,jdbcType=DATE},
351 </if> 367 </if>
352 <if test="createDate != null" > 368 <if test="createDate != null" >
353 CREATE_DATE = #{createDate,jdbcType=TIMESTAMP}, 369 CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
@@ -410,11 +426,11 @@ @@ -410,11 +426,11 @@
410 ORIGIN_MASTERWAYBILL = #{originMasterwaybill,jdbcType=VARCHAR}, 426 ORIGIN_MASTERWAYBILL = #{originMasterwaybill,jdbcType=VARCHAR},
411 ORIGIN_HOUSEWAYBILL = #{originHousewaybill,jdbcType=VARCHAR}, 427 ORIGIN_HOUSEWAYBILL = #{originHousewaybill,jdbcType=VARCHAR},
412 ORIGIN_FLIGHTNO = #{originFlightno,jdbcType=VARCHAR}, 428 ORIGIN_FLIGHTNO = #{originFlightno,jdbcType=VARCHAR},
413 - ORIGIN_FLIGHTDATE = #{originFlightdate,jdbcType=TIMESTAMP}, 429 + ORIGIN_FLIGHTDATE = #{originFlightdate,jdbcType=DATE},
414 TRANS_MASTERWAYBILL = #{transMasterwaybill,jdbcType=VARCHAR}, 430 TRANS_MASTERWAYBILL = #{transMasterwaybill,jdbcType=VARCHAR},
415 TRANS_HOUSEWAYBILL = #{transHousewaybill,jdbcType=VARCHAR}, 431 TRANS_HOUSEWAYBILL = #{transHousewaybill,jdbcType=VARCHAR},
416 TRANS_FLIGHTNO = #{transFlightno,jdbcType=VARCHAR}, 432 TRANS_FLIGHTNO = #{transFlightno,jdbcType=VARCHAR},
417 - TRANS_FLIGHTDATE = #{transFlightdate,jdbcType=TIMESTAMP}, 433 + TRANS_FLIGHTDATE = #{transFlightdate,jdbcType=DATE},
418 CREATE_DATE = #{createDate,jdbcType=TIMESTAMP}, 434 CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
419 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP}, 435 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
420 MODIFY_NAME = #{modifyName,jdbcType=VARCHAR}, 436 MODIFY_NAME = #{modifyName,jdbcType=VARCHAR},