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

src/main/java/com/steerinfo/dil/aspect/LogAspect.java

@@ -58,7 +58,7 @@ public class LogAspect {
         //获取该切点处的方法及入参
         Method method = ((MethodSignature) point.getSignature()).getMethod();
         Object[] requestParams = point.getArgs();
-        JSONObject map = null ;
+        JSONObject map = null;
         for(Object param:requestParams){
             if(param!=null && param instanceof Map){
                 map = JSONObject.parseObject(JSONObject.toJSONString(param));

src/main/java/com/steerinfo/dil/config/RequestFilter.java

@@ -4,9 +4,13 @@ package com.steerinfo.dil.config;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.aspect.LogAspect;
+import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
 import javax.servlet.*;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
@@ -14,6 +18,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URLDecoder;
+import java.util.Map;
 
 @Component
 public class RequestFilter implements Filter {
@@ -22,6 +27,10 @@ public class RequestFilter implements Filter {
     @Override
     public void destroy() {}
 
+
+    @Resource
+    private BackgroundProcessingMapper backgroundProcessingMapper;
+
     @Override
     public void doFilter(ServletRequest request, ServletResponse response,FilterChain chain) throws IOException, ServletException {
        try{
@@ -77,7 +86,8 @@ public class RequestFilter implements Filter {
            httpRequest.setAttribute("orgCode", orgCode);
            Object roleCodesObject = JSONObject.parse(roleCodes);
            httpRequest.setAttribute("roleCodes", roleCodesObject);
-           Object dilCompanyListObject = JSONObject.parse(dilCompanyList);
+           //Object dilCompanyListObject = JSONObject.parse(dilCompanyList);
+           Object dilCompanyListObject =  backgroundProcessingMapper.getCompanyList(userId);
            httpRequest.setAttribute("dilCompanyList",dilCompanyListObject);
            Object rootCompanyMapObject = JSONObject.parse(rootCompanyMap);
            httpRequest.setAttribute("rootCompanyMap",rootCompanyMapObject);

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

@@ -51,12 +51,19 @@ public class BackgroundProcessingController extends BaseRESTfulController {
         if("succeed".equals(resMap.get("status"))) {
             Map<String, Object> dataMap = (Map<String, Object>) resMap.get("data");
             Map<String, Object> userInfo = (Map<String, Object>) dataMap.get("user");
-            // 根据用户名去查询该用户绑定的公司及下属公司
-            List<Map<String, Object>> companyList = backgroundProcessingMapper.getCompanyList(loginName);
-            if(companyList.size() > 0) {
+            // 根据用户名去查询该用户绑定的公司及下属公司;7.2改为只查本单位因前端会报错
+            List<Map<String, Object>> companyList = backgroundProcessingMapper.getCurrentCompanyList(loginName);
+            //List<Map<String, Object>> companyList = backgroundProcessingMapper.getCompanyList(loginName);
+            if(companyList != null && companyList.size() > 0) {
                 Map<String, Object> stringMap = new HashMap<>();
                 stringMap.put("companyId",-1);
                 companyList.add(stringMap);
+            }else{
+                //resMap.put("status","failed");
+                //resMap.put("message","账号未与单位关联,联系管理人员");
+                //resMap.put("resultMessage","账号未与单位关联,联系管理人员");
+                //resMap.put("code","500");
+                //return resMap;
             }
             Map<String,Object> rootCompanyMap = backgroundProcessingMapper.getCompanyRootMap(loginName);
             userInfo.put("dilCompanyList", companyList);
@@ -81,7 +88,6 @@ public class BackgroundProcessingController extends BaseRESTfulController {
                 dataMap.putAll(personnelMap);
             }
             //注册cid
-
             System.out.println(dataMap);
         }
         return resMap;
@@ -95,7 +101,7 @@ public class BackgroundProcessingController extends BaseRESTfulController {
             searchMap.put("cid",dilAppCid.getCid());
             searchMap.put("userCode",dilAppCid.getUserCode());
             List<DilAppCid> mapList = dilAppCidMapper.selectByParameters(searchMap);
-            if(mapList.size() > 0 && mapList.get(0) != null) {
+            if(mapList != null && mapList.size() > 0 && mapList.get(0) != null) {
                 mapList.get(0).setUpdateTime(new Date());
                 dilAppCidMapper.updateByPrimaryKeySelective(mapList.get(0));
                 return success();
@@ -103,7 +109,7 @@ public class BackgroundProcessingController extends BaseRESTfulController {
             dilAppCid.setPrimaryId(dilAppCidMapper.nextId());
             dilAppCid.setInsertTime(new Date());
             dilAppCid.setUpdateTime(new Date());
-            mapList.get(0).setDeleted(0);
+            dilAppCid.setDeleted(0);
             dilAppCidMapper.insertSelective(dilAppCid);
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -129,6 +129,11 @@ public class RMScontroller extends BaseRESTfulController {
     @PostMapping("/insertMaterialType")
     @LogAround(foreignKeys = {"materialTypeId"}, foreignKeyTypes = "物资类型", description = "新增物资类型")
     public RESTfulResult insertMaterialType(@RequestBody(required = false) Map<String, Object> map) {
+        List dilCompanyList = (List) map.get("dilCompanyList");
+        if(dilCompanyList != null && dilCompanyList.size() > 0) {
+            Map<String, Object> stringObjectMap = (Map<String, Object>) dilCompanyList.get(0);
+            map.put("companyId",stringObjectMap.get("companyId"));
+        }
         return rmsFeign.insertMaterialType(map);
     }
 
@@ -1286,6 +1291,11 @@ public class RMScontroller extends BaseRESTfulController {
     @PostMapping(value = "/insertTransRange")
     @LogAround(foreignKeys = {"transRangeId"}, foreignKeyTypes = "运输范围")
     public Map<String, Object> insertTransRange(@RequestBody(required = false) Map<String, Object> map) {
+        List dilCompanyList = (List) map.get("dilCompanyList");
+        if(dilCompanyList != null && dilCompanyList.size() > 0) {
+            Map<String, Object> stringObjectMap = (Map<String, Object>) dilCompanyList.get(0);
+            map.put("companyId",stringObjectMap.get("companyId"));
+        }
         return rmsFeign.insertTransRange(map);
     }
 

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

@@ -828,4 +828,22 @@ public class TMSController extends BaseRESTfulController {
     RESTfulResult getDriverDayJobForApp(@RequestBody Map<String,Object> map,Integer apiId) {
         return tmsFeign.getDriverDayJobForApp(map,apiId);
     }
+
+    @ApiOperation(value = "确认出库", notes = "确认出库")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/outBound")
+    public RESTfulResult outBound(@RequestBody Map<String, Object> map) {
+        return tmsFeign.outBound(map);
+    }
+
+    @ApiOperation(value = "撤销出库", notes = "撤销出库")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/revokeOutBound")
+    public RESTfulResult revokeOutBound(@RequestBody Map<String, Object> map) {
+        return tmsFeign.revokeOutBound(map);
+    }
 }

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

@@ -281,6 +281,12 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/omstransorders/getDriverDayJobForApp")
     RESTfulResult getDriverDayJobForApp(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/outBound")
+    RESTfulResult outBound(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/revokeOutBound")
+    RESTfulResult revokeOutBound(@RequestBody Map<String, Object> map);
 }
 
 

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

@@ -30,7 +30,7 @@
             FROM RMS_PERSONNEL RP
                      LEFT JOIN RMS_PERSONNEL_COMPANY RPC ON RP.PERSONNEL_ID = RPC.PERSONNEL_ID
             WHERE RPC.DELETED = 0
-              AND RP.PERSONNEL_JOB_NUMBER = #{userName}
+              AND RP.SSO_ID = #{userId}
               AND nvl(RP.PERSONNEL_POST,'无') != '司机'
         )
         CONNECT BY PRIOR RC.COMPANY_ID = rc.PARENT_COMPANY_ID
@@ -38,9 +38,7 @@
         order by "level"
     </select>
     <select id="getCurrentCompanyList" resultType="java.util.Map">
-        SELECT distinct rc.company_id "companyId",
-                        rc.COMPANY_TYPE "companyType",
-                        rc.DELETED "deleted"
+        SELECT distinct rc.company_id "companyId"
         FROM RMS_PERSONNEL RP
         LEFT JOIN RMS_PERSONNEL_COMPANY RPC
         on RP.PERSONNEL_ID = RPC.PERSONNEL_ID
@@ -93,7 +91,7 @@
             RP.PERSONNEL_POST "personnelPost",
             RP.PERSONNEL_TEAM "personnelTeam"
         FROM RMS_PERSONNEL  RP
-        WHERE RP.DELETED = 0
+        WHERE RP.DELETED != -1
           AND RP.PERSONNEL_JOB_NUMBER = #{loginName}
         FETCH NEXT 1 ROWS ONLY
     </select>

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

@@ -228,16 +228,19 @@
         select * from(
         select * from(
         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",
+        t.MATERIAL_TYPE_ID "operationsNameId",
+        t.MATERIAL_TYPE_NAME "operationsName",
+        t.MATERIAL_TYPE_ID "id",
+        t.MATERIAL_TYPE_ID "value",
+        t.MATERIAL_TYPE_NAME "label",
+        t.MATERIAL_TYPE_NAME "text",
+        t.REMARK "remark",
+        t1.company_id "businessCompanyId",
         'operationsName' "prop"
-        from RMS_MATERIAL_TYPE
-        where DELETED = 0
+        from RMS_MATERIAL_TYPE t
+        left join rms_company_b_m_t t1
+        on t.material_type_id = t1.material_type_id
+        where t.DELETED = 0
         )
         <where>
             <if test="index!=null and index!=''">
@@ -249,6 +252,9 @@
             <if test="lastIndex!=null">
                 and "operationsNameId" &lt; #{lastIndex}
             </if>
+            <if test="companyType != null and companyType == '业务单位' and isListed == null">
+                <include refid="com.steerinfo.dil.mapper.CommonMapper.filterCompanyData"></include>
+            </if>
         </where>
         order by "operationsNameId" desc
         FETCH NEXT 10 ROWS ONLY
@@ -468,8 +474,10 @@
         RCA.REMARK1 "remark1",
         RCA.CAPACITY_NUMBER "capacityNumber",
         (case
+        when RCA.deleted = '3' is not null then '维保'
         when oto.capacity_id is null then '空闲'
         when oto.deleted != '2' and oto.capacity_id is not null then '已派'
+        when oto.deleted = '2' and oto.capacity_id is not null then '空闲'
         end) "status",
         RCT.CAPACITY_TYPE_NAME "capacityTypeName",
         'capacityNumber' "prop"
@@ -664,11 +672,16 @@
         </if>
         WHERE RCA .DELETED = 0
         <if test="capacityTypeId !=null">
-            AND RCT.CAPACITY_TYPE_ID in (
-            select rct.capacity_type_id from rms_capacity_type rct
-            START WITH rct.capacity_type_id = #{capacityTypeId}
-            connect BY PRIOR rct.capacity_type_id = rct.p_capacity_type_id
-            )
+            AND (RCT.CAPACITY_TYPE_ID in (
+                select rct.capacity_type_id from rms_capacity_type rct
+                START WITH rct.capacity_type_id = #{capacityTypeId}
+                connect BY PRIOR rct.capacity_type_id = rct.p_capacity_type_id
+                )
+                or RCA.CAPACITY_TYPE_ID2 in (
+                select rct.capacity_type_id from rms_capacity_type rct
+                START WITH rct.capacity_type_id = #{capacityTypeId}
+                connect BY PRIOR rct.capacity_type_id = rct.p_capacity_type_id
+            ))
         </if>
         <if test="capacityType != null and capacityType != '' ">
             AND RCT.CAPACITY_TYPE_NAME = #{capacityType}
@@ -826,12 +839,15 @@
         rc.START_POINT_ID   "shippingPointId",
         rc.END_POINT_ID     "receivingPointId",
         rc.LINE_ID  "lineId",
+        t1.company_id "businessCompanyId",
         'operationRangeName' "prop"
         from RMS_TRANS_RANGE RC
         left join rms_operation_point rop_s
         on rop_s.operation_point_id = RC.start_point_id
         left join rms_operation_point rop_e
         on rop_e.operation_point_id = RC.end_point_id
+        left join rms_company_b_m_t t1
+        on RC.trans_range_id = t1.trans_range_id
         <where>
             and RC.DELETED = 0
             <if test="isNc!=null and isNc!=''">
@@ -841,6 +857,9 @@
         </where>
         )
         <where>
+            <if test="companyType != null and companyType == '业务单位' and isListed == null">
+                <include refid="com.steerinfo.dil.mapper.CommonMapper.filterCompanyData"></include>
+            </if>
             <if test="index!=null and index!=''">
                 <bind name="indexBind" value="'%' + index + '%'"/>
                 AND "label" like #{indexBind}