|
@@ -2,7 +2,10 @@ package org.jeecg.modules.ctop.controller;
|
|
|
|
|
|
import cn.com.ctop.common.module.annotation.AutoLog;
|
|
import cn.com.ctop.common.module.annotation.AutoLog;
|
|
import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
|
|
import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
|
|
-import cn.com.ctop.common.module.entity.*;
|
|
|
|
|
|
+import cn.com.ctop.common.module.entity.Advertiser;
|
|
|
|
+import cn.com.ctop.common.module.entity.MaterialInfo;
|
|
|
|
+import cn.com.ctop.common.module.entity.Project;
|
|
|
|
+import cn.com.ctop.common.module.entity.SupplierList;
|
|
import cn.com.ctop.common.module.mapper.ProjectMapper;
|
|
import cn.com.ctop.common.module.mapper.ProjectMapper;
|
|
import cn.com.ctop.common.module.service.*;
|
|
import cn.com.ctop.common.module.service.*;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
@@ -16,14 +19,12 @@ import org.apache.shiro.SecurityUtils;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
-import org.jeecg.modules.ctop.entity.Advertiser;
|
|
|
|
import org.jeecg.modules.ctop.entity.ProjectMember;
|
|
import org.jeecg.modules.ctop.entity.ProjectMember;
|
|
import org.jeecg.modules.ctop.entity.TransferAccount;
|
|
import org.jeecg.modules.ctop.entity.TransferAccount;
|
|
import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
|
|
import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
|
|
import org.jeecg.modules.ctop.service.IAdvertiserService;
|
|
import org.jeecg.modules.ctop.service.IAdvertiserService;
|
|
import org.jeecg.modules.ctop.service.IProjectMemberService;
|
|
import org.jeecg.modules.ctop.service.IProjectMemberService;
|
|
import org.jeecg.modules.ctop.service.ITransferAccountService;
|
|
import org.jeecg.modules.ctop.service.ITransferAccountService;
|
|
-import org.jeecg.modules.system.entity.SysCategory;
|
|
|
|
import org.jeecg.modules.system.service.ISysCategoryService;
|
|
import org.jeecg.modules.system.service.ISysCategoryService;
|
|
import org.jeecg.modules.system.service.ISysUserService;
|
|
import org.jeecg.modules.system.service.ISysUserService;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -339,7 +340,6 @@ public class ProjectController {
|
|
projectMemberService.removeByMap(map);
|
|
projectMemberService.removeByMap(map);
|
|
ProjectMember member = new ProjectMember();
|
|
ProjectMember member = new ProjectMember();
|
|
member.setProjectId(id);
|
|
member.setProjectId(id);
|
|
- member.setProjectName(project.getProjectName());
|
|
|
|
member.setUserId(userId);
|
|
member.setUserId(userId);
|
|
member.setUserName(userName);
|
|
member.setUserName(userName);
|
|
String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
@@ -393,20 +393,12 @@ public class ProjectController {
|
|
result.error500("未找到对应实体");
|
|
result.error500("未找到对应实体");
|
|
} else {
|
|
} else {
|
|
boolean ok = projectService.updateById(project);
|
|
boolean ok = projectService.updateById(project);
|
|
-
|
|
|
|
QueryWrapper<ProjectMember> memberQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<ProjectMember> memberQueryWrapper = new QueryWrapper<>();
|
|
memberQueryWrapper.eq("project_id", project.getId());
|
|
memberQueryWrapper.eq("project_id", project.getId());
|
|
ProjectMember updateMember = new ProjectMember();
|
|
ProjectMember updateMember = new ProjectMember();
|
|
updateMember.setProjectName(project.getProjectName());
|
|
updateMember.setProjectName(project.getProjectName());
|
|
projectMemberService.update(updateMember, memberQueryWrapper);
|
|
projectMemberService.update(updateMember, memberQueryWrapper);
|
|
|
|
|
|
- QueryWrapper<UserAllocation> userAllocationQueryWrapper = new QueryWrapper<>();
|
|
|
|
- userAllocationQueryWrapper.eq("project_id", project.getId());
|
|
|
|
- UserAllocation updateUserAllocation = new UserAllocation();
|
|
|
|
- updateUserAllocation.setProjectName(project.getProjectName());
|
|
|
|
- // updateUserAllocation.setMediaId(project.getMediaId());
|
|
|
|
- userAllocationService.update(updateUserAllocation, userAllocationQueryWrapper);
|
|
|
|
-
|
|
|
|
if (!projectEntity.getSupplierCode().equals(project.getSupplierCode())) {
|
|
if (!projectEntity.getSupplierCode().equals(project.getSupplierCode())) {
|
|
QueryWrapper<MaterialInfo> materialInfoQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<MaterialInfo> materialInfoQueryWrapper = new QueryWrapper<>();
|
|
materialInfoQueryWrapper.eq("project_id", project.getId());
|
|
materialInfoQueryWrapper.eq("project_id", project.getId());
|