diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 78f66e9330..784fba9d9f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -43,7 +43,10 @@ public enum EpmetErrorCode { CANNOT_DISABLE_YOURSELF(8405,"您不能禁用自己"), ALREADY_EVALUATE(8501,"您已评价"), - ALREADY_VOTE(8502,"您已表态"); + ALREADY_VOTE(8502,"您已表态"), + + PROJECT_IS_CLOSED(8601,"项目已结案") + ; private int code; private String msg; diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml index bba4cc4cb9..6137c13b6f 100644 --- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.16 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.17 ports: - "8097:8097" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 9a1b48aa86..d254e41dab 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.16 + 0.3.17 com.epmet gov-grid diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/RemindServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/RemindServiceImpl.java index 6bb67369ff..b06f687de1 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/RemindServiceImpl.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/RemindServiceImpl.java @@ -55,7 +55,7 @@ public class RemindServiceImpl implements RemindService { }else{ List gridList = govOrgResult.getData(); for (CustomerGridByUserIdResultDTO gridInfo : gridList) { - if(formDTO.getGridId().equals(gridInfo)){ + if(formDTO.getGridId().equals(gridInfo.getGridId())){ //查询非当前网格的 break; } diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index a549be7509..442d1e4435 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.3 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.4 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 43d709813d..38432d91d1 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.3 + 0.3.4 gov-issue com.epmet diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml index 3aca7b592a..9384100069 100644 --- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-mine-server: container_name: gov-mine-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.13 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.14 ports: - "8098:8098" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index 45bc38c28f..ec553d4044 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.13 + 0.3.14 com.epmet gov-mine diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java index a1a86b35a4..342faa01e1 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java +++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java @@ -16,7 +16,8 @@ import java.util.List; * @Author yinzuomei * @Date 2020/5/13 15:45 */ -@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueFeignClientFallBack.class) +// +@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueFeignClientFallBack.class,url = "http://localhost:") public interface GovIssueFeignClient { /** * @param gridIdList diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 7a356440b8..fbb60a07ad 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.3 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.4 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index a4f4fd5ffb..7710f148ee 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.3 + 0.3.4 gov-project com.epmet diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java index f26a6b84e4..23d13ab18e 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java @@ -147,10 +147,10 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl customerAgency = govOrgFeignClient.getAgencyById(projectEntity.getAgencyId()); +// Result customerAgency = govOrgFeignClient.getAgencyById(projectEntity.getAgencyId()); //获取人员信息 StaffsInAgencyFromDTO staffsInAgencyFromDTO = new StaffsInAgencyFromDTO(); - staffsInAgencyFromDTO.setCustomerId(customerAgency.getData().getCustomerId()); + staffsInAgencyFromDTO.setCustomerId(projectEntity.getCustomerId()); staffsInAgencyFromDTO.setStaffList(userIds); List staffList = epmetUserFeignClient.getStaffList(staffsInAgencyFromDTO).getData(); //合成返回值 diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index b31106a853..0fff916e28 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; @@ -181,19 +183,23 @@ public class ProjectServiceImpl extends BaseServiceImpl finalDays) { - created.setWarningFlag(true); - created.setDetentionDays(detentionDays); - } else { - created.setDetentionDays(detentionDays); - created.setWarningFlag(false); - } + + //获取当前处理部门 List departmentNameList = new ArrayList<>(); if (ProjectConstant.CLOSED.equals(p.getStatus())) { created.setDepartmentNameList(departmentNameList); + created.setWarningFlag(false); + created.setDetentionDays("0"); } else { + String detentionDays = getDetentionDays(p); + if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > finalDays) { + created.setWarningFlag(true); + created.setDetentionDays(detentionDays); + } else { + created.setDetentionDays(detentionDays); + created.setWarningFlag(false); + } departmentNameList = baseDao.selectDepartmentNameList(p); created.setDepartmentNameList(departmentNameList); } @@ -220,19 +226,23 @@ public class ProjectServiceImpl extends BaseServiceImpl finalDays) { - involved.setWarningFlag(true); - involved.setDetentionDays(detentionDays); - } else { - involved.setDetentionDays(detentionDays); - involved.setWarningFlag(false); - } + + //获取当前处理部门 List departmentNameList = new ArrayList<>(); if (ProjectConstant.CLOSED.equals(p.getStatus())) { involved.setDepartmentNameList(departmentNameList); + involved.setWarningFlag(false); + involved.setDetentionDays("0"); } else { + String detentionDays = getDetentionDays(p); + if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > finalDays) { + involved.setWarningFlag(true); + involved.setDetentionDays(detentionDays); + } else { + involved.setDetentionDays(detentionDays); + involved.setWarningFlag(false); + } departmentNameList = baseDao.selectDepartmentNameList(p); involved.setDepartmentNameList(departmentNameList); } @@ -280,6 +290,9 @@ public class ProjectServiceImpl extends BaseServiceImpl