1.工资合同

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

@@ -28,11 +28,11 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("${api.version}/ams")
-public class AMScontroller{
+public class AMScontroller {
     @Autowired
     AmsFeign amsFeign;
 
-    @ApiOperation(value="展示采购订单详情")
+    @ApiOperation(value = "展示采购订单详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -40,42 +40,42 @@ public class AMScontroller{
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/getPurchaseOrderList")
-    Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                     Integer apiId,
-                                     Integer pageNum,
-                                     Integer pageSize
-    ){
-        return amsFeign.getPurchaseOrderList(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize
+    ) {
+        return amsFeign.getPurchaseOrderList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="同步采购订单")
+    @ApiOperation(value = "同步采购订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/purchaseOrderSync")
-    @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"采购订单"})
-    public Map<String, Object> purchaseOrderSync(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"采购订单"})
+    public Map<String, Object> purchaseOrderSync(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseOrderSync(map);
     }
 
-    @ApiOperation(value="新增采购订单")
+    @ApiOperation(value = "新增采购订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/purchaseOrderAdd")
-    @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"采购订单"})
-    public Map<String, Object> purchaseOrderAdd(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"采购订单"})
+    public Map<String, Object> purchaseOrderAdd(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseOrderAdd(map);
     }
 
-    @ApiOperation(value="修改采购订单")
+    @ApiOperation(value = "修改采购订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/purchaseOrderUpdate")
-    @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"采购订单"})
-    public Map<String, Object> purchaseOrderUpdate(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"采购订单"})
+    public Map<String, Object> purchaseOrderUpdate(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseOrderUpdate(map);
     }
 
-    @ApiOperation(value="删除采购订单")
+    @ApiOperation(value = "删除采购订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/purchaseOrderDelete")
-    @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"采购订单"})
+    @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"采购订单"})
     public Map<String, Object> purchaseOrderDelete(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseOrderDelete(map);
     }
@@ -86,8 +86,8 @@ public class AMScontroller{
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
     })
     @PostMapping(value = "/purchaseRequirementAdd")
-    @LogAround(foreignKeys = {"transRequirementId"},foreignKeyTypes = {"采购需求"})
-    public Map<String, Object> purchaseRequirementAdd(@RequestBody(required = false) Map<String ,Object> map) {
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"采购需求"})
+    public Map<String, Object> purchaseRequirementAdd(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseRequirementAdd(map);
     }
 
@@ -96,8 +96,8 @@ public class AMScontroller{
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
     })
     @PostMapping(value = "/purchaseRequirementUpdate")
-    @LogAround(foreignKeys = {"transRequirementId"},foreignKeyTypes = {"采购需求"})
-    public Map<String, Object> purchaseRequirementUpdate(@RequestBody(required = false) Map<String ,Object> map) {
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"采购需求"})
+    public Map<String, Object> purchaseRequirementUpdate(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseRequirementUpdate(map);
     }
 
@@ -106,12 +106,12 @@ public class AMScontroller{
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
     })
     @PostMapping(value = "/purchaseRequirementChange")
-    @LogAround(foreignKeys = {"transRequirementId"},foreignKeyTypes = {"采购需求"})
-    public Map<String, Object> purchaseRequirementChange(@RequestBody(required = false) Map<String ,Object> map) {
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"采购需求"})
+    public Map<String, Object> purchaseRequirementChange(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseRequirementChange(map);
     }
 
-    @ApiOperation(value="展示采购需求详情")
+    @ApiOperation(value = "展示采购需求详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -119,15 +119,15 @@ public class AMScontroller{
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/getPurchaseRequirementList")
-    Map<String, Object> getPurchaseRequirementList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize
-    ){
-        return amsFeign.getPurchaseRequirementList(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    Map<String, Object> getPurchaseRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize
+    ) {
+        return amsFeign.getPurchaseRequirementList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="展示采购计划详情")
+    @ApiOperation(value = "展示采购计划详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -135,12 +135,12 @@ public class AMScontroller{
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/getPurchasePlanList")
-    Map<String, Object> getPurchasePlanList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   Integer apiId,
-                                                   Integer pageNum,
-                                                   Integer pageSize
-    ){
-        return amsFeign.getPurchasePlanList(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    Map<String, Object> getPurchasePlanList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize
+    ) {
+        return amsFeign.getPurchasePlanList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "采购计划新增接口", notes = "采购计划新增接口")
@@ -148,20 +148,20 @@ public class AMScontroller{
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
     })
     @PostMapping(value = "/purchasePlanAdd")
-    @LogAround(foreignKeys = {"transPlanId"},foreignKeyTypes = {"采购计划"})
-    public Map<String, Object> purchasePlanAdd(@RequestBody(required = false) Map<String ,Object> map) {
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> purchasePlanAdd(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchasePlanAdd(map);
     }
 
-    @ApiOperation(value="同步销售订单")
+    @ApiOperation(value = "同步销售订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/saleOrderSync")
     @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"销售订单"})
-    public Map<String, Object> saleOrderSync(@RequestBody(required = false) Map<String ,Object> map) {
+    public Map<String, Object> saleOrderSync(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.saleOrderSync(map);
     }
 
-    @ApiOperation(value="承运合同")
+    @ApiOperation(value = "承运合同")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -169,44 +169,91 @@ public class AMScontroller{
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/getAmsTransPriceList")
-    public Map<String, Object> getAmsTransPriceList(@RequestBody(required = false) Map<String ,Object> map,Integer apiId,
+    public Map<String, Object> getAmsTransPriceList(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
                                                     Integer pageNum,
                                                     Integer pageSize) {
-        return amsFeign.list(map==null ?new HashMap<>():map,apiId,pageNum,pageSize);
+        return amsFeign.list(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
-    @ApiOperation(value="新增承运合同")
+
+    @ApiOperation(value = "新增承运合同")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
-    @LogAround(foreignKeys = {"priceId"},foreignKeyTypes = {"承运合同"})
+    @LogAround(foreignKeys = {"priceId"}, foreignKeyTypes = {"承运合同"})
     @PostMapping("/")
-    public  Map<String, Object>  insertTransPrice(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
+    public Map<String, Object> insertTransPrice(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
 
-        if (!map.isEmpty()){
-            if (!map.get("priceDate").toString().isEmpty()){
-                SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
+        if (!map.isEmpty()) {
+            if (!map.get("priceDate").toString().isEmpty()) {
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
                 Date priceDate = simpleDateFormat.parse(map.get("priceDate").toString());
-                map.put("priceDate",priceDate);
+                map.put("priceDate", priceDate);
             }
         }
-        map.put("insertUsername",map.get("userName").toString());
-               return  amsFeign.add(map);
+        map.put("insertUsername", map.get("userName").toString());
+        return amsFeign.add(map);
     }
 
-    @ApiOperation(value="修改承运合同")
+    @ApiOperation(value = "修改承运合同")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PutMapping(value = "/{id}")
-    @LogAround(foreignKeys = {"priceId"},foreignKeyTypes = {"承运合同"})
-    public Map<String, Object> purchaseOrderUpdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map){
-        map.put("updateUsername",map.get("userName").toString());
-        return amsFeign.update(id,map);
+    @LogAround(foreignKeys = {"priceId"}, foreignKeyTypes = {"承运合同"})
+    public Map<String, Object> purchaseOrderUpdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map) {
+        map.put("updateUsername", map.get("userName").toString());
+        return amsFeign.update(id, map);
     }
 
-    @ApiOperation(value="承运合同逻辑删除")
+    @ApiOperation(value = "承运合同逻辑删除")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PutMapping(value = "/logicdelete")
-    @LogAround(foreignKeys = {"priceId"},foreignKeyTypes = {"承运合同"})
-    public Map<String, Object> purchaseOrderLogicDelete(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"priceId"}, foreignKeyTypes = {"承运合同"})
+    public Map<String, Object> purchaseOrderLogicDelete(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.logicdelete(map);
     }
 
+    //======================>工资合同
+    @ApiOperation(value = "工资合同")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", 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 = "/getSalaryContrac")
+    public Map<String, Object> getAmsSalaryContracList(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize) {
+        return amsFeign.getAmsSalaryContracList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value = "新增工资合同")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"contractId"}, foreignKeyTypes = {"工资合同"})
+    @PostMapping("/insertSalaryContrac")
+    public Map<String, Object> insertAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
+        if (!map.isEmpty()) {
+            if (!map.get("contractSignDate").toString().isEmpty()) {
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                Date contractSignDate = simpleDateFormat.parse(map.get("contractSignDate").toString());
+                map.put("contractSignDate", contractSignDate);
+            }
+        }
+        map.put("insertUsername", map.get("userName").toString());
+        return amsFeign.insertAmsSalaryContrac(map);
+    }
+
+    @ApiOperation(value = "修改工资合同")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/updateSalaryContrac/{id}")
+    @LogAround(foreignKeys = {"contractId"}, foreignKeyTypes = {"工资合同"})
+    public Map<String, Object> updateAmsSalaryContrac(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map) {
+        map.put("updateUsername", map.get("userName").toString());
+        return amsFeign.updateAmsSalaryContrac(id, map);
+    }
+
+    @ApiOperation(value = "工资合同逻辑删除")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/SalaryContraclogicdelete")
+    @LogAround(foreignKeys = {"contractId"}, foreignKeyTypes = {"工资合同"})
+    public Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.logicdeleteAmsSaalryContrac(map);
+    }
 
 }

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

@@ -103,6 +103,16 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输岗位信息")
+    @GetMapping("/getJobInfosByLike")
+    public RESTfulResult getrmsrmsjobinfosBylike(String index,String id) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("index",index);
+        map.put("id",id);
+        List<Map<String, Object>> list = universalMapper.getrmsrmsjobinfosBylike(map);
+        return success(list);
+    }
+
     @ApiOperation("上传文件通用方法,返回成功后的url")
     @PostMapping("/uploadFile")
     public RESTfulResult uploadFile(MultipartRequest request) throws Exception {

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

@@ -76,4 +76,20 @@ public interface AmsFeign {
 
     @PutMapping("api/v1/ams/amstransprices/logicdelete")
     Map<String, Object> logicdelete(@RequestBody(required = false) Map<String, Object> map);
+
+   // =============================》工资合同
+   @PostMapping("api/v1/ams/amssalarycontracts/getSalaryContrac")
+   Map<String, Object> getAmsSalaryContracList(@RequestBody(required = false) Map<String, Object> map,@RequestParam  Integer apiId,
+                            @RequestParam  Integer pageNum,
+                            @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/ams/amssalarycontracts/insert")
+    Map<String, Object> insertAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/ams/amssalarycontracts/{id}")
+    Map<String, Object> updateAmsSalaryContrac(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/ams/amssalarycontracts/logicdelete")
+    Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map);
+
 }

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

@@ -26,6 +26,8 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getPersonnelByLike(Map<String, Object> map);
 
+    List<Map<String, Object>> getrmsrmsjobinfosBylike(Map<String, Object> map);
+
 
     List<String> getColumnNoRoutList(Map<String, Object> map);
 

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

@@ -11,31 +11,25 @@
     </sql>
 
 
-<!--   查询所有的汽车衡  -->
+    <!--   查询所有的汽车衡  -->
     <select id="getAllCalculateMes" resultType="java.util.Map">
-        select
-            RTC.TRUCK_CALCULATE_ID "id",
-            RTC.TRUCK_CALCULATE_ID "value",
-            RTC.TRUCK_CALCULATE_NUMBER "label"
-        from
-            RMS_TRUCK_CALCULATE RTC
+        select RTC.TRUCK_CALCULATE_ID     "id",
+               RTC.TRUCK_CALCULATE_ID     "value",
+               RTC.TRUCK_CALCULATE_NUMBER "label"
+        from RMS_TRUCK_CALCULATE RTC
     </select>
 
     <select id="getAllGatepost" resultType="java.util.Map">
-        select
-            GATEPOST_ID "id",
-            GATEPOST_ID "value",
-            GATEPOST_NAME "label"
-        from
-            RMS_GATEPOST
+        select GATEPOST_ID   "id",
+               GATEPOST_ID   "value",
+               GATEPOST_NAME "label"
+        from RMS_GATEPOST
     </select>
     <select id="getAllWareHouse" resultType="java.util.Map">
-        select
-            WAREHOUSE_ID "id",
-            WAREHOUSE_ID "value",
-            WAREHOUSE_NAME "label"
-        from
-            RMS_WAREHOUSE
+        select WAREHOUSE_ID   "id",
+               WAREHOUSE_ID   "value",
+               WAREHOUSE_NAME "label"
+        from RMS_WAREHOUSE
     </select>
     <select id="getColumnNoRoutList" resultType="java.lang.String" parameterType="map">
         select DTCR.COLUMN_NAME from DIL_TABLE_COLUMN_ROLE DTCR
@@ -49,7 +43,7 @@
     </select>
     <select id="getColumnShowData" resultType="java.util.Map" parameterType="map">
         SELECT DTCR.COLUMN_NAME "key",
-               DTCR.COLUMN_NAME "label"
+        DTCR.COLUMN_NAME "label"
         FROM DIL_TABLE_COLUMN_ROLE DTCR
         LEFT JOIN DIL_ROLE_ORGCODE_TABLE DROT on DTCR.PRIMARY_ID = DROT.COLUMN_ID
         WHERE
@@ -80,26 +74,24 @@
         SELECT DTCR.COLUMN_NAME "key",
                DTCR.COLUMN_NAME "label"
         FROM DIL_TABLE_COLUMN_ROLE DTCR
-        WHERE
-            DTCR.TABLE_NAME = #{tableName}
+        WHERE DTCR.TABLE_NAME = #{tableName}
     </select>
     <select id="getColumnAllScheme" resultType="java.util.LinkedHashMap" parameterType="map">
-      SELECT
-            distinct
-             DROT.PRIMARY_NAME "schemeName",
-             DROT.ENABLE_STATUS "enableStatus" ,
-             DROT.USER_NAME "userName",
-             DROT.ORG_CODE  "orgCode",
-             DTCR.TABLE_NAME "tableName"
-      FROM DIL_ROLE_ORGCODE_TABLE DROT
-      LEFT JOIN DIL_TABLE_COLUMN_ROLE DTCR on DROT.COLUMN_ID = DTCR.PRIMARY_ID
-      WHERE DROT.USER_NAME = #{userName}
-      AND DROT.ORG_CODE = #{orgCode}
-      AND DTCR.TABLE_NAME = #{tableName}
-      AND NVL(DROT.PRIMARY_NAME,'') != '默认方案'
+        SELECT distinct DROT.PRIMARY_NAME  "schemeName",
+                        DROT.ENABLE_STATUS "enableStatus",
+                        DROT.USER_NAME     "userName",
+                        DROT.ORG_CODE      "orgCode",
+                        DTCR.TABLE_NAME    "tableName"
+        FROM DIL_ROLE_ORGCODE_TABLE DROT
+                 LEFT JOIN DIL_TABLE_COLUMN_ROLE DTCR on DROT.COLUMN_ID = DTCR.PRIMARY_ID
+        WHERE DROT.USER_NAME = #{userName}
+          AND DROT.ORG_CODE = #{orgCode}
+          AND DTCR.TABLE_NAME = #{tableName}
+          AND NVL(DROT.PRIMARY_NAME, '') != '默认方案'
     </select>
     <select id="getWlUrl" resultType="java.lang.String">
-        SELECT DL.VERSION_VALUE FROM DIL_VERSION DL
+        SELECT DL.VERSION_VALUE
+        FROM DIL_VERSION DL
         WHERE DL.VERSION_ID = 11
     </select>
 
@@ -107,26 +99,26 @@
     <!--  边输边查公司  -->
     <select id="getCompanyMesByLike" resultType="java.util.Map">
         select * from(
-            select
-            RC.COMPANY_ID "companyId",
-            RC.COMPANY_NAME "companyName",
-            RC.SSO_ID "ssoId",
-            RC.SSO_CODE "ssoCode",
-            RC.COMPANY_ID "id",
-            RC.COMPANY_ID "value",
-            RC.COMPANY_NAME "label"
-            from RMS_COMPANY RC
-            where DELETED = 0
+        select
+        RC.COMPANY_ID "companyId",
+        RC.COMPANY_NAME "companyName",
+        RC.SSO_ID "ssoId",
+        RC.SSO_CODE "ssoCode",
+        RC.COMPANY_ID "id",
+        RC.COMPANY_ID "value",
+        RC.COMPANY_NAME "label"
+        from RMS_COMPANY RC
+        where DELETED = 0
         )
         <where>
             <if test="companyType!=null and companyType!=''">
-                AND   "companyType" = #{companyType}
+                AND "companyType" = #{companyType}
             </if>
             <if test="index!=null and index!=''">
-                AND   REGEXP_LIKE("label", #{index})
+                AND REGEXP_LIKE("label", #{index})
             </if>
             <if test="id!=null">
-                OR   "id" = #{id}
+                OR "id" = #{id}
             </if>
         </where>
         FETCH NEXT 100 ROWS ONLY
@@ -144,10 +136,10 @@
         )
         <where>
             <if test="index!=null and index!=''">
-                AND   REGEXP_LIKE("label", #{index})
+                AND REGEXP_LIKE("label", #{index})
             </if>
             <if test="id!=null">
-                OR   "id" = #{id}
+                OR "id" = #{id}
             </if>
         </where>
         FETCH NEXT 100 ROWS ONLY
@@ -165,10 +157,10 @@
         )
         <where>
             <if test="index!=null and index!=''">
-                AND   REGEXP_LIKE("label", #{index})
+                AND REGEXP_LIKE("label", #{index})
             </if>
             <if test="id!=null">
-                OR   "id" = #{id}
+                OR "id" = #{id}
             </if>
         </where>
         FETCH NEXT 100 ROWS ONLY
@@ -187,13 +179,13 @@
         )
         <where>
             <if test="operationPointType!=null and operationPointType!=''">
-                AND   REGEXP_LIKE("operationPointType", #{operationPointType})
+                AND REGEXP_LIKE("operationPointType", #{operationPointType})
             </if>
             <if test="index!=null and index!=''">
-                AND   REGEXP_LIKE("label", #{index})
+                AND REGEXP_LIKE("label", #{index})
             </if>
             <if test="id!=null">
-                OR   "id" = #{id}
+                OR "id" = #{id}
             </if>
         </where>
         FETCH NEXT 100 ROWS ONLY
@@ -211,12 +203,33 @@
         )
         <where>
             <if test="index!=null and index!=''">
-                AND   REGEXP_LIKE("label", #{index})
+                AND REGEXP_LIKE("label", #{index})
+            </if>
+            <if test="id!=null">
+                OR "id" = #{id}
+            </if>
+        </where>
+        FETCH NEXT 100 ROWS ONLY
+    </select>
+    <select id="getrmsrmsjobinfosBylike" resultType="java.util.Map">
+        select * from(
+        select
+        RC.JOB_ID "jboId",
+        RC.JOB_NAME "jobName",
+        RC.JOB_ID "id",
+        RC.JOB_ID "value",
+        RC.JOB_NAME "label"
+        from RMS_JOB_INFO RC
+        where DELETED = 0
+        )
+        <where>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE("label", #{index})
             </if>
-              <if test="id!=null">
-                OR   "id" = #{id}
+            <if test="id!=null">
+                OR "id" = #{id}
             </if>
         </where>
         FETCH NEXT 100 ROWS ONLY
     </select>
-</mapper>
+        </mapper>