Merge branch 'develop' into 'feature/insurance-1.3.0'

Develop

See merge request !283

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

@@ -122,6 +122,20 @@ public class TEmployeeInfo extends BaseEntity {
 	@Max(value = 200, message = "年龄不可超过200")
 	private Integer empAge;
 
+	/**
+	 * 年龄查询开始
+	 */
+	@Schema(description = "年龄查询开始")
+	@TableField(exist = false)
+	private int empAgeStart;
+
+	/**
+	 * 年龄查询结束
+	 */
+	@Schema(description = "年龄查询结束")
+	@TableField(exist = false)
+	private int empAgeEnd;
+
 	/**
 	 * 婚姻状态
 	 */

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

@@ -71,6 +71,11 @@ public class EmployeeExportVO extends BaseEntity {
 	@DateTimeFormat("yyyy-MM-dd")
 	private LocalDateTime validityEnd;
 
+	@ExcelProperty(value = "年龄")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelAttribute(name = "年龄")
+	private Integer empAge;
+
 	@ExcelAttribute(name = "婚姻状况", isDataId = true,dataType = ExcelAttributeConstants.EMP_MARRIED)
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value = "婚姻状况")

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

 package com.yifu.cloud.plus.v1.yifu.archives.vo;
 
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
 import lombok.Data;
 
 import java.util.List;
@@ -14,6 +15,9 @@ public class TSettleDomainListVo {
     private List<TSettleDomainSelectVo> listSelectVO;
 
 	private Map<String,TSettleDomainSelectVo> mapSlectVo;
+
+	private Map<String,TSettleDomain> mapVO;
+
 	/**
 	 * 合同主体IDS
 	 */

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

@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TDepartSettlementInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TDepartSettlementInfoService;
@@ -42,7 +41,6 @@ import org.springframework.web.bind.annotation.*;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 
@@ -229,6 +227,21 @@ public class TSettleDomainController {
 		return  tSettleDomainService.getSetInfoByCodes(codes);
 	}
 
+	/**
+	 * @Author fxj
+	 * @Description  通过项目编码获取项目及客户信息
+	 * @Date 10:49 2022/7/20
+	 * @Param
+	 * @return
+	 **/
+	@Operation(description = "通过项目编码获取项目及客户信息")
+	@SysLog("通过项目编码获取项目及客户信息")
+	@Inner
+	@PostMapping("/getSettleInfoByCodes")
+	public TSettleDomainListVo getSettleInfoByCodes(@RequestBody List<String> codes) {
+		return tSettleDomainService.getSettleInfoByCodes(codes);
+	}
+
 	/**
 	 * @param id 项目主键
 	 * @Description: 通过id获取结算主体及单位部分信息
@@ -267,7 +280,7 @@ public class TSettleDomainController {
 	/**
 	 * 修改项目表--EKP调用接口
 	 * @author  hyc
-	 * @param list 项目表
+	 * @param jsonStr 项目表
 	 * @return R
 	 */
 	@Operation(summary = "修改项目表--EKP调用接口", description = "修改项目表--EKP调用接口")

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

@@ -74,4 +74,6 @@ public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
 	 * @return
 	**/
     List<ProjectSetInfoVo> getSetInfoByCodes(@Param(value = "codes") List<String> codes);
+
+	List<TSettleDomain> getSettleInfoByCodes(@Param(value = "codes") List<String> codes);
 }

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

@@ -21,10 +21,7 @@ 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.archives.entity.TSettleDomain;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainEkpVo;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 
@@ -64,6 +61,8 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
 
 	SetInfoVo getSetInfoByCodes(List<String> codes);
 
+	TSettleDomainListVo getSettleInfoByCodes(List<String> codes);
+
 	/**
 	 * 通过id获取项目及单位部分信息
 	 * @param

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

@@ -323,6 +323,16 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 		return setMap;
 	}
 
+	@Override
+	public TSettleDomainListVo getSettleInfoByCodes(List<String> codes) {
+		List<TSettleDomain> voList = baseMapper.getSettleInfoByCodes(codes);
+		TSettleDomainListVo setMap = new TSettleDomainListVo();
+		if (Common.isNotNull(voList)){
+			setMap.setMapVO(voList.stream().collect(Collectors.toMap(TSettleDomain::getDepartNo, k->k)));
+		}
+		return setMap;
+	}
+
 	/**
 	 * @Author fxj
 	 * @Description 更新EKP对应MVP 项目权限，已有权限不做删除处理

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

@@ -82,6 +82,7 @@
 		<result property="empNatrue" column="EMP_NATRUE"/>
 		<result property="empName" column="EMP_NAME"/>
 		<result property="empIdcard" column="EMP_IDCARD"/>
+		<result property="empAge" column="EMP_AGE"/>
 		<result property="validityStart" column="VALIDITY_START"/>
 		<result property="validityEnd" column="VALIDITY_END"/>
 		<result property="empMarriStatus" column="EMP_MARRI_STATUS"/>
@@ -329,8 +330,11 @@
 				<if test="tEmployeeInfo.empBirthday != null">
 					AND a.EMP_BIRTHDAY = #{tEmployeeInfo.empBirthday}
 				</if>
-				<if test="tEmployeeInfo.empAge != null">
-					AND a.EMP_AGE = #{tEmployeeInfo.empAge}
+				<if test="tEmployeeInfo.empAgeStart >0">
+					AND a.EMP_AGE >= #{tEmployeeInfo.empAgeStart}
+				</if>
+				<if test="tEmployeeInfo.empAgeEnd >0">
+					AND a.EMP_AGE <![CDATA[ <= ]]> #{tEmployeeInfo.empAgeEnd}
 				</if>
 				<if test="tEmployeeInfo.empMarriStatus != null and tEmployeeInfo.empMarriStatus.trim() != ''">
 					AND a.EMP_MARRI_STATUS = #{tEmployeeInfo.empMarriStatus}
@@ -952,6 +956,7 @@
 		a.EMP_NATRUE,
 		a.EMP_NAME,
 		a.EMP_IDCARD,
+		a.EMP_AGE,
 		a.VALIDITY_START,
 		a.VALIDITY_END,
 		a.EMP_MARRI_STATUS,

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

@@ -297,4 +297,18 @@
 			</if>
 
 	</select>
+
+	<select id="getSettleInfoByCodes" resultMap="tSettleDomainMap">
+		SELECT
+		<include refid="Base_Column_List"/>
+		FROM t_settle_domain a
+		where 1=1
+		and a.DELETE_FLAG = '0'
+		<if test="codes != null and codes.size() > 0">
+			and  a.DEPART_NO in
+			<foreach collection="codes" item="param" index="index" open="(" close=")" separator=",">
+				#{param}
+			</foreach>
+		</if>
+	</select>
 </mapper>

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

@@ -514,6 +514,10 @@ public interface ErrorCodes {
 	 */
 	String EMP_DISPATCH_SOCIAL_PAYMENT_TYPE_NOT_SAME = "emp.dispatch.social.payment.type.same";
 
+	String SOCIAL_HOLD_IS_EMPTY = "social.hold.is.empty";
+
+	String FUND_HOLD_IS_EMPTY = "fund.hold.is.empty";
+
 	String ARCHIVES_IMPORT_EMP_TRUE = "archives.import.emp.true";
 
 	/**

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

@@ -205,6 +205,10 @@ emp.dispatch.emp.contract.sub.name.not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u54
 
 emp.dispatch.social.record.base.not.exist=\u6D3E\u589E\u5F02\u5E38\uFF1A\u5907\u6848\u57FA\u6570\u4E0D\u53EF\u4E3A\u7A7A
 
+social.hold.is.empty=\u793E\u4FDD\u6237\u4E0D\u80FD\u4E3A\u7A7A
+
+fund.hold.is.empty=\u516C\u79EF\u91D1\u6237\u4E0D\u80FD\u4E3A\u7A7A
+
 
 
 

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

@@ -59,7 +59,20 @@ public class ArchivesDaprUtil {
 		}
 		return res;
 	}
-
+	/**
+	 * @Author huyc
+	 * @Description 通过项目编码获取项目及客户信息
+	 * @Date 21:18 2022/7/20
+	 * @Param
+	 * @return
+	 **/
+	public R<TSettleDomainListVo> getSettleInfoByCodes(List<String> codes){
+		R<TSettleDomainListVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/getSettleInfoByCodes",JSON.toJSONString(codes), TSettleDomainListVo.class, SecurityConstants.FROM_IN);
+		if (Common.isEmpty(res)){
+			return R.failed("通过项目编码获取项目及客户信息失败！");
+		}
+		return res;
+	}
 	/**
 	 * @Author fxj
 	 * @Description 获取派单校验需要的档案信息

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

@@ -6766,6 +6766,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	//商险预估
 	public void createInsuranceInfo(TInsuranceDetail insuranceDetail,TSettleDomain settleDomain) {
 		if (Common.isEmpty(settleDomain)) {
+			settleDomain = new TSettleDomain();
 			//获取项目信息
 			List<TSettleDomainSelectVo> settleDomainR;
 			R<TSettleDomainListVo> listVo;

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

@@ -26,14 +26,14 @@
 		VALUES
 		<foreach collection="list" item="item" index="index" separator=",">
 			(
-			#{item.id,jdbcType=VARCHAR},
-			#{item.remark,jdbcType=VARCHAR},
+			#{item.id},
+			#{item.remark},
 			#{item.displayFlag},
-			#{item.createBy,jdbcType=VARCHAR},
+			#{item.createBy},
 			#{item.createTime},
-			#{item.createName,jdbcType=VARCHAR},
-			#{item.operateDesc,jdbcType=VARCHAR},
-			#{item.insuranceDetailId,jdbcType=VARCHAR}
+			#{item.createName},
+			#{item.operateDesc},
+			#{item.insuranceDetailId}
 			)
 		</foreach>
 	</insert>

yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/SocialTask.java

@@ -132,4 +132,17 @@ public class SocialTask {
 		HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tincome/inner/pushDetail","", Object.class, SecurityConstants.FROM_IN);
 		log.info("------------定时任务生成统计表数据-定时任务结束------------");
 	}
+
+
+	/**
+	 * @Description: 定时任务标识根据项目不需要生成收入的数据
+	 * @Author: huyc
+	 * @Date: 2022/8/30
+	 * @return: void
+	 **/
+	public void signPaymentNoIncomeFlag() {
+		log.info("------------定时任务标识根据项目不需要生成收入的数据-定时任务开始------------");
+		HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tpaymentinfo/inner/signPaymentNoIncomeFlag","", Object.class, SecurityConstants.FROM_IN);
+		log.info("------------定时任务标识根据项目不需要生成收入的数据-定时任务结束------------");
+	}
 }

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

@@ -196,7 +196,7 @@ public class TStatisticsDeclarerServiceImpl extends ServiceImpl<TStatisticsDecla
 				R<TEmployeeInfo> res;
 				for (TStatisticsDeclarer declarer : stdvoYearList) {
 					if (CommonConstants.TWO_STRING.equals(declarer.getIsZeroDeclare())) {
-						res = archivesDaprUtil.getTEmployeeInfoById(declarer.getEmpIdcard());
+						res = archivesDaprUtil.getTEmployeeInfoByIdcard(declarer.getEmpIdcard());
 						if (Common.isNotNull(res) && Common.isNotNull(res.getData())
 								&& (CommonConstants.ZERO_INT == res.getData().getFileStatus())) {
 							declarer.setIsZeroDeclare(CommonConstants.ZERO_STRING);

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsDeclarerMapper.xml

@@ -113,26 +113,24 @@
 			FROM t_salary_account a WHERE a.DELETE_FLAG = '0' AND a.SETTLEMENT_MONTH = #{lastMonth}
 		 GROUP BY a.EMP_IDCARD,a.INVOICE_TITLE,CUPATION_TYPE,a.SETTLEMENT_MONTH) b
 		 WHERE s.DELETE_FLAG = '0' AND b.max_day = s.CREATE_TIME
-		   AND s.EMP_IDCARD = b.EMP_IDCARD AND s.INVOICE_TITLE = b.INVOICE_TITLE AND s.FORM_TYPE = b.FORM_TYPE
+		   AND s.EMP_IDCARD = b.EMP_IDCARD AND s.INVOICE_TITLE = b.INVOICE_TITLE
 		   AND s.SETTLEMENT_MONTH = b.SETTLEMENT_MONTH) c
 		GROUP BY c.EMP_IDCARD,c.INVOICE_TITLE,c.SETTLEMENT_MONTH,OCCUPATION_TYPE
 	</select>
 	<select id="doStatisticsTaxDeclarerYear" resultMap="tStatisticsDeclarerMap">
-		SELECT
-		#{nowMonth} DECLARE_MONTH,c.EMP_NAME,c.EMP_IDCARD,c.EMP_PHONE,c.INVOICE_TITLE DECLARE_UNIT,
-		if(c.FORM_TYPE=0,'0',if(c.FORM_TYPE=3 or c.FORM_TYPE=4,'1','-')) OCCUPATION_TYPE,
-		'2' IS_ZERO_DECLARE,
-		if(DATE_FORMAT(c.CREATE_TIME,"%Y%m")>=DATE_FORMAT(DATE_SUB(CURDATE(),INTERVAL 3 MONTH),"%Y%m"),'1','0') IS_ZERO_FLAG
-			FROM
-			(SELECT s.* FROM t_salary_account s,
-				(SELECT EMP_NAME,EMP_IDCARD,EMP_PHONE,a.INVOICE_TITLE,a.FORM_TYPE,a.SETTLEMENT_MONTH,
-				if(a.FORM_TYPE=0,'0',if(a.FORM_TYPE=3 or a.FORM_TYPE=4,'1','-')) CUPATION_TYPE
-				FROM t_salary_account a WHERE a.DELETE_FLAG = '0'
-				GROUP BY EMP_IDCARD,INVOICE_TITLE,CUPATION_TYPE
-				having a.SETTLEMENT_MONTH like concat(DATE_FORMAT(NOW(), '%Y'), '%') and DATE_FORMAT(DATE_SUB(CURDATE(),INTERVAL 1 MONTH),"%Y%m")
-					>DATE_FORMAT(max(a.CREATE_TIME),"%Y%m")) b
-				WHERE s.DELETE_FLAG = '0' AND b.max_day = s.CREATE_TIME
-				AND s.EMP_IDCARD = b.EMP_IDCARD AND s.INVOICE_TITLE = b.INVOICE_TITLE AND s.FORM_TYPE = b.FORM_TYPE) c
-			GROUP BY c.EMP_IDCARD,c.INVOICE_TITLE,OCCUPATION_TYPE
+		select 	b.DECLARE_MONTH,b.EMP_NAME,b.EMP_IDCARD,b.EMP_PHONE,b.DECLARE_UNIT,
+				  b.OCCUPATION_TYPE,
+				  b.IS_ZERO_DECLARE,
+				  b.IS_ZERO_FLAG from (
+				SELECT
+				#{nowMonth} DECLARE_MONTH,c.EMP_NAME,c.EMP_IDCARD,c.EMP_PHONE,c.INVOICE_TITLE DECLARE_UNIT,
+				if(c.FORM_TYPE=0 or c.FORM_TYPE=1 or c.FORM_TYPE=2,'0',if(c.FORM_TYPE=3 or c.FORM_TYPE=4,'1','-')) OCCUPATION_TYPE,
+				'2' IS_ZERO_DECLARE,
+				if(DATE_FORMAT(max(c.CREATE_TIME),"%Y%m")>=DATE_FORMAT(DATE_SUB(CURDATE(),INTERVAL 3 MONTH),"%Y%m"),'1','0') IS_ZERO_FLAG
+				FROM t_salary_account c WHERE c.DELETE_FLAG = '0' and c.SETTLEMENT_MONTH like concat(DATE_FORMAT(NOW(), '%Y'), '%')
+				GROUP BY c.EMP_IDCARD
+				having  DATE_FORMAT(DATE_SUB(CURDATE(),INTERVAL 1 MONTH),"%Y%m")
+				>DATE_FORMAT(max(c.CREATE_TIME),"%Y%m")) b
+				group by b.EMP_IDCARD,b.DECLARE_UNIT,b.OCCUPATION_TYPE
 	</select>
 </mapper>

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

@@ -632,6 +632,13 @@ public class TPaymentInfo extends BaseEntity {
 	@ExcelProperty("工资公积金结算状态")
 	private String salaryFundFlag;
 
+	/**
+	 * 是否需要生成收入
+	 */
+	@Schema(description ="是否需要生成收入 0需要 1不需要")
+	@ExcelIgnore
+	private String isIncomeStatus;
+
 	/**
 	 * 是否导入重复标识
 	 */

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

@@ -51,7 +51,7 @@ public class TPreDispatchInfo extends BaseEntity {
      */
     @TableId(type = IdType.ASSIGN_ID)
     @Schema(description ="id")
-    private String id;
+	private String id;
 
     /**
      * 0 派增  1 派减

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

@@ -17,6 +17,7 @@ import java.time.LocalDateTime;
 public class TPreDispatchExportVo implements Serializable {
 
 	@ExcelAttribute(name = "主键", needExport = true)
+	@ExcelProperty("主键")
 	private String id;
 
 	/**

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.java

@@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
-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.core.vo.ErrorDetailVO;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
@@ -381,6 +380,20 @@ public class TPaymentInfoController {
 		tPaymentInfoService.createPaymentFundIncome();
 	}
 
+	/**
+	 * @Description: 定时任务标识根据项目不需要生成收入的数据
+	 * @Author: huyc
+	 * @Date: 2022/8/30
+	 * @return: void
+	 **/
+	@Operation(summary = "定时任务标识根据项目不需要生成收入的数据", description = "定时任务标识根据项目不需要生成收入的数据")
+	@SysLog("定时任务标识根据项目不需要生成收入的数据")
+	@Inner
+	@PostMapping("/inner/signPaymentNoIncomeFlag")
+	public void signPaymentNoIncomeFlag() {
+		tPaymentInfoService.signPaymentNoIncomeFlag();
+	}
+
 	/**
 	 * @param info
 	 * @Description: 查询缴费库

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java

@@ -200,6 +200,8 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
 
 	void updateBySocialIncomePayment(@Param("id")String id);
 
+	void updateBySocialIncomeFlag(@Param("id")String id);
+
 	/**
 	 * 缴费库社保推送查询
 	 * @param searchVo 缴费库

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

@@ -146,6 +146,8 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
 	void createPaymentInfoIncome();
 	void createPaymentFundIncome();
 
+	void signPaymentNoIncomeFlag();
+
 	TPaymentVo getPaymentSocialAndFound(TPaymentInfo info);
 
 	void pushPaymentSocialFundInfo(TPaymentInfoSearchVo searchVo);

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

@@ -33,7 +33,6 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AllUserNaVo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
 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.entity.TSettleDomain;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
@@ -60,12 +59,10 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.apache.shardingsphere.transaction.annotation.ShardingTransactionType;
 import org.apache.shardingsphere.transaction.core.TransactionType;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.support.SimpleValueWrapper;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -510,6 +507,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					excelVOTemp.put(excel.getRowIndex().toString(),excel.getEmpIdcard());
 					continue;
 				}
+			} else {
+				if (Common.isNotNull(excel.getRecordBase()) || Common.isNotNull(excel.getPensionStart()) ||
+						Common.isNotNull(excel.getMedicalStart()) || Common.isNotNull(excel.getBirthStart()) ||
+						Common.isNotNull(excel.getBigailmentStart()) || Common.isNotNull(excel.getUnemployStart()) ||
+						Common.isNotNull(excel.getWorkInjuryStart()) || Common.isNotNull(excel.getPaymentType()) ||
+						Common.isNotNull(excel.getPensionCardinal()) || Common.isNotNull(excel.getBirthCardinal()) ||
+						Common.isNotNull(excel.getBigailmentCardinal()) || Common.isNotNull(excel.getMedicalCardinal())
+						|| Common.isNotNull(excel.getUnemploymentCardinal()) || Common.isNotNull(excel.getWorkInjuryCardinal())) {
+					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.SOCIAL_HOLD_IS_EMPTY)));
+					excelVOTemp.put(excel.getRowIndex().toString(),excel.getEmpIdcard());
+				}
 			}
 			if (Common.isNotNull(excel.getProvidentHousehold())){
 				if (Common.isEmpty(fundSet)){
@@ -517,6 +525,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					excelVOTemp.put(excel.getRowIndex().toString(),excel.getEmpIdcard());
 					continue;
 				}
+			} else {
+				if (Common.isNotNull(excel.getProvidentStart()) || Common.isNotNull(excel.getProvidentCardinal()) ||
+					Common.isNotNull(excel.getProvidentPer())) {
+					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.FUND_HOLD_IS_EMPTY)));
+					excelVOTemp.put(excel.getRowIndex().toString(),excel.getEmpIdcard());
+				}
 			}
 			if (Common.isNotNull(dispatchMap) && Common.isNotNull(dispatchMap.get(excel.getEmpIdcard()))){
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EXIST)));
@@ -681,7 +695,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					if (Common.isNotNull(socialFund) && Common.isNotNull(dispatch)){
 						socialFund.setDispatchId(dispatch.getId());
 					}
-					initSocialFundAndInsert(emp, social, fund, socialFund,project,dispatchPart,injury);
+					 initSocialFundAndInsert(emp, social, fund, socialFund,project,dispatchPart,injury);
 				}
 				// 生成预付数据
 				if (Common.isNotNull(socialFund) && Common.isNotNull(socialFund.getId())){
@@ -1460,7 +1474,26 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			social.setHandleStatus(CommonConstants.ZERO_STRING);
 			social.setDeleteFlag(CommonConstants.ZERO_STRING);
 			social.setTrustRemark(excel.getTrustRemark());
-			social.setSocialStartDate(excel.getPensionStart());
+			List<Date> lstDate = new ArrayList<>();
+			if (Common.isNotNull(excel.getPensionStart())) {
+				lstDate.add(excel.getPensionStart());
+			}
+			if (Common.isNotNull(excel.getUnemployStart())) {
+				lstDate.add(excel.getUnemployStart());
+			}
+			if (Common.isNotNull(excel.getBigailmentStart())) {
+				lstDate.add(excel.getBigailmentStart());
+			}
+			if (Common.isNotNull(excel.getWorkInjuryStart())) {
+				lstDate.add(excel.getWorkInjuryStart());
+			}
+			if (Common.isNotNull(excel.getMedicalStart())) {
+				lstDate.add(excel.getMedicalStart());
+			}
+			if (Common.isNotNull(excel.getBirthStart())) {
+				lstDate.add(excel.getBirthStart());
+			}
+			social.setSocialStartDate(Collections.min(lstDate));
 			//  封装单位信息 结算信息
 			social.setBelongUnit(excel.getCustomerId());
 			social.setSettleDomain(excel.getSettleDomainId());

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

@@ -507,7 +507,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		if (!errorMessageList.isEmpty()) {
 			boolean isAllTrue = true;
 			for (ErrorDetailVO d : errorMessageList) {
-				if (d.getResult() == 0) {
+				if (Common.isEmpty(d.getResult()) || d.getResult() == 0) {
 					isAllTrue = false;
 					break;
 				}
@@ -2601,6 +2601,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		long count = baseMapper.selectCount(Wrappers.<TPaymentInfo>query().lambda()
 						.eq(TPaymentInfo::getIncomeStatus,CommonConstants.ONE_STRING)
 						.eq(TPaymentInfo::getLockStatus,CommonConstants.ONE_STRING)
+						.eq(TPaymentInfo::getIsIncomeStatus,CommonConstants.ZERO_STRING)
 						.isNotNull(TPaymentInfo::getSocialId));
 		if (count > 0) {
 			List<TPaymentInfo> sumList;
@@ -2626,6 +2627,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		long count = baseMapper.selectCount(Wrappers.<TPaymentInfo>query().lambda()
 				.eq(TPaymentInfo::getIncomeStatus,CommonConstants.ONE_STRING)
 				.eq(TPaymentInfo::getLockStatus,CommonConstants.ONE_STRING)
+				.eq(TPaymentInfo::getIsIncomeStatus,CommonConstants.ZERO_STRING)
 				.isNotNull(TPaymentInfo::getFundId));
 		if (count > 0) {
 			List<TPaymentInfo> sumList;
@@ -2645,6 +2647,30 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		}
 	}
 
+	@Override
+	public void signPaymentNoIncomeFlag() {
+		//标识根据项目不需要生成收入的数据
+		long count = baseMapper.selectCount(Wrappers.<TPaymentInfo>query().lambda()
+				.eq(TPaymentInfo::getIncomeStatus,CommonConstants.ONE_STRING)
+				.eq(TPaymentInfo::getLockStatus,CommonConstants.ONE_STRING));
+		if (count > 0) {
+			List<TPaymentInfo> unPushInfo;
+			int i = (int) Math.ceil((double) count / CommonConstants.TEN_THOUSAND_INT);
+			for (int j = 0; j < i; j++) {
+				unPushInfo = baseMapper.selectList(Wrappers.<TPaymentInfo>query().lambda()
+						.eq(TPaymentInfo::getIncomeStatus, CommonConstants.ONE_STRING)
+						.eq(TPaymentInfo::getLockStatus, CommonConstants.ONE_STRING)
+						.last(" limit 0,10000"));
+				synchronized (this) {
+					if (Common.isNotNull(unPushInfo)) {
+						//判断是否需要生成收入并标识
+						signIncomeFlag(unPushInfo);
+					}
+				}
+			}
+		}
+	}
+
 	public void createPaymentSocialInfoReal(YifuUser user,TPaymentInfoSearchVo searchVo) {
 		//获取所有未推送的社保实缴明细数据
 		searchVo.setLockStatus(CommonConstants.ONE_STRING);
@@ -3099,10 +3125,51 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		}
 	}
 
+	public void signIncomeFlag(List<TPaymentInfo> updateList) {
+		//获取所有的项目编码
+		List<String> deptNoList = updateList.stream().map(TPaymentInfo::getSettleDomainCode).collect(Collectors.toList());
+		//获取对应项目信息
+		Map<String, TSettleDomain> data = new HashMap<>();
+		TSettleDomain settleDomain;
+		try {
+			R<TSettleDomainListVo> infoByCodes = archivesDaprUtil.getSettleInfoByCodes(deptNoList);
+			if (null != infoByCodes && Common.isNotNull(infoByCodes.getData()) && Common.isNotNull(infoByCodes.getData().getMapVO())) {
+				data = infoByCodes.getData().getMapVO();
+			}
+			if (Common.isNotNull(data)) {
+				for (TPaymentInfo paymentInfo : updateList) {
+					settleDomain = data.get(paymentInfo.getSettleDomainCode());
+					boolean isIncomeFlag = false;
+					if (Common.isNotNull(settleDomain)) {
+						if (Common.isNotNull(settleDomain.getManageServerItem()) && ((settleDomain.getManageServerItem().contains(CommonConstants.ONE_STRING)
+								&& Common.isNotNull(paymentInfo.getSocialId())) || (settleDomain.getManageServerItem().contains(CommonConstants.TWO_STRING)
+								&& Common.isNotNull(paymentInfo.getFundId()))) && CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag()) &&
+								CommonConstants.TWO_STRING.equals(settleDomain.getMrSettleType())) {
+							//实缴模式
+							isIncomeFlag = true;
+						}
+						if (Common.isNotNull(settleDomain.getRiskServerItem()) && ((settleDomain.getRiskServerItem().contains(CommonConstants.ONE_STRING)
+								&& Common.isNotNull(paymentInfo.getSocialId())) || (settleDomain.getRiskServerItem().contains(CommonConstants.TWO_STRING)
+								&& Common.isNotNull(paymentInfo.getFundId()))) && CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag()) &&
+								CommonConstants.TWO_STRING.equals(settleDomain.getMrSettleType())) {
+							//实缴模式
+							isIncomeFlag = true;
+						}
+					}
+					if (!isIncomeFlag) {
+						baseMapper.updateBySocialIncomeFlag(paymentInfo.getId());
+					}
+				}
+			}
+		}catch (Exception e) {
+			log.error("标识是否需要生成收入异常",e);
+		}
+	}
+
 	public void createIncomeInfo(List<TPaymentInfo> updateList, String socialFundFlag) {
+		List<TIncomeDetail> exitIncome;
 		for (TPaymentInfo paymentInfo : updateList) {
 			boolean exitFlag = false;
-			List<TIncomeDetail> exitIncome;
 			if (CommonConstants.ONE_STRING.equals(socialFundFlag)) {
 				exitIncome = detailMapper.selectList(Wrappers.<TIncomeDetail>query().lambda()
 						.eq(TIncomeDetail::getEmpIdcard, paymentInfo.getEmpIdcard())
@@ -3149,6 +3216,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 
 			int isSum = 0;
 			if (Common.isNotNull(settleDomain)) {
+				boolean isIncomeFlag = false;
 				// 含有社保，则计算收入
 				if (Common.isNotNull(settleDomain.getManageServerItem()) && ((settleDomain.getManageServerItem().contains(CommonConstants.ONE_STRING)
 						&& CommonConstants.ONE_STRING.equals(socialFundFlag)) || (settleDomain.getManageServerItem().contains(CommonConstants.TWO_STRING)
@@ -3173,6 +3241,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							}
 						}
 						if (!exitFlag || isSum == 1) {
+							isIncomeFlag = true;
 							createIncomeInsurance(paymentInfo, settleDomain, CommonConstants.ONE_STRING,
 									settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
 									gMoney, socialFundFlag);
@@ -3203,12 +3272,16 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							}
 						}
 						if (!exitFlag || isSum == 2) {
+							isIncomeFlag = true;
 							createIncomeInsurance(paymentInfo, settleDomain, CommonConstants.TWO_STRING,
 									settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(),
 									money, socialFundFlag);
 						}
 					}
 				}
+				if (!isIncomeFlag) {
+					baseMapper.updateBySocialIncomeFlag(paymentInfo.getId());
+				}
 			}
 		}
 	}

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

@@ -2347,7 +2347,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		importVo.setPost(preInfo.getPositionAdd());
 		importVo.setWorkingHours(preInfo.getWorkingHoursAdd());
 		importVo.setEmpNational(CommonConstants.ONE_STRING);
-		importVo.setEducationName(CommonConstants.FIVE_STRING);
+		importVo.setEducationName("大专");
 		importVo.setTrustRemark("预派单");
 		if (null != preInfo.getPensionBase()){
 			importVo.setRecordBase(preInfo.getPensionBase());
@@ -2406,7 +2406,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 	 **/
 	private void initDispatchContractVo(TPreDispatchInfo preInfo, TDispatchImportVo importVo) {
 		if (Common.isNotNull(preInfo.getContractNameAdd())){
-			importVo.setContractName(preInfo.getContractTypeAdd());
+			importVo.setContractName("其他");
 			if (Common.isNotNull(preInfo.getContractStartAdd())){
 				importVo.setContractStart(DateUtil.stringToDate(ServiceUtil.
 						replaceSeparator(preInfo.getContractStartAdd(),CommonConstants.CENTER_SPLIT_LINE_STRING,

yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml

@@ -100,6 +100,7 @@
 		<result property="createName" column="CREATE_NAME"/>
 		<result property="createTime" column="CREATE_TIME"/>
 		<result property="incomeStatus" column="INCOME_STATUS"/>
+		<result property="isIncomeStatus" column="IS_INCOME_STATUS"/>
 	</resultMap>
 	<resultMap id="tPaymentInfoSumMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoExportVo">
 		<result property="empName" column="EMP_NAME"/>
@@ -1266,7 +1267,7 @@
 		<include refid="Base_Column_List"/>
 		FROM t_payment_info a
 		<where>
-			a.INCOME_STATUS = '1' AND a.SOCIAL_ID IS NOT NULL AND a.CREATE_BY = #{userId}
+			a.INCOME_STATUS = '1' AND a.SOCIAL_ID IS NOT NULL AND a.CREATE_BY = #{userId} AND a.IS_INCOME_STATUS = '0'
 			<include refid="tPaymentInfo_export_where"/>
 		</where>
 		limit 0,10000
@@ -1278,7 +1279,7 @@
 		<include refid="Base_Column_List"/>
 		FROM t_payment_info a
 		<where>
-			a.INCOME_STATUS = '1' AND a.FUND_ID IS NOT NULL AND a.CREATE_BY = #{userId}
+			a.INCOME_STATUS = '1' AND a.FUND_ID IS NOT NULL AND a.CREATE_BY = #{userId} AND a.IS_INCOME_STATUS = '0'
 			<include refid="tPaymentInfo_export_where"/>
 		</where>
 		limit 0,10000
@@ -1300,6 +1301,13 @@
 			ID = #{id}
 	</update>
 
+	<update id="updateBySocialIncomeFlag">
+		update t_payment_info
+		set IS_INCOME_STATUS = '1'
+		where
+			ID = #{id}
+	</update>
+
 	<select id="getTPaymentSocialPushCount" resultType="java.lang.Long">
 		SELECT
 		count(1)
@@ -1327,7 +1335,7 @@
 		count(1)
 		FROM t_payment_info a
 		<where>
-			a.INCOME_STATUS = '1' AND a.SOCIAL_ID IS NOT NULL AND a.CREATE_BY = #{userId}
+			a.INCOME_STATUS = '1' AND a.SOCIAL_ID IS NOT NULL AND a.CREATE_BY = #{userId} AND a.IS_INCOME_STATUS = '0'
 			<include refid="tPaymentInfo_export_where"/>
 		</where>
 	</select>
@@ -1338,7 +1346,7 @@
 		count(1)
 		FROM t_payment_info a
 		<where>
-			a.INCOME_STATUS = '1' AND a.FUND_ID IS NOT NULL AND a.CREATE_BY = #{userId}
+			a.INCOME_STATUS = '1' AND a.FUND_ID IS NOT NULL AND a.CREATE_BY = #{userId} AND a.IS_INCOME_STATUS = '0'
 			<include refid="tPaymentInfo_export_where"/>
 		</where>
 	</select>