调基、导出相关

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialFundInfoSearchVo.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.TSocialFundInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 社保公积金查询表
@@ -32,12 +34,13 @@ import java.util.List;
 @Data
 public class TSocialFundInfoSearchVo extends TSocialFundInfo {
 
-	/**
-	 * 多选导出或删除等操作
-	 */
-	@Schema(description = "选中ID,多个逗号分割")
-	private String ids;
 
+
+	@TableField(exist = false)
+	@Schema(description = "导出的表头的Set")
+	private Set<String> exportFields;
+
+	@Schema(description = "选中的idList")
 	private List<String> idList;
 	/**
 	 * 创建时间区间 [开始时间，结束时间]

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

@@ -98,8 +98,8 @@ public class TSocialFundInfoController {
     @SysLog("批量调基")
     @PostMapping("/importListAdd")
     @PreAuthorize("@pms.hasPermission('tsocialfundinfo-batch-import')")
-    public R<List<ErrorMessage>> importListAdd(@RequestBody MultipartFile file){
-        return tSocialFundInfoService.importDiy(file.getInputStream());
+    public R<List<ErrorMessage>> importListAdd(@RequestBody MultipartFile file, @RequestParam String doMonth){
+        return tSocialFundInfoService.importDiy(file.getInputStream(), doMonth);
     }
 
     /**

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

@@ -21,12 +21,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
-import com.yifu.cloud.plus.v1.yifu.social.entity.TAgentConfig;
+import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TForecastLibrary;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -66,7 +65,7 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
 	 * @Date: 2022/7/25 17:33
 	 * @return: void
 	 **/
-	R<String> updateToneForecastLibary(TSocialFundInfo socialFundInfo);
+	R<String> updateToneForecastLibary(TSocialFundInfo socialFundInfo, String doMonth);
 
 	/**
 	 * @param socialFundInfo
@@ -83,7 +82,7 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
 	 * @Date: 2022/7/26 19:09
 	 * @return: void
 	 **/
-	void updateForecastLibaryBySysBase();
+	void updateForecastLibaryBySysBase(SysBaseSetInfo newSysBaseSetInfo);
 
 	/**
 	 * @Description: 每月定时预估库 TODO-加定时器

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

@@ -45,13 +45,13 @@ public interface TSocialFundInfoService extends IService<TSocialFundInfo> {
     IPage<TSocialFundInfo> getTSocialFundInfoPage(Page<TSocialFundInfo> page, TSocialFundInfoSearchVo tSocialFundInfo);
 
 	/**
-	 * @param inputStream
+	 * @param doMonth 执行月份
 	 * @Description: 批量调基
 	 * @Author: hgw
 	 * @Date: 2022/7/22 11:32
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage>>
 	 **/
-	R<List<ErrorMessage>> importDiy(InputStream inputStream);
+	R<List<ErrorMessage>> importDiy(InputStream inputStream, String doMonth);
 
 	/**
 	 * @Description: 导出

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

@@ -31,6 +31,7 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.SysBaseSetInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.social.service.SysBaseSetInfoService;
 import com.yifu.cloud.plus.v1.yifu.social.service.SysPayProportionService;
+import com.yifu.cloud.plus.v1.yifu.social.service.TForecastLibraryService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TSocialLogService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -55,6 +56,8 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 
 	private final SysPayProportionService sysPayProportionService;
 
+	private final TForecastLibraryService tForecastLibraryService;
+
 	/**
 	 * 基数设置表简单分页查询
 	 *
@@ -251,7 +254,10 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 		} else {
 			sysBaseSetInfo.setStatus(CommonConstants.ZERO_INT);
 			sysBaseSetInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
+			sysBaseSetInfo.setIsNew(CommonConstants.ONE_STRING);
 			baseMapper.insert(sysBaseSetInfo);
+			// TODO-测试用（同步社保公积金查询、预估库），后面可删除
+			tForecastLibraryService.updateForecastLibaryBySysBase(sysBaseSetInfo);
 		}
 		List<SysPayProportion> payProportionList = sysBaseSetInfo.getFundProList();
 		if (Common.isNotNull(payProportionList)) {

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

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeContractExportVO;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
@@ -105,7 +106,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
 			response.setCharacterEncoding("utf-8");
 			response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
 			// 这里 需要指定写用哪个class去写，然后写到第一个sheet，然后文件流会自动关闭
-			ExcelWriter excelWriter = EasyExcel.write(out, TSocialFundInfo.class).build();
+			ExcelWriter excelWriter = EasyExcel.write(out, TSocialFundInfo.class).includeColumnFiledNames(searchVo.getExportFields()).build();
 			int index = 0;
 			if (count > CommonConstants.ZERO_INT) {
 				for (int i = 0; i <= count; i += CommonConstants.EXCEL_EXPORT_LIMIT) {
@@ -148,9 +149,8 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
 	@Override
 	public List<TSocialFundInfo> noPageDiy(TSocialFundInfoSearchVo searchVo) {
 		LambdaQueryWrapper<TSocialFundInfo> wrapper = buildQueryWrapper(searchVo);
-		List<String> idList = Common.getList(searchVo.getIds());
-		if (Common.isNotNull(idList)) {
-			wrapper.in(TSocialFundInfo::getId, idList);
+		if (Common.isNotNull(searchVo.getIdList())) {
+			wrapper.in(TSocialFundInfo::getId, searchVo.getIdList());
 		}
 		if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0) {
 			wrapper.last(" limit " + searchVo.getLimitStart() + "," + searchVo.getLimitEnd());
@@ -160,18 +160,16 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
 	}
 
 	private List<TSocialFundInfoExportVo> export(TSocialFundInfoSearchVo searchVo) {
-		List<String> idList = Common.getList(searchVo.getIds());
-		if (Common.isNotNull(idList)) {
-			searchVo.setIdList(idList);
+		if (Common.isNotNull(searchVo.getIdList())) {
+			searchVo.setIdList(searchVo.getIdList());
 		}
 		return baseMapper.exportList(searchVo);
 	}
 
 	private Long noPageCountDiy(TSocialFundInfoSearchVo searchVo) {
 		LambdaQueryWrapper<TSocialFundInfo> wrapper = buildQueryWrapper(searchVo);
-		List<String> idList = Common.getList(searchVo.getIds());
-		if (Common.isNotNull(idList)) {
-			wrapper.in(TSocialFundInfo::getId, idList);
+		if (Common.isNotNull(searchVo.getIdList())) {
+			wrapper.in(TSocialFundInfo::getId, searchVo.getIdList());
 		}
 		return baseMapper.selectCount(wrapper);
 	}
@@ -190,14 +188,14 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
 	}
 
 	/**
-	 * @param inputStream
+	 * @param doMonth 执行月份
 	 * @Description: 批量调基
 	 * @Author: hgw
 	 * @Date: 2022/7/22 11:32
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage>>
 	 **/
 	@Override
-	public R<List<ErrorMessage>> importDiy(InputStream inputStream) {
+	public R<List<ErrorMessage>> importDiy(InputStream inputStream, String doMonth) {
 		List<ErrorMessage> errorMessageList = new ArrayList<>();
 		ExcelUtil<TSocialFundHistoryVo> util1 = new ExcelUtil<>(TSocialFundHistoryVo.class);
 		// 写法2：
@@ -242,7 +240,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
 				 */
 				private void saveData() {
 					log.info("{}条数据，开始存储数据库！", cachedDataList.size());
-					importTSocialFundInfo(cachedDataList, errorMessageList);
+					importTSocialFundInfo(cachedDataList, errorMessageList, doMonth);
 					log.info("存储数据库成功！");
 				}
 			}).sheet().doRead();
@@ -253,7 +251,8 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
 		return R.ok(errorMessageList);
 	}
 
-	private void importTSocialFundInfo(List<TSocialFundHistoryVo> excelVOList, List<ErrorMessage> errorMessageList) {
+	private void importTSocialFundInfo(List<TSocialFundHistoryVo> excelVOList
+			, List<ErrorMessage> errorMessageList, String doMonth) {
 		// 执行数据插入操作 组装
 		TSocialFundHistoryVo excel;
 		List<String> idCardList = new ArrayList<>();
@@ -373,7 +372,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
 					// 3：新增变更日志
 					tSocialLogService.saveModificationRecord(CommonConstants.ONE_INT, oldSocialFundInfo.getId(), oldSocialFundInfo, socialFundInfo);
 					// 4：同步预估库
-					tForecastLibraryService.updateToneForecastLibary(socialFundInfo);
+					tForecastLibraryService.updateToneForecastLibary(socialFundInfo, doMonth);
 					// 返回信息处理
 					initResSuccessMessage(errorMessageList, excel.getRowIndex(), isSocial, isFund);
 				} else {