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

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

@@ -501,7 +501,7 @@ public class TEmployeeContractInfo extends BaseEntity {
 	/**
 	 * 减少原因
 	 */
-	@ExcelAttribute(name = "减少原因", maxLength = 32, isDataId = true,dataType = ExcelAttributeConstants.REDUCE_SOCIAL_REASON)
-	@Schema(description = "减少原因", name = "workingHours")
+	@ExcelAttribute(name = "减少原因")
+	@Schema(description = "减少原因")
 	private String reduceReason;
 }

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

@@ -166,6 +166,18 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
 	@ExcelAttribute(name = "档案柜号", maxLength = 50)
 	@Schema(description = "档案柜号", name = "fileCabinetNo")
 	private String fileCabinetNo;
+	/**
+	 * 离职日期
+	 */
+	@ExcelAttribute(name = "离职日期")
+	@Schema(description = "离职日期")
+	private String leaveDate;
+	/**
+	 * 终止原因
+	 */
+	@ExcelAttribute(name = "终止原因", maxLength = 32)
+	@Schema(description = "终止原因")
+	private String reduceReason;
 	/**
 	 * 备注
 	 */
@@ -173,5 +185,4 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
 	@ExcelAttribute(name = "备注", maxLength = 200)
 	@Schema(description = "备注", name = "remark")
 	private String remark;
-
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java

@@ -50,9 +50,9 @@ public class EmployeeConstants {
 	public static final String WORKING_HOURS_EMPTY = "工时制不能为空";
 	public static final String EXIT_PRIJECT_STATUS = "人员已有该项目信息，禁止重复添加";
 
-	public static final String CONTRACT_REDUCE_INFO_NOT_EMPTY = "合同终止时离职日期和减少原因必填";
+	public static final String CONTRACT_REDUCE_INFO_NOT_EMPTY = "签订类型为终止时，离职日期和终止原因必填";
 
-	public static final String CONTRACT_REDUCE_REASON_NOT_EMPTY = "终止原因为其他时原因说明必填";
+	public static final String CONTRACT_REDUCE_REASON_NOT_EMPTY = "终止原因为其他时，原因说明必填";
 
 	/**
 	 * 无数据可更新

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

@@ -138,6 +138,19 @@ public class TEmployeeInfoController {
 		return tEmployeeInfoService.getById(empId);
 	}
 
+	/**
+	 * @param idcard
+	 * @Description: 内部接口获取档案基本信息
+	 * @Author: hgw
+	 * @Date: 2022/7/21 14:47
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo>
+	 **/
+	@Inner
+	@PostMapping("/inner/getTEmployeeInfoByIdcard")
+	public TEmployeeInfo getTEmployeeInfoByIdcard(@RequestBody String idcard) {
+		return tEmployeeInfoService.getInfoByIdcard(idcard);
+	}
+
 	/**
 	 * @param empName   姓名
 	 * @param empIdCard 身份证

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

@@ -187,6 +187,8 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
 
 	Boolean checkMobile(String mobile);
 
+	TEmployeeInfo getInfoByIdcard(String idcard);
+
 	/**
 	 * @Description: 更新人员档案的商险状态
 	 * @Author: hgw

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

@@ -29,7 +29,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yifu.cloud.plus.v1.check.vo.CheckBankNoVo;
 import com.yifu.cloud.plus.v1.yifu.archives.constants.ArchivesConstants;
 import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants;
 import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeContractConstants;
@@ -44,7 +43,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ResultConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
-import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
@@ -893,7 +891,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 						insert.setOldContractId(contractInfo.getId());
 						insert.setContractName(contractInfo.getContractName());
 						insert.setContractSubName(contractInfo.getContractSubName());
-						insert.setReason(contractInfo.getReason());
+						if (!EmployeeConstants.SITUATION_SEVEN.equals(insert.getSituation())) {
+							insert.setReason(contractInfo.getReason());
+						}
 						insert.setSubjectUnit(contractInfo.getSubjectUnit());
 						insert.setContractParty(contractInfo.getContractParty());
 						insert.setContractType(contractInfo.getContractType());

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

@@ -2266,6 +2266,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 				.eq(TEmployeeInfo::getDeleteFlag,CommonConstants.ZERO_STRING)) > 0;
 	}
 
+	@Override
+	public TEmployeeInfo getInfoByIdcard(String idcard) {
+		return baseMapper.selectOne(Wrappers.<TEmployeeInfo>query().lambda()
+				.eq(TEmployeeInfo::getEmpIdcard, idcard)
+				.eq(TEmployeeInfo::getDeleteFlag, CommonConstants.ZERO_STRING)
+				.last(CommonConstants.LAST_ONE_SQL));
+	}
+
 	private void saveContract(Map<String, EmpProjectDispatchVo> projectsMap,
 							  Map<String, EmpContractDispatchVo> contractsMap,
 							  Map<String, EmpAddDispatchVo> empAddsMap) {

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

@@ -294,6 +294,8 @@ public interface CommonConstants {
 	 **/
 	String RESULT_DATA_FAIL= "操作失败";
 
+	String RESULT_DATA_SUCESS= "操作成功";
+
 	String SAVE_SUCCESS = "保存成功！";
 
 	String UPDATE_SUCCESS = "更新成功！";
@@ -319,7 +321,7 @@ public interface CommonConstants {
 
 	public static final String ZIP_TYPE = "zip";
 	int BATCH_COUNT = 100;
-	int BATCH_COUNT1 = 1000;
+	int BATCH_COUNT1 = 2000;
 	String IMPORT_DATA_ANALYSIS_ERROR = "数据导入解析异常，请检查表数据格式（1.日期格式:yyyy-MM-dd,2.比例为整数且不含%）";
     String CREATE_TIME = "CREATE_TIME";
 	String ID = "ID";
@@ -473,6 +475,8 @@ public interface CommonConstants {
 
 	public static final int TWENTY_INT = 20;
 
+	public static final String TWENTY_STRING = "20";
+
 	public static final int TWENTY_ONE_STRING = 21;
 
 	public static final String ERROR_MSG_PRFIX = "error=";

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.TypeReference;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
-import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
@@ -13,7 +12,6 @@ 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.dapr.config.DaprArchivesProperties;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
@@ -187,6 +185,23 @@ public class ArchivesDaprUtil {
 		return res;
 	}
 
+	/**
+	 * @param idcard
+	 * @Description: 获取档案基本信息
+	 * @Author: huyc
+	 * @Date: 2022/11/28 14:48
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo>
+	 **/
+	public R<TEmployeeInfo> getTEmployeeInfoByIdcard(String idcard) {
+		R<TEmployeeInfo> res = HttpDaprUtil.invokeMethodPost(
+				daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId()
+				,"/temployeeinfo/inner/getTEmployeeInfoByIdcard" , idcard, TEmployeeInfo.class, SecurityConstants.FROM_IN);
+		if (Common.isEmpty(res)){
+			return R.failed("获取档案信息失败！");
+		}
+		return res;
+	}
+
 	/**
 	 * @Description: 获取项目档案基本信息
 	 * @Author: hgw