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

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

@@ -32,7 +32,7 @@ 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"),
@@ -80,6 +80,53 @@ public class AMScontroller{
         return amsFeign.purchaseOrderDelete(map);
     }
 
+
+    @ApiOperation(value = "采购需求新增接口", notes = "采购需求新增接口")
+    @ApiImplicitParams({
+            @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) {
+        return amsFeign.purchaseRequirementAdd(map);
+    }
+
+    @ApiOperation(value = "采购需求修改接口", notes = "采购需求修改接口")
+    @ApiImplicitParams({
+            @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) {
+        return amsFeign.purchaseRequirementUpdate(map);
+    }
+
+    @ApiOperation(value = "采购需求修改状态接口", notes = "采购需求修改状态接口")
+    @ApiImplicitParams({
+            @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) {
+        return amsFeign.purchaseRequirementChange(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 = "/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);
+    }
+
     @ApiOperation(value="同步销售订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/saleOrderSync")

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

@@ -36,6 +36,21 @@ public interface AmsFeign {
                                      @RequestParam  Integer pageSize
     );
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementAdd")
+    Map<String, Object> purchaseRequirementAdd(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementUpdate")
+    Map<String, Object> purchaseRequirementUpdate(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementChange")
+    Map<String, Object> purchaseRequirementChange(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/getPurchaseRequirementList")
+    Map<String, Object> getPurchaseRequirementList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam  Integer apiId,
+                                                   @RequestParam  Integer pageNum,
+                                                   @RequestParam  Integer pageSize);
+
     @PostMapping("api/v1/ams/amsorders/saleOrderSync")
     Map<String, Object> saleOrderSync(@RequestBody(required = false) Map<String, Object> map);
 

src/main/resources/application-prod.yml

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

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

@@ -164,6 +164,9 @@
         <if test="index!=null and index!=''">
             AND   REGEXP_LIKE(OPERATION_POINT_NAME, #{index})
         </if>
+        <if test="operationPointType!=null and operationPointType!=''">
+            AND   REGEXP_LIKE(OPERATION_POINT_TYPE, #{operationPointType})
+        </if>
         FETCH NEXT 100 ROWS ONLY
     </select>
     <select id="getPersonnelByLike" resultType="java.util.Map">