Merge branch 'develop' into feature-licancan

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

@@ -82,7 +82,7 @@ public class FddContractAttachInfo extends BaseEntity {
      * 合同到期时间
      */
     @Schema(description ="合同到期时间")
-	@ExcelAttribute(name = "合同到期时间",needExport = true)
+	@ExcelAttribute(name = "合同到期时间", isNotEmpty = true, errorInfo = "合同到期时间不能为空")
 	private Date contractEnd;
 
     /**
@@ -125,8 +125,8 @@ public class FddContractAttachInfo extends BaseEntity {
      * 岗位
      */
     @Schema(description ="岗位")
-	@Length(max = 200, message = "岗位不能超过200个字符")
-	@ExcelAttribute(name = "岗位", isNotEmpty = true, errorInfo = "岗位不能为空", maxLength = 200, needExport = true)
+	@Length(max = 20, message = "岗位不能超过20个字符")
+	@ExcelAttribute(name = "岗位", isNotEmpty = true, errorInfo = "岗位不能为空", maxLength = 20, needExport = true)
     private String post;
 
     /**
@@ -151,13 +151,14 @@ public class FddContractAttachInfo extends BaseEntity {
      * 法大大模板id
      */
     @Schema(description ="法大大模板id")
-    private String fddTemplateId;
+	@ExcelAttribute(name = "法大大模板id")
+	private String fddTemplateId;
 
     /**
      * 员工姓名
      */
     @Schema(description ="员工姓名")
-	@ExcelAttribute(name = "员工姓名", isNotEmpty = true, errorInfo = "员工合同id姓名不能为空", maxLength = 32, needExport = true)
+	@ExcelAttribute(name = "员工姓名", isNotEmpty = true, errorInfo = "员工姓名不能为空", maxLength = 32, needExport = true)
     private String empName;
 
     /**
@@ -171,7 +172,8 @@ public class FddContractAttachInfo extends BaseEntity {
      * 手机号码
      */
     @Schema(description ="手机号码")
-    private String empPhone;
+	@ExcelAttribute(name = "手机号码", isNotEmpty = true, errorInfo = "手机号码不能为空", maxLength = 32, needExport = true)
+	private String empPhone;
 
     /**
      * 结算主体编码
@@ -184,7 +186,7 @@ public class FddContractAttachInfo extends BaseEntity {
 	 * 员工类型
 	 */
 	@Schema(description ="员工类型")
-	@ExcelAttribute(name = "员工类型", isDataId = true, errorInfo = "员工类型不能为空", maxLength = 20)
+	@ExcelAttribute(name = "员工类型", isNotEmpty = true, errorInfo = "员工类型不能为空", isDataId = true, dataType = "emp_natrue",maxLength = 20, needExport = true)
 	private String empNatrue;
 
 	/**

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

@@ -33,9 +33,9 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @TableName("fdd_template_field_info")
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode()
 @Schema(description = "法大大字段对应信息表")
-public class FddTemplateFieldInfo extends BaseEntity {
+public class FddTemplateFieldInfo {
 
     /**
      * ID

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

@@ -22,13 +22,10 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDictItem;
 import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractAttachInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.service.FddContractAttachInfoService;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties;
-import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -41,9 +38,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.*;
 
 import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 /**
@@ -143,21 +138,35 @@ public class FddContractAttachInfoController {
 
 		ExcelUtil<FddContractAttachInfo> util1 = null;
 		try {
-//			// 调用字典服务，渲染字典值
-//			res = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(), daprUpmsProperties.getAppId()
-//					, "/dict/inner/getDictList", null, Map.class, SecurityConstants.FROM_IN);
-//
-//			Map<String, String> dicMap = new HashMap<>();
-//			if (null != res.getData().get("data")) {
-//				for (SysDictItem dict : res.getData().get("data")) {
-//					dicMap.put(dict.getType() + CommonConstants.DOWN_LINE_STRING + dict.getLabel(), dict.getValue());
-//				}
-//			}
+			// 渲染字典值
+			Map<String, String> dicMap = new HashMap<>();
+			Map<String,String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue()
+					.get(CacheConstants.DICT_DETAILS
+							+ CommonConstants.COLON_STRING
+							+ "emp_natrue");
+			if (Common.isNotNull(dicObj)) {
+				for (Map.Entry<String, String> entry : dicObj.entrySet()) {
+					String key = entry.getKey();
+					String Label = entry.getValue();
+					dicMap.put("emp_natrue" + CommonConstants.DOWN_LINE_STRING + Label, key);
+				}
+			}
+			Map<String,String> dicObj1 = (Map<String, String>) RedisUtil.redis.opsForValue()
+					.get(CacheConstants.DICT_DETAILS
+							+ CommonConstants.COLON_STRING
+							+ "salary_type");
+			if (Common.isNotNull(dicObj1)) {
+				for (Map.Entry<String, String> entry : dicObj1.entrySet()) {
+					String key1 = entry.getKey();
+					String Label1 = entry.getValue();
+					dicMap.put("salary_type" + CommonConstants.DOWN_LINE_STRING + Label1, key1);
+				}
+			}
 
 			jsonString = URLDecoder.decode(jsonString, CommonConstants.UTF8).replace("=", "");
 			util1 = new ExcelUtil<>(FddContractAttachInfo.class);
 			//传参字典数据MAP具体见方法实现
-			util1.getJsonStringToList(jsonString, null);
+			util1.getJsonStringToList(jsonString, dicMap);
 			if (null != util1.getErrorInfo() && !util1.getErrorInfo().isEmpty()) {
 				return R.failed(util1.getErrorInfo(),"数据异常");
 			} else {
@@ -165,7 +174,7 @@ public class FddContractAttachInfoController {
 					List<ErrorMessage> errorInfo = fddContractAttachInfoService.batchAdd(util1.getEntityList());
 					Map<String,Object> variableMap = new HashMap<>();
 					Map<Integer,Object> map = new HashMap<>();
-					boolean allExitContract = errorInfo.stream().allMatch(e-> e.getMessage().equals("存在“在用”的合同"));
+					boolean allExitContract = errorInfo.stream().allMatch(e-> checkInfo(e));
 					if (allExitContract) {
 						variableMap.put("allMatch","true");
 						for (ErrorMessage errorMessage :errorInfo){
@@ -202,14 +211,28 @@ public class FddContractAttachInfoController {
 		ExcelUtil<FddContractAttachInfo> util1 = null;
 
 		try {
-			// 调用字典服务，渲染字典值
-			res = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(), daprUpmsProperties.getAppId()
-					, "/dict/inner/getDictList", null, Map.class, SecurityConstants.FROM_IN);
-
+			// 渲染字典值
 			Map<String, String> dicMap = new HashMap<>();
-			if (null != res.getData()) {
-				for (SysDictItem dict : res.getData()) {
-					dicMap.put(dict.getType() + CommonConstants.DOWN_LINE_STRING + dict.getLabel(), dict.getValue());
+			Map<String,String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue()
+					.get(CacheConstants.DICT_DETAILS
+							+ CommonConstants.COLON_STRING
+							+ "emp_natrue");
+			if (Common.isNotNull(dicObj)) {
+				for (Map.Entry<String, String> entry : dicObj.entrySet()) {
+					String key = entry.getKey();
+					String Label = entry.getValue();
+					dicMap.put("emp_natrue" + CommonConstants.DOWN_LINE_STRING + Label, key);
+				}
+			}
+			Map<String,String> dicObj1 = (Map<String, String>) RedisUtil.redis.opsForValue()
+					.get(CacheConstants.DICT_DETAILS
+							+ CommonConstants.COLON_STRING
+							+ "salary_type");
+			if (Common.isNotNull(dicObj1)) {
+				for (Map.Entry<String, String> entry : dicObj1.entrySet()) {
+					String key1 = entry.getKey();
+					String Label1 = entry.getValue();
+					dicMap.put("salary_type" + CommonConstants.DOWN_LINE_STRING + Label1, key1);
 				}
 			}
 
@@ -250,4 +273,9 @@ public class FddContractAttachInfoController {
 		List<ErrorMessage> errorInfo = fddContractAttachInfoService.sendTask(entityList);
 		return R.ok(errorInfo);
 	}
+
+	public boolean checkInfo(ErrorMessage errorMessage) {
+		Set<String> set = errorMessage.getErrors();
+		return set.stream().allMatch(e-> e.equals("存在“在用”的合同"));
+	}
 }

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

@@ -136,7 +136,8 @@ public class FddContractInfoController {
 	@PostMapping("/send")
 	public R<String> send(FddContractInfo fddContractInfo) throws ApiException {
 		FddContractAttachInfo fddContractAttachInfo = fddContractAttachInfoService.getById(fddContractInfo.getId());
-		return fddContractInfoService.saveEmpContract(fddContractAttachInfo);
+		YifuUser user = SecurityUtils.getUser();
+		return fddContractInfoService.saveEmpContract(fddContractAttachInfo,user);
 	}
 
 	/**

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

@@ -12,6 +12,8 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.exception.CheckedException;
 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.core.vo.YifuUser;
+import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -83,7 +85,7 @@ public class FddController {
                 fddPersonAccountService.updateById(fddPersonAccount);
             }
         }
-		return R.ok(null,"成功");
+		return R.ok(null,"success");
     }
 
     /**
@@ -127,7 +129,7 @@ public class FddController {
                         fddPersonAccount.setCompanyInfoId(companyInfo.getId());
                     }
                     fddPersonAccountService.updateById(fddPersonAccount);
-					return R.ok(null,"成功");
+					return R.ok(null,"success");
                 }
             }
         }
@@ -157,6 +159,7 @@ public class FddController {
             if (StringUtils.equals(CommonConstants.TWO_STRING, jsonObject.getString("status"))) {
                 //成功
                 FddPersonAccount entity = fddPersonAccountService.getById(clientId);
+				YifuUser user = SecurityUtils.getUser();
                 if (entity != null) {
                     entity.setRealStatus(CommonConstants.ONE_STRING);
                     entity.setUnionid(unionId);
@@ -172,7 +175,7 @@ public class FddController {
                                     return;
                                 }
                                 FddContractAttachInfo fddContractAttachInfo = attachInfos.get(CommonConstants.ZERO_INT);
-                               R<String> returnR = fddContractInfoService.saveEmpContract(fddContractAttachInfo);
+                               R<String> returnR = fddContractInfoService.saveEmpContract(fddContractAttachInfo,user);
                                 if (returnR != null) {
                                     //记录返回信息
                                     if(returnR.getCode()== CommonConstants.SUCCESS){
@@ -186,7 +189,7 @@ public class FddController {
                             }
                         });
                     }
-					return R.ok(null,"成功");
+					return R.ok(null,"success");
                 }
             }
         } else if (StringUtils.equals(fddEvent, "reviseTask")) {
@@ -218,7 +221,7 @@ public class FddController {
                             e.printStackTrace();
                         }
                     });
-					return R.ok(null,"成功");
+					return R.ok(null,"success");
                 }
             }
         } else if (StringUtils.equals(fddEvent, "sign")) {
@@ -260,7 +263,7 @@ public class FddController {
                     employeeContractInfoService.updateById(ec);
                 }
             }
-            return R.ok(null,"成功");
+            return R.ok(null,"success");
         }else if (StringUtils.equals(fddEvent, "notifyUrlVerify")) {
             return R.ok(null,"success");
         }

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

@@ -23,6 +23,7 @@ import com.fadada.api.exception.ApiException;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractAttachInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractInfo;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -44,7 +45,7 @@ public interface FddContractInfoService extends IService<FddContractInfo> {
 	 * @Date: 2022/6/30
 	 * @return R
 	 */
-	R<String> saveEmpContract(FddContractAttachInfo fddContractInfo) throws ApiException;
+	R<String> saveEmpContract(FddContractAttachInfo fddContractInfo, YifuUser user) throws ApiException;
 
 	/**
 	 * 作废重签

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

@@ -16,6 +16,7 @@
  */
 package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -32,8 +33,10 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 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.DaprUpmsProperties;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
+import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
@@ -48,11 +51,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -136,6 +135,7 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
 	public List<ErrorMessage> sendTask(List<FddContractAttachInfo> entityList) {
 		List<ErrorMessage> errorList = new ArrayList<>();
 		int i = 1;
+		YifuUser user = SecurityUtils.getUser();
 		for (FddContractAttachInfo attachInfo : entityList) {
 			//保存合同数据
 			attachInfo.setContractId(CommonConstants.EMPTY_STRING);
@@ -175,7 +175,7 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
 					try {
 						//如果已经实名发送电子合同
 						FddContractAttachInfo fddContractAttachInfo = this.getById(attachInfo.getId());
-						R<String> returnR = fddContractInfoService.saveEmpContract(fddContractAttachInfo);
+						R<String> returnR = fddContractInfoService.saveEmpContract(fddContractAttachInfo,user);
 						if (returnR != null) {
 							//记录返回信息
 							if (returnR.getCode() == CommonConstants.SUCCESS) {
@@ -333,108 +333,130 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
 	@Override
 	public List<ErrorMessage> batchAdd(List<FddContractAttachInfo> entityList) {
 		List<ErrorMessage> errorList = new ArrayList<>();
+		Set<String> errorMsg;
+		YifuUser user = SecurityUtils.getUser();
+
+		Map<String, Integer> sameCheck = new HashMap<>();
 		int i = 1;
 		try {
 			if (null != entityList && !entityList.isEmpty()) {
 				for (FddContractAttachInfo attachInfo : entityList) {
+					errorMsg = new HashSet<>();
 					i++;
+
+					String sameInfo = attachInfo.getEmpNatrue() + "_" + attachInfo.getDepartNo()
+							+ "_" + attachInfo.getFddTemplateId() + "_" + attachInfo.getContractStart()
+							+ "_" + attachInfo.getContractEnd();
+					if (sameCheck.get(sameInfo) != null) {
+						errorMsg.add("第" + (i) + "行与第" + sameCheck.get(sameInfo) + "行重复！");
+					} else {
+						sameCheck.put(sameInfo, i);
+					}
+					//判断计时计件工资必填
+					if (CommonConstants.ONE_STRING.equals(attachInfo.getSalaryType()) && Common.isEmpty(attachInfo.getSalaryStandardPerHour())) {
+						errorMsg.add("计时工资不能为空");
+					}
+					if (CommonConstants.TWO_STRING.equals(attachInfo.getSalaryType()) && Common.isEmpty(attachInfo.getSalaryStandardPerPiece())) {
+						errorMsg.add("计件工资不能为空");
+					}
 					//结算主体编码是否准确
-					TSettleDomain settleDomain = tSettleDomainService.getOne(Wrappers.<TSettleDomain>query().lambda().eq(TSettleDomain::getDepartNo, attachInfo.getDepartNo()));
+					TSettleDomain settleDomain = tSettleDomainService.getOne(Wrappers.<TSettleDomain>query().lambda().eq(TSettleDomain::getDepartNo, attachInfo.getDepartNo())
+							.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING).eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING));
 					if (Common.isEmpty(settleDomain)) {
-						errorList.add(new ErrorMessage(i, "结算主体编码有误", CommonConstants.RED));
-						continue;
-					}
-					//查询员工合同
-					TEmployeeContractInfo employeeContractInfo = employeeContractInfoService.getOne(Wrappers.<TEmployeeContractInfo>query().lambda()
-							.eq(TEmployeeContractInfo::getEmpIdcard,attachInfo.getEmpIdcard()).eq(TEmployeeContractInfo::getSettleDomain,settleDomain.getId())
-							.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING));
-					if (employeeContractInfo != null) {
-						long count = this.count(Wrappers.<FddContractAttachInfo>query().lambda().eq(FddContractAttachInfo::getContractId, employeeContractInfo.getId()));
-						if (count > CommonConstants.ZERO_INT && attachInfo.getContractStart().before(employeeContractInfo.getContractEnd())) {
-							errorList.add(new ErrorMessage(i, "已导入合同相关基础数据", CommonConstants.RED));
-							continue;
-						}
+						errorMsg.add("项目编码有误");
+					} else {
+						//查询员工合同
+						TEmployeeContractInfo employeeContractInfo = employeeContractInfoService.getOne(Wrappers.<TEmployeeContractInfo>query().lambda()
+								.eq(TEmployeeContractInfo::getEmpIdcard, attachInfo.getEmpIdcard()).eq(TEmployeeContractInfo::getSettleDomain, settleDomain.getId())
+								.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING).eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_STRING));
+						if (employeeContractInfo != null) {
+							long count = this.count(Wrappers.<FddContractAttachInfo>query().lambda().eq(FddContractAttachInfo::getContractId, employeeContractInfo.getId()));
+							if (count > CommonConstants.ZERO_INT && attachInfo.getContractStart().before(employeeContractInfo.getContractEnd())) {
+								errorMsg.add("已导入合同相关基础数据");
+							}
 
-						List<FddContractTemplate> fddContractTemplateList = fddContractTemplateService.list(Wrappers.<FddContractTemplate>query().lambda()
-								.eq(FddContractTemplate::getFddTemplateId, attachInfo.getFddTemplateId())
-								.eq(FddContractTemplate::getModifyUploadStatus, CommonConstants.dingleDigitStrArray[1]));
-						//如果模板存在则生成法大大电子合同数据
-						if (fddContractTemplateList.size() == CommonConstants.ZERO_INT) {
-							errorList.add(new ErrorMessage(i, "未获取到有效的合同模板", CommonConstants.RED));
-							continue;
-						}
-						if (fddContractTemplateList.size() != CommonConstants.ONE_INT) {
-							errorList.add(new ErrorMessage(i, "法大大合同有效合同模板存在多条", CommonConstants.RED));
-							continue;
-						}else {
-							errorList.add(new ErrorMessage(i, "存在“在用”的合同", CommonConstants.RED));
-							continue;
+							List<FddContractTemplate> fddContractTemplateList = fddContractTemplateService.list(Wrappers.<FddContractTemplate>query().lambda()
+									.eq(FddContractTemplate::getFddTemplateId, attachInfo.getFddTemplateId())
+									.eq(FddContractTemplate::getModifyUploadStatus, CommonConstants.dingleDigitStrArray[1]));
+							//如果模板存在则生成法大大电子合同数据
+							if (fddContractTemplateList.size() == CommonConstants.ZERO_INT) {
+								errorMsg.add("未获取到有效的合同模板");
+							}
+							if (fddContractTemplateList.size() != CommonConstants.ONE_INT) {
+								errorMsg.add("法大大合同有效合同模板存在多条");
+							} else {
+								errorMsg.add("存在“在用”的合同");
+							}
 						}
 					}
 
-					//保存合同数据
-					attachInfo.setContractId(CommonConstants.EMPTY_STRING);
-					attachInfo.setCreateTime(LocalDateTime.now());
-
 					//校验数据
 					R<String> employeeParamR;
 					//新签
 					employeeParamR = fddContractInfoService.generalEmployeeParam(attachInfo, false);
 					if (CommonConstants.FAIL == employeeParamR.getCode()) {
-						errorList.add(new ErrorMessage(i, employeeParamR.getMsg(), CommonConstants.RED));
-						continue;
+						errorMsg.add(employeeParamR.getMsg());
 					}
-					//保存数据
-					this.save(attachInfo);
-					attachInfo.setContractId(attachInfo.getId());
-					this.updateById(attachInfo);
-					//判断员工是否有实名数据，如果没有插入是实名数据
-					long fddPersonCount = fddPersonAccountService.count(Wrappers.<FddPersonAccount>query().lambda().eq(FddPersonAccount::getMoblie, attachInfo.getEmpPhone())
-							.eq(FddPersonAccount::getIdCard, attachInfo.getEmpIdcard()).eq(FddPersonAccount::getName, attachInfo.getEmpName())
-							.eq(FddPersonAccount::getSystemFlag, CommonConstants.ONE_STRING));
-					if (fddPersonCount == CommonConstants.ZERO_INT) {
-						FddPersonAccount fddPersonAccount = new FddPersonAccount();
-						fddPersonAccount.setMoblie(attachInfo.getEmpPhone());
-						fddPersonAccount.setName(attachInfo.getEmpName());
-						fddPersonAccount.setIdCard(attachInfo.getEmpIdcard());
-						fddPersonAccount.setSystemFlag(CommonConstants.ONE_STRING);
-						fddPersonAccount.setRealStatus(CommonConstants.ZERO_STRING);
-						fddPersonAccountService.save(fddPersonAccount);
-						executorService.submit(() -> {
-							try {
-								fddPersonAccountService.sendAuthMessage(fddPersonAccount.getId());
-							} catch (Exception e) {
-								log.error("执行异常",e);
-							}
-						});
+					// 数据合法情况
+					if (!CollUtil.isEmpty(errorMsg)) {
+						// 数据不合法
+						errorList.add(new ErrorMessage(i, errorMsg));
 					} else {
-						executorService.submit(() -> {
-							try {
-								//如果已经实名发送电子合同
-								FddContractAttachInfo fddContractAttachInfo = this.getById(attachInfo.getId());
-								R<String> returnR = fddContractInfoService.saveEmpContract(fddContractAttachInfo);
-								if (returnR != null) {
-									//记录返回信息
-									if(returnR.getCode()==CommonConstants.SUCCESS){
-										fddContractAttachInfo.setRemark("成功");
-									}else {
-										fddContractAttachInfo.setRemark(returnR.getMsg());
+
+						//保存合同数据
+						attachInfo.setContractId(CommonConstants.EMPTY_STRING);
+						attachInfo.setCreateTime(LocalDateTime.now());
+						//保存数据
+						this.save(attachInfo);
+						attachInfo.setContractId(attachInfo.getId());
+						this.updateById(attachInfo);
+						//判断员工是否有实名数据，如果没有插入是实名数据
+						long fddPersonCount = fddPersonAccountService.count(Wrappers.<FddPersonAccount>query().lambda().eq(FddPersonAccount::getMoblie, attachInfo.getEmpPhone())
+								.eq(FddPersonAccount::getIdCard, attachInfo.getEmpIdcard()).eq(FddPersonAccount::getName, attachInfo.getEmpName())
+								.eq(FddPersonAccount::getSystemFlag, CommonConstants.ONE_STRING));
+						if (fddPersonCount == CommonConstants.ZERO_INT) {
+							FddPersonAccount fddPersonAccount = new FddPersonAccount();
+							fddPersonAccount.setMoblie(attachInfo.getEmpPhone());
+							fddPersonAccount.setName(attachInfo.getEmpName());
+							fddPersonAccount.setIdCard(attachInfo.getEmpIdcard());
+							fddPersonAccount.setSystemFlag(CommonConstants.ONE_STRING);
+							fddPersonAccount.setRealStatus(CommonConstants.ZERO_STRING);
+							fddPersonAccountService.save(fddPersonAccount);
+							executorService.submit(() -> {
+								try {
+									fddPersonAccountService.sendAuthMessage(fddPersonAccount.getId());
+								} catch (Exception e) {
+									log.error("执行异常", e);
+								}
+							});
+						} else {
+							executorService.submit(() -> {
+								try {
+									//如果已经实名发送电子合同
+									FddContractAttachInfo fddContractAttachInfo = this.getById(attachInfo.getId());
+									R<String> returnR = fddContractInfoService.saveEmpContract(fddContractAttachInfo, user);
+									if (returnR != null) {
+										//记录返回信息
+										if (returnR.getCode() == CommonConstants.SUCCESS) {
+											fddContractAttachInfo.setRemark("成功");
+										} else {
+											fddContractAttachInfo.setRemark(returnR.getMsg());
+										}
+										this.updateById(fddContractAttachInfo);
 									}
-									this.updateById(fddContractAttachInfo);
+								} catch (Exception e) {
+									e.printStackTrace();
 								}
-							} catch (Exception e) {
-								e.printStackTrace();
-							}
-						});
+							});
+						}
+						errorList.add(new ErrorMessage(i, "保存成功", CommonConstants.GREEN));
 					}
-					errorList.add(new ErrorMessage(i, "保存成功", CommonConstants.GREEN));
 				}
 			} else {
 				errorList.add(new ErrorMessage(i, "无数据保存"));
 			}
 		} catch (Exception e) {
 			log.error("合同数据批量新增异常" + e.getMessage());
-			errorList.add(new ErrorMessage(i, "合同数据批量新增异常:" + e.getMessage()));
 			return errorList;
 		}
 		return errorList;
@@ -490,7 +512,6 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
 			}
 		} catch (Exception e) {
 			log.error("合同数据批量新增异常" + e.getMessage());
-			errorList.add(new ErrorMessage(i, "合同数据批量新增异常:" + e.getMessage()));
 			return errorList;
 		}
 		return errorList;
@@ -577,7 +598,8 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
 	 * @param settleDomain
 	 * @param fddContractTemplate
 	 * @param newEmployeeInfo
-	 * @param tEmployeeProject
+	 * @param tCustomerInfo
+	 * @param newTEmpProject
 	 * @Author: huyc
 	 * @Date: 2022/06/01
 	 * @Description: 新增项目档案

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

@@ -69,7 +69,9 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.ZoneId;
@@ -107,27 +109,18 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe
 	private FddSealPersonAuthService fddSealPersonAuthService;
 	@Autowired
 	private FddContractAttachInfoMapper fddContractAttachInfoMapper;
-//	@Autowired
-//	private TEmployeeContractInfoService employeeContractInfoService;
-//	@Autowired
-//	private TEmployeeInfoService employeeInfoService;
+	@Autowired
+	private TEmployeeContractInfoService employeeContractInfoService;
 	@Autowired
 	private FddTemplateFieldInfoService fieldInfoService;
 	// 阿里云文件上传服务
 	@Autowired
 	private OSSUtil ossUtil;
-//	// 附件表
-//	@Autowired
-//	private TEmpAttaService empAttaService;
-//	// 附件-合同，关联表
-//	@Autowired
-//	private MEmpContractAttaService mempContractAttaService;
 	@Autowired
 	private TSettleDomainService tSettleDomainService;
 
 	@Override
-	public R<String> saveEmpContract(FddContractAttachInfo fddContractAttachInfo) throws ApiException {
-		YifuUser user = SecurityUtils.getUser();
+	public R<String> saveEmpContract(FddContractAttachInfo fddContractAttachInfo,YifuUser user) throws ApiException {
 		if (!user.getId().equals(fddContractAttachInfo.getCreateBy())) {
 			return R.failed("当前用户不是电子合同导入用户,不能操作");
 		}
@@ -560,50 +553,50 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe
 	 **/
 	@Override
 	public R<String> moveFileToEmpConcat(FddContractInfo fddContractInfo, HttpServletResponse response) throws ApiException, IOException {
-//		FddContractInfo entity = this.getById(fddContractInfo.getId());
-//		if (entity == null || entity.getSignTaskId() == null) {
-//			throw new CheckedException("未获取到对应签署任务");
-//		}
-//		TEmployeeContractInfo employeeContractInfo = employeeContractInfoService.getById(entity.getContractId());
-//		if (employeeContractInfo != null) {
-//			//发送请求
-//			GetBySignFileIdReq req = new GetBySignFileIdReq();
-//			req.setToken(fddUtil.getToken());
-//			req.setTaskId(entity.getSignTaskId());
-//			DocumentClient client = new DocumentClient(fddUtil.getFadadaApiClient());
-//			BaseRsp<DownLoadFileRsp> rsp = client.getBySignFileId(req);
-//			//校验参数
-//			if (StringUtils.equals(rsp.getCode(), FddUtil.SUCCESS)) {
-//				DownLoadFileRsp rspData = rsp.getData();
-//				if (rspData != null) {
-//					InputStream bis = null;
-//					try {
-//						bis = new ByteArrayInputStream(rspData.getFileBytes());
-//						String name = System.currentTimeMillis() + "法大大电子签附件";
-//						String key = name + ".zip";
-//						ossUtil.uploadFileByStream(bis, key, null);
-//						// 1：保存为
-////						TEmpAtta empAtta = BasicServiceUtil.initTEmpAttaForInsert(name, key, (long) rspData.getFileBytes().length);
-////						empAttaService.save(empAtta);
-////						MEmpContractAtta contractAtta = new MEmpContractAtta();
-////						contractAtta.setAttaId(empAtta.getId());
-////						contractAtta.setContractId(employeeContractInfo.getId());
-////						mempContractAttaService.save(contractAtta);
-//						FddContractAttachInfo fddContractAttachInfo = fddContractAttachInfoService.getOne(Wrappers.<FddContractAttachInfo>query().lambda()
-//								.eq(FddContractAttachInfo::getContractId,entity.getContractId()).last(CommonConstants.LAST_ONE_SQL));
-//						if (fddContractAttachInfo != null) {
-//							fddContractAttachInfo.setIsMove(CommonConstants.ONE_INT);
-//							fddContractAttachInfoService.updateById(fddContractAttachInfo);
-//						}
-//						return R.ok();
-//					} finally {
-//						if (bis != null) {
-//							bis.close();
-//						}
-//					}
-//				}
-//			}
-//		}
+		FddContractInfo entity = this.getById(fddContractInfo.getId());
+		if (entity == null || entity.getSignTaskId() == null) {
+			throw new CheckedException("未获取到对应签署任务");
+		}
+		TEmployeeContractInfo employeeContractInfo = employeeContractInfoService.getById(entity.getContractId());
+		if (employeeContractInfo != null) {
+			//发送请求
+			GetBySignFileIdReq req = new GetBySignFileIdReq();
+			req.setToken(fddUtil.getToken());
+			req.setTaskId(entity.getSignTaskId());
+			DocumentClient client = new DocumentClient(fddUtil.getFadadaApiClient());
+			BaseRsp<DownLoadFileRsp> rsp = client.getBySignFileId(req);
+			//校验参数
+			if (StringUtils.equals(rsp.getCode(), FddUtil.SUCCESS)) {
+				DownLoadFileRsp rspData = rsp.getData();
+				if (rspData != null) {
+					InputStream bis = null;
+					try {
+						bis = new ByteArrayInputStream(rspData.getFileBytes());
+						String name = System.currentTimeMillis() + "法大大电子签附件";
+						String key = name + ".zip";
+						ossUtil.uploadFileByStream(bis, key, null);
+						// 1：保存为
+//						TEmpAtta empAtta = BasicServiceUtil.initTEmpAttaForInsert(name, key, (long) rspData.getFileBytes().length);
+//						empAttaService.save(empAtta);
+//						MEmpContractAtta contractAtta = new MEmpContractAtta();
+//						contractAtta.setAttaId(empAtta.getId());
+//						contractAtta.setContractId(employeeContractInfo.getId());
+//						mempContractAttaService.save(contractAtta);
+						FddContractAttachInfo fddContractAttachInfo = fddContractAttachInfoMapper.selectOne(Wrappers.<FddContractAttachInfo>query().lambda()
+								.eq(FddContractAttachInfo::getContractId,entity.getContractId()).last(CommonConstants.LAST_ONE_SQL));
+						if (fddContractAttachInfo != null) {
+							fddContractAttachInfo.setIsMove(CommonConstants.ONE_INT);
+							fddContractAttachInfoMapper.updateById(fddContractAttachInfo);
+						}
+						return R.ok();
+					} finally {
+						if (bis != null) {
+							bis.close();
+						}
+					}
+				}
+			}
+		}
 		return R.failed("转移失败");
 	}
 
@@ -878,6 +871,7 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe
 	 * @return: com.yifu.cloud.v1.common.core.util.R<java.lang.String>
 	 **/
 	private R<String> cancleReviSeTask(FddContractInfo entity) throws ApiException {
+		YifuUser user = SecurityUtils.getUser();
 		//定稿任务状态：0 待发起 、1定稿中、2已定稿、3已撤销、4已过期
 		R<Integer> reviseTaskDetailR = reviseTaskDetail(entity);
 		if (reviseTaskDetailR.getCode() != CommonConstants.SUCCESS) {
@@ -897,9 +891,7 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe
 		//.先复制一份合同、然后删除之前合同
 		entity.setDeleteFlag(CommonConstants.ONE_STRING);
 		this.updateById(entity);
-//        TEmployeeContractInfo employeeContractInfo = employeeContractInfoService.getById(entity.getContractId());
-//        TEmployeeInfo employeeInfo = employeeInfoService.getById(employeeContractInfo.getEmpId());
-		R<String> saveEmpContractR = saveEmpContract(attachInfo);
+		R<String> saveEmpContractR = saveEmpContract(attachInfo,user);
 		if (saveEmpContractR.getCode() != CommonConstants.SUCCESS) {
 			throw new CheckedException(saveEmpContractR.getMsg());
 		}

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

@@ -327,5 +327,12 @@ public interface ErrorCodes {
 	 * 该人员项目档案已减项，不允许划转
 	 */
 	String PROJECT_PERSON_DELETE_EXIT = "project.person.delete.exit";
-
+	/**
+	 * 派单员工合同相关信息不可为空
+	 */
+    String EMP_DISPATCH_CONTRACT_NOT_EMPTY = "emp.dispatch.contract.not.empty";
+	/**
+	 * 派单员工社保相关信息不可为空
+	 */
+	String EMP_DISPATCH_SOCIAL_NOT_EMPTY = "emp.dispatch.social.not.empty";
 }

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/ErrorMessage.java

@@ -3,6 +3,8 @@ package com.yifu.cloud.plus.v1.yifu.common.core.util;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author fang
@@ -16,6 +18,8 @@ public class ErrorMessage implements Serializable {
     //默认红色 success green
     private String color = "red";
 
+	private Set<String> errors = new HashSet();
+
     /**
      * @param 用于展示勾选的名称
      * @Author: wangan
@@ -42,4 +46,9 @@ public class ErrorMessage implements Serializable {
         this.message = message;
         this.name= name;
     }
+
+	public ErrorMessage(Integer lineNum, Set<String> errors) {
+		this.lineNum = lineNum;
+		this.errors = errors;
+	}
 }

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

@@ -106,8 +106,15 @@ change.strat.month.exit=\u5212\u8F6C\u8D77\u59CB\u6708\u4E0D\u80FD\u4E3A\u7A7A
 change.less.month.exit=\u5212\u8F6C\u8D77\u59CB\u6708\u8981\u5C0F\u4E8E\u7B49\u4E8E\u5F53\u524D\u6708
 
 project.person.search.exit=\u672A\u627E\u5230\u8BE5\u4EBA\u5458\u7684\u9879\u76EE\u6863\u6848\uFF0C\u8BF7\u6838\u5B9E
+
 project.person.delete.exit=\u8BE5\u4EBA\u5458\u9879\u76EE\u6863\u6848\u5DF2\u51CF\u9879\uFF0C\u4E0D\u5141\u8BB8\u5212\u8F6C
 
+emp.dispatch.contract.not.empty=\u6D3E\u5355\u5458\u5DE5\u5408\u540C\u76F8\u5173\u4FE1\u606F\u4E0D\u53EF\u4E3A\u7A7A
+
+emp.dispatch.social.not.empty=\u6D3E\u5355\u5458\u5DE5\u793E\u4FDD\u76F8\u5173\u4FE1\u606F\u4E0D\u53EF\u4E3A\u7A7A
+
+
+
 
 
 

yifu-common/yifu-common-dapr/src/main/resources/daprConfig.properties

-dapr.upms.appUrl=http://localhost:3500/v1.0/invoke/
+dapr.upms.appUrl=http://yifu-upms.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
 dapr.upms.appId=yifu-upms
 dapr.upms.appPort=4000
 dapr.upms.httpPort=3500
@@ -6,18 +6,11 @@ dapr.upms.grpcPort=52000
 dapr.upms.metricsPort=9094
 
 #\u6D4B\u8BD5\u73AF\u5883
-#dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
+dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
 #\u672C\u5730
-dapr.check.appUrl=http://localhost:3507/v1.0/invoke/
+#dapr.check.appUrl=http://localhost:3502/v1.0/invoke/
 dapr.check.appId=yifu-check
-#dapr.check.appPort=5022
-#dapr.check.httpPort=3502
-#dapr.check.grpcPort=52002
-#dapr.check.metricsPort=9092
-
+dapr.check.appPort=5022
+dapr.check.httpPort=3502
+dapr.check.grpcPort=52002
+dapr.check.metricsPort=9092
\ No newline at end of file
-dapr.social.appUrl=http://localhost:3509/v1.0/invoke/
-dapr.social.appId\uFF1B
-dapr.social.appPort=5002
-dapr.social.httpPort=3509
-dapr.social.grpcPort=52003
-dapr.social.metricsPort=9093
\ No newline at end of file

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceCompanyController.java

 package com.yifu.cloud.plus.v1.yifu.insurances.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceCompanyService;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
 
 /**
  * @author zhaji
@@ -18,4 +27,47 @@ import org.springframework.web.bind.annotation.RestController;
 @Tag(name = "保险公司相关")
 @SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class TInsuranceCompanyController {
+
+	@Resource
+	private TInsuranceCompanyService insuranceCompanyService;
+
+	/**
+	 * 分页查询
+	 * @param page 分页对象
+	 * @param insuranceCompany 保险公司
+	 * @return
+	 */
+	@Operation(summary = "分页查询", description = "分页查询")
+	@GetMapping("/page" )
+	public R<IPage<TInsuranceCompany>> getTCertRecordPage(Page page, TInsuranceCompany insuranceCompany) {
+		return R.ok(insuranceCompanyService.pageDiy(page, insuranceCompany));
+	}
+
+	/**
+	 * 通过id查询保险公司详情
+	 * @param id id
+	 * @return R
+	 */
+	@Operation(summary = "通过id查询保险公司详情", description = "通过id查询：hasPermission('demo_insuranceCompany_get')")
+	@GetMapping("/{id}" )
+	@PreAuthorize("@pms.hasPermission('demo_insuranceCompany_get')" )
+	public R<TInsuranceCompany> getById(@PathVariable("id" ) String id) {
+		return R.ok(insuranceCompanyService.getById(id));
+	}
+
+
+	/**
+	 * 新增保险公司
+	 * @param insuranceCompany 保险公司明细
+	 * @return R
+	 */
+	@Operation(summary = "新增保险公司", description = "新增证明开具记录表：hasPermission('demo_insuranceCompany_add')")
+	@SysLog("新增保险公司" )
+	@PostMapping
+	@PreAuthorize("@pms.hasPermission('demo_insuranceCompany_add')" )
+	public R<Boolean> save(@RequestBody TInsuranceCompany insuranceCompany) {
+		return R.ok(insuranceCompanyService.save(insuranceCompany));
+	}
+
+
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceTypeController.java

 package com.yifu.cloud.plus.v1.yifu.insurances.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeService;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
 
 /**
  * @author zhaji
@@ -18,4 +28,44 @@ import org.springframework.web.bind.annotation.RestController;
 @Tag(name = "险种相关")
 @SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class TInsuranceTypeController {
+	@Resource
+	private TInsuranceTypeService insuranceTypeService;
+
+	/**
+	 * 分页查询
+	 * @param page 分页对象
+	 * @param insuranceType 险种
+	 * @return
+	 */
+	@Operation(summary = "分页查询", description = "分页查询")
+	@GetMapping("/page" )
+	public R<IPage<TInsuranceType>> getTCertRecordPage(Page page, TInsuranceType insuranceType) {
+		return R.ok(insuranceTypeService.pageDiy(page, insuranceType));
+	}
+
+	/**
+	 * 通过id查询险种详情
+	 * @param id id
+	 * @return R
+	 */
+	@Operation(summary = "通过id查询险种详情", description = "通过id查询：hasPermission('demo_insuranceType_get')")
+	@GetMapping("/{id}" )
+	@PreAuthorize("@pms.hasPermission('demo_insuranceType_get')" )
+	public R<TInsuranceType> getById(@PathVariable("id" ) String id) {
+		return R.ok(insuranceTypeService.getById(id));
+	}
+
+
+	/**
+	 * 新增险种
+	 * @param insuranceType 险种明细
+	 * @return R
+	 */
+	@Operation(summary = "新增保险公司", description = "新增险种：hasPermission('demo_insuranceType_add')")
+	@SysLog("新增险种")
+	@PostMapping
+	@PreAuthorize("@pms.hasPermission('demo_insuranceType_add')" )
+	public R<Boolean> save(@RequestBody TInsuranceType insuranceType) {
+		return R.ok(insuranceTypeService.save(insuranceType));
+	}
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceTypeRateController.java

 package com.yifu.cloud.plus.v1.yifu.insurances.controller;
 
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeRateService;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -7,6 +8,8 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * @author zhaji
  * @description 费率相关
@@ -18,4 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Tag(name = "费率相关")
 @SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class TInsuranceTypeRateController {
+
+	@Resource
+	private TInsuranceTypeRateService insuranceTypeRateService;
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceTypeStandardController.java

 package com.yifu.cloud.plus.v1.yifu.insurances.controller;
 
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeStandardService;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -7,6 +8,8 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * @author zhaji
  * @description 购买标准相关
@@ -18,4 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Tag(name = "购买标准相关")
 @SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class TInsuranceTypeStandardController {
+
+	@Resource
+	private TInsuranceTypeStandardService insuranceTypeStandardService;
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceCompanyService.java

 package com.yifu.cloud.plus.v1.yifu.insurances.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.insurances.entity.TInsuranceCompany;
 
@@ -10,4 +12,5 @@ import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
 */
 public interface TInsuranceCompanyService extends IService<TInsuranceCompany> {
 
+	IPage<TInsuranceCompany> pageDiy(Page page, TInsuranceCompany insuranceCompany);
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceTypeService.java

 package com.yifu.cloud.plus.v1.yifu.insurances.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.insurances.entity.TInsuranceCompany;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType;
 
 /**
@@ -11,4 +14,5 @@ import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType;
 */
 public interface TInsuranceTypeService extends IService<TInsuranceType> {
 
+	IPage<TInsuranceType> pageDiy(Page page, TInsuranceType insuranceType);
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceCompanyServiceImpl.java

 package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
 import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceCompanyMapper;
@@ -14,4 +17,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyMapper, TInsuranceCompany> implements TInsuranceCompanyService {
 
+	@Override
+	public IPage<TInsuranceCompany> pageDiy(Page page, TInsuranceCompany insuranceCompany) {
+		LambdaQueryWrapper<TInsuranceCompany> wrapper = new LambdaQueryWrapper<>();
+		wrapper.orderByDesc(TInsuranceCompany::getCreateTime);
+		return this.baseMapper.selectPage(page,wrapper);
+	}
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceTypeServiceImpl.java

 package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType;
 import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeMapper;
@@ -15,4 +18,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper, TInsuranceType> implements TInsuranceTypeService {
 
+	@Override
+	public IPage<TInsuranceType> pageDiy(Page page, TInsuranceType insuranceType) {
+		LambdaQueryWrapper<TInsuranceType> wrapper = new LambdaQueryWrapper<>();
+		wrapper.orderByDesc(TInsuranceType::getCreateTime);
+		return this.baseMapper.selectPage(page,wrapper);
+	}
 }

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.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.social.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+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.core.vo.RowIndex;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 派单信息记录表
+ *
+ * @author fxj
+ * @date 2022-07-15 11:38:05
+ */
+@Data
+public class TDispatchImportVo extends RowIndex implements Serializable {
+
+	/**
+	 * 员工姓名
+	 */
+	@Length(max = 50, message = "员工姓名 不能超过50 个字符" )
+	@ExcelAttribute(name = "员工姓名", maxLength = 50, isNotEmpty = true)
+	@Schema(description = "员工姓名" )
+	@ExcelProperty("员工姓名" )
+	private String empName;
+	/**
+	 * 身份证号
+	 */
+	@Length(max = 20, message = "身份证号 不能超过20 个字符" )
+	@ExcelAttribute(name = "身份证号", maxLength = 20, isNotEmpty = true)
+	@Schema(description = "身份证号" )
+	@ExcelProperty("身份证号" )
+	private String empIdcard;
+	/**
+	 * 员工类型
+	 */
+	@Length(max = 32, message = "员工类型 不能超过32 个字符" )
+	@ExcelAttribute(name = "员工类型", maxLength = 32, isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE, isNotEmpty = true)
+	@Schema(description = "员工类型" )
+	@ExcelProperty("员工类型" )
+	private String empType;
+	/**
+	 * 手机号码
+	 */
+	@Length(max = 32, message = "手机号码 不能超过32 个字符" )
+	@ExcelAttribute(name = "手机号码", maxLength = 32, isNotEmpty = true)
+	@Schema(description = "手机号码" )
+	@ExcelProperty("手机号码" )
+	private String empMobile;
+	/**
+	 * 项目编码
+	 */
+	@Length(max = 32, message = "项目编码 不能超过32 个字符" )
+	@ExcelAttribute(name = "项目编码", maxLength = 32, isNotEmpty = true)
+	@Schema(description = "项目编码" )
+	@ExcelProperty("项目编码" )
+	private String settleDomainCode;
+
+	/**
+	 * 身份证省
+	 */
+	@ExcelAttribute(name = "身份证省" ,isArea = true)
+	@Schema(description = "身份证省" )
+	@ExcelProperty("身份证省" )
+	private Integer idCardProvince;
+	/**
+	 * 身份证市
+	 */
+	@ExcelAttribute(name = "身份证市" ,isArea = true,parentField = "idCardProvince")
+	@Schema(description = "身份证市" )
+	@ExcelProperty("身份证市" )
+	private Integer idCardCity;
+	/**
+	 * 身份证县
+	 */
+	@ExcelAttribute(name = "身份证县",isArea = true,parentField = "idCardCity")
+	@Schema(description = "身份证县" )
+	@ExcelProperty("身份证县" )
+	private Integer idCardTown;
+
+	/**
+	 * 身份证所在地
+	 */
+	@ExcelAttribute(name = "身份证所在地")
+	@Schema(description = "身份证所在地" )
+	@ExcelProperty("身份证所在地" )
+	private Integer idCardAddress;
+
+	/**
+	 * 档案-省
+	 */
+	@ExcelAttribute(name = "档案-省" ,isArea = true)
+	@Schema(description = "档案-省" )
+	@ExcelProperty("档案-省" )
+	private Integer fileProvince;
+	/**
+	 * 档案-市
+	 */
+	@ExcelAttribute(name = "档案-市" ,isArea = true,parentField = "fileProvince", isNotEmpty = true)
+	@Schema(description = "档案-市" )
+	@ExcelProperty("档案-市" )
+	private Integer fileCity;
+	/**
+	 * 档案-县
+	 */
+	@ExcelAttribute(name = "档案-县" ,isArea = true,parentField = "fileCity", isNotEmpty = true)
+	@Schema(description = "档案-县" )
+	@ExcelProperty("档案-县" )
+	private Integer fileTown;
+
+	/**
+	 * 就职班组
+	 */
+	@Length(max = 50, message = "就职班组 不能超过50 个字符" )
+	@ExcelAttribute(name = "就职班组", maxLength = 50)
+	@Schema(description = "就职班组" )
+	@ExcelProperty("就职班组" )
+	private String inauguralTeam;
+
+	/**
+	 * 就职岗位
+	 */
+	@Length(max = 30, message = "就职岗位 不能超过30 个字符" )
+	@ExcelAttribute(name = "就职岗位", maxLength = 30, isNotEmpty = true)
+	@Schema(description = "就职岗位" )
+	@ExcelProperty("就职岗位" )
+	private String post;
+
+	/**
+	 * 试用期（单位月）
+	 */
+	@Length(max = 2, message = "试用期 不能超过2 个字符" )
+	@ExcelAttribute(name = "试用期", maxLength = 32)
+	@Schema(description = "试用期" )
+	@ExcelProperty("试用期" )
+	private String tryPeriod;
+
+	/**
+	 * 工时制：1标准工时 2 综合工时 3不定时工时制
+	 */
+	@Length(max = 1, message = "工时制 不能超过1 个字符" )
+	@ExcelAttribute(name = "工时制", maxLength = 1, isDataId = true,dataType = ExcelAttributeConstants.WORKING_HOURS, isNotEmpty = true)
+	@Schema(description = "工时制：1标准工时 2 综合工时 3不定时工时制" )
+	@ExcelProperty("工时制" )
+	private String workingHours;
+	/**
+	 * 民族
+	 */
+	@Length(max = 32, message = "民族 不能超过32 个字符" )
+	@ExcelAttribute(name = "民族", maxLength = 32, isDataId = true,dataType = ExcelAttributeConstants.EMP_NATIONAL, isNotEmpty = true)
+	@Schema(description = "民族" )
+	@ExcelProperty("民族" )
+	private String empNational;
+	/**
+	 * 户口性质
+	 */
+	@Length(max = 32, message = "户口性质 不能超过32 个字符" )
+	@ExcelAttribute(name = "户口性质", maxLength = 32, isDataId = true,dataType = ExcelAttributeConstants.EMP_REGISTYPE)
+	@Schema(description = "户口性质" )
+	@ExcelProperty("户口性质" )
+	private String empRegisType;
+
+	/**
+	 * 合同类型
+	 */
+	@Length(max = 32, message = "合同类型 不能超过32 个字符" )
+	@ExcelAttribute(name = "合同类型", maxLength = 32, isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_TYPE)
+	@Schema(description = "合同类型" )
+	@ExcelProperty("合同类型" )
+	private String contractName;
+
+	/**
+	 * 业务细分 personnel_type_sub
+	 */
+	@ExcelAttribute(name = "业务细分", maxLength = 32)
+	@Schema(description = "业务细分", name = "contractName")
+	private String contractSubName;
+
+	/**
+	 * 签订期限
+	 * 0	已完成一定工作任务为期限
+	 * 1	固定期限
+	 * 2	无固定期限
+	 */
+	@NotBlank(message = "签订期限不能为空")
+	@Length(max = 32, message = "签订期限不能超过32个字符")
+	@ExcelAttribute(name = "签订期限", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_CONTRACT_TYPE)
+	@Schema(description = "签订期限", name = "contractType")
+	private String contractType;
+
+	/**
+	 * 合同起始时间
+	 */
+	@ExcelAttribute(name = "合同起始时间", isDate = true)
+	@Schema(description = "合同起始时间" )
+	@ExcelProperty("合同起始时间" )
+	private Date contractStart;
+	/**
+	 * 合同到期时间
+	 */
+	@ExcelAttribute(name = "合同到期时间", isDate = true)
+	@Schema(description = "合同到期时间" )
+	@ExcelProperty("合同到期时间" )
+	private Date contractEnd;
+	/**
+	 * 合同期限
+	 */
+	@ExcelAttribute(name = "合同期限", isInteger = true )
+	@Schema(description = "合同期限" )
+	@ExcelProperty("合同期限" )
+	private Integer contractTerm;
+
+	/**
+	 * 学历名称
+	 */
+	@ExcelAttribute(name = "学历",isDataId = true,dataType = ExcelAttributeConstants.EDUCATION)
+	@NotNull(message = "学历不可为空")
+	@Schema(description = "学历：无档案的时候 新增档案时同步新增学历" )
+	@ExcelProperty(value ="学历")
+	private String educationName;
+
+	/**
+	 * 备案基数
+	 */
+	@Length(max = 255, message = "备案基数 不能超过255 个字符" )
+	@ExcelAttribute(name = "备案基数", maxLength = 255)
+	@Schema(description = "备案基数：购买社保时必填" )
+	@ExcelProperty("备案基数" )
+	private String recordBase;
+
+	/**
+	 * 社保户
+	 */
+	@Length(max = 32, message = "社保户 不能超过32个字符" )
+	@ExcelAttribute(name = "社保户", maxLength = 32)
+	@Schema(description = "社保户" )
+	@ExcelProperty("社保户" )
+	private String socialHousehold;
+
+	/**
+	 * 养老起缴日期
+	 */
+	@ExcelAttribute(name = "养老起缴日期", isDate = true)
+	@Schema(description = "养老起缴日期：购买社保时必填" )
+	@ExcelProperty("养老起缴日期" )
+	private Date pensionStart;
+	/**
+	 * 医疗起缴日期
+	 */
+	@ExcelAttribute(name = "医疗起缴日期", isDate = true)
+	@Schema(description = "医疗起缴日期" )
+	@ExcelProperty("医疗起缴日期" )
+	private Date medicalStart;
+	/**
+	 * 失业起缴日期
+	 */
+	@ExcelAttribute(name = "失业起缴日期", isDate = true)
+	@Schema(description = "失业起缴日期" )
+	@ExcelProperty("失业起缴日期" )
+	private Date unemployStart;
+	/**
+	 * 工伤起缴日期
+	 */
+	@ExcelAttribute(name = "工伤起缴日期", isDate = true)
+	@Schema(description = "工伤起缴日期" )
+	@ExcelProperty("工伤起缴日期" )
+	private Date workInjuryStart;
+	/**
+	 * 生育起缴日期
+	 */
+	@ExcelAttribute(name = "生育起缴日期", isDate = true)
+	@Schema(description = "生育起缴日期" )
+	@ExcelProperty("生育起缴日期" )
+	private Date birthStart;
+	/**
+	 * 大病起缴日期
+	 */
+	@ExcelAttribute(name = "大病起缴日期", isDate = true)
+	@Schema(description = "大病起缴日期" )
+	@ExcelProperty("大病起缴日期" )
+	private Date bigailmentStart;
+	/**
+	 * 缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）
+	 */
+	@Length(max = 1, message = "缴纳类型 不能超过1 个字符" )
+	@ExcelAttribute(name = "缴纳类型", maxLength = 1, isDataId = true, readConverterExp = "0=最低缴纳,1=自定义缴纳,2=最高缴纳")
+	@Schema(description = "缴纳类型:（0最低缴纳、1自定义缴纳、2最高缴纳）" )
+	@ExcelProperty("缴纳类型" )
+	private String paymentType;
+
+	/**
+	 * 养老基数
+	 */
+	@ExcelAttribute(name = "养老基数" )
+	@Schema(description = "养老基数" )
+	@ExcelProperty("养老基数" )
+	private BigDecimal pensionCardinal;
+	/**
+	 * 医疗基数
+	 */
+	@ExcelAttribute(name = "医疗基数" )
+	@Schema(description = "医疗基数" )
+	@ExcelProperty("医疗基数" )
+	private BigDecimal medicalCardinal;
+	/**
+	 * 失业基数
+	 */
+	@ExcelAttribute(name = "失业基数" )
+	@Schema(description = "失业基数" )
+	@ExcelProperty("失业基数" )
+	private BigDecimal unemploymentCardinal;
+
+	/**
+	 * 工伤基数
+	 */
+	@ExcelAttribute(name = "工伤基数" )
+	@Schema(description = "工伤基数" )
+	@ExcelProperty("工伤基数" )
+	private BigDecimal workInjuryCardinal;
+	/**
+	 * 生育基数
+	 */
+	@ExcelAttribute(name = "生育基数" )
+	@Schema(description = "生育基数" )
+	@ExcelProperty("生育基数" )
+	private BigDecimal birthCardinal;
+
+	/**
+	 * 大病基数
+	 */
+	@ExcelAttribute(name = "大病基数" )
+	@Schema(description = "大病基数" )
+	@ExcelProperty("大病基数" )
+	private BigDecimal bigailmentCardinal;
+
+	/**
+	 * 公积金户
+	 */
+	@Length(max = 32, message = "公积金户 不能超过32 个字符" )
+	@ExcelAttribute(name = "公积金户", maxLength = 32)
+	@Schema(description = "公积金户" )
+	@ExcelProperty("公积金户" )
+	private String providentHousehold;
+
+	/**
+	 * 公积金起缴日期
+	 */
+	@ExcelAttribute(name = "公积金起缴日期", isDate = true)
+	@Schema(description = "公积金起缴日期" )
+	@ExcelProperty("公积金起缴日期" )
+	private Date providentStart;
+
+	/**
+	 * 公积金基数
+	 */
+	@ExcelAttribute(name = "公积金基数" )
+	@Schema(description = "公积金基数" )
+	@ExcelProperty("公积金基数" )
+	private BigDecimal providentCardinal;
+
+	/**
+	 * 公积金缴纳比例
+	 */
+	@ExcelAttribute(name = "公积金缴纳比例" )
+	@Schema(description = "公积金缴纳比例" )
+	@ExcelProperty("公积金缴纳比例" )
+	private BigDecimal providentPer;
+
+
+	/**
+	 * 委托备注
+	 */
+	@Length(max = 100, message = "委托备注 不能超过100 个字符" )
+	@ExcelAttribute(name = "委托备注", maxLength = 100)
+	@Schema(description = "委托备注" )
+	@ExcelProperty("委托备注" )
+	private String trustRemark;
+
+}

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

@@ -31,13 +31,15 @@ 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.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.TDispatchInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchImportVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoSearchVo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoVo;
+import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
 
@@ -48,6 +50,7 @@ import java.io.InputStream;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
+
 /**
  * 派单信息记录表
  *
@@ -57,190 +60,227 @@ import java.util.List;
 @Log4j2
 @Service
 public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, TDispatchInfo> implements TDispatchInfoService {
-    /**
-     * 派单信息记录表简单分页查询
-     * @param tDispatchInfo 派单信息记录表
-     * @return
-     */
-    @Override
-    public IPage<TDispatchInfo> getTDispatchInfoPage(Page<TDispatchInfo> page, TDispatchInfo tDispatchInfo){
-        return baseMapper.getTDispatchInfoPage(page,tDispatchInfo);
-    }
-
-    /**
-     * 派单信息记录表批量导出
-     * @return
-     */
-    @Override
-    public void listExport(HttpServletResponse response, TDispatchInfoSearchVo searchVo){
-        String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
-        //获取要导出的列表
-        List<TDispatchInfo> list = new ArrayList<>();
-        long count = noPageCountDiy(searchVo);
-        ServletOutputStream out = null;
-        try {
-            out = response.getOutputStream();
-            response.setContentType("multipart/form-data");
-            response.setCharacterEncoding("utf-8");
-            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName  , "UTF-8"));
-            // 这里 需要指定写用哪个class去写，然后写到第一个sheet，然后文件流会自动关闭
-            //EasyExcel.write(out, TEmpBadRecord.class).sheet("不良记录").doWrite(list);
-            ExcelWriter  excelWriter = EasyExcel.write(out, TDispatchInfo.class).build();
-            int index = 0;
-            if (count >  CommonConstants.ZERO_INT){
-                for (int i = 0; i <= count; ) {
-                    // 获取实际记录
-                    searchVo.setLimitStart(i);
-                    searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
-                    list = noPageDiy(searchVo);
-                    if (Common.isNotNull(list)){
-                        ExcelUtil<TDispatchInfo> util = new ExcelUtil<>(TDispatchInfo.class);
-                        for (TDispatchInfo vo:list){
-                            util.convertEntity(vo,null,null,null);
-                        }
-                    }
-                    if (Common.isNotNull(list)){
-                        WriteSheet writeSheet = EasyExcel.writerSheet("派单信息记录表"+index).build();
-                        excelWriter.write(list,writeSheet);
-                        index++;
-                    }
-                    i = i + CommonConstants.EXCEL_EXPORT_LIMIT;
-                    if (Common.isNotNull(list)){
-                        list.clear();
-                    }
-                }
-            }else {
-                WriteSheet writeSheet = EasyExcel.writerSheet("派单信息记录表"+index).build();
-                excelWriter.write(list,writeSheet);
-            }
-            if (Common.isNotNull(list)){
-                list.clear();
-            }
-            out.flush();
-            excelWriter.finish();
-        }catch (Exception e){
-            log.error("执行异常" ,e);
-        }finally {
-            try {
-                if (null != out) {
-                    out.close();
-                }
-            } catch (IOException e) {
-                log.error("执行异常", e);
-            }
-        }
-    }
-
-    @Override
-    public List<TDispatchInfo> noPageDiy(TDispatchInfoSearchVo searchVo) {
-        LambdaQueryWrapper<TDispatchInfo> wrapper = buildQueryWrapper(searchVo);
-        List<String> idList = Common.getList(searchVo.getIds());
-        if (Common.isNotNull(idList)){
-            wrapper.in(TDispatchInfo::getId,idList);
-        }
-        if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0){
-            wrapper.last(" limit "+ searchVo.getLimitStart() +","+ searchVo.getLimitEnd());
-        }
-        wrapper.orderByDesc(BaseEntity::getCreateTime);
-        return baseMapper.selectList(wrapper);
-    }
-
-    private  Long noPageCountDiy(TDispatchInfoSearchVo searchVo) {
-        LambdaQueryWrapper<TDispatchInfo> wrapper = buildQueryWrapper(searchVo);
-        List<String> idList = Common.getList(searchVo.getIds());
-        if (Common.isNotNull(idList)){
-            wrapper.in(TDispatchInfo::getId,idList);
-        }
-        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.getCreateName())){
-            wrapper.eq(TDispatchInfo::getCreateName,entity.getCreateName());
-        }
-        return wrapper;
-    }
-
-    @Override
-    public R<List<ErrorMessage>> importDiy(InputStream inputStream) {
-        List<ErrorMessage> errorMessageList = new ArrayList<>();
-        ExcelUtil<TDispatchInfoVo> util1 = new ExcelUtil<>(TDispatchInfoVo.class);;
-        // 写法2：
-        // 匿名内部类 不用额外写一个DemoDataListener
-        // 这里 需要指定读用哪个class去读，然后读取第一个sheet 文件流会自动关闭
-        try {
-            EasyExcel.read(inputStream, TDispatchInfoVo.class, new ReadListener<TDispatchInfoVo>() {
-                /**
-                 * 单次缓存的数据量
-                 */
-                public static final int BATCH_COUNT = CommonConstants.BATCH_COUNT;
-                /**
-                 *临时存储
-                 */
-                private List<TDispatchInfoVo> cachedDataList = ListUtils.newArrayListWithExpectedSize(BATCH_COUNT);
-
-                @Override
-                public void invoke(TDispatchInfoVo data, AnalysisContext context) {
-                    ReadRowHolder readRowHolder = context.readRowHolder();
-                    Integer rowIndex = readRowHolder.getRowIndex();
-                    data.setRowIndex(rowIndex+1);
-                    ErrorMessage errorMessage = util1.checkEntity(data, data.getRowIndex());
-                    if (Common.isNotNull(errorMessage)){
-                        errorMessageList.add(errorMessage);
-                    }else {
-                        cachedDataList.add(data);
-                    }
-                    if (cachedDataList.size() >= BATCH_COUNT) {
-                        saveData();
-                        // 存储完成清理 list
-                        cachedDataList = ListUtils.newArrayListWithExpectedSize(BATCH_COUNT);
-                    }
-                }
-                @Override
-                public void doAfterAllAnalysed(AnalysisContext context) {
-                    saveData();
-                }
-
-                /**
-                 * 加上存储数据库
-                 */
-                private void saveData() {
-                    log.info("{}条数据，开始存储数据库！", cachedDataList.size());
-                    importTDispatchInfo(cachedDataList,errorMessageList);
-                    log.info("存储数据库成功！");
-                }
-            }).sheet().doRead();
-        }catch (Exception e){
-            log.error(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR,e);
-            return R.failed(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR);
-        }
-        return  R.ok(errorMessageList);
-    }
-    private void importTDispatchInfo(List<TDispatchInfoVo> excelVOList, List<ErrorMessage> errorMessageList) {
-        // 个性化校验逻辑
-        ErrorMessage errorMsg;
-        // 执行数据插入操作 组装
-        for (int i = 0; i < excelVOList.size(); i++) {
-            TDispatchInfoVo excel = excelVOList.get(i);
-            // 数据合法情况 TODO
-
-            // 插入
-            insertExcel(excel);
-            errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS));
-        }
-    }
-    /**
-     * 插入excel bad record
-     */
-    private void insertExcel(TDispatchInfoVo excel) {
-        TDispatchInfo insert = new TDispatchInfo();
-        BeanUtil.copyProperties(excel, insert);
-        this.save(insert);
-    }
+	/**
+	 * 派单信息记录表简单分页查询
+	 *
+	 * @param tDispatchInfo 派单信息记录表
+	 * @return
+	 */
+	@Override
+	public IPage<TDispatchInfo> getTDispatchInfoPage(Page<TDispatchInfo> page, TDispatchInfo tDispatchInfo) {
+		return baseMapper.getTDispatchInfoPage(page, tDispatchInfo);
+	}
+
+	/**
+	 * 派单信息记录表批量导出
+	 *
+	 * @return
+	 */
+	@Override
+	public void listExport(HttpServletResponse response, TDispatchInfoSearchVo searchVo) {
+		String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
+		//获取要导出的列表
+		List<TDispatchInfo> list = new ArrayList<>();
+		long count = noPageCountDiy(searchVo);
+		ServletOutputStream out = null;
+		try {
+			out = response.getOutputStream();
+			response.setContentType("multipart/form-data");
+			response.setCharacterEncoding("utf-8");
+			response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
+			// 这里 需要指定写用哪个class去写，然后写到第一个sheet，然后文件流会自动关闭
+			//EasyExcel.write(out, TEmpBadRecord.class).sheet("不良记录").doWrite(list);
+			ExcelWriter excelWriter = EasyExcel.write(out, TDispatchInfo.class).build();
+			int index = 0;
+			if (count > CommonConstants.ZERO_INT) {
+				for (int i = 0; i <= count; ) {
+					// 获取实际记录
+					searchVo.setLimitStart(i);
+					searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
+					list = noPageDiy(searchVo);
+					if (Common.isNotNull(list)) {
+						ExcelUtil<TDispatchInfo> util = new ExcelUtil<>(TDispatchInfo.class);
+						for (TDispatchInfo vo : list) {
+							util.convertEntity(vo, null, null, null);
+						}
+					}
+					if (Common.isNotNull(list)) {
+						WriteSheet writeSheet = EasyExcel.writerSheet("派单信息记录表" + index).build();
+						excelWriter.write(list, writeSheet);
+						index++;
+					}
+					i = i + CommonConstants.EXCEL_EXPORT_LIMIT;
+					if (Common.isNotNull(list)) {
+						list.clear();
+					}
+				}
+			} else {
+				WriteSheet writeSheet = EasyExcel.writerSheet("派单信息记录表" + index).build();
+				excelWriter.write(list, writeSheet);
+			}
+			if (Common.isNotNull(list)) {
+				list.clear();
+			}
+			out.flush();
+			excelWriter.finish();
+		} catch (Exception e) {
+			log.error("执行异常", e);
+		} finally {
+			try {
+				if (null != out) {
+					out.close();
+				}
+			} catch (IOException e) {
+				log.error("执行异常", e);
+			}
+		}
+	}
+
+	@Override
+	public List<TDispatchInfo> noPageDiy(TDispatchInfoSearchVo searchVo) {
+		LambdaQueryWrapper<TDispatchInfo> wrapper = buildQueryWrapper(searchVo);
+		List<String> idList = Common.getList(searchVo.getIds());
+		if (Common.isNotNull(idList)) {
+			wrapper.in(TDispatchInfo::getId, idList);
+		}
+		if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0) {
+			wrapper.last(" limit " + searchVo.getLimitStart() + "," + searchVo.getLimitEnd());
+		}
+		wrapper.orderByDesc(BaseEntity::getCreateTime);
+		return baseMapper.selectList(wrapper);
+	}
+
+	private Long noPageCountDiy(TDispatchInfoSearchVo searchVo) {
+		LambdaQueryWrapper<TDispatchInfo> wrapper = buildQueryWrapper(searchVo);
+		List<String> idList = Common.getList(searchVo.getIds());
+		if (Common.isNotNull(idList)) {
+			wrapper.in(TDispatchInfo::getId, idList);
+		}
+		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.getCreateName())) {
+			wrapper.eq(TDispatchInfo::getCreateName, entity.getCreateName());
+		}
+		return wrapper;
+	}
+
+	@Override
+	public R<List<ErrorMessage>> importDiy(InputStream inputStream) {
+		List<ErrorMessage> errorMessageList = new ArrayList<>();
+		ExcelUtil<TDispatchImportVo> util1 = new ExcelUtil<>(TDispatchImportVo.class);
+		;
+		// 写法2：
+		// 匿名内部类 不用额外写一个DemoDataListener
+		// 这里 需要指定读用哪个class去读，然后读取第一个sheet 文件流会自动关闭
+		try {
+			EasyExcel.read(inputStream, TDispatchImportVo.class, new ReadListener<TDispatchImportVo>() {
+				/**
+				 * 单次缓存的数据量
+				 */
+				public static final int BATCH_COUNT = CommonConstants.BATCH_COUNT;
+				/**
+				 *临时存储
+				 */
+				private List<TDispatchImportVo> cachedDataList = ListUtils.newArrayListWithExpectedSize(BATCH_COUNT);
+
+				@Override
+				public void invoke(TDispatchImportVo data, AnalysisContext context) {
+					ReadRowHolder readRowHolder = context.readRowHolder();
+					Integer rowIndex = readRowHolder.getRowIndex();
+					data.setRowIndex(rowIndex + 1);
+					ErrorMessage errorMessage = util1.checkEntity(data, data.getRowIndex());
+					if (Common.isNotNull(errorMessage)) {
+						errorMessageList.add(errorMessage);
+					} else {
+						cachedDataList.add(data);
+					}
+					if (cachedDataList.size() >= BATCH_COUNT) {
+						saveData();
+						// 存储完成清理 list
+						cachedDataList = ListUtils.newArrayListWithExpectedSize(BATCH_COUNT);
+					}
+				}
+
+				@Override
+				public void doAfterAllAnalysed(AnalysisContext context) {
+					saveData();
+				}
+
+				/**
+				 * 加上存储数据库
+				 */
+				private void saveData() {
+					log.info("{}条数据，开始存储数据库！", cachedDataList.size());
+					importTDispatchInfo(cachedDataList, errorMessageList);
+					log.info("存储数据库成功！");
+				}
+			}).sheet().doRead();
+		} catch (Exception e) {
+			log.error(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR, e);
+			return R.failed(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR);
+		}
+		return R.ok(errorMessageList);
+	}
+
+	@GlobalTransactional
+	private void importTDispatchInfo(List<TDispatchImportVo> excelVOList, List<ErrorMessage> errorMessageList) {
+		// 个性化校验逻辑
+		ErrorMessage errorMsg;
+		// 执行数据插入操作 组装
+		for (int i = 0; i < excelVOList.size(); i++) {
+			TDispatchImportVo excel = excelVOList.get(i);
+			// 数据合法情况
+			if (Common.isNotNull(excel.getContractName()) && (
+					Common.isEmpty(excel.getContractSubName())
+							|| Common.isEmpty(excel.getContractType())
+							|| Common.isEmpty(excel.getContractStart())
+							|| Common.isEmpty(excel.getContractEnd())
+			)) {
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_CONTRACT_NOT_EMPTY)));
+				continue;
+			}
+			if (Common.isNotNull(excel.getSocialHousehold()) && (
+					Common.isEmpty(excel.getRecordBase())
+					|| Common.isEmpty(excel.getPensionStart())
+					|| Common.isEmpty(excel.getPaymentType())
+					|| Common.isEmpty(excel.getPensionCardinal())
+					)) {
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_NOT_EMPTY)));
+				continue;
+			}
+
+			// 无档案无项目档案无合同无学历
+
+			// 有档案无项目档案无合同
+
+			// 有档案有项目档案无合同
+
+			// 新增社保
+
+			// 新增公积金
+
+			// 变更社保公积金查询
+
+			insertExcel(excel);
+			errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS));
+		}
+	}
+
+
+	/**
+	 * 插入excel bad record
+	 */
+	private void insertExcel(TDispatchImportVo excel) {
+		TDispatchInfo insert = new TDispatchInfo();
+		BeanUtil.copyProperties(excel, insert);
+		this.save(insert);
+	}
 }