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

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

-package com.yifu.cloud.plus.v1.yifu.archives.Constants;
+package com.yifu.cloud.plus.v1.yifu.archives.constants;
 
 public class EmployeeConstants {
 

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/Constants/EmployeeContractConstants.java → yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeContractConstants.java

-package com.yifu.cloud.plus.v1.yifu.archives.Constants;
+package com.yifu.cloud.plus.v1.yifu.archives.constants;
 
 public class EmployeeContractConstants {
 

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

@@ -19,7 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.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.CommonConstants;

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

@@ -26,12 +26,14 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -46,13 +48,14 @@ import java.util.List;
  * @author fxj
  * @date 2022-06-18 09:39:46
  */
+@EnableConfigurationProperties(DaprCheckProperties.class)
 @Log4j2
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/tempfamily" )
 @Tag(name = "员工家庭信息表管理")
 public class TEmpFamilyController {
-
+	private final DaprCheckProperties daprCheckProperties;
     private final TEmpFamilyService tEmpFamilyService;
 
     /**

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

@@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yifu.cloud.plus.v1.yifu.archives.Constants.EmployeeConstants;
+import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.FddContractAttachInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeInfoMapper;

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

@@ -26,7 +26,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yifu.cloud.plus.v1.yifu.archives.Constants.EmployeeContractConstants;
+import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeContractConstants;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.service.*;

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

@@ -24,7 +24,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pig4cloud.plugin.excel.vo.ErrorMessage;
 import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard;
 import com.yifu.cloud.plus.v1.check.entity.TCheckMobile;
-import com.yifu.cloud.plus.v1.yifu.archives.Constants.EmployeeConstants;
+import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpEducation;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;

yifu-check/yifu-check-biz/src/main/java/com/yifu/cloud/plus/v1/check/service/impl/TCheckIdCardServiceImpl.java

@@ -227,21 +227,25 @@ public class TCheckIdCardServiceImpl extends ServiceImpl<TCheckIdCardMapper, TCh
 
 	@Override
 	public TCheckIdCard checkIdCardSingle(TCheckIdCard tCheckIdCard) {
+		tCheckIdCard.setIsTrue(CommonConstants.ZERO_INT);
 		String idCard = tCheckIdCard.getIdCard();
 		String name = tCheckIdCard.getName();
 		if (Common.isEmpty(idCard) || Common.isEmpty(name)){
 			tCheckIdCard.setIsTrue(CommonConstants.ZERO_INT);
 			tCheckIdCard.setReason(CommonConstants.PARAM_IS_NOT_EMPTY);
+			tCheckIdCard.setIsTrue(CommonConstants.ONE_INT);
 			return tCheckIdCard;
 		}
 		// 校验姓名身份证规则
 		if (!regIdCard(idCard)) {
 			tCheckIdCard.setIsTrue(0);
 			tCheckIdCard.setReason("身份证格式有误");
+			tCheckIdCard.setIsTrue(CommonConstants.ONE_INT);
 			return tCheckIdCard;
 		} else if (regEmpName(name)) {
 			tCheckIdCard.setIsTrue(0);
 			tCheckIdCard.setReason("姓名含数字或空格，无法校验");
+			tCheckIdCard.setIsTrue(CommonConstants.ONE_INT);
 			return tCheckIdCard;
 		}
 		synchronized (this){

yifu-check/yifu-check-biz/src/main/java/com/yifu/cloud/plus/v1/check/service/impl/TCheckMobileServiceImpl.java

@@ -126,6 +126,7 @@ public class TCheckMobileServiceImpl extends ServiceImpl<TCheckMobileMapper, TCh
 				for (TCheckMobile c : checkMobiles) {
 					if (CommonConstants.ONE_STRING.equals(c.getStatus())) {
 						returnMobile.setStatus(CommonConstants.ONE_STRING);
+						returnMobile.setMessage(c.getMessage());
 						return returnMobile;
 					}
 				}