Browse Source

1. 增加闲置低效查询内容接口

sugb 6 days ago
parent
commit
76cc6f33d7

+ 6 - 0
jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/gzvhb/entity/QcSsgqzysytdqkGzv.java

@@ -801,6 +801,12 @@ public class QcSsgqzysytdqkGzv implements Serializable {
     @Excel(name = "数据源", width = 15)
     @Excel(name = "数据源", width = 15)
     @ApiModelProperty(value = "数据原")
     @ApiModelProperty(value = "数据原")
     private String source;
     private String source;
+    /**
+     * 闲置低效
+     */
+    @Excel(name = "闲置低效", width = 15)
+    @ApiModelProperty(value = "数据状态")
+    private String xzdx;
 
 
     @Excel(name = "地块价值", width = 15)
     @Excel(name = "地块价值", width = 15)
     @ApiModelProperty(value = "地块价值")
     @ApiModelProperty(value = "地块价值")

+ 14 - 2
jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/controller/QcQyxxController.java

@@ -62,7 +62,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
     /**
     /**
      * 查询添加的年份列表,倒叙
      * 查询添加的年份列表,倒叙
      *
      *
-     * @param sugb
+     * @param
      * @return 年份数组
      * @return 年份数组
      */
      */
     @AutoLog(value = "查询入库的年份组合")
     @AutoLog(value = "查询入库的年份组合")
@@ -72,7 +72,19 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         List years = qcQyxxService.queryYears();
         List years = qcQyxxService.queryYears();
         return Result.OK(years);
         return Result.OK(years);
     }
     }
-
+    /**
+     * 查询添加的年份列表,倒叙
+     *
+     * @param
+     * @return 年份数组
+     */
+    @AutoLog(value = "查询闲置低效类型")
+    @ApiOperation(value = "查询闲置低效类型", notes = "查询闲置低效类型")
+    @GetMapping(value = "/queryXzdx")
+    public Result<List<String>> queryXzdx() {
+        List years = qcQyxxService.queryXzdx();
+        return Result.OK(years);
+    }
     /**
     /**
      * 分页列表查询
      * 分页列表查询
      *
      *

+ 3 - 0
jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/mapper/QcQyxxMapper.java

@@ -120,4 +120,7 @@ public interface QcQyxxMapper extends BaseMapper<QcQyxx> {
      */
      */
     @MapKey("key") // 指定键字段
     @MapKey("key") // 指定键字段
     Map<String, Map<String, Object>> getFirstOrgNames();
     Map<String, Map<String, Object>> getFirstOrgNames();
+
+
+    List queryXzdx();
 }
 }

+ 8 - 5
jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/mapper/xml/QcQyxxMapper.xml

@@ -65,7 +65,7 @@
     <select id="wshAdmin" resultType="String">
     <select id="wshAdmin" resultType="String">
         select count(1) shzt
         select count(1) shzt
         from qc_ssgqzysytdqk_gzv
         from qc_ssgqzysytdqk_gzv
-        where  sys_org_code like 'A04%'
+        where sys_org_code like 'A04%'
     </select>
     </select>
     <select id="btgshAdmin" resultType="String">
     <select id="btgshAdmin" resultType="String">
         select count(1) shzt
         select count(1) shzt
@@ -294,7 +294,7 @@
                             where TDSYXZ = '闲置低效土地'
                             where TDSYXZ = '闲置低效土地'
                               and SYS_ORG_CODE like 'A04%'
                               and SYS_ORG_CODE like 'A04%'
                             GROUP BY b.SJXZQHDM) d on c.xzqh = d.xzqh2
                             GROUP BY b.SJXZQHDM) d on c.xzqh = d.xzqh2
-                            order by c.xzqh
+        order by c.xzqh
     </select>
     </select>
     <select id="ssdkmjbyqx" resultType="java.util.HashMap">
     <select id="ssdkmjbyqx" resultType="java.util.HashMap">
         select VA as "value", NA as "name", VA2 as "value2", numb as "numb", numb2 as "numb2"
         select VA as "value", NA as "name", VA2 as "value2", numb as "numb", numb2 as "numb2"
@@ -321,7 +321,7 @@
                               and SYS_ORG_CODE like 'A04%'
                               and SYS_ORG_CODE like 'A04%'
                               and xzqh like CONCAT(#{xzqh}, '%')
                               and xzqh like CONCAT(#{xzqh}, '%')
                             GROUP BY b.XJXZQHDM) d on c.xzqh = d.xzqh2
                             GROUP BY b.XJXZQHDM) d on c.xzqh = d.xzqh2
-                            order by c.xzqh
+        order by c.xzqh
     </select>
     </select>
     <select id="szdkmj" resultType="java.util.HashMap">
     <select id="szdkmj" resultType="java.util.HashMap">
         select VA as "value", NA as "name", VA2 as "value2", numb as "numb", numb2 as "numb2"
         select VA as "value", NA as "name", VA2 as "value2", numb as "numb", numb2 as "numb2"
@@ -340,7 +340,7 @@
                             where TDSYXZ = '闲置低效土地'
                             where TDSYXZ = '闲置低效土地'
                               and SYS_ORG_CODE like 'A03%'
                               and SYS_ORG_CODE like 'A03%'
                             GROUP BY b.SJXZQHDM) d on c.xzqh = d.xzqh2
                             GROUP BY b.SJXZQHDM) d on c.xzqh = d.xzqh2
-                            order by c.xzqh
+        order by c.xzqh
     </select>
     </select>
     <select id="szdkmjByqx" resultType="java.util.HashMap">
     <select id="szdkmjByqx" resultType="java.util.HashMap">
         select VA as "value", NA as "name", VA2 as "value2", numb as "numb", numb2 as "numb2"
         select VA as "value", NA as "name", VA2 as "value2", numb as "numb", numb2 as "numb2"
@@ -365,7 +365,7 @@
                               and SYS_ORG_CODE like 'A03%'
                               and SYS_ORG_CODE like 'A03%'
                               and xzqh like CONCAT(#{xzqh}, '%')
                               and xzqh like CONCAT(#{xzqh}, '%')
                             GROUP BY b.XJXZQHDM) d on c.xzqh = d.xzqh2
                             GROUP BY b.XJXZQHDM) d on c.xzqh = d.xzqh2
-                            order by c.xzqh
+        order by c.xzqh
     </select>
     </select>
     <!--一级单位用地亩-->
     <!--一级单位用地亩-->
     <select id="yjdwhz" resultType="java.util.HashMap">
     <select id="yjdwhz" resultType="java.util.HashMap">
@@ -412,4 +412,7 @@
         where org_type='2' and sys_org_code like 'A04%'
         where org_type='2' and sys_org_code like 'A04%'
         GROUP BY key, value
         GROUP BY key, value
     </select>
     </select>
+    <select id="queryXzdx" resultType="java.lang.String">
+        select distinct xzdx from qc_ssgqzysytdqk_gzv where xzdx is not null order by xzdx desc
+    </select>
 </mapper>
 </mapper>

+ 6 - 0
jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/service/IQcQyxxService.java

@@ -119,4 +119,10 @@ public interface IQcQyxxService extends IService<QcQyxx> {
      * @return
      * @return
      */
      */
     XzdxVO getXzdxSz();
     XzdxVO getXzdxSz();
+
+    /**
+     * 获取闲置低效类型
+     * @return
+     */
+    List queryXzdx();
 }
 }

+ 5 - 0
jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/service/impl/QcQyxxServiceImpl.java

@@ -200,6 +200,11 @@ public class QcQyxxServiceImpl extends ServiceImpl<QcQyxxMapper, QcQyxx> impleme
     }
     }
 
 
     @Override
     @Override
+    public List queryXzdx() {
+        return qcQyxxMapper.queryXzdx();
+    }
+
+    @Override
     public String sydwtgshAdmin() {
     public String sydwtgshAdmin() {
         return qcQyxxMapper.sydwtgshAdmin();
         return qcQyxxMapper.sydwtgshAdmin();
     }
     }