From f3544d674c4223a17d3a899205b0b5c9746edaf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com>
Date: Tue, 4 Mar 2025 20:06:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BgtProjectRecruitApplyServiceImpl.java    |  7 ++---
 ...ppCancelRegistrationProjectDetailsRes.java |  3 ++
 .../WgzAppPersonalBasicInformationRes.java    |  3 +-
 .../wgz/bo/res/WgzAppProjectDetailsRes.java   |  3 ++
 .../WgzApplyForPayrollSettlementAddRes.java   |  4 +++
 .../java/com/ruoyi/wgz/domain/WgzUser.java    |  3 +-
 .../wgz/service/impl/WgzUserServiceImpl.java  | 29 +++++++++++--------
 7 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java
index 7dbe052..bbfcb1b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java
@@ -405,13 +405,12 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
 	@Override
 	@Transactional
 	public Boolean userCancelRegistration(Long recruitApplyId) {
+		BgtProjectRecruitApply by = baseMapper.selectById(recruitApplyId);
 		BgtProjectRecruitApply bgtProjectRecruitApply = new BgtProjectRecruitApply();
 		bgtProjectRecruitApply.setId(recruitApplyId);
 //		bgtProjectRecruitApply.setStatus("7");
 		if (baseMapper.deleteById(bgtProjectRecruitApply) > 0) {
 			Long appUserId = SecurityUtils.getAppUserId();
-//			BgtProjectRecruitApply by = selectByUserIdProjectRecruitApplyId(appUserId);
-			BgtProjectRecruitApply by = baseMapper.selectById(recruitApplyId);
 			BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getRecruitId());
 			Map<String, String> mp = new HashMap<>();
 			mp.put("projectName", appById.getRecruitName());
@@ -465,7 +464,7 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
 		mp.put("projectName", recruit.getRecruitName());
 		mp.put("userName", byUserId.getUsername());
 		mp.put("post", typeOfWork.getDictLabel());
-		if (req.getStatus().equals("3")) {
+		if (req.getStatus().equals("4")) {
 			WgzMessage wgzMessage = new WgzMessage().
 				setSenderType(USERTYPE_SYSTEM).
 				setRecipientType(USERTYPE_WGZ).
@@ -495,7 +494,7 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
 			return true;
 		}
 		//系统同意消息
-		if (req.getStatus().equals("4")) {
+		if (req.getStatus().equals("3")) {
 			WgzMessage wgzMessage = new WgzMessage().
 				setSenderType(USERTYPE_SYSTEM).
 				setRecipientType(USERTYPE_WGZ).
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppCancelRegistrationProjectDetailsRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppCancelRegistrationProjectDetailsRes.java
index 23a0758..d737bd3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppCancelRegistrationProjectDetailsRes.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppCancelRegistrationProjectDetailsRes.java
@@ -57,6 +57,9 @@ public class WgzAppCancelRegistrationProjectDetailsRes implements Serializable {
 	@ApiModelProperty("招工开始时间")
 	private String recruitBeginTime;
 
+	@ApiModelProperty("开工日期")
+	private String recruitWorkBeginTime;
+
 	@ApiModelProperty("联系人")
 	private String recruitContactPerson;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppPersonalBasicInformationRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppPersonalBasicInformationRes.java
index 34839de..1fb9692 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppPersonalBasicInformationRes.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppPersonalBasicInformationRes.java
@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 
 @Data
 @NoArgsConstructor
@@ -31,7 +32,7 @@ public class WgzAppPersonalBasicInformationRes implements Serializable {
 	private String nation;
 
 	@ApiModelProperty("出生日期")
-	private String birthdate;
+	private LocalDate birthdate;
 
 	@ApiModelProperty("年龄")
 	private Integer age;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppProjectDetailsRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppProjectDetailsRes.java
index 4c135ad..be97c1f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppProjectDetailsRes.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppProjectDetailsRes.java
@@ -59,6 +59,9 @@ public class WgzAppProjectDetailsRes implements Serializable {
 	@ApiModelProperty("招工开始时间")
 	private String recruitBeginTime;
 
+	@ApiModelProperty("开工日期")
+	private String recruitWorkBeginTime;
+
 	@ApiModelProperty("联系人")
 	private String recruitContactPerson;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzApplyForPayrollSettlementAddRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzApplyForPayrollSettlementAddRes.java
index 8cb85ae..60b4960 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzApplyForPayrollSettlementAddRes.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzApplyForPayrollSettlementAddRes.java
@@ -54,6 +54,10 @@ public class WgzApplyForPayrollSettlementAddRes implements Serializable {
 	@ApiModelProperty("招工开始时间")
 	private String recruitBeginTime;
 
+	@ApiModelProperty("开工日期")
+	private String recruitWorkBeginTime;
+
+
 	@ApiModelProperty("联系人")
 	private String recruitContactPerson;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzUser.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzUser.java
index ca70cd0..ca24660 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzUser.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzUser.java
@@ -9,6 +9,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -54,7 +55,7 @@ public class WgzUser implements Serializable {
     /** 出生日期 */
     @Excel(name = "出生日期")
     @ApiModelProperty("出生日期")
-    private String birthdate;
+    private LocalDate birthdate;
 
     /** 身份证号码 */
     @Excel(name = "身份证号码")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzUserServiceImpl.java
index c9cd778..a912038 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzUserServiceImpl.java
@@ -174,21 +174,24 @@ public class WgzUserServiceImpl extends ServicePlusImpl<WgzUserMapper, WgzUser>
         //2、copy数据返回
         WgzAppPersonalBasicInformationRes wgzAppPersonalBasicInformationRes = new WgzAppPersonalBasicInformationRes();
         BeanUtils.copyProperties(wgzUser,wgzAppPersonalBasicInformationRes);
-		wgzAppPersonalBasicInformationRes.setAge(DataUtil.calculateAge(wgzAppPersonalBasicInformationRes.getBirthdate()));
-		//3、字典类型转换
-		List<SysDictData> typeOfWork = dictTypeService.selectDictDataByType("type_of_work");
-		System.out.println("??         "+typeOfWork.toString());
-		String[] split = wgzAppPersonalBasicInformationRes.getTypeOfWork().split(",");
-		StringBuilder typeOfWorkName = new StringBuilder();
-		for (SysDictData sysDictData : typeOfWork) {
-			for (String s : split) {
-				if (sysDictData.getDictValue().equals(s)){
-					typeOfWorkName.append(sysDictData.getDictLabel()).append(",");
+		if (wgzAppPersonalBasicInformationRes.getBirthdate() != null){
+			wgzAppPersonalBasicInformationRes.setAge(DataUtil.calculateAge(String.valueOf(wgzAppPersonalBasicInformationRes.getBirthdate())));
+		}
+		if (wgzAppPersonalBasicInformationRes.getTypeOfWork() != null){
+			//3、字典类型转换
+			List<SysDictData> typeOfWork = dictTypeService.selectDictDataByType("type_of_work");
+			String[] split = wgzAppPersonalBasicInformationRes.getTypeOfWork().split(",");
+			StringBuilder typeOfWorkName = new StringBuilder();
+			for (SysDictData sysDictData : typeOfWork) {
+				for (String s : split) {
+					if (sysDictData.getDictValue().equals(s)){
+						typeOfWorkName.append(sysDictData.getDictLabel()).append(",");
+					}
 				}
 			}
+			typeOfWorkName.deleteCharAt(typeOfWorkName.length() - 1);
+			wgzAppPersonalBasicInformationRes.setTypeOfWorkName(typeOfWorkName.toString());
 		}
-		typeOfWorkName.deleteCharAt(typeOfWorkName.length() - 1);
-		wgzAppPersonalBasicInformationRes.setTypeOfWorkName(typeOfWorkName.toString());
 		return wgzAppPersonalBasicInformationRes;
     }
 
@@ -199,6 +202,8 @@ public class WgzUserServiceImpl extends ServicePlusImpl<WgzUserMapper, WgzUser>
 		//1、对指定用户进行实名认证
 		WgzUser user = new WgzUser();
 		BeanUtils.copyProperties(req, user);
+		System.out.println("1??????????      "+req.getTypeOfWork());
+		System.out.println("2??????????      "+user.getTypeOfWork());
 		int update = baseMapper.update(user, new LambdaQueryWrapper<WgzUser>().eq(WgzUser::getUserId, req.getUserId()));
 		if (update == 0){
 			throw new RuntimeException("当前用户不存在！");