yumeng пре 4 година
родитељ
комит
70815b43bb

+ 33 - 61
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java

@@ -32,10 +32,8 @@ import org.jeecg.modules.ctop.entity.Advertiser;
 import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.excelutil.entity.*;
-import org.jeecg.modules.system.entity.SysCategory;
 import org.jeecg.modules.system.entity.UserCompany;
 import org.jeecg.modules.system.mapper.UserCompanyMapper;
-import org.jeecg.modules.system.service.ISysCategoryService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -61,8 +59,6 @@ public class AdvertiserController {
     @Autowired
     private IAdvertiserService advertiserService;
     @Autowired
-    private ISysCategoryService sysCategoryService;
-    @Autowired
     private UserCompanyMapper userCompanyMapper;
     @Autowired
     private ISysRoleExtService sysRoleService;
@@ -125,8 +121,7 @@ public class AdvertiserController {
         if (CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN.equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "touTiaoOperationManager".equals(roleCode) || roleCode.contains("sale") || "meidaManager".equals(roleCode)) {
             advertiser.setUserId(null);
         }
-        String industryId = advertiser.getIndustryId();
-        advertiser.setIndustryId(null);
+
         QueryWrapper<Advertiser> queryWrapper = QueryGenerator.initQueryWrapper(advertiser, req.getParameterMap());
         if ("kuaishouOperationManager".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
             QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
@@ -138,12 +133,6 @@ public class AdvertiserController {
                 queryWrapper.eq("company_id", userCompany.getCompanyId());
             }
         }
-        if (null != industryId && !"".equals(industryId.trim())) {
-            SysCategory category = sysCategoryService.getById(industryId);
-            if (null != category) {
-                queryWrapper.likeRight("industry_code", category.getCode());
-            }
-        }
         Page<Advertiser> page = new Page<>(pageNo, pageSize);
         IPage<Advertiser> pageList = advertiserService.page(page, queryWrapper);
         result.setSuccess(true);
@@ -184,14 +173,6 @@ public class AdvertiserController {
             if (!Check.isNull(userCompany)) {
                 advertiser.setCompanyId(userCompany.getCompanyId());
             }
-            String industryId = advertiser.getIndustryId();
-            if (null != industryId && !"".equals(industryId.trim())) {
-                SysCategory category = sysCategoryService.getById(industryId);
-                if (null != category) {
-                    advertiser.setIndustryId(category.getId());
-                    advertiser.setIndustryCode(category.getCode());
-                }
-            }
             advertiserService.save(advertiser);
             result.success("添加成功!");
         } catch (Exception e) {
@@ -219,19 +200,10 @@ public class AdvertiserController {
         if (advertiserEntity == null) {
             result.error500("未找到对应实体");
         } else {
-            String industryId = advertiser.getIndustryId();
-            if (null != industryId && !"".equals(industryId.trim())) {
-                SysCategory category = sysCategoryService.getById(industryId);
-                if (null != category) {
-                    advertiser.setIndustryId(category.getId());
-                    advertiser.setIndustryCode(category.getCode());
-                }
-            }
             boolean ok = advertiserService.updateById(advertiser);
             QueryWrapper<Project> projectQueryWrapper = new QueryWrapper<>();
             projectQueryWrapper.eq("advertiser_id", advertiser.getId());
             Project updateProject = new Project();
-            updateProject.setAdvertiserName(advertiser.getName());
             projectService.update(updateProject, projectQueryWrapper);
             QueryWrapper<UserAllocation> userAllocationQueryWrapper = new QueryWrapper<>();
             userAllocationQueryWrapper.eq("advertiser_id", advertiser.getId());
@@ -456,11 +428,11 @@ public class AdvertiserController {
     @RequestMapping("/exportKuaishouProjectInfo")
     public void getKuaishouProjectInfo(@RequestBody KuaishouInfoDTO dto,
                                        HttpServletRequest request,
-                                       HttpServletResponse response)throws IOException  {
+                                       HttpServletResponse response) throws IOException {
         Result<PageInfo<ProjectAccountDTO>> result = new Result<>();
         result.setSuccess(true);
 
-        if(dto.getPageSize() == 0){
+        if (dto.getPageSize() == 0) {
             dto.setPageSize(100000);
         }
         OutputStream outputStream = response.getOutputStream();
@@ -468,36 +440,36 @@ public class AdvertiserController {
         HttpUtils.setResponseHeader(response, "快手效果报表" + date + ".xlsx");
         ExcelWriter excelWriter = EasyExcelFactory.getWriter(outputStream);
         String type = dto.getType();
-        if(null!=type&&type.trim().equals("project")){
+        if (null != type && type.trim().equals("project")) {
             SheetInfoVo projectSheetVo = this.getProjectSheetVo(dto, "项目报表");
-            Sheet sheet = new Sheet( 1, 0, EffecfReportProjectEntity.class);
+            Sheet sheet = new Sheet(1, 0, EffecfReportProjectEntity.class);
             sheet.setSheetName(projectSheetVo.getSheetName());
             excelWriter.write(projectSheetVo.getDetails(), sheet);
         }
-        if(null!=type&&type.trim().equals("account")){
+        if (null != type && type.trim().equals("account")) {
             SheetInfoVo accountSheetVo = this.getAccountSheetVo(dto, "账户报表");
-            Sheet sheet = new Sheet( 1, 0, EffecfReportAccountEntity.class);
+            Sheet sheet = new Sheet(1, 0, EffecfReportAccountEntity.class);
             sheet.setSheetName(accountSheetVo.getSheetName());
             excelWriter.write(accountSheetVo.getDetails(), sheet);
         }
 
-        if(null!=type&&type.trim().equals("campaign")){
+        if (null != type && type.trim().equals("campaign")) {
             SheetInfoVo planSheetVo = this.getPlanSheetVo(dto, "广告计划报表");
-            Sheet sheet = new Sheet( 1, 0, EffecfReportPlanEntity.class);
+            Sheet sheet = new Sheet(1, 0, EffecfReportPlanEntity.class);
             sheet.setSheetName(planSheetVo.getSheetName());
             excelWriter.write(planSheetVo.getDetails(), sheet);
         }
 
-        if(null!=type&&type.trim().equals("group")){
+        if (null != type && type.trim().equals("group")) {
             SheetInfoVo campaignSheetVo = this.getGroupSheetVo(dto, "广告组报表");
-            Sheet sheet = new Sheet( 1, 0, EffecfReportGroupEntity.class);
+            Sheet sheet = new Sheet(1, 0, EffecfReportGroupEntity.class);
             sheet.setSheetName(campaignSheetVo.getSheetName());
             excelWriter.write(campaignSheetVo.getDetails(), sheet);
         }
 
-        if(null!=type&&type.trim().equals("creative")){
+        if (null != type && type.trim().equals("creative")) {
             SheetInfoVo creativeSheetVo = this.getCreativeSheetVo(dto, "广告创意");
-            Sheet sheet = new Sheet( 1, 0, EffecfReportCreativeEntity.class);
+            Sheet sheet = new Sheet(1, 0, EffecfReportCreativeEntity.class);
             sheet.setSheetName(creativeSheetVo.getSheetName());
             excelWriter.write(creativeSheetVo.getDetails(), sheet);
         }
@@ -510,13 +482,13 @@ public class AdvertiserController {
     private SheetInfoVo getCreativeSheetVo(KuaishouInfoDTO dto, String sheetName) {
         SheetInfoVo vo = new SheetInfoVo<EffecfReportProjectEntity>();
         vo.setSheetName(sheetName);
-        PageInfo<KuaishouReportDailyAccountDTO> kuaishouCampaignInfoList = accountService.getKuaishouCreativeInfoByUnitId(dto.getProjectList(), dto.getUnitId(), dto.getStartDate(), dto.getEndDate(),dto.getPageSize(),dto.getPageNum(),dto.getYn());
+        PageInfo<KuaishouReportDailyAccountDTO> kuaishouCampaignInfoList = accountService.getKuaishouCreativeInfoByUnitId(dto.getProjectList(), dto.getUnitId(), dto.getStartDate(), dto.getEndDate(), dto.getPageSize(), dto.getPageNum(), dto.getYn());
         List<KuaishouReportDailyAccountDTO> dtos = kuaishouCampaignInfoList.getList();
-        if(null!=dtos&&!dtos.isEmpty()){
+        if (null != dtos && !dtos.isEmpty()) {
             List<EffecfReportCreativeEntity> details = new ArrayList<>();
-            for(KuaishouReportDailyAccountDTO dto1:dtos){
+            for (KuaishouReportDailyAccountDTO dto1 : dtos) {
                 EffecfReportCreativeEntity entity = new EffecfReportCreativeEntity();
-                BeanUtils.copyProperties(dto1,entity);
+                BeanUtils.copyProperties(dto1, entity);
                 details.add(entity);
             }
             vo.setDetails(details);
@@ -527,13 +499,13 @@ public class AdvertiserController {
     private SheetInfoVo getGroupSheetVo(KuaishouInfoDTO dto, String sheetName) {
         SheetInfoVo vo = new SheetInfoVo<EffecfReportProjectEntity>();
         vo.setSheetName(sheetName);
-        PageInfo<KuaishouReportDailyAccountDTO> kuaishouCampaignInfoList = accountService.getKuaishouUnitInfoByCampaignId(dto.getProjectList(), dto.getCampaignId(), dto.getStartDate(), dto.getEndDate(),dto.getPageSize(),dto.getPageNum(),dto.getYn());
+        PageInfo<KuaishouReportDailyAccountDTO> kuaishouCampaignInfoList = accountService.getKuaishouUnitInfoByCampaignId(dto.getProjectList(), dto.getCampaignId(), dto.getStartDate(), dto.getEndDate(), dto.getPageSize(), dto.getPageNum(), dto.getYn());
         List<KuaishouReportDailyAccountDTO> dtos = kuaishouCampaignInfoList.getList();
-        if(null!=dtos&&!dtos.isEmpty()){
+        if (null != dtos && !dtos.isEmpty()) {
             List<EffecfReportGroupEntity> details = new ArrayList<>();
-            for(KuaishouReportDailyAccountDTO dto1:dtos){
+            for (KuaishouReportDailyAccountDTO dto1 : dtos) {
                 EffecfReportGroupEntity entity = new EffecfReportGroupEntity();
-                BeanUtils.copyProperties(dto1,entity);
+                BeanUtils.copyProperties(dto1, entity);
                 details.add(entity);
             }
             vo.setDetails(details);
@@ -544,13 +516,13 @@ public class AdvertiserController {
     private SheetInfoVo getPlanSheetVo(KuaishouInfoDTO dto, String sheetName) {
         SheetInfoVo vo = new SheetInfoVo<EffecfReportProjectEntity>();
         vo.setSheetName(sheetName);
-        PageInfo<KuaishouReportDailyAccountDTO> kuaishouCampaignInfoList = accountService.getKuaishouCampaignInfoByAccountId(dto.getProjectList(), dto.getAccountId(), dto.getStartDate(), dto.getEndDate(),dto.getPageSize(),dto.getPageNum(),dto.getYn());
+        PageInfo<KuaishouReportDailyAccountDTO> kuaishouCampaignInfoList = accountService.getKuaishouCampaignInfoByAccountId(dto.getProjectList(), dto.getAccountId(), dto.getStartDate(), dto.getEndDate(), dto.getPageSize(), dto.getPageNum(), dto.getYn());
         List<KuaishouReportDailyAccountDTO> dtos = kuaishouCampaignInfoList.getList();
-        if(null!=dtos&&!dtos.isEmpty()){
+        if (null != dtos && !dtos.isEmpty()) {
             List<EffecfReportPlanEntity> details = new ArrayList<>();
-            for(KuaishouReportDailyAccountDTO dto1:dtos){
+            for (KuaishouReportDailyAccountDTO dto1 : dtos) {
                 EffecfReportPlanEntity entity = new EffecfReportPlanEntity();
-                BeanUtils.copyProperties(dto1,entity);
+                BeanUtils.copyProperties(dto1, entity);
                 details.add(entity);
             }
             vo.setDetails(details);
@@ -561,13 +533,13 @@ public class AdvertiserController {
     private SheetInfoVo getAccountSheetVo(KuaishouInfoDTO dto, String sheetName) {
         SheetInfoVo vo = new SheetInfoVo<EffecfReportProjectEntity>();
         vo.setSheetName(sheetName);
-        PageInfo<KuaishouReportDailyAccountDTO> kuaishouReportDailyAccountDTOList = accountService.getKuaishouAccountInfoByProjectId(dto.getProjectId(),dto.getProjectList(), dto.getStartDate(), dto.getEndDate(),dto.getPageSize(),dto.getPageNum(),dto.getYn());
+        PageInfo<KuaishouReportDailyAccountDTO> kuaishouReportDailyAccountDTOList = accountService.getKuaishouAccountInfoByProjectId(dto.getProjectId(), dto.getProjectList(), dto.getStartDate(), dto.getEndDate(), dto.getPageSize(), dto.getPageNum(), dto.getYn());
         List<KuaishouReportDailyAccountDTO> dtos = kuaishouReportDailyAccountDTOList.getList();
-        if(null!=dtos&&!dtos.isEmpty()){
+        if (null != dtos && !dtos.isEmpty()) {
             List<EffecfReportAccountEntity> details = new ArrayList<>();
-            for(KuaishouReportDailyAccountDTO dto1:dtos){
+            for (KuaishouReportDailyAccountDTO dto1 : dtos) {
                 EffecfReportAccountEntity entity = new EffecfReportAccountEntity();
-                BeanUtils.copyProperties(dto1,entity);
+                BeanUtils.copyProperties(dto1, entity);
                 details.add(entity);
             }
             vo.setDetails(details);
@@ -578,13 +550,13 @@ public class AdvertiserController {
     private SheetInfoVo getProjectSheetVo(KuaishouInfoDTO dto, String sheetName) {
         SheetInfoVo vo = new SheetInfoVo<EffecfReportProjectEntity>();
         vo.setSheetName(sheetName);
-        PageInfo<ProjectAccountDTO> projectAccountDTOList = accountService.getKuaishouProjectInfo(dto.getStartDate(), dto.getEndDate(), dto.getProjectList(),dto.getPageSize(),dto.getPageNum(), "", dto.getYn());
+        PageInfo<ProjectAccountDTO> projectAccountDTOList = accountService.getKuaishouProjectInfo(dto.getStartDate(), dto.getEndDate(), dto.getProjectList(), dto.getPageSize(), dto.getPageNum(), "", dto.getYn());
         List<ProjectAccountDTO> dtos = projectAccountDTOList.getList();
-        if(null!=dtos&&!dtos.isEmpty()){
+        if (null != dtos && !dtos.isEmpty()) {
             List<EffecfReportProjectEntity> details = new ArrayList<>();
-            for(ProjectAccountDTO dto1:dtos){
+            for (ProjectAccountDTO dto1 : dtos) {
                 EffecfReportProjectEntity entity = new EffecfReportProjectEntity();
-                BeanUtils.copyProperties(dto1,entity);
+                BeanUtils.copyProperties(dto1, entity);
                 details.add(entity);
             }
             vo.setDetails(details);

+ 18 - 18
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -239,12 +239,12 @@ public class ProjectController {
                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                 HttpServletRequest req) {
         Result<IPage<Project>> result = new Result<>();
-        String advertiserName = project.getAdvertiserName();
-        project.setAdvertiserName(null);
+      /*  String advertiserName = project.getAdvertiserName();
+        project.setAdvertiserName(null);*/
         String projectName = project.getProjectName();
         project.setProjectName(null);
-        String industryId = project.getIndustryId();
-        project.setIndustryId(null);
+     /*   String industryId = project.getIndustryId();
+        project.setIndustryId(null);*/
         QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
         Page<Project> page = new Page<>(pageNo, pageSize);
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -253,7 +253,7 @@ public class ProjectController {
             queryWrapper.eq("user_id", sysUser.getId());
             queryWrapper.orderByDesc("create_time");
         }
-        if (null != industryId && !"".equals(industryId.trim())) {
+        /*if (null != industryId && !"".equals(industryId.trim())) {
             SysCategory category = sysCategoryService.getById(industryId);
             if (null != category) {
                 queryWrapper.likeRight("industry_code", category.getCode());
@@ -262,7 +262,7 @@ public class ProjectController {
         if (!Check.isNull(advertiserName)) {
             queryWrapper.like("advertiser_name", advertiserName);
 
-        }
+        }*/
         if (!Check.isNull(projectName)) {
             queryWrapper.like("project_name", projectName);
         }
@@ -310,23 +310,23 @@ public class ProjectController {
             if (!Check.isNull(advertiser)) {
                 project.setCompanyId(advertiser.getCompanyId());
             }
-            SysCategory category = sysCategoryService.getById(project.getIndustryId());
+          /*  SysCategory category = sysCategoryService.getById(project.getIndustryId());
             if (null != category) {
                 project.setIndustryCode(category.getCode());
                 project.setIndustryId(category.getId());
-            }
-            SysUser sysUser = sysUserService.getById(project.getResponsibleId());
+            }*/
+           /* SysUser sysUser = sysUserService.getById(project.getResponsibleId());
             if (!Check.isNull(sysUser)) {
                 project.setResponsibleName(sysUser.getRealname());
                 memberMap.put(sysUser.getId(), sysUser.getRealname());
-            }
+            }*/
 
-            SysUser designSysUser = sysUserService.getById(project.getDesignResponsibleId());
+           /* SysUser designSysUser = sysUserService.getById(project.getDesignResponsibleId());
             if (!Check.isNull(designSysUser)) {
                 project.setDesignResponsibleName(designSysUser.getRealname());
                 memberMap.put(designSysUser.getId(), designSysUser.getRealname());
             }
-
+*/
             projectService.save(project);
 
             Long id = project.getId();
@@ -372,22 +372,22 @@ public class ProjectController {
     @PutMapping(value = "/edit")
     public Result<Project> edit(@RequestBody Project project) {
         Result<Project> result = new Result<>();
-        SysUser sysUser = sysUserService.getById(project.getResponsibleId());
+       /* SysUser sysUser = sysUserService.getById(project.getResponsibleId());
         if (!Check.isNull(sysUser)) {
             project.setResponsibleName(sysUser.getRealname());
             projectMemberService.addMember(sysUser, project);
-        }
+        }*/
 
-        SysCategory category = sysCategoryService.getById(project.getIndustryId());
+       /* SysCategory category = sysCategoryService.getById(project.getIndustryId());
         if (null != category) {
             project.setIndustryCode(category.getCode());
             project.setIndustryId(category.getId());
-        }
-        SysUser designSysUser = sysUserService.getById(project.getDesignResponsibleId());
+        }*/
+       /* SysUser designSysUser = sysUserService.getById(project.getDesignResponsibleId());
         if (!Check.isNull(designSysUser)) {
             project.setDesignResponsibleName(designSysUser.getRealname());
             projectMemberService.addMember(designSysUser, project);
-        }
+        }*/
         Project projectEntity = projectService.getById(project.getId());
         if (projectEntity == null) {
             result.error500("未找到对应实体");

+ 27 - 12
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java

@@ -18,8 +18,10 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 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.mapper.ProjectMemberMapper;
+import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +52,8 @@ public class ProjectMemberController {
     private ISysRoleExtService sysRoleService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private IAdvertiserService advertiserService;
 
 
     /**
@@ -84,6 +88,8 @@ public class ProjectMemberController {
      * @param userId
      * @return
      */
+
+
     @GetMapping(value = "/participateList")
     public Map<String, Object> participateList(String userId) {
         Map<String, Object> map = new HashMap<>();
@@ -104,9 +110,14 @@ public class ProjectMemberController {
                     }
                     Project project = projectService.getById(projectMember.getProjectId());
                     if (!Check.isNull(project)) {
-                        projectMember.setResponsibleName(project.getResponsibleName());
-                        projectMember.setDesignResponsibleName(project.getDesignResponsibleName());
-                        projectMember.setAdvertiserName(project.getAdvertiserName());
+                        SysUser responsible = sysUserService.getById(project.getResponsibleId());
+
+                        projectMember.setResponsibleName(responsible.getRealname());
+                        SysUser designResponsible = sysUserService.getById(project.getDesignResponsibleId());
+                        projectMember.setDesignResponsibleName(designResponsible.getRealname());
+
+                        Advertiser advertiser = advertiserService.getById(project.getAdvertiserId());
+                        projectMember.setAdvertiserName(advertiser.getName());
                         projectMember.setAdvertiserId(project.getAdvertiserId());
                         projectMember.setMediaId(project.getMediaId());
                         projectMember.setMaxBid(project.getMaxBid());
@@ -126,24 +137,24 @@ public class ProjectMemberController {
     }
 
     @GetMapping("/projectList")
-    public Map<String,Object>projectList(){
+    public Map<String, Object> projectList() {
         Map<String, Object> result = new HashMap<>();
         try {
             String userId = ((LoginUser) SecurityUtils.getSubject().getPrincipal()).getId();
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
             if ("admin".equals(roleCode) || roleCode.contains("sale") || "meidaManager".equals(roleCode)) {
-                List<Project>projects = projectService.list();
-                result.put("data",projects);
+                List<Project> projects = projectService.list();
+                result.put("data", projects);
                 ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
                 return result;
             }
             List<Project> projects = projectMemberService.selectListByUserId(userId);
-            result.put("data",projects);
-            ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
+            result.put("data", projects);
+            ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
             return result;
         } catch (Exception e) {
             e.printStackTrace();
-            ResultMapUtils.setResultMap(result,StatusCode.COMMON_PARAM_ERROR);
+            ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR);
             return result;
         }
     }
@@ -190,9 +201,13 @@ public class ProjectMemberController {
                 }
                 Project project = projectService.getById(member.getProjectId());
                 if (!Check.isNull(project)) {
-                    member.setResponsibleName(project.getResponsibleName());
-                    member.setDesignResponsibleName(project.getDesignResponsibleName());
-                    member.setAdvertiserName(project.getAdvertiserName());
+                    SysUser responsible = sysUserService.getById(project.getResponsibleId());
+                    projectMember.setResponsibleName(responsible.getRealname());
+                    SysUser designResponsible = sysUserService.getById(project.getDesignResponsibleId());
+                    projectMember.setDesignResponsibleName(designResponsible.getRealname());
+                    Advertiser advertiser = advertiserService.getById(project.getAdvertiserId());
+                    projectMember.setAdvertiserName(advertiser.getName());
+                    projectMember.setAdvertiserId(project.getAdvertiserId());
                     member.setAdvertiserId(project.getAdvertiserId());
                     member.setMediaId(project.getMediaId());
                     member.setMaxBid(project.getMaxBid());

+ 7 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java

@@ -20,8 +20,10 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 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.mapper.ProjectMemberMapper;
+import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -54,6 +56,8 @@ public class UserAllocationController {
     private ProjectMemberMapper memberMapper;
     @Autowired
     private IProjectMemberService projectMemberService;
+    @Autowired
+    private IAdvertiserService advertiserService;
 
     @GetMapping(value = "/accountTurnProject")
     public Result<Object> getAccountList(Long accountId, Long projectId) {
@@ -85,7 +89,8 @@ public class UserAllocationController {
             userAllocations.setProjectName(project.getProjectName());
             userAllocations.setMediaId(project.getMediaId());
             userAllocations.setAdvertiserId(project.getAdvertiserId());
-            userAllocations.setAdvertiserName(project.getAdvertiserName());
+            Advertiser advertiser = advertiserService.getById(project.getAdvertiserId());
+            userAllocations.setAdvertiserName(advertiser.getName());
             userAllocationService.save(userAllocations);
             QueryWrapper<ProjectMember> memberQueryWrapper = new QueryWrapper<>();
             memberQueryWrapper.eq("user_id", userAllocations.getUserId());
@@ -362,7 +367,7 @@ public class UserAllocationController {
     public Result<List<UserAllocation>> selectAccountListByProjectId(Long projectId) {
         Result<List<UserAllocation>> result = new Result<>();
         try {
-            List<UserAllocation> userAllocations = userAllocationService.getByParams(projectId,null,null);
+            List<UserAllocation> userAllocations = userAllocationService.getByParams(projectId, null, null);
             result.setSuccess(true);
             result.setResult(userAllocations);
         } catch (Exception e) {

+ 0 - 28
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/Advertiser.java

@@ -29,7 +29,6 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value = "ctop_advertiser对象", description = "广告主信息表")
 public class Advertiser {
-
     /**
      * 主键ID
      */
@@ -42,32 +41,7 @@ public class Advertiser {
     @Excel(name = "广告主名称", width = 15)
     @ApiModelProperty(value = "广告主名称")
     private String name;
-    /**
-     * 行业ID
-     */
-    @Excel(name = "行业ID", width = 15)
-    @ApiModelProperty(value = "行业ID")
-    @Dict(dicCode = "id",dictTable="sys_category",dicText="name")
-    private String industryId;
-    private String industryCode;
-    /**
-     * 销售ID
-     */
-    @Excel(name = "销售ID", width = 15)
-    @ApiModelProperty(value = "销售ID")
-    @Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
-    private String saleId;
-    /**
-     * 销售ID
-     */
-    @Excel(name = "广告主类别", width = 15)
-    @ApiModelProperty(value = "广告主类别")
-    private Integer advertiserType;
 
-    /**
-     * 代理商Id
-     */
-    private Long agentId;
 
     /**
      * 联系人姓名
@@ -119,8 +93,6 @@ public class Advertiser {
 
     private String companyId;
 
-    @TableField(exist = false)
-    private String saleName;
 
 
 }

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ProjectMember.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.entity;
 
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -47,6 +48,8 @@ public class ProjectMember implements  Serializable{
     @Excel(name = "项目名称", width = 15)
     @ApiModelProperty(value = "项目名称")
     private String projectName;
+
+
     /**
      * 成员id
      */

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/PerformanceSaleServiceImpl.java

@@ -127,7 +127,7 @@ public class PerformanceSaleServiceImpl implements IPerformanceSaleService {
         detail.setQuarter(quarter);
         detail.setStartDate(startDate);
         detail.setEndDate(endDate);
-        detail.setExtensionSelf(advertiser.getAdvertiserType());
+     //   detail.setExtensionSelf(advertiser.getAdvertiserType());
         detail.setBrandNew(brandNew);
         if (user.getOrgCode().startsWith(CtopAdConstant.HB_BYTEDANCE_SALE_ORG_CODE)) {
             detail.setMediaType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/SalePerformanceDetailServiceImpl.java

@@ -137,7 +137,7 @@ public class SalePerformanceDetailServiceImpl extends ServiceImpl<SalePerformanc
         detail.setQuarter(quarter);
         detail.setStartDate(startDate);
         detail.setEndDate(endDate);
-        detail.setExtensionSelf(advertiser.getAdvertiserType());
+     //   detail.setExtensionSelf(advertiser.getAdvertiserType());
         detail.setBrandNew(brandNew);
         if (null != user.getOrgCode()) {
             if (user.getOrgCode().startsWith(CtopAdConstant.HB_BYTEDANCE_SALE_ORG_CODE)) {

+ 1 - 1
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -76,7 +76,7 @@ public class SampleTest {
     }
 
     static ExecutorService executorService = null;
-    //线程计数器
+    //线程计数器/bytedance/bytedanceMaterialReport
     static CountDownLatch countDownLatch = null;
 
     @Test

+ 6 - 11
module-common/src/main/java/cn/com/ctop/common/module/controller/ProductController.java

@@ -66,8 +66,13 @@ public class ProductController {
                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                 HttpServletRequest req) {
         Result<IPage<Product>> result = new Result<>();
+        String productName = product.getProductName();
+        product.setProductName(null);
         QueryWrapper<Product> queryWrapper = QueryGenerator.initQueryWrapper(product, req.getParameterMap());
-        Page<Product> page = new Page<Product>(pageNo, pageSize);
+        if (!Check.isNull(productName)) {
+            queryWrapper.like("product_name", productName);
+        }
+        Page<Product> page = new Page<>(pageNo, pageSize);
         IPage<Product> pageList = productService.page(page, queryWrapper);
         result.setSuccess(true);
         result.setResult(pageList);
@@ -83,16 +88,6 @@ public class ProductController {
         Result<List<Product>> result = new Result<>();
         QueryWrapper<Product> queryWrapper = QueryGenerator.initQueryWrapper(product, req.getParameterMap());
         List<Product> list = productService.list(queryWrapper);
-        if (!Check.isNull(list)) {
-            for (Product productVo : list) {
-                String userName = productService.getUserNameByUserId(productVo.getUserId());
-                if (!Check.isNull(userName)) {
-                    productVo.setUserName(userName);
-                }
-            }
-        }
-
-
         result.setSuccess(true);
         result.setResult(list);
         return result;

+ 0 - 29
module-common/src/main/java/cn/com/ctop/common/module/entity/Advertiser.java

@@ -42,32 +42,6 @@ public class Advertiser {
     @Excel(name = "广告主名称", width = 15)
     @ApiModelProperty(value = "广告主名称")
     private String name;
-    /**
-     * 行业ID
-     */
-    @Excel(name = "行业ID", width = 15)
-    @ApiModelProperty(value = "行业ID")
-    @Dict(dicCode = "id",dictTable="sys_category",dicText="name")
-    private String industryId;
-    private String industryCode;
-    /**
-     * 销售ID
-     */
-    @Excel(name = "销售ID", width = 15)
-    @ApiModelProperty(value = "销售ID")
-    @Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
-    private String saleId;
-    /**
-     * 销售ID
-     */
-    @Excel(name = "广告主类别", width = 15)
-    @ApiModelProperty(value = "广告主类别")
-    private Integer advertiserType;
-
-    /**
-     * 代理商Id
-     */
-    private Long agentId;
 
     /**
      * 联系人姓名
@@ -119,8 +93,5 @@ public class Advertiser {
 
     private String companyId;
 
-    @TableField(exist = false)
-    private String saleName;
-
 
 }

+ 6 - 6
module-common/src/main/java/cn/com/ctop/common/module/entity/Product.java

@@ -1,7 +1,7 @@
 package cn.com.ctop.common.module.entity;
 
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -44,13 +44,18 @@ public class Product {
      */
     @Excel(name = "advertiserId", width = 15)
     @ApiModelProperty(value = "advertiserId")
+    @Dict(dicCode = "id", dictTable = "ctop_advertiser", dicText = "name")
     private String advertiserId;
     /**
      * 创建人
      */
     @Excel(name = "创建人", width = 15)
     @ApiModelProperty(value = "创建人")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     private String userId;
+
+    @Dict(dicCode = "code", dictTable = "sys_category", dicText = "name")
+    private String industryCode;
     /**
      * 1正常0删除
      */
@@ -67,9 +72,4 @@ public class Product {
      */
     @ApiModelProperty(value = "updateTime")
     private Date updateTime;
-
-    @TableField(exist = false)
-    private String userName;
-
-
 }

+ 15 - 15
module-common/src/main/java/cn/com/ctop/common/module/entity/Project.java

@@ -47,16 +47,15 @@ public class Project {
      */
     @Excel(name = "广告主id", width = 15)
     @ApiModelProperty(value = "广告主id")
+    @Dict(dicCode = "id", dictTable = "ctop_advertiser", dicText = "name")
     private String advertiserId;
 
-    @Excel(name = "广告主名称", width = 15)
-    @ApiModelProperty(value = "广告主名称")
-    private String advertiserName;
 
-    @Dict(dicCode = "id", dictTable = "sys_category", dicText = "name")
-    private String industryId;
-    @Dict(dicCode = "code", dictTable = "sys_category", dicText = "name")
-    private String industryCode;
+    @Excel(name = "产品id", width = 15)
+    @ApiModelProperty(value = "广告主id")
+    @Dict(dicCode = "id", dictTable = "ctop_product", dicText = "product_name")
+    private Long productId;
+
     /**
      * 创建人
      */
@@ -68,21 +67,15 @@ public class Project {
      */
     @Excel(name = "负责人id", width = 15)
     @ApiModelProperty(value = "负责人id")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     private String responsibleId;
 
 
-    @Excel(name = "负责人名称", width = 15)
-    @ApiModelProperty(value = "负责人名称")
-    private String responsibleName;
-
     @Excel(name = "设计负责人", width = 15)
     @ApiModelProperty(value = "设计负责人")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     private String designResponsibleId;
 
-    @Excel(name = "设计负责人名称", width = 15)
-    @ApiModelProperty(value = "设计负责人名称")
-    private String designResponsibleName;
-
 
     @Excel(name = "公司id", width = 15)
     @ApiModelProperty(value = "公司id")
@@ -134,4 +127,11 @@ public class Project {
     @TableField(exist = false)
     private Integer needExamine;
 
+
+   /* @TableField(exist = false)
+    private String responsibleName; // 运营负责人
+
+
+    private String designResponsibleName; // 产品负责人
+*/
 }