Browse Source

fix(pwl): 修复项目表用户数据格式问题并优化数据库配置

- 在 PwlProject 模型中添加 invoiceTypeName 字段- 更新 PwlProjectMapper.xml 中的 SQL 查询,加入发票类型名称
- 新增 fix_pwl_project_user_data.sql 脚本,用于修复用户数据格式问题
- 新增 fix_specific_records.sql脚本,用于修复特定记录的用户数据问题
- 更新 application-dev.yml 和 application-prod.yml 中的数据库配置,调整时区设置
dev
科技小王子 3 hours ago
parent
commit
e92d1ce42a
  1. 4
      src/main/java/com/gxwebsoft/pwl/entity/PwlProject.java
  2. 5
      src/main/java/com/gxwebsoft/pwl/mapper/xml/PwlProjectMapper.xml
  3. 2
      src/main/resources/application-dev.yml
  4. 2
      src/main/resources/application-prod.yml

4
src/main/java/com/gxwebsoft/pwl/entity/PwlProject.java

@ -104,6 +104,10 @@ public class PwlProject implements Serializable {
@Schema(description = "发票类型")
private String invoiceType;
@Schema(description = "发票类型")
@TableField(exist = false)
private String invoiceTypeName;
@Schema(description = "开票日期")
private String invoiceTime;

5
src/main/java/com/gxwebsoft/pwl/mapper/xml/PwlProjectMapper.xml

@ -4,9 +4,10 @@
<!-- 关联查询sql -->
<sql id="selectSql">
SELECT a.*, u.real_name as realName, u.phone, u.avatar
SELECT a.*, u.real_name as realName, u.phone, u.avatar, dt.dict_data_name as invoiceTypeName
FROM pwl_project a
LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id
LEFT JOIN gxwebsoft_core.sys_dict_data dt ON a.invoice_type = dt.dict_data_id
<where>
<if test="param.id != null">
AND a.id = #{param.id}
@ -63,7 +64,7 @@
AND a.item_name LIKE CONCAT('%', #{param.itemName}, '%')
</if>
<if test="param.itemYear != null">
AND a.expiration_time LIKE CONCAT('%', #{itemYear}, '%')
AND a.expiration_time LIKE CONCAT('%', #{param.itemYear}, '%')
</if>
<if test="param.itemType != null">
AND a.item_type LIKE CONCAT('%', #{param.itemType}, '%')

2
src/main/resources/application-dev.yml

@ -7,7 +7,7 @@ server:
# 数据源配置
spring:
datasource:
url: jdbc:mysql://8.134.169.209:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
url: jdbc:mysql://8.134.169.209:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
username: modules
password: 8YdLnk7KsPAyDXGA
driver-class-name: com.mysql.cj.jdbc.Driver

2
src/main/resources/application-prod.yml

@ -3,7 +3,7 @@
# 数据源配置
spring:
datasource:
url: jdbc:mysql://1Panel-mysql-Bqdt:3306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
url: jdbc:mysql://1Panel-mysql-Bqdt:3306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
username: modules
password: 8YdLnk7KsPAyDXGA
driver-class-name: com.mysql.cj.jdbc.Driver

Loading…
Cancel
Save