bonus
/
Bonus-Cloud-Houqin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug 5440

This commit is contained in:
sxu 2025-03-26 17:36:29 +08:00
parent c8e1a64704
commit 6a5ce142ae
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/statistics/account/vo/ReportAccountWalletConsumeVO.java
View File

@ -46,12 +46,12 @@ public class ReportAccountWalletConsumeVO {
@ApiModelProperty("用户手机号")
@LeNiuDecryptField(HandleType.DESENSITIZE_MOBILE_PHONE)
private String mobile;
// @ExcelProperty(
// value = {"所属组织"},
// order = 5
// )
// @ApiModelProperty("所属组织")
// private String orgFullName;
@ExcelProperty(
value = {"所属组织"},
order = 5
)
@ApiModelProperty("所属组织")
private String orgFullName;
@ApiModelProperty("用户类别")
@ExcelProperty(
value = {"用户类别"},
@ -103,9 +103,9 @@ public class ReportAccountWalletConsumeVO {
return this.mobile;
}
// public String getOrgFullName() {
// return this.orgFullName;
// }
public String getOrgFullName() {
return this.orgFullName;
}
public String getPsnTypeName() {
return this.psnTypeName;
@ -147,10 +147,10 @@ public class ReportAccountWalletConsumeVO {
return this;
}
// public ReportAccountWalletConsumeVO setOrgFullName(final String orgFullName) {
// this.orgFullName = orgFullName;
// return this;
// }
public ReportAccountWalletConsumeVO setOrgFullName(final String orgFullName) {
this.orgFullName = orgFullName;
return this;
}
public ReportAccountWalletConsumeVO setPsnTypeName(final String psnTypeName) {
this.psnTypeName = psnTypeName;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/statistics/config/mq/ReportAccountMQListener.java
View File

@ -46,7 +46,7 @@ public class ReportAccountMQListener implements MQListener<MqPayload<?>> {
ReportConsumerService reportConsumerService;
@Autowired
private ReportErrorLogService reportErrorLogService;
//@Value("${system.report.report-msg-consumer-incr}")
@Value("${system.report.report-msg-consumer-incr}")
private String reportMsgConsumerIncr;
@Autowired
private DeviceApi deviceApi;

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/ReportAccountConsumeMapper.xml
View File

@ -94,7 +94,7 @@
ci.cust_num,
ci.nick_name as cust_name,
ci.phonenumber as mobile,
sd.dept_name as org_full_name,
sd.dept_full_name as org_full_name,
ifnull( t.consume_num, 0 ) AS consume_num,
ifnull( t.consume_amount, 0 ) AS consume_amount,
ifnull( t.consume_repair_num, 0 ) AS consume_repair_num,

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/ReportAccountWalletConsumeMapper.xml
View File

@ -79,7 +79,7 @@
c.cust_num,
c.nick_name as cust_name,
c.phonenumber as mobile,
g.dept_name as org_full_name,
g.dept_full_name as org_full_name,
p.psn_type_name,
t.wallet_consume_amount,
t.subsidy_consume_amount,