Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessInfoController.java

@@ -58,9 +58,9 @@ public class BusinessInfoController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:info:list')")
     @GetMapping("/browse/{businessId}")
-    public AjaxResult browse(@PathVariable Integer id)
+    public AjaxResult browse(@PathVariable Integer businessId)
     {
-        return success(businessInfoService.browse(id));
+        return success(businessInfoService.browse(businessId));
     }
 
     /**
@@ -74,14 +74,14 @@ public class BusinessInfoController extends BaseController
     }
 
     /**
-     * 删除项目列表
+     * 删除项目
      */
 //    @PreAuthorize("@ss.hasPermi('system:info:remove')")
 //    @Log(title = "项目详情", businessType = BusinessType.DELETE)
     @DeleteMapping("/remove/{ids}")
-    public AjaxResult remove(@PathVariable(value = "ids",required=false) Long[] ids)
+    public AjaxResult remove(@PathVariable(value = "ids",required=false) Long id)
     {
-        return toAjax(businessInfoService.deleteBusinessInfoByIds(ids));
+        return toAjax(businessInfoService.deleteBusinessInfoById(id));
     }
 
     /**

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessInfo.java

@@ -102,10 +102,6 @@ public class BusinessInfo extends BaseEntity
     @Excel(name = "项目类别")
     private String projectCategory;
 
-    /** 商务团队 */
-    @Excel(name = "商务团队")
-    private String team;
-
     /** 0 仅自己可见，1 他人可见 */
     @Excel(name = "0 仅自己可见，1 他人可见")
     private Integer isPrivate;
@@ -313,15 +309,7 @@ public class BusinessInfo extends BaseEntity
     {
         return projectCategory;
     }
-    public void setTeam(String team)
-    {
-        this.team = team;
-    }
 
-    public String getTeam()
-    {
-        return team;
-    }
     public void setIsPrivate(Integer isPrivate)
     {
         this.isPrivate = isPrivate;
@@ -354,7 +342,6 @@ public class BusinessInfo extends BaseEntity
             .append("districtId", getDistrictId())
             .append("projectType", getProjectType())
             .append("projectCategory", getProjectCategory())
-            .append("team", getTeam())
             .append("isPrivate", getIsPrivate())
             .append("createTime", getCreateTime())
             .append("updateTime", getUpdateTime())

dsk-system/src/main/java/com/dsk/system/domain/vo/BusinessBrowseVo.java

@@ -98,5 +98,10 @@ public class BusinessBrowseVo {
      */
     private Integer relateCompanyCount;
 
+    /**
+     * 相关企业统计
+     */
+    private Integer fileCount;
+
 
 }

dsk-system/src/main/java/com/dsk/system/mapper/BusinessBacklogMapper.java

@@ -44,12 +44,12 @@ public interface BusinessBacklogMapper
     public int updateBusinessBacklog(BusinessBacklog businessBacklog);
 
     /**
-     * 删除项目工作待办
+     * 根据项目id删除项目工作待办
      * 
-     * @param id 项目工作待办主键
+     * @param businessId 项目id主键
      * @return 结果
      */
-    public int deleteBusinessBacklogById(Long id);
+    public int deleteBacklogByBusinessId(Long businessId);
 
     /**
      * 批量删除项目工作待办

dsk-system/src/main/java/com/dsk/system/mapper/BusinessContactsMapper.java

@@ -47,10 +47,10 @@ public interface BusinessContactsMapper
     /**
      * 删除项目联系人
      * 
-     * @param id 项目联系人主键
+     * @param businessId 项目联系人主键
      * @return 结果
      */
-    public int deleteBusinessContactsById(Long id);
+    public int deleteBusinessContactsByBusinessId(Long businessId);
 
     /**
      * 批量删除项目联系人

dsk-system/src/main/java/com/dsk/system/mapper/BusinessFollowRecordMapper.java

@@ -53,12 +53,12 @@ public interface BusinessFollowRecordMapper
     public int updateBusinessFollowRecord(BusinessFollowRecord businessFollowRecord);
 
     /**
-     * 删除项目跟进记录
+     * 根据项目id删除项目跟进记录
      * 
-     * @param id 项目跟进记录主键
+     * @param businessId 项目主键id
      * @return 结果
      */
-    public int deleteBusinessFollowRecordById(Long id);
+    public int deleteBusinessFollowRecordByBusinessId(Long businessId);
 
     /**
      * 批量删除项目跟进记录

dsk-system/src/main/java/com/dsk/system/mapper/BusinessInfoMapper.java

@@ -84,7 +84,7 @@ public interface BusinessInfoMapper extends BaseMapper<BusinessInfo>
     public int deleteBusinessInfoByIds(Long[] ids);
 
     /**
-     * 根据项目统计
+     * 统计项目相关的信息数量
      * @param business
      * @return
      */

dsk-system/src/main/java/com/dsk/system/mapper/BusinessLabelMapper.java

@@ -53,6 +53,14 @@ public interface BusinessLabelMapper
      */
     public int deleteBusinessLabelById(BusinessIdDto dto);
 
+    /**
+     * 根据项目id删除项目标签
+     *
+     * @param businessId 项目主键
+     * @return 结果
+     */
+    public int deleteBusinessLabelByBusinessId(Long businessId);
+
     /**
      * 批量删除项目标签
      * 

dsk-system/src/main/java/com/dsk/system/mapper/BusinessRelateCompanyMapper.java

@@ -2,7 +2,6 @@ package com.dsk.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsk.common.core.domain.entity.BusinessRelateCompany;
-import com.dsk.system.domain.customer.CustomerDecisionChain;
 
 import java.util.List;
 
@@ -52,7 +51,7 @@ public interface BusinessRelateCompanyMapper extends BaseMapper<BusinessRelateCo
      * @param id 项目关联单位主键
      * @return 结果
      */
-    public int deleteBusinessRelateCompanyById(Long id);
+    public int deleteRelateCompanyByBusinessId(Long id);
 
     /**
      * 批量删除项目关联单位

dsk-system/src/main/java/com/dsk/system/mapper/BusinessUserMapper.java

@@ -19,6 +19,14 @@ public interface BusinessUserMapper
      */
     public BusinessUser selectBusinessUserById(Long id);
 
+    /**
+     * 根据项目id查询项目的创建者
+     *
+     * @param businessId 项目id主键
+     * @return 项目创建者名称
+     */
+    String selectCreatorBybusinessId(Integer businessId);
+
     /**
      * 查询项目用户关联列表
      * 
@@ -44,12 +52,12 @@ public interface BusinessUserMapper
     public int updateBusinessUser(BusinessUser businessUser);
 
     /**
-     * 删除项目用户关联
+     * 根据项目id删除项目用户关联
      * 
-     * @param id 项目用户关联主键
+     * @param businessId 项目用户关联主键
      * @return 结果
      */
-    public int deleteBusinessUserById(Long id);
+    public int deleteBusinessUserByBusinessId(Long businessId);
 
     /**
      * 批量删除项目用户关联

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessBacklogServiceImpl.java

@@ -97,6 +97,6 @@ public class BusinessBacklogServiceImpl implements IBusinessBacklogService
     @Override
     public int deleteBusinessBacklogById(Long id)
     {
-        return businessBacklogMapper.deleteBusinessBacklogById(id);
+        return businessBacklogMapper.deleteBacklogByBusinessId(id);
     }
 }

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessContactsServiceImpl.java

@@ -98,6 +98,6 @@ public class BusinessContactsServiceImpl implements IBusinessContactsService
     @Override
     public int deleteBusinessContactsById(Long id)
     {
-        return businessContactsMapper.deleteBusinessContactsById(id);
+        return businessContactsMapper.deleteBusinessContactsByBusinessId(id);
     }
 }

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessFollowRecordServiceImpl.java

@@ -92,6 +92,6 @@ public class BusinessFollowRecordServiceImpl implements IBusinessFollowRecordSer
     @Override
     public int deleteBusinessFollowRecordById(Long id)
     {
-        return businessFollowRecordMapper.deleteBusinessFollowRecordById(id);
+        return businessFollowRecordMapper.deleteBusinessFollowRecordByBusinessId(id);
     }
 }

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java

 package com.dsk.system.service.impl;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.entity.BusinessInfo;
 import com.dsk.common.core.domain.entity.BusinessLabel;
 import com.dsk.common.core.domain.entity.BusinessRelateCompany;
 import com.dsk.common.core.domain.entity.BusinessUser;
-import com.dsk.common.dtos.BusinessInfoDto;
 import com.dsk.common.utils.DateUtils;
-import com.dsk.common.utils.SecurityUtils;
 import com.dsk.system.domain.BusinessAddDto;
 import com.dsk.system.domain.BusinessListDto;
 import com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto;
 import com.dsk.system.domain.customer.vo.CustomerBusinessListVo;
 import com.dsk.system.domain.vo.BusinessBrowseVo;
 import com.dsk.system.domain.vo.BusinessListVo;
-import com.dsk.system.mapper.BusinessInfoMapper;
-import com.dsk.system.mapper.BusinessLabelMapper;
-import com.dsk.system.mapper.BusinessRelateCompanyMapper;
-import com.dsk.system.mapper.BusinessUserMapper;
+import com.dsk.system.mapper.*;
 import com.dsk.system.service.IBusinessInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -46,6 +40,12 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     private BusinessRelateCompanyMapper businessRelateCompanyMapper;
     @Resource
     private BusinessLabelMapper businessLabelMapper;
+    @Resource
+    private BusinessBacklogMapper businessBacklogMapper;
+    @Resource
+    private  BusinessContactsMapper businessContactsMapper;
+    @Resource
+    private BusinessFollowRecordMapper businessFollowRecordMapper;
 
     /**
      * 查询项目详情
@@ -80,10 +80,15 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         //查询项目基本信息
         BusinessInfo businessInfo = businessInfoMapper.selectBusinessInfoById(businessId);
         BeanUtil.copyProperties(businessInfo,businessBrowseVo);
+        //查询商务团队
+        String team = "";
+        team = businessUserMapper.selectCreatorBybusinessId(businessId);
+        businessBrowseVo.setTeam(team);
         //查询项目标签
         businessBrowseVo.setLabelList(businessLabelMapper.selectBusinessLabelList(new BusinessLabel(businessId)).stream().map(p -> p.getLabel()).collect(Collectors.toList()));
         //查询关键企业
         businessBrowseVo.setRelateCompany(businessRelateCompanyMapper.selectBusinessRelateCompanyList(new BusinessRelateCompany(businessId)));
+        //统计项目相关的信息数量
         BusinessBrowseVo total = businessInfoMapper.selectTotal(businessId);
         businessBrowseVo.setBacklogCount(total.getBacklogCount());
         businessBrowseVo.setContactsCount(total.getContactsCount());
@@ -117,7 +122,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
             //新增用户-项目关系信息
             int addbusinessUser = businessUserMapper.insertBusinessUser(new BusinessUser(businessInfo.getId(), deptId.intValue(), dto.getUserId(), 1));
             //新增项目-关联企业信息
-            int addRelateCompany = businessRelateCompanyMapper.insertBusinessRelateCompany(new BusinessRelateCompany(businessInfo.getId(), dto.getCompanyId(), dto.getOwnerCompany(), "业主"));
+            int addRelateCompany = businessRelateCompanyMapper.insertBusinessRelateCompany(new BusinessRelateCompany(businessInfo.getId(), dto.getCompanyId(), dto.getOwnerCompany(), "业主单位"));
             return addbusinessUser > 0 && addRelateCompany > 0 ? AjaxResult.success() : AjaxResult.error();
         }
         return AjaxResult.error();
@@ -157,8 +162,25 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
      * @return 结果
      */
     @Override
+    @Transactional
     public int deleteBusinessInfoById(Long id) {
-        return businessInfoMapper.deleteBusinessInfoById(id);
+        int removeBusiness = businessInfoMapper.deleteBusinessInfoById(id);
+        if (removeBusiness > 0) {
+            //删除用户关联项目
+            businessUserMapper.deleteBusinessUserByBusinessId(id);
+            //删除项目关联单位
+            businessRelateCompanyMapper.deleteRelateCompanyByBusinessId(id);
+            //删除项目关联工作待办
+            businessBacklogMapper.deleteBacklogByBusinessId(id);
+            //删除项目关联联系人
+            businessContactsMapper.deleteBusinessContactsByBusinessId(id);
+            //删除项目跟进记录
+            businessFollowRecordMapper.deleteBusinessFollowRecordByBusinessId(id);
+            //删除项目标签
+            businessLabelMapper.deleteBusinessLabelByBusinessId(id);
+            return 1;
+        }
+        return 0;
     }
 
     /**

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessRelateCompanyServiceImpl.java

@@ -4,7 +4,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.entity.BusinessRelateCompany;
 import com.dsk.common.exception.base.BaseException;
 import com.dsk.common.utils.CheckUtils;
@@ -104,7 +103,7 @@ public class BusinessRelateCompanyServiceImpl implements IBusinessRelateCompanyS
     @Override
     public int deleteBusinessRelateCompanyById(Long id)
     {
-        return businessRelateCompanyMapper.deleteBusinessRelateCompanyById(id);
+        return businessRelateCompanyMapper.deleteRelateCompanyByBusinessId(id);
     }
 
     @Override

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessUserServiceImpl.java

@@ -92,6 +92,6 @@ public class BusinessUserServiceImpl implements IBusinessUserService
     @Override
     public int deleteBusinessUserById(Long id)
     {
-        return businessUserMapper.deleteBusinessUserById(id);
+        return businessUserMapper.deleteBusinessUserByBusinessId(id);
     }
 }

dsk-system/src/main/resources/mapper/business/BusinessBacklogMapper.xml

@@ -82,10 +82,10 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteBusinessBacklogById" parameterType="Long">
+    <delete id="deleteBacklogByBusinessId" parameterType="Long">
         delete
         from business_backlog
-        where id = #{id}
+        where business_id = #{businessId}
     </delete>
 
     <delete id="deleteBusinessBacklogByIds" parameterType="String">

dsk-system/src/main/resources/mapper/business/BusinessContactsMapper.xml

@@ -93,10 +93,10 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteBusinessContactsById" parameterType="Long">
+    <delete id="deleteBusinessContactsByBusinessId" parameterType="Long">
         delete
         from business_contacts
-        where id = #{id}
+        where business_id = #{businessId}
     </delete>
 
     <delete id="deleteBusinessContactsByIds" parameterType="String">

dsk-system/src/main/resources/mapper/business/BusinessFollowRecordMapper.xml

@@ -107,10 +107,10 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteBusinessFollowRecordById" parameterType="Long">
+    <delete id="deleteBusinessFollowRecordByBusinessId" parameterType="Long">
         delete
         from business_follow_record
-        where id = #{id}
+        where business_id = #{businessId}
     </delete>
 
     <delete id="deleteBusinessFollowRecordByIds" parameterType="String">

dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml

@@ -24,7 +24,6 @@
         <result property="districtId" column="district_id"/>
         <result property="projectType" column="project_type"/>
         <result property="projectCategory" column="project_category"/>
-        <result property="team" column="team"/>
         <result property="isPrivate" column="is_private"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
@@ -52,7 +51,6 @@
                district_id,
                project_type,
                project_category,
-               team,
                is_private,
                create_time,
                update_time,
@@ -173,7 +171,6 @@
             <if test="districtId != null">district_id,</if>
             <if test="projectType != null">project_type,</if>
             <if test="projectCategory != null">project_category,</if>
-            <if test="team != null">team,</if>
             <if test="isPrivate != null">is_private,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
@@ -199,7 +196,6 @@
             <if test="districtId != null">#{districtId},</if>
             <if test="projectType != null">#{projectType},</if>
             <if test="projectCategory != null">#{projectCategory},</if>
-            <if test="team != null">#{team},</if>
             <if test="isPrivate != null">#{isPrivate},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
@@ -229,7 +225,6 @@
             <if test="districtId != null">district_id = #{districtId},</if>
             <if test="projectType != null">project_type = #{projectType},</if>
             <if test="projectCategory != null">project_category = #{projectCategory},</if>
-            <if test="team != null">team = #{team},</if>
             <if test="isPrivate != null">is_private = #{isPrivate},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>

dsk-system/src/main/resources/mapper/business/BusinessLabelMapper.xml

@@ -71,4 +71,9 @@
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteBusinessLabelByBusinessId">
+        delete
+        from business_label
+        where business_id = #{businessId}
+    </delete>
 </mapper>
\ No newline at end of file

dsk-system/src/main/resources/mapper/business/BusinessRelateCompanyMapper.xml

@@ -97,10 +97,10 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteBusinessRelateCompanyById" parameterType="Long">
+    <delete id="deleteRelateCompanyByBusinessId" parameterType="Long">
         delete
         from business_relate_company
-        where id = #{id}
+        where business_id = #{businessId}
     </delete>
 
     <delete id="deleteBusinessRelateCompanyByIds" parameterType="String">

dsk-system/src/main/resources/mapper/business/BusinessUserMapper.xml

@@ -33,6 +33,12 @@
         <include refid="selectBusinessUserVo"/>
         where id = #{id}
     </select>
+    <select id="selectCreatorBybusinessId" resultType="java.lang.String">
+        select u.nick_name
+        from business_user b
+        left join sys_user u on u.user_id = b.user_id
+        where b.is_founder = 1 and business_id =#{businessId}
+    </select>
 
     <insert id="insertBusinessUser" parameterType="com.dsk.common.core.domain.entity.BusinessUser" useGeneratedKeys="true" keyProperty="id">
         insert into business_user
@@ -67,10 +73,10 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteBusinessUserById" parameterType="Long">
+    <delete id="deleteBusinessUserByBusinessId" parameterType="Long">
         delete
         from business_user
-        where id = #{id}
+        where business_id = #{businessId} and is_founder = 1
     </delete>
 
     <delete id="deleteBusinessUserByIds" parameterType="String">