whycrzg
2021-03-31 eb54ef147728526158e8c7be5e05c62215464c56
更新 项目管理-查询分页-筛选条件,删除文件
5个文件已修改
180 ■■■■ 已修改文件
src/main/java/com/whyc/controller/ProjectManageController.java 69 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/ProjectManageMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/ProjectArchiveManageService.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/ProjectProcessManageService.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ProjectManageMapper.xml 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/ProjectManageController.java
@@ -1,5 +1,6 @@
package com.whyc.controller;
import com.github.pagehelper.PageInfo;
import com.whyc.config.MyProps;
import com.whyc.dto.Response;
import com.whyc.pojo.ProjectArchiveManage;
@@ -40,26 +41,10 @@
    private ProjectArchiveManageService archiveManageService;
    @GetMapping("all")
    @ApiOperation(value = "项目过程管理-查询所有")
    public Response<List<ProjectManage>> searchAll() {
        return service.searchAll();
    }
    @GetMapping("byCondition")
    @ApiOperation(notes = "项目过程管理",value = "项目过程管理-条件查询")
    public Response<List<ProjectManage>> searchByCondition(@ApiParam(value = "申报日期 格式 2021/01/28",required = true) @RequestParam Date proCreatedate,
                                                           @ApiParam(value = "项目类型",required = true)@RequestParam String proSort,
                                                           @ApiParam(value = "项目状态",required = true)@RequestParam int proState,
                                                           @ApiParam(value = "项目编号",required = true)@RequestParam String proNum) {
        ProjectManage projectManage = new ProjectManage();
        projectManage.setProCreatedate(proCreatedate);
        projectManage.setProSort(proSort);
        projectManage.setProState(proState);
        projectManage.setProNum(proNum);
        return service.searchByCondition(projectManage);
    @PostMapping("progressByCondition")
    @ApiOperation(notes = "项目过程管理", value = "项目过程管理-查询分页-根据筛选条件")
    public Response<PageInfo<ProjectManage>> searchByCondition(@RequestParam int pageNum, @RequestParam int pageSize, @RequestBody ProjectManage projectManage) {
        return service.searchByCondition(pageNum, pageSize, projectManage);
    }
    @PostMapping("add")
@@ -220,30 +205,6 @@
        return result.setMsg(0,"文件不存在");
    }
    @DeleteMapping("/delDoc")
    @ApiOperation(notes = "", value = "文档材料删除")
    public Response delDocment(@RequestParam String filePath) {
        Response<Object> response = new Response<>();
        File file = new File(filePath);
        try {
            if (file.exists()) {
                File absoluteFile = file.getAbsoluteFile();
                String name = absoluteFile.getName();
                file.delete();
                HashMap<Object, Object> map = new HashMap<>();
                map.put("删除的文件名", name);
                map.put("删除的文件路径", filePath);
                response.setData(map);
                response.setMsg(1, "删除成功");
            } else {
                response.setMsg(0, "文件不存在");
            }
        } catch (Exception e) {
            e.printStackTrace();
            return response.setMsg(0, "删除失败");
        }
        return response;
    }
    @GetMapping("managesState")
@@ -287,8 +248,8 @@
    }
    @Delete("delDoc")
    @ApiOperation(notes = "项目过程管理-项目管理-己确认阶段",value = "文档材料删除")
    @DeleteMapping("delDoc")
    @ApiOperation(notes = "项目过程管理-项目管理",value = "文档材料删除")
    public  Response delDocumentation(@ApiParam(value = "项目编号", required = true) @RequestParam String proNum,
                                      @ApiParam(value = "项目名称代码", required = true) @RequestParam String proNameCode,
                                      @ApiParam(value = "文档路径", required = true) @RequestParam String proFilePath){
@@ -305,20 +266,12 @@
        return archiveManageService.searchArchiveAll();
    }
    @GetMapping("archiveByCondition")
    @ApiOperation(value = "项目归档管理-条件查询")
    public Response searchArchiveByCondition(@ApiParam(value = "开始日期 格式 2021/03/27",required = true) @RequestParam Date proExecutionDate,
                                             @ApiParam(value = "归档日期 格式 2021/03/27",required = true)@RequestParam Date proArchiveDate,
                                             @ApiParam(value = "项目类型",required = true)@RequestParam String proSort,
                                             @ApiParam(value = "项目编号",required = true)@RequestParam String proNum) {
        ProjectManage pm = new ProjectManage();
        pm.setProExecutionDate(proExecutionDate);
        pm.setProArchiveDate(proArchiveDate);
        pm.setProSort(proSort);
        pm.setProNum(proNum);
    @PostMapping("archiveByCondition")
    @ApiOperation(value = "项目归档管理-查询分页-根据筛选条件")
    public Response<PageInfo<ProjectManage>> searchArchiveByCondition(@RequestParam int pageNum, @RequestParam int pageSize, @RequestBody ProjectManage projectManage) {
        return archiveManageService.searchArchiveByCondition(pm);
        return archiveManageService.searchArchiveByCondition(pageNum,pageSize,projectManage);
    }
    @GetMapping("archiveProjectInfo")
src/main/java/com/whyc/mapper/ProjectManageMapper.java
@@ -20,7 +20,7 @@
    //项目管理/项目过程管理
    List<ProjectManage> searchAll();
    //项目管理/项目过程管理 查询
    //项目管理/项目过程管理 根据筛选条件,如果无参数为all
    List<ProjectManage> searchByCondition(ProjectManage projectManage);
    //项目管理/己确认、未确认阶段 管理-显示
@@ -34,7 +34,7 @@
    List<ProjectManage> searchArchiveAll();
//    项目归档管理-条件查询 开始日期 OR 归档日期
//    项目归档管理-条件查询 开始日期 OR 归档日期 根据筛选条件,如果无参数为all
    List<ProjectManage> searchArchiveByCondition(ProjectManage projectManage);
    //项目概况信息
src/main/java/com/whyc/service/ProjectArchiveManageService.java
@@ -1,5 +1,7 @@
package com.whyc.service;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.ProjectArchiveManageMapper;
import com.whyc.mapper.ProjectManageMapper;
@@ -50,7 +52,13 @@
            projectArchiveManageMapper.delDocumentation(pam);
            File file = new File(pam.getProFilePath());
            if (file.exists()){
                File absoluteFile = file.getAbsoluteFile();
                String name = absoluteFile.getName();
                file.delete();
                HashMap<Object, Object> map = new HashMap<>();
                map.put("删除的文件名", name);
                map.put("删除的文件路径", pam.getProFilePath());
                response.setData(map);
            }
        } catch (Exception e) {
            e.printStackTrace();
@@ -77,22 +85,19 @@
    /**
     * 项目归档管理-条件查询
     *
     * @param pageNum
     * @param pageSize
     * @param projectManage
     * @return
     */
    public Response searchArchiveByCondition(ProjectManage projectManage) {
        Response<Object> response = new Response<>();
    public Response<PageInfo<ProjectManage>> searchArchiveByCondition(int pageNum, int pageSize, ProjectManage projectManage) {
        try {
            List<ProjectManage> lists = projectManageMapper.searchArchiveByCondition(projectManage);
        PageHelper.startPage(pageNum, pageSize);
        List<ProjectManage> lists = projectManageMapper.searchArchiveByCondition(projectManage);
        PageInfo<ProjectManage> projectManagePageInfo = new PageInfo<>(lists);
        return new Response<PageInfo<ProjectManage>>().set(1, projectManagePageInfo);
            response.setMsg(1,"查询成功");
            response.setData(lists);
        } catch (Exception e) {
            e.printStackTrace();
            return response.setMsg(0,"查询失败");
        }
        return response;
    }
    /**
src/main/java/com/whyc/service/ProjectProcessManageService.java
@@ -1,9 +1,12 @@
package com.whyc.service;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.ProjectArchiveManageMapper;
import com.whyc.mapper.ProjectManageMapper;
import com.whyc.pojo.DeviceManage;
import com.whyc.pojo.ProjectArchiveManage;
import com.whyc.pojo.ProjectManage;
import io.swagger.models.auth.In;
@@ -42,13 +45,18 @@
        return response;
    }
    public Response<List<ProjectManage>> searchByCondition(ProjectManage projectManage) {
        Response<List<ProjectManage>> response = new Response<>();
    /**
     * 根据筛选条件
     * @param pageNum
     * @param pageSize
     * @param projectManage
     * @return
     */
    public Response<PageInfo<ProjectManage>> searchByCondition(int pageNum, int pageSize, ProjectManage projectManage) {
        PageHelper.startPage(pageNum, pageSize);
        List<ProjectManage> projectManages = projectManageMapper.searchByCondition(projectManage);
        response.setCode(1);
        response.setData(projectManages);
        return response;
        PageInfo<ProjectManage> projectManagePageInfo = new PageInfo<>(projectManages);
        return new Response<PageInfo<ProjectManage>>().set(1, projectManagePageInfo);
    }
src/main/resources/mapper/ProjectManageMapper.xml
@@ -270,23 +270,33 @@
           pro_state
    FROM db_experiment.tb_project_manage
  </select>
  <select id="searchByCondition" resultType="com.whyc.pojo.ProjectManage">
      SELECT pro_num,
             pro_name,
             pro_name_code,
             pro_sort,
             pro_admin,
             pro_department,
             pro_createdate,
             pro_execution_date,
             pro_execution_date1,
             pro_state
    FROM db_experiment.tb_project_manage
    where pro_createdate = #{proCreatedate}
      and pro_sort = #{proSort}
      and pro_state = #{proState}
      and pro_num = #{proNum}
  </select>
    <select id="searchByCondition" resultMap="BaseResultMap">
        SELECT pro_num,
        pro_name,
        pro_name_code,
        pro_sort,
        pro_admin,
        pro_department,
        pro_createdate,
        pro_execution_date,
        pro_execution_date1,
        pro_state
        FROM db_experiment.tb_project_manage
        where 1=1
        <if test="proNum!=null">
            and pro_num = #{proNum}
        </if>
        <if test="proSort!=null">
            and pro_sort = #{proSort}
        </if>
        <if test="proState!=null">
            and pro_state = #{proState}
        </if>
        <if test="proCreatedate!=null">
            and pro_createdate = #{proCreatedate}
        </if>
    </select>
  <select id="searchManageStateByCondition" resultType="com.whyc.pojo.ProjectManage">
    SELECT *
    FROM db_experiment.tb_project_manage
@@ -320,11 +330,19 @@
               pro_execution_date1,
               pro_archive_date
        FROM db_experiment.tb_project_manage
        where (pro_num = #{proNum}
        where 1=1
        <if test="proNum!=null">
            and pro_num = #{proNum}
        </if>
        <if test="proSort!=null">
            and pro_sort = #{proSort}
            and pro_execution_date = #{proExecutionDate})
           or (pro_num = #{proNum}
            and pro_sort = #{proSort} and pro_archive_date = #{proArchiveDate})
        </if>
        <if test="proExecutionDate!=null">
            and pro_execution_date = #{proExecutionDate}
        </if>
        <if test="proArchiveDate!=null">
            and pro_archive_date = #{proArchiveDate}
        </if>
    </select>
    <select id="searchArchiveProjectInfo" resultType="com.whyc.pojo.ProjectManage">