From 96b495dc431aa01a0641762a91918f8ecdbf6bcd Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Mon, 22 Apr 2024 16:43:07 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SystemUserServiceImpl.java | 11 +- .../ProjectEnterpriseController.java | 27 +--- .../project/entity/ProjectEnterprise.java | 23 ++-- .../mapper/ProjectEnterpriseMapper.java | 3 + .../mapper/xml/ProjectEnterpriseMapper.xml | 6 + .../service/IProjectEnterpriseService.java | 5 + .../impl/ProjectEnterpriseServiceImpl.java | 69 +++++++++-- .../controller/QualityRegionController.java | 15 +-- .../modules/quality/entity/QualityRegion.java | 2 + .../quality/mapper/QualityRegionMapper.java | 3 + .../mapper/xml/QualityRegionMapper.xml | 6 + .../service/IQualityRegionService.java | 4 +- .../impl/QualityRegionServiceImpl.java | 115 ++++++++++++------ .../controller/XzTaskProgressController.java | 4 +- .../modules/xz/entity/XzTaskProgress.java | 2 + .../xz/entity/vo/CountTaskProgressVo.java | 13 +- 16 files changed, 206 insertions(+), 102 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index 0ac1b9030..05836699c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -1284,11 +1284,6 @@ public class SystemUserServiceImpl extends ServiceImpl getSystemUserList(Map map) { @@ -1511,6 +1506,12 @@ public class SystemUserServiceImpl extends ServiceImpl delete(@RequestBody Map map) { - Result result = new Result(); - ProjectEnterprise projectEnterprise = projectEnterpriseService.getById(MapUtils.getString(map,"id")); - if(projectEnterprise==null) { - result.error500(MessageUtil.get("notFindErr")); - }else { - boolean ok = projectEnterpriseService.removeById(MapUtils.getString(map,"id")); - if(ok) { - result.successMsg(MessageUtil.get("deleteSucess")); - } - } - return result; - } + String id = MapUtils.getString(map, "id"); + projectEnterpriseService.delete(id); + return Result.ok(); + } /** * 批量删除 @@ -126,15 +118,8 @@ public class ProjectEnterpriseController { @ApiImplicitParam(name = "ids", value = "项目劳务公司关联ID字符串", paramType = "body", required = true, dataType = "String") @PostMapping(value = "/deleteBatch") public Result deleteBatch(@RequestBody Map map) { - Result result = new Result(); - String ids=MapUtils.getString(map,"ids"); - if(ids==null || "".equals(ids.trim())) { - result.error500(MessageUtil.get("parameterErr")); - }else { - this.projectEnterpriseService.removeByIds(Arrays.asList(ids.split(","))); - result.successMsg(MessageUtil.get("deleteSucess")); - } - return result; + projectEnterpriseService.deleteBatch(map); + return Result.ok(); } /** diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java index b14b0f128..2be22ad98 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java @@ -22,7 +22,7 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel(value="ProjectEnterprise实体类",description="ProjectEnterprise") public class ProjectEnterprise implements Serializable { private static final long serialVersionUID = 1L; - + /**项目-企业关联表*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="项目-企业关联表") @@ -39,13 +39,11 @@ public class ProjectEnterprise implements Serializable { /**企业类型*/ @Excel(name = "企业类型", width = 15) @ApiModelProperty(value="企业类型") - private java.lang.Long enterpriseTypeId ; /**父级企业ID*/ @Excel(name = "父级企业ID", width = 15) @ApiModelProperty(value="父级企业ID") - private java.lang.Long parentEnterpriseId ; @Excel(name = "类型，1项目，2企业", width = 15) @@ -57,14 +55,19 @@ public class ProjectEnterprise implements Serializable { private java.lang.String projectDirectorName ; @Excel(name = "项目负责人电话", width = 15) - @ApiModelProperty(value="项目负责人电话") - private java.lang.String projectDirectorPhone ; + @ApiModelProperty(value = "项目负责人电话") + private java.lang.String projectDirectorPhone; - /**排序*/ + /** + * 排序 + */ @Excel(name = "排序", width = 15) - @ApiModelProperty(value="排序") - private java.lang.Integer sortNum ; + @ApiModelProperty(value = "排序") + private java.lang.Integer sortNum; - @ApiModelProperty(value="是否是项目部公司，1否，2是") - private java.lang.Integer departmentType ; + @ApiModelProperty(value = "是否是项目部公司，1否，2是") + private java.lang.Integer departmentType; + + @ApiModelProperty(value = "祖级列表") + private java.lang.String ancestors; } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectEnterpriseMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectEnterpriseMapper.java index 4dfaaff6e..dcf3e1fac 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectEnterpriseMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectEnterpriseMapper.java @@ -33,4 +33,7 @@ public interface ProjectEnterpriseMapper extends BaseMapper { void updateEnterpriseType(Map map); List> selectExternalEnterpriseList(Map map); + + void updateAncestors(@Param("oldAncestor") String oldAncestor, @Param("newAncestor") String newAncestor, @Param("projectSn") String projectSn, @Param("id") Long id); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectEnterpriseMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectEnterpriseMapper.xml index 6bd38a3bb..6d864c365 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectEnterpriseMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectEnterpriseMapper.xml @@ -102,4 +102,10 @@ and a.social_code = #{socialCode} + + + UPDATE project_enterprise + SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) + WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn} + diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectEnterpriseService.java b/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectEnterpriseService.java index 378115314..7cfb4e332 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectEnterpriseService.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectEnterpriseService.java @@ -30,4 +30,9 @@ public interface IProjectEnterpriseService extends IService { Map bindProjectCompany(Map map); List> selectExternalEnterpriseList(Map map); + + void delete(String id); + + void deleteBatch(Map map); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java index 403e1a69f..1e21cf6d3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.project.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -24,10 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -81,16 +79,48 @@ public class ProjectEnterpriseServiceImpl extends ServiceImpl 0) { throw new OpenAlertException(MessageUtil.get("existsEnterpriseErr")); } + + boolean top = projectEnterprise.getParentEnterpriseId() == null || projectEnterprise.getParentEnterpriseId() == 0; + if (top) { + projectEnterprise.setParentEnterpriseId(0L); + projectEnterprise.setAncestors("0"); + } else { + ProjectEnterprise pOrg = projectEnterpriseMapper.selectOne(new LambdaQueryWrapper() + .eq(ProjectEnterprise::getId, projectEnterprise.getParentEnterpriseId())); + if (pOrg == null) { + throw new OpenAlertException("上级不存在"); + } + projectEnterprise.setAncestors(pOrg.getAncestors() + "," + pOrg.getId()); + } projectEnterpriseMapper.insert(projectEnterprise); } @Override public void editProjectEnterprise(ProjectEnterprise projectEnterprise) { - ProjectEnterprise projectEnterpriseEntity = projectEnterpriseMapper.selectById(projectEnterprise.getId()); - if (projectEnterpriseEntity == null) { + ProjectEnterprise oldPo = projectEnterpriseMapper.selectById(projectEnterprise.getId()); + if (oldPo == null) { throw new OpenAlertException(MessageUtil.get("notFindErr")); } - projectEnterpriseMapper.updateById(projectEnterprise); + + if (!Objects.equals(oldPo.getParentEnterpriseId(), projectEnterprise.getParentEnterpriseId())) { + ProjectEnterprise pOrg = projectEnterpriseMapper.selectById(projectEnterprise.getParentEnterpriseId()); + // 修改子部门 + boolean top = projectEnterprise.getParentEnterpriseId() == null || projectEnterprise.getParentEnterpriseId() == 0; + if (top) { + projectEnterprise.setParentEnterpriseId(0L); + projectEnterprise.setAncestors("0"); + } else { + if (pOrg == null) { + throw new OpenAlertException("上级部门不存在"); + } + projectEnterprise.setAncestors(pOrg.getAncestors() + "," + pOrg.getId()); + } + baseMapper.updateAncestors(oldPo.getAncestors(), projectEnterprise.getAncestors(), projectEnterprise.getProjectSn(), projectEnterprise.getId()); + baseMapper.updateById(projectEnterprise); + } else { + projectEnterprise.setAncestors(null); + baseMapper.updateById(projectEnterprise); + } } @Override @@ -148,4 +178,29 @@ public class ProjectEnterpriseServiceImpl extends ServiceImpl> selectExternalEnterpriseList(Map map) { return projectEnterpriseMapper.selectExternalEnterpriseList(map); } + + @Override + public void delete(String id) { + ProjectEnterprise xzProjectOrg = baseMapper.selectById(id); + if (xzProjectOrg == null) { + throw new OpenAlertException("未找到对应实体"); + } + List xzProjectOrgs = baseMapper.selectList(new LambdaQueryWrapper() + .eq(ProjectEnterprise::getParentEnterpriseId, id)); + if (CollUtil.isNotEmpty(xzProjectOrgs)) { + throw new OpenAlertException("有下级劳务公司，无法删除"); + } + baseMapper.deleteById(id); + } + + @Override + public void deleteBatch(Map map) { + String ids = MapUtils.getString(map, "ids"); + if (ids == null || "".equals(ids.trim())) { + throw new OpenAlertException(MessageUtil.get("parameterErr")); + } + for (String id : Arrays.asList(ids.split(","))) { + delete(id); + } + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java index 38c41ec9a..db63543fe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java @@ -67,19 +67,8 @@ public class QualityRegionController { @ApiOperation(value = "编辑质量—检查部位信息", notes = "编辑质量—检查部位信息" , httpMethod="POST") @PostMapping(value = "/edit") public Result edit(@RequestBody QualityRegion qualityRegion) { - Result result = new Result(); - QualityRegion qualityRegionEntity = qualityRegionService.getById(qualityRegion.getId()); - if(qualityRegionEntity==null) { - result.error500(MessageUtil.get("notFindErr")); - }else { - boolean ok = qualityRegionService.updateById(qualityRegion); - - if(ok) { - result.successMsg(MessageUtil.get("editSucess")); - } - } - - return result; + qualityRegionService.edit(qualityRegion); + return Result.ok(); } /** diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRegion.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRegion.java index 68f912528..d561e6ef1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRegion.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRegion.java @@ -83,6 +83,8 @@ public class QualityRegion implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; + @ApiModelProperty(value = "祖级列表") + private java.lang.String ancestors; @TableField(exist = false) private List children; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java index d92b0533a..6e567d6a9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java @@ -7,6 +7,7 @@ import com.zhgd.jeecg.common.mybatis.EntityMap; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.quality.entity.QualityRegion; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** * @Description: 质量—检查部位 @@ -24,4 +25,6 @@ public interface QualityRegionMapper extends BaseMapper { QualityRegion getPeerNewQualityRegion(Map param); void updateDutyNull(String id); + + void updateAncestors(@Param("oldAncestor") String oldAncestor, @Param("newAncestor") String newAncestor, @Param("projectSn") String projectSn, @Param("id") Long id); } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml index 457230a7c..5fc4cd7d5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml @@ -29,4 +29,10 @@ duty_name = null where duty_id = #{id} + + + UPDATE quality_region + SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) + WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn} + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java index 3fda2bc3f..f510c4abf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java @@ -10,7 +10,7 @@ import java.util.Map; /** * @Description: 质量—检查部位 * @author： pds - * @date： 2020-10-21 + * @date： 2020-10-21 * @version： V1.0 */ public interface IQualityRegionService extends IService { @@ -20,4 +20,6 @@ public interface IQualityRegionService extends IService { void addQualityRegion(QualityRegion qualityRegion); void deleteQualityRegion(Map map); + + void edit(QualityRegion qualityRegion); } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java index 769e33f6a..37876e099 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java @@ -1,16 +1,18 @@ package com.zhgd.xmgl.modules.quality.service.impl; -import cn.hutool.core.lang.tree.TreeUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.xmgl.modules.quality.entity.QualityRegion; import com.zhgd.xmgl.modules.quality.mapper.QualityRegionMapper; import com.zhgd.xmgl.modules.quality.service.IQualityRegionService; +import com.zhgd.xmgl.modules.xz.entity.XzProjectOrg; import com.zhgd.xmgl.util.ListUtils; +import com.zhgd.xmgl.util.MessageUtil; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; import java.util.*; @@ -18,7 +20,7 @@ import java.util.*; /** * @Description: 质量—检查部位 * @author： pds - * @date： 2020-10-21 + * @date： 2020-10-21 * @version： V1.0 */ @Service @@ -54,55 +56,96 @@ public class QualityRegionServiceImpl extends ServiceImpl param=new HashMap<>(); - param.put("projectSn",qualityRegion.getProjectSn()); - param.put("parentRegion",qualityRegion.getParentRegion()); + Map param = new HashMap<>(); + param.put("projectSn", qualityRegion.getProjectSn()); + param.put("parentRegion", qualityRegion.getParentRegion()); qualityRegion.setCreateTime(new Date()); - QualityRegion tempQualityRegion=qualityRegionMapper.getPeerNewQualityRegion(param); - if(tempQualityRegion!=null){ - String end = tempQualityRegion.getRegionCode().substring(tempQualityRegion.getRegionCode().length() -2,tempQualityRegion.getRegionCode().length()); - String start = tempQualityRegion.getRegionCode().substring(0,tempQualityRegion.getRegionCode().length()-2); - Integer num=Integer.valueOf(end)+1; - if(num<10){ - start=start+"0"+num; - }else{ - start=start+num; + QualityRegion tempQualityRegion = qualityRegionMapper.getPeerNewQualityRegion(param); + if (tempQualityRegion != null) { + String end = tempQualityRegion.getRegionCode().substring(tempQualityRegion.getRegionCode().length() - 2, tempQualityRegion.getRegionCode().length()); + String start = tempQualityRegion.getRegionCode().substring(0, tempQualityRegion.getRegionCode().length() - 2); + Integer num = Integer.valueOf(end) + 1; + if (num < 10) { + start = start + "0" + num; + } else { + start = start + num; } qualityRegion.setRegionCode(start); - }else{ - if(qualityRegion.getParentRegion()==0){ + } else { + if (qualityRegion.getParentRegion() == 0) { qualityRegion.setRegionCode("01"); - }else{ - QualityRegion parentQualityRegion=qualityRegionMapper.selectById(qualityRegion.getParentRegion()); - String end = parentQualityRegion.getRegionCode().substring(parentQualityRegion.getRegionCode().length() -2,parentQualityRegion.getRegionCode().length()); - String start = parentQualityRegion.getRegionCode().substring(0,parentQualityRegion.getRegionCode().length()-2); - Integer num=Integer.valueOf(end)+1; - if(num<10){ - start=start+"0"+num; - }else{ - start=start+num; + } else { + QualityRegion parentQualityRegion = qualityRegionMapper.selectById(qualityRegion.getParentRegion()); + String end = parentQualityRegion.getRegionCode().substring(parentQualityRegion.getRegionCode().length() - 2, parentQualityRegion.getRegionCode().length()); + String start = parentQualityRegion.getRegionCode().substring(0, parentQualityRegion.getRegionCode().length() - 2); + Integer num = Integer.valueOf(end) + 1; + if (num < 10) { + start = start + "0" + num; + } else { + start = start + num; } qualityRegion.setRegionCode(start); } } + + boolean top = qualityRegion.getParentRegion() == null || qualityRegion.getParentRegion() == 0; + if (top) { + qualityRegion.setParentRegion(0L); + qualityRegion.setAncestors("0"); + } else { + QualityRegion pOrg = qualityRegionMapper.selectOne(new LambdaQueryWrapper() + .eq(QualityRegion::getId, qualityRegion.getParentRegion())); + if (pOrg == null) { + throw new OpenAlertException("上级不存在"); + } + qualityRegion.setAncestors(pOrg.getAncestors() + "," + pOrg.getId()); + } qualityRegionMapper.insert(qualityRegion); } - @Override public void deleteQualityRegion(Map map) { - deleteRegion(MapUtils.getLong(map,"id")); + deleteRegion(MapUtils.getLong(map, "id")); } - private void deleteRegion(Long id){ - QueryWrapper queryWrapper=new QueryWrapper(); - queryWrapper.lambda().eq(QualityRegion::getParentRegion,id); - List list=qualityRegionMapper.selectList(queryWrapper); - if(list.size()>0){ - for(QualityRegion qualityRegion:list){ + + @Override + public void edit(QualityRegion qualityRegion) { + QualityRegion oldPo = getById(qualityRegion.getId()); + if (oldPo == null) { + throw new OpenAlertException(MessageUtil.get("notFindErr")); + } + + if (!Objects.equals(oldPo.getParentRegion(), qualityRegion.getParentRegion())) { + QualityRegion pOrg = qualityRegionMapper.selectById(qualityRegion.getParentRegion()); + // 修改子部门 + boolean top = qualityRegion.getParentRegion() == null || qualityRegion.getParentRegion() == 0; + if (top) { + qualityRegion.setParentRegion(0L); + qualityRegion.setAncestors("0"); + } else { + if (pOrg == null) { + throw new OpenAlertException("上级部门不存在"); + } + qualityRegion.setAncestors(pOrg.getAncestors() + "," + pOrg.getId()); + } + baseMapper.updateAncestors(oldPo.getAncestors(), qualityRegion.getAncestors(), qualityRegion.getProjectSn(), qualityRegion.getId()); + baseMapper.updateById(qualityRegion); + } else { + qualityRegion.setAncestors(null); + baseMapper.updateById(qualityRegion); + } + } + + private void deleteRegion(Long id) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.lambda().eq(QualityRegion::getParentRegion, id); + List list = qualityRegionMapper.selectList(queryWrapper); + if (list.size() > 0) { + for (QualityRegion qualityRegion : list) { deleteRegion(qualityRegion.getId()); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressController.java index cf2f522c4..2e6b5f902 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressController.java @@ -239,11 +239,9 @@ public class XzTaskProgressController { return taskProgressService.exportXls(paramMap, request); } - - @ApiOperation(value = "工作一览（统计）", notes = "工作一览（统计）", httpMethod = "POST") + @ApiOperation(value = "甘特图统计", notes = "甘特图统计", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), - @ApiImplicitParam(name = "type", value = "1.本月2.下月", paramType = "body", required = false, dataType = "Integer"), }) @PostMapping(value = "/countTaskProgress") public Result countTaskProgress(@ApiIgnore @RequestBody HashMap paramMap) { diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgress.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgress.java index 09031cc33..de4da121d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgress.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgress.java @@ -164,6 +164,8 @@ public class XzTaskProgress implements Serializable { @ApiModelProperty(value = "所属企业表外键ID") private java.lang.Long enterpriseId; + @ApiModelProperty(value = "区域id") + private java.lang.Long qualityRegionId; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java index 3b2baef26..8bd9056a3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java @@ -5,10 +5,11 @@ import lombok.Data; @Data public class CountTaskProgressVo { - @ApiModelProperty("工作总数") - private Integer workCount; - @ApiModelProperty("延迟工作（那按照实际开始时间来算，实际开始时间提前就算提前工作，实际开始时间逾期就算延迟工作）") - private Integer delayCount; - @ApiModelProperty("提前工作（那按照实际开始时间来算，实际开始时间提前就算提前工作，实际开始时间逾期就算延迟工作）") - private Integer aheadCount; + @ApiModelProperty("项目总进度") + private Double projectTotalProgress; + @ApiModelProperty("项目总天数") + private Integer projectTotalDayNum; + @ApiModelProperty("项目剩余天数") + private Integer projectSurplusDayNum; } +