Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3

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

@@ -97,8 +97,8 @@
 	<result property="sumPrivatePension" column="SUM_PRIVATE_PENSION"/>
 	<result property="incomeSettleFlag" column="INCOME_SETTLE_FLAG"/>
 	<result property="incomeCollectFlag" column="INCOME_COLLECT_FLAG"/>
-	<result property="paySettleFlag" column="PAY_COLLECT_FLAG"/>
-	<result property="payCollectFlag" column="PAY_SETTLE_FLAG"/>
+	<result property="paySettleFlag" column="PAY_SETTLE_FLAG"/>
+	<result property="payCollectFlag" column="PAY_COLLECT_FLAG"/>
 	<result property="isDiff" column="IS_DIFF"/>
   </resultMap>
 
@@ -280,7 +280,8 @@
 				a.SUM_CONTINUING_EDUCATION_MONEY,
 				a.SUM_BABY_MONEY,
 				a.SUM_PRIVATE_PENSION,
-				a.IS_DIFF
+				a.IS_DIFF,
+				a.PAY_SETTLE_FLAG
 	</sql>
 
     <sql id="tSalaryAccount_where">

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

@@ -20,6 +20,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
@@ -706,4 +707,12 @@ public class TDispatchInfo extends BaseEntity {
 	@ExcelProperty("订单ID" )
 	private String orderId;
 
+	/**
+	 * 原派单ID
+	 * 2023-4-11 14:37:17
+	 * hgw增加
+	 */
+	@TableField(exist = false)
+	private String pid;
+
 }

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

+package com.yifu.cloud.plus.v1.yifu.social.vo;
+
+import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author huyc
+ * @Date 2023/4/10
+ * @Description
+ * @Version 1.0
+ */
+@Data
+public class DispatchOneDetailVo implements Serializable {
+
+	/**
+	 * 派单
+	 **/
+	private TDispatchInfo dispatch;
+	/**
+	 * 社保公积金查询
+	 **/
+	private TSocialFundInfo social;
+}

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

@@ -119,4 +119,12 @@ public class TDispatchReduceVo extends RowIndex implements Serializable {
 	@ExcelProperty("是否是失败项重新派单" )
 	private String isAgainFlag;
 
+	/**
+	 * 重新派单的ID
+	 */
+	@ExcelAttribute(name = "重新派单的ID")
+	@Schema(description = "重新派单的ID" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("重新派单的ID" )
+	private String isAgainId;
 }

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.yifu.social.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 社保公积金查询表
+ *
+ * @author huyc
+ * @date 2023-04-10 11:38:05
+ */
+@Data
+public class TSocialFundInfoOneVo {
+
+	/**
+	 * id
+	 */
+	@Schema(description = "id" )
+	private String id;
+
+	/**
+	 * 员工身份证
+	 */
+	@Schema(description = "身份证号" )
+	private String empIdcard;
+
+}

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

@@ -31,7 +31,9 @@ import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
 import com.yifu.cloud.plus.v1.yifu.social.service.TSocialFundInfoService;
+import com.yifu.cloud.plus.v1.yifu.social.vo.DispatchOneDetailVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoDetailVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoOneVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoSearchVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -86,6 +88,17 @@ public class TSocialFundInfoController {
         return R.ok(tSocialFundInfoService.noPageDiy(tSocialFundInfo));
     }
 
+	/**
+	 * 重新派单明细查询
+	 * @param tSocialFundInfo 社保公积金查询表
+	 * @return
+	 */
+	@Operation(summary = "重新派单明细查询", description = "重新派单明细查询")
+	@PostMapping("/dispatchAgainInfo" )
+	public R<DispatchOneDetailVo> getTSocialFundInfoOne(@RequestBody TSocialFundInfoOneVo tSocialFundInfo) {
+		return R.ok(tSocialFundInfoService.getTSocialFundInfoOne(tSocialFundInfo));
+	}
+
     /**
      * 通过id查询社保公积金查询表
      * @param id id

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

@@ -24,7 +24,9 @@ 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.salary.vo.UpdateSocialFoundVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.DispatchOneDetailVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoDetailVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoOneVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoSearchVo;
 
 import javax.servlet.http.HttpServletResponse;
@@ -64,6 +66,8 @@ public interface TSocialFundInfoService extends IService<TSocialFundInfo> {
 
     List<TSocialFundInfo> noPageDiy(TSocialFundInfoSearchVo searchVo);
 
+	DispatchOneDetailVo getTSocialFundInfoOne(TSocialFundInfoOneVo searchVo);
+
 	/**
 	 * @param id
 	 * @Description: 社保公积金查询的详情

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

@@ -829,6 +829,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			}
 			dispatch.setCreateTime(LocalDateTime.now());
 			baseMapper.insert(dispatch);
+			if (Common.isNotNull(dispatch.getPid())) {
+				TDispatchInfo old = new TDispatchInfo();
+				old.setId(dispatch.getPid());
+				old.setAgainDispatchCode(dispatch.getApplyNo());
+				baseMapper.updateById(old);
+			}
 		}
 	}
 
@@ -1291,6 +1297,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		}
 		// 生成申请编码
 		dispatch.setApplyNo(getApplyCode());
+		dispatch.setPid(excel.getDispatchId());
 		dispatchMap.put(excel.getEmpIdcard(),dispatch);
 		return false;
 	}
@@ -2741,7 +2748,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				dispatch.setOrderId(orderId);
 				dispatch.setApplyNo(getApplyCode());
 				if (CommonConstants.ZERO_STRING.equals(excel.getIsAgainFlag())) {
-					dispatch.setAgainDispatchCode(dispatch.getApplyNo());
+					TDispatchInfo dispatchInfo = baseMapper.selectById(excel.getIsAgainId());
+					dispatchInfo.setAgainDispatchCode(dispatch.getApplyNo());
+					baseMapper.updateById(dispatchInfo);
 				}
 				dispatch.setStatus(CommonConstants.ONE_STRING);
 				baseMapper.insert(dispatch);

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

@@ -42,10 +42,7 @@ import com.yifu.cloud.plus.v1.yifu.social.constants.SocialConstants;
 import com.yifu.cloud.plus.v1.yifu.social.entity.*;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialFundInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.social.service.*;
-import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundHistoryVo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoDetailVo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoExportVo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoSearchVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
@@ -165,6 +162,22 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
 		return baseMapper.selectList(wrapper);
 	}
 
+	@Override
+	public DispatchOneDetailVo getTSocialFundInfoOne(TSocialFundInfoOneVo searchVo) {
+		if (Common.isNotNull(searchVo.getEmpIdcard()) && Common.isNotNull(searchVo.getId())) {
+			LambdaQueryWrapper<TSocialFundInfo> wrapper = Wrappers.lambdaQuery();
+			wrapper.eq(TSocialFundInfo::getEmpIdcard, searchVo.getEmpIdcard());
+			wrapper.last(CommonConstants.LAST_ONE_SQL);
+			TSocialFundInfo socialFundInfo = baseMapper.selectOne(wrapper);
+			TDispatchInfo dispatchInfo = tDispatchInfoService.getById(searchVo.getId());
+			DispatchOneDetailVo detailVo = new DispatchOneDetailVo();
+			detailVo.setSocial(socialFundInfo);
+			detailVo.setDispatch(dispatchInfo);
+			return detailVo;
+		}
+		return null;
+	}
+
 	private List<TSocialFundInfoExportVo> export(TSocialFundInfoSearchVo searchVo) {
 		if (Common.isNotNull(searchVo.getIdList())) {
 			searchVo.setIdList(searchVo.getIdList());