From 2567631e207e7e074b5ff70488f1662e60d9f271 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Fri, 20 Oct 2023 10:12:48 +0800 Subject: [PATCH] 10/20 --- .../ProjectInformationService.java | 55 +++++-------------- .../biz/projectzzfiles/ProjectZzFiles.java | 3 +- .../projectzzfiles/ProjectZzFilesMapper.java | 4 +- .../projectzzfiles/ProjectZzFilesService.java | 25 +++++++-- .../system/sysuser/SysUserService.java | 7 ++- 5 files changed, 43 insertions(+), 51 deletions(-) diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java index d05b4824..c09611f4 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java @@ -137,25 +137,11 @@ public class ProjectInformationService extends MybatisBaseService 0) { - List> maps = new ArrayList<>(); for (ProjectZzFilesDto projectZzFilesDto : dto.getIdCardList()) { - String[] zzFile = projectZzFilesDto.getUrls(); - if (zzFile != null) { - for (String s : zzFile) { - Map m = new HashMap<>(); - m.put("projectSid", projectSid); - m.put("enterpriseSid", projectZzFilesDto.getEnterpriseSid()); - m.put("url", s); - m.put("sid", UUID.randomUUID().toString()); - m.put("idCardType", projectZzFilesDto.getIdCardType()); - m.put("idCardName", projectZzFilesDto.getIdCardName()); - maps.add(m); - } - } - } - if (maps.size() > 0) { - projectZzFilesService.insertFiles(maps); + projectZzFilesDto.setProjectSid(projectSid); } + projectZzFilesService.insertFiles(dto.getIdCardList()); + }else{ projectZzFilesService.deleteByProjectSid(projectSid); } @@ -270,32 +256,19 @@ public class ProjectInformationService extends MybatisBaseService enterpriseProjectVoList = enterpriseProjectService.getEnterpriseByProjectSid(sid); projectInfoVo.setEnterpriseList(enterpriseProjectVoList); //章证 - List zzFilesVos = new ArrayList<>(); - enterpriseProjectVoList.forEach(s -> { - ProjectZzFilesVo projectZzFilesVo = new ProjectZzFilesVo(); - List> maps =new ArrayList<>(); - List projectZzFilesVos = projectZzFilesService.getZzFilesByProjectSid(bank.getSid(), s.getEnterpriseSid()).getData(); - if (projectZzFilesVos.size() != 0) { - projectZzFilesVos.forEach(j -> { + List projectZzFilesVos = projectZzFilesService.getZzFilesByProjectSid(bank.getSid()).getData(); + if (projectZzFilesVos.size() != 0) { + projectZzFilesVos.forEach(j -> { + List> maps =new ArrayList<>(); + for(String r:j.getUrl().split(",")){ Map map=new HashMap<>(); - map.put("url",j.getUrl()); -// if (StringUtils.isEmpty(projectZzFilesVo.getUrl())) { -// projectZzFilesVo.setUrl(j.getUrl()); -// } else { -// projectZzFilesVo.setUrl(projectZzFilesVo.getUrl() + "," + j.getUrl()); -// } + map.put("url",r); maps.add(map); - }); - projectZzFilesVo.setProjectSid(projectZzFilesVos.get(0).getProjectSid()); - projectZzFilesVo.setEnterpriseSid(projectZzFilesVos.get(0).getEnterpriseSid()); - projectZzFilesVo.setIdCardType(projectZzFilesVos.get(0).getIdCardType()); - projectZzFilesVo.setIdCardName(projectZzFilesVos.get(0).getIdCardName()); - projectZzFilesVo.setEnterpriseName(projectZzFilesVos.get(0).getEnterpriseName()); - projectZzFilesVo.setUrls(maps); - zzFilesVos.add(projectZzFilesVo); - } - }); - projectInfoVo.setIdCardList(zzFilesVos); + } + j.setUrls(maps); + }); + } + projectInfoVo.setIdCardList(projectZzFilesVos); //账户 List ProjectAccountVos = projectAccountService.getAccountByProjectSid(bank.getSid()).getData(); projectInfoVo.setBankList(ProjectAccountVos); diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFiles.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFiles.java index d8f0f355..b119f8de 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFiles.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFiles.java @@ -1,5 +1,6 @@ package com.yxt.supervise.crm.biz.projectzzfiles; +import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; import com.yxt.common.core.domain.EntityWithId; @@ -14,7 +15,7 @@ import lombok.Data; @ApiModel(value = "项目章证关联", description = "项目章证关联") @TableName("project_zz_files") public class ProjectZzFiles extends EntityWithId { - private String sid; + private String sid= IdUtil.fastSimpleUUID(); private String url; private String projectSid; private String enterpriseSid; diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesMapper.java index 79596a96..3d0644b2 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesMapper.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesMapper.java @@ -22,7 +22,7 @@ public interface ProjectZzFilesMapper extends BaseMapper { void insertFiles(List> maps); @Select("select * from project_state_dictionary where sid=#{sid}") ProjectZzFilesVo getProjectStateBySid(@Param("sid")String sid); - @Select("select p.*,e.enterpriseName as enterpriseName from project_zz_files p left join enterprise_information e on e.sid =p.enterpriseSid where projectSid=#{projectSid} and enterpriseSid=#{enterpriseSid}") - List getZzFilesByProjectSid(@Param("projectSid")String projectSid,@Param("enterpriseSid")String enterpriseSid); + @Select("select p.*,e.enterpriseName as enterpriseName from project_zz_files p left join enterprise_information e on e.sid =p.enterpriseSid where projectSid=#{projectSid}") + List getZzFilesByProjectSid(@Param("projectSid")String projectSid); } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesService.java index 23149cca..3f03e1ba 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -38,15 +39,27 @@ public class ProjectZzFilesService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } - public ResultBean insertFiles(List> maps) { + public ResultBean insertFiles(List dtos) { ResultBean rb=new ResultBean(); // - for(Map map: maps){ - baseMapper.delete(new QueryWrapper().eq("projectSid",map.get("projectSid").toString()).eq("enterpriseSid",map.get("enterpriseSid"))); + for(ProjectZzFilesDto dto: dtos){ + baseMapper.delete(new QueryWrapper().eq("projectSid",dto.getProjectSid()).eq("enterpriseSid",dto.getEnterpriseSid())); + } + ProjectZzFiles entity=new ProjectZzFiles(); + for(ProjectZzFilesDto dto: dtos){ + BeanUtil.copyProperties(dto, entity, "id", "sid"); + for(String d:dto.getUrls()){ + if(StringUtils.isBlank(entity.getUrl())){ + entity.setUrl(d); + }else{ + entity.setUrl(entity.getUrl()+","+d); + } + } + baseMapper.insert(entity); } - baseMapper.insertFiles(maps); return rb.success(); } + public ResultBean save(ProjectZzFilesDto dto) { ResultBean rb=new ResultBean(); ProjectZzFiles entity=new ProjectZzFiles(); @@ -79,9 +92,9 @@ public class ProjectZzFilesService extends MybatisBaseService> getZzFilesByProjectSid(String projectSid,String enterpriseSid) { + public ResultBean> getZzFilesByProjectSid(String projectSid ) { ResultBean rb=new ResultBean(); - List projectStateBySids=baseMapper.getZzFilesByProjectSid(projectSid,enterpriseSid); + List projectStateBySids=baseMapper.getZzFilesByProjectSid(projectSid); return rb.success().setData(projectStateBySids); } } diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java index d233d23a..70688980 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java @@ -233,6 +233,9 @@ public class SysUserService extends MybatisBaseService { } public SysUser getUserBySid(String sid) { SysUser entity = this.fetchBySid(sid); + if(null==entity){ + return new SysUser(); + } SysStaffinfo sysStaffinfo=sysStaffinfoService.fetchBySid(entity.getStaffSid()); List s=userRoleService.list(new QueryWrapper().eq("userSid",sid)); List roles=new ArrayList<>(); @@ -242,7 +245,9 @@ public class SysUserService extends MybatisBaseService { roles.add(sysRole.getName()); } } - entity.setName(sysStaffinfo.getName()); + if(null!=sysStaffinfo){ + entity.setName(sysStaffinfo.getName()); + } entity.setRoleNames(roles); return entity; }