1.修改

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

@@ -175,4 +175,20 @@ public class EMSController extends BaseRESTfulController {
         return emsFeign.faildMsg();
     }
 
+
+    @ApiOperation(value = "展示年月工资绩效")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getemssalarydetailsMonthyear")
+    Map<String, Object> getemssalarydetailsMonthyear(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize
+    ) {
+        return emsFeign.getemssalarydetailsMonthyear(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
 }

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

@@ -239,4 +239,11 @@ public class UniversalController extends BaseRESTfulController {
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, material);
         return success(pageList);
     }
+
+    @ApiOperation("根据车型获取剩余车辆")
+    @PostMapping("/getcountCar")
+    public RESTfulResult getcountCar(@RequestBody Map<String,Object> map) {
+        List<Map<String, Object>> material = universalMapper.getcountCar(map);
+        return success(material);
+    }
 }

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

@@ -62,6 +62,14 @@ public interface EmsFeign {
 
     @PostMapping("api/v1/ems/emsdetailsorders/faildMsg")
     Map<String, Object> faildMsg();
+
+
+    @PostMapping("api/v1/ems/emssalarydetailss/getemssalarydetailsMonthyear")
+    Map<String, Object> getemssalarydetailsMonthyear(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize
+    );
 }
 
 

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

@@ -76,4 +76,7 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getMaterial(Map<String, Object> map);
 
+
+    //获取车型剩余的空闲车辆和已经派车的数量
+    List<Map<String, Object>> getcountCar(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/util/FtpFileUtil.java

@@ -32,7 +32,7 @@ public class FtpFileUtil {
      */
 
     // String FTP_ADDRESS;
-    private String FTP_ADDRESS = "172.16.90.238";
+    private String FTP_ADDRESS = "172.16.90.202";
 
     /**
      * 端口号
@@ -44,12 +44,12 @@ public class FtpFileUtil {
      * 用户名
      */
 
-    private String FTP_USERNAME = "ftptest";
+    private String FTP_USERNAME = "ftpuser";
     /**
      * 密码
      */
 
-    private String FTP_PASSWORD = "at286315";
+    private String FTP_PASSWORD = "123456";
 
     private FTPClient ftpClient = new FTPClient();
     private static final String SPOT = ".";

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

@@ -1077,4 +1077,36 @@
             AND APC.TRANS_PLAN_ID =#{transPlanId}
         </where>
     </select>
+
+    <select id="getcountCar" resultType = "java.util.Map">
+        SELECT
+            RCAOLD.a "oldcar",(RCA.b-RCAOLD.a)"nowcar"
+        FROM
+            (
+                SELECT
+                    COUNT( RCA.CAPACITY_NUMBER ) a
+                FROM
+                    RMS_CAPACITY RCA
+                        LEFT JOIN OMS_TRANS_ORDER OTO ON RCA.CAPACITY_ID = OTO.CAPACITY_ID
+
+                WHERE
+                    OTO.TRANS_ORDER_ID IS NOT NULL
+                  AND OTO.DELETED = 5
+                  <if test="capacityTypeId != null and capacityTypeId != ''" >
+                  AND RCA.CAPACITY_TYPE_ID = #{capacityTypeId}
+                  </if>
+                  AND RCA.DELETED !=  1
+            ) RCAOLD,
+            ( SELECT
+                  COUNT( RCA.CAPACITY_NUMBER) b
+              FROM
+                  RMS_CAPACITY RCA
+              WHERE
+             <if test="capacityTypeId != null and capacityTypeId != ''" >
+            RCA.CAPACITY_TYPE_ID = #{capacityTypeId}
+             AND
+            </if>
+                RCA.DELETED !=  1
+            ) RCA
+    </select>
 </mapper>