项目修改

cloud-model/src/main/java/com/hssx/cloudmodel/constant/Constant.java

@@ -14,4 +14,6 @@ public class Constant {
     public static final Integer SYS_ID = 1;//系统管理员的id
     public static final String MOULD_PREFIX = "YMMJ";//模具编号前缀
     public static final String PROJECT_PREFIX = "YMXM";//项目编号
+    public static final String UPLOAD = "上传";//上传
+    public static final String DOWNLOAD = "下载";//下载
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectFileServiceImpl.java

@@ -1,13 +1,17 @@
 package com.hssx.cloudmodel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.constant.Constant;
 import com.hssx.cloudmodel.entity.ProjectFile;
+import com.hssx.cloudmodel.entity.ProjectOperationDynamics;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.mapper.ProjectFileMapper;
+import com.hssx.cloudmodel.mapper.ProjectOperationDynamicsMapper;
 import com.hssx.cloudmodel.mapper.UserMapper;
 import com.hssx.cloudmodel.service.ProjectFileService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.cloudmodel.service.ProjectOperationDynamicsService;
 import com.hssx.cloudmodel.util.FileUtil;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import org.springframework.stereotype.Service;
@@ -33,6 +37,8 @@ public class ProjectFileServiceImpl extends ServiceImpl<ProjectFileMapper, Proje
     UserMapper userMapper;
     @Resource
     ProjectFileMapper projectFileMapper;
+    @Resource
+    ProjectOperationDynamicsMapper projectOperationDynamicsMapper;
 
     @Override
     public HttpRespMsg addFile(UserVO userVO, MultipartFile file, String path) {
@@ -74,6 +80,9 @@ public class ProjectFileServiceImpl extends ServiceImpl<ProjectFileMapper, Proje
                         e.printStackTrace();
                         projectFile = null;
                     }
+                    ProjectOperationDynamics dynamics = new ProjectOperationDynamics();
+                    dynamics.setContent(Constant.UPLOAD);
+//                    projectOperationDynamicsMapper
                 }
                 msg.data = projectFile;
             }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectServiceImpl.java

@@ -93,31 +93,51 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }
             } else if (flag == 1) {
                 projectMapper.updateById(project);
+                //删除之前添加的生产方公司
+                customCompanyMapper.delete(new QueryWrapper<CustomCompany>().eq("project_id",project.getId()));
+                //重新添加生产方公司
+                if (customerCompanyIds != null && !"".equals(customerCompanyIds) && customerCompanyNames != null && !"".equals(customerCompanyNames)) {
+                    List<Integer> ides = ListUtil.convertIntegerIdsArrayToList(customerCompanyIds);
+                    String[] split = customerCompanyNames.split(",");
+                    int index = 0;
+                    for (String cusCompany : split) {
+                        CustomCompany customCompany = new CustomCompany();
+                        customCompany.setCompanyId(ides.get(index));
+                        customCompany.setCompanyName(cusCompany);
+                        customCompany.setProjectId(project.getId());
+                        customCompanyMapper.insert(customCompany);
+                        index++;
+                    }
+                }
                 //删除之前的项目审批人
                 projectApproveMapper.delete(new QueryWrapper<ProjectApprove>().eq("project_id", project.getId()));
                 //重新添加审批人
                 //1.添加资产方审批人
-                User customerExaminer = userMapper.selectById(customerApproverId);
-                Company company = companyMapper.selectById(customerExaminer.getCompanyId());
-                ProjectApprove projectApprove = new ProjectApprove();
-                projectApprove.setApproverId(customerExaminer.getId());
-                projectApprove.setApproverName(customerExaminer.getUsername());
-                projectApprove.setCompanyId(customerExaminer.getCompanyId());
-                projectApprove.setCompanyName(company.getCompanyName());
-                projectApprove.setProjectId(project.getId());
-                projectApprove.setSubordinateType(customerExaminer.getSubordinateType());
-                projectApproveMapper.insert(projectApprove);
-                //2.添加生产方审批人
-                User ownerExaminer = userMapper.selectById(ownerApproverId);
-                company = companyMapper.selectById(ownerExaminer.getCompanyId());
-                ProjectApprove ownerProjectApprove = new ProjectApprove();
-                projectApprove.setApproverId(ownerExaminer.getId());
-                ownerProjectApprove.setApproverName(ownerExaminer.getUsername());
-                ownerProjectApprove.setCompanyId(ownerExaminer.getCompanyId());
-                ownerProjectApprove.setCompanyName(company.getCompanyName());
-                ownerProjectApprove.setProjectId(project.getId());
-                ownerProjectApprove.setSubordinateType(ownerExaminer.getSubordinateType());
-                projectApproveMapper.insert(ownerProjectApprove);
+                if(null != customerApproverId){
+                    User customerExaminer = userMapper.selectById(customerApproverId);
+                    Company company = companyMapper.selectById(customerExaminer.getCompanyId());
+                    ProjectApprove projectApprove = new ProjectApprove();
+                    projectApprove.setApproverId(customerExaminer.getId());
+                    projectApprove.setApproverName(customerExaminer.getUsername());
+                    projectApprove.setCompanyId(customerExaminer.getCompanyId());
+                    projectApprove.setCompanyName(company.getCompanyName());
+                    projectApprove.setProjectId(project.getId());
+                    projectApprove.setSubordinateType(customerExaminer.getSubordinateType());
+                    projectApproveMapper.insert(projectApprove);
+                }
+                if(null != ownerApproverId){
+                    //2.添加生产方审批人
+                    User ownerExaminer = userMapper.selectById(ownerApproverId);
+                    Company company = companyMapper.selectById(ownerExaminer.getCompanyId());
+                    ProjectApprove ownerProjectApprove = new ProjectApprove();
+                    ownerProjectApprove.setApproverId(ownerExaminer.getId());
+                    ownerProjectApprove.setApproverName(ownerExaminer.getUsername());
+                    ownerProjectApprove.setCompanyId(ownerExaminer.getCompanyId());
+                    ownerProjectApprove.setCompanyName(company.getCompanyName());
+                    ownerProjectApprove.setProjectId(project.getId());
+                    ownerProjectApprove.setSubordinateType(ownerExaminer.getSubordinateType());
+                    projectApproveMapper.insert(ownerProjectApprove);
+                }
                 //删除之前分配的人员
                 QueryWrapper<ProjectUser> qwPro = new QueryWrapper<>();
                 qwPro.eq("project_id", project.getId());

cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_power");
+        strategy.setInclude("tb_project_operation_dynamics");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);