薪資配置

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

@@ -14,5 +14,9 @@ public class TSettleDomainListVo {
     private List<TSettleDomainSelectVo> listSelectVO;
 
 	private Map<String,TSettleDomainSelectVo> mapSlectVo;
+	/**
+	 * 合同主体IDS
+	 */
+	private List<String> deptIds;
 
 }

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

@@ -137,12 +137,14 @@ public class TSettleDomainController {
 	@Operation(description = "获取登录用户拥有的项目数据）")
 	@Inner
 	@GetMapping("/getSettleDomainIdsByUserId")
-	public List<String> getSettleDomainIdsByUserId() {
+	public TSettleDomainListVo getSettleDomainIdsByUserId() {
 		YifuUser user = SecurityUtils.getUser();
 		if (null == user || null == user.getId()) {
 			return null;
 		}
-		return tSettleDomainService.getSettleDomainIdsByUserId(user.getId());
+		TSettleDomainListVo vo = new TSettleDomainListVo();
+		vo.setDeptIds(tSettleDomainService.getSettleDomainIdsByUserId(user.getId()));
+		return vo;
 	}
 
 	/**

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

@@ -107,6 +107,21 @@ public class ArchivesDaprUtil {
 		return res;
 	}
 
+	/**
+	 * @Author fxj
+	 * @Description 获取所有客户单位的项目信息
+	 * @Date 21:18 2022/7/18
+	 * @Param
+	 * @return
+	 **/
+	public R<TSettleDomainListVo> getSettleDomainIdsByUserId(String userId){
+		R<TSettleDomainListVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/getSettleDomainIdsByUserId",userId, TSettleDomainListVo.class, SecurityConstants.FROM_IN);
+		if (Common.isEmpty(res)){
+			return R.failed("获取所有客户单位的项目信息失败！");
+		}
+		return res;
+	}
+
 	/**
 	 * @Author huyc
 	 * @Description 根据项目id 获取项目编码

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandardSet.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -28,7 +29,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @TableName("t_salary_standard_set")
 @Tag(name = "薪资工资条配置主表")
-public class TSalaryStandardSet extends Model<TSalaryStandardSet> {
+public class TSalaryStandardSet extends BaseEntity {
      private static final long serialVersionUID = 1L;
      /**
       *
@@ -52,20 +53,7 @@ public class TSalaryStandardSet extends Model<TSalaryStandardSet> {
      @ExcelAttribute(name = "结算部门id", isNotEmpty = true, errorInfo = "结算部门id不能为空", maxLength = 32)
      @ExcelProperty(value = "结算部门id")
      private String deptId;
-     /**
-      * 创建人
-      */
-     @NotBlank(message = "创建人不能为空")
-     @Length(max = 32, message = "创建人不能超过32个字符")
-     @ExcelAttribute(name = "创建人", isNotEmpty = true, errorInfo = "创建人不能为空", maxLength = 32)
-     @ExcelProperty(value = "创建人")
-     private String createUser;
-     /**
-      * 创建时间
-      */
-     @ExcelAttribute(name = "创建时间")
-     @ExcelProperty(value = "创建时间")
-     private LocalDateTime createTime;
+
      /**
       * 是否为0不显示：0显示；1不显示
       */

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandardSetDetail.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,7 +26,7 @@ import javax.validation.constraints.NotNull;
 @EqualsAndHashCode(callSuper = true)
 @TableName("t_salary_standard_set_detail")
 @Tag(name = "薪资工资条配置明细表")
-public class TSalaryStandardSetDetail extends Model<TSalaryStandardSetDetail> {
+public class TSalaryStandardSetDetail extends BaseEntity {
      private static final long serialVersionUID = 1L;
      /**
       *

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

@@ -20,6 +20,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -29,7 +30,7 @@ import java.time.LocalDateTime;
  * @date 2022-08-05 11:40:14
  */
 @Data
-public class TSalaryStandardSearchVo extends TSalaryStandard {
+public class TSalaryStandardSearchVo extends TSalaryStandard implements Serializable {
 
 	/**
 	 * 多选导出或删除等操作

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

@@ -19,7 +19,7 @@ import java.util.List;
 
 /**
  * @Author fxj
- * @Description 工资报账配置
+ * @Description 普通工资配置
  * @Date 13:32 2022/8/6
  * @Param
  * @return

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

@@ -109,7 +109,7 @@ public class TSalaryStandardController {
 	 **/
 	@Operation(description = "导出标准薪酬工资表 hasPermission('salary_tsalarystandard-export')")
 	@PostMapping("/export")
-	@PreAuthorize("@pms.hasPermission('salary_tsalarystandard-export')")
+	//@PreAuthorize("@pms.hasPermission('salary_tsalarystandard-export')")
 	public void export(HttpServletResponse response, @RequestBody TSalaryStandardSearchVo searchVo) {
 		tSalaryStandardService.listExport(response, searchVo);
 	}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TConfigSalaryMapper.java

@@ -24,7 +24,7 @@ public interface TConfigSalaryMapper extends BaseMapper<TConfigSalary> {
       * @return
       */
      IPage<TConfigSalary> getTConfigSalaryPage(Page page, @Param("tConfigSalary") TConfigSalary tConfigSalary
-             , @Param("settleDomainVos") List<TSettleDomainSelectVo> settleDomainVos);
+             , @Param("depatIds") List<String> depatIds);
 
 
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryStandardMapper.java

@@ -50,7 +50,7 @@ public interface TSalaryStandardMapper extends BaseMapper<TSalaryStandard> {
 	 */
 	IPage<TSalaryStandard> getTSalaryStandardAuditPage(Page<TSalaryStandard> page, @Param("tSalaryStandard") TSalaryStandard tSalaryStandard);
 
-	List<TSalaryStandardExportVo> getSalaryStandardExport( @Param("tSalaryStandard") TSalaryStandardSearchVo searchVo);
+	List<TSalaryStandardExportVo> getSalaryStandardExport(@Param("searchVo") TSalaryStandardSearchVo searchVo);
 
 	int getSalaryStandardExportCount(TSalaryStandardSearchVo searchVo);
 }

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

@@ -3,15 +3,19 @@ package com.yifu.cloud.plus.v1.yifu.salary.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
 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.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TConfigSalary;
 import com.yifu.cloud.plus.v1.yifu.salary.mapper.TConfigSalaryMapper;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TConfigSalaryService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -23,10 +27,11 @@ import java.util.List;
  * @Param
  * @return
 **/
+@AllArgsConstructor
 @Service("tConfigSalaryService")
 public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, TConfigSalary> implements TConfigSalaryService {
 
-
+	private final ArchivesDaprUtil archivesDaprUtil;
      /**
       * 工资报账配置简单分页查询
       * @param tConfigSalary 工资报账配置
@@ -35,22 +40,24 @@ public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, T
      @Override
      public IPage<TConfigSalary> getTConfigSalaryPage(Page<TConfigSalary> page, TConfigSalary tConfigSalary){
           YifuUser user = SecurityUtils.getUser();
-          List<TSettleDomainSelectVo> remoteSettleDomainVoData = null;
+		 TSettleDomainListVo vo = null;
           if (Common.isNotNull(user)) {
-			  // TODO
-               R<List<TSettleDomainSelectVo>> remoteGetTSettleDomainVo = null;
-               if (remoteGetTSettleDomainVo == null) {
+			  R<TSettleDomainListVo> domainListVoR = archivesDaprUtil.getSettleDomainIdsByUserId(user.getId());
+               if (Common.isEmpty(domainListVoR)) {
                     throw new RuntimeException("调用结算服务失败");
                }
-               if (CommonConstants.SUCCESS != remoteGetTSettleDomainVo.getCode()) {
+               if (CommonConstants.SUCCESS != domainListVoR.getCode()) {
                     throw new RuntimeException("调用结算服务返回失败");
                }
-               remoteSettleDomainVoData = remoteGetTSettleDomainVo.getData();
-               if (remoteSettleDomainVoData == null) {
+			   vo = domainListVoR.getData();
+               if (Common.isEmpty(vo) || Common.isEmpty(vo.getDeptIds())) {
                     throw new RuntimeException("未获取到相关结算信息");
                }
           }
-          return baseMapper.getTConfigSalaryPage(page, tConfigSalary, remoteSettleDomainVoData);
+		  if (Common.isEmpty(vo)){
+			  return baseMapper.getTConfigSalaryPage(page, tConfigSalary, vo.getDeptIds());
+		  }
+          return baseMapper.getTConfigSalaryPage(page, tConfigSalary, null);
      }
 
 }

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

@@ -66,7 +66,7 @@ public class TSalaryStandardSetServiceImpl extends ServiceImpl<TSalaryStandardSe
                             Wrappers.<TSalaryStandardSetDetail>query().lambda().eq(TSalaryStandardSetDetail::getSetId, ss.getId()));
                     TSalaryStandardSet newSet = new TSalaryStandardSet();
                     newSet.setCreateTime(LocalDateTime.now());
-                    newSet.setCreateUser(userId);
+                    newSet.setCreateBy(userId);
                     newSet.setIsZero(ss.getIsZero());
                     newSet.setSalaryId(salaryId);
                     newSet.setDeptId(deptId);
@@ -113,7 +113,7 @@ public class TSalaryStandardSetServiceImpl extends ServiceImpl<TSalaryStandardSe
           }
           if (Common.isEmpty(tSalaryStandardSet.getId())) {
                tSalaryStandardSet.setCreateTime(LocalDateTime.now());
-               tSalaryStandardSet.setCreateUser(String.valueOf(user.getId()));
+               tSalaryStandardSet.setCreateBy(String.valueOf(user.getId()));
                this.save(tSalaryStandardSet);
           } else {
                this.updateById(tSalaryStandardSet);

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

@@ -79,10 +79,10 @@
 				AND ANNUAL_BONUS_TYPE = #{tConfigSalary.annualBonusType}
 			</if>
 			<!--数据权限判断-->
-			<if test="settleDomainVos != null and settleDomainVos.size() > 0">
+			<if test="depatIds != null and depatIds.size() > 0">
 				and DEPART_ID in
-				<foreach collection="settleDomainVos" item="param" index="index" open="(" close=")" separator=",">
-					#{param.id}
+				<foreach collection="depatIds" item="param" index="index" open="(" close=")" separator=",">
+					#{param}
 				</foreach>
 			</if>
 		</where>

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

@@ -225,8 +225,20 @@
 		</where>
 		order by a.CREATE_TIME desc
 	</select>
+	<resultMap id="salaryStandardExportMap" type="com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardExportVo">
+		<result property="status" column="STATUS"/>
+		<result property="sendMonth" column="SEND_MONTH"/>
+		<result property="deptName" column="DEPT_NAME"/>
+		<result property="deptNo" column="DEPT_NO"/>
+		<result property="settlementAmount" column="SETTLEMENT_AMOUNT"/>
+		<result property="invoiceTitle" column="INVOICE_TITLE"/>
+		<result property="createName" column="CREATE_NAME"/>
+		<result property="salaryMonth" column="SALARY_MONTH"/>
+		<result property="formType" column="FORM_TYPE"/>
+		<result property="createTime" column="CREATE_TIME"/>
+	</resultMap>
 	<!--tSalaryStandard简单分页查询-->
-	<select id="getSalaryStandardExport" resultType="com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardExportVo">
+	<select id="getSalaryStandardExport" resultMap="salaryStandardExportMap" parameterType="com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardSearchVo">
 		SELECT
 		a.STATUS,
 		a.SEND_MONTH,
@@ -246,17 +258,17 @@
 		FROM t_salary_standard a
 		<where>
 			1=1
-			<include refid="where_page"/>
+			<include refid="where_export"/>
 		</where>
 	</select>
 	<!--tSalaryStandard简单分页查询-->
-	<select id="getSalaryStandardExportCount" resultType="java.lang.Integer">
+	<select id="getSalaryStandardExportCount"   resultType="java.lang.Integer" parameterType="com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardSearchVo">
 		SELECT
 		count(1)
 		FROM t_salary_standard a
 		<where>
 			1=1
-			<include refid="where_page"/>
+			<include refid="where_export"/>
 		</where>
 	</select>
 	<sql id="where_page">
@@ -271,11 +283,33 @@
 				AND a.SALARY_MONTH = #{tSalaryStandard.salaryMonth}
 			</if>
 			<if test="tSalaryStandard.status == null">
-				AND a.STATUS = 1 OR a.STATUS = 2 OR a.STATUS = 5
+				AND (a.STATUS = 1 OR a.STATUS = 2 OR a.STATUS = 5)
 			</if>
 			<if test="tSalaryStandard.status != null">
 				AND a.STATUS = #{tSalaryStandard.status}
 			</if>
 		</if>
 	</sql>
+	<sql id="where_export">
+		<if test="searchVo != null">
+			<if test="searchVo.deptName != null and searchVo.deptName.trim() != ''">
+				AND a.DEPT_NAME like concat(#{'%',#{searchVo.deptName},'%')
+			</if>
+			<if test="searchVo.deptNo != null and searchVo.deptNo.trim() != ''">
+				AND a.DEPT_NO = #{searchVo.deptNo}
+			</if>
+			<if test="searchVo.salaryMonth != null and searchVo.salaryMonth.trim() != ''">
+				AND a.SALARY_MONTH = #{searchVo.salaryMonth}
+			</if>
+			<if test="searchVo.status == null">
+				AND (a.STATUS = 1 OR a.STATUS = 2 OR a.STATUS = 5)
+			</if>
+			<if test="searchVo.status != null">
+				AND a.STATUS = #{searchVo.status}
+			</if>
+			<if test="searchVo.limitStart != null">
+				limit #{searchVo.limitStart},#{searchVo.limitEnd}
+			</if>
+		</if>
+	</sql>
 </mapper>

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

@@ -5,7 +5,7 @@
         <id property="id" column="id"/>
         <result property="salaryId" column="SALARY_ID"/>
         <result property="deptId" column="DEPT_ID"/>
-        <result property="createUser" column="CREATE_USER"/>
+        <result property="createUser" column="CREATE_BY"/>
         <result property="createTime" column="CREATE_TIME"/>
         <result property="isZero" column="IS_ZERO"/>
     </resultMap>
@@ -13,7 +13,7 @@
              a.id,
                   a.SALARY_ID,
                   a.DEPT_ID,
-                  a.CREATE_USER,
+                  a.CREATE_BY,
                   a.CREATE_TIME,
                   a.IS_ZERO
          </sql>
@@ -29,7 +29,7 @@
                 AND a.DEPT_ID = #{tSalaryStandardSet.deptId}
             </if>
             <if test="tSalaryStandardSet.createUser != null and tSalaryStandardSet.createUser.trim() != ''">
-                AND a.CREATE_USER = #{tSalaryStandardSet.createUser}
+                AND a.CREATE_BY = #{tSalaryStandardSet.createUser}
             </if>
             <if test="tSalaryStandardSet.createTime != null">
                 AND a.CREATE_TIME = #{tSalaryStandardSet.createTime}

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

@@ -969,6 +969,7 @@ public class TSocialFundInfo extends BaseEntity {
 	@ExcelAttribute(name = "公积金停缴日期", isDate = true)
 	@Schema(description = "公积金停缴日期" )
 	@ExcelProperty("公积金停缴日期" )
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Date fundReduceDate;
 
 	/**

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

@@ -823,6 +823,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				socialFund.setPersonalBigailmentCardinal(null);
 				socialFund.setPersonalBigailmentPer(null);
 				socialFund.setPersonalBigailmentMoney(null);
+
+				socialFund.setSocialStartDate(social.getWorkInjuryStart());
 			}
 			if (Common.isNotNull(socialFund.getId())){
 				socialFundMapper.updateById(socialFund);
@@ -2334,9 +2336,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		// 执行数据插入操作 组装
 		for (int i = 0; i < excelVOList.size(); i++) {
 			socialFund = null;
-			setInfoVo= null;
 			empVo= null;
-			dispatch= null;
 			excel = excelVOList.get(i);
 			setInfoVo = getSetInfoVo(projectVoMap,excel.getDepartNo());
 			if (Common.isNotNull(socialFundMap)){
@@ -2373,7 +2373,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		}
 	}
 
-	private TDispatchInfo getDispatchInfo(DispatchEmpVo empVo, TDispatchReduceVo excel, TSocialFundInfo socialFund, ProjectSetInfoVo setInfoVo, YifuUser user) {
+	private TDispatchInfo getDispatchInfo(DispatchEmpVo empVo,
+										  TDispatchReduceVo excel,
+										  TSocialFundInfo socialFund,
+										  ProjectSetInfoVo setInfoVo,
+										  YifuUser user) {
 		TDispatchInfo dispatch;
 		dispatch = new TDispatchInfo();
 		if (Common.isNotNull(user)){
@@ -2403,7 +2407,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		if (Common.isNotNull(excel.getSocialReduceDate())){
 			dispatch.setSocialHandleStatus(CommonConstants.ZERO_STRING);
 			dispatch.setSocialId(socialFund.getSocialId());
-			dispatch.setSocialReduceDate(excel.getSocialReduceDate());
 			dispatch.setSocialProvince(socialFund.getSocialProvince());
 			dispatch.setSocialCity(socialFund.getSocialCity());
 			dispatch.setSocialTown(socialFund.getSocialTown());
@@ -2440,7 +2443,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			}
 			dispatch.setFundHandleStatus(CommonConstants.ZERO_STRING);
 			dispatch.setFundId(socialFund.getFundId());
-			dispatch.setFundReduceDate(excel.getSocialReduceDate());
 			dispatch.setFundProvince(socialFund.getFundProvince());
 			dispatch.setFundCity(socialFund.getFundCity());
 			dispatch.setFundTown(socialFund.getFundTown());
@@ -2697,6 +2699,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									// 作废更新：社保状态、同步预估数据  8 审核不通过直接作废
 									sf.setSocialReduceStatus(CommonConstants.ONE_STRING_NEGATE);
 									sf.setSocialStatus(CommonConstants.THREE_STRING);
+									sf.setSocialReduceDate(null);
 								}
 							}
 							socialMapper.updateById(socialInfo);
@@ -2745,6 +2748,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									// 作废更新：公积金状态、同步档案的公积金状态
 									sf.setFundReduceStatus(CommonConstants.ONE_STRING_NEGATE);
 									sf.setFundStatus(CommonConstants.THREE_STRING);
+									sf.setFundReduceDate(null);
 								}
 							}
 							fundMapper.updateById(providentFund);
@@ -3097,6 +3101,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									socialInfo.setReduceCan(CommonConstants.dingleDigitStrArray[0]);//改成可派减状态
 									sf.setSocialReduceStatus(CommonConstants.THREE_STRING);
 									sf.setSocialStatus(CommonConstants.NINE_STRING);
+									sf.setSocialReduceDate(null);
 								}
 								socialInfo.setHandleTime(now);
 								socialInfo.setHandleUser(user.getId());
@@ -3145,6 +3150,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									providentFund.setReduceCan(CommonConstants.dingleDigitStrArray[0]);//改成可派减状态
 									sf.setFundReduceStatus(CommonConstants.THREE_STRING);
 									sf.setFundStatus(CommonConstants.EIGHT_STRING);
+									sf.setFundReduceDate(null);
 								}
 								providentFund.setHandleTime(now);
 								providentFund.setHandleUser(user.getId());
@@ -3226,7 +3232,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						//1.派增办理失败 刷新预估数据
 						if (CommonConstants.ZERO_STRING.equals(dis.getType())) {
 							// 全部办理失败 社保和公积金派增办理失败 减少预估
-							if (CommonConstants.ONE_INT == flag && CommonConstants.FIVE_STRING.equals(sf.getSocialStatus())){
+							if (CommonConstants.ONE_INT == flag
+									&& (CommonConstants.FIVE_STRING.equals(sf.getSocialStatus())
+									|| CommonConstants.FOUR_STRING.equals(sf.getFundStatus()))){
 								// 派增办理，全部失败 同步预估库数据
 								forecastLibraryService.updateForecastLibaryByDispatchReduce(sf, forecastFlag);
 							}
@@ -3420,7 +3428,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		updateSocialByHandle(flag, socialInfo, dis, sf);
 		// 批量办理，或者办理选择对应的类型，修改对应的办理状态
 		this.setSocialSixStatus(handleStatus, socialType, socialInfo,sf);
-
+		if (CommonConstants.FOUR_STRING.equals(socialInfo.getHandleStatus())){
+			dis.setSocialHandleStatus(CommonConstants.THREE_STRING);
+			dis.setStatus(CommonConstants.TWO_STRING);
+		}
 		// HandleStatus办理状态 0 未办理 1 全部办理成功(原-已办理) 2 全部办理失败（原-办理失败） 3已派减 4办理中 5部分办理失败
 		// 派减，审核不通过，社保状态不变更
 		// 1.派减处理
@@ -3638,6 +3649,31 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			socialInfo.setBigailmentHandle(handleStatus);
 			sf.setBigailmentHandle(handleStatus);
 		}
+		// 单个办理的时候处理派单和社保的办理状态  有办理成功也有办理失败的 为办理中
+		if ((CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
+				|| CommonConstants.TWO_STRING.equals(sf.getPensionHandle())
+				|| CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
+				|| CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
+				|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
+				|| CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
+				|| (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
+				&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness()))
+				|| CommonConstants.TWO_STRING.equals(sf.getMedicalHandle())
+				|| CommonConstants.TWO_STRING.equals(sf.getWorkInjuryHandle())
+				|| CommonConstants.TWO_STRING.equals(sf.getBirthHandle())
+				|| CommonConstants.TWO_STRING.equals(sf.getUnemployHandle())
+				|| (CommonConstants.TWO_STRING.equals(sf.getBigailmentHandle())
+				&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())))
+				&& (CommonConstants.ZERO_STRING.equals(sf.getPensionHandle())
+				|| CommonConstants.ZERO_STRING.equals(sf.getMedicalHandle())
+				|| CommonConstants.ZERO_STRING.equals(sf.getWorkInjuryHandle())
+				|| CommonConstants.ZERO_STRING.equals(sf.getBirthHandle())
+				|| CommonConstants.ZERO_STRING.equals(sf.getUnemployHandle())
+				|| (CommonConstants.ZERO_STRING.equals(sf.getBigailmentHandle())
+				&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())))
+		){
+			socialInfo.setHandleStatus(CommonConstants.FOUR_STRING);
+		}
 	}
 	/**
 	 * @Author fxj