whycrzg
2021-04-01 3e9ea659ab76fa036390c49ca63e6f64fc451598
修改 项目管理更新
4个文件已修改
64 ■■■■ 已修改文件
src/main/java/com/whyc/controller/ProjectManageController.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/ProjectArchiveManageMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/ProjectArchiveManageService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/ProjectProcessManageService.java 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/ProjectManageController.java
@@ -105,7 +105,7 @@
            // 保存到服务器中
            file.transferTo(dest);
            map.put("fileType", file.getContentType());
            map.put("fileName", originalFilename);
            map.put("name", originalFilename);
            Double size = file.getSize() * 0.01 / 1024 / 1024 * 100;
            String douStr = String.format("%.2f", size);
            map.put("fileSize", douStr+" M");
@@ -227,15 +227,8 @@
     */
    @PutMapping("updateManageState")
    @ApiOperation(notes = "项目进度确认1-6 对应 立项-审批-研究-结题-验收-归档",value = "项目过程管理-未确认阶段更新")
    public Response updateManageState(@ApiParam(value = "项目编号", required = true) @RequestParam String proNum,
                                      @ApiParam(value = "项目名称代码", required = true) @RequestParam String proNameCode,
                                      @ApiParam(value = "项目进度确认1-6",required = true)@RequestParam int proProgress,
                                      @ApiParam(value = "文档上传保存地址(如果无传空字符串)",required = true)@RequestParam String proFilePath) {
        ProjectManage projectManage = new ProjectManage();
        projectManage.setProNum(proNum);
        projectManage.setProNameCode(proNameCode);
        projectManage.setProProgress(proProgress);
        projectManage.setNote(proFilePath);
    public Response updateManageState(@RequestBody ProjectManage projectManage) {
        return service.updateManageState(projectManage);
    }
src/main/java/com/whyc/mapper/ProjectArchiveManageMapper.java
@@ -3,6 +3,7 @@
import com.whyc.pojo.ProjectArchiveExperiment;
import com.whyc.pojo.ProjectArchiveManage;
import com.whyc.pojo.ProjectManage;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -37,4 +38,7 @@
    //归档时间更新
    int updateProjectProgress(ProjectManage progress);
    @Select("SELECT COUNT(*) FROM db_experiment.tb_project_archive_manage WHERE pro_file_path=#{filePath}")
    int checkFileExist(String filePath);
}
src/main/java/com/whyc/service/ProjectArchiveManageService.java
@@ -33,7 +33,7 @@
            for (int i = 0; i < list.size(); i++) {
                HashMap<String, String> map = new HashMap<>();
                ProjectArchiveManage projectArchiveManage = list.get(i);
                map.put("fileName",projectArchiveManage.getProDocumentName());
                map.put("name",projectArchiveManage.getProDocumentName());
                map.put("url",projectArchiveManage.getProFilePath());
                list1.add(map);
            }
@@ -56,8 +56,8 @@
                String name = absoluteFile.getName();
                file.delete();
                HashMap<Object, Object> map = new HashMap<>();
                map.put("delFileName", name);
                map.put("delUrl", pam.getProFilePath());
                map.put("name", name);
                map.put("url", pam.getProFilePath());
                response.setData(map);
            }
        } catch (Exception e) {
src/main/java/com/whyc/service/ProjectProcessManageService.java
@@ -70,7 +70,8 @@
    public Response add(ProjectManage pm) {
        Response response = new Response<>();
        pm.setProNameCode(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
        pm.setProProgress(1);//立项
        pm.setProState(1);//项目状态 进行中
        pm.setProProgress(1);//项目进度 立项
        Integer num = projectManageMapper.checkUniqueId(pm);
        if (num > 0) {
            return response.setMsg(0, "添加失败,pro_name_code重复");
@@ -134,7 +135,7 @@
                for (int i = 0; i < pams.size(); i++) {
                    ProjectArchiveManage pam = pams.get(i);
                    HashMap<Object, Object> mapDoc = new HashMap<>();
                    mapDoc.put("fileName", pam.getProDocumentName());
                    mapDoc.put("name", pam.getProDocumentName());
                    mapDoc.put("url", pam.getProFilePath());
                    list.add(mapDoc);
                }
@@ -163,30 +164,36 @@
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        try {
            bl = projectManageMapper.updateManageState(pm) > 0;
            String path = pm.getNote().trim();
            if (path.length() > 10) {
                ProjectArchiveManage pam = new ProjectArchiveManage();
                pam.setProNum(pm.getProNum());
                pam.setProName(pm.getProName());
                pam.setProNameCode(pm.getProNameCode());//唯一
                pam.setProSort(pm.getProSort());
                pam.setProFilePath(path);
                String[] split = path.split("-");
                int rexIdex = split[1].lastIndexOf(".");
                pam.setProDocumentName(split[1].substring(0, rexIdex));
                pam.setProDocumentFormat(split[1].substring(rexIdex + 1));
                projectArchiveManageMapper.insert(pam);
            ArrayList<String> fileList = pm.getFileList();
            if (bl&&null != fileList) {
                for (int i = 0; i < fileList.size(); i++) {
                    String filePath = fileList.get(i);
                    Boolean fileExist = projectArchiveManageMapper.checkFileExist(filePath)>0;
                    if (!fileExist) {
                        ProjectArchiveManage pam = new ProjectArchiveManage();
                        pam.setProNum(pm.getProNum());
                        pam.setProName(pm.getProName());
                        pam.setProNameCode(pm.getProNameCode());//唯一
                        pam.setProSort(pm.getProSort());
                        pam.setProFilePath(filePath);
                        String[] split = filePath.split("_");
                        int rexIdex = split[1].lastIndexOf(".");
                        pam.setProDocumentName(split[1].substring(0, rexIdex));
                        pam.setProDocumentFormat(split[1].substring(rexIdex + 1));
                        projectArchiveManageMapper.insert(pam);
                    }
                }
            }
            response.setMsg(1, "更新成功");
        } catch (Exception e) {
            e.printStackTrace();
            dataSourceTransactionManager.rollback(transactionStatus);
            return response.setMsg(0, "更新失败");
        }
        if (bl) {
            response.setMsg(1, "更新成功");
            dataSourceTransactionManager.commit(transactionStatus);
        } else {
            response.setMsg(0, "更新失败");
            dataSourceTransactionManager.rollback(transactionStatus);
        }
        return response;