c-zhouhf1/zhgh_hmc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

福利

Browse Source
This commit is contained in:
Paidax
2025-01-16 20:41:17 +08:00
parent 6795c475df
commit 4beba06d11
7 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java
+1 -1
View File
@@ -252,7 +252,7 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
// 人员状态及在职状态更新
userPatUpService.renewUserState();
// 修改不在人事库的人员，删除角色
userPatUpService.deleteNotInSourceUser(true);
// userPatUpService.deleteNotInSourceUser(true);
//清除缓存
// sysUserService.clearCache();
// sysRoleService.clearCache();
src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java
+9 -9
View File
@@ -456,15 +456,15 @@ public class WelfareListController {
if (StrUtil.isNotBlank(courierNumberExcelMode.getOneCourierNumber())) {
courierNumberList.add(courierNumberExcelMode.getOneCourierNumber());
}
if (StrUtil.isNotBlank(courierNumberExcelMode.getTwoCourierNumber())) {
courierNumberList.add(courierNumberExcelMode.getTwoCourierNumber());
}
if (StrUtil.isNotBlank(courierNumberExcelMode.getThreeCourierNumber())) {
courierNumberList.add(courierNumberExcelMode.getThreeCourierNumber());
}
if (StrUtil.isNotBlank(courierNumberExcelMode.getFourCourierNumber())) {
courierNumberList.add(courierNumberExcelMode.getFourCourierNumber());
}
// if (StrUtil.isNotBlank(courierNumberExcelMode.getTwoCourierNumber())) {
// courierNumberList.add(courierNumberExcelMode.getTwoCourierNumber());
// }
// if (StrUtil.isNotBlank(courierNumberExcelMode.getThreeCourierNumber())) {
// courierNumberList.add(courierNumberExcelMode.getThreeCourierNumber());
// }
// if (StrUtil.isNotBlank(courierNumberExcelMode.getFourCourierNumber())) {
// courierNumberList.add(courierNumberExcelMode.getFourCourierNumber());
// }
for (String number : courierNumberList) {
WelfareCourierNumber courierNumber = new WelfareCourierNumber();
src/main/java/io/v/nutz/zhgh/welfare/mode/CourierNumberExcelMode.java
+1 -1
View File
@@ -12,7 +12,7 @@ public class CourierNumberExcelMode {
@Excel(name = "姓名", width = 20)
private String userName;
@Excel(name = "快递单号1", width = 30)
@Excel(name = "快递单号", width = 30)
private String oneCourierNumber;
@Excel(name = "快递单号2", width = 30)