代码更新

sgzb-gateway/src/main/resources/bootstrap.yml

@@ -11,6 +11,13 @@ spring:
     # 环境配置
     active: sgzb_cloud_dev
   cloud:
+    loadbalancer:
+      # 关闭Ribbon的负载均衡器
+      ribbon:
+        enabled: false
+      # 开启Nacos的负载均衡器
+      nacos:
+        enabled: true
     nacos:
       discovery:
         # 服务注册地址

sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml

@@ -11,6 +11,13 @@ spring:
     # 环境配置
     active: sgzb_cloud_dev
   cloud:
+    loadbalancer:
+      # 关闭Ribbon的负载均衡器
+      ribbon:
+        enabled: false
+      # 开启Nacos的负载均衡器
+      nacos:
+        enabled: true
     nacos:
       discovery:
         # 服务注册地址

sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml

@@ -11,6 +11,13 @@ spring:
     # 环境配置
     active: sgzb_cloud_dev
   cloud:
+    loadbalancer:
+      # 关闭Ribbon的负载均衡器
+      ribbon:
+        enabled: false
+      # 开启Nacos的负载均衡器
+      nacos:
+        enabled: true
     nacos:
       discovery:
         # 服务注册地址

sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml

@@ -26,7 +26,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectRepairAuditDetailsVo">
-        select id, task_id, repair_id, ma_id, type_id, repair_num, repaired_num, scrap_num, audit_by, audit_time, audit_remark, status, create_by, create_time, update_by, update_time, remark, company_id from repair_audit_details
+        SELECT
+            rd.id,
+            rd.task_id,
+            rd.repair_id,
+            rd.ma_id,
+            rd.type_id,
+            rd.repair_num,
+            rd.repaired_num,
+            rd.scrap_num,
+            rd.audit_by,
+            rd.audit_time,
+            rd.audit_remark,
+            rd.STATUS,
+            rd.create_by,
+            rd.create_time,
+            rd.update_by,
+            rd.update_time,
+            rd.remark,
+            mt.company_id
+        FROM
+            repair_audit_details rd
+                LEFT JOIN ma_type mt on rd.type_id = mt.type_id
     </sql>
 
     <select id="selectRepairAuditDetailsList" parameterType="com.bonus.sgzb.material.domain.RepairAuditDetails" resultMap="RepairAuditDetailsResult">

sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml

@@ -15,6 +15,13 @@ spring:
     # 环境配置
     active: sgzb_cloud_dev
   cloud:
+    loadbalancer:
+      # 关闭Ribbon的负载均衡器
+      ribbon:
+        enabled: false
+      # 开启Nacos的负载均衡器
+      nacos:
+        enabled: true
     nacos:
       discovery:
         # 服务注册地址