emm

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<List<UnResolvedResultDTO>>().ok(issueService.getUnResolvedList(formDTO));
     }
 
+//    @PostMapping("resibuzz")
+
 }
 

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
     </select>
 
     <update id="updateIssueProjectCategoryDict">

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)
+    @NotBlank(message = "startDate不能为空",groups = ProjectDistributionAnalysisForm.class)
-    private String date;
+    private String startDate;
+
+    @NotBlank(message = "endDate不能为空",groups = ProjectDistributionAnalysisForm.class)
+    private String endDate;
 
     private String orgId;
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java

@@ -220,13 +220,14 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 
     /**
      * @Description  根据日期查询项目分类
-     * @param date
+     * @param startDate
-     * @param orgId
+     * @param endDate
      * @param codeLength 1级分类编码长度
-     * @param originGrid 是否来源网格
+     * @param orgId
      * @author zxc
      * @date 2021/12/8 1:37 下午
      */
-    List<ProjectCategoryByDateDTO> selectProjectCategoryByDate(@Param("date")String date,@Param("orgId")String orgId,@Param("codeLength")Integer codeLength,@Param("originGrid")Boolean originGrid);
+    List<ProjectCategoryByDateDTO> selectProjectCategoryByDate(@Param("startDate")String startDate,@Param("endDate")String endDate,
+															   @Param("orgId")String orgId,@Param("codeLength")Integer codeLength);
 
 }

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<ProjectDao, ProjectEntit
 	 */
 	@Override
 	public List<ProjectDistributionAnalysisLeftResultDTO> projectDistributionAnalysisLeft(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto) {
-		CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+		if (StringUtils.isBlank(formDTO.getOrgId())){
-		if (null == staffInfo){
+			CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
-			throw new EpmetException("未查询到此工作人员的所属组织信息...");
+			if (null == staffInfo){
+				throw new EpmetException("未查询到此工作人员的所属组织信息...");
+			}
+			formDTO.setOrgId(staffInfo.getAgencyId());
 		}
 		Result<List<CategoryListResultDTO>> listResult = govIssueOpenFeignClient.selectCategoryOneLevelListByCustomerId(tokenDto);
 		if (!listResult.success()){
 			throw new EpmetException("查询1级分类列表失败...");
 		}
-		List<ProjectCategoryByDateDTO> projectCategoryByDateDTOS = new ArrayList<>();
+		List<ProjectCategoryByDateDTO> projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getStartDate(),formDTO.getEndDate(), formDTO.getOrgId(), listResult.getData().get(NumConstant.ZERO).getCodeLength());
-		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);
-		}
 		if (CollectionUtils.isEmpty(projectCategoryByDateDTOS)){
 			return new ArrayList<>();
 		}
-		return disposeTimeInterval(projectCategoryByDateDTOS, formDTO.getDate(), listResult.getData());
+		return disposeTimeInterval(projectCategoryByDateDTOS, formDTO.getStartDate(), listResult.getData());
 	}
 
 	/**

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -402,16 +402,14 @@
     <select id="selectProjectCategoryByDate" resultType="com.epmet.dto.result.ProjectCategoryByDateDTO">
         SELECT
             DISTINCT p.ID AS projectId,
-            p.CREATED_TIME AS createdTime,
+            CONCAT(#{startDate},' ', DATE_FORMAT(p.CREATED_TIME,'%h:%i:%s')) AS createdTime,
             LEFT(pc.CATEGORY_CODE,#{codeLength}) AS categoryCode
         FROM project p
         INNER JOIN project_category pc ON (pc.PROJECT_ID = p.ID AND pc.DEL_FLAG = 0)
         WHERE p.DEL_FLAG = 0
           AND p.ORG_ID_PATH LIKE CONCAT('%',#{orgId})
-          AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') = #{date}
+          AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') >= #{startDate}
-          <if test="originGrid == true">
+          AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
-              p.ORIGIN = 'issue'
-          </if>
         ORDER BY projectId
     </select>
 </mapper>