'提交'

pom.xml

@@ -12,14 +12,18 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.0.7.RELEASE</version>
+<!--        <version>2.1.13.RELEASE</version>-->
     </parent>
+<!--    <properties>-->
+<!--        <java.version>1.8</java.version>-->
+<!--    </properties>-->
 
     <dependencyManagement>
         <dependencies>
 <!--            <dependency>-->
 <!--                <groupId>com.alibaba.cloud</groupId>-->
 <!--                <artifactId>spring-cloud-alibaba-dependencies</artifactId>-->
-<!--                <version>2.0.0.RELEASE</version>-->
+<!--                <version>2.1.4.RELEASE</version>-->
 <!--                <type>pom</type>-->
 <!--                <scope>import</scope>-->
 <!--            </dependency>-->
@@ -28,6 +32,7 @@
                 <artifactId>spring-cloud-dependencies</artifactId>
                 <!--Spring Cloud的版本-->
                 <version>Finchley.SR2</version>
+<!--                <version>Greenwich.SR6</version>-->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

src/main/java/com/steerinfo/dil/service/impl/TestServiceImpl.java

@@ -0,0 +1,36 @@
+//package com.steerinfo.dil.service.impl;
+//
+//import com.steerinfo.dil.feign.AmsFeign;
+//import io.seata.spring.annotation.GlobalTransactional;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Service;
+//import org.springframework.transaction.annotation.Transactional;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//
+///**
+// * @ClassName TestServiceImpl
+// * @Description TODO
+// * @date 2024-04-22 11:27
+// * @Version 1.0
+// */
+//@Service(value = "testService")
+//public class TestServiceImpl {
+//    @Autowired
+//    AmsFeign amsFeign;
+//
+//
+//    @Transactional(rollbackFor = Exception.class)
+//    public Map<String, Object> test(Map<String, Object> map) {
+//        Map<String, Object> map1 = amsFeign.productionRequirementAdd(map);
+//
+//        Map<String, Object> map2 = amsFeign.getproductionPlanList(new HashMap<>(),null,null,null);
+//
+//        if(true){
+//            int i = 1/0;
+//        }
+//
+//        return map1;
+//    }
+//}

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev2}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
@@ -11,8 +11,8 @@ spring:
     encoding: UTF-8
   mvc:
     static-path-pattern:
-
-
+#  main:
+#    allow-bean-definition-overriding: true
 genxml:
   pth: com/agit
 cache:

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

@@ -85,24 +85,26 @@
 
     <!--  边输边查公司  -->
     <select id="getCompanyMesByLike" resultType="java.util.Map">
-        select * from(
-        select
-        RC.SSO_ID "ssoId",
-        RC.SSO_CODE "ssoCode",
-        RC.COMPANY_ID "id",
-        RC.COMPANY_ID   "key",
-        RC.COMPANY_ID "value",
-        <if test="companyType==null">
-            RC.COMPANY_TYPE || '-' ||
-        </if>
-        RC.COMPANY_NAME "label",
-        RC.COMPANY_NAME "text",
-        RC.COMPANY_NAME "companyName",
-        T2 ."rootCompanyId",
-        T2 ."rootCompanyName",
-        'label' "prop"
-        from RMS_COMPANY RC
-        LEFT JOIN (
+        select * from (
+            select * from(
+            select
+            RC.SSO_ID "ssoId",
+            RC.SSO_CODE "ssoCode",
+            RC.COMPANY_ID "id",
+            RC.COMPANY_ID "businessCompanyId",
+            RC.COMPANY_ID   "key",
+            RC.COMPANY_ID "value",
+            <if test="companyType==null">
+                RC.COMPANY_TYPE || '-' ||
+            </if>
+            RC.COMPANY_NAME "label",
+            RC.COMPANY_NAME "text",
+            RC.COMPANY_NAME "companyName",
+            T2 ."rootCompanyId",
+            T2 ."rootCompanyName",
+            'label' "prop"
+            from RMS_COMPANY RC
+            LEFT JOIN (
             SELECT "companyId",MAX("level") "rootIndex" FROM
             (
             SELECT
@@ -115,9 +117,9 @@
             CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
             )
             GROUP BY "companyId"
-        ) T1 ON  T1 ."companyId" = RC .COMPANY_ID
-        LEFT JOIN
-        (
+            ) T1 ON  T1 ."companyId" = RC .COMPANY_ID
+            LEFT JOIN
+            (
             SELECT
             RC.COMPANY_ID "rootCompanyId",
             RC.COMPANY_NAME "rootCompanyName",
@@ -126,45 +128,53 @@
             FROM
             RMS_COMPANY RC
             CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
-        ) T2 ON  T2 ."companyId" = T1 ."companyId" AND T2 ."level" = T1 ."rootIndex"
-        <where>
-            DELETED = 0
-            <if test="companyType!=null and companyType!=''">
-                AND RC.COMPANY_TYPE = #{companyType}
-            </if>
-            <if test="companyId!=null and companyId!=''">
-                AND RC.COMPANY_ID = #{companyId}
-            </if>
-            <if test="businessCompanyId!=null and businessCompanyId!=''">
-                AND RC.COMPANY_ID = #{businessCompanyId}
-            </if>
-            <if test="supplierCompanyId!=null and supplierCompanyId!=''">
-                AND RC.COMPANY_ID = #{supplierCompanyId}
-            </if>
-            <if test="receiveCompanyId!=null and receiveCompanyId!=''">
-                AND RC.COMPANY_ID = #{receiveCompanyId}
-            </if>
-            <if test="carrierId!=null and carrierId!=''">
-                AND RC.COMPANY_ID = #{carrierId}
-            </if>
-            <if test="index!=null and index!=''">
-                AND REGEXP_LIKE(RC.COMPANY_NAME, #{index})
-            </if>
-            <if test="isListed !=null and isListed!=''">
-                AND RC.is_Listed IS NOT NULL
+            ) T2 ON  T2 ."companyId" = T1 ."companyId" AND T2 ."level" = T1 ."rootIndex"
+            <where>
+                DELETED = 0
+                <if test="companyType!=null and companyType!=''">
+                    AND RC.COMPANY_TYPE = #{companyType}
+                </if>
+                <if test="companyId!=null and companyId!=''">
+                    AND RC.COMPANY_ID = #{companyId}
+                </if>
+                <if test="businessCompanyId!=null and businessCompanyId!=''">
+                    AND RC.COMPANY_ID = #{businessCompanyId}
+                </if>
+                <if test="supplierCompanyId!=null and supplierCompanyId!=''">
+                    AND RC.COMPANY_ID = #{supplierCompanyId}
+                </if>
+                <if test="receiveCompanyId!=null and receiveCompanyId!=''">
+                    AND RC.COMPANY_ID = #{receiveCompanyId}
+                </if>
+                <if test="carrierId!=null and carrierId!=''">
+                    AND RC.COMPANY_ID = #{carrierId}
+                </if>
+                <if test="index!=null and index!=''">
+                    AND REGEXP_LIKE(RC.COMPANY_NAME, #{index})
+                </if>
+                <if test="isListed !=null and isListed!=''">
+                    AND RC.is_Listed IS NOT NULL
+                </if>
+
+            </where>
+            <if test="noRow == null">
+                order by LENGTH(company_name)
             </if>
-        </where>
-        <if test="noRow == null">
-            order by LENGTH(company_name)
+            )
+            <where>
+                <include refid="com.steerinfo.dil.mapper.CommonMapper.rootCompanyFilter"></include>
+                <include refid="com.steerinfo.dil.mapper.CommonMapper.filterCompanyData"></include>
+            </where>
             FETCH NEXT 10 ROWS ONLY
-        </if>
         )
         <if test="id!=null and id.size>0">
         UNION
-            select
+            select * from
+            (select
             RC.SSO_ID "ssoId",
             RC.SSO_CODE "ssoCode",
             RC.COMPANY_ID "id",
+            RC.COMPANY_ID "businessCompanyId",
             RC.COMPANY_ID   "key",
             RC.COMPANY_ID "value",
             <if test="companyType==null">
@@ -206,6 +216,7 @@
             <foreach collection="id" item="item"  open="(" close=")" separator="," >
                 #{item}
             </foreach>
+            order by LENGTH(company_name))
         </if>
     </select>
     <select id="getMaterialTypeByLike" resultType="java.util.Map">