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

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")
+	@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,6 +172,7 @@ public class FddContractAttachInfo extends BaseEntity {
      * 手机号码
      */
     @Schema(description ="手机号码")
+	@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,26 +333,46 @@ 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;
-					}
+						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::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())) {
-							errorList.add(new ErrorMessage(i, "已导入合同相关基础数据", CommonConstants.RED));
-							continue;
+								errorMsg.add("已导入合同相关基础数据");
 							}
 
 							List<FddContractTemplate> fddContractTemplateList = fddContractTemplateService.list(Wrappers.<FddContractTemplate>query().lambda()
@@ -360,30 +380,32 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
 									.eq(FddContractTemplate::getModifyUploadStatus, CommonConstants.dingleDigitStrArray[1]));
 							//如果模板存在则生成法大大电子合同数据
 							if (fddContractTemplateList.size() == CommonConstants.ZERO_INT) {
-							errorList.add(new ErrorMessage(i, "未获取到有效的合同模板", CommonConstants.RED));
-							continue;
+								errorMsg.add("未获取到有效的合同模板");
 							}
 							if (fddContractTemplateList.size() != CommonConstants.ONE_INT) {
-							errorList.add(new ErrorMessage(i, "法大大合同有效合同模板存在多条", CommonConstants.RED));
-							continue;
-						}else {
-							errorList.add(new ErrorMessage(i, "存在“在用”的合同", CommonConstants.RED));
-							continue;
+								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());
 					}
+					// 数据合法情况
+					if (!CollUtil.isEmpty(errorMsg)) {
+						// 数据不合法
+						errorList.add(new ErrorMessage(i, errorMsg));
+					} else {
+
+						//保存合同数据
+						attachInfo.setContractId(CommonConstants.EMPTY_STRING);
+						attachInfo.setCreateTime(LocalDateTime.now());
 						//保存数据
 						this.save(attachInfo);
 						attachInfo.setContractId(attachInfo.getId());
@@ -404,7 +426,7 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
 								try {
 									fddPersonAccountService.sendAuthMessage(fddPersonAccount.getId());
 								} catch (Exception e) {
-								log.error("执行异常",e);
+									log.error("执行异常", e);
 								}
 							});
 						} else {
@@ -412,12 +434,12 @@ 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){
+										if (returnR.getCode() == CommonConstants.SUCCESS) {
 											fddContractAttachInfo.setRemark("成功");
-									}else {
+										} else {
 											fddContractAttachInfo.setRemark(returnR.getMsg());
 										}
 										this.updateById(fddContractAttachInfo);
@@ -429,12 +451,12 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
 						}
 						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.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
+dapr.check.appPort=5022
+dapr.check.httpPort=3502
+dapr.check.grpcPort=52002
+dapr.check.metricsPort=9092
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

+package com.yifu.cloud.plus.v1.yifu.insurances.constants;
+
+/**
+ * @author licancan
+ * @description 商险常量
+ * @date 2022-07-18 17:52:59
+ */
+public class InsurancesConstants {
+}

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceCompany.java

+package com.yifu.cloud.plus.v1.yifu.insurances.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * 保险公司表
+ *
+ * @author zhaji
+ * @return {@link null}
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_insurance_company")
+@Tag(name = "保险公司表")
+public class TInsuranceCompany extends BaseEntity {
+    /**
+     * 保险公司id
+     */
+    private Long id;
+
+    /**
+     * 保险公司名称
+     */
+    private String companyName;
+
+    /**
+     * 保险公司地址
+     */
+    private String companyAddress;
+
+    /**
+     * 对接人
+     */
+    private String companyDocking;
+
+    /**
+     * 删除标志(0：未删除，1：删除)
+     */
+    private Integer deleteFlag;
+
+}
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceCompanyInfo.java

-package com.yifu.cloud.plus.v1.yifu.insurances.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.io.Serializable;
-
-/**
- * @author zhaji
- * @description 保险公司实体
- * @date 2022-07-18 14:12:35
- */
-@Data
-@TableName("t_insurance_company")
-@EqualsAndHashCode()
-@Schema(description = "保险公司实体类")
-public class TInsuranceCompanyInfo  implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-	/**
-	 * 保险公司id
-	 */
-	private String id;
-
-	/**
-	 * 保险公司名称
-	 */
-	private String companyName;
-
-	/**
-	 * 保险公司地址
-	 */
-	private String companyAddress;
-
-	/**
-	 * 对接人
-	 */
-	private String companyDocking;
-
-	/**
-	 * 创建人
-	 */
-	private String createBy;
-
-	/**
-	 * 创建人姓名
-	 */
-	private String createName;
-
-	/**
-	 * 创建时间
-	 */
-	private String createTime;
-
-	/**
-	 * 更新人
-	 */
-	private String updateBy;
-
-	/**
-	 * 更新时间
-	 */
-	private String updateTime;
-
-	/**
-	 * 删除标志
-	 */
-	private String deleteFlag;
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java

@@ -12,7 +12,8 @@ import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 
 /**
@@ -50,6 +51,11 @@ public class TInsuranceDetail extends BaseEntity {
      */
     private String empIdcardNo;
 
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
 	/**
 	 * 项目编码
 	 */
@@ -78,22 +84,22 @@ public class TInsuranceDetail extends BaseEntity {
     /**
      * 保单开始时间
      */
-    private Date policyStart;
+    private LocalDate policyStart;
 
     /**
      * 保单结束时间
      */
-    private Date policyEnd;
+    private LocalDate policyEnd;
 
     /**
      * 保单生效日期
      */
-    private Date policyEffect;
+    private LocalDate policyEffect;
 
     /**
      * 办理时间
      */
-    private Date batchDate;
+    private LocalDateTime batchDate;
 
     /**
      * 结算月
@@ -111,24 +117,24 @@ public class TInsuranceDetail extends BaseEntity {
     private Integer buyType;
 
     /**
-     * 商险购买地省名称
+     * 商险购买地省code
      */
-    private String businessInsuranceProvName;
+    private Integer insuranceProvince;
 
     /**
-     * 商险购买地市名称
+     * 商险购买地市code
      */
-    private String businessInsuranceCityName;
+    private Integer insuranceCity;
 
     /**
-     * 商险办理省名称
+     * 商险办理省code
      */
-    private String businessInsuranceHandleProvName;
+    private Integer insuranceHandleProvince;
 
     /**
-     * 商险办理城市名称
+     * 商险办理城市code
      */
-    private String businessInsuranceHandleCityName;
+    private Integer insuranceHandleCity;
 
     /**
      * 结算类型 (1、单独结算 2、合并结算-和工资一起结算)
@@ -181,6 +187,11 @@ public class TInsuranceDetail extends BaseEntity {
 	@Schema(description = "是否过期 0未过期 1已过期")
     private Integer isOverdue;
 
+	/**
+	 * 备注
+	 */
+    private String remark;
+
     /**
      * 是否删除 0未删除/1删除
      */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceType.java

+package com.yifu.cloud.plus.v1.yifu.insurances.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 险种表
+ * @TableName t_insurance_type
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_insurance_type")
+@Tag(name = "险种表")
+public class TInsuranceType extends BaseEntity {
+    /**
+     * 险种id
+     */
+    private Long id;
+
+    /**
+     * 保险名称
+     */
+    private String name;
+
+    /**
+     * 保险公司主键ID
+     */
+    private Long insuranceCompanyId;
+
+    /**
+     * 收款单位名称
+     */
+    private String receiptUnitName;
+
+    /**
+     * 收款银行名称
+     */
+    private String bankName;
+
+    /**
+     * 收款银行账号
+     */
+    private String bankNo;
+
+    /**
+     * 删除标志(0：未删除，1：删除)
+     */
+    private Integer deleteFlag;
+
+}
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceTypeInfo.java

-package com.yifu.cloud.plus.v1.yifu.insurances.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.io.Serializable;
-
-/**
- * @author zhaji
- * @description 险种实体类
- * @date 2022-07-18 14:00:42
- */
-@Data
-@TableName("t_insurance_type")
-@EqualsAndHashCode()
-@Schema(description = "险种实体类")
-public class TInsuranceTypeInfo  implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-	/**
-	 * 险种id
-	 */
-	private String	id;
-
-	/**
-	 * 险种名称
-	 */
-	private String	name;
-
-	/**
-	 * 保险公司主键ID
-	 */
-	private String	insuranceCompanyId;
-
-	/**
-	 * 收款单位名称
-	 */
-	private String	receiptUnitName;
-
-	/**
-	 * 收款银行名称
-	 */
-	private String	bankName;
-
-	/**
-	 * 收款银行账号
-	 */
-	private String	bankNo;
-
-	/**
-	 * 创建时间
-	 */
-	private String createTime;
-
-	/**
-	 * 创建人
-	 */
-	private String createBy;
-
-	/**
-	 * 更新时间
-	 */
-	private String updateTime;
-
-	/**
-	 * 更新人
-	 */
-	private String updateBy;
-
-	/**
-	 * 删除标志
-	 */
-	private String deleteFlag;
-}

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceTypeRate.java

 package com.yifu.cloud.plus.v1.yifu.insurances.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
- * @author zhaji
- * @description 费率实体类
- * @date 2022-07-18 15:48:24
+ * 费率表
+ * @TableName t_insurance_type_rate
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName("t_insurance_type_rate")
-@EqualsAndHashCode()
-@Schema(description = "费率实体类")
-public class TInsuranceTypeRate implements Serializable {
-
-	private static final long serialVersionUID = 1L;
+@Tag(name = "费率表")
+public class TInsuranceTypeRate extends BaseEntity {
     /**
      * 费率id
      */
-	private String id ;
+    private String id;
 
     /**
-	 * 险种id
+     * 险种ID
      */
-	private String insuranceTypeId ;
+    private String insuranceTypeId;
 
     /**
      * 月数
      */
-	private String month ;
+    private Integer month;
 
     /**
      * 费率
      */
-	private String rate ;
+    private BigDecimal rate;
 
 }
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceTypeStandard.java

+package com.yifu.cloud.plus.v1.yifu.insurances.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 购买标准表
+ * @TableName t_insurance_type_standard
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_insurance_type_standard")
+@Tag(name = "保险公司表")
+public class TInsuranceTypeStandard extends BaseEntity {
+    /**
+     * 
+     */
+    private String id;
+
+    /**
+     * 险种主键ID
+     */
+    private String insuranceTypeId;
+
+    /**
+     * 购买标准
+     */
+    private String buyStandard;
+
+    /**
+     * 
+     */
+    private Integer type;
+
+    /**
+     * 医疗额度
+     */
+    private String medicalQuota;
+
+    /**
+     * 身故或残疾额度
+     */
+    private String dieDisableQuota;
+}
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceTypeStandardInfo.java

-package com.yifu.cloud.plus.v1.yifu.insurances.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.io.Serializable;
-
-/**
- * @author zhaji
- * @description 购买标准表
- * @date 2022-07-18 14:52:03
- */
-@Data
-@TableName("t_insurance_type_standard")
-@EqualsAndHashCode()
-@Schema(description = "购买标准实体类")
-public class TInsuranceTypeStandardInfo implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 购买标准id
-	 */
-	private String id ;
-
-	/**
-	 * 险种ID
-	 */
-	private String insuranceTypeId ;
-
-	/**
-	 * 购买标准
-	 */
-	private String buyStandard ;
-
-	/**
-	 * 类型
-	 */
-	private String type ;
-
-	/**
-	 * 医疗额度
-	 */
-	private String medicalQuota ;
-
-	/**
-	 * 身故或残疾额度
-	 */
-	private String dieDisableQuota ;
-
-
-}

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceAddParam.java

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @author licancan
+ * @description 商险办理新增入参
+ * @date 2022-07-18 17:03:31
+ */
+@Data
+public class InsuranceAddParam  implements Serializable {
+	private static final long serialVersionUID = -2689686777914935788L;
+	/**
+	 * 订单编号
+	 */
+	@NotBlank(message = "订单编号不能为空")
+	@Length(max = 32, message = "订单编号不能超过32个字符")
+	@Schema(description = "订单编号")
+	private String orderNo;
+
+	/**
+	 * 员工姓名
+	 */
+	@NotBlank(message = "员工姓名不能为空")
+	@Length(max = 32, message = "员工姓名不能超过32个字符")
+	@Schema(description = "员工姓名")
+	private String empName;
+
+	/**
+	 * 员工身份证号
+	 */
+	@NotBlank(message = "员工身份证号不能为空")
+	@Length(max = 32, message = "员工身份证号不能超过32个字符")
+	@Schema(description = "员工身份证号")
+	private String empIdcardNo;
+
+	/**
+	 * 项目编码
+	 */
+	@NotBlank(message = "项目编码不能为空")
+	@Length(max = 32, message = "项目编码不能超过32个字符")
+	@Schema(description = "项目编码")
+	private String deptNo;
+
+	/**
+	 * 保险公司名称
+	 */
+	@NotBlank(message = "保险公司名称不能为空")
+	@Length(max = 32, message = "保险公司名称不能超过32个字符")
+	@Schema(description = "保险公司名称")
+	private String insuranceCompanyName;
+	/**
+	 * 险种名称
+	 */
+	@NotBlank(message = "险种名称不能为空")
+	@Length(max = 32, message = "险种名称不能超过32个字符")
+	@Schema(description = "险种名称")
+	private String insuranceTypeName;
+
+	/**
+	 * 保单开始时间
+	 */
+	private LocalDate policyStart;
+
+	/**
+	 * 保单结束时间
+	 */
+	private LocalDate policyEnd;
+
+	/**
+	 * 商险购买地省名称
+	 */
+	private String insuranceProvinceName;
+
+	/**
+	 * 商险购买地市名称
+	 */
+	private String insuranceCityName;
+
+	/**
+	 * 商险办理省名称
+	 */
+	private String insuranceHandleProvinceName;
+
+	/**
+	 * 商险办理城市名称
+	 */
+	private String insuranceHandleCityName;
+
+	/**
+	 * 结算月
+	 */
+	private String settleMonth;
+
+	/**
+	 * 岗位
+	 */
+	private String post;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+}

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.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zhaji
+ * @description 保险公司相关
+ * @date 2022-07-18 17:40:50
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/insuranceCompany")
+@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.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zhaji
+ * @description 险种相关
+ * @date 2022-07-18 17:41:08
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/insuranceType")
+@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;
+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 费率相关
+ * @date 2022-07-18 17:41:20
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/insuranceTypeRate")
+@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;
+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 购买标准相关
+ * @date 2022-07-18 17:41:36
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/insuranceTypeStandard")
+@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/mapper/TInsuranceCompanyMapper.java

+package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_company(保险公司表)】的数据库操作Mapper
+* @createDate 2022-07-18 17:19:09
+* @Entity generator.domain.TInsuranceCompany
+*/
+@Mapper
+public interface TInsuranceCompanyMapper extends BaseMapper<TInsuranceCompany> {
+
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceTypeMapper.java

+package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type(险种表)】的数据库操作Mapper
+* @createDate 2022-07-18 17:19:23
+* @Entity generator.domain.TInsuranceType
+*/
+@Mapper
+public interface TInsuranceTypeMapper extends BaseMapper<TInsuranceType> {
+
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceTypeRateMapper.java

+package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type_rate(费率表)】的数据库操作Mapper
+* @createDate 2022-07-18 17:19:33
+* @Entity generator.domain.TInsuranceTypeRate
+*/
+@Mapper
+public interface TInsuranceTypeRateMapper extends BaseMapper<TInsuranceTypeRate> {
+
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceTypeStandardMapper.java

+package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type_standard(购买标准表)】的数据库操作Mapper
+* @createDate 2022-07-18 17:19:41
+* @Entity generator.domain.TInsuranceTypeStandard
+*/
+@Mapper
+public interface TInsuranceTypeStandardMapper extends BaseMapper<TInsuranceTypeStandard> {
+
+
+}

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;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_company(保险公司表)】的数据库操作Service
+* @createDate 2022-07-18 17:19:09
+*/
+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/TInsuranceTypeRateService.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type_rate(费率表)】的数据库操作Service
+* @createDate 2022-07-18 17:19:33
+*/
+public interface TInsuranceTypeRateService extends IService<TInsuranceTypeRate> {
+
+}

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;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type(险种表)】的数据库操作Service
+* @createDate 2022-07-18 17:19:23
+*/
+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/TInsuranceTypeStandardService.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type_standard(购买标准表)】的数据库操作Service
+* @createDate 2022-07-18 17:19:41
+*/
+public interface TInsuranceTypeStandardService extends IService<TInsuranceTypeStandard> {
+
+}

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;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceCompanyService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_company(保险公司表)】的数据库操作Service实现
+* @createDate 2022-07-18 17:19:09
+*/
+@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/TInsuranceTypeRateServiceImpl.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeRateMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeRateService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type_rate(费率表)】的数据库操作Service实现
+* @createDate 2022-07-18 17:19:33
+*/
+@Service
+public class TInsuranceTypeRateServiceImpl extends ServiceImpl<TInsuranceTypeRateMapper, TInsuranceTypeRate> implements TInsuranceTypeRateService {
+
+}

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;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type(险种表)】的数据库操作Service实现
+* @createDate 2022-07-18 17:19:23
+*/
+@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-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceTypeStandardServiceImpl.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeStandardMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeStandardService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_type_standard(购买标准表)】的数据库操作Service实现
+* @createDate 2022-07-18 17:19:41
+*/
+@Service
+public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTypeStandardMapper, TInsuranceTypeStandard> implements TInsuranceTypeStandardService {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceCompanyMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceCompanyMapper">
+
+    <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany">
+            <id property="id" column="ID" jdbcType="BIGINT"/>
+            <result property="companyName" column="COMPANY_NAME" jdbcType="VARCHAR"/>
+            <result property="companyAddress" column="COMPANY_ADDRESS" jdbcType="VARCHAR"/>
+            <result property="companyDocking" column="COMPANY_DOCKING" jdbcType="VARCHAR"/>
+            <result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/>
+            <result property="createName" column="CREATE_NAME" jdbcType="VARCHAR"/>
+            <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
+            <result property="updateBy" column="UPDATE_BY" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="UPDATE_TIME" jdbcType="TIMESTAMP"/>
+            <result property="deleteFlag" column="DELETE_FLAG" jdbcType="TINYINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,COMPANY_NAME,COMPANY_ADDRESS,
+        COMPANY_DOCKING,CREATE_BY,CREATE_NAME,
+        CREATE_TIME,UPDATE_BY,UPDATE_TIME,
+        DELETE_FLAG
+    </sql>
+</mapper>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml

@@ -9,6 +9,7 @@
             <result property="empId" column="EMP_ID" jdbcType="VARCHAR"/>
             <result property="empName" column="EMP_NAME" jdbcType="VARCHAR"/>
             <result property="empIdcardNo" column="EMP_IDCARD_NO" jdbcType="VARCHAR"/>
+            <result property="orderNo" column="ORDER_NO" jdbcType="VARCHAR"/>
             <result property="deptNo" column="DEPT_NO" jdbcType="VARCHAR"/>
             <result property="insuranceCompanyName" column="INSURANCE_COMPANY_NAME" jdbcType="VARCHAR"/>
             <result property="insuranceTypeId" column="INSURANCE_TYPE_ID" jdbcType="VARCHAR"/>
@@ -21,10 +22,10 @@
             <result property="settleMonth" column="SETTLE_MONTH" jdbcType="VARCHAR"/>
             <result property="invoiceNo" column="INVOICE_NO" jdbcType="VARCHAR"/>
             <result property="buyType" column="BUY_TYPE" jdbcType="TINYINT"/>
-            <result property="businessInsuranceProvName" column="BUSINESS_INSURANCE_PROV_NAME" jdbcType="VARCHAR"/>
-            <result property="businessInsuranceCityName" column="BUSINESS_INSURANCE_CITY_NAME" jdbcType="VARCHAR"/>
-            <result property="businessInsuranceHandleProvName" column="BUSINESS_INSURANCE_HANDLE_PROV_NAME" jdbcType="VARCHAR"/>
-            <result property="businessInsuranceHandleCityName" column="BUSINESS_INSURANCE_HANDLE_CITY_NAME" jdbcType="VARCHAR"/>
+            <result property="insuranceProvince" column="INSURANCE_PROVINCE" jdbcType="TINYINT"/>
+            <result property="insuranceCity" column="INSURANCE_CITY" jdbcType="TINYINT"/>
+            <result property="insuranceHandleProvince" column="INSURANCE_HANDLE_PROVINCE" jdbcType="TINYINT"/>
+            <result property="insuranceHandleCity" column="INSURANCE_HANDLE_CITY" jdbcType="TINYINT"/>
             <result property="settleType" column="SETTLE_TYPE" jdbcType="VARCHAR"/>
             <result property="actualPremium" column="ACTUAL_PREMIUM" jdbcType="DECIMAL"/>
             <result property="estimatePremium" column="ESTIMATE_PREMIUM" jdbcType="DECIMAL"/>
@@ -35,6 +36,7 @@
             <result property="isUse" column="IS_USE" jdbcType="TINYINT"/>
             <result property="isEffect" column="IS_EFFECT" jdbcType="TINYINT"/>
             <result property="isOverdue" column="IS_OVERDUE" jdbcType="TINYINT"/>
+            <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
             <result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/>
             <result property="createName" column="CREATE_NAME" jdbcType="VARCHAR"/>
             <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
@@ -45,15 +47,15 @@
 
     <sql id="Base_Column_List">
         ID,EMP_ID,EMP_NAME,
-        EMP_IDCARD_NO,DEPT_NO,INSURANCE_COMPANY_NAME,
+        EMP_IDCARD_NO,ORDER_NO,DEPT_NO,INSURANCE_COMPANY_NAME,
         INSURANCE_TYPE_ID,BUY_STANDARD,POLICY_NO,
         POLICY_START,POLICY_END,POLICY_EFFECT,
         BATCH_DATE,SETTLE_MONTH,INVOICE_NO,
-        BUY_TYPE,BUSINESS_INSURANCE_PROV_NAME,BUSINESS_INSURANCE_CITY_NAME,
-        BUSINESS_INSURANCE_HANDLE_PROV_NAME,BUSINESS_INSURANCE_HANDLE_CITY_NAME,SETTLE_TYPE,
+        BUY_TYPE,INSURANCE_PROVINCE,INSURANCE_CITY,
+        INSURANCE_HANDLE_PROVINCE,INSURANCE_HANDLE_CITY,SETTLE_TYPE,
         ACTUAL_PREMIUM,ESTIMATE_PREMIUM,SETTLE_BALANCE,
         BUY_HANDLE_STATUS,SETTLE_HANDLE_STATUS,REDUCE_HANDLE_STATUS,
-        IS_USE,IS_EFFECT,IS_OVERDUE,
+        IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
         CREATE_BY,CREATE_NAME,CREATE_TIME,
         UPDATE_BY,UPDATE_TIME,DELETE_FLAG
     </sql>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceTypeMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeMapper">
+
+    <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType">
+            <id property="id" column="ID" jdbcType="BIGINT"/>
+            <result property="name" column="NAME" jdbcType="VARCHAR"/>
+            <result property="insuranceCompanyId" column="INSURANCE_COMPANY_ID" jdbcType="BIGINT"/>
+            <result property="receiptUnitName" column="RECEIPT_UNIT_NAME" jdbcType="VARCHAR"/>
+            <result property="bankName" column="BANK_NAME" jdbcType="VARCHAR"/>
+            <result property="bankNo" column="BANK_NO" jdbcType="VARCHAR"/>
+            <result property="deleteFlag" column="DELETE_FLAG" jdbcType="TINYINT"/>
+            <result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/>
+            <result property="createName" column="CREATE_NAME" jdbcType="VARCHAR"/>
+            <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
+            <result property="updateBy" column="UPDATE_BY" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="UPDATE_TIME" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,NAME,INSURANCE_COMPANY_ID,
+        RECEIPT_UNIT_NAME,BANK_NAME,BANK_NO,
+        DELETE_FLAG,CREATE_BY,CREATE_NAME,
+        CREATE_TIME,UPDATE_BY,UPDATE_TIME
+    </sql>
+</mapper>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceTypeRateMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeRateMapper">
+
+    <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="insuranceTypeId" column="INSURANCE_TYPE_ID" jdbcType="VARCHAR"/>
+            <result property="month" column="MONTH" jdbcType="INTEGER"/>
+            <result property="rate" column="RATE" jdbcType="DECIMAL"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,INSURANCE_TYPE_ID,MONTH,
+        RATE
+    </sql>
+</mapper>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceTypeStandardMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeStandardMapper">
+
+    <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="insuranceTypeId" column="INSURANCE_TYPE_ID" jdbcType="VARCHAR"/>
+            <result property="buyStandard" column="BUY_STANDARD" jdbcType="VARCHAR"/>
+            <result property="type" column="TYPE" jdbcType="TINYINT"/>
+            <result property="medicalQuota" column="MEDICAL_QUOTA" jdbcType="VARCHAR"/>
+            <result property="dieDisableQuota" column="DIE_DISABLE_QUOTA" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,INSURANCE_TYPE_ID,BUY_STANDARD,
+        TYPE,MEDICAL_QUOTA,DIE_DISABLE_QUOTA
+    </sql>
+</mapper>