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

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/ReportController.java

@@ -104,4 +104,19 @@ public class ReportController {
                                               Integer pageSize){
         return reportFeign.getTransReportCarrier(mapValue,apiId,pageNum,pageSize);
     }
+
+    @ApiOperation(value="型钢报表")
+    @PostMapping(value = "/getTransReportXG")
+    Map<String, Object> getTransReportXG(@RequestBody(required=false) HashMap<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize){
+        return reportFeign.getTransReportXG(mapValue,apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value="修改运价")
+    @PostMapping(value = "/updateTransUnitPrice")
+    Map<String, Object> updateTransUnitPrice(@RequestBody(required=false) HashMap<String,Object> map){
+        return reportFeign.updateTransUnitPrice(map);
+    }
 }

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

@@ -48,4 +48,13 @@ public interface ReportFeign {
                                               @RequestParam Integer apiId,
                                               @RequestParam  Integer pageNum,
                                               @RequestParam  Integer pageSize);
+
+    @PostMapping(value = "api/v1/report/saleReports/getTransReportXG")
+    Map<String, Object> getTransReportXG(@RequestBody(required = false) HashMap<String, Object> map,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam  Integer pageNum,
+                                              @RequestParam  Integer pageSize);
+
+    @PostMapping(value = "api/v1/report/saleReports/updateTransUnitPrice")
+    Map<String, Object> updateTransUnitPrice(HashMap<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>