From a80d4715034d1935e5ca33caa9e0e10c8f59fb15 Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Mon, 27 Oct 2025 14:15:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=88=A9=E5=BA=93=E4=B8=8D?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                                       | 1 +
 src/main/resources/application-local.yml                 | 9 +++++----
 src/main/resources/application-test.yml                  | 1 +
 src/main/resources/application.yml                       | 2 +-
 .../mappers/business/backstage/BackApplyMapper.xml       | 2 ++
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 73acdf5..de4862c 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
index 1c8cd33..982d97b 100644
--- a/src/main/resources/application-local.yml
+++ b/src/main/resources/application-local.yml
@@ -11,12 +11,12 @@ spring:
     #    url: jdbc:mysql://192.168.0.14:4417/gzimtcs?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true
     #    username: root
     #    password: Bonus@admin123!
-    url: jdbc:mysql://127.0.0.1:3306/gzimt250319?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
-    username: ruanliang
-    password: ruanliang@MYSQL
+    url: jdbc:mysql://14.103.246.124/gz_imt0703?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    username: root
+    password: mysql_CXzwWd
     type: com.alibaba.druid.pool.DruidDataSource
   redis:
-    host: localhost
+    host: 14.103.246.124
     port: 6379
     database: 7
 
@@ -45,6 +45,7 @@ file:
   upload_path:
     windows: D://files/zg_gqj
     linux: /home/zg_gqj/files
+    other: /Users/syruan/files
 
 
 
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 1051ca4..045c379 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -51,6 +51,7 @@ file:
   upload_path:
     windows: D://files/zg_gqj
     linux: /home/zg_gqj/files
+    other: /Users/syruan/files
 
 
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 90385b2..027b4e3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: prod
\ No newline at end of file
+    active: test
\ No newline at end of file
diff --git a/src/main/resources/mappers/business/backstage/BackApplyMapper.xml b/src/main/resources/mappers/business/backstage/BackApplyMapper.xml
index 21efb4e..6e2a411 100644
--- a/src/main/resources/mappers/business/backstage/BackApplyMapper.xml
+++ b/src/main/resources/mappers/business/backstage/BackApplyMapper.xml
@@ -79,6 +79,7 @@
 
     <select id="getDetails" resultType="com.bonus.aqgqj.business.backstage.entity.back.BackApplyVo">
         SELECT sta.id,
+               bp.`NAME` as projectName,
                sta.CODE,
                sta.project_id                                               as projectId,
                sta.back_time                                                as backTime,
@@ -88,6 +89,7 @@
                sum(sbd.num)                                                 as backNum,
                GROUP_CONCAT(CONCAT(mt.`name`, ':', sbd.num) SEPARATOR ', ') AS summarize
         FROM st_back_apply sta
+                 LEFT JOIN bm_project bp ON sta.project_id = bp.ID
                  LEFT JOIN st_back_details sbd ON sbd.apply_id = sta.id
                  LEFT JOIN st_ma_type mt ON mt.id = sbd.model_id
                  LEFT JOIN st_ma_type mt2 ON mt.parent_id = mt2.id