【项目处理分析】按状态查询项目列表

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java

@@ -40,5 +40,7 @@ public class ProjectTotalFormDTO implements Serializable {
     private String startMonth;
     //查询数据结束月份Id
     private String endMonth;
+    //明天的dateId值
+    private String toDateId;
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java

@@ -9,10 +9,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO;
 import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO;
 import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
-import com.epmet.dataaggre.dto.govproject.result.AllProjectResultDTO;
+import com.epmet.dataaggre.dto.govproject.result.*;
-import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO;
-import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO;
-import com.epmet.dataaggre.dto.govproject.result.ProjectTotalResultDTO;
 import com.epmet.dataaggre.service.govproject.GovProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -86,9 +83,9 @@ public class GovProjectController {
 	 * @author sun
 	 */
 	@PostMapping("projectstatuslist")
-	public Result<List<ProjectTotalResultDTO>> projectStatusList(@RequestBody ProjectTotalFormDTO formDTO) {
+	public Result<List<ProjectStatusListResultDTO>> projectStatusList(@RequestBody ProjectTotalFormDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO, ProjectTotalFormDTO.Statuslist.class);
-		return new Result<List<ProjectTotalResultDTO>>().ok(govProjectService.projectStatusList(formDTO));
+		return new Result<List<ProjectStatusListResultDTO>>().ok(govProjectService.projectStatusList(formDTO));
 	}
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java

@@ -21,8 +21,11 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
 import com.epmet.dataaggre.dto.govproject.ProjectDTO;
 import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO;
+import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
 import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO;
 import com.epmet.dataaggre.dto.govproject.result.ProjectInfoDTO;
+import com.epmet.dataaggre.dto.govproject.result.ProjectStatusListResultDTO;
+import com.epmet.dataaggre.dto.govproject.result.ProjectTotalResultDTO;
 import com.epmet.dataaggre.entity.govproject.ProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -70,4 +73,10 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
     List<ProjectDistributionResultDTO> selectList(@Param("customerId") String customerId,@Param("list")List<String> issueIds);
 
     int countRedDot(String userId);
+
+    /**
+     * @Description 查询组织下截止到dateId的某个状态的项目列表
+     * @author sun
+     */
+    List<ProjectStatusListResultDTO> getProjectStatusList(ProjectTotalFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java

@@ -68,5 +68,5 @@ public interface GovProjectService {
 	 * @Description 赋能平台【项目处理分析】按状态查询项目列表
 	 * @author sun
 	 */
-	List<ProjectTotalResultDTO> projectStatusList(ProjectTotalFormDTO formDTO);
+	List<ProjectStatusListResultDTO> projectStatusList(ProjectTotalFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -326,8 +326,12 @@ public class GovProjectServiceImpl implements GovProjectService {
 	 * @author sun
 	 */
 	@Override
-	public List<ProjectTotalResultDTO> projectStatusList(ProjectTotalFormDTO formDTO) {
+	public List<ProjectStatusListResultDTO> projectStatusList(ProjectTotalFormDTO formDTO) {
-		return null;
+		//所选日期后一天的dateId值
+		formDTO.setYeDateId(DateUtils.dateOrmonthId(formDTO.getDateId(), "date", 1));
+		//1.查询组织下截止到dateId的某个状态的项目列表
+		List<ProjectStatusListResultDTO> resultList = projectDao.getProjectStatusList(formDTO);
+		return resultList;
 	}
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -155,4 +155,23 @@
             AND rem.RED_DOT = '1'
             AND rem.USER_ID = #{userId}
     </select>
+
+    <select id="getProjectStatusList" resultType="com.epmet.dataaggre.dto.govproject.result.ProjectStatusListResultDTO">
+        SELECT
+            agency_id "agencyId",
+            id "projectId",
+            origin "origin",
+            `status` "status",
+            locate_longitude "longitude",
+            locate_dimension dimension
+        FROM
+            project
+        WHERE
+            del_flag = '0'
+        AND agency_id = #{agencyId}
+        AND `status` = #{status}
+        AND created_time <![CDATA[<]]> DATE_FORMAT(#{dateId}, '%Y-%m-%d')
+        ORDER BY created_time DESC
+    </select>
+
 </mapper>