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

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

@@ -701,4 +701,22 @@ public class AMScontroller {
         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/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/feign/AmsFeign.java

@@ -257,4 +257,11 @@ public interface AmsFeign {
                                  @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/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>
         )
@@ -422,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">