Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -700,4 +700,10 @@ public class TMSController extends BaseRESTfulController {
     public RESTfulResult uploadLocation(@RequestBody  Map<String,Object> map) {
         return tmsFeign.uploadLocation(map);
     }
+
+    @ApiOperation("实收吨数")
+    @PostMapping("/updateWeight")
+    public RESTfulResult updateWeight(@RequestBody  Map<String,Object> map) {
+        return tmsFeign.updateWeight(map);
+    }
 }

src/main/java/com/steerinfo/dil/feign/TmsFeign.java

@@ -214,6 +214,9 @@ public interface TmsFeign {
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize);
 
+    @PostMapping("api/v1/tms/tmsreceiptresults/updateWeight")
+    RESTfulResult updateWeight(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping("api/v1/tms/tmsloadresults/purchaseTrainLoad")
     Map<String, Object> purchaseTrainLoad(Map<String, Object> map);
 

src/main/java/com/steerinfo/dil/mapper/CommonMapper.java

@@ -0,0 +1,8 @@
+package com.steerinfo.dil.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CommonMapper {
+
+}

src/main/resources/com/steerinfo/dil/mapper/CommonMapper.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.CommonMapper">
+    <sql id="orderBy">
+        <if test="orderField != null and orderField != ''">
+            order by "${orderField}"
+            <if test="orderType != null and orderType != ''">
+                ${orderType}
+            </if>
+        </if>
+    </sql>
+    <sql id="timeFilter">
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= ${timeFilterProp}
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= ${timeFilterProp}
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= ${timeFilterProp}
+        </if>
+    </sql>
+    <sql id="companyFilter">
+        <if test="${companyType} != null">
+            <if test="!roleCodes.contains('admin') and dilCompanyList != null and dilCompanyList.size > 0">
+                AND ${prop}
+                in
+                <foreach collection="dilCompanyList" item="item" open="(" close=")" separator=",">
+                    <if test="item.companyType == ${companyType}">
+                        #{item.companyId}
+                    </if>
+                </foreach>
+            </if>
+        </if>
+        <if test="${companyType} == null">
+            <if test="!roleCodes.contains('admin') and dilCompanyList != null and dilCompanyList.size > 0">
+                AND ${prop}
+                in
+                <foreach collection="dilCompanyList" item="item" open="(" close=")" separator=",">
+                    #{item.companyId}
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <sql id="rootCompanyFilter">
+        <if test="rootCompanyMap != null and (rootCompanyMap.rootCompanyName.contains('安泰') or rootCompanyMap.rootCompanyName.contains('新泰'))">
+            AND "rootCompanyId" = #{rootCompanyMap.rootCompanyId}
+        </if>
+    </sql>
+    <sql id="filterCompanyData">
+        <if test="roleCodes != null and roleCodes.size > 0  and dilCompanyList != null and dilCompanyList.size > 0" >
+        AND
+            <foreach collection="roleCodes" index="index" item="item" separator="or" close=")" open="(">
+                <choose>
+                    <when test="item == 'chengYunShang'">
+                        "carrierId"
+                        in
+                        <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
+                            #{item.companyId}
+                        </foreach>
+                    </when>
+                    <when test="item == 'shippingCompany'">
+                        "shippingCompanyId"
+                        in
+                        <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
+                            #{item.companyId}
+                        </foreach>
+                    </when>
+                    <when test="item == 'receivingCompany'">
+                        "receivingCompanyId"
+                        in
+                        <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
+                            #{item.companyId}
+                        </foreach>
+                    </when>
+                    <when test="item == 'businessCompany'">
+                        "businessCompanyId"
+                        in
+                        <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
+                            #{item.companyId}
+                        </foreach>
+                    </when>
+                    <otherwise>
+                         1 = 1
+                    </otherwise>
+                </choose>
+            </foreach>
+        </if>
+    </sql>
+</mapper>

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -83,7 +83,6 @@
         WHERE DL.VERSION_ID = 11
     </select>
 
-
     <!--  边输边查公司  -->
     <select id="getCompanyMesByLike" resultType="java.util.Map">
         select * from(
@@ -93,6 +92,7 @@
         RC.COMPANY_ID "id",
         RC.COMPANY_ID   "key",
         RC.COMPANY_ID "value",
+        RC.COMPANY_ID "carrierId",
         <if test="companyType==null">
             RC.COMPANY_TYPE || '-' ||
         </if>
@@ -150,38 +150,6 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE(RC.COMPANY_NAME, #{index})
             </if>
-            <if test="roleCodes.contains('shippingCompany') and dilCompanyList != null and dilCompanyList.size > 0">
-                or RC.COMPANY_ID in
-                <foreach collection="dilCompanyList" item="item" open="(" close=")" separator=",">
-                    <if test="companyType == '发货单位'">
-                        #{item.companyId}
-                    </if>
-                </foreach>
-            </if>
-            <if test="roleCodes.contains('recevingCompany') and dilCompanyList != null and dilCompanyList.size > 0">
-                or RC.COMPANY_ID in
-                <foreach collection="dilCompanyList" item="item" open="(" close=")" separator=",">
-                    <if test="companyType == '收货单位'">
-                        #{item.companyId}
-                    </if>
-                </foreach>
-            </if>
-            <if test="roleCodes.contains('carrierCompany') and dilCompanyList != null and dilCompanyList.size > 0">
-                or RC.COMPANY_ID in
-                <foreach collection="dilCompanyList" item="item" open="(" close=")" separator=",">
-                    <if test="companyType == '承运单位'">
-                        #{item.companyId}
-                    </if>
-                </foreach>
-            </if>
-            <if test="roleCodes.contains('businessCompany') and dilCompanyList != null and dilCompanyList.size > 0">
-                or RC.COMPANY_ID in
-                <foreach collection="dilCompanyList" item="item" open="(" close=")" separator=",">
-                    <if test="companyType == '业务单位'">
-                        #{item.companyId}
-                    </if>
-                </foreach>
-            </if>
         </where>
         <if test="noRow == null">
             order by LENGTH(company_name)
@@ -196,6 +164,7 @@
             RC.COMPANY_ID "id",
             RC.COMPANY_ID   "key",
             RC.COMPANY_ID "value",
+            RC.COMPANY_ID "carrierId",
             <if test="companyType==null">
                 RC.COMPANY_TYPE || '-' ||
             </if>
@@ -264,11 +233,14 @@
         <if test="id!=null and id.size>0">
         UNION
             select
+            MATERIAL_TYPE_ID "operationsNameId",
+            MATERIAL_TYPE_NAME "operationsName",
             MATERIAL_TYPE_ID "id",
             MATERIAL_TYPE_ID "value",
             MATERIAL_TYPE_NAME "label",
             MATERIAL_TYPE_NAME "text",
-            REMARK "remark"
+            REMARK "remark",
+            'operationsName' "prop"
             from RMS_MATERIAL_TYPE
             where MATERIAL_TYPE_ID in
             <foreach collection="id" item="item"  open="(" close=")" separator="," >
@@ -557,6 +529,13 @@
             <if test="capacityTypeId!=null and capacityTypeId!=''">
                 AND RCT.CAPACITY_TYPE_ID =  #{capacityTypeId}
             </if>
+            <if test="capacityTypeNameList != null and capacityTypeNameList.size > 0">
+                and
+                RCT.CAPACITY_TYPE_NAME in
+                <foreach collection="capacityTypeNameList" index="index" item="item" separator="," close=")" open="(">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY RCT .CAPACITY_TYPE_ID,RCT.CAPACITY_TYPE_NAME,RCT .CAPACITY_MAX_LOAD
         FETCH NEXT 10 ROWS ONLY
@@ -581,6 +560,13 @@
             <foreach collection="id" item="item"  open="(" close=")" separator="," >
                 #{item}
             </foreach>
+            <if test="capacityTypeNameList != null and capacityTypeNameList.size > 0">
+                and
+                RCT.CAPACITY_TYPE_NAME in
+                <foreach collection="capacityTypeNameList" index="index" item="item" separator="," close=")" open="(">
+                    #{item}
+                </foreach>
+            </if>
             GROUP BY RCT .CAPACITY_TYPE_ID,RCT.CAPACITY_TYPE_NAME,RCT .CAPACITY_MAX_LOAD
         </if>
     </select>
@@ -637,7 +623,8 @@
             RL.LINE_NAME "label",
             RL.LINE_NAME "text",
             NVL(RL_TEMP."points",'无') "points",
-            RL.LINE_TYPE    "lineType"
+            RL.LINE_TYPE    "lineType",
+            'lineName' "prop"
             from RMS_LINE RL
             LEFT JOIN
             (
@@ -897,11 +884,6 @@
         ON ROP.OPERATION_POINT_ID = RTR.START_POINT_ID
         LEFT JOIN RMS_OPERATION_POINT ROP2
         ON ROP2.OPERATION_POINT_ID = RTR.END_POINT_ID
-        <where>
-            <include refid="companyFilter" >
-                <property name="prop" value="rdb.COMPANY_ID"/>
-            </include>
-        </where>
         )
         <where>
             <if test="index!=null and index!=''">
@@ -910,6 +892,7 @@
             <if test="businessCompanyId!=null and businessCompanyId!=''">
                 AND REGEXP_LIKE("businessCompanyId", #{businessCompanyId})
             </if>
+            <include refid="com.steerinfo.dil.mapper.CommonMapper.filterCompanyData"></include>
         </where>
     </select>
     <select id="getIdCardCode" resultType="java.lang.String">

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,RUNNING,stdout
+log4j.rootCategory=DEBUG, stdout,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout