From 1187d79b052a11041ab2a1ecd56b3733d38554f7 Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 25 Apr 2024 14:32:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BsSgcJsjdBuiAttendanceInformationController.java | 2 +- .../build/domain/vo/BsSgcJsjdBuiAttendanceInformationExcel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiAttendanceInformationController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiAttendanceInformationController.java index 15a6ac6b..86dfd3a8 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiAttendanceInformationController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiAttendanceInformationController.java @@ -142,7 +142,7 @@ public class BsSgcJsjdBuiAttendanceInformationController extends BaseController BeanUtils.copyProperties(bsSgcJsjdBuiAttendanceInformationExcel,bsSgcJsjdBuiAttendanceInformation); BsSgcJsjdBuiRealName one = bsSgcJsjdBuiRealNameService.getOne(Wrappers.lambdaQuery(BsSgcJsjdBuiRealName.class) .eq(BsSgcJsjdBuiRealName::getIdNo, bsSgcJsjdBuiAttendanceInformationExcel.getIdNo()) - .eq(BsSgcJsjdBuiRealName::getName, bsSgcJsjdBuiAttendanceInformationExcel.getName()) + .eq(BsSgcJsjdBuiRealName::getName, bsSgcJsjdBuiAttendanceInformationExcel.getWorkerName()) .eq(BsSgcJsjdBuiRealName::getProCode, proCode) .eq(BsSgcJsjdBuiRealName::getProNo, proNo),false); bsSgcJsjdBuiAttendanceInformation.setSocialCreditCode(one.getSocialCreditCode()); diff --git a/jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcJsjdBuiAttendanceInformationExcel.java b/jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcJsjdBuiAttendanceInformationExcel.java index 46876c18..6d389ec6 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcJsjdBuiAttendanceInformationExcel.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcJsjdBuiAttendanceInformationExcel.java @@ -12,7 +12,7 @@ public class BsSgcJsjdBuiAttendanceInformationExcel { @Excel(name = "姓名") @ApiModelProperty("姓名") - public String name; + public String workerName; /** 考勤所属年月 */ @JsonFormat(pattern = "yyyy-MM-dd") From f401f7fa4f60d81bd9409d834ddf8f2143fb2681 Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 25 Apr 2024 14:33:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BsSgcJsjdBuiAttendanceInformationController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiAttendanceInformationController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiAttendanceInformationController.java index 86dfd3a8..11fcfe94 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiAttendanceInformationController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiAttendanceInformationController.java @@ -142,7 +142,7 @@ public class BsSgcJsjdBuiAttendanceInformationController extends BaseController BeanUtils.copyProperties(bsSgcJsjdBuiAttendanceInformationExcel,bsSgcJsjdBuiAttendanceInformation); BsSgcJsjdBuiRealName one = bsSgcJsjdBuiRealNameService.getOne(Wrappers.lambdaQuery(BsSgcJsjdBuiRealName.class) .eq(BsSgcJsjdBuiRealName::getIdNo, bsSgcJsjdBuiAttendanceInformationExcel.getIdNo()) - .eq(BsSgcJsjdBuiRealName::getName, bsSgcJsjdBuiAttendanceInformationExcel.getWorkerName()) +// .eq(BsSgcJsjdBuiRealName::getName, bsSgcJsjdBuiAttendanceInformationExcel.getWorkerName()) .eq(BsSgcJsjdBuiRealName::getProCode, proCode) .eq(BsSgcJsjdBuiRealName::getProNo, proNo),false); bsSgcJsjdBuiAttendanceInformation.setSocialCreditCode(one.getSocialCreditCode()); From 076bf3021eda3684d67ac81e52f25bc7ef6416c4 Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 25 Apr 2024 14:48:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../build/domain/vo/BsSgcJsjdBuiAttendanceInformationExcel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcJsjdBuiAttendanceInformationExcel.java b/jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcJsjdBuiAttendanceInformationExcel.java index 6d389ec6..e9e94d9e 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcJsjdBuiAttendanceInformationExcel.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcJsjdBuiAttendanceInformationExcel.java @@ -15,7 +15,7 @@ public class BsSgcJsjdBuiAttendanceInformationExcel { public String workerName; /** 考勤所属年月 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM") @Excel(name = "考勤所属年月", width = 30, dateFormat = "yyyy-MM") @ApiModelProperty("考勤所属年月") public Date attendanceYear;