实缴导入校验项目

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

@@ -356,15 +356,6 @@ public class TPaymentInfo extends BaseEntity {
 	@ExcelProperty("就职班组")
     private String inauguralTeam;
 
-    /**
-     * 排序字段
-     */
-    @ExcelAttribute(name = "排序字段" )
-    @Schema(description ="排序字段")
-    @HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("排序字段")
-    private String sortTime;
-
 	/**
 	 * 推送状态
 	 */

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

@@ -337,15 +337,6 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value = "就职班组")
 	private String inauguralTeam;
-	/**
-	 * 排序字段
-	 */
-	@Length(max = 32, message = "排序字段 不能超过32 个字符")
-	@ExcelAttribute(name = "排序字段", maxLength = 32)
-	@Schema(description = "排序字段")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty(value = "排序字段")
-	private String sortTime;
 	/**
 	 * 单位补缴利息
 	 */

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

@@ -911,7 +911,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			TSocialFundInfo socialInfo;
 			TSocialInfo tSocialInfo = null;
 			String temp;
-			int res;
 			List<TSocialInfo> socialist;
 			TSettleDomain domain;
 
@@ -1370,7 +1369,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				paymentInfo.setCreateBy(user.getId());
 				paymentInfo.setCreateName(user.getNickname());
 				paymentInfo.setSocialId(UUID.randomUUID().toString());
-				res = insertAndSTimestamp(paymentInfo);
+				int res = baseMapper.insert(paymentInfo);
 				if (res < 0) {
 					errorMessageList.add(new ErrorDetailVO(infoVo.getRowIndex(), CommonConstants.ZERO_INT, infoVo.getEmpIdcard(), paymentInfo.getSocialHousehold(), paymentInfo.getProvidentHousehold(), infoVo.getEmpName(), CommonConstants.SAVE_FAILED));
 				} else {
@@ -1381,22 +1380,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		return errorMessageList;
 	}
 
-	/**
-	 * 拼接排序字段并插入
-	 *
-	 * @param entity
-	 * @return
-	 * @Author huyc
-	 * @Date 2022-07-25
-	 **/
-	private int insertAndSTimestamp(TPaymentInfo entity) {
-		if (Common.isNotNull(entity.getSocialCreateMonth()) && Common.isNotNull(entity.getSocialPayMonth())) {
-			entity.setSortTime(entity.getSocialCreateMonth().concat(entity.getSocialPayMonth()).concat(
-					String.valueOf(System.currentTimeMillis())));
-		}
-		return baseMapper.insert(entity);
-	}
-
 	@Override
 	public R<List<ErrorDetailVO>> importSocialHeFeiDiy(InputStream inputStream, String random, String type) {
 		YifuUser user = SecurityUtils.getUser();

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

@@ -58,7 +58,6 @@
 		<result property="socialSecurityPersonalSum" column="SOCIAL_SECURITY_PERSONAL_SUM"/>
 		<result property="providentSum" column="PROVIDENT_SUM"/>
 		<result property="inauguralTeam" column="INAUGURAL_TEAM"/>
-		<result property="sortTime" column="SORT_TIME"/>
 		<result property="companyAccrual" column="COMPANY_ACCRUAL"/>
 		<result property="personalAccrual" column="PERSONAL_ACCRUAL"/>
 		<result property="unitPensionSet" column="UNIT_PENSION_SET"/>
@@ -288,7 +287,6 @@
                 a.SOCIAL_SECURITY_PERSONAL_SUM,
                 a.PROVIDENT_SUM,
                 a.INAUGURAL_TEAM,
-                a.SORT_TIME,
                 a.SALARY_SOCIAL_FLAG,
         		a.SALARY_FUND_FLAG,
                 a.COMPANY_ACCRUAL,
@@ -432,9 +430,6 @@
 			<if test="tPaymentInfo.inauguralTeam != null and tPaymentInfo.inauguralTeam.trim() != ''">
 				AND a.INAUGURAL_TEAM = #{tPaymentInfo.inauguralTeam}
 			</if>
-			<if test="tPaymentInfo.sortTime != null and tPaymentInfo.sortTime.trim() != ''">
-				AND a.SORT_TIME = #{tPaymentInfo.sortTime}
-			</if>
 			<if test="tPaymentInfo.companyAccrual != null">
 				AND a.COMPANY_ACCRUAL = #{tPaymentInfo.companyAccrual}
 			</if>