admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
guoshengxiong 2024-04-22 17:56:24 +08:00
parent 96b495dc43
commit 5e043eb365
3 changed files with 88 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java
View File

@ -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;
}

18
src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java
View File

@ -80,13 +80,13 @@ public class ProjectEnterpriseServiceImpl extends ServiceImpl<ProjectEnterpriseM
throw new OpenAlertException(MessageUtil.get("existsEnterpriseErr"));
}
boolean top = projectEnterprise.getParentEnterpriseId() == null || projectEnterprise.getParentEnterpriseId() == 0;
boolean top = projectEnterprise.getParentProjectEnterpriseId() == null || projectEnterprise.getParentProjectEnterpriseId() == 0;
if (top) {
projectEnterprise.setParentEnterpriseId(0L);
projectEnterprise.setParentProjectEnterpriseId(0L);
projectEnterprise.setAncestors("0");
} else {
ProjectEnterprise pOrg = projectEnterpriseMapper.selectOne(new LambdaQueryWrapper<ProjectEnterprise>()
.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<ProjectEnterpriseM
throw new OpenAlertException(MessageUtil.get("notFindErr"));
}
if (!Objects.equals(oldPo.getParentEnterpriseId(), projectEnterprise.getParentEnterpriseId())) {
ProjectEnterprise pOrg = projectEnterpriseMapper.selectById(projectEnterprise.getParentEnterpriseId());
if (!Objects.equals(oldPo.getParentProjectEnterpriseId(), projectEnterprise.getParentProjectEnterpriseId())) {
ProjectEnterprise pOrg = projectEnterpriseMapper.selectById(projectEnterprise.getParentProjectEnterpriseId());
// 修改子部门
boolean top = projectEnterprise.getParentEnterpriseId() == null || projectEnterprise.getParentEnterpriseId() == 0;
boolean top = projectEnterprise.getParentProjectEnterpriseId() == null || projectEnterprise.getParentProjectEnterpriseId() == 0;
if (top) {
projectEnterprise.setParentEnterpriseId(0L);
projectEnterprise.setParentProjectEnterpriseId(0L);
projectEnterprise.setAncestors("0");
} else {
if (pOrg == null) {
@ -165,7 +165,7 @@ public class ProjectEnterpriseServiceImpl extends ServiceImpl<ProjectEnterpriseM
projectEnterprise.setEnterpriseId(enterpriseInfo.getId());
projectEnterprise.setEnterpriseTypeId(MapUtils.getLong(map, "companyTypeId"));
projectEnterprise.setType(1);
projectEnterprise.setParentEnterpriseId(0L);
projectEnterprise.setParentProjectEnterpriseId(0L);
projectEnterpriseMapper.insert(projectEnterprise);
}
}
@ -186,7 +186,7 @@ public class ProjectEnterpriseServiceImpl extends ServiceImpl<ProjectEnterpriseM
throw new OpenAlertException("未找到对应实体");
}
List<ProjectEnterprise> xzProjectOrgs = baseMapper.selectList(new LambdaQueryWrapper<ProjectEnterprise>()
.eq(ProjectEnterprise::getParentEnterpriseId, id));
.eq(ProjectEnterprise::getParentProjectEnterpriseId, id));
if (CollUtil.isNotEmpty(xzProjectOrgs)) {
throw new OpenAlertException("有下级劳务公司，无法删除");
}

43
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java
View File

@ -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<EnterpriseInfoMapper,
@Autowired
private EnterpriseInfoMapper enterpriseInfoMapper;
@Autowired
private ProjectEnterpriseServiceImpl projectEnterpriseService;
@Autowired
private ProjectEnterpriseMapper projectEnterpriseMapper;
@Autowired
private TeamInfoMapper teamInfoMapper;
@ -179,6 +182,22 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl<EnterpriseInfoMapper,
projectEnterprise.setSortNum(enterpriseInfo.getSortNum());
projectEnterprise.setEnterpriseId(enterpriseInfo.getId());
projectEnterprise.setDepartmentType(enterpriseInfo.getDepartmentType());
boolean top = projectEnterprise.getParentEnterpriseId() == null || projectEnterprise.getParentEnterpriseId() == 0;
if (top) {
projectEnterprise.setParentProjectEnterpriseId(0L);
projectEnterprise.setAncestors("0");
} else {
ProjectEnterprise pOrg = projectEnterpriseMapper.selectOne(new LambdaQueryWrapper<ProjectEnterprise>()
.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<EnterpriseInfoMapper,
if (dCount > 0) {
throw new OpenAlertException("企业下存在部门，不允许删除");
}
Integer parentEnterpriseNum = projectEnterpriseMapper.selectCount(new QueryWrapper<ProjectEnterprise>().lambda()
.eq(ProjectEnterprise::getParentEnterpriseId, enterpriseId)
.eq(ProjectEnterprise::getProjectSn, projectSn));
if (parentEnterpriseNum != 0) {
throw new OpenAlertException("企业下存在子企业，不允许删除");
}
QueryWrapper<ProjectEnterprise> 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<EnterpriseInfoMapper,
projectEnterpris.setProjectDirectorPhone(enterpriseInfo.getProjectDirectorPhone());
projectEnterpris.setSortNum(enterpriseInfo.getSortNum());
projectEnterpris.setDepartmentType(enterpriseInfo.getDepartmentType());
projectEnterpriseMapper.updateById(projectEnterpris);
/*if(enterpriseInfo.getEnterpriseTypeId()!=projectEnterpris.getEnterpriseTypeId().intValue()){
boolean top = projectEnterpris.getParentEnterpriseId() == null || projectEnterpris.getParentEnterpriseId() == 0;
if (top) {
projectEnterpris.setParentProjectEnterpriseId(0L);
} else {
ProjectEnterprise parentPe = projectEnterpriseMapper.selectOne(new QueryWrapper<ProjectEnterprise>().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;
}