”修改“

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

@@ -1714,4 +1714,6 @@ public class AMScontroller{
     ) {
         return amsFeign.getSporadicOfOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,sporadicId);
     }
+
+
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -206,8 +207,8 @@ public class RMScontroller {
         return   rmsFeign.getCarrierBidAreaList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
     //    处理承运商照片
-    @PostMapping("/uploadCarrier1")
-    public int uploadCarrier1(@RequestParam("file") MultipartFile multipartFile){
+    @PostMapping(value = "/uploadCarrier1")
+    public String uploadCarrier1(@RequestParam ("file") MultipartFile multipartFile){
         return rmsFeign.uploadCarrier1(multipartFile);
     }
     //    处理承运商照片

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

@@ -192,7 +192,6 @@ public class UniversalController extends BaseRESTfulController {
                                                      Integer apiId,
                                                      Integer pageNum,
                                                      Integer pageSize,
-                                                     String carrierSsoId,
                                                      String index
     ){
         if(mapValue == null){
@@ -662,7 +661,11 @@ public class UniversalController extends BaseRESTfulController {
            failed();
        }
        return success(carrier);
+    }
 
-
+    @ApiOperation(value = "查询待分解计划数量")
+    @PostMapping("/getPlanCount")
+    public Integer getPlanCount(){
+        return universalMapper.getPlanCount();
     }
 }

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

@@ -1549,4 +1549,5 @@ public interface AmsFeign {
                                                         @RequestParam Integer pageNum,
                                                         @RequestParam Integer pageSize,
                                                         @RequestParam Integer sporadicId);
+
 }

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -108,14 +109,14 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscarrier/deleteCarrier/{id}")
     Map<String, Object> deleteCarrier(@PathVariable("id") BigDecimal id);
     //    处理承运商照片
-    @PostMapping("api/v1/rms/rmscarrier/uploadCarrier1")
-    int uploadCarrier1(@RequestParam("file") MultipartFile multipartFile);
+    @PostMapping(value = "api/v1/rms/rmscarrier/uploadCarrier1" ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    String uploadCarrier1(@RequestPart("file") MultipartFile multipartFile);
     //    处理承运商照片
     @PostMapping("api/v1/rms/rmscarrier/uploadCarrier2")
-    int uploadCarrier2(@RequestParam("file") MultipartFile multipartFile);
+    int uploadCarrier2(@RequestParam("file")MultipartFile multipartFile);
     //    处理承运商照片
     @PostMapping("api/v1/rms/rmscarrier/uploadCarrier3")
-    int uploadCarrier3(@RequestParam("file") MultipartFile multipartFile);
+    int uploadCarrier3(@RequestPart("file") MultipartFile multipartFile);
     //    更新承运商信息
     @PostMapping(value = "api/v1/rms/rmscarrier/updateCarrier")
     Map<String, Object> updateCarrier(@RequestBody(required = false) Map<String, Object> map);

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

@@ -140,4 +140,8 @@ public interface UniversalMapper {
     Map<String, Object> getRmsCarrierByCarrierSsoId(String carrierSsoId);
 
     List<Map<String, Object>> getCapacityType(Map<String, Object> mapValue);
+
+    Integer getPlanCount();
+
+
 }

src/main/resources/application-dev.yml

@@ -35,5 +35,6 @@ openfeign:
     url: ${RMSFEIGN_HRL:localhost:8014}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
+
 server:
   port: 8019

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -752,6 +752,19 @@
         select RCT.CAPACITY_TYPE_ID "capacityTypeId",
                RCT.CAPACITY_TYPE_NAME "capacityTypeName"
         from RMS_CAPACITY_TYPE RCT
-        where instr( RCT.CAPACITY_TYPE_NAME, #{index}) > 0
+        <if test="index!=null">
+         where   instr( RCT.CAPACITY_TYPE_NAME, #{index}) > 0
+        </if>
+
+    </select>
+    <select id="getPlanCount" resultType="java.lang.Integer">
+        SELECT
+            COUNT( * )
+        FROM
+            ( SELECT AIR2.REQUIREMENT_ID FROM AMSTRUCK_INWARD_REQUIREMENT AIR2 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP ON AIR2.REQUIREMENT_ID = ARP.REQUIREMENT_ID WHERE ARP.PLAN_ID IS NULL ) AIRP
+                LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR ON AIR.REQUIREMENT_ID = AIRP.REQUIREMENT_ID
+        WHERE
+            AIR.REQUIREMENT_STATUS = 2
+          AND AIR.DELETED = 0
     </select>
 </mapper>