diff --git a/src/main/java/com/gxwebsoft/pwl/entity/PwlProject.java b/src/main/java/com/gxwebsoft/pwl/entity/PwlProject.java index 8df310e..20b3335 100644 --- a/src/main/java/com/gxwebsoft/pwl/entity/PwlProject.java +++ b/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; diff --git a/src/main/java/com/gxwebsoft/pwl/mapper/xml/PwlProjectMapper.xml b/src/main/java/com/gxwebsoft/pwl/mapper/xml/PwlProjectMapper.xml index 57eafd4..f24fc7f 100644 --- a/src/main/java/com/gxwebsoft/pwl/mapper/xml/PwlProjectMapper.xml +++ b/src/main/java/com/gxwebsoft/pwl/mapper/xml/PwlProjectMapper.xml @@ -4,9 +4,10 @@ - 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 AND a.id = #{param.id} @@ -63,7 +64,7 @@ AND a.item_name LIKE CONCAT('%', #{param.itemName}, '%') - AND a.expiration_time LIKE CONCAT('%', #{itemYear}, '%') + AND a.expiration_time LIKE CONCAT('%', #{param.itemYear}, '%') AND a.item_type LIKE CONCAT('%', #{param.itemType}, '%') diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 258962d..0615070 100644 --- a/src/main/resources/application-dev.yml +++ b/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 diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 23c99bc..fbff897 100644 --- a/src/main/resources/application-prod.yml +++ b/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