档案优化

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

@@ -22,7 +22,6 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import lombok.Data;
 
 import javax.validation.constraints.Past;
@@ -38,7 +37,7 @@ import java.util.List;
  */
 @Data
 @ColumnWidth(15)
-public class EmployeeProjectExportVO extends BaseEntity {
+public class EmployeeProjectExportVO {
 
 	private static final long serialVersionUID = 1L;
 

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

@@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportParamVO;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.UpProjectSocialFundVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
@@ -262,7 +262,7 @@ public class TEmployeeProjectController {
 	 **/
 	@PostMapping("/export")
 	public void export(HttpServletResponse response, @RequestParam(name = "idstr", required = false)String idstr,
-					   @RequestBody List<String> exportFields, EmployeeProjectExportVO projectDTO) {
+					   @RequestBody List<String> exportFields, EmployeeProjectExportParamVO projectDTO) {
 		YifuUser user = SecurityUtils.getUser();
 		if (user != null && Common.isNotNull(user.getId())) {
 			menuUtil.setAuthSql(user, projectDTO);

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeProjectMapper.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.EmployeeProjectExportParamVO;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -57,5 +58,5 @@ public interface TEmployeeProjectMapper extends BaseMapper<TEmployeeProject> {
 	 * @param tEmployeeProject
 	 * @return
 	 */
-	List<EmployeeProjectExportVO> getTEmployeeProjectExportPage(@Param("tEmployeeProject")EmployeeProjectExportVO tEmployeeProject);
+	List<EmployeeProjectExportVO> getTEmployeeProjectExportPage(@Param("tEmployeeProject") EmployeeProjectExportParamVO tEmployeeProject);
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java

@@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 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.EmployeeProjectExportVO;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportParamVO;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.UpProjectSocialFundVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
@@ -96,7 +96,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
 	R deleteEmpPro(TEmployeeProject tEmployeeProject);
 
 	/**
-	 * @param list
+	 * @param inputStream
 	 * @Description: 批量减项
 	 * @Author: huyc
 	 * @Date: 2022/6/21 10:30
@@ -163,7 +163,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
 	 * @Date: 2022/6/23 10:30
 	 * @return: R
 	 **/
-	void listExportProject(HttpServletResponse response, EmployeeProjectExportVO projectDTO,
+	void listExportProject(HttpServletResponse response, EmployeeProjectExportParamVO projectDTO,
 						   String idstr, List<String> exportFields);
 	/**
 	 * @param employeeInfo

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java

@@ -1174,7 +1174,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 	 * @Date 10:55 2022/6/23
 	 **/
 	@Override
-	public void listExportProject(HttpServletResponse response, EmployeeProjectExportVO projectDTO, String idstr, List<String> exportFields) {
+	public void listExportProject(HttpServletResponse response, EmployeeProjectExportParamVO projectDTO, String idstr, List<String> exportFields) {
 
 		String fileName = "项目档案批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
 		// 根据用户传入确定要导出的字段
@@ -1256,7 +1256,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 	/**
 	 * 获取导出的项目档案列表
 	 */
-	private List<EmployeeProjectExportVO> gettEmpProInfoExportVos(String idstr, EmployeeProjectExportVO projectDTO) {
+	private List<EmployeeProjectExportVO> gettEmpProInfoExportVos(String idstr, EmployeeProjectExportParamVO projectDTO) {
 		List<EmployeeProjectExportVO> list;
 		if (!Common.isEmpty(idstr)) {
 			projectDTO.setIdList(Common.initStrToList(idstr, CommonConstants.COMMA_STRING));