Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectNewOldVO.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.yifu.archives.vo;
+
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 项目档案更新记录需要的信息
+ *
+ * @author huyc
+ * @date 2022-06-20 17:54:40
+ */
+@Data
+public class EmployeeProjectNewOldVO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 变更前的项目档案
+	 */
+	private TEmployeeProject oldProjectEmployee;
+
+	/**
+	 * 变更后的项目档案
+	 */
+	private TEmployeeProject newProjectEmployee;
+
+}

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectUpdateVO.java

@@ -115,7 +115,7 @@ public class EmployeeProjectUpdateVO extends RowIndex implements Serializable {
     /**
      * 入职日期
      */
-	@ExcelAttribute(name = "入职日期",maxLength = 4)
+	@ExcelAttribute(name = "入职日期")
 	@ExcelProperty(value ="入职日期")
 	@Past
 	@DateTimeFormat("yyyy-MM-dd")

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java

@@ -109,6 +109,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			errorMessageList.stream().forEach(errorMessage -> errorMsgMap.put(errorMessage.getLineNum(),errorMessage));
 		}
 
+		List<TEmployeeProject> updateList = new ArrayList<>();
 		Set<String> errorMsg;
 		// 执行数据插入操作 组装
 		for (int i = 0; i < excelVOList.size(); i++) {
@@ -120,21 +121,17 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			TEmpChangeInfoVO excel = excelVOList.get(i);
 
 			if (Common.isNotNull(excel.getChangeStartMonth()) && excel.getChangeStartMonth().length() > CommonConstants.dingleDigitIntArray[6]) {
-				errorMsg.add("第" + (i + 2) + "行划转起始月长度不能超过6位");
-				errorMsgMap.put((i + 2L), new ErrorMessage("第" + (i + 2) + "行划转起始月长度不能超过6位"));
+				errorMsg.add("划转起始月长度不能超过6位");
 			}
 			if (!Common.isEmpty(excel.getChangeStartMonth()) && !PATTERN.matcher(excel.getChangeStartMonth()).matches()) {
-				errorMsg.add("第" + (i + 2) + "行划转起始月格式错误");
-				errorMsgMap.put((i + 2L), new ErrorMessage("第" + (i + 2) + "行划转起始月格式错误"));
+				errorMsg.add("划转起始月格式错误");
 			}
 			if (excel.getUnsettleDeal().equals(CommonConstants.IS_CHANGE)) {
 				if (Common.isEmpty(excel.getChangeStartMonth())) {
-					errorMsg.add("第" + (i + 2) + "行划转起始月不能为空");
-					errorMsgMap.put((i + 2L), new ErrorMessage("第" + (i + 2) + "行划转起始月不能为空"));
+					errorMsg.add("划转起始月不能为空");
 				} else if (PATTERN.matcher(excel.getChangeStartMonth()).matches()) {
 					if (Integer.parseInt(excel.getChangeStartMonth()) > Integer.parseInt(DateUtil.getThisMonth())) {
-						errorMsg.add("第" + (i + 2) + "行划转起始月要小于等于当前月");
-						errorMsgMap.put((i + 2L), new ErrorMessage("第" + (i + 2) + "行划转起始月要小于等于当前月"));
+						errorMsg.add("划转起始月要小于等于当前月");
 					}
 				}
 			}
@@ -174,7 +171,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 							updateTEmployeePro.setUnitNo(tCustomerInfo.getCustomerCode());
 							updateTEmployeePro.setUnitName(tCustomerInfo.getCustomerName());
 						}
-						tEmployeeProjectService.updateById(updateTEmployeePro);
+						updateList.add(updateTEmployeePro);
 						// 记录变更日志
 						TEmployeeProject tEmployeeProjectOld = tEmployeeProjectService.getById(updateTEmployeePro.getId());
 						tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", tEmployeeProjectOld.getId(), tEmployeeProjectOld, updateTEmployeePro);
@@ -182,13 +179,16 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 				} else {
 					errorMsg.add(MsgUtils.getMessage(ErrorCodes.PROJECT_PERSON_SEARCH_EXIT, excel.getOldSettleCode()));
 				}
-			} else {
-				// 数据不合法
+			}
+			if (!CollUtil.isEmpty(errorMsg)) {
 				errorMessageList.add(new ErrorMessage((long) (i + 2), errorMsg));
 			}
 		}
+
 		if (CollUtil.isNotEmpty(errorMessageList)) {
 			return R.failed(errorMessageList);
+		} else {
+			tEmployeeProjectService.updateBatchById(updateList);
 		}
 		return R.ok();
 	}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java

@@ -174,6 +174,9 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 		if (Common.isNotNull(entity.getContractType())){
 			wrapper.eq(TEmpContractAlert::getContractType,entity.getContractType());
 		}
+		if (Common.isNotNull(entity.getContractTerm())){
+			wrapper.eq(TEmpContractAlert::getContractTerm,entity.getContractTerm());
+		}
 		if (Common.isNotNull(entity.getFileProvince())){
 			wrapper.eq(TEmpContractAlert::getFileProvince,entity.getFileProvince());
 		}
@@ -250,6 +253,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 			return;
 		}
 		alert = new TEmpContractAlert();
+		alert.setContractId(contract.getId());
 		alert.setAlertPerson(contract.getCreateName());
 		alert.setEmpName(contract.getEmpName());
 		alert.setEmpId(contract.getEmpId());

yifu-archives/yifu-archives-biz/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 # 加解密根密码
 jasypt:
   encryptor:
-    password: pig #根密码
+    password: yifu #根密码
 # 暴露监控端点
 management:
   endpoints:
@@ -30,6 +30,10 @@ mybatis-plus:
 
 # spring security 配置
 security:
+  #client:
+  #  client-id: pig
+  #  client-secret: pig
+  #  scope: server
   oauth2:
     resource:
       loadBalanced: true

yifu-auth/src/main/java/com/yifu/cloud/plus/v1/yifu/auth/filter/PasswordDecoderFilter.java

@@ -33,7 +33,8 @@ public class PasswordDecoderFilter extends UsernamePasswordAuthenticationFilter
 	/**
 	 * 解密登录前端密码 秘钥
 	 */
-	private String encodeKey = "thanks,pig4cloud";
+	//private String encodeKey = "thanks,pig4cloud";
+	private String encodeKey = "thanks,yifucloud";
 
 	private boolean postOnly = true;
 

yifu-auth/src/main/resources/application.yml

@@ -3,10 +3,11 @@ server:
 # 加解密根密码
 jasypt:
   encryptor:
-    password: pig #根密码
+    password: yifu #根密码
 # 前端界面秘钥
 gateway:
-  encode-key: 'thanks,pig4cloud'
+  #encode-key: 'thanks,pig4cloud'
+  encode-key: 'thanks,yifucloud'
 # 暴露监控端点
 management:
   endpoints:
@@ -34,8 +35,8 @@ mybatis-plus:
 security:
   oauth2:
     client:
-      client-id: ENC(27v1agvAug87ANOVnbKdsw==)
-      client-secret: ENC(VbnkopxrwgbFVKp+UxJ2pg==)
+      client-id: ENC(pRAt3XaQaL5rFZbqyWJfpQ==)
+      client-secret: ENC(V9n6n7YdBOc8Lx/XGM3Irg==)
       scope: server
     resource:
       loadBalanced: true

yifu-check/yifu-check-biz/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 # 加解密根密码
 jasypt:
   encryptor:
-    password: pig #根密码
+    password: yifu #根密码
 # 暴露监控端点
 management:
   endpoints:

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java

@@ -296,7 +296,7 @@ public interface ErrorCodes {
 	 */
 	String ARCHIVES_PROJECT_CHANGE_NOT_EXIST = "archives.project.change.not.exist";
 	/**
-	 * 存在其他草稿/已审核的状态的项目，不允许同步减档
+	 * 该人员存在其他进行中的项目，禁止同步减档！
 	 */
 	String QT_PROJECT_CHANGE_NOT_EXIST = "qt.project.change.not.exist";
 	/**

yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties

@@ -98,7 +98,7 @@ archives.project.change.not.exist=\u4EBA\u5458\u5728\u8BE5\u9879\u76EE\u4E0B\u5B
 
 archives.project.emp.lose.fee.not.empty=\u4E0D\u826F\u8BB0\u5F55\u8D39\u7528\u635F\u5931\u548C\u5176\u4ED6\u635F\u5931\u4E0D\u53EF\u540C\u65F6\u4E3A\u7A7A
 
-qt.project.change.not.exist=\u5B58\u5728\u5176\u4ED6\u8349\u7A3F/\u5DF2\u5BA1\u6838\u7684\u72B6\u6001\u7684\u9879\u76EE\uFF0C\u4E0D\u5141\u8BB8\u540C\u6B65\u51CF\u6863
+qt.project.change.not.exist=\u8BE5\u4EBA\u5458\u5B58\u5728\u5176\u4ED6\u8FDB\u884C\u4E2D\u7684\u9879\u76EE\uFF0C\u7981\u6B62\u540C\u6B65\u51CF\u6863
 project.search.not.exist=\u672A\u627E\u5230\u5BF9\u5E94\u7684\u9879\u76EE\uFF0C\u8BF7\u6838\u5B9E
 
 change.strat.month.exit=\u5212\u8F6C\u8D77\u59CB\u6708\u4E0D\u80FD\u4E3A\u7A7A

yifu-job/yifu-job-biz/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 # 加解密根密码
 jasypt:
   encryptor:
-    password: pig #根密码
+    password: yifu #根密码
 # 暴露监控端点
 management:
   endpoints:
@@ -16,8 +16,8 @@ management:
 security:
   oauth2:
     client:
-      client-id: ENC(27v1agvAug87ANOVnbKdsw==)
-      client-secret: ENC(VbnkopxrwgbFVKp+UxJ2pg==)
+      client-id: ENC(K5ErrbgsBtqiWfy7CpBzYg==)
+      client-secret: ENC(skHg7VwJV+1YWXR9RpsiBg==)
       scope: server
     resource:
       loadBalanced: true

yifu-social/yifu-social-biz/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 # 加解密根密码
 jasypt:
   encryptor:
-    password: pig #根密码
+    password: yifu #根密码
 # 暴露监控端点
 management:
   endpoints:

yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/service/impl/SysUserServiceImpl.java

@@ -192,9 +192,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 				MsgUtils.getMessage(ErrorCodes.SYS_USER_UPDATE_PASSWORDERROR));
 
 		SysUser sysUser = new SysUser();
-		if (StrUtil.isNotBlank(userDto.getNewpassword1())) {
+		/*if (StrUtil.isNotBlank(userDto.getNewpassword1())) {
 			sysUser.setPassword(ENCODER.encode(userDto.getNewpassword1()));
-		}
+		}*/
 		sysUser.setPhone(userDto.getPhone());
 		sysUser.setUserId(userVO.getUserId());
 		sysUser.setAvatar(userDto.getAvatar());
@@ -215,9 +215,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		BeanUtils.copyProperties(userDto, sysUser);
 		sysUser.setUpdateTime(LocalDateTime.now());
 
-		if (StrUtil.isNotBlank(userDto.getPassword())) {
+		/*if (StrUtil.isNotBlank(userDto.getPassword())) {
 			sysUser.setPassword(ENCODER.encode(userDto.getPassword()));
-		}
+		}*/
 		this.updateById(sysUser);
 
 		sysUserRoleMapper

yifu-upms/yifu-upms-biz/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 # 加解密根密码
 jasypt:
   encryptor:
-    password: pig #根密码
+    password: yifu #根密码
 # 暴露监控端点
 management:
   endpoints:

yifu-visual/yifu-codegen/src/main/resources/application.yml

@@ -3,13 +3,13 @@ server:
 # 加解密根密码
 jasypt:
   encryptor:
-    password: pig #根密码
+    password: yifu #根密码
 ## spring security 配置
 security:
   oauth2:
     client:
-      client-id: ENC(27v1agvAug87ANOVnbKdsw==)
-      client-secret: ENC(VbnkopxrwgbFVKp+UxJ2pg==)
+      client-id: ENC(wWI+Jy4pPr4Ejk/KUX88sQ==)
+      client-secret: ENC(cejw0YoLBXxtLKW3vSFjNw==)
       scope: server
     resource:
       loadBalanced: true