diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index cec85e03e5..3378abc1b4 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -284,5 +284,7 @@ public class IssueController { return new Result>().ok(issueService.getUnResolvedList(formDTO)); } +// @PostMapping("resibuzz") + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml index 0030bb0a27..6c5d46eedd 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml @@ -256,7 +256,7 @@ AND CUSTOMER_ID = #{customerId} AND CATEGORY_TYPE = 1 AND IS_DISABLE = 'enable' - ORDER BY CATEGORY_CODE + ORDER BY SORT diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java index 6cf6eaa2d4..d4413eb75f 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java @@ -17,8 +17,11 @@ public class ProjectDistributionAnalysisFormDTO implements Serializable { public interface ProjectDistributionAnalysisForm{} - @NotBlank(message = "date不能为空",groups = ProjectDistributionAnalysisForm.class) - private String date; + @NotBlank(message = "startDate不能为空",groups = ProjectDistributionAnalysisForm.class) + private String startDate; + + @NotBlank(message = "endDate不能为空",groups = ProjectDistributionAnalysisForm.class) + private String endDate; private String orgId; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index c070c7e8ac..df0dc1ad95 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -220,13 +220,14 @@ public interface ProjectDao extends BaseDao { /** * @Description 根据日期查询项目分类 - * @param date - * @param orgId + * @param startDate + * @param endDate * @param codeLength 1级分类编码长度 - * @param originGrid 是否来源网格 + * @param orgId * @author zxc * @date 2021/12/8 1:37 下午 */ - List selectProjectCategoryByDate(@Param("date")String date,@Param("orgId")String orgId,@Param("codeLength")Integer codeLength,@Param("originGrid")Boolean originGrid); + List selectProjectCategoryByDate(@Param("startDate")String startDate,@Param("endDate")String endDate, + @Param("orgId")String orgId,@Param("codeLength")Integer codeLength); } \ No newline at end of file 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 b83310b93c..3588aeefb1 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 @@ -2804,24 +2804,22 @@ public class ProjectServiceImpl extends BaseServiceImpl projectDistributionAnalysisLeft(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); - if (null == staffInfo){ - throw new EpmetException("未查询到此工作人员的所属组织信息..."); + if (StringUtils.isBlank(formDTO.getOrgId())){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo){ + throw new EpmetException("未查询到此工作人员的所属组织信息..."); + } + formDTO.setOrgId(staffInfo.getAgencyId()); } Result> listResult = govIssueOpenFeignClient.selectCategoryOneLevelListByCustomerId(tokenDto); if (!listResult.success()){ throw new EpmetException("查询1级分类列表失败..."); } - List projectCategoryByDateDTOS = new ArrayList<>(); - if (formDTO.getOrgType().equals(ProjectConstant.ORG_TYPE_GRID)){ - projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getDate(), staffInfo.getAgencyId(), listResult.getData().get(NumConstant.ZERO).getCodeLength(),true); - }else { - projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getDate(), staffInfo.getAgencyId(), listResult.getData().get(NumConstant.ZERO).getCodeLength(),false); - } + List projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getStartDate(),formDTO.getEndDate(), formDTO.getOrgId(), listResult.getData().get(NumConstant.ZERO).getCodeLength()); if (CollectionUtils.isEmpty(projectCategoryByDateDTOS)){ return new ArrayList<>(); } - return disposeTimeInterval(projectCategoryByDateDTOS, formDTO.getDate(), listResult.getData()); + return disposeTimeInterval(projectCategoryByDateDTOS, formDTO.getStartDate(), listResult.getData()); } /** diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 6eec0fe694..179a83ce1b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -402,16 +402,14 @@ \ No newline at end of file