whycrzg
2021-03-31 50162c4048a608bee17feb4d68d919122162d2d9
更新 项目过程管理/新建项目
3个文件已修改
77 ■■■■■ 已修改文件
src/main/java/com/whyc/controller/ProjectManageController.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/ProjectManage.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/ProjectProcessManageService.java 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/ProjectManageController.java
@@ -19,6 +19,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -48,13 +49,16 @@
    }
    @PostMapping("add")
    @ApiOperation(value = "新建项目",notes = "notes中存文件地址用 ; 分隔 {\n" +
            "  \"proNum\": S0900033,\n" +
            "  \"proName\": \"\",\n" +
            "  \"proNameCode\": \"yyyyMMddHHmmss格式字符串\",\n" +
    @ApiOperation(value = "新建项目",notes = "fileList 存文件地址 {\n" +
            "  \"fileList\": [\n" +
            "    \n" +
            "  ],\n" +
            "  \"proNum\": \"S0900033\",\n" +
            "  \"proName\": \"舰船电气动力试验\",\n" +
            "  \"proSort\": 0,\n" +
            "  \"proAdmin\": \"张三\",\n" +
            "  \"proTel\": 13800003131,\n" +
            "  \"proDepartment\": \"xxxx\",\n" +
            "  \"proTel\": \"13800003131\",\n" +
            "  \"proCreatedate\": \"2021-03-27 08:18:27\",\n" +
            "  \"proExecutionDate\": \"2021-03-27 08:18:27\",\n" +
            "  \"proExecutionDate1\": \"2021-03-27 08:18:27\",\n" +
@@ -63,10 +67,9 @@
            "  \"proFundingSource\": \"经费来源\",\n" +
            "  \"proContent\": \" \",\n" +
            "  \"proState\": 0,\n" +
            "  \"note\": \"拼接多个文件地址\"\n" +
            "  \"proProgress\": 0\n" +
            "}")
    public Response add(@RequestBody ProjectManage projectManage) {
        Response response = service.add(projectManage);
        return response;
    }
src/main/java/com/whyc/pojo/ProjectManage.java
@@ -5,7 +5,9 @@
import org.apache.ibatis.type.Alias;
import javax.validation.constraints.NotNull;
import java.beans.Transient;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
/**
@@ -15,6 +17,12 @@
@Alias("ProjectManage")
@TableName(schema = "db_experiment",value = "tb_project_manage")
public class ProjectManage implements Serializable {
    /**
     * 存文件地址
     */
    private ArrayList<String> fileList ;
    private Integer num;
    /**
@@ -110,6 +118,14 @@
    private static final long serialVersionUID = 1L;
    public ArrayList<String> getFileList() {
        return fileList;
    }
    public void setFileList(ArrayList<String> fileList) {
        this.fileList = fileList;
    }
    public Integer getNum() {
        return num;
    }
src/main/java/com/whyc/service/ProjectProcessManageService.java
@@ -17,6 +17,7 @@
import org.springframework.transaction.TransactionStatus;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -60,32 +61,41 @@
    }
    /**
     * 新建项目
     *
     * @param pm
     * @return
     */
    public Response add(ProjectManage pm) {
        Response response = new Response<>();
        pm.setProNameCode(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
        Integer num = projectManageMapper.checkUniqueId(pm);
        if(num>0){
            return  response.setMsg(0, "添加失败,pro_name_code重复");
        if (num > 0) {
            return response.setMsg(0, "添加失败,pro_name_code重复");
        }
        boolean bl;
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        try {
            bl = projectManageMapper.insert(pm) > 0;
            if (bl) {
                String[] paths = pm.getNote().split(";");
                for (int i = 0; i < paths.length; i++) {
                    ProjectArchiveManage pam = new ProjectArchiveManage();
                    pam.setProNum(pm.getProNum());
                    pam.setProName(pm.getProName());
                    pam.setProNameCode(pm.getProNameCode());//唯一,可对应多个文件
                    pam.setProSort(pm.getProSort());
                    String path = paths[i];
                    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));
                    pam.setProUploadDate(new Date());
                    projectArchiveManageMapper.insert(pam);
                ArrayList<String> list = pm.getFileList();
                if (null != list) {
                    for (int i = 0; i < list.size(); i++) {
                        ProjectArchiveManage pam = new ProjectArchiveManage();
                        pam.setProNum(pm.getProNum());
                        pam.setProName(pm.getProName());
                        pam.setProNameCode(pm.getProNameCode());//唯一,可对应多个文件
                        pam.setProSort(pm.getProSort());
                        String path = list.get(i);
                        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));
                        pam.setProUploadDate(new Date());
                        projectArchiveManageMapper.insert(pam);
                    }
                }
            }
        } catch (Exception e) {