项目库相关人员列表+导出修改

This commit is contained in:
xiejunyu
2022-04-22 01:58:06 +08:00
parent fe3b1343c6
commit 77e7b78e6f
5 changed files with 25 additions and 26 deletions
@@ -18,7 +18,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* @Description: 项目库-相关人员维护表
@@ -41,11 +40,10 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
@AutoLog(value = "项目库-相关人员维护表-分页列表查询")
@ApiOperation(value="项目库-相关人员维护表-分页列表查询", notes="项目库-相关人员维护表-分页列表查询")
@PostMapping(value = "/page")
public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
List<ProjectRelatedPersonnel> pageList= projectRelatedPersonnelService.queryPageList(params);
return Result.OK(params.get("cut").toString(),pageList);
public Result<?> queryPageList(@RequestParam(name="projectId",required=true) String projectId,@RequestParam(name="cut",required=true) String cut) {
List<ProjectRelatedPersonnel> pageList= projectRelatedPersonnelService.queryPageList(projectId);
return Result.OK(cut,pageList);
}
/**
* 列表查询
*
@@ -138,10 +136,11 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
@AutoLog(value = "项目库-相关人员维护表-导出excel")
@ApiOperation(value="项目库-相关人员维护表-导出excel", notes="项目库-相关人员维护表-导出excel")
@GetMapping(value = "/exportXls", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
public ModelAndView exportXls(HttpServletRequest request, Map<String, Object> params) {
public ModelAndView exportXls(HttpServletRequest request,@RequestParam(name="id") String id,
@RequestParam(name="projectId") String projectId,
@RequestParam(name="cut",required=true) String cut) {
//获取导出的数据
List<ProjectRelatedPersonnel> records = projectRelatedPersonnelService.disposeExportXls(params);
List<ProjectRelatedPersonnel> records = projectRelatedPersonnelService.disposeExportXls(id,projectId);
return projectRelatedPersonnelService.exportDataToXls(request, records, ProjectRelatedPersonnel.class, "相关人员名单");
}
@@ -152,9 +151,8 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
@AutoLog(value = "项目库-相关人员维护表-导出excel模板")
@ApiOperation(value="项目库-相关人员维护表-导出excel模板", notes="项目库-相关人员维护表-导出excel模板")
@GetMapping(value = "/exportTemplate", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
public ModelAndView exportTemplate(HttpServletRequest request,ProjectRelatedPersonnel projectRelatedPersonnel) {
return projectRelatedPersonnelService.exportTemplate(request, ProjectRelatedPersonnel.class, "相关人员名单");
public ModelAndView exportTemplate(HttpServletRequest request) {
return projectRelatedPersonnelService.setExporTemplate(request, ProjectRelatedPersonnel.class, "相关人员名单");
}
/**
@@ -167,8 +165,8 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
@AutoLog(value = "项目库-相关人员维护表-通过excel导入数据")
@ApiOperation(value="项目库-相关人员维护表-通过excel导入数据", notes="项目库-相关人员维护表-通过excel导入数据")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return projectRelatedPersonnelService.importExcel(request, response, ProjectRelatedPersonnel.class);
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response,@RequestParam(name="projectId",required=true) String projectId) {
return projectRelatedPersonnelService.importExcel(request, response, ProjectRelatedPersonnel.class,projectId);
}
/**
@@ -2,9 +2,9 @@ package com.jero.modules.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.project.entity.ProjectRelatedPersonnel;
import org.springframework.data.repository.query.Param;
import java.util.List;
import java.util.Map;
/**
* @Description: 相关人员维护表
@@ -14,7 +14,7 @@ import java.util.Map;
*/
public interface ProjectRelatedPersonnelMapper extends BaseMapper<ProjectRelatedPersonnel> {
List<ProjectRelatedPersonnel> queryPageList(Map<String, Object> params);
List<ProjectRelatedPersonnel> queryPageList(@Param("projectId") String projectId);
List<ProjectRelatedPersonnel> queryById(String id);
List<ProjectRelatedPersonnel> queryById(@Param("id")String id);
}
@@ -29,14 +29,15 @@
prp.update_time,
prp.sys_org_code
</sql>
<select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectRelatedPersonnel">
SELECT
<include refid="select_item"/>
FROM
project_related_personnel AS prp
project_related_personnel AS prp
<where>
<if test="params.projectId != null and params.projectId != ''">
prp.project_id=#{params.projectId}
<if test="projectId != null and projectId != ''">
prp.project_id=#{projectId}
</if>
</where>
order by prp.create_time desc
@@ -8,7 +8,6 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* @Description: 相关人员维护表
@@ -65,17 +64,18 @@ public interface IProjectRelatedPersonnelService extends IService<ProjectRelated
*/
List<ProjectRelatedPersonnel> queryList();
List<ProjectRelatedPersonnel> queryPageList(Map<String, Object> params);
List<ProjectRelatedPersonnel> queryPageList(String projectId);
Result<?> queryPersonByProjectId(String projectId,String dutyTerritory);
/**处理导出数据*/
List<ProjectRelatedPersonnel> disposeExportXls(Map<String, Object> params);
List<ProjectRelatedPersonnel> disposeExportXls(String id,String projectId);
/**设置导出模板*/
ModelAndView setExporTemplate(HttpServletRequest request, Class<ProjectRelatedPersonnel> clazz, String title);
ModelAndView exportDataToXls(HttpServletRequest request, List<ProjectRelatedPersonnel> dataList, Class<ProjectRelatedPersonnel> clazz, String title);
ModelAndView exportTemplate(HttpServletRequest request, Class<ProjectRelatedPersonnel> clazz, String title);
Result<?> importExcel(HttpServletRequest request, HttpServletResponse response, Class<ProjectRelatedPersonnel> clazz);
Result<?> importExcel(HttpServletRequest request, HttpServletResponse response, Class<ProjectRelatedPersonnel> clazz, String projectId);
}
@@ -142,8 +142,8 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
* @return
*/
@Override
public List<ProjectRelatedPersonnel> queryPageList(Map<String, Object> params) {
List<ProjectRelatedPersonnel> result = projectRelatedPersonnelMapper.queryPageList(params);
public List<ProjectRelatedPersonnel> queryPageList(String projectId) {
List<ProjectRelatedPersonnel> result = projectRelatedPersonnelMapper.queryPageList(projectId);
disposeData(result);
return result;
}