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

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

@@ -998,4 +998,10 @@ public class AMScontroller  extends BaseRESTfulController {
     public Map<String, Object> dispatch() throws Exception {
         return amsFeign.dispatch();
     }
+
+    @ApiOperation("强制修改")
+    @PostMapping("/forcedModification")
+    public Map<String, Object> forcedModification(@RequestBody Map<String, Object> params) throws Exception {
+        return amsFeign.forcedModification(params);
+    }
 }

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

@@ -656,6 +656,7 @@ public class RMScontroller extends BaseRESTfulController {
             item.put("personnelName",item.get("姓名"));
             item.put("personnelPhone",item.get("手机"));
             item.put("identityCard",item.get("身份证号"));
+            item.put("roleName",item.get("角色"));
         }
         map.put("userId",userId);
         map.put("userName",userName);

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

@@ -355,4 +355,7 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/dispatch")
     Map<String, Object> dispatch();
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/forcedModification")
+    Map<String, Object> forcedModification(Map<String, Object> params);
 }

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

@@ -1699,6 +1699,9 @@
         RP.PERSONNEL_ID "value",
         RP.PERSONNEL_NAME "label",
         RP.PERSONNEL_NAME "text",
+        <if test="driverCapacityId!=null and driverCapacityId!=''">
+            RCD.group_number "groupNumber",
+        </if>
         'personnelName' "prop"
         <if test="capacityId!=null and capacityId!=''">
             ,NVL(T ."countNumber",0) "countNumber"
@@ -1718,7 +1721,13 @@
             GROUP BY DRIVER_ID
             ) T ON T."driverId" = RP .PERSONNEL_ID
         </if>
+        <if test="driverCapacityId!=null and driverCapacityId!=''">
+            LEFT JOIN RMS_CAPACITY_DRIVER RCD on rcd.personnel_id = RP.personnel_id
+        </if>
         WHERE RP.DELETED != -1
+        <if test="driverCapacityId!=null and driverCapacityId!=''">
+            and RCD.capacity_id = #{driverCapacityId}
+        </if>
         <if test="isNC!=null">
             AND RP.SOURCE_ID IS NOT NULL
         </if>
@@ -1766,6 +1775,9 @@
             RP.PERSONNEL_ID "value",
             RP.PERSONNEL_NAME "label",
             RP.PERSONNEL_NAME "text",
+            <if test="driverCapacityId!=null and driverCapacityId!=''">
+                RCD.group_number "groupNumber",
+            </if>
             'personnelName' "prop"
             <if test="capacityId!=null and capacityId!=''">
                 ,NVL(T ."countNumber",0) "countNumber"
@@ -1784,6 +1796,9 @@
                 GROUP BY DRIVER_ID
                 ) T ON T."driverId" = RP .PERSONNEL_ID
             </if>
+            <if test="driverCapacityId!=null and driverCapacityId!=''">
+                LEFT JOIN RMS_CAPACITY_DRIVER RCD on rcd.personnel_id = RP.personnel_id
+            </if>
             WHERE RP.PERSONNEL_ID in
             <foreach collection="id" item="item"  open="(" close=")" separator="," >
                 #{item}