10/19

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectService.java

@@ -72,6 +72,11 @@ public class EnterpriseProjectService extends MybatisBaseService<EnterpriseProje
         baseMapper.delete(new QueryWrapper<EnterpriseProject>().eq("sid",sid));
         return rb.success().setMsg("删除企业信息成功");
     }
+    public ResultBean deleteByProjectSid(String projectSid) {
+        ResultBean rb=new ResultBean();
+        baseMapper.delete(new QueryWrapper<EnterpriseProject>().eq("projectSid",projectSid));
+        return rb.success().setMsg("删除企业信息成功");
+    }
     public List<EnterpriseProjectVo> EnterpriseList(){
         return baseMapper.EnterpriseList();
     }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountService.java

@@ -46,7 +46,8 @@ public class ProjectAccountService extends MybatisBaseService<ProjectAccountMapp
     public ResultBean save(List<ProjectAccountDto> dtos) {
         ResultBean rb=new ResultBean();
         //新增先删除
-        baseMapper.delete(new QueryWrapper<ProjectAccount>().eq("projectSid",dtos.get(0).getProjectSid()).eq("enterpriseSid",dtos.get(0).getEnterpriseSid()));
+//        baseMapper.delete(new QueryWrapper<ProjectAccount>().eq("projectSid",dtos.get(0).getProjectSid()).eq("enterpriseSid",dtos.get(0).getEnterpriseSid()));
+        baseMapper.delete(new QueryWrapper<ProjectAccount>().eq("projectSid",dtos.get(0).getProjectSid()));
         for(ProjectAccountDto dto:dtos){
             ProjectAccount entity=new ProjectAccount();
             BeanUtil.copyProperties(dto, entity, "id", "sid");
@@ -69,6 +70,11 @@ public class ProjectAccountService extends MybatisBaseService<ProjectAccountMapp
         baseMapper.delete(new QueryWrapper<ProjectAccount>().eq("sid",sid));
         return rb.success().setMsg("删除项目信息成功");
     }
+    public ResultBean deleteByProjectSid(String projectSid) {
+        ResultBean rb=new ResultBean();
+        baseMapper.delete(new QueryWrapper<ProjectAccount>().eq("projectSid",projectSid));
+        return rb.success().setMsg("删除项目信息成功");
+    }
     public ResultBean getProjectAccountBySid(String sid) {
         ResultBean rb=new ResultBean();
         ProjectAccountVo projectStateBySid=baseMapper.getProjectStateBySid(sid);

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInfoDto.java

@@ -14,6 +14,7 @@ import java.util.List;
  */
 @Data
 public class ProjectInfoDto {
+    private String id;
     private String sid;
     private ProjectInformationDto baseInfo;
     //章证

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml

@@ -26,6 +26,7 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        order by info.createTime desc
     </select>
     <select id="getProjectBySid" resultType="com.yxt.supervise.crm.biz.projectinformation.ProjectInformationVo">
         SELECT

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java

@@ -82,6 +82,16 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         }
         IPage<ProjectInformation> page = PagerUtil.queryToPage(pq);
         IPage<ProjectInformationVo> pagging = baseMapper.selectPageVo(page, qw);
+        for(ProjectInformationVo vo:pagging.getRecords()){
+            SysUser sysUser = sysUserFeign.getUserBySid(vo.getManagerSid()).getData();
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(vo.getBankSid()).getData();
+            if(null!=sysOrganizationVo){
+                vo.setBankName(sysOrganizationVo.getName());
+            }
+            if(null!=sysUser){
+                vo.setBManagerName(sysUser.getName());
+            }
+        }
         PagerVo<ProjectInformationVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -95,10 +105,11 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
     public ResultBean save(ProjectInfoDto dto) {
         ResultBean rb = new ResultBean();
         ProjectInformation entity = new ProjectInformation();
-        if (null != dto.getSid()) {
-            baseMapper.delete(new QueryWrapper<ProjectInformation>().eq("sid", dto.getSid()));
-        }
         BeanUtil.copyProperties(dto.getBaseInfo(), entity, "id", "sid");
+//        String projectSid="";
+        if (StringUtils.isNotBlank(dto.getSid())) {
+            entity.setSid(dto.getSid());
+        }
         String projectSid = entity.getSid();
         //企业
         if (dto.getEnterpriseList().size() != 0) {
@@ -106,6 +117,8 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
                 enterpriseProjectDto.setProjectSid(projectSid);
             }
             enterpriseProjectService.save(dto.getEnterpriseList());
+        }else {
+            enterpriseProjectService.deleteByProjectSid(projectSid);
         }
         //资金账户
         if (dto.getBankList().size() != 0) {
@@ -113,6 +126,8 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
                 projectAccountDto.setProjectSid(projectSid);
             }
             projectAccountService.save(dto.getBankList());
+        }else{
+            projectAccountService.deleteByProjectSid(projectSid);
         }
         //关联章证
         if (dto.getIdCardList().size() > 0) {
@@ -135,13 +150,17 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
             if (maps.size() > 0) {
                 projectZzFilesService.insertFiles(maps);
             }
+        }else{
+            projectZzFilesService.deleteByProjectSid(projectSid);
         }
         //绑定仓库
-        if (dto.getIdCardList().size() > 0) {
+        if (dto.getWarehouse().size() > 0) {
             for (StoreHouseProjectDto storeHouseProjectDto : dto.getWarehouse()) {
                 storeHouseProjectDto.setProjectSid(projectSid);
             }
             storeHouseProjectService.saveOrUpdateDto(dto.getWarehouse());
+        }else{
+            storeHouseProjectService.deleteByProjectSid(projectSid);
         }
 
 
@@ -159,7 +178,15 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
 //                baseMapper.insertFiles(maps);
 //            }
 //        }
-        baseMapper.insert(entity);
+        if(StringUtils.isNotBlank(dto.getSid())){
+            System.out.println(entity);
+            ProjectInformation projectInformation=baseMapper.selectOne(new QueryWrapper<ProjectInformation>().eq("sid",dto.getSid()));
+            BeanUtil.copyProperties(dto.getBaseInfo(), projectInformation, "id", "sid");
+            baseMapper.updateById(projectInformation);
+        }else{
+            baseMapper.insert(entity);
+        }
+
         return rb.success().setMsg("保存项目信息成功");
     }
 
@@ -225,8 +252,12 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
             //主体
             SysUser sysUser = sysUserFeign.getUserBySid(bank.getManagerSid()).getData();
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(bank.getBankSid()).getData();
-            bank.setBankName(sysOrganizationVo.getName());
+            if(null!=sysOrganizationVo){
-            bank.setBManagerName(sysUser.getName());
+                bank.setBankName(sysOrganizationVo.getName());
+            }
+            if(null!=sysUser){
+                bank.setBManagerName(sysUser.getName());
+            }
             projectInfoVo.setBaseInfo(bank);
             projectInfoVo.setSid(bank.getSid());
             //企业

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesService.java

@@ -68,6 +68,11 @@ public class ProjectZzFilesService extends MybatisBaseService<ProjectZzFilesMapp
         baseMapper.delete(new QueryWrapper<ProjectZzFiles>().eq("sid",sid));
         return rb.success().setMsg("删除项目信息成功");
     }
+    public ResultBean deleteByProjectSid(String projectSid) {
+        ResultBean rb=new ResultBean();
+        baseMapper.delete(new QueryWrapper<ProjectZzFiles>().eq("projectSid",projectSid));
+        return rb.success().setMsg("删除项目信息成功");
+    }
     public ResultBean getProjectZzFilesBySid(String sid) {
         ResultBean rb=new ResultBean();
         ProjectZzFilesVo projectStateBySid=baseMapper.getProjectStateBySid(sid);

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java

@@ -4,9 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
 import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProject;
 import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectDto;
 import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectVo;
+import com.yxt.supervise.crm.biz.projectzzfiles.ProjectZzFiles;
 import com.yxt.supervise.crm.feign.wh.ShStorehouseFeign;
 import com.yxt.supervise.crm.feign.wh.ShStorehouseVo;
 import org.apache.commons.lang3.StringUtils;
@@ -71,11 +73,13 @@ public class StoreHouseProjectService extends MybatisBaseService<StoreHouseProje
         for(StoreHouseProjectVo vo:pagging){
             String shSid=vo.getShSid();
             ShStorehouseVo shStorehouseVo=shStorehouseFeign.selectStoreBySid(shSid).getData();
-            vo.setName(shStorehouseVo.getName());
+            if(null!=shStorehouseVo){
-            vo.setPicUrl(shStorehouseVo.getPicUrl());
+                vo.setName(shStorehouseVo.getName());
-            vo.setAddress(shStorehouseVo.getAddress());
+                vo.setPicUrl(shStorehouseVo.getPicUrl());
-            vo.setLinkerName(shStorehouseVo.getLinkerName());
+                vo.setAddress(shStorehouseVo.getAddress());
-            vo.setLinkerPhone(shStorehouseVo.getLinkerPhone());
+                vo.setLinkerName(shStorehouseVo.getLinkerName());
+                vo.setLinkerPhone(shStorehouseVo.getLinkerPhone());
+            }
         }
         return pagging;
     }
@@ -88,4 +92,9 @@ public class StoreHouseProjectService extends MybatisBaseService<StoreHouseProje
         List<String> pagging = baseMapper.getAllShSid();
         return pagging;
     }
+    public ResultBean deleteByProjectSid(String projectSid) {
+        ResultBean rb=new ResultBean();
+        baseMapper.delete(new QueryWrapper<StoreHouseProject>().eq("projectSid",projectSid));
+        return rb.success().setMsg("删除项目信息成功");
+    }
 }