QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update:社团管理导入结果添加翻译

Browse Source
This commit is contained in:
sunzheng
2024-09-18 17:30:41 +08:00
parent 029806d50f
commit 1114e00ac3
6 changed files with 65 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/club/controller/LawsClubJoinTeamController.java
+2 -2
View File
@@ -2,6 +2,7 @@ package com.jero.modules.laws.club.controller;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.modules.laws.club.service.ILawsClubJoinTeamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,7 +35,6 @@ public class LawsClubJoinTeamController {
@AutoLog(value = "社团管理-入团信息表-模板下载")
@ApiOperation(value="社团管理-入团信息表-模板下载", notes="社团管理-入团信息表-模板下载")
@GetMapping(value = "/exportTemplate")
// @RequiresPermissions("clubManagement:clubManagement:templateDownload")
public void exportTemplate(HttpServletRequest request, HttpServletResponse response) {
lawsClubJoinTeamService.exportTemplate(request,response);
}
@@ -45,7 +45,7 @@ public class LawsClubJoinTeamController {
@AutoLog(value = "社团管理-入团信息表-导入")
@ApiOperation(value="社团管理-入团信息表-导入", notes="社团管理-入团信息表-导入")
@PostMapping(value = "/importExcel")
// @RequiresPermissions("clubManagement:clubManagement:import")
@Translation
public Result<?> excelimport(HttpServletRequest request) {
return lawsClubJoinTeamService.importExcel(request);
}
laws-modules/src/main/java/com/jero/modules/laws/club/controller/LawsClubMeetingController.java
+2 -2
View File
@@ -2,6 +2,7 @@ package com.jero.modules.laws.club.controller;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.modules.laws.club.service.ILawsClubMeetingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -37,7 +38,6 @@ public class LawsClubMeetingController {
@AutoLog(value = "社团管理-参会信息表-模板下载")
@ApiOperation(value="社团管理-参会信息表-模板下载", notes="社团管理-参会信息表-模板下载")
@GetMapping(value = "/exportTemplate")
// @RequiresPermissions("clubManagement:clubManagement:templateDownload")
public void exportTemplate(HttpServletRequest request, HttpServletResponse response) {
lawsClubMeetingService.exportTemplate(request,response);
}
@@ -48,7 +48,7 @@ public class LawsClubMeetingController {
@AutoLog(value = "社团管理-参会信息表-导入")
@ApiOperation(value="社团管理-参会信息表-导入", notes="社团管理-参会信息表-导入")
@PostMapping(value = "/importExcel")
// @RequiresPermissions("clubManagement:clubManagement:import")
@Translation
public Result<?> excelimport(HttpServletRequest request) {
return lawsClubMeetingService.importExcel(request);
}
laws-modules/src/main/java/com/jero/modules/laws/club/controller/LawsClubResearchInformationController.java
+2 -2
View File
@@ -2,6 +2,7 @@ package com.jero.modules.laws.club.controller;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.modules.laws.club.service.ILawsClubResearchInformationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -37,7 +38,6 @@ public class LawsClubResearchInformationController {
@AutoLog(value = "社团管理-征集调研信息表-模板下载")
@ApiOperation(value="社团管理-征集调研信息表-模板下载", notes="社团管理-征集调研信息表-模板下载")
@GetMapping(value = "/exportTemplate")
// @RequiresPermissions("clubManagement:clubManagement:templateDownload")
public void exportTemplate(HttpServletRequest request, HttpServletResponse response) {
lawsClubResearchInformationService.exportTemplate(request,response);
}
@@ -48,7 +48,7 @@ public class LawsClubResearchInformationController {
@AutoLog(value = "社团管理-征集调研信息表-导入")
@ApiOperation(value="社团管理-征集调研信息表-导入", notes="社团管理-征集调研信息表-导入")
@PostMapping(value = "/importExcel")
// @RequiresPermissions("clubManagement:clubManagement:import")
@Translation
public Result<?> excelimport(HttpServletRequest request) {
return lawsClubResearchInformationService.importExcel(request);
}
laws-modules/src/main/java/com/jero/modules/laws/club/service/impl/LawsClubJoinTeamServiceImpl.java
+22 -4
View File
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.DictModel;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.laws.club.entity.LawsClubJoinTeam;
import com.jero.modules.laws.club.mapper.LawsClubJoinTeamMapper;
import com.jero.modules.laws.club.service.ILawsClubJoinTeamService;
@@ -19,6 +20,7 @@ import com.jero.modules.tag.entity.LawsTag;
import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.shiro.SecurityUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.beans.BeanUtils;
@@ -33,11 +35,10 @@ import java.io.IOException;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -87,6 +88,8 @@ public class LawsClubJoinTeamServiceImpl extends ServiceImpl<LawsClubJoinTeamMap
@Override
public Result<?> importExcel(HttpServletRequest request) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
System.out.println(loginUser);
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
List<LawsClubJoinTeam> lawsClubJoinTeamList = new ArrayList<>();
@@ -108,6 +111,7 @@ public class LawsClubJoinTeamServiceImpl extends ServiceImpl<LawsClubJoinTeamMap
for (LawsClubJoinTeamExcel lawsClubJoinTeamExcel : excelList) {
LawsClubJoinTeam lawsClubJoinTeam = new LawsClubJoinTeam();
BeanUtils.copyProperties(lawsClubJoinTeamExcel, lawsClubJoinTeam);
lawsClubJoinTeam.setJoinDate(convertStringToDate(lawsClubJoinTeamExcel.getJoinDate()));
lawsClubJoinTeamList.add(lawsClubJoinTeam);
}
}catch (Exception e) {
@@ -184,6 +188,20 @@ public class LawsClubJoinTeamServiceImpl extends ServiceImpl<LawsClubJoinTeamMap
return msg;
}
private Date convertStringToDate(String dateStr) {
if (StringUtils.isBlank(dateStr)) {
return null;
}
try {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
Date date = simpleDateFormat.parse(dateStr);
return date;
}catch (Exception e) {
log.error("日期转换异常");
}
return null;
}
// 错误消息格式化
private String getErrorMsg(int rowIndex, String errorMsg) {
return "第" + (rowIndex + 4) + "行" + errorMsg;
laws-modules/src/main/java/com/jero/modules/laws/club/service/impl/LawsClubMeetingServiceImpl.java
+18 -4
View File
@@ -36,11 +36,9 @@ import java.io.IOException;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -121,6 +119,8 @@ public class LawsClubMeetingServiceImpl extends ServiceImpl<LawsClubMeetingMappe
for (LawsClubMeetingExcel lawsClubMeetingExcel : meetingExcels) {
LawsClubMeeting lawsClubMeeting = new LawsClubMeeting();
BeanUtils.copyProperties(lawsClubMeetingExcel, lawsClubMeeting);
lawsClubMeeting.setMeetingDate(convertStringToDate(lawsClubMeetingExcel.getMeetingDate()));
lawsClubMeeting.setPlanCompletionDate(convertStringToDate(lawsClubMeetingExcel.getPlanCompletionDate()));
lawsClubMeetingList.add(lawsClubMeeting);
}
}catch (Exception e) {
@@ -368,4 +368,18 @@ public class LawsClubMeetingServiceImpl extends ServiceImpl<LawsClubMeetingMappe
).anyMatch(value -> value != null && !value.isEmpty());
}
private Date convertStringToDate(String dateStr) {
if (StringUtils.isBlank(dateStr)) {
return null;
}
try {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
Date date = simpleDateFormat.parse(dateStr);
return date;
}catch (Exception e) {
log.error("日期转换异常");
}
return null;
}
}
laws-modules/src/main/java/com/jero/modules/laws/club/service/impl/LawsClubResearchInformationServiceImpl.java
+19 -4
View File
@@ -14,6 +14,7 @@ import com.jero.modules.system.entity.SysDepart;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysDepartService;
import com.jero.modules.system.service.ISysDictService;
import com.jero.modules.system.service.ISysRolePermissionService;
import com.jero.modules.system.service.ISysUserService;
import com.jero.modules.tag.entity.LawsTag;
import lombok.SneakyThrows;
@@ -33,11 +34,9 @@ import java.io.IOException;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -110,6 +109,8 @@ public class LawsClubResearchInformationServiceImpl extends ServiceImpl<LawsClub
for (LawsClubResearchInformationExcel lawsClubResearchInformationExcel : excelList) {
LawsClubResearchInformation lawsClubResearchInformation = new LawsClubResearchInformation();
BeanUtils.copyProperties(lawsClubResearchInformationExcel, lawsClubResearchInformation);
lawsClubResearchInformation.setReceiveDate(convertStringToDate(lawsClubResearchInformationExcel.getReceiveDate()));
lawsClubResearchInformation.setDeadlineDate(convertStringToDate(lawsClubResearchInformationExcel.getDeadlineDate()));
lawsClubResearchInformationList.add(lawsClubResearchInformation);
}
}catch (Exception e) {
@@ -240,4 +241,18 @@ public class LawsClubResearchInformationServiceImpl extends ServiceImpl<LawsClub
}
return notifierId; // 如果没有括号，则返回整个字符串
}
private Date convertStringToDate(String dateStr) {
if (StringUtils.isBlank(dateStr)) {
return null;
}
try {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
Date date = simpleDateFormat.parse(dateStr);
return date;
}catch (Exception e) {
log.error("日期转换异常");
}
return null;
}
}