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

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

@@ -237,19 +237,19 @@ public class SystemFileController extends BaseRESTfulController {
 
     @PostMapping("/previewfile2")
     public RESTfulResult previewfile2(@RequestBody HashMap parmas) {
-
+        try {
         SystemFile value = systemFileMapper.selectByPrimaryKey(parmas.get("id").toString());
-
+        if (value==null){
+            return failed(1,"该文件不存在！请查验文件是否被清除或已损坏！");
+        }
         String fileName = value.getFilename();
         String filepath = value.getFilepath();
         if (fileName == null || fileName.isEmpty()) {
-            return failed("该图片不存在！");
+            return failed(1,"该文件不存在！");
         }
         if (filepath == null || filepath.isEmpty()) {
-            return failed("该图片地址不存在！");
+            return failed(1,"该文件地址不存在！");
         }
-
-        try {
             String result = ftpFileUtil.downloadFile(fileName, filepath);
             return success(result);
         } catch (IOException e) {

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

@@ -89,11 +89,10 @@ public class TMSController extends BaseRESTfulController {
 
     @ApiOperation(value = "修改车辆实绩")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
-    @PutMapping(value = "/comprehensiveresultsupadete/{id}")
+    @PostMapping(value = "/comprehensiveresultsupadete")
     @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计算公式"})
-    public Map<String, Object> comprehensiveresultsUpdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map) {
-        map.put("updateUsername", map.get("userName").toString());
-        return tmsFeign.updateAmsSalaryContrac(id, map);
+    public Map<String, Object> comprehensiveresultsUpdate(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsFeign.updateAmsSalaryContrac(map);
     }
 
     @ApiOperation(value = "派发运输订单")
@@ -651,6 +650,7 @@ public class TMSController extends BaseRESTfulController {
         map.put("weightOld",weightOld);
         map.put("diff",DataChange.dataToBigDecimal(map.get("weight").toString()).subtract(weightOld));
         map.put("orderList",orderList);
+        map.put("requirementSerialNumber",orderList.get(0).get("requirementSerialNumber"));
         map.put("transPlanId",orderList.get(0).get("transPlanId"));
         map.put("materialId",orderList.get(0).get("materialId"));
         map.put("unloadPointId",orderList.get(0).get("unloadPointId"));

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

@@ -51,6 +51,7 @@ public class UniversalController extends BaseRESTfulController {
     @Autowired
     private ImageFileUtils imageFileUtils;
 
+
     @ApiModelProperty(value = "边输边查物资大类")
     @PostMapping("/getMaterialTypeByLike")
     public RESTfulResult getMaterialTypeByLike(@RequestBody(required = false) Map<String,Object> map) {

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

@@ -32,8 +32,8 @@ public interface TmsFeign {
     @PostMapping("api/v1/tms/tmscomprehensiveresults/add")
     Map<String, Object> insertAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);
 
-    @PutMapping("api/v1/tms/tmscomprehensiveresults/{id}")
-    Map<String, Object> updateAmsSalaryContrac(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
+    @PostMapping("api/v1/tms/tmscomprehensiveresults/tmscomprehensiveresultsupdate")
+    Map<String, Object> updateAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/tms/tmscomprehensiveresults/logicdelete")
     Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map);

src/main/resources/application-prod.yml

@@ -36,7 +36,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.90.214:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:localhost:8060}
+    url: ${RMSFEIGN_URL:172.16.90.214:8060}
   IntegrationFeign:
     url: ${INTEGRATIONFEIGN_URL:172.16.90.214:8066}
   OTMSFeign:

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

@@ -47,7 +47,7 @@
     </sql>
     <sql id="filterCompanyData">
         <if test="roleCodes != null and roleCodes.size > 0  and dilCompanyList != null and dilCompanyList.size > 0" >
-        AND
+            AND
             <foreach collection="roleCodes" index="index" item="item" separator="or" close=")" open="(">
                 <choose>
                     <when test="item == 'chengYunShang'">
@@ -78,8 +78,18 @@
                             #{item.companyId}
                         </foreach>
                     </when>
+                    <when test="item == 'approveBusinessCompany'">
+                        "approveBusinessCompanyId"
+                        in
+                        <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
+                            #{item.companyId}
+                        </foreach>
+                    </when>
+                    <when test="item.contains('admin')">
+                        1 = 1
+                    </when>
                     <otherwise>
-                         1 = 1
+                        1 != 1
                     </otherwise>
                 </choose>
             </foreach>

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

@@ -895,6 +895,7 @@
             OOC .ORDER_CHILD_ID "transOrderChildId",
             TUR .RESULT_ID "resultId",
             TUR .ACTUAL_TONNAGE "unloadWeightOld",
+            ATR .SERIAL_NUMBER  "requirementSerialNumber",
             APC .TRANS_PLAN_ID "transPlanId",
             ARC .RECEIVING_POINT_ID "unloadPointId",
             APC .MATERIAL_ID "materialId",