# update

cost-service/src/main/java/com/blt/other/common/util/JwtUtil.java

@@ -28,7 +28,7 @@ public class JwtUtil {
      * 前缀
      */
     public static final String TOKEN_PREFIX = "Bearer ";
-    private static final String PUBLIC_KEY = "{\"kty\":\"RSA\",\"use\":\"sig\",\"kid\":\"0a968baa62e99029a973415887029fbd\",\"e\":\"AQAB\",\"n\":\"1hr9F7WGP6jpixp8kxN2E0BUB23EYiR0jSfdZQsN0ljnZfyqORK6fETVMDxDHB-ueekqieKh7UYJO3Cc3ecC2WCP7Z0KDsGcQBFJd0a9_BBktYv1rDnteJF3v43XkM1gi6gBEtXUb_l-mfpp14His6HtGH8W0v0klBOQ8UsBHDZvOHr2ns_qWPn0i6N86EUe1W47dGSy7fbms3nYQEncNFpnug6x39fJyFxpKjHS_63f2r3QRdf8UlHbjoVsHjg9sJ7pznrxDIIK8heRqH4JiutV8LhagPBVSm8UVHNwdi5IfjmVpYDirBrZDJZq7FwhyZE7ua29a3wP2I08qS9yJw\",\"alg\":\"RS256\"}";
+    private static final String PUBLIC_KEY = "{\"kty\":\"RSA\",\"use\":\"sig\",\"kid\":\"1f86f9a4a708e507a9285728d32f3bc1\",\"e\":\"AQAB\",\"n\":\"xu23WtxFwR5cjiQPXU12F4nH-4UvBWKraA5mUF7qjKf8xekZ1XY6KdrVwAEgyL-ZovK-xVGkqcRrs3zhUazB05EwUlG3BfdcGMWsE4WhVPcNLx8FWcbzSa5PfurUhB-hPksDw-Nrrm78EV85hhvPf9v395gTfb-9AcJ2yTYC8XTHHMIe6BPegmwFQ08W3uzhfbtiJuO6ry-0MofnYEZ8yyjn5AupbLgFZ2FGloBNznaTfNJwLAIONSIbSTN-vrqRYntqzlASdU4fwuQ7M7Kqo58NxI47Ev3UO3qDHLwG6bcTT8OSEsW10PWJgTGdz2-p5_74vNTfPwYcSaJpB73tyQ\",\"alg\":\"RS256\"}";
 
     /**
      * 功能描述: 解密Bailun Sso Token

cost-service/src/main/resources/application-test.yml

@@ -8,7 +8,6 @@ spring:
     hikari:
       maximum-pool-size: 200
       minimum-idle: 10
-
   thymeleaf:
     prefix: classpath:/templates/
     suffix: .html

cost-service/src/main/resources/mapper/Cost.xml

@@ -11,10 +11,10 @@
     <select id="selectAll" resultMap="cost">
         SELECT
         t1.*,
-        ifnull(ct.type_no,0) type_no,
-        ifnull(ct.type_name,'待补充') type_name,
-        ifnull(ast.subject_no,0) accounting_subject_no,
-        ifnull(ast.name,'待补充') accounting_subject_name,
+#         ifnull(ct.type_no,0) type_no,
+#         ifnull(ct.type_name,'待补充') type_name,
+#         ifnull(ast.subject_no,0) accounting_subject_no,
+#         ifnull(ast.name,'待补充') accounting_subject_name,
         group_concat(distinct t2.username) as cost_current_reviewer
         from cost t1
         left join cost_current_reviewer t2 on t1.cost_no = t2.cost_no
@@ -36,11 +36,11 @@
 
     <select id="selectByCostNo" resultMap="cost">
         SELECT t1.*,
-               ifnull(ct.type_no, 0)                 type_no,
-               ifnull(ct.type_name, '待补充')           type_name,
+#                ifnull(ct.type_no, 0)                 type_no,
+#                ifnull(ct.type_name, '待补充')           type_name,
                ct.description,
-               ifnull(ast.subject_no, 0)             accounting_subject_no,
-               ifnull(ast.name, '待补充')               accounting_subject_name,
+#                ifnull(ast.subject_no, 0)             accounting_subject_no,
+#                ifnull(ast.name, '待补充')               accounting_subject_name,
                group_concat(distinct t2.username) as cost_current_reviewer
         FROM cost t1
                  left join cost_current_reviewer t2 on t1.cost_no = t2.cost_no
@@ -55,10 +55,10 @@
     <select id="selectByKeys" resultType="com.blt.other.module.cost.model.CostDomain">
         SELECT
         t1.*,
-        ifnull(ct.type_no,0) type_no,
-        ifnull(ct.type_name,'待补充') type_name,
-        ifnull(ast.subject_no,0) accounting_subject_no,
-        ifnull(ast.name,'待补充') accounting_subject_name,
+#         ifnull(ct.type_no,0) type_no,
+#         ifnull(ct.type_name,'待补充') type_name,
+#         ifnull(ast.subject_no,0) accounting_subject_no,
+#         ifnull(ast.name,'待补充') accounting_subject_name,
         group_concat(distinct t2.username) as cost_current_reviewer
         from cost t1
         left join cost_current_reviewer t2 on t1.cost_no = t2.cost_no
@@ -296,15 +296,15 @@
     <select id="queryPage" resultType="com.blt.other.module.cost.model.CostDomain">
         SELECT
         t1.*,
-        ifnull(ct.type_no,0) type_no,
-        ifnull(ct.type_name,'待补充') type_name,
-        ifnull(ast.subject_no,0) accounting_subject_no,
-        ifnull(ast.name,'待补充') accounting_subject_name,
+#         ifnull(ct.type_no,0) type_no,
+#         ifnull(ct.type_name,'待补充') type_name,
+#         ifnull(ast.subject_no,0) accounting_subject_no,
+#         ifnull(ast.name,'待补充') accounting_subject_name,
         group_concat(distinct t2.username) as cost_current_reviewer
         from cost t1
         left join cost_current_reviewer t2 on t1.cost_no = t2.cost_no
-        left join cost_type ct on t1.type_id = ct.id
-        left join accounting_subject ast on ct.accounting_subject_id = ast.id
+#         left join cost_type ct on t1.type_id = ct.id
+#         left join accounting_subject ast on ct.accounting_subject_id = ast.id
         WHERE
         true
         <if test=" req.costForm!=null and req.costForm != ''">and t1.cost_form= #{req.costForm}</if>

cost-service/src/main/resources/mapper/CostDetailMapper.xml

@@ -5,10 +5,10 @@
 
     <select id="selectListByCostNo" resultType="com.blt.other.module.cost.model.CostDetailDomain">
         SELECT t1.*,
-               ifnull(ct.type_no, 0)       type_no,
-               ifnull(ct.type_name, '待补充') type_name,
-               ifnull(ast.subject_no, 0)   accounting_subject_no,
-               ifnull(ast.name, '待补充')     accounting_subject_name,
+#                ifnull(ct.type_no, 0)       type_no,
+#                ifnull(ct.type_name, '待补充') type_name,
+#                ifnull(ast.subject_no, 0)   accounting_subject_no,
+#                ifnull(ast.name, '待补充')     accounting_subject_name,
                ct.description
         FROM cost_detail t1
                  left join cost_type ct on t1.type_id = ct.id
@@ -18,10 +18,10 @@
 
     <select id="selectByDetailNo" resultType="com.blt.other.module.cost.model.CostDetailDomain">
         SELECT t1.*,
-               ifnull(ct.type_no, 0)       type_no,
-               ifnull(ct.type_name, '待补充') type_name,
-               ifnull(ast.subject_no, 0)   accounting_subject_no,
-               ifnull(ast.name, '待补充')     accounting_subject_name,
+#                ifnull(ct.type_no, 0)       type_no,
+#                ifnull(ct.type_name, '待补充') type_name,
+#                ifnull(ast.subject_no, 0)   accounting_subject_no,
+#                ifnull(ast.name, '待补充')     accounting_subject_name,
                ct.description
         FROM cost_detail t1
                  left join cost_type ct on t1.type_id = ct.id

cost-service/src/main/resources/mapper/CostPlanDao.xml

@@ -8,11 +8,11 @@
     </resultMap>
 
     <select id="selectByNo" resultMap="costPlan">
-        SELECT t1.*,
-               ifnull(ct.type_no,0) type_no,
-               ifnull(ct.type_name,'待补充') type_name,
-               ifnull(ast.subject_no,0) accounting_subject_no,
-               ifnull(ast.name,'待补充')       accounting_subject_name
+        SELECT t1.*
+#                ifnull(ct.type_no,0) type_no,
+#                ifnull(ct.type_name,'待补充') type_name,
+#                ifnull(ast.subject_no,0) accounting_subject_no,
+#                ifnull(ast.name,'待补充')       accounting_subject_name
         FROM cost_plan t1
                  left join cost_type ct on t1.type_id = ct.id
                  left join accounting_subject ast on ct.accounting_subject_id = ast.id
@@ -28,11 +28,11 @@
 
     <select id="selectAll" resultMap="costPlan">
         SELECT
-        t1.*,
-        ifnull(ct.type_no,0) type_no,
-        ifnull(ct.type_name,'待补充') type_name,
-        ifnull(ast.subject_no,0) accounting_subject_no,
-        ifnull(ast.name,'待补充') accounting_subject_name
+        t1.*
+#         ifnull(ct.type_no,0) type_no,
+#         ifnull(ct.type_name,'待补充') type_name,
+#         ifnull(ast.subject_no,0) accounting_subject_no,
+#         ifnull(ast.name,'待补充') accounting_subject_name
         FROM
         cost_plan t1
         left join cost_type ct on t1.type_id = ct.id

cost-service/src/main/resources/mapper/CostPlanTempMapper.xml

@@ -3,11 +3,11 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.blt.other.module.cost.dao.CostPlanTempDao">
     <select id="selectByNo" resultType="com.blt.other.database.model.CostPlanTempDomain">
-        SELECT t1.*,
-               ifnull(ct.type_no,0) type_no,
-               ifnull(ct.type_name,'待补充') type_name,
-               ifnull(ast.subject_no,0) accounting_subject_no,
-               ifnull(ast.name,'待补充')       accounting_subject_name
+        SELECT t1.*
+#                ifnull(ct.type_no,0) type_no,
+#                ifnull(ct.type_name,'待补充') type_name,
+#                ifnull(ast.subject_no,0) accounting_subject_no,
+#                ifnull(ast.name,'待补充')       accounting_subject_name
         FROM cost_plan_temp t1
                  left join cost_type ct on t1.type_id = ct.id
                  left join accounting_subject ast on ct.accounting_subject_id = ast.id
@@ -16,11 +16,11 @@
 
 
     <select id="selectListByPlanNo" resultType="com.blt.other.database.model.CostPlanTempDomain">
-        SELECT t1.*,
-               ifnull(ct.type_no,0) type_no,
-               ifnull(ct.type_name,'待补充') type_name,
-               ifnull(ast.subject_no,0) accounting_subject_no,
-               ifnull(ast.name,'待补充')       accounting_subject_name
+        SELECT t1.*
+#                ifnull(ct.type_no,0) type_no,
+#                ifnull(ct.type_name,'待补充') type_name,
+#                ifnull(ast.subject_no,0) accounting_subject_no,
+#                ifnull(ast.name,'待补充')       accounting_subject_name
         FROM cost_plan_temp t1
                  left join cost_type ct on t1.type_id = ct.id
                  left join bailun_other.accounting_subject ast on ct.accounting_subject_id = ast.id
@@ -44,25 +44,25 @@
     </update>
 
     <select id="selectByPlanNoAndTypeNo" resultType="com.blt.other.database.model.CostPlanTempDomain">
-        SELECT t1.*,
-               ifnull(ct.type_no,0) type_no,
-               ifnull(ct.type_name,'待补充') type_name,
-               ifnull(ast.subject_no,0) accounting_subject_no,
-               ifnull(ast.name,'待补充')       accounting_subject_name
+        SELECT t1.*
+#                ifnull(ct.type_no,0) type_no,
+#                ifnull(ct.type_name,'待补充') type_name,
+#                ifnull(ast.subject_no,0) accounting_subject_no,
+#                ifnull(ast.name,'待补充')       accounting_subject_name
         FROM cost_plan_temp t1
                  left join cost_type ct on t1.type_id = ct.id
                  left join bailun_other.accounting_subject ast on ct.accounting_subject_id = ast.id
         WHERE cost_plan_no = #{costPlanNo}
-          AND type_no = #{typeNo}
+          AND t1.type_no = #{typeNo}
         ORDER BY id DESC
     </select>
 
     <select id="selectByPlanNoAndTempNo" resultType="com.blt.other.database.model.CostPlanTempDomain">
-        SELECT t1.*,
-               ifnull(ct.type_no,0) type_no,
-               ifnull(ct.type_name,'待补充') type_name,
-               ifnull(ast.subject_no,0) accounting_subject_no,
-               ifnull(ast.name,'待补充')       accounting_subject_name
+        SELECT t1.*
+#                ifnull(ct.type_no,0) type_no,
+#                ifnull(ct.type_name,'待补充') type_name,
+#                ifnull(ast.subject_no,0) accounting_subject_no,
+#                ifnull(ast.name,'待补充')       accounting_subject_name
         FROM cost_plan_temp t1
                  left join cost_type ct on t1.type_id = ct.id
                  left join bailun_other.accounting_subject ast on ct.accounting_subject_id = ast.id