bonus
/
gz_safety_ma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master'

This commit is contained in:
syruan 2025-12-04 09:53:02 +08:00
parent 2b26b9fff2 a80d471503
commit 002907d98d
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/compiler.xml
View File

@ -2,6 +2,7 @@
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<annotationProcessing> <annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true"> <profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" /> <sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />

9
src/main/resources/application-local.yml
View File

@ -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 # 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 # username: root
# password: Bonus@admin123! # password: Bonus@admin123!
url: jdbc:mysql://127.0.0.1:3306/gzimt250319?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false url: jdbc:mysql://14.103.246.124/gz_imt0703?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
username: ruanliang username: root
password: ruanliang@MYSQL password: mysql_CXzwWd
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
redis: redis:
host: localhost host: 14.103.246.124
port: 6379 port: 6379
database: 7 database: 7
@ -45,6 +45,7 @@ file:
upload_path: upload_path:
windows: D://files/zg_gqj windows: D://files/zg_gqj
linux: /home/zg_gqj/files linux: /home/zg_gqj/files
other: /Users/syruan/files

1
src/main/resources/application-test.yml
View File

@ -51,6 +51,7 @@ file:
upload_path: upload_path:
windows: D://files/zg_gqj windows: D://files/zg_gqj
linux: /home/zg_gqj/files linux: /home/zg_gqj/files
other: /Users/syruan/files

2
src/main/resources/application.yml
View File

@ -1,3 +1,3 @@
spring: spring:
profiles: profiles:
active: prod active: test

2
src/main/resources/mappers/business/backstage/BackApplyMapper.xml
View File

@ -81,6 +81,7 @@
<select id="getDetails" resultType="com.bonus.aqgqj.business.backstage.entity.back.BackApplyVo"> <select id="getDetails" resultType="com.bonus.aqgqj.business.backstage.entity.back.BackApplyVo">
SELECT sta.id, SELECT sta.id,
bp.`NAME` as projectName,
sta.CODE, sta.CODE,
sta.project_id as projectId, sta.project_id as projectId,
sta.back_time as backTime, sta.back_time as backTime,
@ -90,6 +91,7 @@
sum(sbd.num) as backNum, sum(sbd.num) as backNum,
GROUP_CONCAT(CONCAT(mt.`name`, ':', sbd.num) SEPARATOR ', ') AS summarize GROUP_CONCAT(CONCAT(mt.`name`, ':', sbd.num) SEPARATOR ', ') AS summarize
FROM st_back_apply sta 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_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 mt ON mt.id = sbd.model_id
LEFT JOIN st_ma_type mt2 ON mt.parent_id = mt2.id LEFT JOIN st_ma_type mt2 ON mt.parent_id = mt2.id