Merge branch 'develop' into feature-zhaji

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

@@ -17,6 +17,7 @@
 package com.yifu.cloud.plus.v1.yifu.archives.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
@@ -117,6 +118,7 @@ public class TEmployeeProject extends BaseEntity {
      */
     @Schema(description ="减项时间")
 	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	@JsonFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
     private LocalDateTime leaveTime;
 
     /**

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

@@ -215,4 +215,13 @@ public class EmpContractDispatchVo implements Serializable {
 	@ExcelAttribute(name = "客户名称", maxLength = 128)
 	@Schema(description = "客户名称", name = "subjectUnit")
 	private String subjectUnit;
+
+	/**
+	 * 合同年限
+	 */
+	@NotBlank(message = "合同年限不能为空")
+	@ExcelAttribute(name = "合同年限", errorInfo = "合同年限不能为空")
+	@Schema(description = "合同年限", name = "contractTerm")
+	private String contractTerm;
+
 }

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

@@ -49,10 +49,15 @@ public class TDispatchInfoSearchVo extends TDispatchInfo {
 	private String ids;
 
 	/**
-	 * 创建时间区间 [开始时间，结束时间]
+	 * 申请时间起
 	 */
-	@Schema(description = "创建时间区间")
-	private LocalDateTime[] createTimes;
+	@Schema(description = "申请时间起")
+	private LocalDateTime createTimeStart;
+	/**
+	 * 申请时间止
+	 */
+	@Schema(description = "申请时间止")
+	private LocalDateTime createTimeEnd;
 	/**
 	 * @Author fxj
 	 * 查询数据起

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

@@ -210,15 +210,22 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			idList = searchVo.getIdList();
 			wrapper.in(TDispatchInfo::getId, idList);
 		}
+		if (Common.isNotNull(searchVo.getCreateTimeStart())) {
+			wrapper.ge(TDispatchInfo::getCreateTime, searchVo.getCreateTimeStart());
+		}
+		if (Common.isNotNull(searchVo.getCreateTimeEnd())) {
+			wrapper.le(TDispatchInfo::getCreateTime, searchVo.getCreateTimeEnd());
+		}
 		return baseMapper.selectCount(wrapper);
 	}
 
 	private LambdaQueryWrapper buildQueryWrapper(TDispatchInfoSearchVo entity) {
 		LambdaQueryWrapper<TDispatchInfo> wrapper = Wrappers.lambdaQuery();
-		if (ArrayUtil.isNotEmpty(entity.getCreateTimes())) {
-			wrapper.ge(TDispatchInfo::getCreateTime, entity.getCreateTimes()[0])
-					.le(TDispatchInfo::getCreateTime,
-							entity.getCreateTimes()[1]);
+		if (Common.isNotNull(entity.getCreateTimeStart())) {
+			wrapper.ge(TDispatchInfo::getCreateTime, entity.getCreateTimeStart());
+		}
+		if (Common.isNotNull(entity.getCreateTimeEnd())) {
+			wrapper.le(TDispatchInfo::getCreateTime, entity.getCreateTimeEnd());
 		}
 		if (Common.isNotNull(entity.getCreateName())) {
 			wrapper.eq(TDispatchInfo::getCreateName, entity.getCreateName());
@@ -335,6 +342,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		EmpDispatchAddVo addVo = new EmpDispatchAddVo();
 		// 执行数据插入操作 组装
 		for (int i = 0; i < excelVOList.size(); i++) {
+			empVo = null;
 			excel = excelVOList.get(i);
 			fundSet = fundHoldMap.get(excel.getProvidentHousehold());
 			socialSet = socialHoldMap.get(excel.getSocialHousehold());
@@ -439,6 +447,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			projectsMap = res.getData().getProjectsMap();
 		}
 		for (int i = 0; i < excelVOList.size(); i++) {
+			contract = null;
+			social = null;
+			project = null;
+			fund = null;
 			excel = excelVOList.get(i);
 			if (Common.isNotNull(excelVOTemp) && Common.isNotNull(excelVOTemp.get(excel.getEmpIdcard()))){
 				continue;
@@ -819,8 +831,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 										 SysBaseSetInfo fundSet,
 										 TDispatchImportVo excel,
 										 TSocialFundInfo socialFund) {
-		TDispatchInfo dispatch;
-		dispatch = new TDispatchInfo();
+		TDispatchInfo dispatch = new TDispatchInfo();
 		// 初始化派单项
 		initAddHandleItem(excel, socialFund,dispatch,socialSet);
 		dispatch.setOrganName(user.getDeptName());
@@ -875,10 +886,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			dispatch.setEmpId(empVo.getId());
 			dispatch.setEmpNo(empVo.getEmpNo());
 			// 封装合同信息 如果有合同取值实际合同信息
+			if (Common.isNotNull(empVo.getContractStart())){
 				dispatch.setContractStart(empVo.getContractStart());
 				dispatch.setContractEnd(empVo.getContractEnd());
 				dispatch.setContractTerm(empVo.getContractTerm());
 				dispatch.setContractType(empVo.getContractType());
+			}
 			dispatch.setFileProvince(empVo.getFileProvince());
 			dispatch.setFileCity(empVo.getFileCity());
 			dispatch.setFileTown(empVo.getFileTown());
@@ -1005,6 +1018,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				fund.setPayPolicy(fundSet.getPayPolicy());
 				fund.setLowerLimit(fundSet.getLowerLimit());
 				fund.setUpperLimit(fundSet.getUpperLimit());
+				fund.setInsuranceIsLatestCardinality(fundSet.getInsuranceIsLatestCardinality());
 				if (Common.isNotNull(fundSet.getProvince())){
 					fund.setFundProvince(Integer.toString(fundSet.getProvince()));
 				}
@@ -1356,10 +1370,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		contract.setContractSubName(excel.getContractSubName());
 		contract.setDeptNo(excel.getSettleDomainCode());
 		contract.setPost(excel.getPost());
-		contract.setSituation(excel.getContractType());
+		contract.setSituation("正常签订");
 		contract.setEmpIdcard(excel.getEmpIdcard());
 		contract.setEmpName(excel.getEmpName());
 		contract.setWorkingHours(excel.getWorkingHours());
+		contract.setContractTerm(excel.getContractTerm());
 		if (Common.isNotNull(excel.getSocialHousehold())){
 			contract.setContractParty(excel.getSocialHousehold());
 		}
@@ -2528,6 +2543,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				Date now = new Date();
 				StringBuffer temp = new StringBuffer();
 				for (TDispatchInfo dis : disList) {
+					auditInfo = new TAuditInfo();
 					if (Common.isNotNull(socialFundMap)){
 						sf = socialFundMap.get(dis.getEmpIdcard());
 					}
@@ -2575,7 +2591,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 								}
 								socialMapper.updateById(socialInfo);
 								dis.setSocialHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
-								auditInfo = new TAuditInfo();
 								auditInfo.setType(CommonConstants.ONE_STRING);
 								if (CommonConstants.ZERO_INT == flag) {
 									temp.setLength(CommonConstants.ZERO_INT);

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

@@ -400,9 +400,11 @@
 					<if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''">
 						AND f.PROVIDENT_HOUSEHOLD_NAME = #{tDispatchInfo.providentHouseholdName}
 					</if>
-			<if test="tDispatchInfo.createTimes != null and tDispatchInfo.createTimes.length>0">
-				AND a.UPDATE_TIME <![CDATA[ >= ]]> #{tDispatchInfo.createTimes[0]}
-				AND a.UPDATE_TIME <![CDATA[ <= ]]> #{tDispatchInfo.createTimes[1]}
+					<if test="tDispatchInfo.createTimeStart != null and tDispatchInfo.createTimeStart.trim() != ''">
+						AND a.CREATE_TIME <![CDATA[ >= ]]> #{tDispatchInfo.createTimeStart}
+					</if>
+					<if test="tDispatchInfo.createTimeEnd != null and tDispatchInfo.createTimeEnd.trim() != ''">
+						AND a.CREATE_TIME <![CDATA[ <= ]]> #{tDispatchInfo.createTimeEnd}
 					</if>
 		</if>
     </sql>