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

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java

@@ -144,9 +144,9 @@ public class TEmployeeProject extends BaseEntity {
     private Integer isLeaveEmployee;
 
 	/**
-	 * 已产生未结算费用 0：划转 1：不划转
+	 * 已产生未结算费用 0：不划转 1：划转
 	 */
-	@Schema(description ="已产生未结算费用（0：划转 1：不划转）")
+	@Schema(description ="已产生未结算费用（0：不划转 1：划转）")
 	@TableField(exist = false)
 	private String unsettleDeal;
 

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

@@ -78,7 +78,6 @@ public class TEmpChangeInfoVO implements Serializable {
      */
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value ="已产生未结算费用")
-	@NotNull(message = "已产生未结算费用不能为空")
     private String unsettleDeal;
 
     /**

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpChangeInfoController.java

@@ -139,8 +139,8 @@ public class TEmpChangeInfoController {
 	@Operation(summary = "获取所有项目名称", description = "获取所有项目名称")
 	@SysLog("获取所有项目名称" )
 	@GetMapping("/getAllDept" )
-	public R<List<TSettleDomain>> getAllDept() {
-		return tEmpChangeInfoService.getAllDept();
+	public R<List<TSettleDomain>> getAllDept(@RequestParam(required = false,name = "customerName") String customerName) {
+		return tEmpChangeInfoService.getAllDept(customerName);
 	}
 
 	/**
@@ -152,8 +152,8 @@ public class TEmpChangeInfoController {
 	@Operation(summary = "获取所有单位名称", description = "获取所有单位名称")
 	@SysLog("获取所有单位名称" )
 	@GetMapping("/getAllUint" )
-	public R<List<TCustomerInfo>> getAllUint() {
-		return tEmpChangeInfoService.getAllUint();
+	public R<List<TCustomerInfo>> getAllUint(@RequestParam(required = false,name = "customerName") String customerName) {
+		return tEmpChangeInfoService.getAllUint(customerName);
 	}
 
 	/**

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractInfoController.java

@@ -223,7 +223,6 @@ public class TEmployeeContractInfoController {
 		if (Common.isNotNull(tEmployeeContractInfo.getAuditRemark()) && tEmployeeContractInfo.getAuditRemark().length() > 200) {
 			return R.failed("审核说明不可超过200字！");
 		}
-		tEmployeeContractInfo.setAuditRemark(Common.isBlankToNullString(tEmployeeContractInfo.getReason()) + tEmployeeContractInfo.getAuditRemark());
 		return tEmployeeContractInfoService.auditContract(tEmployeeContractInfo);
 	}
 

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TCustomerInfoMapper.java

@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -32,5 +33,5 @@ import java.util.List;
 @Mapper
 public interface TCustomerInfoMapper extends BaseMapper<TCustomerInfo> {
 
-    List<TCustomerInfo> getAllUnit();
+    List<TCustomerInfo> getAllUnit(@Param("customerName") String customerName);
 }

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

@@ -30,5 +30,5 @@ import java.util.List;
  */
 public interface TCustomerInfoService extends IService<TCustomerInfo> {
 
-    List<TCustomerInfo> getAllUnit();
+    List<TCustomerInfo> getAllUnit(String customerName);
 }

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

@@ -57,16 +57,18 @@ public interface TEmpChangeInfoService extends IService<TEmpChangeInfo> {
 	 * @return R
 	 * @Author huyc
 	 * @Date 2022-06-22
+	 * @param customerName
 	 */
-	R<List<TSettleDomain>> getAllDept();
+	R<List<TSettleDomain>> getAllDept(String customerName);
 
 	/**
 	 * 获取所有单位名称
 	 * @return R
 	 * @Author huyc
 	 * @Date 2022-06-22
+	 * @param customerName
 	 */
-	R<List<TCustomerInfo>> getAllUint();
+	R<List<TCustomerInfo>> getAllUint(String customerName);
 
 	IPage<TSettleDomain> getAllDeptPage(Page page, String deptName, String customerId);
 }

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

@@ -34,7 +34,7 @@ import java.util.List;
 public class TCustomerInfoServiceImpl extends ServiceImpl<TCustomerInfoMapper, TCustomerInfo> implements TCustomerInfoService {
 
 	@Override
-	public List<TCustomerInfo> getAllUnit() {
-		return baseMapper.getAllUnit();
+	public List<TCustomerInfo> getAllUnit(String customerName) {
+		return baseMapper.getAllUnit(customerName);
 	}
 }

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

@@ -165,7 +165,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			}
 			errorMsg = new HashSet<>();
 			TEmpChangeInfoVO excel = excelVOList.get(i);
-
+			excel.setUnsettleDeal(CommonConstants.IS_NO_CHANGE);
 			if (Common.isNotNull(excel.getChangeStartMonth()) && excel.getChangeStartMonth().length() > CommonConstants.dingleDigitIntArray[6]) {
 				errorMsg.add("划转起始月长度不能超过6位");
 			}
@@ -227,7 +227,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 							updateTEmployeePro.setUnitName(tCustomerInfo.getCustomerName());
 						}
 						updateTEmployeePro.setChangeStartMonth(excel.getChangeStartMonth());
-						updateTEmployeePro.setUnsettleDeal(excel.getUnsettleDeal());
+						updateTEmployeePro.setUnsettleDeal(CommonConstants.IS_NO_CHANGE);
 						updateList.add(updateTEmployeePro);
 						// 记录变更日志
 						tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", tEmployeeProjectOld.getId(), tEmployeeProjectOld, updateTEmployeePro);
@@ -276,11 +276,18 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 	 * @return R
 	 * @Author huyc
 	 * @Date 2022-06-22
+	 * @param customerName
 	 */
 	@Override
-	public R<List<TSettleDomain>> getAllDept() {
-		List<TSettleDomain> list = tSettleDomainMapper.selectList(Wrappers.<TSettleDomain>query().lambda().eq(TSettleDomain::getDeleteFlag, CommonConstants.STATUS_NORMAL)
+	public R<List<TSettleDomain>> getAllDept(String customerName) {
+		List<TSettleDomain> list = null;
+		if (Common.isNotNull(customerName)){
+			list = tSettleDomainMapper.selectList(Wrappers.<TSettleDomain>query().lambda().eq(TSettleDomain::getDeleteFlag, CommonConstants.STATUS_NORMAL)
+					.eq(TSettleDomain::getStopFlag,CommonConstants.STATUS_NORMAL).eq(TSettleDomain::getCustomerName,customerName));
+		}else {
+			list = tSettleDomainMapper.selectList(Wrappers.<TSettleDomain>query().lambda().eq(TSettleDomain::getDeleteFlag, CommonConstants.STATUS_NORMAL)
 					.eq(TSettleDomain::getStopFlag,CommonConstants.STATUS_NORMAL));
+		}
 		return R.ok(list);
 	}
 
@@ -289,11 +296,12 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 	 * @return R
 	 * @Author huyc
 	 * @Date 2022-06-22
+	 * @param customerName
 	 */
 	@Override
-	public R<List<TCustomerInfo>> getAllUint() {
+	public R<List<TCustomerInfo>> getAllUint(String customerName) {
 		//List<TCustomerInfo> list = tCustomerInfoService.list(Wrappers.<TCustomerInfo>query().lambda().eq(TCustomerInfo::getDeleteFlag, CommonConstants.STATUS_NORMAL));
-		List<TCustomerInfo> list = tCustomerInfoService.getAllUnit();
+		List<TCustomerInfo> list = tCustomerInfoService.getAllUnit(customerName);
 		return R.ok(list);
 	}
 

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

@@ -62,6 +62,13 @@
   </resultMap>
 
 	<select id="getAllUnit" resultMap="tCustomerInfoMap">
-		select  a.CUSTOMER_ID AS "ID",a.CUSTOMER_NAME AS "CUSTOMER_NAME",a.CUSTOMER_NO AS "CUSTOMER_CODE" from t_settle_domain a GROUP BY A.CUSTOMER_NO
+		select  a.CUSTOMER_ID AS "ID",a.CUSTOMER_NAME AS "CUSTOMER_NAME",a.CUSTOMER_NO AS "CUSTOMER_CODE" from t_settle_domain a
+		<where>
+			1=1
+			<if test="customerName != null and customerName != null">
+				and a.CUSTOMER_NAME  like concat(#{customerName},'%')
+			</if>
+		</where>
+		GROUP BY A.CUSTOMER_NO
 	</select>
 </mapper>

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java

@@ -392,6 +392,8 @@ public interface CommonConstants {
 	// 是否
 	String IS_CHANGE = "划转";
 
+	String IS_NO_CHANGE = "不划转";
+
 	// 年
 	String YEAR = "年";
 	// 月

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

@@ -618,7 +618,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 											errorMessageList), yfSocialImportThreadPoolExecutor);
 							completableFutureList.add(listCompletableFuture);
 						}
-
 						// 阻塞当前线程，等待所有的线程执行完毕
 						boolean computeFlag;
 						do {
@@ -634,12 +633,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			 			log.error("社保缴费库数据批量导入异常：" + e);
 						redisUtil.remove(key);
 					}
-					// -----------------------------线程池处理list，批量保存社保信息结束--------------------------------
-					//最后一个推送
-					log.info("社保批量导入耗时:{}", (System.currentTimeMillis() - start) + "");
-					redisUtil.remove(key);
 				}
 			}
+			redisUtil.remove(key);
 		}
 	}
 

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

@@ -40,8 +40,6 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
 	 */
 	List<SysDept> listDepts();
 
-	List<String> selectDnList();
-
 	SysDept selectCountId(@Param("deptId")Long deptId);
 
 	int updateDeptById(@Param("dept") SysDept dept);

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

@@ -183,15 +183,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 	@Override
 	public R<Boolean> updateDeptByLdap() {
 		List<SearchResultEntry> entryList = ldapUtil.getAllPersonNamesWithTraditionalWay();
-		//获取ldap所有的dn
-		List<String> entryDnList = entryList.stream().map(SearchResultEntry::getDN).collect(Collectors.toList());
-		//获取本地dept表中所有的dn
-		List<String> dnList = baseMapper.selectDnList();
-		List<String> delList = dnList.stream().filter(p-> !entryDnList.contains(p)).collect(Collectors.toList());
-		//删除ldap中不存在的dn的数据
-		if (!delList.isEmpty()) {
-			baseMapper.delete(Wrappers.<SysDept>query().lambda().in(SysDept::getDeptDn, delList));
-		}
 		List<Map<String,Object>> updUserList = new ArrayList<>();
 		for (SearchResultEntry entry : entryList) {
 			String dn = entry.getDN();
@@ -273,7 +264,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 			}
 		}
 		//更新用户信息
+		if (!updUserList.isEmpty()) {
 			sysUserMapper.updateUser(updUserList);
+		}
 		return R.ok();
 	}
 }

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

@@ -437,15 +437,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 				}
 			}
 			List<SearchResultEntry> entryList = ldapUtil.getAllPersonNamesWithTraditionalWay();
-			//获取ldap所有的dn
-			List<String> entryDnList = entryList.stream().map(SearchResultEntry::getDN).collect(Collectors.toList());
-			//获取本地dept表中所有的dn
-			List<String> dnList = sysDeptMapper.selectDnList();
-			List<String> delList = dnList.stream().filter(p-> !entryDnList.contains(p)).collect(Collectors.toList());
-			//删除ldap中不存在的dn的数据
-			if (!delList.isEmpty()) {
-				sysDeptMapper.delete(Wrappers.<SysDept>query().lambda().in(SysDept::getDeptDn, delList));
-			}
 			List<Map<String,Object>> updUserList = new ArrayList<>();
 			for (SearchResultEntry entry : entryList) {
 				String dn = entry.getDN();
@@ -474,6 +465,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 								if (Common.isNotNull(entry.getAttributeValue("x-ouid"))) {
 									insertSysDept.setDeptId(Long.valueOf(entry.getAttributeValue("x-ouid")));
 								}
+								insertSysDept.setDelFlag(CommonConstants.ZERO_STRING);
 								sysDeptMapper.insert(insertSysDept);
 							}
 						}
@@ -482,7 +474,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 						sysDeptMapper.updateDeptById(sysDept);
 					}
 				} else {
-					SysDept sysDept = sysDeptMapper.selectOne(Wrappers.<SysDept>query().lambda().eq(SysDept::getDeptDn, dn.substring(dn.indexOf("ou=", 2), dn.length())));
+					SysDept sysDept = sysDeptMapper.selectDeptDn(dn.substring(dn.indexOf("ou=", 2), dn.length()));
 					if (null != sysDept) {
 						SysDept sysDeptCount = sysDeptMapper.selectDeptDn(dn);
 						if (null == sysDeptCount) {
@@ -501,6 +493,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 									if (Common.isNotNull(entry.getAttributeValue("x-ouid"))) {
 										insertSysDept.setDeptId(Long.valueOf(entry.getAttributeValue("x-ouid")));
 									}
+									insertSysDept.setDelFlag(CommonConstants.ZERO_STRING);
 									sysDeptMapper.insert(insertSysDept);
 								}
 							}

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

@@ -31,14 +31,6 @@
 		<result column="del_flag" property="delFlag"/>
 	</resultMap>
 
-	<!--查询所有dn-->
-	<select id="selectDnList" resultType="String">
-		SELECT a.dept_dn
-		FROM sys_dept a
-		WHERE a.del_flag = 0
-		AND a.dept_dn IS NOT NULL
-	</select>
-
 	<select id="selectCountId" resultType="com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDept">
 		SELECT
 		*
@@ -63,6 +55,7 @@
 			<if test="dept.name != null">name=#{dept.name},</if>
 			<if test="dept.parentId != null">parent_id=#{dept.parentId},</if>
 			<if test="dept.deptDn != null">dept_dn=#{dept.deptDn},</if>
+			del_flag = '0',
 			update_time = now()
 		</trim>
 		WHERE dept_id=#{dept.deptId}