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

k8s-bash-test/yifu-insurances-deployment.yaml

@@ -44,8 +44,8 @@ spec:                 # 资源规范字段
         kubernetes.io/hostname: yfmaster1
       containers:     # 容器
         - name: yifu-insurances  # 容器的名字
-          image: 192.168.1.110:5500/qas-mvp/yifu-insurances-biz:1.0.0  # 容器镜像地址
-          imagePullPolicy: Always  # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent
+          image: hub.yifucenter.com:5500/qas-mvp/yifu-insurances-biz:1.0.0  # 容器镜像地址
+          imagePullPolicy: Never  # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent
                                    # Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时，
                                    # 已经打好镜像存在docker容器中时，使用存在不检查级别，
                                    # 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败）

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

@@ -31,9 +31,11 @@ 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.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -165,6 +167,24 @@ public class TSettleDomainController {
 		return listVo;
 	}
 
+	/**
+	 * @param
+	 * @Author: wangan
+	 * @Date: 2019/10/18
+	 * @Description:获取所有客户单位的项目信息
+	 **/
+	@Inner
+	@PostMapping("/selectSettleDomainSelectVoById")
+	public TSettleDomainListVo selectSettleDomainSelectVoById(@RequestBody TSettleDomainSelectVo tSettleDomainSelectVo) {
+		List<TSettleDomainSelectVo> list = new ArrayList<>();
+		TSettleDomain tSettleDomain = tSettleDomainService.getById(tSettleDomainSelectVo.getId());
+		BeanUtils.copyProperties(tSettleDomain,tSettleDomainSelectVo);
+		list.add(tSettleDomainSelectVo);
+		TSettleDomainListVo listVo = new TSettleDomainListVo();
+		listVo.setListSelectVO(list);
+		return listVo;
+	}
+
 	/**
 	 * @Author fxj
 	 * @Description  通过项目编码获取项目及客户信息

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

@@ -107,6 +107,23 @@ public class ArchivesDaprUtil {
 		return res;
 	}
 
+	/**
+	 * @Author huyc
+	 * @Description 根据项目id 获取项目编码
+	 * @Date 11:50 2022/8/9
+	 * @Param
+	 * @return
+	 **/
+	public R<TSettleDomainListVo> selectSettleDomainSelectVoById(String id){
+		TSettleDomainSelectVo settleDomainSelectVo = new TSettleDomainSelectVo();
+		settleDomainSelectVo.setId(id);
+		R<TSettleDomainListVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/selectSettleDomainSelectVoById",settleDomainSelectVo, TSettleDomainListVo.class, SecurityConstants.FROM_IN);
+		if (Common.isEmpty(res)){
+			return R.failed("通过项目id获取项目信息失败！");
+		}
+		return res;
+	}
+
 	public R<EmpDispatchAddVo> addDispatchInfo(EmpDispatchAddVo addVo) {
 		R<EmpDispatchAddVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/temployeeinfo/addDispatchInfo" , JSON.toJSONString(addVo), EmpDispatchAddVo.class, SecurityConstants.FROM_IN);
 		if (Common.isEmpty(res)){

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

@@ -104,6 +104,12 @@ public class InsuranceListVO implements Serializable {
 	@Schema(description = "创建人(派单人)")
 	private String createName;
 
+	/**
+	 * 创建者
+	 */
+	@Schema(description = "创建人")
+	private String createBy;
+
 	/**
 	 * 投保状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
 	 */

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

@@ -659,6 +659,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 											)
 											.or(e -> e.le(TInsuranceDetail::getPolicyStart,LocalDateUtil.parseLocalDate(param.getPolicyEnd()))
 													  .ge(TInsuranceDetail::getPolicyEnd,LocalDateUtil.parseLocalDate(param.getPolicyEnd())))
+											.or(s -> s.ge(TInsuranceDetail::getPolicyStart,LocalDateUtil.parseLocalDate(param.getPolicyStart()))
+													  .le(TInsuranceDetail::getPolicyStart,LocalDateUtil.parseLocalDate(param.getPolicyEnd())))
+											.or(s -> s.ge(TInsuranceDetail::getPolicyEnd,LocalDateUtil.parseLocalDate(param.getPolicyStart()))
+													  .le(TInsuranceDetail::getPolicyEnd,LocalDateUtil.parseLocalDate(param.getPolicyEnd())))
 					)
 					//有效
 					.and(
@@ -1598,6 +1602,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 											)
 											.or(e -> e.le(TInsuranceDetail::getPolicyStart,LocalDateUtil.parseLocalDate(param.getPolicyEnd()))
 													  .ge(TInsuranceDetail::getPolicyEnd,LocalDateUtil.parseLocalDate(param.getPolicyEnd())))
+											.or(s -> s.ge(TInsuranceDetail::getPolicyStart,LocalDateUtil.parseLocalDate(param.getPolicyStart()))
+													  .le(TInsuranceDetail::getPolicyStart,LocalDateUtil.parseLocalDate(param.getPolicyEnd())))
+											.or(s -> s.ge(TInsuranceDetail::getPolicyEnd,LocalDateUtil.parseLocalDate(param.getPolicyStart()))
+													  .le(TInsuranceDetail::getPolicyEnd,LocalDateUtil.parseLocalDate(param.getPolicyEnd())))
 					)
 					//有效
 					.and(
@@ -2285,6 +2293,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 											)
 											.or(e -> e.le(TInsuranceDetail::getPolicyStart,LocalDateUtil.parseLocalDate(param.getPolicyEnd()))
 													  .ge(TInsuranceDetail::getPolicyEnd,LocalDateUtil.parseLocalDate(param.getPolicyEnd())))
+											.or(s -> s.ge(TInsuranceDetail::getPolicyStart,LocalDateUtil.parseLocalDate(param.getPolicyStart()))
+													  .le(TInsuranceDetail::getPolicyStart,LocalDateUtil.parseLocalDate(param.getPolicyEnd())))
+											.or(s -> s.ge(TInsuranceDetail::getPolicyEnd,LocalDateUtil.parseLocalDate(param.getPolicyStart()))
+													  .le(TInsuranceDetail::getPolicyEnd,LocalDateUtil.parseLocalDate(param.getPolicyEnd())))
 					)
 					//有效
 					.and(

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

@@ -80,6 +80,7 @@
 		detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
 		detail.INSURANCE_TYPE_NAME as insuranceTypeName,
 	    detail.BUY_STANDARD as buyStandard,
+		detail.CREATE_BY as createBy,
 		detail.CREATE_NAME as createName,
 		detail.BUY_HANDLE_STATUS as buyHandleStatus,
 		detail.SETTLE_TYPE as settleType,
@@ -184,6 +185,7 @@
 		detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
 		detail.INSURANCE_TYPE_NAME as insuranceTypeName,
 		detail.BUY_STANDARD as buyStandard,
+		detail.CREATE_BY as createBy,
 		detail.CREATE_NAME as createName,
 		detail.BUY_HANDLE_STATUS as buyHandleStatus,
 		detail.SETTLE_TYPE as settleType,

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TApprovalRecordServiceImpl.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TApprovalRecord;
 import com.yifu.cloud.plus.v1.yifu.salary.mapper.TApprovalRecordMapper;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TApprovalRecordService;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
 import java.util.List;
@@ -36,6 +37,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
  */
 @Log4j2
 @Service
+@RequiredArgsConstructor
 public class TApprovalRecordServiceImpl extends ServiceImpl<TApprovalRecordMapper, TApprovalRecord> implements TApprovalRecordService {
     /**
      * 审批记录表简单分页查询

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

@@ -541,25 +541,25 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
 	@ExcelProperty("公积金编号")
 	private String providentNo;
 	/**
-	 * 单位公积金基数
+	 * 公积金单边基数
 	 */
-	@ExcelAttribute(name = "单位公积金基数")
-	@Schema(description ="单位公积金基数")
-	@ExcelProperty("单位公积金基数")
+	@ExcelAttribute(name = "公积金单边基数")
+	@Schema(description ="公积金单边基数")
+	@ExcelProperty("公积金单边基数")
 	private BigDecimal unitProvidentSet;
 	/**
-	 * 单位公积金比例
+	 * 公积金单边比例
 	 */
-	@ExcelAttribute(name = "单位公积金比例")
-	@Schema(description ="单位公积金比例")
-	@ExcelProperty("单位公积金比例")
+	@ExcelAttribute(name = "公积金单边比例")
+	@Schema(description ="公积金单边比例")
+	@ExcelProperty("公积金单边比例")
 	private BigDecimal providentPercent;
 	/**
-	 * 单位公积金费用
+	 * 公积金单边金额
 	 */
-	@ExcelAttribute(name = "单位公积金费用")
-	@Schema(description ="单位公积金费用")
-	@ExcelProperty("单位公积金费用")
+	@ExcelAttribute(name = "公积金单边金额")
+	@Schema(description ="公积金单边金额")
+	@ExcelProperty("公积金单边金额")
 	private BigDecimal unitProvidentSum;
 	/**
 	 * 个人公积金基数

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

@@ -47,7 +47,6 @@ import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoSearchVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoVo;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
@@ -1837,11 +1836,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 					continue;
 				}
 				//无对应员工的社保数据
-				if (Common.isNotNull(socialMap) || Common.isNotNull(socialMapTemp)) {
+				if (socialMap.size() >CommonConstants.ZERO_INT || socialMapTemp.size() >CommonConstants.ZERO_INT) {
 					//采用客服导入的地址
 					areaArray = infoVo.getSocialPayAddr().split(CommonConstants.CENTER_SPLIT_LINE_STRING);
 					infoVo = initAddressThree(areaArray, areaMap2, infoVo);
-					if (null != socialMap) {
+					if (socialMap.size() >CommonConstants.ZERO_INT) {
 						socialInfo = socialMap.get(infoVo.getEmpIdcard()
 								+ CommonConstants.DOWN_LINE_STRING + infoVo.getSocialProvince()
 								+ CommonConstants.DOWN_LINE_STRING + infoVo.getSocialCity()
@@ -1857,7 +1856,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 					}
 					if (null == socialInfo || (null != socialInfo && !ServiceUtil.checkMothForPaymentImport(
 							socialInfo.getSocialStartDate(), infoVo.getSocialPayMonth(), socialInfo.getSocialReduceDate()))) {
-						if (null != socialMapTemp) {
+						if (socialMapTemp.size() >CommonConstants.ZERO_INT) {
 							socialInfo = socialMapTemp.get(infoVo.getEmpIdcard()
 									+ CommonConstants.DOWN_LINE_STRING + infoVo.getSocialProvince()
 									+ CommonConstants.DOWN_LINE_STRING + infoVo.getSocialCity()

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

@@ -329,15 +329,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		if (Common.isEmpty(id)) {
 			return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
 		}
-		List<TSettleDomainSelectVo> settleDomainR = null;
-		R<TSettleDomainListVo> listVo = null;
-		listVo = archivesDaprUtil.selectAllSettleDomainSelectVos();
-		if (Common.isNotNull(listVo)) {
-			TSettleDomainListVo tSettleDomainListVo = listVo.getData();
-			if (Common.isNotNull(tSettleDomainListVo) && Common.isNotEmpty(tSettleDomainListVo.getListSelectVO())) {
-				settleDomainR = tSettleDomainListVo.getListSelectVO();
-			}
-		}
 		TPreDispatchInfo preInfo = baseMapper.selectById(id);
 		if (null == preInfo){
 			return R.failed(CommonConstants.ERROR_NO_DOMAIN);
@@ -356,6 +347,20 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 			TDispatchImportVo importVo = new TDispatchImportVo();
 			//  初始化派增的派单数据
 			initDispatchAddVo(preInfo, importVo);
+			List<TSettleDomainSelectVo> settleDomainR = null;
+			R<TSettleDomainListVo> listVo = null;
+			if (Common.isNotNull(preInfo.getDepartIdAdd())) {
+				listVo = archivesDaprUtil.selectSettleDomainSelectVoById(preInfo.getDepartIdAdd());
+				if (Common.isNotNull(listVo)) {
+					TSettleDomainListVo tSettleDomainListVo = listVo.getData();
+					if (Common.isNotNull(tSettleDomainListVo) && Common.isNotEmpty(tSettleDomainListVo.getListSelectVO())) {
+						settleDomainR = tSettleDomainListVo.getListSelectVO();
+						for (TSettleDomainSelectVo vo :settleDomainR) {
+							importVo.setSettleDomainCode(vo.getDepartNo());
+						}
+					}
+				}
+			}
 			importVo.setRowIndex(CommonConstants.ONE_INT);
 			List<TDispatchImportVo> importVoList = new ArrayList<>();
 			importVoList.add(importVo);
@@ -423,7 +428,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		}
 		List<TSettleDomainSelectVo> settleDomainR = null;
 		R<TSettleDomainListVo> listVo = null;
-		//项目名称map key:项目id value:项目名称
+		//项目名称map key:项目id value:项目编码
 		Map<String, String> settleDomainNameMap = new HashMap<>();
 		//客户名称map key:客户id value:客户名称
 		Map<String, String> customerNameMap = new HashMap<>();
@@ -468,7 +473,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		// 开始处理派增
 		List<ErrorMessage> errorMessageList = new ArrayList<>();
 		List<ErrorMessage> errorMsgList = new ArrayList<>();
-		R<Boolean> res;
 		HashMap<String, SysArea> areaMap = new HashMap<>();
 		HashMap<String, SysArea> areaIdMap = new HashMap<>();
 		int i = 1;
@@ -1882,7 +1886,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 			//map数据封装
 			if (Common.isNotNull(settleDomainList)) {
 				for (TSettleDomainSelectVo settleDomainSelectVo : settleDomainList) {
-					settleDomainNameMap.put(settleDomainSelectVo.getId(), settleDomainSelectVo.getDepartName());
+					settleDomainNameMap.put(settleDomainSelectVo.getId(), settleDomainSelectVo.getDepartNo());
 					settleIdAndCustomerIdMap.put(settleDomainSelectVo.getId(), settleDomainSelectVo.getCustomerId());
 					if (!customerNameMap.containsKey(settleDomainSelectVo.getCustomerName())) {
 						customerNameMap.put(settleDomainSelectVo.getCustomerId(), settleDomainSelectVo.getCustomerName());
@@ -2360,6 +2364,9 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 			//  初始化派增的派单数据
 			initDispatchAddVo(pre, importVo);
 			importVo.setRowIndex(i);
+			if (Common.isNotNull(settleDomainNameMap.get(pre.getDepartIdAdd()))) {
+				importVo.setSettleDomainCode(settleDomainNameMap.get(pre.getDepartIdAdd()));
+			}
 			List<TDispatchImportVo> importVoList = new ArrayList<>();
 			importVoList.add(importVo);
 			// 如果档案地市空  只能用缴纳地封装，如果缴纳地有问题直接返回