From c0d5ab9644759fac2560de8671b9b1665228c302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= Date: Sat, 23 Aug 2025 17:04:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E5=A4=84=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bmw/controller/BmWorkerAttController.java | 10 +++++----- .../bmw/controller/BmWorkerBlackController.java | 2 +- .../bmw/controller/HomePageSubController.java | 14 +++++++------- .../bmw/controller/PmWorkerExitController.java | 2 +- .../bonus/bmw/domain/vo/BmWorkerAttProExport.java | 2 +- .../bonus/bmw/domain/vo/BmWorkerAttTeamExport.java | 2 +- .../bmw/domain/vo/BmWorkerAttWorkerMsgExport.java | 2 +- .../com/bonus/bmw/domain/vo/BmWorkerBlack.java | 2 +- .../com/bonus/bmw/domain/vo/BmWorkerContract.java | 4 ++-- .../bonus/bmw/domain/vo/HomePageMainProExport.java | 2 +- .../bonus/bmw/domain/vo/HomePageWorkerExport.java | 14 +++++++------- .../bmw/domain/vo/HomePageWorkerNoFileExport.java | 6 +++--- .../java/com/bonus/bmw/domain/vo/PmWorker.java | 2 +- .../bonus/bmw/domain/vo/PmWorkerExitExport.java | 4 ++-- 14 files changed, 34 insertions(+), 34 deletions(-) diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerAttController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerAttController.java index d368ed0..d3f69fe 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerAttController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerAttController.java @@ -183,7 +183,7 @@ public class BmWorkerAttController extends BaseController { List 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 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 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 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 exportList = list.stream() .map(worker -> { BmWorkerAttSevenNoAttExport export = new BmWorkerAttSevenNoAttExport(); - BeanUtils.copyProperties(export, worker); + BeanUtils.copyProperties(worker, export); return export; }) .collect(Collectors.toList()); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerBlackController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerBlackController.java index 8a0b23a..6b20f7f 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerBlackController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerBlackController.java @@ -74,7 +74,7 @@ public class BmWorkerBlackController extends BaseController { /** * 黑名单人员解除 - * @param o + * @param * @return */ @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:black:query")) diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java index 035813a..412fdc1 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java @@ -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 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 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 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 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 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 exportList = list.stream() .map(worker -> { HomePageWorkerNoFileExport export = new HomePageWorkerNoFileExport(); - BeanUtils.copyProperties(export, worker); + BeanUtils.copyProperties(worker, export); return export; }) .collect(Collectors.toList()); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerExitController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerExitController.java index c6d7592..5874829 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerExitController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerExitController.java @@ -171,7 +171,7 @@ public class PmWorkerExitController extends BaseController { List exportList = list.stream() .map(worker -> { PmWorkerExitExport export = new PmWorkerExitExport(); - BeanUtils.copyProperties(export, worker); + BeanUtils.copyProperties(worker, export); return export; }) .collect(Collectors.toList()); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAttProExport.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAttProExport.java index 35fb292..bbf3191 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAttProExport.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAttProExport.java @@ -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; diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAttTeamExport.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAttTeamExport.java index 16e012f..3e8e72e 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAttTeamExport.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAttTeamExport.java @@ -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; diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAttWorkerMsgExport.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAttWorkerMsgExport.java index ed23847..e6362dc 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAttWorkerMsgExport.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerAttWorkerMsgExport.java @@ -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; /** diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerBlack.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerBlack.java index ccb21d1..05cac9a 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerBlack.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerBlack.java @@ -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; /** diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerContract.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerContract.java index c7db3f6..92334df 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerContract.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmWorkerContract.java @@ -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; /** diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageMainProExport.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageMainProExport.java index b68a053..737041e 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageMainProExport.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageMainProExport.java @@ -23,7 +23,7 @@ public class HomePageMainProExport { * 工程数量 */ @Excel(name = "工程数量", type = Excel.Type.EXPORT,sort = 3) - private String proNum; + private Integer proNum; } \ No newline at end of file diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageWorkerExport.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageWorkerExport.java index 7c1f62f..68aee90 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageWorkerExport.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageWorkerExport.java @@ -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; /** diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageWorkerNoFileExport.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageWorkerNoFileExport.java index 60575c8..3d87104 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageWorkerNoFileExport.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageWorkerNoFileExport.java @@ -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; /** diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorker.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorker.java index 0ec541c..722ae7a 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorker.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorker.java @@ -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; /** diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorkerExitExport.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorkerExitExport.java index f135e9e..9aa1685 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorkerExitExport.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorkerExitExport.java @@ -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; /** * 创建时间