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

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

@@ -92,6 +92,14 @@ public class AMScontroller {
         return amsFeign.purchaseRequirementAdd(map);
     }
 
+    @ApiOperation(value = "同步生产调拨订单")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/productionOrderSync")
+    @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"采购订单"})
+    public Map<String, Object> productionOrderSync(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.productionOrderSync(map);
+    }
+
     @ApiOperation(value = "生产需求新增接口", notes = "生产需求新增接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
@@ -677,5 +685,38 @@ public class AMScontroller {
         return amsFeign.requirementApproveDetails(map);
     }
 
+    @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 = "/getOrderStatus")
+    RESTfulResult getOrderStatus(@RequestBody(required = false) Map<String, Object> map,
+                                                             Integer apiId,
+                                                             Integer pageNum,
+                                                             Integer pageSize
+    ) {
+        return amsFeign.getOrderStatus(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
 
+    }
+
+
+    @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 = "/getamsproductionordersyncs")
+    RESTfulResult getamsproductionordersyncs(@RequestBody(required = false) Map<String, Object> map,
+                                 Integer apiId,
+                                 Integer pageNum,
+                                 Integer pageSize
+    ) {
+        return amsFeign.getamsproductionordersyncs(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+
+    }
 }

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

@@ -107,22 +107,25 @@ public class RMScontroller extends BaseRESTfulController {
         //获取Excel中包含的对象数组
         List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
         map.put("list", list);
-        Set<String> materialTypeSet = new HashSet<>();
+        Set<String> set = new HashSet<>();
         for (Map<String, Object> item : list) {
             //校验行
             if(
                     item.get("名称")==null || item.get("名称").equals("")
+                    || item.get("编码")==null || item.get("编码").equals("")
+                    || item.get("NC主键")==null || item.get("NC主键").equals("")
             ){
-                throw new Exception("单元格数据异常（名称），请检查模板或数据是否正确!");
+                throw new Exception("单元格数据异常，请检查模板或数据是否正确!");
             }
-            materialTypeSet.add(item.get("名称").toString());
+            set.add(item.get("NC主键").toString());
+            map.put(item.get("NC主键").toString(),item);
         }
         //去重
-        String[] materialTypes = materialTypeSet.toArray(new String[0]);
-        if (materialTypes.length != list.size()) {
-            throw new Exception("名称不允许重复！");
+        String[] setList = set.toArray(new String[0]);
+        if (setList.length != list.size()) {
+            throw new Exception("NC主键不允许重复！");
         }
-        map.put("materialTypes",materialTypes);
+        map.put("setList",setList);
         map.put("userId",userId);
         map.put("userName",userName);
         map.put("remark",remark);
@@ -160,6 +163,13 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getMaterialTypeById(id);
     }
 
+    @ApiOperation(value = "物资树形结构", notes = "")
+    @ApiImplicitParam(name = "rmsMaterialType", value = "rmsMaterialType", required = true, dataType = "rmsMaterialType")
+    @PostMapping(value = "/getMaterialTree")
+    public Map<String, Object> getMaterialTree(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.getMaterialTree(map);
+    }
+
 
     //====================物资
     @ApiOperation(value = "获取物资列表")
@@ -218,6 +228,41 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.syncMaterial(map);
     }
 
+    @ApiOperation("导入物资")
+    @PostMapping("/importMaterial")
+    public RESTfulResult importMaterial(@RequestBody MultipartFile file,
+                                                 String remark,
+                                                 String userId,
+                                                 String userName) throws Exception {
+        Map<String, Object> map = new HashMap<>();
+        //获取Excel中包含的对象数组
+        List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
+        map.put("list", list);
+        Set<String> set = new HashSet<>();
+        for (Map<String, Object> item : list) {
+            //校验行
+            if(
+                    item.get("名称")==null || item.get("名称").equals("")
+                            || item.get("编码")==null || item.get("编码").equals("")
+                            || item.get("类型")==null || item.get("类型").equals("")
+                            || item.get("NC主键")==null || item.get("NC主键").equals("")
+            ){
+                throw new Exception("单元格数据异常，请检查模板或数据是否正确!");
+            }
+            set.add(item.get("NC主键").toString());
+            map.put(item.get("NC主键").toString(),item);
+        }
+        //去重
+        String[] setList = set.toArray(new String[0]);
+        if (setList.length != list.size()) {
+            throw new Exception("NC主键不允许重复！");
+        }
+        map.put("setList",setList);
+        map.put("userId",userId);
+        map.put("userName",userName);
+        return rmsFeign.importMaterial(map);
+    }
+
     //====================作业点
     @ApiOperation(value = "获取作业点列表")
     @ApiImplicitParams({
@@ -267,31 +312,31 @@ public class RMScontroller extends BaseRESTfulController {
                                          String userName) throws Exception {
         Map<String, Object> map = new HashMap<>();
         //获取Excel中包含的对象数组
-        List<Map<String, Object>> excelList = ExcelToolUtils.getExcelList(file, 0);
-        map.put("list", excelList);
+        List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
+        map.put("list", list);
         Set<String> set = new HashSet<>();
-        for (Map<String, Object> item : excelList) {
+        for (Map<String, Object> item : list) {
             //校验行
             if(
-                    item.get("作业点名称")==null || item.get("作业点名称").equals("")
-                            || item.get("作业点类型")==null || item.get("作业点类型").equals("")
-                            || item.get("作业点状态")==null || item.get("作业点状态").equals("")
-                            || item.get("环保标准")==null || item.get("环保标准").equals("")
+                    item.get("名称")==null || item.get("名称").equals("")
+                            || item.get("编码")==null || item.get("编码").equals("")
+                            || item.get("类型")==null || item.get("类型").equals("")
+                            || item.get("NC主键")==null || item.get("NC主键").equals("")
                             || item.get("所属单位")==null || item.get("所属单位").equals("")
             ){
-                throw new Exception("单元格数据异常（作业点名称/作业点类型/作业点状态/环保标准/所属单位），请检查模板或数据是否正确!");
+                throw new Exception("单元格数据异常，请检查模板或数据是否正确!");
             }
             //隔开用于查询是否数据库存在
-            set.add(item.get("作业点名称").toString());
+            set.add(item.get("NC主键").toString());
             //key-value结构方便数据库去重后获取值
-            map.put(item.get("作业点名称").toString(),item);
+            map.put(item.get("NC主键").toString(),item);
         }
         //去重
-        String[] list = set.toArray(new String[0]);
-        if (list.length != excelList.size()) {
-            throw new Exception("手机号不允许重复！");
+        String[] setList = set.toArray(new String[0]);
+        if (setList.length != list.size()) {
+            throw new Exception("NC主键不允许重复！");
         }
-        map.put("list",list);
+        map.put("setList",setList);
         map.put("userId",userId);
         map.put("userName",userName);
         return rmsFeign.importOperationPoint(map);
@@ -383,23 +428,23 @@ public class RMScontroller extends BaseRESTfulController {
             //校验行
             if(
                     item.get("姓名")==null || item.get("姓名").equals("")
-                            || item.get("岗位")==null || item.get("岗位").equals("")
-                            || item.get("联系电话")==null || item.get("联系电话").equals("")
-                            || item.get("身份证号码")==null || item.get("身份证号码").equals("")
+                            || item.get("编码")==null || item.get("编码").equals("")
+                            || item.get("身份证号")==null || item.get("身份证号").equals("")
                             || item.get("所属单位")==null || item.get("所属单位").equals("")
-                            || item.get("授权角色")==null || item.get("授权角色").equals("")
+                            || item.get("NC主键")==null || item.get("NC主键").equals("")
             ){
-                throw new Exception("单元格数据异常（姓名/岗位/联系电话/身份证号码/所属单位/授权角色），请检查模板或数据是否正确!");
+                throw new Exception("单元格数据异常，请检查模板或数据是否正确!");
             }
             //隔开用于查询是否数据库存在
-            set.add(item.get("联系电话").toString() +"-"+item.get("所属单位").toString());
+            set.add(item.get("NC主键").toString() + item.get("所属单位").toString());
+            map.put(item.get("NC主键").toString() + item.get("所属单位").toString(),item);
         }
         //去重
-        String[] array = set.toArray(new String[0]);
-        if (array.length != list.size()) {
-            throw new Exception("手机号-所属单位不允许重复！");
+        String[] setList = set.toArray(new String[0]);
+        if (setList.length != list.size()) {
+            throw new Exception("NC主键-所属单位不允许重复！");
         }
-        map.put("list", list);
+        map.put("setList", setList);
         map.put("userId",userId);
         map.put("userName",userName);
         return rmsFeign.importPersonnel(map);
@@ -463,6 +508,42 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.syncCompany(map);
     }
 
+    @ApiOperation("导入公司")
+    @PostMapping("/importCompany")
+    public RESTfulResult importCompany(@RequestBody MultipartFile file,
+                                                 String remark,
+                                                 String userId,
+                                                 String userName) throws Exception {
+        Map<String, Object> map = new HashMap<>();
+        //获取Excel中包含的对象数组
+        List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
+        map.put("list", list);
+        Set<String> set = new HashSet<>();
+        for (Map<String, Object> item : list) {
+            //校验行
+            if(
+                    item.get("名称")==null || item.get("名称").equals("")
+                    || item.get("编码")==null || item.get("编码").equals("")
+                    || item.get("类型")==null || item.get("类型").equals("")
+                    || item.get("NC主键")==null || item.get("NC主键").equals("")
+            ){
+                throw new Exception("单元格数据异常，请检查模板或数据是否正确!");
+            }
+            set.add(item.get("NC主键").toString()+item.get("类型").toString());
+            map.put(item.get("NC主键").toString()+item.get("类型").toString(),item);
+        }
+        //去重
+        String[] setList = set.toArray(new String[0]);
+        if (setList.length != list.size()) {
+            throw new Exception("NC主键-类型不允许重复！");
+        }
+        map.put("setList",setList);
+        map.put("userId",userId);
+        map.put("userName",userName);
+        map.put("remark",remark);
+        return rmsFeign.importCompany(map);
+    }
+
     //运力
     @ApiOperation(value = "新增运力信息", notes = "根据rmsCapacity对象创建")
     @ApiImplicitParam(name = "rmsCapacity", value = "详细实体rmsCapacity", required = true, dataType = "rmsCapacity")

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

@@ -103,7 +103,6 @@ public class UniversalController extends BaseRESTfulController {
     @ApiModelProperty(value = "边输边查人员")
     @PostMapping("/getPersonnelByLike")
     public RESTfulResult getPersonnelByLike(@RequestBody(required = false) Map<String,Object> map) {
-        DataChange.getMonthStartEnd(map);
         List<Map<String, Object>> list = universalMapper.getPersonnelByLike(map);
         return success(list);
     }

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

@@ -1,9 +1,12 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.annotaion.LogAround;
+import com.steerinfo.dil.feign.ATWmsFeign;
 import com.steerinfo.dil.feign.WMSFeign;
 import com.steerinfo.dil.model.WmsSlmDlivDir;
 import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -32,6 +35,12 @@ public class WMSController extends BaseRESTfulController {
     @Autowired
     WMSFeign wmsFeign;
 
+    @Autowired
+    ATWmsFeign atWmsFeign;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
     @ApiOperation(value = "查询", notes = "分页查询销售订单")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "params", value = "查询条件", required = false, dataType = "HashMap"),
@@ -223,5 +232,108 @@ public class WMSController extends BaseRESTfulController {
     public Map<String, Object> outbound(@RequestBody(required = false) Map<String, Object> map){
         return wmsFeign.outbound(map);
     }
+
+    @PostMapping("/selectkcmx")
+    public RESTfulResult selectkcmx(@RequestBody HashMap map,
+                             Integer apiId,
+                             Integer pageNum,
+                             Integer pageSize){
+
+        if (map.get("createTime") != null) {
+            ArrayList arrayList = (ArrayList)map.get("createTime");
+            map.put("starttime", arrayList.get(0).toString());
+            map.put("endtime", arrayList.get(1).toString());
+        }
+
+         if (map.get("inDt") != null) {
+                ArrayList arrayList = (ArrayList)map.get("inDt");
+                map.put("indtstart", arrayList.get(0).toString());
+                map.put("indtend", arrayList.get(1).toString());
+        }
+        RESTfulResult selectkcmx = atWmsFeign.wuliuSelectkcmx(map, pageNum, pageSize);
+        Map<String, Object> data = (Map<String, Object>)selectkcmx.getData();
+        List<Map<String, Object>> list = (List<Map<String,Object>>)data.get("list");
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,list);
+        pageList.setTotal((int)data.get("total"));
+        return success(pageList);
+    }
+
+    @PostMapping("/selectbybatchno")
+    public RESTfulResult selectbybatchno(@RequestBody HashMap map,
+                             Integer apiId,
+                             Integer pageNum,
+                             Integer pageSize){
+
+        if (map.get("createTime") != null) {
+            ArrayList arrayList = (ArrayList)map.get("createTime");
+            map.put("starttime", arrayList.get(0).toString());
+            map.put("endtime", arrayList.get(1).toString());
+        }
+
+        if (map.get("inDt") != null) {
+            ArrayList arrayList = (ArrayList)map.get("inDt");
+            map.put("indtstart", arrayList.get(0).toString());
+            map.put("indtend", arrayList.get(1).toString());
+        }
+
+        RESTfulResult selectkcmx = atWmsFeign.wuliuSelectbybatchno(map, pageNum, pageSize);
+        Map<String, Object> data = (Map<String, Object>)selectkcmx.getData();
+        List<Map<String, Object>> list = (List<Map<String,Object>>)data.get("list");
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,list);
+        pageList.setTotal((int)data.get("total"));
+        return success(pageList);
+    }
+
+    @PostMapping("/selectbyprod")
+    public RESTfulResult selectbyprod(@RequestBody HashMap map,
+                                         Integer apiId,
+                                         Integer pageNum,
+                                         Integer pageSize){
+
+        if (map.get("createTime") != null) {
+            ArrayList arrayList = (ArrayList)map.get("createTime");
+            map.put("starttime", arrayList.get(0).toString());
+            map.put("endtime", arrayList.get(1).toString());
+        }
+
+        if (map.get("inDt") != null) {
+            ArrayList arrayList = (ArrayList)map.get("inDt");
+            map.put("indtstart", arrayList.get(0).toString());
+            map.put("indtend", arrayList.get(1).toString());
+        }
+
+        RESTfulResult selectkcmx = atWmsFeign.wuliuSelectbyprod(map, pageNum, pageSize);
+        Map<String, Object> data = (Map<String, Object>)selectkcmx.getData();
+        List<Map<String, Object>> list = (List<Map<String,Object>>)data.get("list");
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,list);
+        pageList.setTotal((int)data.get("total"));
+        return success(pageList);
+    }
+
+    @PostMapping("/selectbybuttress")
+    public RESTfulResult selectbybuttress(@RequestBody HashMap map,
+                                      Integer apiId,
+                                      Integer pageNum,
+                                      Integer pageSize){
+
+        if (map.get("createTime") != null) {
+            ArrayList arrayList = (ArrayList)map.get("createTime");
+            map.put("starttime", arrayList.get(0).toString());
+            map.put("endtime", arrayList.get(1).toString());
+        }
+
+        if (map.get("inDt") != null) {
+            ArrayList arrayList = (ArrayList)map.get("inDt");
+            map.put("indtstart", arrayList.get(0).toString());
+            map.put("indtend", arrayList.get(1).toString());
+        }
+
+        RESTfulResult selectkcmx = atWmsFeign.wuliuSelectbybuttress(map, pageNum, pageSize);
+        Map<String, Object> data = (Map<String, Object>)selectkcmx.getData();
+        List<Map<String, Object>> list = (List<Map<String,Object>>)data.get("list");
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,list);
+        pageList.setTotal((int)data.get("total"));
+        return success(pageList);
+    }
 }
 

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

@@ -0,0 +1,32 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.HashMap;
+
+@FeignClient(value = "antwms-service", url = "http://192.168.1.16:8802/")  //http://192.168.0.244:8002/
+public interface ATWmsFeign {
+
+    /**
+     * 库存查询
+     * @param parmas
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "antai.maketx/v1/wmsproductdetails/wuliuSelectkcmx")
+    RESTfulResult wuliuSelectkcmx(@RequestBody HashMap parmas, @RequestParam Integer pageNum,@RequestParam Integer pageSize);
+
+    @GetMapping(value = "antai.maketx/v1/wmsproductdetails/wuliuSelectbybatchno")
+    RESTfulResult wuliuSelectbybatchno(@RequestBody HashMap parmas, @RequestParam Integer pageNum,@RequestParam Integer pageSize);
+
+    @GetMapping(value = "antai.maketx/v1/wmsproductdetails/wuliuSelectbyprod")
+    RESTfulResult wuliuSelectbyprod(@RequestBody HashMap parmas, @RequestParam Integer pageNum,@RequestParam Integer pageSize);
+
+    @GetMapping(value = "antai.maketx/v1/wmsproductdetails/wuliuSelectbybuttress")
+    RESTfulResult wuliuSelectbybuttress(@RequestBody HashMap parmas, @RequestParam Integer pageNum,@RequestParam Integer pageSize);
+}

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

@@ -41,6 +41,10 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementAdd")
     Map<String, Object> purchaseRequirementAdd(Map<String, Object> map);
 
+
+    @PostMapping(value = "api/v1/ams/amsorders/productionOrderSync")
+    Map<String, Object> productionOrderSync(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping(value = "api/v1/ams/amstransrequirements/productionRequirementAdd")
     Map<String, Object> productionRequirementAdd(Map<String, Object> map);
 
@@ -247,4 +251,17 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements/requirementApproveDetails")
     Map<String, Object> requirementApproveDetails(@RequestBody Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amsorders/getOrderStatus")
+    RESTfulResult getOrderStatus(@RequestBody Map<String, Object> objectMap,
+                                 @RequestParam Integer apiId,
+                                 @RequestParam Integer pageNum,
+                                 @RequestParam Integer pageSize);
+
+
+    @PostMapping(value = "api/v1/ams/amsproductionordersyncs/getamsproductionordersyncs")
+    RESTfulResult getamsproductionordersyncs(@RequestBody Map<String, Object> objectMap,
+                                 @RequestParam Integer apiId,
+                                 @RequestParam Integer pageNum,
+                                 @RequestParam Integer pageSize);
+
 }

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

@@ -95,6 +95,9 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmsmaterialtype/getMaterialTypeById/{id}")
     Map<String, Object> getMaterialTypeById(@PathVariable("id") BigDecimal id);
 
+    @PostMapping(value = "api/v1/rms/rmsmaterialtype/getMaterialTree")
+    Map<String, Object> getMaterialTree(@RequestBody(required = false) Map<String, Object> map);
+
     //==============物资
     //查询物资List
     @PostMapping(value = "api/v1/rms/rmsmaterial/getMaterialList")
@@ -122,6 +125,9 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmsmaterial/syncMaterial")
     Map<String, Object> syncMaterial(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/rms/rmsmaterial/importMaterial")
+    RESTfulResult importMaterial(@RequestBody(required = false) Map<String, Object> map);
+
     //==============作业点
     //查询作业点List
     @PostMapping(value = "api/v1/rms/rmsoperationpoint/getOperationPointList")
@@ -207,6 +213,11 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscompany/syncCompany")
     Map<String, Object> syncCompany(@RequestBody(required = false) Map<String, Object> map);
 
+    //导入公司
+    @PostMapping(value = "api/v1/rms/rmscompany/importCompany")
+    RESTfulResult importCompany(@RequestBody(required = false) Map<String, Object> map);
+
+
 
     //===========运力
     //新增运力

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

@@ -465,8 +465,8 @@ public class ExcelToolUtils {
             }
             // 获取表格中最后一行的行号
             int lastRowNum = sheet.getLastRowNum();
-            if (lastRowNum < startRow) {
-                throw new Exception("第"+sheetIndex+"个工作簿无数据！请检查Excel！");
+            if (lastRowNum <= startRow) {
+                throw new Exception("第"+(sheetIndex+1)+"个工作簿无数据！请检查Excel！");
             }
             // 定义行变量和单元格变量
             Row row = null;

src/main/resources/application-dev.yml

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

src/main/resources/application-prod.yml

@@ -16,6 +16,7 @@ server:
   tomcat:
     max-threads: 1000
     accept-count: 800
+    basedir: /tomcat/baseDir
 eureka:
   client:
     registerWithEureka: false

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

@@ -184,6 +184,7 @@
             </if>
         </where>
         <if test="noRow == null">
+            order by LENGTH(company_name)
             FETCH NEXT 10 ROWS ONLY
         </if>
         )
@@ -350,6 +351,9 @@
         'personnelName' "prop"
         from RMS_PERSONNEL
         where DELETED = 0
+        <if test="isNC!=null">
+            AND SOURCE_ID IS NOT NULL
+        </if>
         )
         <where>
             <if test="personnelPost!=null and personnelPost!=''">
@@ -419,12 +423,6 @@
             <if test="capacityId!=null and capacityId!=''">
                 AND RCA .CAPACITY_ID = #{capacityId}
             </if>
-            <if test="id!=null and id.size>0 and !(index!=null and index!='')">
-                AND RCA .CAPACITY_ID in
-                <foreach collection="id" item="item"  open="(" close=")" separator="," >
-                    #{item}
-                </foreach>
-            </if>
             FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">