whycrzg
2021-04-01 7239d6bd49e8623de3f0e8f0caaf01776fb31080
修改 项目归档接口
1个文件已修改
18 ■■■■ 已修改文件
src/main/java/com/whyc/service/ProjectProcessManageService.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/ProjectProcessManageService.java
@@ -48,6 +48,7 @@
    /**
     * 根据筛选条件
     *
     * @param pageNum
     * @param pageSize
     * @param projectManage
@@ -119,6 +120,7 @@
    /**
     * 项目过程管理/己确认、未确认阶段
     *
     * @param projectManage
     * @return
     */
@@ -154,7 +156,8 @@
    /**
     * 项目进度确认
     *未归档可以修改更新,归档后不能修改
     * 未归档可以修改更新,归档后不能修改
     *
     * @param pm
     * @return
     */
@@ -165,10 +168,10 @@
        try {
            bl = projectManageMapper.updateManageState(pm) > 0;
            ArrayList<String> fileList = pm.getFileList();
            if (bl&&null != fileList) {
            if (bl && null != fileList) {
                for (int i = 0; i < fileList.size(); i++) {
                    String filePath = fileList.get(i);
                    Boolean fileExist = projectArchiveManageMapper.checkFileExist(filePath)>0;
                    Boolean fileExist = projectArchiveManageMapper.checkFileExist(filePath) > 0;
                    if (!fileExist) {
                        ProjectArchiveManage pam = new ProjectArchiveManage();
                        pam.setProNum(pm.getProNum());
@@ -176,6 +179,7 @@
                        pam.setProNameCode(pm.getProNameCode());//唯一
                        pam.setProSort(pm.getProSort());
                        pam.setProFilePath(filePath);
                        pam.setProUploadDate(new Date());
                        String[] split = filePath.split("_");
                        int rexIdex = split[1].lastIndexOf(".");
                        pam.setProDocumentName(split[1].substring(0, rexIdex));
@@ -203,22 +207,18 @@
    /**
     * 项目进度管理
     * 项目进度(1-6 立项、审批、研究、结题、验收、归档)
     *
     * @param progress
     * @return
     */
    public Response updateProjectProgress(ProjectManage progress) {
        Response<Object> response = new Response<>();
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        progress.setProArchiveDate(new Date());
        boolean bl = projectManageMapper.updateProjectProgress(progress) > 0;
        if (bl) {
            bl = projectArchiveManageMapper.updateProjectProgress(progress) > 0;
        }
        if (bl) {
            dataSourceTransactionManager.commit(transactionStatus);
            projectArchiveManageMapper.updateProjectProgress(progress);//有文档材料就增加归档时间
            response.setMsg(1, "更新成功");
        } else {
            dataSourceTransactionManager.rollback(transactionStatus);
            response.setMsg(0, "更新失败");
        }
        return response;