From 5e043eb36589618ac04dc3677c4b935e0a74fc1f Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Mon, 22 Apr 2024 17:56:24 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProjectEnterprise.java | 71 +++++++++++-------- .../impl/ProjectEnterpriseServiceImpl.java | 18 ++--- .../impl/EnterpriseInfoServiceImpl.java | 43 +++++++++-- 3 files changed, 88 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java index 2be22ad98..712a0ca6e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java @@ -1,58 +1,67 @@ package com.zhgd.xmgl.modules.project.entity; -import java.io.Serializable; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; + /** * @Description: 项目劳务公司关联 * @author： pds - * @date： 2020-08-13 + * @date： 2020-08-13 * @version： V1.0 */ @Data @TableName("project_enterprise") -@ApiModel(value="ProjectEnterprise实体类",description="ProjectEnterprise") +@ApiModel(value = "ProjectEnterprise实体类", description = "ProjectEnterprise") public class ProjectEnterprise implements Serializable { private static final long serialVersionUID = 1L; - /**项目-企业关联表*/ + /** + * 项目-企业关联表 + */ @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value="项目-企业关联表") - private java.lang.Long id ; - /**项目sn或总企业sn*/ - @Excel(name = "项目sn或总企业sn", width = 15) - @ApiModelProperty(value="项目sn或总企业sn") - private java.lang.String projectSn ; - /**企业Id enterprise_info外键*/ - @Excel(name = "企业Id enterprise_info外键", width = 15) - @ApiModelProperty(value="企业Id enterprise_info外键") + @ApiModelProperty(value = "项目-企业关联表") + private java.lang.Long id; + /** + * 项目sn或总企业sn + */ + @Excel(name = "项目sn或总企业sn", width = 15) + @ApiModelProperty(value = "项目sn或总企业sn") + private java.lang.String projectSn; + /** + * 企业Id enterprise_info外键 + */ + @Excel(name = "企业Id enterprise_info外键", width = 15) + @ApiModelProperty(value = "企业Id enterprise_info外键") - private java.lang.Long enterpriseId ; - /**企业类型*/ - @Excel(name = "企业类型", width = 15) - @ApiModelProperty(value="企业类型") - private java.lang.Long enterpriseTypeId ; + private java.lang.Long enterpriseId; + /** + * 企业类型 + */ + @Excel(name = "企业类型", width = 15) + @ApiModelProperty(value = "企业类型") + private java.lang.Long enterpriseTypeId; - /**父级企业ID*/ + /** + * 父级企业ID + */ @Excel(name = "父级企业ID", width = 15) - @ApiModelProperty(value="父级企业ID") - private java.lang.Long parentEnterpriseId ; + @ApiModelProperty(value = "父级企业ID") + private java.lang.Long parentEnterpriseId; @Excel(name = "类型，1项目，2企业", width = 15) - @ApiModelProperty(value="类型，1项目，2企业") - private java.lang.Integer type ; + @ApiModelProperty(value = "类型，1项目，2企业") + private java.lang.Integer type; @Excel(name = "项目负责人", width = 15) - @ApiModelProperty(value="项目负责人") - private java.lang.String projectDirectorName ; + @ApiModelProperty(value = "项目负责人") + private java.lang.String projectDirectorName; @Excel(name = "项目负责人电话", width = 15) @ApiModelProperty(value = "项目负责人电话") @@ -70,4 +79,6 @@ public class ProjectEnterprise implements Serializable { @ApiModelProperty(value = "祖级列表") private java.lang.String ancestors; + @ApiModelProperty(value = "父级id") + private java.lang.Long parentProjectEnterpriseId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java index 1e21cf6d3..5cbaef345 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java @@ -80,13 +80,13 @@ public class ProjectEnterpriseServiceImpl extends ServiceImpl() - .eq(ProjectEnterprise::getId, projectEnterprise.getParentEnterpriseId())); + .eq(ProjectEnterprise::getId, projectEnterprise.getParentProjectEnterpriseId())); if (pOrg == null) { throw new OpenAlertException("上级不存在"); } @@ -102,12 +102,12 @@ public class ProjectEnterpriseServiceImpl extends ServiceImpl xzProjectOrgs = baseMapper.selectList(new LambdaQueryWrapper() - .eq(ProjectEnterprise::getParentEnterpriseId, id)); + .eq(ProjectEnterprise::getParentProjectEnterpriseId, id)); if (CollUtil.isNotEmpty(xzProjectOrgs)) { throw new OpenAlertException("有下级劳务公司，无法删除"); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java index 234ef51c7..a527db03d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java @@ -22,6 +22,7 @@ import com.zhgd.xmgl.modules.project.entity.ProjectEnterprise; import com.zhgd.xmgl.modules.project.entity.XzUserToSupplier; import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper; import com.zhgd.xmgl.modules.project.mapper.ProjectMapper; +import com.zhgd.xmgl.modules.project.service.impl.ProjectEnterpriseServiceImpl; import com.zhgd.xmgl.modules.worker.entity.DepartmentInfo; import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo; import com.zhgd.xmgl.modules.worker.entity.SjEnterpriseInfo; @@ -62,6 +63,8 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl() + .eq(ProjectEnterprise::getEnterpriseId, projectEnterprise.getParentEnterpriseId()) + .eq(ProjectEnterprise::getProjectSn, projectEnterprise.getProjectSn()) + ); + if (pOrg == null) { + throw new OpenAlertException("上级不存在"); + } + projectEnterprise.setParentProjectEnterpriseId(pOrg.getId()); + projectEnterprise.setAncestors(pOrg.getAncestors() + "," + pOrg.getId()); + } projectEnterpriseMapper.insert(projectEnterprise); asyncWorker.addEnterpriseInfo(enterpriseInfo); asyncJiLianDa.saveEnterpriseInfo(enterpriseInfo); @@ -213,12 +232,19 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl 0) { throw new OpenAlertException("企业下存在部门，不允许删除"); } + Integer parentEnterpriseNum = projectEnterpriseMapper.selectCount(new QueryWrapper().lambda() + .eq(ProjectEnterprise::getParentEnterpriseId, enterpriseId) + .eq(ProjectEnterprise::getProjectSn, projectSn)); + if (parentEnterpriseNum != 0) { + throw new OpenAlertException("企业下存在子企业，不允许删除"); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ProjectEnterprise::getEnterpriseId, enterpriseId) .eq(ProjectEnterprise::getProjectSn, projectSn); ProjectEnterprise projectEnterprise = projectEnterpriseMapper.selectOne(queryWrapper); if (projectEnterprise != null) { - projectEnterpriseMapper.deleteById(projectEnterprise.getId()); + projectEnterpriseService.delete(String.valueOf(projectEnterprise.getId())); asyncWorker.removeEnterpriseInfo(projectEnterprise); asyncJiLianDa.removeEnterpriseInfo(projectEnterprise); } @@ -271,13 +297,20 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl().lambda() + .eq(ProjectEnterprise::getEnterpriseId, projectEnterpris.getParentEnterpriseId()) + .eq(ProjectEnterprise::getProjectSn, enterpriseInfo.getProjectSn())); + projectEnterpris.setParentProjectEnterpriseId(parentPe.getId()); + } + projectEnterpriseService.editProjectEnterprise(projectEnterpris); - }*/ asyncJiLianDa.saveEnterpriseInfo(enterpriseInfo); -//同步海康 + //同步海康 asyncHikvision.editEnterpriseInfoForHikvision(enterpriseInfo); return enterpriseInfo; }