项目和企业关联接口

warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java

@@ -148,11 +148,11 @@ public class ShStorehouseService extends MybatisBaseService<ShStorehouseMapper,
 			BeanUtil.copyProperties(shStorehouseAttachmentDetailsVo,picdto);
 			shStorehouseAttachmentService.updateByDto(picdto);
 		}
-		StoreHouseProjectDto dto1=new StoreHouseProjectDto();
-		dto1.setShSid(entity.getSid());
-		dto1.setProjectSid(dto.getProjectSid());
-		//绑定项目
-		storeHouseProjectService.saveOrUpdateDto(dto1);
+//		StoreHouseProjectDto dto1=new StoreHouseProjectDto();
+//		dto1.setShSid(entity.getSid());
+//		dto1.setProjectSid(dto.getProjectSid());
+//		//绑定项目
+//		storeHouseProjectService.saveOrUpdateDto(dto1);
 		baseMapper.insert(entity);
 	}
 	
@@ -200,15 +200,15 @@ public class ShStorehouseService extends MybatisBaseService<ShStorehouseMapper,
 			shStorehouseAttachmentService.updateByDto(picdto);
 		}
 		//修改项目
-		StoreHouseProject storeHouseProject=storeHouseProjectService.getOne(new QueryWrapper<StoreHouseProject>().eq("sh_sid",dto.getSid()));
-		StoreHouseProjectDto dto1=new StoreHouseProjectDto();
-		if(null==storeHouseProject){
-			dto1.setShSid(entity.getSid());
-			dto1.setProjectSid(dto.getProjectSid());
-		}else{
-			BeanUtil.copyProperties(dto1, storeHouseProject, "id", "sid");
-		}
-		storeHouseProjectService.saveOrUpdateDto(dto1);
+//		StoreHouseProject storeHouseProject=storeHouseProjectService.getOne(new QueryWrapper<StoreHouseProject>().eq("sh_sid",dto.getSid()));
+//		StoreHouseProjectDto dto1=new StoreHouseProjectDto();
+//		if(null==storeHouseProject){
+//			dto1.setShSid(entity.getSid());
+//			dto1.setProjectSid(dto.getProjectSid());
+//		}else{
+//			BeanUtil.copyProperties(dto1, storeHouseProject, "id", "sid");
+//		}
+//		storeHouseProjectService.saveOrUpdateDto(dto1);
 		baseMapper.updateById(entity);
 	}
 	

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProject.java

@@ -0,0 +1,18 @@
+package com.yxt.supervise.crm.api.enterpriseproject;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/24 10:45
+ */
+@Data
+@ApiModel(value = "企业项目关联", description = "企业项目关联")
+@TableName("enterprise_project")
+public class EnterpriseProject extends BaseEntity {
+    private String projectSid;
+    private String enterpriseSid;
+}

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectDto.java

@@ -0,0 +1,18 @@
+package com.yxt.supervise.crm.api.enterpriseproject;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/24 10:46
+ */
+@ApiModel(value = "企业信息 数据传输对象", description = "企业信息 数据传输对象")
+@Data
+public class EnterpriseProjectDto implements Dto {
+    private String id;
+    private String sid;
+    private String projectSid;
+    private String enterpriseSid;
+}

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.supervise.crm.api.enterpriseproject;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/24 10:47
+ */
+@Data
+public class EnterpriseProjectQuery implements Query {
+    private String id;
+    private String ids;
+    private String projectSid;
+    private String enterpriseSid;
+}

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectVo.java

@@ -0,0 +1,18 @@
+package com.yxt.supervise.crm.api.enterpriseproject;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/24 10:45
+ */
+@Data
+
+public class EnterpriseProjectVo implements Vo {
+    private String id;
+    private String ids;
+    private String projectSid;
+    private String enterpriseSid;
+
+}

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java

@@ -1,6 +1,7 @@
 package com.yxt.supervise.crm.api.projectinformation;
 
 import com.yxt.common.core.dto.Dto;
+import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectDto;
 import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectDto;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -45,4 +46,5 @@ public class ProjectInformationDto implements Dto {
     private String [] imageFiles;
     //仓库信息dto
     private StoreHouseProjectDto storeHouseProjectDto;
+    private EnterpriseProjectDto enterpriseProjectDto;
 }

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

@@ -0,0 +1,27 @@
+package com.yxt.supervise.crm.biz.enterpriseproject;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.crm.api.bankmanager.BankManagerVo;
+import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProject;
+import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/24 10:45
+ */
+@Mapper
+public interface EnterpriseProjectMapper extends BaseMapper<EnterpriseProject> {
+    IPage<EnterpriseProjectVo> selectPageVo(IPage<EnterpriseProject> page, @Param(Constants.WRAPPER) Wrapper<EnterpriseProject> qw);
+    EnterpriseProjectVo getEnterpriseBySid( @Param("sid") String sid);
+    //查询联系人
+    List<BankManagerVo> getBankManager(@Param("sid") String sid);
+    //根据sid下级
+    List<EnterpriseProjectVo> EnterpriseList();
+}

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.crm.biz.enterpriseproject.EnterpriseProjectMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo">
+        SELECT *
+        FROM enterprise_information
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <!--根据客户的微信号以及当前登录者所在部门的sid和登录者所关联的员工sid查询-->
+    <select id="getEnterpriseBySid" resultType="com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo">
+        SELECT *
+        FROM enterprise_information
+        WHERE sid=#{sid}
+    </select>
+    <select id="getBankManager" resultType="com.yxt.supervise.crm.api.bankmanager.BankManagerVo">
+        SELECT *
+        FROM bank_manager
+        WHERE bankSid=#{sid}
+    </select>
+    <select id="EnterpriseList" resultType="com.yxt.supervise.crm.api.enterpriseinformation.EnterpriseInformationVo">
+        SELECT *
+        FROM enterprise_information
+    </select>
+</mapper>

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

@@ -0,0 +1,64 @@
+package com.yxt.supervise.crm.biz.enterpriseproject;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectDto;
+import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectQuery;
+import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/24 10:45
+ */
+@Api(tags = "企业信息")
+@RestController
+@RequestMapping("v1/EnterpriseProject")
+public class EnterpriseProjectRest {
+    @Autowired
+    EnterpriseProjectService EnterpriseProjectService;
+
+    //@Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<EnterpriseProjectVo>> listPage(@RequestBody PagerQuery<EnterpriseProjectQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<EnterpriseProjectVo> pv = EnterpriseProjectService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("查询全部企业")
+    @PostMapping("/list")
+    public ResultBean<List<EnterpriseProjectVo>> EnterpriseList() {
+        ResultBean rb = ResultBean.fireFail();
+        List<EnterpriseProjectVo> pv = EnterpriseProjectService.EnterpriseList();
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody EnterpriseProjectDto dto) {
+        return EnterpriseProjectService.save(dto);
+    }
+    @ApiOperation("修改")
+    @PostMapping("/update")
+    public ResultBean update(@RequestBody EnterpriseProjectDto dto) {
+        return EnterpriseProjectService.update(dto);
+    }
+    @ApiOperation("根据sid查询数据")
+    @GetMapping("/getEnterpriseBySid/{sid}")
+    public ResultBean getEnterpriseBySid(@PathVariable String sid){
+        ResultBean rb = ResultBean.fireFail();
+        EnterpriseProjectVo EnterpriseProjectVo=EnterpriseProjectService.getEnterpriseBySid(sid);
+        return rb.success().setData(EnterpriseProjectVo);
+    }
+    @ApiOperation("删除")
+    @DeleteMapping("/delete/{sid}")
+    public ResultBean delete(@PathVariable String sid) {
+        return EnterpriseProjectService.delete(sid);
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.yxt.supervise.crm.biz.enterpriseproject;
+
+import cn.hutool.core.bean.BeanUtil;
+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.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProject;
+import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectDto;
+import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectQuery;
+import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/24 10:45
+ */
+@Service
+public class EnterpriseProjectService extends MybatisBaseService<EnterpriseProjectMapper, EnterpriseProject> {
+    public PagerVo<EnterpriseProjectVo> listPageVo(PagerQuery<EnterpriseProjectQuery> pq) {
+        EnterpriseProjectQuery query = pq.getParams();
+        QueryWrapper<EnterpriseProject> qw = new QueryWrapper<>();
+//        if(StringUtils.isNotBlank(query.getEnterpriseName())){
+//            qw.like("enterpriseName",query.getEnterpriseName());
+//        }
+//        if(StringUtils.isNotBlank(query.getTelephone())){
+//            qw.like("telephone",query.getTelephone());
+//        }
+
+        IPage<EnterpriseProject> page = PagerUtil.queryToPage(pq);
+        IPage<EnterpriseProjectVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<EnterpriseProjectVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public ResultBean save(EnterpriseProjectDto dto) {
+        ResultBean rb=new ResultBean();
+        EnterpriseProject entity=new EnterpriseProject();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return rb.success().setMsg("保存企业信息成功");
+    }
+    public ResultBean update(EnterpriseProjectDto dto) {
+        ResultBean rb=new ResultBean();
+        String dtoSid = dto.getSid();
+        EnterpriseProject entity=fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+        return rb.success().setMsg("修改企业信息成功");
+    }
+    public EnterpriseProjectVo getEnterpriseBySid(String sid){
+        //根据sid查询的企业
+        EnterpriseProjectVo bank=baseMapper.getEnterpriseBySid(sid);
+        return bank;
+    }
+    public ResultBean delete(String sid) {
+        ResultBean rb=new ResultBean();
+        baseMapper.delete(new QueryWrapper<EnterpriseProject>().eq("sid",sid));
+        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/projectinformation/ProjectInformationService.java

@@ -13,9 +13,11 @@ import com.yxt.supervise.crm.api.projectinformation.ProjectInformation;
 import com.yxt.supervise.crm.api.projectinformation.ProjectInformationDto;
 import com.yxt.supervise.crm.api.projectinformation.ProjectInformationQuery;
 import com.yxt.supervise.crm.api.projectinformation.ProjectInformationVo;
+import com.yxt.supervise.crm.biz.enterpriseproject.EnterpriseProjectService;
 import com.yxt.supervise.crm.feign.wh.StoreHouseProjectFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
@@ -27,6 +29,8 @@ import java.util.*;
 public class ProjectInformationService extends MybatisBaseService<ProjectInformationMapper, ProjectInformation> {
     @Autowired
     StoreHouseProjectFeign storeHouseProjectFeign;
+    @Autowired
+    EnterpriseProjectService enterpriseProjectService;
     public PagerVo<ProjectInformationVo> listPageVo(PagerQuery<ProjectInformationQuery> pq) {
         ProjectInformationQuery query = pq.getParams();
         QueryWrapper<ProjectInformation> qw = new QueryWrapper<>();
@@ -42,6 +46,7 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         List<ProjectInformationVo> pagging = baseMapper.listAll();
         return pagging;
     }
+    @Transactional
     public ResultBean save(ProjectInformationDto dto) {
         ResultBean rb=new ResultBean();
         ProjectInformation entity=new ProjectInformation();
@@ -60,11 +65,16 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
                 baseMapper.insertFiles(maps);
             }
         }
+        //绑定仓库
         dto.getStoreHouseProjectDto().setProjectSid(entity.getSid());
         storeHouseProjectFeign.saveOrUpdateDto(dto.getStoreHouseProjectDto());
+        //绑定企业
+        dto.getEnterpriseProjectDto().setProjectSid(entity.getSid());
+        enterpriseProjectService.save(dto.getEnterpriseProjectDto());
         baseMapper.insert(entity);
         return rb.success().setMsg("保存项目信息成功");
     }
+    @Transactional
     public ResultBean update(ProjectInformationDto dto) {
         ResultBean rb=new ResultBean();
         String dtoSid = dto.getSid();
@@ -73,6 +83,8 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         //修改绑定的仓库
         dto.getStoreHouseProjectDto().setProjectSid(entity.getSid());
         storeHouseProjectFeign.saveOrUpdateDto(dto.getStoreHouseProjectDto());
+        //绑定企业
+        enterpriseProjectService.save(dto.getEnterpriseProjectDto());
         baseMapper.updateById(entity);
         return rb.success().setMsg("修改项目信息成功");
     }