From e3efdfbad88ca937650b220fb1b550d79a12995b Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 24 Jul 2023 18:01:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=92=8C=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shstorehouse/ShStorehouseService.java | 28 ++++---- .../enterpriseproject/EnterpriseProject.java | 18 +++++ .../EnterpriseProjectDto.java | 18 +++++ .../EnterpriseProjectQuery.java | 16 +++++ .../EnterpriseProjectVo.java | 18 +++++ .../ProjectInformationDto.java | 2 + .../EnterpriseProjectMapper.java | 27 ++++++++ .../EnterpriseProjectMapper.xml | 28 ++++++++ .../EnterpriseProjectRest.java | 64 +++++++++++++++++ .../EnterpriseProjectService.java | 69 +++++++++++++++++++ .../ProjectInformationService.java | 12 ++++ 11 files changed, 286 insertions(+), 14 deletions(-) create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProject.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectDto.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectQuery.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectVo.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.xml create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectRest.java create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectService.java diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java index 47d2abad..039d7bfc 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java @@ -148,11 +148,11 @@ public class ShStorehouseService extends MybatisBaseService().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().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); } diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProject.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProject.java new file mode 100644 index 00000000..0d75ae79 --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectDto.java new file mode 100644 index 00000000..11eb8907 --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectQuery.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectQuery.java new file mode 100644 index 00000000..94c1d34f --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectVo.java new file mode 100644 index 00000000..7fd21fc1 --- /dev/null +++ b/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; + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java index b835f6bf..8f724057 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java +++ b/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; } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.java new file mode 100644 index 00000000..df86d069 --- /dev/null +++ b/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 { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + EnterpriseProjectVo getEnterpriseBySid( @Param("sid") String sid); + //查询联系人 + List getBankManager(@Param("sid") String sid); + //根据sid下级 + List EnterpriseList(); +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.xml new file mode 100644 index 00000000..9ca20e49 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectRest.java new file mode 100644 index 00000000..2d774de1 --- /dev/null +++ b/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> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = EnterpriseProjectService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("查询全部企业") + @PostMapping("/list") + public ResultBean> EnterpriseList() { + ResultBean rb = ResultBean.fireFail(); + List 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); + } +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectService.java new file mode 100644 index 00000000..3b332045 --- /dev/null +++ b/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 { + public PagerVo listPageVo(PagerQuery pq) { + EnterpriseProjectQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); +// if(StringUtils.isNotBlank(query.getEnterpriseName())){ +// qw.like("enterpriseName",query.getEnterpriseName()); +// } +// if(StringUtils.isNotBlank(query.getTelephone())){ +// qw.like("telephone",query.getTelephone()); +// } + + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo 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().eq("sid",sid)); + return rb.success().setMsg("删除企业信息成功"); + } + public List EnterpriseList(){ + return baseMapper.EnterpriseList(); + } +} 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 b87e6c5c..6aa5c087 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 @@ -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 { @Autowired StoreHouseProjectFeign storeHouseProjectFeign; + @Autowired + EnterpriseProjectService enterpriseProjectService; public PagerVo listPageVo(PagerQuery pq) { ProjectInformationQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -42,6 +46,7 @@ public class ProjectInformationService extends MybatisBaseService 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