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:28:38 +08:00
parent 5d5330dd33
commit c8e1a64704
6 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/web/vo/AccOperationRecordPageVO.java
View File

@ -33,12 +33,12 @@ public class AccOperationRecordPageVO {
)
@LeNiuDecryptField(HandleType.DESENSITIZE_MOBILE_PHONE)
private String mobile;
// @ApiModelProperty("组织全称")
// @ExcelProperty(
// value = {"组织全称"},
// order = 4
// )
// private String orgFullName;
@ApiModelProperty("组织全称")
@ExcelProperty(
value = {"组织全称"},
order = 4
)
private String orgFullName;
@ApiModelProperty("操作员")
@ExcelProperty(
value = {"操作员"},
@ -83,9 +83,9 @@ public class AccOperationRecordPageVO {
return this.mobile;
}
// public String getOrgFullName() {
// return this.orgFullName;
// }
public String getOrgFullName() {
return this.orgFullName;
}
public String getCrby() {
return this.crby;
@ -111,9 +111,9 @@ public class AccOperationRecordPageVO {
this.mobile = mobile;
}
// public void setOrgFullName(final String orgFullName) {
// this.orgFullName = orgFullName;
// }
public void setOrgFullName(final String orgFullName) {
this.orgFullName = orgFullName;
}
public void setCrby(final String crby) {
this.crby = crby;

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

@ -46,12 +46,12 @@ public class ReportAccountFlowVO {
private Long orgId;
@ApiModelProperty("组织名称")
private String orgName;
// @ExcelProperty(
// value = {"所属组织"},
// order = 4
// )
// @ApiModelProperty("组织全称")
// private String orgFullName;
@ExcelProperty(
value = {"所属组织"},
order = 4
)
@ApiModelProperty("组织全称")
private String orgFullName;
@ApiModelProperty("人员类别编号")
private Integer psnType;
@ExcelProperty(
@ -190,9 +190,9 @@ public class ReportAccountFlowVO {
return this.orgName;
}
// public String getOrgFullName() {
// return this.orgFullName;
// }
public String getOrgFullName() {
return this.orgFullName;
}
public Integer getPsnType() {
return this.psnType;
@ -340,10 +340,10 @@ public class ReportAccountFlowVO {
return this;
}
// public ReportAccountFlowVO setOrgFullName(final String orgFullName) {
// this.orgFullName = orgFullName;
// return this;
// }
public ReportAccountFlowVO setOrgFullName(final String orgFullName) {
this.orgFullName = orgFullName;
return this;
}
public ReportAccountFlowVO setPsnType(final Integer psnType) {
this.psnType = psnType;

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;

3
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationRecordMapper.xml
View File

@ -9,11 +9,14 @@
t2.cust_num,
t2.nick_name as cust_name,
t2.phonenumber as mobile,
sd.dept_name,
sd.dept_full_name as org_full_name,
t1.type,
t1.crby,
t1.crtime
FROM acc_operation_record t1
LEFT JOIN sys_user t2 ON t1.cust_id = t2.cust_id
LEFT JOIN sys_dept sd on sd.dept_id = t2.dept_id
<where>
<if test="content.startDateTime != null">
and t1.crtime <![CDATA[ >= ]]> #{content.startDateTime}

1
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/ReportAccountFlowMapper.xml
View File

@ -472,6 +472,7 @@
c.nick_name as cust_name,
s.org_id,
g.dept_name as org_name,
g.dept_full_name as org_full_name,
s.psn_type,
p.psn_type_name,
a.mch_num,

1
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccInfoMapper.xml
View File

@ -77,6 +77,7 @@
t2.nick_name as cust_name,
t2.phonenumber as mobile,
t6.dept_name,
t6.dept_full_name as org_full_name,
t2.psn_type,
t5.psn_type_name,
t1.scope,