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

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

@@ -405,10 +405,10 @@ public class TEmployeeContractInfo extends BaseEntity {
 	private String auditRemark;
 
 	/**
-	 * 员工类型（字典值，0外包1派遣2代理）
+	 * 员工类型（字典值，0外包1派遣2代理3内部员工）
 	 */
 	@ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
-	@Schema(description = "员工类型（字典值，0外包1派遣2代理）")
+	@Schema(description = "员工类型（字典值，0外包1派遣2代理3内部员工）")
 	@Size(max = 1, message = "员工类型不可超过1位")
 	private String empNatrue;
 

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

@@ -59,10 +59,10 @@ public class TEmployeeInfo extends BaseEntity {
 	private String empCode;
 
 	/**
-	 * 员工类型（字典值，0外包1派遣2代理）
+	 * 员工类型（字典值，0外包1派遣2代理3内部员工）
 	 */
 	@ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
-	@Schema(description = "员工类型（字典值，0外包1派遣2代理）")
+	@Schema(description = "员工类型（字典值，0外包1派遣2代理3内部员工）")
 	@NotNull(message = "员工类型不可为空")
 	@Size(max = 1, message = "员工类型不可超过1位")
 	private String empNatrue;
@@ -440,4 +440,8 @@ public class TEmployeeInfo extends BaseEntity {
 	@TableField(exist = false)
 	private String[] empNatureArray;
 
+	@Schema(description = "姓名或身份证")
+	@TableField(exist = false)
+	private String nameOrIdcard;
+
 }

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

@@ -66,9 +66,9 @@ public class TEmployeeProject extends BaseEntity {
     private String empCode;
 
     /**
-     * 员工类型（字典值，0外包1派遣2代理）
+     * 员工类型（字典值，0外包1派遣2代理3内部员工）
      */
-    @Schema(description ="员工类型（字典值，0外包1派遣2代理）")
+    @Schema(description ="员工类型（字典值，0外包1派遣2代理3内部员工）")
 	@NotNull(message = "员工类型不能为空")
 	@Size(max = 1, message = "员工类型不可超过1位")
     private String empNatrue;

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

@@ -22,10 +22,10 @@ public class EmpAddDispatchVo extends TEmployeeInfo {
 
 
 	/**
-	 * 员工类型（字典值，0外包1派遣2代理）
+	 * 员工类型（字典值，0外包1派遣2代理3内部员工）
 	 */
 	@ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
-	@Schema(description = "员工类型（字典值，0外包1派遣2代理）")
+	@Schema(description = "员工类型（字典值，0外包1派遣2代理3内部员工）")
 	private String empNatrue;
 
 	/**

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

@@ -117,7 +117,7 @@ public class EmployeeContractExportVO implements Serializable {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("员工类型")
 	@ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
-	@Schema(description = "员工类型（字典值，0外包1派遣2代理）")
+	@Schema(description = "员工类型（字典值，0外包1派遣2代理3内部员工）")
 	private String empNatrue;
 
 	@HeadFontStyle(fontHeightInPoints = 11)

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

@@ -22,7 +22,6 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import lombok.Data;
 
 import javax.validation.constraints.Past;
@@ -38,7 +37,7 @@ import java.util.List;
  */
 @Data
 @ColumnWidth(15)
-public class EmployeeProjectExportVO extends BaseEntity {
+public class EmployeeProjectExportVO {
 
 	private static final long serialVersionUID = 1L;
 

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

@@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportParamVO;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.UpProjectSocialFundVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
@@ -262,7 +262,7 @@ public class TEmployeeProjectController {
 	 **/
 	@PostMapping("/export")
 	public void export(HttpServletResponse response, @RequestParam(name = "idstr", required = false)String idstr,
-					   @RequestBody List<String> exportFields, EmployeeProjectExportVO projectDTO) {
+					   @RequestBody List<String> exportFields, EmployeeProjectExportParamVO projectDTO) {
 		YifuUser user = SecurityUtils.getUser();
 		if (user != null && Common.isNotNull(user.getId())) {
 			menuUtil.setAuthSql(user, projectDTO);

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeProjectMapper.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportParamVO;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -57,5 +58,5 @@ public interface TEmployeeProjectMapper extends BaseMapper<TEmployeeProject> {
 	 * @param tEmployeeProject
 	 * @return
 	 */
-	List<EmployeeProjectExportVO> getTEmployeeProjectExportPage(@Param("tEmployeeProject")EmployeeProjectExportVO tEmployeeProject);
+	List<EmployeeProjectExportVO> getTEmployeeProjectExportPage(@Param("tEmployeeProject") EmployeeProjectExportParamVO tEmployeeProject);
 }

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

@@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportParamVO;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.UpProjectSocialFundVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
@@ -96,7 +96,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
 	R deleteEmpPro(TEmployeeProject tEmployeeProject);
 
 	/**
-	 * @param list
+	 * @param inputStream
 	 * @Description: 批量减项
 	 * @Author: huyc
 	 * @Date: 2022/6/21 10:30
@@ -163,7 +163,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
 	 * @Date: 2022/6/23 10:30
 	 * @return: R
 	 **/
-	void listExportProject(HttpServletResponse response, EmployeeProjectExportVO projectDTO,
+	void listExportProject(HttpServletResponse response, EmployeeProjectExportParamVO projectDTO,
 						   String idstr, List<String> exportFields);
 	/**
 	 * @param employeeInfo

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/DoJointTask.java

@@ -57,7 +57,9 @@ public class DoJointTask {
 						.eq(TEmployeeProject::getProjectStatus, CommonConstants.ZERO_INT));
 				if (Common.isNotNull(list)) {
 					Set<String> empNatrue = list.stream().map(TEmployeeProject::getEmpNatrue).collect(Collectors.toSet());
-					if (empNatrue.stream().anyMatch(e -> e.equals(CommonConstants.ZERO_STRING))) {
+					if (empNatrue.stream().anyMatch(e -> e.equals(CommonConstants.THREE_STRING))) {
+						tEmployeeInfo.setEmpNatrue(CommonConstants.THREE_STRING);
+					} else if (empNatrue.stream().anyMatch(e -> e.equals(CommonConstants.ZERO_STRING))) {
 						tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING);
 					} else if (empNatrue.stream().anyMatch(e -> e.equals(CommonConstants.ONE_STRING))) {
 						tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING);

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml

@@ -297,6 +297,13 @@
 				<if test="tEmployeeInfo.empIdcard != null and tEmployeeInfo.empIdcard.trim() != ''">
 					AND a.EMP_IDCARD = #{tEmployeeInfo.empIdcard}
 				</if>
+				<if test="tEmployeeInfo.nameOrIdcard != null and tEmployeeInfo.nameOrIdcard.trim() != ''">
+					AND (
+					a.EMP_NAME  like concat(#{tEmployeeInfo.nameOrIdcard},'%')
+					or
+					a.EMP_IDCARD  like concat(#{tEmployeeInfo.nameOrIdcard},'%')
+					)
+				</if>
 				<if test="tEmployeeInfo.validityStart != null">
 					AND a.VALIDITY_START = #{tEmployeeInfo.validityStart}
 				</if>

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

@@ -1670,8 +1670,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				detailList.add(detail);
 				try {
 					if (detail.getBuyType() != CommonConstants.FOUR_INT &&
-							CommonConstants.ONE_INT == detail.getSettleType()) {
-						if (new BigDecimal(success.getActualPremium()).compareTo(actualMoney) != 0) {
+							CommonConstants.ONE_INT == detail.getSettleType() &&
+							new BigDecimal(success.getActualPremium()).compareTo(actualMoney) != 0) {
 						//获取项目信息
 						TSettleDomain settleDomain = new TSettleDomain();
 						List<TSettleDomainSelectVo> settleDomainR = null;
@@ -1681,13 +1681,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							TSettleDomainListVo tSettleDomainListVo = listVo.getData();
 							if (Common.isNotNull(tSettleDomainListVo) && Common.isNotEmpty(tSettleDomainListVo.getListSelectVO())) {
 								settleDomainR = tSettleDomainListVo.getListSelectVO();
-									for (TSettleDomainSelectVo vo :settleDomainR) {
-										BeanUtils.copyProperties(vo,settleDomain);
+								for (TSettleDomainSelectVo vo : settleDomainR) {
+									BeanUtils.copyProperties(vo, settleDomain);
 								}
 							}
 						}
 						BigDecimal gMoney = BigDecimal.ZERO;
-							Boolean isBl = false;
+						boolean isBl = false;
 						if (Common.isNotNull(settleDomain)) {
 							// 含有商险，则计算收入
 							if (settleDomain.getMrSettleType().equals(CommonConstants.TWO_STRING)) {
@@ -1704,14 +1704,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 									incomeDetail.setSourceId(detail.getId());
 									if (isBl) {
 										incomeDetail.setMoney(gMoney);
-										}else {
+									} else {
 										incomeDetail.setMoney(actualMoney);
 									}
 									incomeDetail.setFeeType(CommonConstants.ONE_STRING);
 									//判断是否存在当月的商险收入数据
 									R<TIncomeDetailReturnVo> detailInfoList = socialDaprUtils.getTIncomeDetailList(incomeDetail);
 									if (Common.isNotNull(detailInfoList) && detailInfoList.getCode() == CommonConstants.SUCCESS
-												&& detailInfoList.getData().getDetailList().size() > 0) {
+											&& !detailInfoList.getData().getDetailList().isEmpty()) {
 										//生成红冲数据
 										for (TIncomeDetail detailInfo : detailInfoList.getData().getDetailList()) {
 											TIncomeDetail detail1 = new TIncomeDetail();
@@ -1738,13 +1738,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 									incomeDetail.setFeeType(CommonConstants.TWO_STRING);
 									if (isBl) {
 										incomeDetail.setMoney(gMoney);
-										}else {
+									} else {
 										incomeDetail.setMoney(actualMoney);
 									}
 									//判断是否存在当月的商险收入数据
 									R<TIncomeDetailReturnVo> detailInfoList = socialDaprUtils.getTIncomeDetailList(incomeDetail);
 									if (Common.isNotNull(detailInfoList) && detailInfoList.getCode() == CommonConstants.SUCCESS
-												&& detailInfoList.getData().getDetailList().size() > 0) {
+											&& !detailInfoList.getData().getDetailList().isEmpty()) {
 										//生成红冲数据
 										for (TIncomeDetail detailInfo : detailInfoList.getData().getDetailList()) {
 											TIncomeDetail detail1 = new TIncomeDetail();
@@ -1762,7 +1762,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						//生成收入数据
 						createInsuranceInfo(detail);
 					}
-					}
 				}catch (Exception e){
 					log.error("收入数据同步处理失败："+e);
 				}

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TForecastLibrary.java

@@ -515,10 +515,10 @@ public class TForecastLibrary extends BaseEntity {
 	/**
 	 * 员工类型（字典值，0外包1派遣2代理）
 	 */
-	@ExcelAttribute(name = "员工类型（字典值，0外包1派遣2代理）", maxLength = 1)
-	@Length(max = 1, message = "员工类型（字典值，0外包1派遣2代理）不能超过1个字符")
+	@ExcelAttribute(name = "员工类型（字典值，0外包1派遣2代理3内部员工）", maxLength = 1)
+	@Length(max = 1, message = "员工类型（字典值，0外包1派遣2代理3内部员工）不能超过1个字符")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("员工类型（字典值，0外包1派遣2代理）")
+	@ExcelProperty("员工类型（字典值，0外包1派遣2代理3内部员工）")
 	private String empNatrue;
 	/**
 	 * 单位补缴利息

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

@@ -554,13 +554,13 @@ public class TForecastLibraryVo extends RowIndex implements Serializable {
 	@ExcelProperty("项目名称")
 	private String deptName;
 	/**
-	 * 员工类型（字典值，0外包1派遣2代理）
+	 * 员工类型（字典值，0外包1派遣2代理3内部员工）
 	 */
-	@Length(max = 1, message = "员工类型（字典值，0外包1派遣2代理） 不能超过1 个字符")
-	@ExcelAttribute(name = "员工类型（字典值，0外包1派遣2代理）", maxLength = 1)
-	@Schema(description = "员工类型（字典值，0外包1派遣2代理）")
+	@Length(max = 1, message = "员工类型（字典值，0外包1派遣2代理3内部员工） 不能超过1 个字符")
+	@ExcelAttribute(name = "员工类型（字典值，0外包1派遣2代理3内部员工）", maxLength = 1)
+	@Schema(description = "员工类型（字典值，0外包1派遣2代理3内部员工）")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("员工类型（字典值，0外包1派遣2代理）")
+	@ExcelProperty("员工类型（字典值，0外包1派遣2代理3内部员工）")
 	private String empNatrue;
 	/**
 	 * 单位补缴利息