bonus
/
sh_real_name_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

到处问题修改

This commit is contained in:
方亮 2025-08-23 17:04:40 +08:00
parent 210a4cfaa5
commit c0d5ab9644
14 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerAttController.java
View File

@ -183,7 +183,7 @@ public class BmWorkerAttController extends BaseController {
List<BmWorkerAttProExport> exportList = list.stream()
.map(worker -> {
BmWorkerAttProExport export = new BmWorkerAttProExport();
BeanUtils.copyProperties(export, worker);
BeanUtils.copyProperties(worker, export);
return export;
})
.collect(Collectors.toList());
@ -206,7 +206,7 @@ public class BmWorkerAttController extends BaseController {
List<BmWorkerAttTeamExport> exportList = list.stream()
.map(worker -> {
BmWorkerAttTeamExport export = new BmWorkerAttTeamExport();
BeanUtils.copyProperties(export, worker);
BeanUtils.copyProperties(worker, export);
return export;
})
.collect(Collectors.toList());
@ -229,7 +229,7 @@ public class BmWorkerAttController extends BaseController {
List<BmWorkerAttWorkerExport> exportList = list.stream()
.map(worker -> {
BmWorkerAttWorkerExport export = new BmWorkerAttWorkerExport();
BeanUtils.copyProperties(export, worker);
BeanUtils.copyProperties(worker, export);
return export;
})
.collect(Collectors.toList());
@ -252,7 +252,7 @@ public class BmWorkerAttController extends BaseController {
List<BmWorkerAttWorkerMsgExport> exportList = list.stream()
.map(worker -> {
BmWorkerAttWorkerMsgExport export = new BmWorkerAttWorkerMsgExport();
BeanUtils.copyProperties(export, worker);
BeanUtils.copyProperties(worker, export);
return export;
})
.collect(Collectors.toList());
@ -275,7 +275,7 @@ public class BmWorkerAttController extends BaseController {
List<BmWorkerAttSevenNoAttExport> exportList = list.stream()
.map(worker -> {
BmWorkerAttSevenNoAttExport export = new BmWorkerAttSevenNoAttExport();
BeanUtils.copyProperties(export, worker);
BeanUtils.copyProperties(worker, export);
return export;
})
.collect(Collectors.toList());

2
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerBlackController.java
View File

@ -74,7 +74,7 @@ public class BmWorkerBlackController extends BaseController {
/**
* 黑名单人员解除
* @param o
* @param
* @return
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:black:query"))

14
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java
View File

@ -175,7 +175,7 @@ public class HomePageSubController extends BaseController {
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query"))
@GetMapping("/getWorkerLightMsg")
@SysLog(title = "单人详情页面", businessType = OperaType.QUERY, logType = 0, module = "首页->二级页面", details = "单人详情页面")
@SysLog(title = "单人红绿灯详情", businessType = OperaType.QUERY, logType = 0, module = "首页->二级页面", details = "单人红绿灯详情")
public AjaxResult getWorkerLightMsg(HomePagePo o) {
try {
return service.getWorkerLightMsg(o);
@ -199,7 +199,7 @@ public class HomePageSubController extends BaseController {
List<HomePageMainProExport> exportList = list.stream()
.map(worker -> {
HomePageMainProExport export = new HomePageMainProExport();
BeanUtils.copyProperties(export, worker);
BeanUtils.copyProperties(worker, export);
return export;
})
.collect(Collectors.toList());
@ -222,7 +222,7 @@ public class HomePageSubController extends BaseController {
List<HomePageProExport> exportList = list.stream()
.map(worker -> {
HomePageProExport export = new HomePageProExport();
BeanUtils.copyProperties(export, worker);
BeanUtils.copyProperties(worker, export);
return export;
})
.collect(Collectors.toList());
@ -245,7 +245,7 @@ public class HomePageSubController extends BaseController {
List<HomePageSubExport> exportList = list.stream()
.map(worker -> {
HomePageSubExport export = new HomePageSubExport();
BeanUtils.copyProperties(export, worker);
BeanUtils.copyProperties(worker, export);
return export;
})
.collect(Collectors.toList());
@ -268,7 +268,7 @@ public class HomePageSubController extends BaseController {
List<HomePageTeamExport> exportList = list.stream()
.map(worker -> {
HomePageTeamExport export = new HomePageTeamExport();
BeanUtils.copyProperties(export, worker);
BeanUtils.copyProperties(worker, export);
return export;
})
.collect(Collectors.toList());
@ -292,7 +292,7 @@ public class HomePageSubController extends BaseController {
List<HomePageWorkerExport> exportList = list.stream()
.map(worker -> {
HomePageWorkerExport export = new HomePageWorkerExport();
BeanUtils.copyProperties(export, worker);
BeanUtils.copyProperties(worker, export);
return export;
})
.collect(Collectors.toList());
@ -316,7 +316,7 @@ public class HomePageSubController extends BaseController {
List<HomePageWorkerNoFileExport> exportList = list.stream()
.map(worker -> {
HomePageWorkerNoFileExport export = new HomePageWorkerNoFileExport();
BeanUtils.copyProperties(export, worker);
BeanUtils.copyProperties(worker, export);
return export;
})
.collect(Collectors.toList());

2
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerExitController.java
View File

@ -171,7 +171,7 @@ public class PmWorkerExitController extends BaseController {
List<PmWorkerExitExport> exportList = list.stream()
.map(worker -> {
PmWorkerExitExport export = new PmWorkerExitExport();
BeanUtils.copyProperties(export, worker);
BeanUtils.copyProperties(worker, export);
return export;
})
.collect(Collectors.toList());

2
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAttProExport.java
View File

@ -22,7 +22,7 @@ public class BmWorkerAttProExport {
/**
* 工程状态
*/
@Excel(name = "工程状态", type = Excel.Type.EXPORT,sort = 3,readConverterExp = "在建=1,筹建=3,停工=2,完工=5,遗留收尾=4")
@Excel(name = "工程状态", type = Excel.Type.EXPORT,sort = 3,readConverterExp = "0=在建,2=筹建,1=停工,4=完工,3=遗留收尾")
private String proStatus;

2
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAttTeamExport.java
View File

@ -34,7 +34,7 @@ public class BmWorkerAttTeamExport {
/**
* 班组在场状态
*/
@Excel(name = "班组在场状态", type = Excel.Type.EXPORT,sort = 5,readConverterExp = "已入场=1,已离场=2")
@Excel(name = "班组在场状态", type = Excel.Type.EXPORT,sort = 5,readConverterExp = "1=已入场,2=已离场")
private Integer teamEinStatus;

2
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAttWorkerMsgExport.java
View File

@ -34,7 +34,7 @@ public class BmWorkerAttWorkerMsgExport {
/**
* 考勤状态
*/
@Excel(name = "考勤状态", type = Excel.Type.EXPORT,sort = 5,readConverterExp = "未考勤=1,已考勤=1,补卡=2,未入场=3")
@Excel(name = "考勤状态", type = Excel.Type.EXPORT,sort = 5,readConverterExp = "0=未考勤,1=已考勤,2=补卡,3=未入场")
private Integer isAtt;
/**

2
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerBlack.java
View File

@ -74,7 +74,7 @@ public class BmWorkerBlack {
/**
* 是否解除 0 未解除 1 已解除
*/
@Excel(name = "是否解除", type = Excel.Type.EXPORT, sort = 10,readConverterExp = "执行中=0,已解除=1,已到解除时间=2")
@Excel(name = "是否解除", type = Excel.Type.EXPORT, sort = 10,readConverterExp = "0=执行中,1=已解除,2=已到解除时间")
private Integer isRemove;
/**

4
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerContract.java
View File

@ -43,7 +43,7 @@ public class BmWorkerContract {
*/
@Excel(name = "合同生效时间", type = Excel.Type.EXPORT, sort = 9)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date contractStartDate;
private String contractStartDate;
/**
* 合同结束时间
@ -130,7 +130,7 @@ public class BmWorkerContract {
/**
* 是否签合同
*/
@Excel(name = "是否签合同", type = Excel.Type.EXPORT, sort = 8,readConverterExp = "已签订=1,未签订=0")
@Excel(name = "是否签合同", type = Excel.Type.EXPORT, sort = 8,readConverterExp = "1=已签订,0=未签订")
private String isSign;
/**

2
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageMainProExport.java
View File

@ -23,7 +23,7 @@ public class HomePageMainProExport {
* 工程数量
*/
@Excel(name = "工程数量", type = Excel.Type.EXPORT,sort = 3)
private String proNum;
private Integer proNum;
}

14
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageWorkerExport.java
View File

@ -15,37 +15,37 @@ public class HomePageWorkerExport {
/**
* 施工人员名称
*/
@Excel(name = "项目", isSequence = true, type = Excel.Type.EXPORT,sort = 2)
@Excel(name = "项目", type = Excel.Type.EXPORT,sort = 2)
private String workerName;
/**
* 岗位名称
*/
@Excel(name = "工种", isSequence = true, type = Excel.Type.EXPORT,sort = 3)
@Excel(name = "工种", type = Excel.Type.EXPORT,sort = 3)
private String postName;
/**
* 红绿灯状态
*/
@Excel(name = "红绿灯状态", isSequence = true, type = Excel.Type.EXPORT,sort = 4,readConverterExp = "1=黄灯,2 = 红灯")
@Excel(name = "红绿灯状态", type = Excel.Type.EXPORT,sort = 4,readConverterExp = "1=黄灯,2=绿灯")
private String lightStatus;
/**
* 是否考勤
*/
@Excel(name = "是否考勤", isSequence = true, type = Excel.Type.EXPORT,sort = 5,readConverterExp = "1 = 是,0 = 否")
@Excel(name = "是否考勤", type = Excel.Type.EXPORT,sort = 5,readConverterExp = "1=是,0=否")
private String isAtt;
/**
* 性别
*/
@Excel(name = "性别", isSequence = true, type = Excel.Type.EXPORT,sort = 6)
@Excel(name = "性别", type = Excel.Type.EXPORT,sort = 6)
private String sex;
/**
* 年龄
*/
@Excel(name = "年龄", isSequence = true, type = Excel.Type.EXPORT,sort = 7)
@Excel(name = "年龄", type = Excel.Type.EXPORT,sort = 7)
private String age;
/**
* 手机号
*/
@Excel(name = "手机号", isSequence = true, type = Excel.Type.EXPORT,sort = 8)
@Excel(name = "手机号", type = Excel.Type.EXPORT,sort = 8)
private String phone;
/**

6
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageWorkerNoFileExport.java
View File

@ -15,18 +15,18 @@ public class HomePageWorkerNoFileExport {
/**
* 施工人员名称
*/
@Excel(name = "姓名", isSequence = true, type = Excel.Type.EXPORT,sort = 2)
@Excel(name = "姓名", type = Excel.Type.EXPORT,sort = 2)
private String workerName;
/**
* 身份证号码
*/
@Excel(name = "身份证号码", isSequence = true, type = Excel.Type.EXPORT,sort = 3)
@Excel(name = "身份证号码", type = Excel.Type.EXPORT,sort = 3)
private String idNumber;
/**
* 手机号
*/
@Excel(name = "手机号", isSequence = true, type = Excel.Type.EXPORT,sort = 4)
@Excel(name = "手机号", type = Excel.Type.EXPORT,sort = 4)
private String phone;
/**

2
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorker.java
View File

@ -95,7 +95,7 @@ public class PmWorker {
/**
* 入场状态 0未入场 1 已入场
*/
@Excel(name = "入场状态", type = Excel.Type.EXPORT, sort = 8,readConverterExp = "入场=1,未入场=0")
@Excel(name = "入场状态", type = Excel.Type.EXPORT, sort = 8,readConverterExp = "1=入场,0=未入场,2=未入场")
private Integer einStatus;
/**

4
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorkerExitExport.java
View File

@ -88,7 +88,7 @@ public class PmWorkerExitExport {
/**
* 入场状态 0未入场 1 已入场
*/
@Excel(name = "入场状态", type = Excel.Type.EXPORT, sort = 7,readConverterExp = "入场=1,未入场=0")
@Excel(name = "入场状态", type = Excel.Type.EXPORT, sort = 7,readConverterExp = "0=未入场,1=入场,2=未入场")
private Integer einStatus;
/**
@ -158,7 +158,7 @@ public class PmWorkerExitExport {
/**
* 是否上传文件 0未上传 1 已上传
*/
@Excel(name = "是否上传离职文件", type = Excel.Type.EXPORT, sort = 10,readConverterExp = "未上传=0,已上传=1")
@Excel(name = "是否上传离职文件", type = Excel.Type.EXPORT, sort = 10,readConverterExp = "0=未上传,1=已上传")
private String isUploadFile;
/**
* 创建时间