GTsoft/mps-platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

每日录入明细,导出罚没款和换卡 取子表的chenkflag 导出户号字段名

Browse Source
This commit is contained in:
zhuangdashia 2025-10-22 14:43:10 +08:00
parent 14e16824e0
commit f9f0f3534f
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryExportVo.java
View File

@ -181,7 +181,7 @@ public class MpsDetailEntryExportVo implements Serializable {
/**
* 取暖费户号
*/
@ExcelProperty(value = "取暖费户号")
@ExcelProperty(value = "户号")
private String heatingNo;

2
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryImportVo.java
View File

@ -168,7 +168,7 @@ public class MpsDetailEntryImportVo implements Serializable {
/**
* 取暖费户号
*/
@ExcelProperty(value = "取暖费户号")
@ExcelProperty(value = "户号")
private String heatingNo;
/**

8
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/mapper/MpsDetailEntryMapper.java
View File

@ -44,9 +44,15 @@ public interface MpsDetailEntryMapper extends BaseMapperPlus<MpsDetailEntry, Mps
"select " +
"c.old_card_no as oldCardNo , c.new_card_no as newCardNo, c.replace_method as affair ," +
"t.traffic_no as trafficNo ,t.traffic_amt as trafficAmt, " +
"m.* ," +
"d.dept_name AS yxDeptName ," +
"de.dept_name AS deptName " +
"de.dept_name AS deptName ," +
" CASE " +
" WHEN m.traffic_id IS NOT NULL THEN t.check_flag " +
" WHEN m.magnetic_card_id IS NOT NULL THEN c.check_flag " +
" ELSE m.check_flag " +
" END AS checkFlag "+
"from mps_market m " +
" left join mps_traffic t on m.traffic_id = t.traffic_id " +
" left join mps_magneticcard c on m.magnetic_card_id = c.magnetic_card_id " +

2
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidVo.java
View File

@ -80,7 +80,7 @@ public class MarketingValidInvalidVo implements Serializable {
* 有效无效标识
*/
@ExcelProperty(value = "有效无效标识", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "report_valid_invalid")
@ExcelDictFormat(readConverterExp = "1=有效,9=无效")
private String checkFlag;
/**