wlxxpt / customAnalysis · 提交

转到一个项目

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

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

内嵌 并排对比
正在显示 4 个修改的文件 包含 67 行增加 和 17 行删除
package com.tianbo.analysis.controller;
import com.github.pagehelper.PageInfo;
import com.tianbo.analysis.annotation.UserPermissionCheck;
import com.tianbo.analysis.dao.DOMTRANSITMapper;
import com.tianbo.analysis.model.DOMTRANSIT;
import com.tianbo.analysis.model.ResultJson;
import com.tianbo.analysis.service.DomTransitService;
... ... @@ -13,7 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import javax.annotation.Resource;
import java.util.LinkedHashMap;
import java.util.List;
/**
* 国内转运接口
... ... @@ -25,6 +28,9 @@ public class DomTransController {
@Autowired
DomTransitService domTransitService;
@Resource
DOMTRANSITMapper domtransitMapper;
@ApiOperation(value = "添加转运申请")
@PostMapping("dom")
@UserPermissionCheck
... ... @@ -72,8 +78,10 @@ public class DomTransController {
@RequestParam(value = "originMasterwaybill",required = false) String awba,
@RequestParam(value = "originHousewaybill",required = false) String awbh,
@RequestParam(value = "originFlightdate",required = false) String flightDate,
@RequestParam(value = "originFlightdateEnd",required = false) String originFlightdateEnd,
@RequestParam(value = "originFlightno",required = false) String flightNo,
@RequestParam(value = "transType",required = false) String transType,
@RequestParam(value = "agentName",required = false) String agentName,
@CookieValue("username") String username,
@CookieValue("userid") String userid){
DOMTRANSIT domtransit = new DOMTRANSIT();
... ... @@ -81,13 +89,15 @@ public class DomTransController {
domtransit.setOriginHousewaybill(awbh);
domtransit.setOriginFlightno(flightNo);
domtransit.setTransitType(transType);
domtransit.setAgentName(agentName);
//todo:权限校验,有管理权限的 显示全部数据
if (!"admin".equals(username)){
domtransit.setUserName(username);
}
if(StringUtils.isNotEmpty(flightDate)){
if(StringUtils.isNotEmpty(flightDate) && StringUtils.isNotEmpty(originFlightdateEnd)){
domtransit.setOriginFlightdate(DateUtil.parseDate(flightDate,"yyyy-MM-dd"));
domtransit.setOriginFlightdateEnd(DateUtil.parseDate(originFlightdateEnd,"yyyy-MM-dd"));
}
return new ResultJson<PageInfo<DOMTRANSIT>>("200","success",domTransitService.selectList(domtransit,pageNum,pageSize));
}
... ... @@ -102,4 +112,14 @@ public class DomTransController {
int i = domTransitService.updateByAudit(domtransit);
return i >0 ?new ResultJson("200", "审核通过"):new ResultJson("403", "审核失败");
}
@ApiOperation(value = "今日转运统计接口",notes = "开始日期为今日,结束日期为今日加一")
@GetMapping("analysisTodayWeight")
public ResultJson analysisTodayWeight( @RequestParam(value = "startDate") String startDate,
@RequestParam(value = "endDate") String endDate){
List<LinkedHashMap> result = domtransitMapper.analysisTodayWeight(startDate,endDate);
return new ResultJson("200","success",result);
}
}
... ...
package com.tianbo.analysis.dao;
import com.tianbo.analysis.model.DOMTRANSIT;
import org.apache.ibatis.annotations.Param;
import java.util.LinkedHashMap;
import java.util.List;
public interface DOMTRANSITMapper {
... ... @@ -13,6 +15,8 @@ public interface DOMTRANSITMapper {
DOMTRANSIT selectByPrimaryKey(String id);
List<LinkedHashMap> analysisTodayWeight(@Param("startDate") String var1, @Param("endDate")String var2);
List<DOMTRANSIT> selectList(DOMTRANSIT record);
int updateByPrimaryKeySelective(DOMTRANSIT record);
... ...
... ... @@ -51,6 +51,8 @@ public class DOMTRANSIT {
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date originFlightdate;
private Date originFlightdateEnd;
@NotNull(message="转运后主运单号不能为空",groups=ValidateInsert.class)
private String transMasterwaybill;
... ... @@ -320,4 +322,12 @@ public class DOMTRANSIT {
public void setApproverResoult(String approverResoult) {
this.approverResoult = approverResoult == null ? null : approverResoult.trim();
}
public Date getOriginFlightdateEnd() {
return originFlightdateEnd;
}
public void setOriginFlightdateEnd(Date originFlightdateEnd) {
this.originFlightdateEnd = originFlightdateEnd;
}
}
... ...
... ... @@ -14,11 +14,11 @@
<result column="ORIGIN_MASTERWAYBILL" property="originMasterwaybill" jdbcType="VARCHAR" />
<result column="ORIGIN_HOUSEWAYBILL" property="originHousewaybill" jdbcType="VARCHAR" />
<result column="ORIGIN_FLIGHTNO" property="originFlightno" jdbcType="VARCHAR" />
<result column="ORIGIN_FLIGHTDATE" property="originFlightdate" jdbcType="TIMESTAMP" />
<result column="ORIGIN_FLIGHTDATE" property="originFlightdate" jdbcType="DATE" />
<result column="TRANS_MASTERWAYBILL" property="transMasterwaybill" jdbcType="VARCHAR" />
<result column="TRANS_HOUSEWAYBILL" property="transHousewaybill" jdbcType="VARCHAR" />
<result column="TRANS_FLIGHTNO" property="transFlightno" jdbcType="VARCHAR" />
<result column="TRANS_FLIGHTDATE" property="transFlightdate" jdbcType="TIMESTAMP" />
<result column="TRANS_FLIGHTDATE" property="transFlightdate" jdbcType="DATE" />
<result column="CREATE_DATE" property="createDate" jdbcType="TIMESTAMP" />
<result column="MODIFY_TIME" property="modifyTime" jdbcType="TIMESTAMP" />
<result column="MODIFY_NAME" property="modifyName" jdbcType="VARCHAR" />
... ... @@ -45,6 +45,22 @@
from DOMTRANSIT
where ID = #{id,jdbcType=VARCHAR}
</select>
<select id="analysisTodayWeight" resultType="java.util.LinkedHashMap">
SELECT
ORIGIN_FLIGHTNO,
SUM(WEIGHT) as weightcount,
SUM(PIECE) as piececount,
ORIGIN_FLIGHTDATE
FROM
DOMTRANSIT
WHERE
TRANSIT_TYPE = 'dom'
AND CREATE_DATE
BETWEEN TO_DATE( #{startDate,jdbcType=VARCHAR}, 'yyyy-MM-dd' )
AND TO_DATE(#{endDate,jdbcType=VARCHAR},'yyyy-MM-dd')
GROUP BY ORIGIN_FLIGHTNO,ORIGIN_FLIGHTDATE
</select>
<select id="selectList" resultMap="BaseResultMap" parameterType="com.tianbo.analysis.model.DOMTRANSIT" >
select
<include refid="Base_Column_List" />
... ... @@ -62,8 +78,8 @@
<if test="originFlightno !=null and originFlightno !=''">
AND ORIGIN_FLIGHTNO = #{originFlightno,jdbcType=VARCHAR}
</if>
<if test="originFlightdate != null and originFlightdate !=''">
AND ORIGIN_FLIGHTDATE = to_date(#{originFlightdate}, 'YYYY-MM-DD')
<if test="originFlightdate != null and originFlightdateEnd != null">
AND ORIGIN_FLIGHTDATE between #{originFlightdate,jdbcType=DATE} and #{originFlightdateEnd,jdbcType=DATE}
</if>
<if test="transMasterwaybill != null and transMasterwaybill !='' ">
AND TRANS_MASTERWAYBILL = #{transMasterwaybill,jdbcType=VARCHAR}
... ... @@ -74,8 +90,8 @@
<if test="transFlightno !=null and originFltransFlightnoightno !=''">
AND ORIGIN_FLIGHTNO = #{transFlightno,jdbcType=VARCHAR}
</if>
<if test="transFlightdate !=null and transFlightdate !=''">
AND TRANS_FLIGHTDATE = to_date(#{transFlightdate}, 'YYYY-MM-DD')
<if test="transFlightdate !=null">
AND TRANS_FLIGHTDATE = #{transFlightdate,jdbcType=DATE}
</if>
<if test="userName !=null and userName !=''">
AND USER_NAME = #{userName,jdbcType=VARCHAR}
... ... @@ -84,7 +100,7 @@
AND AGENT_CODE = #{agentCode,jdbcType=VARCHAR}
</if>
<if test="agentName !=null and agentName !=''">
AND AGENT_NAME like CONCAT('%',#{agentName,jdbcType=VARCHAR},'%')
AND AGENT_NAME = #{agentName,jdbcType=VARCHAR}
</if>
</where>
order by CREATE_DATE desc
... ... @@ -109,8 +125,8 @@
#{weight,jdbcType=DECIMAL}, #{originStation,jdbcType=VARCHAR}, #{destinationStation,jdbcType=VARCHAR},
#{goodsdesen,jdbcType=VARCHAR}, #{goodsdescn,jdbcType=VARCHAR}, #{pack,jdbcType=VARCHAR},
#{originMasterwaybill,jdbcType=VARCHAR}, #{originHousewaybill,jdbcType=VARCHAR},
#{originFlightno,jdbcType=VARCHAR}, #{originFlightdate,jdbcType=TIMESTAMP}, #{transMasterwaybill,jdbcType=VARCHAR},
#{transHousewaybill,jdbcType=VARCHAR}, #{transFlightno,jdbcType=VARCHAR}, #{transFlightdate,jdbcType=TIMESTAMP},
#{originFlightno,jdbcType=VARCHAR}, #{originFlightdate,jdbcType=DATE}, #{transMasterwaybill,jdbcType=VARCHAR},
#{transHousewaybill,jdbcType=VARCHAR}, #{transFlightno,jdbcType=VARCHAR}, #{transFlightdate,jdbcType=DATE},
#{createDate,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyName,jdbcType=VARCHAR},
#{agentName,jdbcType=VARCHAR}, #{agentCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR},
#{userRealName,jdbcType=VARCHAR}, #{userTel,jdbcType=VARCHAR}, #{status,jdbcType=DECIMAL},
... ... @@ -246,7 +262,7 @@
#{originFlightno,jdbcType=VARCHAR},
</if>
<if test="originFlightdate != null" >
#{originFlightdate,jdbcType=TIMESTAMP},
#{originFlightdate,jdbcType=DATE},
</if>
<if test="transMasterwaybill != null" >
#{transMasterwaybill,jdbcType=VARCHAR},
... ... @@ -258,7 +274,7 @@
#{transFlightno,jdbcType=VARCHAR},
</if>
<if test="transFlightdate != null" >
#{transFlightdate,jdbcType=TIMESTAMP},
#{transFlightdate,jdbcType=DATE},
</if>
<if test="createDate != null" >
#{createDate,jdbcType=TIMESTAMP},
... ... @@ -335,7 +351,7 @@
ORIGIN_FLIGHTNO = #{originFlightno,jdbcType=VARCHAR},
</if>
<if test="originFlightdate != null" >
ORIGIN_FLIGHTDATE = #{originFlightdate,jdbcType=TIMESTAMP},
ORIGIN_FLIGHTDATE = #{originFlightdate,jdbcType=DATE},
</if>
<if test="transMasterwaybill != null" >
TRANS_MASTERWAYBILL = #{transMasterwaybill,jdbcType=VARCHAR},
... ... @@ -347,7 +363,7 @@
TRANS_FLIGHTNO = #{transFlightno,jdbcType=VARCHAR},
</if>
<if test="transFlightdate != null" >
TRANS_FLIGHTDATE = #{transFlightdate,jdbcType=TIMESTAMP},
TRANS_FLIGHTDATE = #{transFlightdate,jdbcType=DATE},
</if>
<if test="createDate != null" >
CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
... ... @@ -410,11 +426,11 @@
ORIGIN_MASTERWAYBILL = #{originMasterwaybill,jdbcType=VARCHAR},
ORIGIN_HOUSEWAYBILL = #{originHousewaybill,jdbcType=VARCHAR},
ORIGIN_FLIGHTNO = #{originFlightno,jdbcType=VARCHAR},
ORIGIN_FLIGHTDATE = #{originFlightdate,jdbcType=TIMESTAMP},
ORIGIN_FLIGHTDATE = #{originFlightdate,jdbcType=DATE},
TRANS_MASTERWAYBILL = #{transMasterwaybill,jdbcType=VARCHAR},
TRANS_HOUSEWAYBILL = #{transHousewaybill,jdbcType=VARCHAR},
TRANS_FLIGHTNO = #{transFlightno,jdbcType=VARCHAR},
TRANS_FLIGHTDATE = #{transFlightdate,jdbcType=TIMESTAMP},
TRANS_FLIGHTDATE = #{transFlightdate,jdbcType=DATE},
CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
MODIFY_NAME = #{modifyName,jdbcType=VARCHAR},
... ...