Merge branch 'master' into pingyin_master

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/HistoryScoreResultDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class HistoryScoreResultDTO implements Serializable {
+    private static final long serialVersionUID = -4316054054019675419L;
+
+    /**
+     * id
+     */
+    private String id;
+    /**
+     * 标题
+     */
+    private String title;
+    /**
+     * 起始时间
+     */
+    private String startTime;
+    /**
+     * 截止时间
+     */
+    private String endTime;
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/index/IndexExplainController.java

@@ -23,6 +23,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.index.IndexExplainService;
 import com.epmet.dto.form.HistoryScoreListFormDTO;
 import com.epmet.dto.result.HistoryScoreDetailResultDTO;
+import com.epmet.dto.result.HistoryScoreResultDTO;
 import com.epmet.evaluationindex.index.form.IndexExplainFormDTO;
 import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
 import com.epmet.evaluationindex.index.result.IndexExplainResult;
@@ -86,4 +87,13 @@ public class IndexExplainController {
         return new Result<List<HistoryScoreDetailResultDTO.Detail>>().ok(indexExplainService.dplist(formDTO));
     }
 
+    /**
+     * 获取最近一条记录数据信息
+     * @return
+     */
+    @RequestMapping("firsthistoryscore")
+    public Result<HistoryScoreResultDTO> firstHistoryScore() {
+        return new Result<HistoryScoreResultDTO>().ok(indexExplainService.firstHistoryScore());
+    }
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexExplainDao.java

@@ -19,6 +19,7 @@ package com.epmet.datareport.dao.evaluationindex.index;
 
 import com.epmet.dto.form.HistoryScoreListFormDTO;
 import com.epmet.dto.result.HistoryScoreDetailResultDTO;
+import com.epmet.dto.result.HistoryScoreResultDTO;
 import com.epmet.evaluationindex.index.dto.IndexExplainTreeDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -37,4 +38,6 @@ public interface IndexExplainDao {
     List<IndexExplainTreeDTO> getIndexExplainTreeByOrgType(@Param("orgLevel") String orgLevel);
 
     List<HistoryScoreDetailResultDTO.Detail> selectDpList(HistoryScoreListFormDTO formDTO);
+
+    HistoryScoreResultDTO firstHistoryScore();
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/IndexExplainService.java

@@ -19,6 +19,7 @@ package com.epmet.datareport.service.evaluationindex.index;
 
 import com.epmet.dto.form.HistoryScoreListFormDTO;
 import com.epmet.dto.result.HistoryScoreDetailResultDTO;
+import com.epmet.dto.result.HistoryScoreResultDTO;
 import com.epmet.evaluationindex.index.form.IndexExplainFormDTO;
 import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
 import com.epmet.evaluationindex.index.result.IndexExplainResult;
@@ -55,4 +56,6 @@ public interface IndexExplainService {
     IndexDictResultDTO getIndexMeaning(IndexScoreFormDTO formDTO);
 
     List<HistoryScoreDetailResultDTO.Detail> dplist(HistoryScoreListFormDTO formDTO);
+
+    HistoryScoreResultDTO firstHistoryScore();
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java

@@ -31,6 +31,7 @@ import com.epmet.datareport.dao.fact.*;
 import com.epmet.datareport.service.evaluationindex.index.IndexExplainService;
 import com.epmet.dto.form.HistoryScoreListFormDTO;
 import com.epmet.dto.result.HistoryScoreDetailResultDTO;
+import com.epmet.dto.result.HistoryScoreResultDTO;
 import com.epmet.evaluationindex.index.dto.IndexExplainTreeDTO;
 import com.epmet.evaluationindex.index.form.IndexExplainFormDTO;
 import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
@@ -466,4 +467,9 @@ public class IndexExplainServiceImpl implements IndexExplainService {
 
     }
 
+    @Override
+    public HistoryScoreResultDTO firstHistoryScore() {
+        return indexExplainDao.firstHistoryScore();
+    }
+
 }

epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexExplainDao.xml

@@ -66,4 +66,19 @@
             avg(b.nldf) DESC, b.agency_name ASC
     </select>
 
+    <select id="firstHistoryScore" resultType="com.epmet.dto.result.HistoryScoreResultDTO">
+        SELECT
+            id id,
+            title title,
+            DATE_FORMAT(start_time, '%Y-%m-%d') startTime,
+            DATE_FORMAT(end_time, '%Y-%m-%d') endTime
+        FROM
+            screen_py_history_score
+        WHERE
+            del_flag = '0'
+        ORDER BY
+            end_time DESC
+        LIMIT 1
+    </select>
+
 </mapper>