Merge remote-tracking branch 'origin/develop' into develop

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

@@ -16,12 +16,14 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 缴费库
@@ -32,28 +34,31 @@ import java.util.List;
 @Data
 public class TPaymentInfoSearchVo extends TPaymentInfo {
 
-/**
- * 多选导出或删除等操作
- */
-@Schema(description = "选中ID,id数组")
-private List<String> idList;
+	@Schema(description = "导出的表头的Set")
+	private Set<String> exportFields;
 
-/**
- * 创建时间区间 [开始时间，结束时间]
- */
-@Schema(description = "创建时间区间")
-private LocalDateTime[] createTimes;
-/**
- * @Author fxj
- * 查询数据起
-**/
-@Schema(description = "查询limit  开始")
-private int limitStart;
-/**
- * @Author fxj
- * 查询数据止
- **/
-@Schema(description = "查询limit  数据条数")
-private int limitEnd;
+	/**
+	 * 多选导出或删除等操作
+	 */
+	@Schema(description = "选中ID,id数组")
+	private List<String> idList;
+
+	/**
+	 * 创建时间区间 [开始时间，结束时间]
+	 */
+	@Schema(description = "创建时间区间")
+	private LocalDateTime[] createTimes;
+	/**
+	 * @Author fxj
+	 * 查询数据起
+	 **/
+	@Schema(description = "查询limit  开始")
+	private int limitStart;
+	/**
+	 * @Author fxj
+	 * 查询数据止
+	 **/
+	@Schema(description = "查询limit  数据条数")
+	private int limitEnd;
 
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/PreDispatchConstants.java

@@ -6,8 +6,6 @@ public class PreDispatchConstants {
 
     public static final String NO_PENSION_AREA_REDUCE = "获取缴纳地数据失败，请检查养老截止城市或公积金截止城市名称是否合规！";
 
-    public static final String NO_PENSION_AREA=  "请检查派单缴纳地名称是否合规！";
-
     public static final String SOCIAL_START_DATE_ERROR = "社保起缴月份在可补缴月份之前，请确认后操作！";
 
     public static final String NO_SOCIAL_BASE_SET_INFO = "未找到有效的社保基数配置信息（户+缴纳地+起缴时间）！";
@@ -27,7 +25,6 @@ public class PreDispatchConstants {
             "工伤城市","工伤截止时间","生育城市","生育截止时间","失业城市","失业截止时间","公积金城市","公积金截止时间",
             "派单分公司","派单客服","小合同名称","合同类型"};
 
-    public static final String HAED_ERROR = "请使用标准模板！";
     public static final String POSITION = "服务";
     public static final String CONTRACT_NAME = "代理社保";
     public static final String DISPATCH_TYPE_ERROR = "派单类型有误，0-派增 1-派减！";
@@ -40,16 +37,10 @@ public class PreDispatchConstants {
     public static final String PRESTATUS_ERROR = "‘是否派单’为是且‘预派单状态’为正常未派单才可派单！";
     public static final String CITY = "city";
     public static final String TOWN = "town";
-    public static final String SOCIAL_CITY = "social_city";
-    public static final String SOCIAL_TOWN = "social_town";
-    public static final String FUND_CITY = "fund_city";
-    public static final String FUND_TOWN = "fund_town";
     public static final String YES_CH = "是";
     public static final String NO_CH = "否";
     public static final String DATA_CHECK = "数据校验信息：";
-    public static final String DATA_HANDLE_RESULT = "数据导入结果：";
     public static final String DATA_IMPORT_ANALYSIS_ERROR = "数据导入解析失败！";
-    public static final String IMPORT_PREDISPATCH = "导出预派单";
     public static final String NO_SOCIAL_FUND_ADDRESS_ADD = "派增：养老城市和公积金城市不可同时为空，请确认表中有‘养老城市’和‘公积金城市’数据列及数据！";
     public static final String NO_SOCIAL_FUND_ADDRESS_REDUCE = "派减：养老城市和公积金城市不可同时为空，请确认表中有‘养老城市’和‘公积金城市’数据列及数据！";
     public static final String TEL_NOT_EMPTY = "联系电话1不可为空！";

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

@@ -94,7 +94,6 @@ public class TPreDispatchInfoController {
      */
     @Operation(summary = "通过id查询", description = "通过id查询：hasPermission('social_tpredispatchinfo_get')")
     @GetMapping("/{id}" )
-    @PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_get')" )
     public R<TPreDispatchInfo> getById(@PathVariable("id" ) String id) {
         return R.ok(tPreDispatchInfoService.getById(id));
     }

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

@@ -26,7 +26,6 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import io.seata.spring.annotation.GlobalTransactional;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
@@ -58,6 +57,9 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
 
 	R<List<ErrorMessage>> importReduceDiy(InputStream inputStream);
 
+	@GlobalTransactional
+	void batchReduceDispatch(List<TDispatchReduceVo> excelVOList, List<ErrorMessage> errorMessageList);
+
 	R<Boolean> removeByIdDiy(String id);
 
 	DispatchDetailVo getSocialAndFundInfoById(String id);

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

@@ -1477,7 +1477,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		return R.ok(errorMessageList);
 	}
 
-	private void batchReduceDispatch(List<TDispatchReduceVo> excelVOList, List<ErrorMessage> errorMessageList) {
+	@GlobalTransactional
+	@Override
+	public void batchReduceDispatch(List<TDispatchReduceVo> excelVOList, List<ErrorMessage> errorMessageList) {
 		if (!Common.isNotNull(excelVOList)){
 			return;
 		}

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

@@ -138,7 +138,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			response.setCharacterEncoding("utf-8");
 			response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
 			// 这里 需要指定写用哪个class去写，然后写到第一个sheet，然后文件流会自动关闭
-			ExcelWriter excelWriter = EasyExcel.write(out, TPaymentInfo.class).build();
+			ExcelWriter excelWriter = EasyExcel.write(out, TPaymentInfo.class).includeColumnFiledNames(searchVo.getExportFields()).build();;
 			int index = 0;
 			if (count > CommonConstants.ZERO_INT) {
 				for (int i = 0; i <= count; ) {

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/ServiceUtil.java

@@ -115,4 +115,16 @@ public class ServiceUtil {
 		}
 		return str;
 	}
+
+	public static String replaceSeparator(String string,String str1, String... strn){
+		if (null != str1) {
+			string = string.replace(str1,CommonConstants.EMPTY_STRING);
+		}
+		if (null != strn) {
+			for (String str : strn) {
+				string = string.replace(str,CommonConstants.EMPTY_STRING);
+			}
+		}
+		return string;
+	}
 }