Skip to content

D
dsk-operate-sys-cscec
Commit a6d64cbd authored by huangjie's avatar huangjie
Browse files
Options

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys... 

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司
parents 5a33890e 0ce14e0a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2583 additions and 396 deletions
dsk-admin/src/main/resources/application.yml
View file @ a6d64cbd
...@@ -171,6 +171,8 @@ tenant: ...@@ -171,6 +171,8 @@ tenant:
- advisory_body_custom_form - advisory_body_custom_form
- dim_area - dim_area
- biz_dict_data - biz_dict_data
- push_monitor_rules
- push_monitor_info
# MyBatisPlus配置 # MyBatisPlus配置
......
dsk-common/src/main/java/com/dsk/common/utils/DateUtils.java
View file @ a6d64cbd
...@@ -12,6 +12,7 @@ import java.time.LocalDateTime; ...@@ -12,6 +12,7 @@ import java.time.LocalDateTime;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
/** /**
...@@ -191,4 +192,30 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { ...@@ -191,4 +192,30 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
int year = localDate.getHour(); int year = localDate.getHour();
return year; return year;
} }
/**
* 获取小时前后日期
* @param date
* @param hours
* @return
*/
public static Date addDays(Date date, int hours) {
return org.apache.commons.lang3.time.DateUtils.addHours(date, hours);
}
/***
*@Description: yyyy-MM-dd HH:mm:ss
*@Param:
*@return: java.lang.String
*@Author: Dgm
*@date: 2023/12/21 18:23
*/
public static String format(Date date) {
Calendar calendar = Calendar.getInstance();
if (date != null) {
calendar.setTime(date);
}
return new SimpleDateFormat(YYYY_MM_DD_HH_MM_SS).format(calendar.getTime());
}
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/AdvisoryBodyManageController.java
View file @ a6d64cbd
...@@ -12,6 +12,7 @@ import com.dsk.cscec.service.AdvisoryBodyCustomFormService; ...@@ -12,6 +12,7 @@ import com.dsk.cscec.service.AdvisoryBodyCustomFormService;
import com.dsk.cscec.service.AdvisoryBodyProjectService; import com.dsk.cscec.service.AdvisoryBodyProjectService;
import com.dsk.cscec.service.AdvisoryBodyService; import com.dsk.cscec.service.AdvisoryBodyService;
import com.dsk.cscec.service.IDProjectService; import com.dsk.cscec.service.IDProjectService;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -73,7 +74,7 @@ public class AdvisoryBodyManageController extends BaseController { ...@@ -73,7 +74,7 @@ public class AdvisoryBodyManageController extends BaseController {
* 校验咨询机构是否存在 * 校验咨询机构是否存在
*/ */
@GetMapping("/checkAdvisoryBodyExist") @GetMapping("/checkAdvisoryBodyExist")
public R<AdvisoryBodyExistVo> checkAdvisoryBodyExist(@Validated @NotBlank(message = "咨询机构名称不能为空") String advisoryBodyName) { public R<AdvisoryBodyExistVo> checkAdvisoryBodyExist(@NotBlank(message = "咨询机构名称不能为空") String advisoryBodyName) {
return R.ok(advisoryBodyService.checkAdvisoryBodyExist(advisoryBodyName)); return R.ok(advisoryBodyService.checkAdvisoryBodyExist(advisoryBodyName));
} }
...@@ -97,6 +98,7 @@ public class AdvisoryBodyManageController extends BaseController { ...@@ -97,6 +98,7 @@ public class AdvisoryBodyManageController extends BaseController {
* 新增咨询机构自定义表单 * 新增咨询机构自定义表单
*/ */
@PostMapping("/addAdvisoryBodyCustomForm") @PostMapping("/addAdvisoryBodyCustomForm")
@Transactional(rollbackFor = Exception.class)
public R<Void> addAdvisoryBodyCustomForm(@Validated AdvisoryBodyCustomForm advisoryBodyCustomForm) { public R<Void> addAdvisoryBodyCustomForm(@Validated AdvisoryBodyCustomForm advisoryBodyCustomForm) {
return toAjax(advisoryBodyCustomFormService.save(advisoryBodyCustomForm)); return toAjax(advisoryBodyCustomFormService.save(advisoryBodyCustomForm));
} }
...@@ -105,6 +107,7 @@ public class AdvisoryBodyManageController extends BaseController { ...@@ -105,6 +107,7 @@ public class AdvisoryBodyManageController extends BaseController {
* 更新咨询机构自定义表单 * 更新咨询机构自定义表单
*/ */
@PutMapping("/updateAdvisoryBodyCustomForm") @PutMapping("/updateAdvisoryBodyCustomForm")
@Transactional(rollbackFor = Exception.class)
public R<Void> updateAdvisoryBodyCustomForm(@Validated AdvisoryBodyCustomForm advisoryBodyCustomForm) { public R<Void> updateAdvisoryBodyCustomForm(@Validated AdvisoryBodyCustomForm advisoryBodyCustomForm) {
return toAjax(advisoryBodyCustomFormService.updateById(advisoryBodyCustomForm)); return toAjax(advisoryBodyCustomFormService.updateById(advisoryBodyCustomForm));
} }
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/AdvisoryBodyProject.java
View file @ a6d64cbd
...@@ -6,6 +6,7 @@ import lombok.Data; ...@@ -6,6 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
...@@ -51,7 +52,7 @@ public class AdvisoryBodyProject extends BaseEntity implements Serializable { ...@@ -51,7 +52,7 @@ public class AdvisoryBodyProject extends BaseEntity implements Serializable {
/** /**
* 结算金额(万元) * 结算金额(万元)
*/ */
private Double settleAmount; private BigDecimal settleAmount;
/** /**
* 结算开始时间 * 结算开始时间
*/ */
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/AddAdvisoryBodyBo.java
View file @ a6d64cbd
package com.dsk.cscec.domain.bo; package com.dsk.cscec.domain.bo;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
...@@ -57,10 +58,12 @@ public class AddAdvisoryBodyBo { ...@@ -57,10 +58,12 @@ public class AddAdvisoryBodyBo {
/** /**
* 结算开始时间 * 结算开始时间
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date settleStartTime; private Date settleStartTime;
/** /**
* 结算完成时间 * 结算完成时间
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date settleFinishTime; private Date settleFinishTime;
/** /**
* 是否为终审单位（0代表是 1代表否） * 是否为终审单位（0代表是 1代表否）
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CustomerApproveVo.java
View file @ a6d64cbd
...@@ -79,6 +79,10 @@ public class CustomerApproveVo { ...@@ -79,6 +79,10 @@ public class CustomerApproveVo {
* 业主性质 * 业主性质
*/ */
private String ownerKind; private String ownerKind;
/**
* 企业性质
*/
private String customerProperty;
/** /**
* 资质等级 * 资质等级
*/ */
...@@ -132,10 +136,6 @@ public class CustomerApproveVo { ...@@ -132,10 +136,6 @@ public class CustomerApproveVo {
* 税号 * 税号
*/ */
private String taxNumber; private String taxNumber;
/**
* 企业性质
*/
private String customerProperty;
//证书信息 //证书信息
/** /**
...@@ -167,6 +167,10 @@ public class CustomerApproveVo { ...@@ -167,6 +167,10 @@ public class CustomerApproveVo {
*/ */
private String expireDate7; private String expireDate7;
//审批意见 //审批意见
/**
* 是否同意准入/准入情况
*/
private String isagree;
/** /**
* 经办人 * 经办人
*/ */
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/DCustomerListVo.java
View file @ a6d64cbd
...@@ -17,7 +17,7 @@ public class DCustomerListVo implements Serializable { ...@@ -17,7 +17,7 @@ public class DCustomerListVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Excel(name = "序号", width = 6) @Excel(name = "序号", width = 6)
private Integer num; private Integer num;
/** /**
* jsk企业id * jsk企业id
...@@ -38,136 +38,135 @@ public class DCustomerListVo implements Serializable { ...@@ -38,136 +38,135 @@ public class DCustomerListVo implements Serializable {
/** /**
* 供应商名称 * 供应商名称
*/ */
@Excel(name = "供应商名称", width = 30) @Excel(name = "供应商名称", width = 30)
private String customerName; private String customerName;
/** /**
* 供应商编号 * 供应商编号
*/ */
@Excel(name = "供应商编号", width = 15) @Excel(name = "供应商编号", width = 15)
private String customerCode; private String customerCode;
/** /**
* 推荐公司 * 推荐公司
*/ */
@Excel(name = "推荐单位", width = 30) @Excel(name = "推荐单位", width = 30)
private String recommendOrg; private String recommendOrg;
/** /**
* 注册地区域 * 注册地区域
*/ */
@Excel(name = "公司注册区域", width = 10) @Excel(name = "公司注册区域", width = 10)
private String registerRegion; private String registerRegion;
/** /**
* 省份 * 省份
*/ */
@Excel(name = "公司注册省", width = 10) @Excel(name = "公司注册省", width = 10)
private String registerProvince; private String registerProvince;
/** /**
* 城市 * 城市
*/ */
@Excel(name = "公司注册市", width = 10) @Excel(name = "公司注册市", width = 10)
private String registerCity; private String registerCity;
/** /**
* 供应商类别 * 供应商类别
*/ */
@Excel(name = "供应商类别", width = 10) @Excel(name = "供应商类别", width = 10)
private String customerClass; private String customerClass;
/** /**
* 集团专业类别 * 集团专业类别
*/ */
@Excel(name = "专业类别", width = 20) @Excel(name = "专业类别", width = 20)
private String groupSpecialty; private String groupSpecialty;
/** /**
* 纳税人身份 * 纳税人身份
*/ */
@Excel(name = "纳税人身份", width = 10) @Excel(name = "纳税人身份", width = 10)
private String paytaxType; private String paytaxType;
/** /**
* 纳税人税率 * 纳税人税率
*/ */
@Excel(name = "纳税人税率", width = 10) @Excel(name = "纳税人税率", width = 10)
private String taxRate; private String taxRate;
/** /**
* 供应商状态 * 供应商状态
*/ */
@Excel(name = "状态", width = 10) @Excel(name = "状态", width = 10)
private String customerState; private String customerState;
/** /**
* 限用/禁用状态 * 限用/禁用状态
*/ */
@Excel(name = "限用/禁用状态", width = 10) @Excel(name = "限用/禁用状态", width = 10)
private String badnessState; private String badnessState;
/** /**
* 队长名称 * 队长名称
*/ */
@Excel(name = "劳务队长", width = 10) @Excel(name = "劳务队长", width = 10)
private String leaderName; private String leaderName;
/** /**
* 劳务队长联系电话 * 劳务队长联系电话
*/ */
@Excel(name = "队长联系电话", width = 10) @Excel(name = "队长联系电话", width = 10)
private String laborCaptainPhone; private String laborCaptainPhone;
/** /**
* 劳务队长身份证号 * 劳务队长身份证号
*/ */
@Excel(name = "队长身份证号", width = 10) @Excel(name = "队长身份证号", width = 10)
private String laborCaptainIdcard; private String laborCaptainIdcard;
/** /**
* 队伍规模人数 * 队伍规模人数
*/ */
@Excel(name = "队伍规模", width = 10) @Excel(name = "队伍规模", cellType = Excel.ColumnType.NUMERIC, width = 10)
private Double serviceTeamPersonnum; private Double serviceTeamPersonnum;
/** /**
* 专业特长 * 专业特长
*/ */
@Excel(name = "专业特长", width = 10) @Excel(name = "专业特长", width = 10)
private String serviceTeamSpeciality; private String serviceTeamSpeciality;
/** /**
* 施工承包范围 * 施工承包范围
*/ */
@Excel(name = "施工承包范围", width = 25) @Excel(name = "施工承包范围", width = 25)
private String constructJobScope; private String constructJobScope;
/** /**
* 资质等级 * 资质等级
*/ */
@Excel(name = "资质等级", width = 10) @Excel(name = "资质等级", width = 10)
private String credential; private String credential;
/** /**
* 注册资金 * 注册资金
*/ */
@Excel(name = "注册资金（万元）", width = 10) @Excel(name = "注册资金（万元）", cellType = Excel.ColumnType.NUMERIC, width = 10)
private Double registerCapital; private Double registerCapital;
/** /**
* 联系人 * 联系人
*/ */
@Excel(name = "公司联系人", width = 10) @Excel(name = "公司联系人", width = 10)
private String contactPerson; private String contactPerson;
/** /**
* 电话 * 电话
*/ */
@Excel(name = "联系人电话", width = 10) @Excel(name = "联系人电话", width = 10)
private String contactPhone; private String contactPhone;
/** /**
* 准入时间 * 准入时间
*/ */
@Excel(name = "准入时间", width = 10 , dateFormat = "yyyy-MM-dd") @Excel(name = "准入时间", width = 10, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date approveDate2; private Date approveDate2;
/** /**
* 企业合作数量 * 企业合作数量
*/ */
@Excel(name = "公司合作数量", width = 10 ) @Excel(name = "公司合作数量", width = 10)
private Integer enterpriseCooperationCount; private Integer enterpriseCooperationCount;
/** /**
* 项目合作数量 * 项目合作数量
*/ */
@Excel(name = "合作项目数量", width = 10 ) @Excel(name = "合作项目数量", width = 10)
private Integer projectCooperationCount; private Integer projectCooperationCount;
/** /**
* 考评等级 * 考评等级
*/ */
@Excel(name = "分包商等级", width = 10) @Excel(name = "分包商等级", width = 10)
private String creditLevel; private String creditLevel;
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/AdvisoryBodyServiceImpl.java
View file @ a6d64cbd
package com.dsk.cscec.service.impl; package com.dsk.cscec.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...@@ -27,7 +28,6 @@ import org.springframework.stereotype.Service; ...@@ -27,7 +28,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -132,17 +132,18 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv ...@@ -132,17 +132,18 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
List<Map<String, Object>> data = (List<Map<String, Object>>) jskData.get("list"); List<Map<String, Object>> data = (List<Map<String, Object>>) jskData.get("list");
for (Map<String, Object> companyData : data) { for (Map<String, Object> companyData : data) {
//企业名称完全匹配上,则直接返回给前端 //企业名称完全匹配上,则直接返回给前端
if (advisoryBodyName.equals(companyData.get("name"))) { String companyName = StringUtils.removeRed(MapUtils.getString(companyData, "name","NotExist"));
if (advisoryBodyName.equals(companyName)) {
AdvisoryBodyExistVo advisoryBodyExistVo = new AdvisoryBodyExistVo(); AdvisoryBodyExistVo advisoryBodyExistVo = new AdvisoryBodyExistVo();
advisoryBodyExistVo.setAdvisoryBodyCid(Math.toIntExact(MapUtils.getLong(companyData, "jskEid"))); advisoryBodyExistVo.setAdvisoryBodyCid(Math.toIntExact(MapUtils.getLong(companyData, "jskEid")));
advisoryBodyExistVo.setAdvisoryBodyName(MapUtils.getString(companyData, "name")); advisoryBodyExistVo.setAdvisoryBodyName(companyName);
advisoryBodyExistVo.setBusinessScope(MapUtils.getString(companyData, "businessScope")); advisoryBodyExistVo.setBusinessScope(MapUtils.getString(companyData, "businessScope"));
advisoryBodyExistVo.setIsNewAdvisoryBody(true); advisoryBodyExistVo.setIsNewAdvisoryBody(true);
break; return advisoryBodyExistVo;
} }
} }
//查不到则抛异常 //查不到则抛异常
throw new ServiceException("咨询机构不存在"); throw new ServiceException("咨询机构不存在或结果不唯一,请输入完整咨询机构企业名称");
} }
} }
return null; return null;
...@@ -157,20 +158,24 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv ...@@ -157,20 +158,24 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Integer addAdvisoryBody(AddAdvisoryBodyBo addAdvisoryBodyBo) { public Integer addAdvisoryBody(AddAdvisoryBodyBo addAdvisoryBodyBo) {
long advisoryBodyId = IdUtil.getSnowflakeNextId();;
//如果是新增咨询机构,则需要新增记录到咨询机构表 //如果是新增咨询机构,则需要新增记录到咨询机构表
if (addAdvisoryBodyBo.getIsNewAdvisoryBody()) { if (addAdvisoryBodyBo.getIsNewAdvisoryBody()) {
AdvisoryBody newAdvisoryBody = BeanUtil.toBean(addAdvisoryBodyBo, AdvisoryBody.class); AdvisoryBody newAdvisoryBody = BeanUtil.toBean(addAdvisoryBodyBo, AdvisoryBody.class);
newAdvisoryBody.setCreateTime(new Date()); newAdvisoryBody.setAdvisoryBodyId(advisoryBodyId);
baseMapper.insert(newAdvisoryBody); baseMapper.insert(newAdvisoryBody);
} }
return advisoryBodyProjectMapper.insert(BeanUtil.toBean(addAdvisoryBodyBo, AdvisoryBodyProject.class)); AdvisoryBodyProject advisoryBodyProject = BeanUtil.toBean(addAdvisoryBodyBo, AdvisoryBodyProject.class);
advisoryBodyProject.setAdvisoryBodyId(advisoryBodyId);
return advisoryBodyProjectMapper.insert(advisoryBodyProject);
} }
/** /**
* 每小时更新一次咨询机构经营范围 * 每小时更新一次咨询机构经营范围
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public void updateAdvisoryBodyBusinessScope() { public void updateAdvisoryBodyBusinessScope() {
EnterpriseInfoHeaderBody infoHeaderBody = new EnterpriseInfoHeaderBody(); EnterpriseInfoHeaderBody infoHeaderBody = new EnterpriseInfoHeaderBody();
for (AdvisoryBody advisoryBody : baseMapper.selectList(null)) { for (AdvisoryBody advisoryBody : baseMapper.selectList(null)) {
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java
View file @ a6d64cbd
...@@ -42,7 +42,7 @@ import java.util.Map; ...@@ -42,7 +42,7 @@ import java.util.Map;
/** /**
* 咨询机构管理 * 咨询机构管理
* *
* @author makejava * @author sxk
* @since 2023-12-10 15:34:51 * @since 2023-12-10 15:34:51
*/ */
@Slf4j @Slf4j
...@@ -148,11 +148,14 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject> ...@@ -148,11 +148,14 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
public TableDataInfo<CooperateProjectDetailSearchVo> queryCooperateProjectDetailList(CooperateProjectDetailSearchBo cooperateProjectDetailSearchBo, PageQuery pageQuery) { public TableDataInfo<CooperateProjectDetailSearchVo> queryCooperateProjectDetailList(CooperateProjectDetailSearchBo cooperateProjectDetailSearchBo, PageQuery pageQuery) {
//先根据咨询机构CID查出所有该咨询机构下的项目主键keys //先根据咨询机构CID查出所有该咨询机构下的项目主键keys
List<Long> projectKeys = advisoryBodyProjectMapper.selectProjectKeysByAdvisoryBodyCids(Collections.singletonList(cooperateProjectDetailSearchBo.getAdvisoryBodyCid())); List<Long> projectKeys = advisoryBodyProjectMapper.selectProjectKeysByAdvisoryBodyCids(Collections.singletonList(cooperateProjectDetailSearchBo.getAdvisoryBodyCid()));
if (projectKeys.isEmpty()) {
return TableDataInfo.build();
}
//再根据记录终改的项目主键查询项目详情 //再根据记录终改的项目主键查询项目详情
QueryWrapper<DProject> wrapper = Wrappers.query(); QueryWrapper<DProject> wrapper = Wrappers.query();
wrapper wrapper
//项目主键 //项目主键
.in(!projectKeys.isEmpty(), "project_key", projectKeys) .in("project_key", projectKeys)
//项目名称 //项目名称
.like(StringUtils.isNotBlank(cooperateProjectDetailSearchBo.getProjectName()), "project_name", cooperateProjectDetailSearchBo.getProjectName()) .like(StringUtils.isNotBlank(cooperateProjectDetailSearchBo.getProjectName()), "project_name", cooperateProjectDetailSearchBo.getProjectName())
//项目承接类型 //项目承接类型
...@@ -175,9 +178,9 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject> ...@@ -175,9 +178,9 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
if (ObjectUtil.isNotNull(advisoryBodyProject)) { if (ObjectUtil.isNotNull(advisoryBodyProject)) {
Date settleStartTime = advisoryBodyProject.getSettleStartTime(); Date settleStartTime = advisoryBodyProject.getSettleStartTime();
Date settleFinishTime = advisoryBodyProject.getSettleFinishTime(); Date settleFinishTime = advisoryBodyProject.getSettleFinishTime();
if (ObjectUtil.isNotNull(settleStartTime)&& ObjectUtil.isNotNull(settleFinishTime)) { if (ObjectUtil.isNotNull(settleStartTime) && ObjectUtil.isNotNull(settleFinishTime)) {
cooperateProjectDetailSearchVo.setSettlementDays(DateUtil.between(settleStartTime, settleFinishTime, DateUnit.DAY)); cooperateProjectDetailSearchVo.setSettlementDays(DateUtil.between(settleStartTime, settleFinishTime, DateUnit.DAY));
}else { } else {
cooperateProjectDetailSearchVo.setSettlementDays(0L); cooperateProjectDetailSearchVo.setSettlementDays(0L);
} }
} }
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/CompanyRelationTableV1Controller.java
View file @ a6d64cbd
...@@ -61,4 +61,30 @@ public class CompanyRelationTableV1Controller { ...@@ -61,4 +61,30 @@ public class CompanyRelationTableV1Controller {
public R pageSelect(@RequestBody JskCompanyRelationTableV1Dto dto) throws Exception{ public R pageSelect(@RequestBody JskCompanyRelationTableV1Dto dto) throws Exception{
return relationTableV1Service.pageSelect(dto); return relationTableV1Service.pageSelect(dto);
} }
/***
*@Description: -分页列表-统计
*@Param:
*@return: com.dsk.common.core.domain.AjaxResult
*@Author: Dgm
*@date: 2023/5/18 10:29
*/
@PostMapping("/statistics")
public R statistics(@RequestBody JskCompanyRelationTableV1Dto dto) throws Exception{
return relationTableV1Service.statistics(dto);
}
/***
*@Description: 常合作集团成员详情-分页列表
*@Param:
*@return: com.dsk.common.core.domain.AjaxResult
*@Author: Dgm
*@date: 2023/5/18 10:29
*/
@PostMapping("/combinePage")
public TableDataInfo combinePage(@RequestBody JskCompanyRelationTableV1Dto dto) throws Exception {
return relationTableV1Service.combinePage(dto);
}
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCompanyRelationTableV1Dto.java
View file @ a6d64cbd
...@@ -67,5 +67,10 @@ public class JskCompanyRelationTableV1Dto extends BasePage { ...@@ -67,5 +67,10 @@ public class JskCompanyRelationTableV1Dto extends BasePage {
*/ */
private Integer sort = 5; private Integer sort = 5;
/**
* 集团Id
*/
private Integer combineId;
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/CompanyRelationTableV1Service.java
View file @ a6d64cbd
...@@ -25,12 +25,22 @@ public class CompanyRelationTableV1Service { ...@@ -25,12 +25,22 @@ public class CompanyRelationTableV1Service {
private DskOpenApiUtil dskOpenApiUtil; private DskOpenApiUtil dskOpenApiUtil;
public TableDataInfo page(JskCompanyRelationTableV1Dto dto) throws Exception { public TableDataInfo page(JskCompanyRelationTableV1Dto dto) throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/page", BeanUtil.beanToMap(dto, false, false)); Map<String, Object> map = null;
if (dto.getCompanyType().equals(3)) {
map = dskOpenApiUtil.requestBody("/operate/consultancy/combinePage", BeanUtil.beanToMap(dto, false, false));
} else {
map = dskOpenApiUtil.requestBody("/operate/consultancy/page", BeanUtil.beanToMap(dto, false, false));
}
return dskOpenApiUtil.responsePage(map); return dskOpenApiUtil.responsePage(map);
} }
public TableDataInfo detailPage(JskCompanyRelationTableV1Dto dto) throws Exception{ public TableDataInfo detailPage(JskCompanyRelationTableV1Dto dto) throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/detailPage", BeanUtil.beanToMap(dto, false, false)); Map<String, Object> map = null;
if (dto.getCompanyType().equals(3)) {
map = dskOpenApiUtil.requestBody("/operate/consultancy/combineDetailPage", BeanUtil.beanToMap(dto, false, false));
} else {
map = dskOpenApiUtil.requestBody("/operate/consultancy/detailPage", BeanUtil.beanToMap(dto, false, false));
}
return dskOpenApiUtil.responsePage(map); return dskOpenApiUtil.responsePage(map);
} }
...@@ -45,4 +55,21 @@ public class CompanyRelationTableV1Service { ...@@ -45,4 +55,21 @@ public class CompanyRelationTableV1Service {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/pageSelect", BeanUtil.beanToMap(dto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/pageSelect", BeanUtil.beanToMap(dto, false, false));
return BeanUtil.toBean(map, R.class); return BeanUtil.toBean(map, R.class);
} }
/***
*@Description: -分页列表-下拉
*@Param:
*@return: com.dsk.common.core.domain.AjaxResult
*@Author: Dgm
*@date: 2023/5/18 10:29
*/
public R statistics(JskCompanyRelationTableV1Dto dto) throws Exception{
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/statistics", BeanUtil.beanToMap(dto, false, false));
return BeanUtil.toBean(map, R.class);
}
public TableDataInfo combinePage(JskCompanyRelationTableV1Dto dto) throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/combinePage", BeanUtil.beanToMap(dto, false, false));
return dskOpenApiUtil.responsePage(map);
}
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/job/PushScheduling.java
View file @ a6d64cbd
//package com.dsk.monitor.job; package com.dsk.monitor.job;
//
//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import cn.hutool.core.date.DateUtil;
//import com.dsk.common.utils.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
//import com.dsk.monitor.domain.dto.PushMonitorRules; import com.dsk.common.tenant.helper.TenantHelper;
//import com.dsk.monitor.mapper.PushMonitorInfoMapper; import com.dsk.common.utils.DateUtils;
//import com.dsk.monitor.mapper.PushMonitorRulesMapper; import com.dsk.monitor.domain.dto.PushMonitorRules;
//import com.dsk.monitor.util.SendMessageUtil; import com.dsk.monitor.domain.vo.ConditionVo;
//import org.springframework.scheduling.annotation.Scheduled; import com.dsk.monitor.domain.vo.PushMonitorDynamicPageVo;
// import com.dsk.monitor.mapper.PushMonitorInfoMapper;
//import javax.annotation.Resource; import com.dsk.monitor.mapper.PushMonitorRulesMapper;
// import com.dsk.monitor.service.MonitorService;
///** import com.dsk.monitor.util.SendMessageUtil;
// * @ClassName PushScheduling import org.springframework.scheduling.annotation.Scheduled;
// * @Description 发送短信 import org.springframework.stereotype.Component;
// * @Author Dgm
// * @Date 2023/12/9 13:51 import javax.annotation.Resource;
// * @Version import java.util.Arrays;
// */ import java.util.Date;
//public class PushScheduling { import java.util.List;
//
// @Resource /**
// private PushMonitorInfoMapper monitorInfoMapper; * @ClassName PushScheduling
// * @Description 发送短信
// @Resource * @Author Dgm
// private PushMonitorRulesMapper rulesMapper; * @Date 2023/12/9 13:51
// * @Version
// @Scheduled(cron = "0 0 5 * * * ?") */
// public void receiveModePhone() { @Component
// // 获取当前整点时间 public class PushScheduling {
// Integer concurrentHour = DateUtils.getHour();
// QueryWrapper queryWrapper = new QueryWrapper(); @Resource
// PushMonitorRules detail = rulesMapper.selectOne(queryWrapper); private MonitorService monitorService;
// // 推送时段-起
// Integer timePeriodStart = detail.getTimePeriodStart(); @Resource
// // 推送时段-止 private PushMonitorInfoMapper monitorInfoMapper;
// Integer timePeriodEnd = detail.getTimePeriodEnd();
// if (concurrentHour > timePeriodStart && concurrentHour < timePeriodEnd) { @Resource
// QueryWrapper monitorInfoWrapper = new QueryWrapper(); private PushMonitorRulesMapper rulesMapper;
// // 风险类型
// monitorInfoWrapper.in("risk_type", detail.getRiskType()); // @Scheduled(cron = "0 0/2 * * * ?")
// // 监控维度 @Scheduled(cron = "0 0 * * * ?")
// monitorInfoWrapper.in("dimension", detail.getDimension()); public void receiveModePhone() throws Exception {
// Long count = monitorInfoMapper.selectCount(monitorInfoWrapper); // 是否是周末
// if (count >0 ) { boolean isWeekend = DateUtil.isWeekend(new Date());
// SendMessageUtil.sendMessage(detail.getPhones(), count.toString());
// } String aa = DateUtil.now();
// }
// }
//} TenantHelper.setTenantId("1");
// 获取当前整点时间
Integer concurrentHour = DateUtils.getHour();
QueryWrapper<PushMonitorRules> queryWrapper = new QueryWrapper();
List<PushMonitorRules> detailList = rulesMapper.selectList(queryWrapper);
for (PushMonitorRules detail : detailList) {
// 推送时段-起
String timePeriodStart = detail.getTimePeriodStart();
timePeriodStart = timePeriodStart.substring(0,2);
if (timePeriodStart.contains("0")) {
timePeriodStart = timePeriodStart.substring(1,2);
}
// 推送时段-止
String timePeriodEnd = detail.getTimePeriodEnd();
timePeriodEnd = timePeriodEnd.substring(0,2);
if (timePeriodEnd.contains("0")) {
timePeriodEnd = timePeriodEnd.substring(1,2);
}
Integer pushFrequency = detail.getPushFrequency();
if (pushFrequency > 1) {
if (isWeekend) {
continue;
}
}
Integer timeStart = Integer.valueOf(timePeriodStart);
Integer timeEnd = Integer.valueOf(timePeriodEnd);
if (concurrentHour >= timeStart && concurrentHour <= timeEnd) {
QueryWrapper monitorInfoWrapper = new QueryWrapper();
// 风险类型
// monitorInfoWrapper.in("risk_type", detail.getRiskType());
PushMonitorDynamicPageVo pageVo = new PushMonitorDynamicPageVo();
pageVo.setUserId(detail.getUserId());
ConditionVo vo = new ConditionVo();
// 截止时间
vo.setEndTime(DateUtils.getDate());
vo.setBeginTime(DateUtils.format(DateUtils.addDays(new Date(),-1)));
// 监控维度
vo.setDimension(getDimension(detail.getDimension()));
vo.setUserId(detail.getUserId());
pageVo.setCondition(vo);;
Integer count = monitorService.companyDynamicPage2(pageVo);
if (count > 0 ) {
SendMessageUtil.sendMessage(detail.getPhones(), count.toString());
}
}
}
}
public List<String> getDimension(String dimension) {
List<String> dimensionList = Arrays.asList(dimension.split(","));
return dimensionList;
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/service/MonitorService.java
View file @ a6d64cbd
...@@ -52,7 +52,7 @@ public interface MonitorService { ...@@ -52,7 +52,7 @@ public interface MonitorService {
/*** /***
*@Description: 监控动态/监控报告 分页 *@Description: 监控动态 分页
*@Param: pageVo 信息 *@Param: pageVo 信息
*@return: R *@return: R
*@Author: Dgm *@Author: Dgm
...@@ -60,6 +60,15 @@ public interface MonitorService { ...@@ -60,6 +60,15 @@ public interface MonitorService {
*/ */
TableDataInfo companyDynamicPage(PushMonitorDynamicPageVo pageVo) throws Exception; TableDataInfo companyDynamicPage(PushMonitorDynamicPageVo pageVo) throws Exception;
/***
*@Description: 监控动态分页(定时任务使用)
*@Param: pageVo 信息
*@return: R
*@Author: Dgm
*@date: 2023/12/9 10:03
*/
Integer companyDynamicPage2(PushMonitorDynamicPageVo pageVo) throws Exception;
/*** /***
*@Description: 监控报告 *@Description: 监控报告
*@Param: pageVo 信息 *@Param: pageVo 信息
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/service/impl/MonitorServiceImpl.java
View file @ a6d64cbd
...@@ -14,6 +14,7 @@ import com.dsk.monitor.mapper.PushMonitorRulesMapper; ...@@ -14,6 +14,7 @@ import com.dsk.monitor.mapper.PushMonitorRulesMapper;
import com.dsk.monitor.service.MonitorService; import com.dsk.monitor.service.MonitorService;
import com.dsk.system.utils.DskOpenApiUtil; import com.dsk.system.utils.DskOpenApiUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook;
...@@ -92,7 +93,6 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -92,7 +93,6 @@ public class MonitorServiceImpl implements MonitorService {
@Override @Override
public TableDataInfo companyDynamicPage(PushMonitorDynamicPageVo pageVo) throws Exception { public TableDataInfo companyDynamicPage(PushMonitorDynamicPageVo pageVo) throws Exception {
pageVo.setPageSize(3);
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
if (ObjectUtil.isNotEmpty(userId)) { if (ObjectUtil.isNotEmpty(userId)) {
pageVo.setUserId(userId); pageVo.setUserId(userId);
...@@ -103,6 +103,19 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -103,6 +103,19 @@ public class MonitorServiceImpl implements MonitorService {
return dskOpenApiUtil.responsePageT(map); return dskOpenApiUtil.responsePageT(map);
} }
@Override
public Integer companyDynamicPage2(PushMonitorDynamicPageVo pageVo) throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/info/companyDynamicList", BeanUtil.beanToMap(pageVo, false, false));
log.info("companyDynamicPage=============================>"+map);
Integer code = MapUtils.getInteger(map, "code", 300);
Map data = MapUtils.getMap(map, "data", null);
Integer count = 0;
if (code.equals(200)) {
count = MapUtils.getInteger(data, "totalCount", 0);
}
return count;
}
@Override @Override
public TableDataInfo reportPage(PushMonitorReportPageVo pageVo) throws Exception { public TableDataInfo reportPage(PushMonitorReportPageVo pageVo) throws Exception {
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
...@@ -195,13 +208,13 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -195,13 +208,13 @@ public class MonitorServiceImpl implements MonitorService {
} }
//进行excel格式判定 //进行excel格式判定
String name = sheet.getRow(0).getCell(0) + ""; String name = sheet.getRow(2).getCell(0) + "";
//只要其中一个不满足则格式有误 //只要其中一个不满足则格式有误
if (!"企业名称".equals(name)){ if (!"企业名称".equals(name)){
return R.fail("操作失败，数据异常，请使用正确的模板"); return R.fail("操作失败，数据异常，请使用正确的模板");
} }
//行列皆从0开始 //行列皆从0开始
for (int i = 1; i <= lastRowNum; i++) { for (int i = 3; i <= lastRowNum; i++) {
String companyNameStr = ""; String companyNameStr = "";
// 统一社会信用代码 // 统一社会信用代码
Cell companyName = sheet.getRow(i).getCell(0); Cell companyName = sheet.getRow(i).getCell(0);
......
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/AdvisoryBodyProjectMapper.xml
View file @ a6d64cbd
...@@ -9,7 +9,10 @@ ...@@ -9,7 +9,10 @@
from advisory_body_project abp from advisory_body_project abp
<where> <where>
<if test="advisoryBodyCids != null"> <if test="advisoryBodyCids != null">
abp.advisory_body_cid = #{advisoryBodyCids} abp.advisory_body_cid in
<foreach collection="advisoryBodyCids" item="advisoryBodyCids" open="(" close=")" separator=",">
#{advisoryBodyCids}
</foreach>
</if> </if>
</where> </where>
</select> </select>
......
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DCustomerMapper.xml
View file @ a6d64cbd
...@@ -137,36 +137,36 @@ ...@@ -137,36 +137,36 @@
</if> </if>
</trim> </trim>
</if> </if>
<if test="bo.groupSpecialtyId != null "> <if test="bo.groupSpecialtyId != null and bo.groupSpecialtyId.size > 0 ">
<foreach collection="bo.groupSpecialtyId" item="groupSpecialtyId"> <foreach collection="bo.groupSpecialtyId" item="groupSpecialtyId">
and find_in_set(#{groupSpecialtyId},group_specialty_id) > 0 and find_in_set(#{groupSpecialtyId},group_specialty_id) > 0
</foreach> </foreach>
</if> </if>
<if test="bo.customerState != null "> <if test="bo.customerState != null and bo.customerState.size > 0 ">
and customer_state in and customer_state in
<foreach collection="bo.customerState" item="customerState" separator="," open="(" close=")"> <foreach collection="bo.customerState" item="customerState" separator="," open="(" close=")">
#{customerState} #{customerState}
</foreach> </foreach>
</if> </if>
<if test="bo.credential != null "> <if test="bo.credential != null and bo.credential.size > 0 ">
and credential in and credential in
<foreach collection="bo.credential" item="credential" separator="," open="(" close=")"> <foreach collection="bo.credential" item="credential" separator="," open="(" close=")">
#{credential} #{credential}
</foreach> </foreach>
</if> </if>
<if test="bo.creditLevel != null "> <if test="bo.creditLevel != null and bo.creditLevel.size > 0 ">
and credit_level in and credit_level in
<foreach collection="bo.creditLevel" item="creditLevel" separator="," open="(" close=")"> <foreach collection="bo.creditLevel" item="creditLevel" separator="," open="(" close=")">
#{creditLevel} #{creditLevel}
</foreach> </foreach>
</if> </if>
<if test="bo.paytaxType != null"> <if test="bo.paytaxType != null and bo.paytaxType.size > 0 ">
and paytax_type in and paytax_type in
<foreach collection="bo.paytaxType" item="paytaxType" separator="," open="(" close=")"> <foreach collection="bo.paytaxType" item="paytaxType" separator="," open="(" close=")">
#{paytaxType} #{paytaxType}
</foreach> </foreach>
</if> </if>
<if test="bo.taxRate != null"> <if test="bo.taxRate != null and bo.taxRate.size > 0 ">
and tax_rate in and tax_rate in
<foreach collection="bo.taxRate" item="taxRate" separator="," open="(" close=")"> <foreach collection="bo.taxRate" item="taxRate" separator="," open="(" close=")">
#{taxRate} #{taxRate}
......
dsk-operate-ui/src/api/consultingOrgManagement/index.js
View file @ a6d64cbd
...@@ -31,4 +31,15 @@ export const getConsultingOrgEenterpriseDetailWithSearchApi = (params) => reques ...@@ -31,4 +31,15 @@ export const getConsultingOrgEenterpriseDetailWithSearchApi = (params) => reques
url: "/advisory/body/getCooperateProjectDetailList", url: "/advisory/body/getCooperateProjectDetailList",
method: "get", method: "get",
params params
});
/**
* 咨询机构项目列表 项目跳转详情获取
* @param {*} params
* @returns
*/
export const getgetConsultingOrgProjectDetailApi = (params) => request({
url: "/advisory/body/getProjectDetail",
method: "get",
params
}); });
\ No newline at end of file
dsk-operate-ui/src/api/consultingTransaction/index.js
View file @ a6d64cbd
...@@ -6,7 +6,52 @@ import request from '@/utils/request'; ...@@ -6,7 +6,52 @@ import request from '@/utils/request';
* @returns * @returns
*/ */
export const getCooperativeOwnerUnitsListApi = (data) => request({ export const getCooperativeOwnerUnitsListApi = (data) => request({
url: "/consultancy/page",
method: "post",
data
});
/**
* 获取(常合作业主单位、常合作施工单位、常合作集团)详情
* @param {*} data
* @returns
*/
export const getCooperativeOwnerUnitsDetailApi = (data) => request({
url: "/consultancy/detailPage", url: "/consultancy/detailPage",
method: "post", method: "post",
data data
});
/**
* 获取下拉列表选项
* @param {*} data
* @returns
*/
export const getCooperativeOwnerUnitsOptionsApi = (data) => request({
url: "/consultancy/pageSelect",
method: "post",
data
});
/**
* 当前页列表 amount 总数
* @param {*} data
* @returns
*/
export const getCooperativeOwnerUnitsCountAmountApi = (data) => request({
url: "/consultancy/statistics",
method: "post",
data
});
/**
* 常合作集团详情 合作成员列表
* @param {*} data
* @returns
*/
export const getCooperativeGroupMemberApi = (data) => request({
url: "/consultancy/combinePage",
method: "post",
data
}); });
\ No newline at end of file
dsk-operate-ui/src/assets/styles/index.scss
View file @ a6d64cbd
...@@ -453,14 +453,9 @@ li { ...@@ -453,14 +453,9 @@ li {
// 封装组件样式 // 封装组件样式
.table-list-com-ins { .table-list-com-ins {
.table-item { .table-item {
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
.el-table { .el-table {
width: 100%; width: 100%;
height: 100%; height: auto;
font-size: 14px; font-size: 14px;
color: #232323; color: #232323;
......
dsk-operate-ui/src/components/TableListCom/index.vue
View file @ a6d64cbd
<template> <template>
<div class="table-list-com-ins"> <div class="table-list-com-ins" :class="{'is-empty-table' : !tableDataTotal}">
<div class="table-item"> <div class="table-item">
<el-table v-if="tableDataTotal>0" class="fixed-table" :class="headerFixed ? 'headerFixed':''" v-loading="tableLoading" :data="tableData" <el-table v-if="tableDataTotal>0" class="fixed-table" :class="headerFixed ? 'headerFixed':''" v-loading="tableLoading" :data="tableData"
element-loading-text="Loading" ref="tableRef" border fit highlight-current-row :default-sort="defaultSort?defaultSort:{}" element-loading-text="Loading" ref="tableRef" border fit highlight-current-row :default-sort="defaultSort?defaultSort:{}"
@sort-change="sortChange" @selection-change="selectionChange" :cell-class-name="cellClassName" :cell-style="cellStyle" @sort-change="sortChange" @selection-change="selectionChange" :cell-class-name="cellClassName" :cell-style="cellStyle"
:row-class-name="rowClassName" :row-style="rowStyle" :height="height" :maxHeight="maxHeight" v-sticky-header="stickyHeader"> :row-class-name="rowClassName" :row-style="rowStyle" :height="height" :maxHeight="comMaxHeight" v-sticky-header="stickyHeader">
<el-table-column type="selection" :width="needSelection.width ? needSelection.width : '38px'" v-if="needSelection.flag" <el-table-column type="selection" :width="needSelection.width ? needSelection.width : '38px'" v-if="needSelection.flag"
:fixed="needSelection.fixed" :align="needSelection.align" :show-overflow-tooltip="needSelection.showOverflowTooltip"> :fixed="needSelection.fixed" :align="needSelection.align" :show-overflow-tooltip="needSelection.showOverflowTooltip">
</el-table-column> </el-table-column>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</template> </template>
</el-table> </el-table>
<div style="padding: 30px 0;box-sizing:border-box;" v-else> <div class="table-empty-container" v-else>
<no-data /> <no-data />
</div> </div>
</div> </div>
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
type: [String, Number] type: [String, Number]
}, },
maxHeight: { maxHeight: {
type: [String, Number] type: Boolean
}, },
isIndex: { isIndex: {
type: Boolean, type: Boolean,
...@@ -168,7 +168,8 @@ export default { ...@@ -168,7 +168,8 @@ export default {
data() { data() {
return { return {
current_page: this.queryParams.pageNum, current_page: this.queryParams.pageNum,
show_page: this.paging show_page: this.paging,
comMaxHeight: null
}; };
}, },
watch: { watch: {
...@@ -177,9 +178,24 @@ export default { ...@@ -177,9 +178,24 @@ export default {
} }
}, },
created() { created() {
this.maxHeight ? this.maxHeightInit() : null;
}, },
methods: { methods: {
// 自适应当前容器
async maxHeightInit() {
try {
await this.$nextTick();
/**
* @type {HTMLDivElement}
*/
const container = this.$el.querySelector(".table-item");
if (container) {
this.comMaxHeight = `${container.offsetHeight}px`;
}
} catch (error) {
}
},
handleCurrentChange(e) { handleCurrentChange(e) {
if (this.MaxPage < e) { if (this.MaxPage < e) {
this.show_page = false; this.show_page = false;
...@@ -214,7 +230,15 @@ export default { ...@@ -214,7 +230,15 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.table-list-com-ins { .table-list-com-ins {
&.is-empty-table {
.table-item {
max-height: unset;
height: 100%;
}
}
::v-deep .table-item { ::v-deep .table-item {
width: 100%;
max-height: calc(100% - 40px);
.no-line-feed { .no-line-feed {
display: block; display: block;
color: #0081ff; color: #0081ff;
...@@ -250,11 +274,25 @@ export default { ...@@ -250,11 +274,25 @@ export default {
height: 16px; height: 16px;
} }
// 空状态容器
.table-empty-container {
width: 100%;
height: 100%;
min-height: 360px;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: center;
.no-data {
min-height: unset;
}
}
.el-table { .el-table {
/* .cell { .el-table__header-wrapper {
display: flex; min-height: 40px;
align-items: center; }
} */
} }
} }
......
dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/consultingAgency.vue 0 → 100644
View file @ a6d64cbd
<template>
<div class="consulting-agency-container">
</div>
</template>
<script>
export default {
name: "consultingAgency",
data() {
return {
};
},
//可访问data属性
created() {
},
//计算集
computed: {
},
//方法集
methods: {
},
}
</script>
<style lang="scss" scoped>
.consulting-agency-container {
width: 100%;
height: 100%;
background: #fff;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
padding: 16px;
box-sizing: border-box;
overflow: auto;
}
</style>
dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/detailsOfCooperation.vue
View file @ a6d64cbd
...@@ -53,10 +53,22 @@ ...@@ -53,10 +53,22 @@
<skeleton v-if="tableLoading"></skeleton> <skeleton v-if="tableLoading"></skeleton>
<!-- table 列表 --> <!-- table 列表 -->
<table-list-com ref="tableContainer" :tableData="tableDataList" :formColum="formColum" :tableDataTotal="total" :queryParams="queryParams" <table-list-com ref="tableContainer" :tableData="tableDataList" :formColum="formColum" :tableDataTotal="total" :queryParams="queryParams"
v-else-if="!tableLoading" :height="'100%'" @handle-current-change="handleCurrentChange"> v-else-if="!tableLoading" :maxHeight="true" @handle-current-change="handleCurrentChange">
<!-- 项目列表 --> <!-- 项目列表 -->
<template slot="projectName" slot-scope="{data,row}"> <template slot="projectName" slot-scope="{data,row}">
<div v-if="row.projectName" class="no-line-feed ">{{row.projectName}}</div> <div v-if="row.projectName" class="no-line-feed">{{row.projectName}}</div>
<span v-else>-</span>
</template>
<template slot="projectLeader" slot-scope="{data,row}">
<div v-if="row.advisoryBodyProject && row.advisoryBodyProject.projectLeader">{{row.advisoryBodyProject.projectLeader}}</div>
<span v-else>-</span>
</template>
<template slot="projectLeaderMajor" slot-scope="{data,row}">
<div v-if="row.advisoryBodyProject && row.advisoryBodyProject.projectLeaderMajor">{{row.advisoryBodyProject.projectLeaderMajor}}</div>
<span v-else>-</span>
</template>
<template slot="projectLeaderPhone" slot-scope="{data,row}">
<div v-if="row.advisoryBodyProject && row.advisoryBodyProject.projectLeaderPhone">{{row.advisoryBodyProject.projectLeaderPhone}}</div>
<span v-else>-</span> <span v-else>-</span>
</template> </template>
</table-list-com> </table-list-com>
...@@ -99,12 +111,12 @@ export default { ...@@ -99,12 +111,12 @@ export default {
{ label: '项目列表', prop: 'projectName', width: "222px", lock: true, fixed: false, slot: true, uid: v4(), showOverflowTooltip: true }, { label: '项目列表', prop: 'projectName', width: "222px", lock: true, fixed: false, slot: true, uid: v4(), showOverflowTooltip: true },
{ label: '合同编码', prop: 'projectCode', width: "123px", uid: v4() }, { label: '合同编码', prop: 'projectCode', width: "123px", uid: v4() },
{ label: '省市', prop: 'provinceName', width: "102px", uid: v4() }, { label: '省市', prop: 'provinceName', width: "102px", uid: v4() },
{ label: '项目承接类型', prop: 'isinvestproject', width: "102px", uid: v4() }, { label: '项目承接类型', prop: 'isinvestproject', minWidth: "102px", uid: v4() },
{ label: '工程基础大类', prop: 'projectType1', width: "98px", uid: v4() }, { label: '工程基础大类', prop: 'projectType1', width: "98px", uid: v4() },
{ label: '工程类别明细', prop: 'projectType', width: "98px", uid: v4() }, { label: '工程类别明细', prop: 'projectType', width: "98px", uid: v4() },
{ label: '项目负责人姓名', prop: 'projectLeader', width: "110px", uid: v4() }, { label: '项目负责人姓名', prop: 'projectLeader', width: "110px", slot: true, uid: v4() },
{ label: '项目负责人专业', prop: 'projectLeaderMajor', width: "110px", uid: v4() }, { label: '项目负责人专业', prop: 'projectLeaderMajor', width: "110px", slot: true, uid: v4() },
{ label: '项目负责人联系电话', prop: 'projectLeaderPhone', width: "134px", uid: v4() }, { label: '项目负责人联系电话', prop: 'projectLeaderPhone', width: "134px", slot: true, uid: v4() },
], ],
queryParams: { queryParams: {
pageSize: 20, pageSize: 20,
...@@ -197,7 +209,7 @@ export default { ...@@ -197,7 +209,7 @@ export default {
resetForm() { resetForm() {
const defaultValue = this.$options.data.call(this); const defaultValue = this.$options.data.call(this);
this.form = defaultValue.form; this.form = defaultValue.form;
this.queryParams = defaultValue.queryParams; this.queryParams = { ...defaultValue.queryParams, advisoryBodyCid: this.queryParams.advisoryBodyCid };
this.getList(this.queryParams); this.getList(this.queryParams);
}, },
async getList(params) { async getList(params) {
...@@ -326,7 +338,7 @@ export default { ...@@ -326,7 +338,7 @@ export default {
@import "@/assets/styles/search-result-list-public.scss"; @import "@/assets/styles/search-result-list-public.scss";
::v-deep .table-list-com-ins { ::v-deep .table-list-com-ins {
height: calc(100% - 80px); height: calc(100% - 40px);
margin-top: 16px; margin-top: 16px;
.pagination-box { .pagination-box {
......
dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/projectDetail.vue 0 → 100644
View file @ a6d64cbd
<template>
<div class="project-detail-container">
<div class="project-detail-inner">
<div class="project-header-container">
<!-- 项目名称 logo -->
<div class="prject-icon-and-title">
<img src="@/assets/images/financing/head_icon.png" alt="">
<div class="prject-title">{{projectDetailInfo.finProjectName ? projectDetailInfo.finProjectName : "-"}}</div>
</div>
<!-- 项目承接单位 -->
<div class="project-undertaking-unit-container">
<span class="project-undertaking-unit-title">项目承接单位：</span>
<span class="project-undertaking-unit">{{projectDetailInfo.contractOrgName ? projectDetailInfo.contractOrgName : "-"}}</span>
</div>
</div>
<!-- tab切换部分 -->
<div class="project-consulting-agency">
<!-- tab切换栏 -->
<dsk-tab-toggle v-model="currentList" :tabs="toggleTabs"></dsk-tab-toggle>
<!-- tab切换容器 -->
<div class="project-consulting-agency-inner">
<!-- 工程基本信息 -->
<basic-engineering-information v-if="currentList === 'project'" :projectDetailInfo="projectDetailInfo"></basic-engineering-information>
<!-- 咨询机构结算信息 -->
<consulting-agency v-if="currentList === 'consultingAgency'" :projectDetailInfo="projectDetailInfo"></consulting-agency>
</div>
</div>
</div>
</div>
</template>
<script>
import DskTabToggle from "@/components/DskTabToggle";
import { getgetConsultingOrgProjectDetailApi } from "@/api/consultingOrgManagement/index";
import { v4 } from 'uuid';
import BasicEngineeringInformation from "@/views/consultingOrgManagement/components/EnterpriseList/detail/basicEngineeringInformation";
import consultingAgency from "@/views/consultingOrgManagement/components/EnterpriseList/detail/consultingAgency";
export default {
name: "projectDetail",
components: {
DskTabToggle,
BasicEngineeringInformation,
consultingAgency
},
data() {
return {
currentList: "project",
toggleTabs: [
{
value: "project",
name: "工程基本信息",
id: v4()
},
{
value: "consultingAgency",
name: "咨询机构结算信息",
id: v4()
}
],
projectDetailInfo: {},
projectKey: "",
advisoryBodyCid: ""
};
},
//可访问data属性
created() {
this.init();
},
//计算集
computed: {
},
//方法集
methods: {
async init() {
try {
const advisoryBodyCid = this.$route.params?.advisoryBodyCid;
const projectKey = this.$route.query?.projectKey;
if (!advisoryBodyCid) return this.$message.error("缺少咨询机构ID");
if (!projectKey) return this.$message.error("缺少项目主键");
const detail = await getgetConsultingOrgProjectDetailApi({
advisoryBodyCid,
projectKey
});
if (detail.code == 200 && detail.data) {
this.projectDetailInfo = { ...this.pprojectDetailInfo, ...detail.data };
}
} catch (error) {
}
}
},
}
</script>
<style lang="scss" scoped>
.project-detail-container {
width: 100%;
height: 100%;
padding: 16px 24px 24px 24px;
box-sizing: border-box;
overflow: hidden;
.project-detail-inner {
width: 100%;
height: 100%;
.project-header-container {
width: 100%;
height: 94px;
background: #fff;
border-radius: 4px;
padding: 16px;
box-sizing: border-box;
.prject-icon-and-title {
display: flex;
align-items: center;
& > img {
width: 28px;
height: 28px;
}
.prject-title {
font-size: 16px;
font-weight: bold;
color: #232323;
margin-left: 12px;
}
}
.project-undertaking-unit-container {
display: flex;
align-items: center;
margin-top: 16px;
.project-undertaking-unit-title {
font-size: 14px;
font-weight: 400;
color: rgba(35, 35, 35, 0.4);
}
.project-undertaking-unit {
color: rgba(35, 35, 35, 0.8);
font-size: 14px;
font-weight: 400;
margin-left: 8px;
}
}
}
.project-consulting-agency {
width: 100%;
height: calc(100% - 110px);
margin-top: 16px;
.project-consulting-agency-inner {
width: 100%;
height: calc(100% - 47px);
}
}
}
}
</style>
dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/index.vue
View file @ a6d64cbd
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
<skeleton v-if="tableLoading"></skeleton> <skeleton v-if="tableLoading"></skeleton>
<!-- table 列表 --> <!-- table 列表 -->
<table-list-com ref="tableContainer" :tableData="tableDataList" :formColum="formColum" :tableDataTotal="total" :queryParams="queryParams" <table-list-com ref="tableContainer" :tableData="tableDataList" :formColum="formColum" :tableDataTotal="total" :queryParams="queryParams"
v-else-if="!tableLoading" :height="'100%'" @handle-current-change="handleCurrentChange"> v-else-if="!tableLoading" :maxHeight="true" @handle-current-change="handleCurrentChange">
<!-- 咨询机构名称 --> <!-- 咨询机构名称 -->
<template slot="advisoryBodyName" slot-scope="{data,row}"> <template slot="advisoryBodyName" slot-scope="{data,row}">
<div v-if="row.advisoryBodyName" class="no-line-feed ">{{row.advisoryBodyName}}</div> <div v-if="row.advisoryBodyName" class="no-line-feed" @click="viewEnterprise(row)">{{row.advisoryBodyName}}</div>
<span v-else>-</span> <span v-else>-</span>
</template> </template>
<!-- 合作项目数量 --> <!-- 合作项目数量 -->
...@@ -70,6 +70,7 @@ import Skeleton from "@/components/Skeleton"; ...@@ -70,6 +70,7 @@ import Skeleton from "@/components/Skeleton";
import { getConsultingOrgEenterpriseListWithSearchApi } from "@/api/consultingOrgManagement"; import { getConsultingOrgEenterpriseListWithSearchApi } from "@/api/consultingOrgManagement";
import { queryConditionFiltering } from "@/utils"; import { queryConditionFiltering } from "@/utils";
import { v4 } from 'uuid'; import { v4 } from 'uuid';
import { encodeStr } from "@/assets/js/common";
export default { export default {
name: "cooperationDeskAccountEnterprise", name: "cooperationDeskAccountEnterprise",
components: { components: {
...@@ -140,6 +141,10 @@ export default { ...@@ -140,6 +141,10 @@ export default {
if (!row.advisoryBodyCid) return this.$message.warning("缺少咨询机构id"); if (!row.advisoryBodyCid) return this.$message.warning("缺少咨询机构id");
this.$tab.openPage(`${row.advisoryBodyName}合作明细`, `/consultingOrgManagement/detailsOfCooperation/${row.advisoryBodyCid}`); this.$tab.openPage(`${row.advisoryBodyName}合作明细`, `/consultingOrgManagement/detailsOfCooperation/${row.advisoryBodyCid}`);
}, },
// 跳转到企业详情
viewEnterprise(row) {
this.$tab.openPage(row.advisoryBodyName ? row.advisoryBodyName : "咨询机构详情", `/enterprise/${encodeStr(row.advisoryBodyCid)}`);
},
// 创建最终查询条件 // 创建最终查询条件
mergeCondition() { mergeCondition() {
const _queryParams = JSON.parse(JSON.stringify(this.queryParams)); const _queryParams = JSON.parse(JSON.stringify(this.queryParams));
...@@ -147,8 +152,8 @@ export default { ...@@ -147,8 +152,8 @@ export default {
const _form = queryConditionFiltering(this.form); const _form = queryConditionFiltering(this.form);
// 处理时间 // 处理时间
if (_form?.cooperationTime?.length) { if (_form?.cooperationTime?.length) {
_form.projectStartTime = _form?.projectCreateTime[0]; _form.projectStartTime = _form?.cooperationTime[0];
_form.projectEndTime = _form?.projectCreateTime[1]; _form.projectEndTime = _form?.cooperationTime[1];
} }
delete _form.cooperationTime; delete _form.cooperationTime;
...@@ -277,7 +282,7 @@ export default { ...@@ -277,7 +282,7 @@ export default {
@import "@/assets/styles/search-result-list-public.scss"; @import "@/assets/styles/search-result-list-public.scss";
::v-deep .table-list-com-ins { ::v-deep .table-list-com-ins {
height: calc(100% - 80px); height: calc(100% - 40px);
margin-top: 16px; margin-top: 16px;
.pagination-box { .pagination-box {
......
dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue
View file @ a6d64cbd
...@@ -71,25 +71,26 @@ ...@@ -71,25 +71,26 @@
<skeleton v-if="tableLoading"></skeleton> <skeleton v-if="tableLoading"></skeleton>
<!-- table 列表 --> <!-- table 列表 -->
<table-list-com ref="tableContainer" :tableData="tableDataList" :formColum="formColum" :tableDataTotal="total" :queryParams="queryParams" <table-list-com ref="tableContainer" :tableData="tableDataList" :formColum="formColum" :tableDataTotal="total" :queryParams="queryParams"
v-else-if="!tableLoading" :height="'100%'" @handle-current-change="handleCurrentChange"> v-else-if="!tableLoading" :maxHeight="true" @handle-current-change="handleCurrentChange">
<!-- 项目列表 --> <!-- 项目列表 -->
<template slot="projectName" slot-scope="{data,row}"> <template slot="projectName" slot-scope="{data,row}">
<div v-if="row.projectName" class="no-line-feed" v-html="row.projectName">{{row.projectName}}</div> <div v-if="row.projectName" class="no-line-feed" v-html="row.projectName" @click="viewProjectDetail(row)">{{row.projectName}}</div>
<span v-else>-</span> <span v-else>-</span>
</template> </template>
<!-- 业主单位 --> <!-- 业主单位 -->
<template slot="ownerName" slot-scope="{data,row}"> <!-- <template slot="ownerName" slot-scope="{data,row}">
<div v-if="row.ownerName" class="no-line-feed">{{row.ownerName}}</div> <div v-if="row.ownerName" class="no-line-feed">{{row.ownerName}}</div>
<span v-else>-</span> <span v-else>-</span>
</template> </template> -->
<!-- 项目承接单位 --> <!-- 项目承接单位 -->
<template slot="contractOrgName" slot-scope="{data,row}"> <!-- <template slot="contractOrgName" slot-scope="{data,row}">
<div v-if="row.contractOrgName" class="no-line-feed">{{row.contractOrgName}}</div> <div v-if="row.contractOrgName" class="no-line-feed">{{row.contractOrgName}}</div>
<span v-else>-</span> <span v-else>-</span>
</template> </template> -->
<!-- 咨询机构名称 --> <!-- 咨询机构名称 -->
<template slot="advisoryBodyName" slot-scope="{data,row}"> <template slot="advisoryBodyName" slot-scope="{data,row}">
<div v-if="row.advisoryBodyName" class="no-line-feed">{{row.advisoryBodyName}}</div> <div v-if="row.advisoryBody && row.advisoryBody.advisoryBodyName" class="no-line-feed" @click="viewEnterprise(row)">
{{row.advisoryBody.advisoryBodyName}}</div>
<span v-else>-</span> <span v-else>-</span>
</template> </template>
</table-list-com> </table-list-com>
...@@ -105,6 +106,7 @@ import Skeleton from "@/components/Skeleton"; ...@@ -105,6 +106,7 @@ import Skeleton from "@/components/Skeleton";
import { getConsultingOrgProjectListWithSearchApi } from "@/api/consultingOrgManagement"; import { getConsultingOrgProjectListWithSearchApi } from "@/api/consultingOrgManagement";
import { queryConditionFiltering } from "@/utils"; import { queryConditionFiltering } from "@/utils";
import { v4 } from 'uuid'; import { v4 } from 'uuid';
import { encodeStr } from "@/assets/js/common.js";
export default { export default {
name: "cooperationDeskAccountProject", name: "cooperationDeskAccountProject",
components: { components: {
...@@ -316,6 +318,14 @@ export default { ...@@ -316,6 +318,14 @@ export default {
this.formColum.forEach(item => this.fixedPropsKey.includes(item.prop) ? item.fixed = flag : null); this.formColum.forEach(item => this.fixedPropsKey.includes(item.prop) ? item.fixed = flag : null);
} }
}, },
// 查看项目详情
viewProjectDetail(row) {
this.$tab.openPage(row.projectName, `/consultingOrgManagement/projectDetail/${row.advisoryBody?.advisoryBodyCid}?projectKey=${row.projectKey}`);
},
// 跳转到企业详情
viewEnterprise(row) {
this.$tab.openPage(row.advisoryBody.advisoryBodyName ? row.advisoryBody.advisoryBodyName : "咨询机构详情", `/enterprise/${encodeStr(row.advisoryBody.advisoryBodyCid)}`);
}
}, },
} }
</script> </script>
...@@ -367,7 +377,7 @@ export default { ...@@ -367,7 +377,7 @@ export default {
@import "@/assets/styles/search-result-list-public.scss"; @import "@/assets/styles/search-result-list-public.scss";
::v-deep .table-list-com-ins { ::v-deep .table-list-com-ins {
height: calc(100% - 80px); height: calc(100% - 40px);
margin-top: 16px; margin-top: 16px;
.pagination-box { .pagination-box {
......
dsk-operate-ui/src/views/detail/party-a/component/HeadFormNew.vue
View file @ a6d64cbd
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="flex-box query-box"> <div class="flex-box query-box">
<div class="flex-box query-params"> <div class="flex-box query-params">
<div class="headForm-from"> <div class="headForm-from">
<div class="from-item" :key="i" v-for="(form, i) in formData"> <div class="from-item" :key="i" v-for="(form, i) in comFormData">
<!-- 单选 --> <!-- 单选 -->
<template v-if="form.type==1"> <template v-if="form.type==1">
<el-select v-model="form.value" clearable class="form-content-width same-select-com" :class="[`select-adaptive-${form.uid}`]" <el-select v-model="form.value" clearable class="form-content-width same-select-com" :class="[`select-adaptive-${form.uid}`]"
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
<span v-if="!form.hover && !form.value">搜索</span> <span v-if="!form.hover && !form.value">搜索</span>
<el-input v-model="form.value" :placeholder="form.placeholder ? form.placeholder : '输入关键词查询'" <el-input v-model="form.value" :placeholder="form.placeholder ? form.placeholder : '输入关键词查询'"
:style="form.width?'width:'+form.width+'px':'width:238px'" @focus.stop="searchFocus($event,form)" :style="form.width?'width:'+form.width+'px':'width:238px'" @focus.stop="searchFocus($event,form)"
@blur.stop="searchBlur($event,form)" @input="value => searchInput(value,form)" v-else @keydown.native.enter="changeSelect"> @input="value => searchInput(value,form)" v-else @keydown.native.enter="changeSelect">
<template slot="suffix"> <template slot="suffix">
<transition mode="out-in" appear name="fade"> <transition mode="out-in" appear name="fade">
<img src="@/assets/images/enterprise/search-input-clear-icon.svg" @click.stop="form.value = '';changeSelect()" <img src="@/assets/images/enterprise/search-input-clear-icon.svg" @click.stop="form.value = '';changeSelect()"
v-show="form.showClearIcon"> @mousedown.prevent="''" v-show="form.showClearIcon">
</transition> </transition>
</template> </template>
</el-input> </el-input>
...@@ -127,9 +127,18 @@ export default { ...@@ -127,9 +127,18 @@ export default {
default: false default: false
} }
}, },
watch: {
formData: {
handler(newValue) {
this.comFormData = newValue;
},
deep: true
}
},
data() { data() {
return { return {
showSearchBox: false showSearchBox: false,
comFormData: this.formData
}; };
}, },
created() { created() {
...@@ -244,7 +253,7 @@ export default { ...@@ -244,7 +253,7 @@ export default {
textContainer.remove(); textContainer.remove();
}); });
dom.style.setProperty("width", `${width + 60}px`); dom.style.setProperty("width", `${width + 60}px`);
this.$emit('handle-search'); this.$emit('handle-search', this.comFormData);
return; return;
} }
textContainer.style.setProperty("visibility", "hidden"); textContainer.style.setProperty("visibility", "hidden");
...@@ -257,7 +266,7 @@ export default { ...@@ -257,7 +266,7 @@ export default {
let containerWidth = textContainer.offsetWidth + 12 + 8; let containerWidth = textContainer.offsetWidth + 12 + 8;
textContainer.remove(); textContainer.remove();
dom.style.setProperty("width", `${containerWidth}px`); dom.style.setProperty("width", `${containerWidth}px`);
this.$emit('handle-search'); this.$emit('handle-search', this.comFormData);
} }
} catch (error) { } catch (error) {
...@@ -288,13 +297,13 @@ export default { ...@@ -288,13 +297,13 @@ export default {
textContainer.remove(); textContainer.remove();
dom.style.setProperty("width", `${containerWidth}px`); dom.style.setProperty("width", `${containerWidth}px`);
} }
this.$emit('handle-search'); this.$emit('handle-search', this.comFormData);
} catch (error) { } catch (error) {
} }
}, },
changeSelect(e) { changeSelect(e) {
this.$emit('handle-search'); this.$emit('handle-search', this.comFormData);
}, },
clickEXCEL() { clickEXCEL() {
this.$emit('handle-excel'); this.$emit('handle-excel');
......
dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue
View file @ a6d64cbd
...@@ -333,8 +333,8 @@ export default { ...@@ -333,8 +333,8 @@ export default {
getFinancial(id) { getFinancial(id) {
financial({ cid: String(id) }).then(res => { financial({ cid: String(id) }).then(res => {
if ((res.code == 200 && !res.data) || !res.data?.totalAssets) { if ((res.code == 200 && !res.data) || !res.data?.totalAssets) {
this.$set(this.sideRoute[0], "disabled", true); // 禁用商务信息
this.$set(this.sideRoute[1], "disabled", true); this.$set(this.findNodeIndex(this.sideRoute, "business"), "disabled", true);
this.defaultRoute = JSON.parse(JSON.stringify(this.sideRoute)); this.defaultRoute = JSON.parse(JSON.stringify(this.sideRoute));
} }
}); });
......
dsk-operate-ui/src/views/detail/party-a/component/Tables.vue
View file @ a6d64cbd
<template> <template>
<div class="Tables"> <div class="Tables" :class="{'is-empty-table' : !tableDataTotal}">
<div class="table-item"> <div class="table-item">
<el-table v-if="tableDataTotal>0" class="fixed-table" :class="headerFixed ? 'headerFixed':''" v-loading="tableLoading" :data="tableData" <el-table v-if="tableDataTotal>0" class="fixed-table" :class="headerFixed ? 'headerFixed':''" v-loading="tableLoading" :data="tableData"
element-loading-text="Loading" ref="tableRef" v-horizontal-scroll="'hover'" border fit highlight-current-row element-loading-text="Loading" ref="tableRef" v-horizontal-scroll="'hover'" border fit highlight-current-row :height="height"
:default-sort="defaultSort?defaultSort:{}" @sort-change="sortChange"> :maxHeight="comMaxHeight" :default-sort="defaultSort?defaultSort:{}" @sort-change="sortChange">
<el-table-column v-if="isIndex" label="序号" :width="flexWidth(tableData)" align="left" :fixed="indexFixed" :resizable="false"> <el-table-column v-if="isIndex" label="序号" :width="flexWidth(tableData)" align="left" :fixed="indexFixed" :resizable="false">
<template slot-scope="scope">{{ queryParams.pageNum * queryParams.pageSize - queryParams.pageSize + scope.$index + 1 }}</template> <template slot-scope="scope">{{ queryParams.pageNum * queryParams.pageSize - queryParams.pageSize + scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</template> </template>
</el-table> </el-table>
<div style="padding: 30px 0" v-else> <div class="table-empty-container" v-else>
<no-data /> <no-data />
</div> </div>
</div> </div>
...@@ -56,6 +56,12 @@ import NoData from '../component/noData'; ...@@ -56,6 +56,12 @@ import NoData from '../component/noData';
export default { export default {
name: "Tables", name: "Tables",
props: { props: {
height: {
type: [String, Number]
},
maxHeight: {
type: Boolean
},
isIndex: { isIndex: {
type: Boolean, type: Boolean,
default: true default: true
...@@ -107,7 +113,8 @@ export default { ...@@ -107,7 +113,8 @@ export default {
data() { data() {
return { return {
current_page: this.queryParams.pageNum, current_page: this.queryParams.pageNum,
show_page: this.paging show_page: this.paging,
comMaxHeight: null
}; };
}, },
watch: { watch: {
...@@ -116,9 +123,24 @@ export default { ...@@ -116,9 +123,24 @@ export default {
} }
}, },
created() { created() {
this.maxHeight ? this.maxHeightInit() : null;
}, },
methods: { methods: {
// 自适应当前容器
async maxHeightInit() {
try {
await this.$nextTick();
/**
* @type {HTMLDivElement}
*/
const container = this.$el.querySelector(".table-item");
if (container) {
this.comMaxHeight = `${container.offsetHeight}px`;
}
} catch (error) {
}
},
handleCurrentChange(e) { handleCurrentChange(e) {
if (this.MaxPage < e) { if (this.MaxPage < e) {
this.show_page = false; this.show_page = false;
...@@ -154,9 +176,6 @@ export default { ...@@ -154,9 +176,6 @@ export default {
::v-deep .el-table__body tr.current-row > td.el-table__cell { ::v-deep .el-table__body tr.current-row > td.el-table__cell {
background-color: #ffffff; background-color: #ffffff;
} }
/*::v-deep .el-table__fixed{
height: calc(100% - 16px) !important;
}*/
::v-deep .el-table__row { ::v-deep .el-table__row {
&:nth-child(even) { &:nth-child(even) {
...@@ -176,7 +195,30 @@ export default { ...@@ -176,7 +195,30 @@ export default {
} }
} }
} }
&.is-empty-table {
.table-item {
max-height: unset;
height: 100%;
}
}
::v-deep .table-item { ::v-deep .table-item {
position: relative;
max-height: calc(100% - 56px);
.table-empty-container {
min-height: 360px;
display: flex;
height: 100%;
width: 100%;
align-items: center;
justify-content: center;
box-sizing: border-box;
.no-data {
min-height: unset;
}
}
.el-table td.el-table__cell { .el-table td.el-table__cell {
border-bottom: 0; border-bottom: 0;
} }
...@@ -185,6 +227,11 @@ export default { ...@@ -185,6 +227,11 @@ export default {
font-size: 12px; font-size: 12px;
} }
} }
.el-table--border th.gutter:last-of-type {
display: block !important;
padding-right: 16px;
height: 55px;
}
} }
::v-deep .el-table th.el-table__cell.is-leaf, ::v-deep .el-table th.el-table__cell.is-leaf,
::v-deep .el-table td.el-table__cell { ::v-deep .el-table td.el-table__cell {
......
dsk-operate-ui/src/views/detail/party-a/component/skeleton.vue
View file @ a6d64cbd
<template> <template>
<el-skeleton animated> <el-skeleton animated class="el-skeleton-container">
<template slot="template"> <template slot="template">
<el-skeleton-item variant="text" style="width: 60%;"/> <el-skeleton-item variant="text" style="width: 60%;" />
<el-skeleton-item variant="text" style="width: 100%;" /> <el-skeleton-item variant="text" style="width: 100%;" />
<el-skeleton-item variant="text" style="width: 100%;" /> <el-skeleton-item variant="text" style="width: 100%;" />
<el-skeleton-item variant="text" style="width: 100%;" /> <el-skeleton-item variant="text" style="width: 100%;" />
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
</template> </template>
<script> <script>
export default { export default {
name: 'skeleton' name: 'skeleton'
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.el-skeleton__item{ .el-skeleton__item {
height: 20px; height: 20px;
border-radius: 0; border-radius: 0;
margin: 9px 0; margin: 9px 0;
......
dsk-operate-ui/src/views/detail/party-a/index.vue
View file @ a6d64cbd
...@@ -35,6 +35,11 @@ ...@@ -35,6 +35,11 @@
<!-- 咨询业务往来 --> <!-- 咨询业务往来 -->
<!-- 1.常合作业主单位 --> <!-- 1.常合作业主单位 -->
<cooperative-owner-units v-if="currentPath.pathName=='cooperativeOwnerUnits'" :company-id="companyId"></cooperative-owner-units> <cooperative-owner-units v-if="currentPath.pathName=='cooperativeOwnerUnits'" :company-id="companyId"></cooperative-owner-units>
<!-- 2、常合作施工单位 -->
<cooperative-construction-unit v-if="currentPath.pathName=='cooperativeConstructionUnit'"
:company-id="companyId"></cooperative-construction-unit>
<!-- 3、常合作集团 -->
<cooperative-group v-if="currentPath.pathName=='cooperativeGroup'" :company-id="companyId"></cooperative-group>
<!-- 投诚分析 --> <!-- 投诚分析 -->
<RegionalEconomies v-if="currentPath.pathName=='regionalEconomies'" :company-id="companyId" :companyInfo="companyInfo" /> <RegionalEconomies v-if="currentPath.pathName=='regionalEconomies'" :company-id="companyId" :companyInfo="companyInfo" />
<LandAcquisition v-if="currentPath.pathName=='landAcquisition'" :company-id="companyId" /> <LandAcquisition v-if="currentPath.pathName=='landAcquisition'" :company-id="companyId" />
...@@ -111,6 +116,8 @@ import Bidagency from "./dealings/bidagency"; //业务往来-招标代理 ...@@ -111,6 +116,8 @@ import Bidagency from "./dealings/bidagency"; //业务往来-招标代理
import Hiscontract from "./dealings/hiscontract"; //业务往来-历史发包 import Hiscontract from "./dealings/hiscontract"; //业务往来-历史发包
import Bidrecords from "./dealings/bidrecords"; //业务往来-开标记录 import Bidrecords from "./dealings/bidrecords"; //业务往来-开标记录
import CooperativeOwnerUnits from "@/views/detail/party-a/consultingTransaction/cooperativeOwnerUnits"; //咨询业务往来 常合作业主单位 import CooperativeOwnerUnits from "@/views/detail/party-a/consultingTransaction/cooperativeOwnerUnits"; //咨询业务往来 常合作业主单位
import CooperativeConstructionUnit from "@/views/detail/party-a/consultingTransaction/cooperativeConstructionUnit"; //咨询业务往来 常合作施工单位
import CooperativeGroup from "@/views/detail/party-a/consultingTransaction/cooperativeGroup"; //咨询业务往来 常合作集团
import LandAcquisition from "./urbanLnvestment/landAcquisition"; //投诚分析-城投拿地 import LandAcquisition from "./urbanLnvestment/landAcquisition"; //投诚分析-城投拿地
import RegionalEconomies from "./urbanLnvestment/regionalEconomies"; //投诚分析-区域经济 import RegionalEconomies from "./urbanLnvestment/regionalEconomies"; //投诚分析-区域经济
import SameRegion from "./urbanLnvestment/sameRegion"; //投诚分析-同地区城投 import SameRegion from "./urbanLnvestment/sameRegion"; //投诚分析-同地区城投
...@@ -180,7 +187,9 @@ export default { ...@@ -180,7 +187,9 @@ export default {
CooperativeOwnerUnits, CooperativeOwnerUnits,
ConsultingAgencyCooperation, ConsultingAgencyCooperation,
AccessCondition, AccessCondition,
CooperationRecord CooperationRecord,
CooperativeConstructionUnit,
CooperativeGroup
}, },
data() { data() {
return { return {
...@@ -309,7 +318,7 @@ export default { ...@@ -309,7 +318,7 @@ export default {
if (result.code == 200) { if (result.code == 200) {
if (result.data.totalCount < 1) { if (result.data.totalCount < 1) {
let arr = JSON.parse(JSON.stringify(this.$refs.sidebar.sideRoute)); let arr = JSON.parse(JSON.stringify(this.$refs.sidebar.sideRoute));
arr[1].children[5].children[2].disabled = true; arr[0].children[5].children[2].disabled = true;
this.$refs.sidebar.sideRoute = arr; this.$refs.sidebar.sideRoute = arr;
} }
} }
......
dsk-operate-ui/src/views/detail/party-a/internalCooperation/accessCondition.vue
View file @ a6d64cbd
...@@ -11,37 +11,37 @@ ...@@ -11,37 +11,37 @@
</tr> </tr>
<tr> <tr>
<td class="table-key">公司名称</td> <td class="table-key">公司名称</td>
<td>-</td> <td>{{supplierAccessInfo.customerName ? supplierAccessInfo.customerName : "-"}}</td>
<td class="table-key">注册资本（万元）</td> <td class="table-key">注册资本（万元）</td>
<td>-</td> <td>{{supplierAccessInfo.registerCapital ? supplierAccessInfo.registerCapital : "-"}}</td>
</tr> </tr>
<tr> <tr>
<td class="table-key">证件选择</td> <td class="table-key">证件选择</td>
<td>-</td> <td>{{supplierAccessInfo.cardType ? supplierAccessInfo.cardType : "-"}}</td>
<td class="table-key">统一社会信用代码</td> <td class="table-key">统一社会信用代码</td>
<td>-</td> <td>{{supplierAccessInfo.unifySocialCode ? supplierAccessInfo.unifySocialCode : "-"}}</td>
</tr> </tr>
<tr> <tr>
<td class="table-key">工商注册号</td> <td class="table-key">工商注册号</td>
<td>-</td> <td>{{supplierAccessInfo.registerNo ? supplierAccessInfo.registerNo : "-"}}</td>
<td class="table-key">组织机构代码证号</td> <td class="table-key">组织机构代码证号</td>
<td>-</td> <td>{{supplierAccessInfo.orgnizationCode ? supplierAccessInfo.orgnizationCode : "-"}}</td>
</tr> </tr>
<tr> <tr>
<td class="table-key">税务登记号</td> <td class="table-key">税务登记号</td>
<td colspan="3">-</td> <td colspan="3">{{supplierAccessInfo.businessLicense ? supplierAccessInfo.businessLicense : "-"}}</td>
</tr> </tr>
<tr> <tr>
<td class="table-key">身份选择</td> <td class="table-key">身份选择</td>
<td>-</td> <td>{{supplierAccessInfo.cardType ? supplierAccessInfo.cardType : "-"}}</td>
<td class="table-key">法人身份证号/护照...</td> <td class="table-key">法人身份证号/护照...</td>
<td>-</td> <td>{{supplierAccessInfo.idCard ? supplierAccessInfo.idCard : "-"}}</td>
</tr> </tr>
<tr> <tr>
<td class="table-key">纳税人身份</td> <td class="table-key">纳税人身份</td>
<td>-</td> <td>{{supplierAccessInfo.paytaxType ? supplierAccessInfo.paytaxType : "-"}}</td>
<td class="table-key">纳税人税率</td> <td class="table-key">纳税人税率</td>
<td>-</td> <td>{{supplierAccessInfo.taxRate ? supplierAccessInfo.taxRate : "-"}}</td>
</tr> </tr>
<tr> <tr>
<td class="table-key lot">享受优惠政策说明</td> <td class="table-key lot">享受优惠政策说明</td>
...@@ -52,45 +52,45 @@ ...@@ -52,45 +52,45 @@
<table style="margin-top:16px;"> <table style="margin-top:16px;">
<tr> <tr>
<td class="table-key">法人代表</td> <td class="table-key">法人代表</td>
<td>-</td> <td>{{supplierAccessInfo.representative ? supplierAccessInfo.representative : "-"}}</td>
<td class="table-key">公司联系人</td> <td class="table-key">公司联系人</td>
<td>-</td> <td>{{supplierAccessInfo.contactPerson ? supplierAccessInfo.contactPerson : "-"}}</td>
</tr> </tr>
<tr> <tr>
<td class="table-key">公司联系人电话</td> <td class="table-key">公司联系人电话</td>
<td>-</td> <td>{{supplierAccessInfo.contactPhone ? supplierAccessInfo.contactPhone : "-"}}</td>
<td class="table-key">主项资质</td> <td class="table-key">主项资质</td>
<td>-</td> <td>-</td>
</tr> </tr>
<tr> <tr>
<td class="table-key">公司性质</td> <td class="table-key">公司性质</td>
<td>-</td> <td>{{supplierAccessInfo.ownerKind ? supplierAccessInfo.ownerKind : "-"}}</td>
<td class="table-key">资质等级</td> <td class="table-key">资质等级</td>
<td>-</td> <td>{{supplierAccessInfo.credential ? supplierAccessInfo.credential : "-"}}</td>
</tr> </tr>
<tr> <tr>
<td class="table-key">施工承包范围</td> <td class="table-key">施工承包范围</td>
<td>-</td> <td>{{supplierAccessInfo.constructJobScope ? supplierAccessInfo.constructJobScope : "-"}}</td>
<td class="table-key">专业类别</td> <td class="table-key">专业类别</td>
<td>-</td> <td>{{supplierAccessInfo.groupSpecialty ? supplierAccessInfo.groupSpecialty : "-"}}</td>
</tr> </tr>
<tr> <tr>
<td class="table-key">公司注册地所属区域</td> <td class="table-key">公司注册地所属区域</td>
<td>-</td> <td>{{supplierAccessInfo.registerRegion ? supplierAccessInfo.registerRegion : "-"}}</td>
<td class="table-key">公司注册地所属省</td> <td class="table-key">公司注册地所属省</td>
<td>-</td> <td>{{supplierAccessInfo.registerProvince ? supplierAccessInfo.registerProvince : "-"}}</td>
</tr> </tr>
<tr> <tr>
<td class="table-key">公司注册地所属城市</td> <td class="table-key">公司注册地所属城市</td>
<td>-</td> <td>{{supplierAccessInfo.registerCity ? supplierAccessInfo.registerCity : "-"}}</td>
<td class="table-key">注册地址</td> <td class="table-key">注册地址</td>
<td>-</td> <td>{{supplierAccessInfo.registerAddress ? supplierAccessInfo.registerAddress : "-"}}</td>
</tr> </tr>
<tr> <tr>
<td class="table-key">开户行</td> <td class="table-key">开户行</td>
<td>-</td> <td>{{supplierAccessInfo.openBank ? supplierAccessInfo.openBank : "-"}}</td>
<td class="table-key">银行账号</td> <td class="table-key">银行账号</td>
<td>-</td> <td>{{supplierAccessInfo.bankAccount ? supplierAccessInfo.bankAccount : "-"}}</td>
</tr> </tr>
</table> </table>
......
dsk-operate-ui/src/views/detail/party-a/internalCooperation/cooperationRecord.vue
View file @ a6d64cbd
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</tables> </tables>
<el-dialog :title="dialogTitle" :visible.sync="cooperationRecordDialog" width="1100px" @close="dialogClose" <el-dialog :title="dialogTitle" :visible.sync="cooperationRecordDialog" width="1100px" @close="dialogClose"
class="cooperation-record-dialog-container" custom-class="cooperation-record-dialog"> class="cooperation-record-dialog-container" custom-class="cooperation-record-dialog" :destroy-on-close="true">
<div class="cooperation-record-dialog-innner"> <div class="cooperation-record-dialog-innner">
<dialog-head-form-new title="" :form-data="dialogFormData" :query-params="dialogQueryParams" :total="dialogtableDataTotal" :isExcel="false" <dialog-head-form-new title="" :form-data="dialogFormData" :query-params="dialogQueryParams" :total="dialogtableDataTotal" :isExcel="false"
@handle-search="dialogHandleSearch" ref="dialogSearchFormNew" /> @handle-search="dialogHandleSearch" ref="dialogSearchFormNew" />
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
isSkeleton: true, isSkeleton: true,
areaList: [], areaList: [],
// 合作记录弹窗 // 合作记录弹窗
cooperationRecordDialog: true, cooperationRecordDialog: false,
dialogTitle: "", dialogTitle: "",
dialogQueryParams: { dialogQueryParams: {
......
dsk-operate-ui/src/views/monitoring/EnterpriseMonitoring.vue
View file @ a6d64cbd
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
</el-upload> </el-upload>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button class="download" icon="el-icon-download">下载模版</el-button> <el-button class="download" icon="el-icon-download" @click="downloadClick">下载模版</el-button>
<el-button @click="handleUploadCancel1">取消</el-button> <el-button @click="handleUploadCancel1">取消</el-button>
<el-button type="primary" @click="submitUpload">确定</el-button> <el-button type="primary" @click="submitUpload">确定</el-button>
</div> </div>
...@@ -207,10 +207,12 @@ ...@@ -207,10 +207,12 @@
headers: { headers: {
Authorization: "Bearer " + getToken(), Authorization: "Bearer " + getToken(),
}, },
companyId:'' companyId:'',
downloadhref: '',//样例地址
} }
}, },
created() { created() {
this.downloadhref = '/file/Template.xlsx';
this.querySubmit() this.querySubmit()
}, },
methods: { methods: {
...@@ -244,6 +246,8 @@ ...@@ -244,6 +246,8 @@
} }
companyAdd(data).then(res => { companyAdd(data).then(res => {
this.qyVisible=false; this.qyVisible=false;
this.companyName=''
this.dataList=[]
this.$message.success("新增成功"); this.$message.success("新增成功");
this.querySubmit() this.querySubmit()
}) })
...@@ -367,6 +371,14 @@ ...@@ -367,6 +371,14 @@
this.fileList=[] this.fileList=[]
this.pldrVisible=false; this.pldrVisible=false;
}, },
downloadClick() {
let a = document.createElement("a");
a.setAttribute("href", this.downloadhref);
a.setAttribute("download", "批量导入模版.xlsx");
document.body.appendChild(a);
a.click();
a.remove();
},
submitUpload() { submitUpload() {
this.$refs.upload.submit(); this.$refs.upload.submit();
}, },
......
dsk-operate-ui/src/views/monitoring/MonitorSettings.vue
View file @ a6d64cbd
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
} }
console.log(params) console.log(params)
insertOrUpdate(params).then(res => { insertOrUpdate(params).then(res => {
this.$modal.success(res.msg); this.$message.success(res.msg);
}) })
}, },
handleResetting(){ handleResetting(){
......
dsk-operate-ui/src/views/monitoring/MonitoringDynamics.vue
View file @ a6d64cbd
...@@ -456,6 +456,7 @@ ...@@ -456,6 +456,7 @@
this.dialogVisible=true; this.dialogVisible=true;
break; break;
default: default:
this.$message.success("暂无详情");
break; break;
} }
this.getDetail(item.dimensionName,item.sourceId) this.getDetail(item.dimensionName,item.sourceId)
......
dsk-operate-ui/src/views/monitoring/MonitoringReportDetails.vue
View file @ a6d64cbd
...@@ -436,6 +436,7 @@ ...@@ -436,6 +436,7 @@
this.dialogVisible=true; this.dialogVisible=true;
break; break;
default: default:
this.$message.success("暂无详情");
break; break;
} }
this.getDetail(item.dimensionName,item.sourceId) this.getDetail(item.dimensionName,item.sourceId)
......
dsk-system/src/main/java/com/dsk/system/service/impl/SysRoleServiceImpl.java
View file @ a6d64cbd
...@@ -7,13 +7,9 @@ import cn.hutool.core.util.ObjectUtil; ...@@ -7,13 +7,9 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsk.common.constant.TenantConstants; import com.dsk.common.constant.TenantConstants;
import com.dsk.system.domain.*;
import com.dsk.system.mapper.*;
import com.dsk.system.service.ISysRoleService;
import com.dsk.common.constant.UserConstants; import com.dsk.common.constant.UserConstants;
import com.dsk.common.core.domain.PageQuery; import com.dsk.common.core.domain.PageQuery;
import com.dsk.common.core.domain.model.LoginUser; import com.dsk.common.core.domain.model.LoginUser;
...@@ -22,6 +18,9 @@ import com.dsk.common.exception.ServiceException; ...@@ -22,6 +18,9 @@ import com.dsk.common.exception.ServiceException;
import com.dsk.common.helper.LoginHelper; import com.dsk.common.helper.LoginHelper;
import com.dsk.common.utils.StreamUtils; import com.dsk.common.utils.StreamUtils;
import com.dsk.common.utils.StringUtils; import com.dsk.common.utils.StringUtils;
import com.dsk.system.domain.*;
import com.dsk.system.mapper.*;
import com.dsk.system.service.ISysRoleService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -406,8 +405,12 @@ public class SysRoleServiceImpl implements ISysRoleService { ...@@ -406,8 +405,12 @@ public class SysRoleServiceImpl implements ISysRoleService {
*/ */
@Override @Override
public int deleteAuthUser(SysUserRole userRole) { public int deleteAuthUser(SysUserRole userRole) {
//校验企业管理员角色下是否至少有一个账号 Set<String> rolePermission = Objects.requireNonNull(LoginHelper.getLoginUser()).getRolePermission();
checkAdminHasUsers(userRole.getRoleId()); if (rolePermission.contains(TenantConstants.TENANT_SUPER_ADMIN_ROLE_KEY)
|| rolePermission.contains(TenantConstants.TENANT_ADMIN_ROLE_KEY)) {
//校验企业管理员角色下是否至少有一个可用账号
checkAdminHasUsers(userRole.getRoleId());
}
//若该账号仅有一个角色,则不允许取消授权 //若该账号仅有一个角色,则不允许取消授权
SysUser sysUser = userMapper.selectUserById(userRole.getUserId()); SysUser sysUser = userMapper.selectUserById(userRole.getUserId());
...@@ -447,7 +450,7 @@ public class SysRoleServiceImpl implements ISysRoleService { ...@@ -447,7 +450,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
//将缺少角色的账号返回给前端 //将缺少角色的账号返回给前端
if (lackRoleAccount.toString().contains(",")) { if (lackRoleAccount.toString().contains(",")) {
throw new ServiceException(lackRoleAccount.substring(0, lackRoleAccount.length()-1)); throw new ServiceException(lackRoleAccount.substring(0, lackRoleAccount.length() - 1));
} }
//如果取消授权企业管理员角色下所有账号,则抛异常 //如果取消授权企业管理员角色下所有账号,则抛异常
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment