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

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

@@ -791,4 +791,10 @@ public class AMScontroller  extends BaseRESTfulController {
     public RESTfulResult getMoney(@PathVariable String id) {
         return amsFeign.getprintstr(id);
     }
+
+    @ApiOperation("上传凭证")
+    @PostMapping("/transPlanupload")
+    Map<String,Object> transPlanupload(@RequestBody Map<String,Object> map) {
+        return amsFeign.transPlanupload(map);
+    }
 }

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

@@ -40,7 +40,7 @@ public class BackgroundProcessingController extends BaseRESTfulController {
 
     @ApiOperation("登录接口")
     @PostMapping("bpLogin")
-    public Map<String,Object> bpLogin(@RequestParam String loginName, @RequestParam String password,  @RequestParam String app_code,@RequestParam String urlFlag) {
+    public Map<String,Object> bpLogin(@RequestParam String loginName, @RequestParam String password,  @RequestParam String app_code,@RequestParam(required = false) String urlFlag) {
         Map<String,Object> resMap = ssoUtil.individualLogin(loginName,password,app_code);
         if("succeed".equals(resMap.get("status"))) {
             Map<String, Object> dataMap = (Map<String, Object>) resMap.get("data");

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

@@ -112,7 +112,7 @@ public class SystemFileController extends BaseRESTfulController {
     }
 
     @PostMapping("/insertFiles2")
-    public RESTfulResult insertFiles2(String fileuuid, @ModelAttribute MultipartFile[] file) {
+    public RESTfulResult insertFiles2(@RequestParam String fileuuid, @ModelAttribute MultipartFile[] file) {
         String filenames = "";
         for (int i = 0; i < file.length; i++) {
             filenames += file[i].getOriginalFilename() + ";";

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

@@ -287,4 +287,7 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements//getMoney/{id}")
     RESTfulResult getprintstr(@PathVariable String id);
 
+    @PostMapping(value = "api/v1/ams/amstransplans/transPlanupload")
+    Map<String, Object> transPlanupload(@RequestBody(required = false) Map<String, Object> map);
+
 }

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev2}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -283,6 +283,7 @@
         OPERATION_POINT_ID "value",
         OPERATION_POINT_NAME "label",
         OPERATION_POINT_NAME "text"
+
         from RMS_OPERATION_POINT
         <where>
             DELETED = 0
@@ -298,6 +299,9 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE(OPERATION_POINT_NAME, #{index})
             </if>
+            <if test="sourceFlag != null and sourceFlag !=''">
+                AND ALTERNATE_FIELDS1 = #{sourceFlag}
+            </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
     )
@@ -906,7 +910,7 @@
         RC.MATERIAL_NAME "materialName",
         RC.MATERIAL_ID "id",
         RC.MATERIAL_ID "value",
-        RC.MATERIAL_CODE || '-' || RC.MATERIAL_NAME ||
+        RC.MATERIAL_NAME  || '-' || RC.MATERIAL_CODE ||
         (CASE WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL
         THEN '-' || RC.MATERIAL_SPECIFICATION
         WHEN RC.MATERIAL_MODEL IS NOT NULL