Merge branch 'MVP1.6.1' into develop

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

 package com.yifu.cloud.plus.v1.yifu.archives.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author fxj
@@ -68,6 +73,12 @@ public class UpProjectSocialFundVo implements Serializable {
 	 */
 	@Schema(description = "专业" )
 	private String major;
+
+	/**
+	 * 毕业时间
+	 */
+	@Schema(description = "毕业时间")
+	private Date gradutionDate;
 	// 是否更新学历标识
 	String flag;
 }

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

@@ -1425,6 +1425,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 					employee.setMajor(vo.getMajor());
 				}
 			}
+			if (Common.isNotNull(vo.getGradutionDate())){
+				employee.setGradutionDate(vo.getGradutionDate());
+			}
 			tEmployeeInfoMapper.updateSocialInfoById(employee);
 		}
 		TEmployeeProject project = baseMapper.selectOne(Wrappers.<TEmployeeProject>query().lambda()

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml

@@ -1142,6 +1142,7 @@
 			<if test="tEmployeeInfo.hignEducation != null">HIGN_EDUCATION=#{tEmployeeInfo.hignEducation},</if>
 			<if test="tEmployeeInfo.school != null">SCHOOL=#{tEmployeeInfo.school},</if>
 			<if test="tEmployeeInfo.major != null">MAJOR=#{tEmployeeInfo.major},</if>
+			<if test="tEmployeeInfo.gradutionDate != null">GRADUTION_DATE=#{tEmployeeInfo.gradutionDate},</if>
 			<if test="tEmployeeInfo.contactAddress != null">CONTACT_ADDRESS=#{tEmployeeInfo.contactAddress},</if>
 			<if test="tEmployeeInfo.isCollege != null">IS_COLLEGE='1',</if>
 			<if test="tEmployeeInfo.fileProvince != null">a.FILE_PROVINCE=#{tEmployeeInfo.fileProvince},</if>

yifu-insurances/yifu-insurances-biz/src/main/resources/logback-spring.xml

@@ -50,7 +50,7 @@
 
 
   <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
-  <root level="INFO">
+  <root level="error">
     <appender-ref ref="console"/>
     <appender-ref ref="debug"/>
     <appender-ref ref="error"/>

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/controller/SysRoleInfoController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.permission.service.SysRoleInfoService;
 import com.yifu.cloud.plus.v1.permission.service.SysUserRoleResService;
+import com.yifu.cloud.plus.v1.yifu.admin.api.vo.HcmRoleInfoVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
@@ -161,4 +162,14 @@ public class SysRoleInfoController {
 		return R.ok();
 	}
 
+	/**
+	 * 获取ekp角色列表
+	 * @return 角色列表
+	 */
+	@Operation(description = "HCM获取ekp角色列表")
+	@SysLog("HCM获取ekp角色列表--HCM调用接口")
+	@GetMapping("/getEkpRoleList")
+	public R<List<HcmRoleInfoVo>> getRoleList() {
+		return R.ok(sysRoleInfoService.getRoleList());
+	}
 }

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/mapper/SysRoleInfoMapper.java

@@ -18,6 +18,7 @@ package com.yifu.cloud.plus.v1.permission.mapper;/*
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.admin.api.vo.HcmRoleInfoVo;
 import com.yifu.cloud.plus.v1.yifu.permission.entity.SysRoleInfo;
 import com.yifu.cloud.plus.v1.yifu.permission.vo.SysRoleInfoSearchVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -68,4 +69,10 @@ public interface SysRoleInfoMapper extends BaseMapper<SysRoleInfo> {
 	 **/
 	int checkExistenceRole(@Param("roleName") String roleName, @Param("roleId") String roleId);
 
+
+	/**
+	 * hcm查询角色信息
+	 * @return
+	 */
+	List<HcmRoleInfoVo> getRoleList();
 }

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/SysRoleInfoService.java

@@ -18,6 +18,7 @@ package com.yifu.cloud.plus.v1.permission.service;/*
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.admin.api.vo.HcmRoleInfoVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.permission.entity.SysRoleInfo;
 import com.yifu.cloud.plus.v1.yifu.permission.vo.SysRoleInfoSaveVo;
@@ -78,4 +79,9 @@ public interface SysRoleInfoService extends IService<SysRoleInfo> {
 	 **/
 	String getRoleDataAuthByRoleId(List<String> roleIdList);
 
+	/**
+	 * hcm查询ekp全部的角色列表
+	 * @return list
+	 */
+	List<HcmRoleInfoVo> getRoleList();
 }

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysRoleInfoServiceImpl.java

@@ -12,6 +12,7 @@ import com.yifu.cloud.plus.v1.permission.mapper.SysMenuMapper;
 import com.yifu.cloud.plus.v1.permission.mapper.SysRoleInfoMapper;
 import com.yifu.cloud.plus.v1.permission.service.SysRoleInfoService;
 import com.yifu.cloud.plus.v1.permission.service.SysRoleMenuResService;
+import com.yifu.cloud.plus.v1.yifu.admin.api.vo.HcmRoleInfoVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
@@ -197,4 +198,13 @@ public class SysRoleInfoServiceImpl extends ServiceImpl<SysRoleInfoMapper, SysRo
 		return wrapper;
 	}
 
+
+	/**
+	 * hcm查询ekp全部的角色
+	 * @return list
+	 */
+	@Override
+	public List<HcmRoleInfoVo> getRoleList() {
+		return baseMapper.getRoleList();
+	}
 }

yifu-permission/yifu-permission-biz/src/main/resources/application-dev.yml

@@ -8,7 +8,6 @@ spring:
       on-profile: dev
   redis:
     host: 127.0.0.1
-    password: '@yf_2017'
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -25,16 +24,3 @@ spring:
       maximum-pool-size: 12 # 连接池最大连接数，默认是10
       auto-commit: true  #此属性控制从池返回的连接的默认自动提交行为,默认值：true
       max-lifetime: 0 #此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认1800000即30分钟
-## spring security 配置
-security:
-  oauth2:
-    resource:
-      loadBalanced: true
-      token-info-uri: http://127.0.0.1:3000/oauth/check_token
-    # 直接放行URL
-    ignore:
-      urls:
-        - /v3/api-docs
-        - /actuator/**
-        - /swagger-ui/**
-        - /msg/**
\ No newline at end of file

yifu-permission/yifu-permission-biz/src/main/resources/application-prd.yml

@@ -26,16 +26,3 @@ spring:
       maximum-pool-size: 12 # 连接池最大连接数，默认是10
       auto-commit: true  #此属性控制从池返回的连接的默认自动提交行为,默认值：true
       max-lifetime: 0 #此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认1800000即30分钟
-## spring security 配置
-security:
-  oauth2:
-    resource:
-      loadBalanced: true
-      token-info-uri: http://127.0.0.1:3000/oauth/check_token
-    # 直接放行URL
-    ignore:
-      urls:
-        - /v3/api-docs
-        - /actuator/**
-        - /swagger-ui/**
-        - /msg/**
\ No newline at end of file

yifu-permission/yifu-permission-biz/src/main/resources/application-test.yml

@@ -26,15 +26,3 @@ spring:
       maximum-pool-size: 12 # 连接池最大连接数，默认是10
       auto-commit: true  #此属性控制从池返回的连接的默认自动提交行为,默认值：true
       max-lifetime: 0 #此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认1800000即30分钟
-## spring security 配置
-security:
-  oauth2:
-    resource:
-      loadBalanced: true
-      token-info-uri: http://127.0.0.1:3000/oauth/check_token
-    # 直接放行URL
-    ignore:
-      urls:
-        - /v3/api-docs
-        - /actuator/**
-        - /swagger-ui/**
\ No newline at end of file

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

@@ -28,6 +28,19 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
+# spring security 配置
+security:
+  oauth2:
+    resource:
+      loadBalanced: true
+      token-info-uri: http://yifu-auth/oauth/check_token
+    ignore: # 通用放行URL，服务个性化，请在对应配置文件覆盖
+      urls:
+        - /v3/api-docs
+        - /actuator/**
+        - /swagger-ui/**
+        - /sysroleinfo/getEkpRoleList
+
 spring:
   application:
     name: @artifactId@

yifu-permission/yifu-permission-biz/src/main/resources/logback-spring.xml

@@ -49,7 +49,7 @@
   </appender>
 
   <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
-  <root level="INFO">
+  <root level="error">
     <appender-ref ref="console"/>
     <appender-ref ref="debug"/>
     <appender-ref ref="error"/>

yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysRoleInfoMapper.xml

@@ -36,6 +36,12 @@
     <result property="updateBy" column="UPDATE_BY"/>
     <result property="updateTime" column="UPDATE_TIME"/>
   </resultMap>
+
+
+	<resultMap id="HcmRoleMap" type="com.yifu.cloud.plus.v1.yifu.admin.api.vo.HcmRoleInfoVo">
+		<result column="fd_id" property="roleId"/>
+		<result column="role_name" property="roleName"/>
+	</resultMap>
     <sql id="Base_Column_List">
                 a.fd_id,
                 a.role_name,
@@ -135,4 +141,13 @@
 		</if>
     </select>
 
+
+	<select id="getRoleList" resultMap="HcmRoleMap">
+		SELECT
+			a.fd_id,
+			a.role_name
+		FROM
+			sys_role_info a
+		where a.status = 0 and a.delete_flag = 0
+	</select>
 </mapper>

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java

@@ -614,6 +614,12 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 						if (Common.isNotNull(excel.getEmpName())) {
 							emp.setEmpName(excel.getEmpName());
 						}
+						// 2024-2-4 16:05:56 hgw 银行卡需要校验
+						String pre = getCheckBankNo(emp, old);
+						if (pre != null) {
+							errorMessageList.add(new ErrorMessage(excel.getRowIndex(), pre));
+							continue;
+						}
 						// 变更日志 fxj 2023-10-24
 						logService.initModLog(old,emp,CommonConstants.ONE_STRING,user.getNickname(),util);
 						baseMapper.updateById(emp);
@@ -749,6 +755,12 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 		List<TSalaryEmployee> updateList = new ArrayList<>();
 		TSettleDomain dept = vo.getDept();
 		Map<String, String> bankMap = tBankSetService.getBankMap(null);
+
+		// 校验卡号所用的
+		Map<String, Boolean> bankCheckMap = new HashMap<>();
+		List<TCheckBankNo> bankList = new ArrayList<>();
+		TCheckBankNo checkBankNo;
+
 		for (int i = 0; i < excelVOList.size(); i++) {
 			excel = excelVOList.get(i);
 			if (excel != null) {
@@ -818,6 +830,15 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 							emp.setDeptName(dept.getDepartName());
 							emp.setDeptNo(dept.getDepartNo());
 							emp.setInvoiceTitle(dept.getInvoiceTitleSalary());
+
+							if (Common.isNotNull(excel.getBankNo())) {
+								checkBankNo = new TCheckBankNo();
+								emp.setLineNums((i + 2));
+								checkBankNo.setName(excel.getEmpName());
+								checkBankNo.setBankNo(excel.getBankNo());
+								bankList.add(checkBankNo);
+							}
+
 							updateList.add(emp);
 							if (curTaxMonth) {
 								errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.CUR_TAX_INFO));
@@ -878,6 +899,13 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 								excel.setDeptName(dept.getDepartName());
 								excel.setDeptNo(dept.getDepartNo());
 								excel.setInvoiceTitle(dept.getInvoiceTitleSalary());
+								if (Common.isNotNull(excel.getBankNo())) {
+									checkBankNo = new TCheckBankNo();
+									excel.setLineNums((i + 2));
+									checkBankNo.setName(excel.getEmpName());
+									checkBankNo.setBankNo(excel.getBankNo());
+									bankList.add(checkBankNo);
+								}
 								saveList.add(excel);
 								errorMessageList.add(new ErrorMessage((i + 2), CommonConstants.SAVE_SUCCESS));
 							}
@@ -890,11 +918,42 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 				errorMessageList.add(new ErrorMessage(CommonConstants.ZERO_INT, SalaryConstants.DATA_MUST));
 			}
 		}
+
+		if (bankList != null && !bankList.isEmpty()) {
+			R<CheckBatchVo> checkListR = HttpDaprUtil.invokeMethodPost(checkProperties.getAppUrl(), checkProperties.getAppId()
+					, "/tcheckbankno/inner/checkBankNoBatch", bankList, CheckBatchVo.class, SecurityConstants.FROM_IN);
+			if (checkListR != null && checkListR.getData() != null) {
+				bankCheckMap = checkListR.getData().getCheckMap();
+			}
+		}
+
 		if (!updateList.isEmpty()) {
-			this.updateBatchById(updateList);
+			List<TSalaryEmployee> newUpdateList = new ArrayList<>();
+			for (TSalaryEmployee employee : updateList) {
+				if (bankCheckMap.get(employee.getBankNo()) != null && Boolean.FALSE.equals(bankCheckMap.get(employee.getBankNo()))) {
+					errorMessageList.add(new ErrorMessage(employee.getLineNums(), "第" + employee.getLineNums()
+							+ "行：-上次代发户未校验【姓名与卡号】，本次校验结果：不匹配。请去薪酬人员查询处更新卡号信息！"));
+				} else {
+					employee.setIssueStatus(CommonConstants.ZERO_INT);
+					employee.setLineNums(null);
+					newUpdateList.add(employee);
+				}
+			}
+			this.updateBatchById(newUpdateList);
 		}
 		if (!saveList.isEmpty()) {
-			this.saveBatch(saveList);
+			List<TSalaryEmployee> newSaveList = new ArrayList<>();
+			for (TSalaryEmployee employee : saveList) {
+				if (bankCheckMap.get(employee.getBankNo()) != null && Boolean.FALSE.equals(bankCheckMap.get(employee.getBankNo()))) {
+					errorMessageList.add(new ErrorMessage(employee.getLineNums(), "第" + employee.getLineNums()
+							+ "行：-上次代发户未校验【姓名与卡号】，本次校验结果：不匹配。请去薪酬人员查询处更新卡号信息！"));
+				} else {
+					employee.setIssueStatus(CommonConstants.ZERO_INT);
+					employee.setLineNums(null);
+					newSaveList.add(employee);
+				}
+			}
+			this.saveBatch(newSaveList);
 		}
 		boolean isTrue = true;
 		for (ErrorMessage message : errorMessageList) {
@@ -958,8 +1017,13 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 		if (Common.isEmpty(user)){
 			return R.failed(CommonConstants.USER_FAIL);
 		}
-		// 变更日志 fxj 2023-10-24
+
 		TSalaryEmployee old = baseMapper.selectById(tSalaryEmployee.getId());
+		// 2024-2-4 16:05:56 hgw 银行卡需要校验
+		String pre = getCheckBankNo(tSalaryEmployee, old);
+		if (pre != null) return R.failed(pre);
+
+		// 变更日志 fxj 2023-10-24
 		logService.initModLog(old,tSalaryEmployee,CommonConstants.ZERO_STRING,user.getNickname(),null);
 		int res = baseMapper.updateById(tSalaryEmployee);
 		if (res >= CommonConstants.ZERO_INT){
@@ -968,4 +1032,36 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 			return R.failed(CommonConstants.UPDATE_DATA_FAIL);
 		}
 	}
+
+	/**
+	 * @Description: 单个校验通用方法
+	 * @Author: hgw
+	 * @Date: 2024/2/4 17:15
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
+	 **/
+	private String getCheckBankNo(TSalaryEmployee tSalaryEmployee, TSalaryEmployee old) {
+		if (old != null && Common.isNotNull(tSalaryEmployee.getBankNo()) && !tSalaryEmployee.getBankNo().equals(old.getBankNo())) {
+			// 调用校验服务
+			TCheckBankNo checkBankNo = new TCheckBankNo();
+			checkBankNo.setName(tSalaryEmployee.getEmpName());
+			checkBankNo.setBankNo(tSalaryEmployee.getBankNo());
+			R<CheckBankNoVo> checkListR = HttpDaprUtil.invokeMethodPost(checkProperties.getAppUrl(), checkProperties.getAppId()
+					, "/tcheckbankno/inner/checkBankNo", checkBankNo, CheckBankNoVo.class, SecurityConstants.FROM_IN);
+			String pre = "姓名与卡号验证：";
+			if (checkListR != null && checkListR.getData() != null) {
+				CheckBankNoVo vo = checkListR.getData();
+				TCheckBankNo check = (null == vo.getRes()) ? null : vo.getRes().getData();
+				if (Common.isEmpty(vo)) {
+					return pre + SalaryConstants.CHECK_NO_RESPONSE;
+				} else if (!CommonConstants.SUCCESS.equals(vo.getRes().getCode())) {
+					return pre + vo.getRes().getMsg();
+				} else if (check != null && !check.getResult().equals(CommonConstants.ZERO_ONE)) {
+					return pre + check.getRemark();
+				}
+			} else {
+				return pre + SalaryConstants.CHECK_NO_RESPONSE;
+			}
+		}
+		return null;
+	}
 }

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java

@@ -646,6 +646,15 @@ public class TDispatchInfo extends BaseEntity {
 	@ExcelProperty(value ="专业")
 	private String major;
 
+	/**
+	 * 毕业时间
+	 */
+	@ExcelAttribute(name = "毕业时间", isDate = true)
+	@Schema(description = "毕业时间" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("毕业时间" )
+	private Date graduationTime;
+
 	/**
 	 * 首次至缴纳地时间
 	 */

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java

@@ -458,6 +458,16 @@ public class SocialHandleExportVo implements Serializable {
 	@ExcelProperty(value ="专业")
 	private String major;
 
+	/**
+	 * 毕业时间
+	 */
+	@DateTimeFormat("yyyy-MM-dd")
+	@ExcelAttribute(name = "毕业时间", isDate = true)
+	@Schema(description = "毕业时间" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("毕业时间" )
+	private Date graduationTime;
+
 	/**
 	 * 首次至缴纳地时间
 	 */

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchAuditExportVo.java

@@ -375,6 +375,16 @@ public class TDispatchAuditExportVo {
 	@ExcelProperty(value ="专业")
 	private String major;
 
+	/**
+	 * 毕业时间
+	 */
+	@DateTimeFormat("yyyy-MM-dd")
+	@ExcelAttribute(name = "毕业时间", isDate = true)
+	@Schema(description = "毕业时间" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("毕业时间" )
+	private Date graduationTime;
+
 	/**
 	 * 首次至缴纳地时间
 	 */

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java

@@ -290,6 +290,15 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	@ExcelProperty(value ="学校")
 	private String schoolName;
 
+	/**
+	 * 毕业时间
+	 */
+	@ExcelAttribute(name = "毕业时间", isDate = true)
+	@Schema(description = "毕业时间" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("毕业时间" )
+	private Date graduationTime;
+
 	/**
 	 * 专业
 	 */

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java

@@ -501,6 +501,16 @@ public class TDispatchInfoExportVo {
 	@ExcelProperty(value ="专业")
 	private String major;
 
+	/**
+	 * 毕业时间
+	 */
+	@DateTimeFormat("yyyy-MM-dd")
+	@ExcelAttribute(name = "毕业时间", isDate = true)
+	@Schema(description = "毕业时间" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("毕业时间" )
+	private Date graduationTime;
+
 	/**
 	 * 首次至缴纳地时间
 	 */

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -852,6 +852,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					if (Common.isNotNull(excel.getMajor())){
 						vo.setMajor(excel.getMajor());
 					}
+					if (Common.isNotNull(excel.getGraduationTime())){
+						vo.setGradutionDate(excel.getGraduationTime());
+					}
 				}
 			}
 		}
@@ -1326,6 +1329,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		dispatch.setEducationName(excel.getEducationName());
 		dispatch.setSchoolName(excel.getSchoolName());
 		dispatch.setMajor(excel.getMajor());
+		dispatch.setGraduationTime(excel.getGraduationTime());
 		dispatch.setFirstPayTime(excel.getFirstPayTime());
 		dispatch.setIdCardProvince(excel.getIdCardProvince());
 		dispatch.setIdCardCity(excel.getIdCardCity());
@@ -2134,6 +2138,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		emp.setEmpRegisType(excel.getEmpRegisType());
 		emp.setHignEducation(excel.getEducationName());
 		emp.setMajor(excel.getMajor());
+		emp.setGradutionDate(excel.getGraduationTime());
 		emp.setSchool(excel.getSchoolName());
 		emp.setContractStatus(CommonConstants.ZERO_INT);
 		emp.setDeleteFlag(CommonConstants.ZERO_STRING);

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -102,6 +102,7 @@
 	  <result property="schoolName" column="SCHOOL_NAME"/>
 	  <result property="major" column="MAJOR"/>
 	  <result property="firstPayTime" column="FIRST_PAY_TIME"/>
+	  <result property="graduationTime" column="GRADUATION_TIME"/>
 
   </resultMap>
 	<resultMap id="dispatchPageMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPageVo" extends="tDispatchInfoMap">
@@ -172,6 +173,7 @@
 		<result property="schoolName" column="SCHOOL_NAME"/>
 		<result property="major" column="MAJOR"/>
 		<result property="firstPayTime" column="FIRST_PAY_TIME"/>
+		<result property="graduationTime" column="GRADUATION_TIME"/>
 	</resultMap>
 
 	<resultMap id="fundSupplementaryMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.FundSupplementaryExportVo">
@@ -341,6 +343,7 @@
 		<result property="schoolName" column="SCHOOL_NAME"/>
 		<result property="major" column="MAJOR"/>
 		<result property="firstPayTime" column="FIRST_PAY_TIME"/>
+		<result property="graduationTime" column="GRADUATION_TIME"/>
 	</resultMap>
 
     <sql id="Base_Column_List">
@@ -420,7 +423,8 @@
 		a.ORDER_ID,
 		a.SCHOOL_NAME,
 		a.MAJOR,
-		a.FIRST_PAY_TIME
+		a.FIRST_PAY_TIME,
+		a.GRADUATION_TIME
     </sql>
     <sql id="tDispatchInfo_where">
         <if test="tDispatchInfo != null">
@@ -955,7 +959,8 @@
 		a.EDUCATION_NAME,
 		a.SCHOOL_NAME,
 		a.MAJOR,
-		a.FIRST_PAY_TIME
+		a.FIRST_PAY_TIME,
+		a.GRADUATION_TIME
 
 		from t_dispatch_info a
 		left join t_social_info s on s.id=a.SOCIAL_ID
@@ -1016,7 +1021,8 @@
 		a.EDUCATION_NAME,
 		a.SCHOOL_NAME,
 	    a.MAJOR,
-	    a.FIRST_PAY_TIME
+	    a.FIRST_PAY_TIME,
+		a.GRADUATION_TIME
 		from t_dispatch_info a
 		left join t_social_info b on a.SOCIAL_ID = b.ID
 		left join t_provident_fund c on a.FUND_ID = C.ID
@@ -1103,6 +1109,7 @@
 		<result property="schoolName" column="SCHOOL_NAME"/>
 		<result property="major" column="MAJOR"/>
 		<result property="firstPayTime" column="FIRST_PAY_TIME"/>
+		<result property="graduationTime" column="GRADUATION_TIME"/>
 	</resultMap>
 
 	<resultMap id="fundHandleMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.FundHandleExportVo">
@@ -1191,7 +1198,8 @@
 		'1'  as EXPORT_SOCIAL_FLAG,
 		a.SCHOOL_NAME,
 		a.MAJOR,
-		a.FIRST_PAY_TIME
+		a.FIRST_PAY_TIME,
+		a.GRADUATION_TIME
 		FROM t_dispatch_info a
 		left join t_social_info s on a.SOCIAL_ID = s.id
 		<include refid="where_getSocialRecordRoster"/>

yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/vo/HcmRoleInfoVo.java

+package com.yifu.cloud.plus.v1.yifu.admin.api.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class HcmRoleInfoVo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "角色编号")
+	private Long roleId;
+
+	@Schema(description = "角色名称")
+	private String roleName;
+}

yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/RoleController.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.plugin.excel.annotation.RequestExcel;
 import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysRole;
+import com.yifu.cloud.plus.v1.yifu.admin.api.vo.HcmRoleInfoVo;
 import com.yifu.cloud.plus.v1.yifu.admin.api.vo.RoleExcelVO;
 import com.yifu.cloud.plus.v1.yifu.admin.api.vo.RoleVo;
 import com.yifu.cloud.plus.v1.yifu.admin.service.SysRoleMenuService;
@@ -31,9 +32,9 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import org.springframework.boot.autoconfigure.integration.IntegrationProperties;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -125,6 +126,18 @@ public class RoleController {
 				.eq(SysRole::getDelFlag, CommonConstants.ZERO_STRING)));
 	}
 
+
+	/**
+	 * 获取角色列表
+	 * @return 角色列表
+	 */
+	@Operation(description = "HCM获取角色列表")
+	@SysLog("HCM获取角色列表--HCM调用接口")
+	@GetMapping("/getRoleList")
+	public R<List<HcmRoleInfoVo>> getRoleList() {
+		return R.ok(sysRoleService.getRoleList());
+	}
+
 	/**
 	 * 分页查询角色信息
 	 * @param page 分页对象

yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/mapper/SysRoleMapper.java

@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.admin.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysRole;
 import com.yifu.cloud.plus.v1.yifu.admin.api.vo.BusinessRoleMenuVo;
+import com.yifu.cloud.plus.v1.yifu.admin.api.vo.HcmRoleInfoVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -46,4 +47,10 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
 	List<BusinessRoleMenuVo> getRoleAndMenu(@Param("type")String type);
 
 	Set<String> getRoleByUserIdAndClient(@Param("userId")String userId, @Param("clientId") String clientId);
+
+	/**
+	 * hcm查询角色信息
+	 * @return
+	 */
+	List<HcmRoleInfoVo> getRoleList();
 }

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

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysRole;
 import com.yifu.cloud.plus.v1.yifu.admin.api.vo.BusinessRoleMenuVo;
+import com.yifu.cloud.plus.v1.yifu.admin.api.vo.HcmRoleInfoVo;
 import com.yifu.cloud.plus.v1.yifu.admin.api.vo.RoleExcelVO;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import org.springframework.validation.BindingResult;
@@ -58,6 +59,12 @@ public interface SysRoleService extends IService<SysRole> {
 	 */
 	List<RoleExcelVO> listRole();
 
+	/**
+	 * hcm查询全部的角色列表
+	 * @return list
+	 */
+	List<HcmRoleInfoVo> getRoleList();
+
 	Page<SysRole> getSysRoleByPage(Page page, SysRole sysRole);
 	/**
 	 * 更新角色信息

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

@@ -28,6 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysRole;
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysRoleMenu;
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUserRole;
 import com.yifu.cloud.plus.v1.yifu.admin.api.vo.BusinessRoleMenuVo;
+import com.yifu.cloud.plus.v1.yifu.admin.api.vo.HcmRoleInfoVo;
 import com.yifu.cloud.plus.v1.yifu.admin.api.vo.RoleExcelVO;
 import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysRoleMapper;
 import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysRoleMenuMapper;
@@ -153,6 +154,15 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 		}).collect(Collectors.toList());
 	}
 
+	/**
+	 * hcm查询全部的角色
+	 * @return list
+	 */
+	@Override
+	public List<HcmRoleInfoVo> getRoleList() {
+		return baseMapper.getRoleList();
+	}
+
 	@Override
 	public Page<SysRole> getSysRoleByPage(Page page, SysRole sysRole) {
 		return baseMapper.selectPage(page, buildQueryWrapper(sysRole));

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

@@ -38,6 +38,7 @@ security:
         - /v3/api-docs
         - /actuator/**
         - /swagger-ui/**
+        - /role/getRoleList
 
 
 

yifu-upms/yifu-upms-biz/src/main/resources/logback-spring.xml

@@ -64,7 +64,7 @@
 	</appender>
 
 	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
-	<root level="INFO">
+	<root level="error">
 		<appender-ref ref="console"/>
 		<appender-ref ref="debug"/>
 		<appender-ref ref="error"/>

yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysRoleMapper.xml

@@ -31,6 +31,11 @@
 		<result column="update_by" property="updateBy"/>
 	</resultMap>
 
+	<resultMap id="HcmRoleMap" type="com.yifu.cloud.plus.v1.yifu.admin.api.vo.HcmRoleInfoVo">
+		<result column="role_id" property="roleId"/>
+		<result column="role_name" property="roleName"/>
+	</resultMap>
+
 	<!-- 通过用户ID，查询角色信息-->
 	<select id="listRolesByUserId" resultMap="BaseResultMap">
 		SELECT r.role_id,
@@ -74,4 +79,13 @@
 								  left join sys_role b on a.role_id = b.role_id
 		where a.user_id = #{userId} and b.client_id = #{clientId} and b.del_flag = '0'
 	</select>
+
+	<select id="getRoleList" resultMap="HcmRoleMap">
+		SELECT
+		a.role_id,
+		a.role_name
+		FROM
+		sys_role a
+		where a.client_id = 'yifu-mvp' and a.del_flag = '0'
+	</select>
 </mapper>