镇江本部历年项目建设进度

src/main/java/com/jeeplus/modules/sg/progress/mapper/YearProgressMapper.java

@@ -18,5 +18,5 @@ import java.util.List;
 public interface YearProgressMapper extends BaseMapper<YearProgress> {
     void replaceAll(List<YearProgress> yearProgressList);
 
-    List<YearProgress> findAllYear();
+    List<String> findAllYear();
 }

src/main/java/com/jeeplus/modules/sg/progress/mapper/xml/YearProgressMapper.xml

@@ -68,11 +68,8 @@
 
     </select>
 
-    <select id="findAllYear" resultType="YearProgress">
-        SELECT
-        <include refid="progressColumns"/>
-        FROM xm_year_progress a
-        group by projectYear
+    <select id="findAllYear" resultType="string">
+        select distinct  projectYear from xm_year_progress;
     </select>
 
     <select id="findAllList" resultType="YearProgress">

src/main/java/com/jeeplus/modules/sg/progress/service/YearProgressService.java

@@ -36,7 +36,7 @@ public class YearProgressService extends CrudService<YearProgressMapper, YearPro
         yearProgressMapper.replaceAll(yearProgressList);
     }
 
-    public List<YearProgress> findAllYear() {
+    public List<String> findAllYear() {
         return yearProgressMapper.findAllYear();
     }
 	

src/main/java/com/jeeplus/modules/sg/progress/web/YearProgressController.java

@@ -231,13 +231,13 @@ public class YearProgressController extends BaseController {
     @RequestMapping(value = "treeData")
     public List<Map<String, Object>> treeData(@RequestParam(required = false) String extId, HttpServletResponse response) {
         List<Map<String, Object>> mapList = Lists.newArrayList();
-        List<YearProgress> list = yearProgressService.findAllYear();
+        List<String> list = yearProgressService.findAllYear();
         for (int i = 0; i < list.size(); i++) {
-            YearProgress e = list.get(i);
-            if (StringUtils.isBlank(extId) || (extId != null && !extId.equals(e.getId()))) {
+            String e = list.get(i);
+            if (StringUtils.isBlank(extId) || (extId != null && !extId.equals(e))) {
                 Map<String, Object> map = Maps.newHashMap();
-                map.put("id", e.getProjectYear());
-                map.put("text", e.getProjectYear());
+                map.put("id", e);
+                map.put("text", e);
                 mapList.add(map);
             }
         }