MVP8号版本

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

@@ -319,16 +319,16 @@ public class TEmployeeInfo extends BaseEntity {
 	 * 	1、派单处社保或公积金状态为待审核、待办理、办理中，项目档案处社保或公积金状态为处理中；           0,1=1
 	 * 	2、派单处社保或公积金状态为审核不通过或办理失败，项目档案处社保状态为无社保，公积金状态为无公积金； 9,4=0
 	 * 	3、派单处社保状态为部分办理失败，项目档案处社保状态为部分购买
-	 * 	4、派单处社保或公积金状态为办理成功，项目档案处社保或公积金状态为正常                          3=2
+	 * 	4、派单处社保或公积金状态为办理成功，项目档案处社保或公积金状态为正常                          3=3
 	 * 	派减：
-	 * 	1、派减状态为待审核、待办理、审核不通过、办理失败，项目档案处社保或公积金状态不变；             5,6,8 =2
-	 * 	2、派减状态为办理成功，项目档案处社保或公积金状态变为已派减                                7=3
+	 * 	1、派减状态为待审核、待办理、审核不通过、办理失败，项目档案处社保或公积金状态不变；             5,6,8 =3
+	 * 	2、派减状态为办理成功，项目档案处社保或公积金状态变为已派减                                7=4
 	 * 	人员档案处社保或公积金状态根据身份证+项目进行整合：
 	 * 	社保状态优先级：正常>部分购买>处理中>已派减>无社保
 	 * 	公积金状态优先级：正常>处理中>已派减>无公积金
 	 * 公积金状态（字典）0初始状态
 	 */
-	@Schema(description = "公积金状态（字典）0初始状态：0 无公积金 1 处理中  2.正常 3.已派减")
+	@Schema(description = "公积金状态（字典）0初始状态：0 无公积金 1 处理中 2.部分购买 3.正常 4.已派减")
 	private Integer fundStatus;
 
 	/**

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

@@ -377,10 +377,10 @@
 			<if test="tEmployeeProject.socialProvince != null">
 				AND a.SOCIAL_PROVINCE = #{tEmployeeProject.socialProvince}
 			</if>
-			<if test="tEmployeeProject.socialCity != null">
+			<if test="tEmployeeProject.fileCity != null">
 				AND a.SOCIAL_CITY = #{tEmployeeProject.socialCity}
 			</if>
-			<if test="tEmployeeProject.socialTown != null">
+			<if test="tEmployeeProject.fileTown != null">
 				AND a.SOCIAL_TOWN = #{tEmployeeProject.socialTown}
 			</if>
 			<if test="tEmployeeProject.empNatureArray != null and tEmployeeProject.empNatureArray.length > 0">
@@ -528,10 +528,10 @@
 			<if test="tEmployeeProject.socialProvince != null">
 				AND a.SOCIAL_PROVINCE = #{tEmployeeProject.socialProvince}
 			</if>
-			<if test="tEmployeeProject.socialCity != null">
+			<if test="tEmployeeProject.fileCity != null">
 				AND a.SOCIAL_CITY = #{tEmployeeProject.socialCity}
 			</if>
-			<if test="tEmployeeProject.socialTown != null">
+			<if test="tEmployeeProject.fileTown != null">
 				AND a.SOCIAL_TOWN = #{tEmployeeProject.socialTown}
 			</if>
 			<if test="tEmployeeProject.idList != null">

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

@@ -255,5 +255,4 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	 **/
 	List<InsuranceUpdateVO> selectByIds(@Param("ids") List<String> ids);
 
-	List<TInsuranceDetail> selectPushList();
 }

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

@@ -1982,61 +1982,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		return R.ok(operatList,InsurancesConstants.OPERATE_SUCCESS);
 	}
 
-	/*
-	 * 获取当前保单的结算状态
-	 *
-	 * @author zhaji
-	 * @param
-	 * @return {@link String}
-	 */
-	@Override
-	public void pushActualPremium(){
-		List<TInsuranceDetail> list = baseMapper.selectPushList();
-		for (TInsuranceDetail detail: list){
-			//推作废
-			pushEstimate(detail, CommonConstants.FIVE_INT);
-		}
-		for (TInsuranceDetail detail: list){
-			//单独结算
-			if(StringUtils.isNotBlank(detail.getDefaultSettleId()) && detail.getSettleType() == CommonConstants.ONE_INT) {
-				TInsuranceSettle settle = tInsuranceSettleService.getById(detail.getDefaultSettleId());
-				String s = pushEstimate(detail, CommonConstants.TWO_INT);
-				//如果推送成功则更改推送状态
-				if (StringUtils.isNotBlank(s) && Common.isNotNull(settle)) {
-					settle.setActualPushTime(LocalDateTime.now());
-					settle.setIsActualPush(CommonConstants.ONE_INT);
-					tInsuranceSettleService.updateById(settle);
-				}
-			}
-			if(StringUtils.isNotBlank(detail.getDefaultSettleId()) && detail.getSettleType() == CommonConstants.ZERO_INT) {
-				TInsuranceSettle settle = tInsuranceSettleService.getById(detail.getDefaultSettleId());
-				TInsuranceDetail t = new TInsuranceDetail();
-				BeanUtils.copyProperties(detail,t);
-				if (Common.isEmpty(detail.getEstimatePremium())) {
-					detail.setEstimatePremium(detail.getActualPremium());
-				}
-				String s1 = pushEstimate(detail, CommonConstants.ONE_INT);
-				//如果推送成功则更改推送状态
-				if (StringUtils.isNotBlank(s1) && Common.isNotNull(settle)) {
-					settle.setIsEstimatePush(CommonConstants.ONE_INT);
-					settle.setEstimatePushTime(LocalDateTime.now());
-					tInsuranceSettleService.updateById(settle);
-				}
-
-				if (Common.isEmpty(t.getEstimatePremium())) {
-					t.setEstimatePremium(t.getActualPremium());
-				}
-				String s2 = pushEstimate(t, CommonConstants.TWO_INT);
-				//如果推送成功则更改推送状态
-				if (StringUtils.isNotBlank(s2) && Common.isNotNull(settle)) {
-					settle.setIsActualPush(CommonConstants.ONE_INT);
-					settle.setActualPushTime(LocalDateTime.now());
-					tInsuranceSettleService.updateById(settle);
-				}
-			}
-		}
-	}
-
 	/**
 	 * 商险新增校验
 	 *
@@ -6260,6 +6205,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			cancel.setDeptNo(tInsuranceDetail.getDeptNo());
 			cancel.setInsDetailId(tInsuranceDetail.getId());
 			cancel.setSettleId(tInsuranceDetail.getDefaultSettleId());
+			cancel.setCreateUesr(user.getId());
 			cancel.setCreateTime(LocalDateTime.now());
 			cancel.setDeptName(param.getDeptName());
 			cancel.setIsCancelPush(CommonConstants.ZERO_INT);

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

@@ -1191,13 +1191,6 @@
 		</foreach>
 	</update>
 
-	<select id="selectPushList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail">
-		SELECT
-		*
-		FROM
-		t_insurance_detail
-		WHERE ERROR_STATUS = '1'
-	</select>
 
 	<!--查询所有商险，如果idList 不为空，则不含被替换的本身。 用来改变档案状态-->
 	<select id="selectByIdCardList" resultMap="BaseResultMap">
@@ -1206,11 +1199,14 @@
 		FROM
 		t_insurance_detail
 		where
-			DELETE_FLAG = 0 AND EMP_IDCARD_NO in
+			DELETE_FLAG = 0
+		<if test="idCardList != null and idCardList.size > 0">
+			AND EMP_IDCARD_NO in
 			<foreach item="item" index="index" collection="idCardList" open="(" separator="," close=")">
 				#{item}
 			</foreach>
-			<if test="idList != null">
+		</if>
+			<if test="idList != null and idList.size > 0">
 				AND id not in
 				<foreach item="item" index="index" collection="idList" open="(" separator="," close=")">
 					#{item}

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryStandardExportVo.java

@@ -26,7 +26,7 @@ public class TSalaryStandardExportVo implements Serializable {
 	/**
 	 * 状态0待提交   1待审核  2审核通过   3发送成功   5审核不通过   10 发送失败
 	 */
-	@ExcelAttribute(name = "状态", isDataId = true, readConverterExp = "0=待提交,1=待审核,2=审核通过,3=发送成功,5=审核不通过,6=确认不通过,10=发送失败")
+	@ExcelAttribute(name = "状态", isDataId = true, readConverterExp = "0=待提交,1=待审核,2=待推送明细,3=发送成功,5=审核不通过,6=确认不通过,10=发送失败,11=已审核生成收入中,12=已审核生成收入失败")
 	@NotBlank(message = "状态（0待提交   1待审核  2审核通过   3发送成功   5审核不通过   10 发送失败）不能为空")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("薪酬状态")

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java

@@ -229,4 +229,14 @@ public class TSalaryStandardController {
 	public R<String> backSalaryByApplyNo(@RequestParam String applyNo) {
 		return tSalaryStandardService.backSalaryByApplyNo(applyNo);
 	}
+
+	/**
+	 * @param id
+	 * @return
+	 */
+	@Operation(description = "重新生成收入")
+	@GetMapping("/salaryDoIncome")
+	public R<String> salaryDoIncome(@RequestParam String id) {
+		return tSalaryStandardService.salaryDoIncome(id);
+	}
 }

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

@@ -75,6 +75,8 @@
 	<result property="orderId" column="ORDER_ID"/>
 	<result property="bpoFlag" column="BPO_FLAG"/>
 	<result property="applyNo" column="APPLY_NO"/>
+	<result property="incomeStartTime" column="INCOME_START_TIME"/>
+	<result property="incomeEndTime" column="INCOME_END_TIME"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -128,7 +130,9 @@
 				a.INVOICE_TITLE,
 				a.ORDER_ID,
 				a.BPO_FLAG,
-				a.APPLY_NO
+				a.APPLY_NO,
+				a.INCOME_START_TIME,
+				a.INCOME_END_TIME
     </sql>
     <sql id="tSalaryStandard_where">
         <if test="tSalaryStandard != null">