屏蔽qc_ssgqzysytdqk相关的实体类和接口启用全新的gzv类原接口不变

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/gzvhb/controller/QcSsgqzysytdqkGzvController.java

@@ -40,7 +40,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
@@ -51,7 +50,6 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import static org.jeecg.modules.zrzyqc.qcsb.constants.Enum.ENTERPRISE_CODE_SQ;
 import static org.jeecg.modules.zrzyqc.qcsb.constants.Enum.ENTERPRISE_CODE_SZ;
 
@@ -63,7 +61,6 @@ import static org.jeecg.modules.zrzyqc.qcsb.constants.Enum.ENTERPRISE_CODE_SZ;
  */
 @Api(tags="qc_ssgqzysytdqk_gzv")
 @RestController
-//@RequestMapping("/qcsb/qcSsgqzysytdqk")
 @RequestMapping("/qcsb/qcSsgqzysytdqk")
 @Slf4j
 public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkGzv, IQcSsgqzysytdqkGzvService> {
@@ -443,14 +440,6 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 		return Result.OK(qcSsgqzysytdqk);
 	}
 
-	//@AutoLog(value = "省属国企占有使用土地情况调查-通过id查询")
-	@RateLimiter(permitRate = 0.5, timeout = 5, timeUnit = TimeUnit.SECONDS)
-	@GetMapping(value = "/test")
-	public Result<QcSsgqzysytdqkGzv> test() {
-
-		return Result.OK("请求成功");
-	}
-
 	/**
 	 * 导出excel 省属企业
 	 *
@@ -500,7 +489,7 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 	}
 
 	/**
-	 * 事业单位导出excel
+	 * 省直单位导出excel
 	 *
 	 * @param request
 	 * @param qcSsgqzysytdqk
@@ -636,7 +625,6 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 					qcSsgqzysytdqk.setSysOrgCode(sysUser.getOrgCode());
 					qcSsgqzysytdqk.setSfsb(0);
 					qcSsgqzysytdqk.setSjsyjzmjdw("平方米");
-					qcSsgqzysytdqk.setSjzytdmjdw("平方米");
 				}
 				long start = System.currentTimeMillis();
 				qcSsgqzysytdqkService1.saveBatch(list);

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/entity/QcSsgqzysytdqk1.java

@@ -24,7 +24,7 @@ import java.util.Date;
  */
 @Data
 @Accessors(chain = true)
-@TableName("qc_ssgqzysytdqk")
+@TableName("qc_ssgqzysytdqk_gzv")
 @EqualsAndHashCode(callSuper = false)
 public class QcSsgqzysytdqk1 implements Serializable {
     /**主键*/
@@ -164,9 +164,7 @@ public class QcSsgqzysytdqk1 implements Serializable {
     @ApiModelProperty(value = "权益受损情况")
     @Dict(dicCode = "qyssqk")
     private String qyssqk;
-    /**实际占用土地面积单位*/
-    @ApiModelProperty(value = "实际占用土地面积单位")
-    private String sjzytdmjdw;
+
     /**实际使用建筑面积单位*/
     @ApiModelProperty(value = "实际使用建筑面积单位")
     private String sjsyjzmjdw;
@@ -190,5 +188,4 @@ public class QcSsgqzysytdqk1 implements Serializable {
     @Excel(name = "审核意见", width = 15)
     @ApiModelProperty(value = "审核意见")
     private String shyj;
-
 }

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/service/impl/QcSsgqzysytdqk1ServiceImpl.java

@@ -15,6 +15,4 @@ import org.springframework.stereotype.Service;
 @Service
 public class QcSsgqzysytdqk1ServiceImpl extends ServiceImpl<QcSsgqzysytdqk1Mapper, QcSsgqzysytdqk1> implements IQcSsgqzysytdqk1Service {
 
-
-
 }

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

@@ -68,24 +68,23 @@ public interface QcQyxxMapper extends BaseMapper<QcQyxx> {
 
     String sydwshzslAdmin();
 
-    List<HashMap<String, Object>> sjyttjsz(String xzqh);
+    List<HashMap<String, Object>> sjyttjsz(@Param("xzqh") String xzqh);
 
-    List<HashMap<String, Object>> sjyttjss(String xzqh);
+    List<HashMap<String, Object>> sjyttjss(@Param("xzqh") String xzqh);
 
+    List<HashMap<String, Object>> dtdktj(@Param("orgCode") String orgCode);
 
-    List<HashMap<String, Object>> dtdktj(String orgCode);
-
-    List<HashMap<String, Object>> dtdktjByxq(String orgCode, String xzqh);
+    List<HashMap<String, Object>> dtdktjByxq(@Param("orgCode") String orgCode, @Param("xzqh") String xzqh);
 
     List<HashMap<String, Object>> ssdkmj();
 
-    List<HashMap<String, Object>> ssdkmjbyqx(String xzqh);
+    List<HashMap<String, Object>> ssdkmjbyqx(@Param("xzqh") String xzqh);
 
     List<HashMap<String, Object>> szdkmj();
 
-    List<HashMap<String, Object>> szdkmjByqx(String xzqh);
+    List<HashMap<String, Object>> szdkmjByqx(@Param("xzqh") String xzqh);
 
-    List<HashMap<String, Object>> yjdwhz(String xzqh);
+    List<HashMap<String, Object>> yjdwhz(@Param("xzqh") String xzqh);
 
     String sbdksMjAdmin();
 

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

@@ -234,8 +234,8 @@
     </select>
 
 
-    <select id="sjyttjsz" resultType="map">
-        select count(a.pzyt) as "value", b.name as "name"
+    <select id="sjyttjsz" resultType="java.util.HashMap">
+        select count(a.pzyt) as "value", b.name as "name",b.id as "code"
         from qc_ssgqzysytdqk_gzv a
         LEFT JOIN SYS_CATEGORY b
         on a.pzyt = b.id
@@ -243,9 +243,9 @@
         <if test="xzqh !=null">
             and xzqh like CONCAT( #{xzqh},'%')
         </if>
-        GROUP BY b.name
+        GROUP BY b.name,b.id
     </select>
-    <select id="dtdktjByxq" resultType="map" parameterType="String">
+    <select id="dtdktjByxq" resultType="java.util.HashMap" parameterType="String">
         select count(b.XJXZQHDM) as "value", b.XJXZQHMC as "name",b.XJXZQHDM as "xzqhdm",b.sjxzqhdm as "sjxzqhdm",
         <if test="orgCode=='A04'">
             ROUND(sum(CAST(sjzytdmj AS DECIMAL(16,2))*0.0015),2) as "value2"
@@ -260,7 +260,7 @@
         GROUP BY b.XJXZQHDM, b.XJXZQHMC, b.sjxzqhdm ORDER BY b.XJXZQHDM DESC
     </select>
 
-    <select id="dtdktj" resultType="map" parameterType="String">
+    <select id="dtdktj" resultType="java.util.HashMap" parameterType="String">
 
         select count(b.sjxzqhdm) as "value", b.SJXZQHMC as "name",b.SJXZQHDM as "xzqhdm",
         <if test="orgCode=='A04'">
@@ -287,7 +287,7 @@
         <!--        where SYS_ORG_CODE like concat(#{orgCode}, '%') and sfsb=3-->
         <!--        GROUP BY SUBSTR(a.xzqh, 0, 4), b.SJXZQHMC ORDER BY count(SUBSTR(a.xzqh, 0, 4)) DESC-->
     </select>
-    <select id="sjyttjss" resultType="map">
+    <select id="sjyttjss" resultType="java.util.HashMap">
         select count(a.sjyt) as "value", b.name as "name", b.id as "code"
         from qc_ssgqzysytdqk_gzv a
         LEFT JOIN SYS_CATEGORY b
@@ -299,7 +299,7 @@
         </if>
         GROUP BY b.name, b.id
     </select>
-    <select id="ssdkmj" resultType="map">
+    <select id="ssdkmj" resultType="java.util.HashMap">
         select VA as "value", NA as "name", VA2 as "value2"
         from (
                  select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16, 2))*0.0015), 2) VA, b.SJXZQHMC na, b.SJXZQHDM xzqh
@@ -320,7 +320,7 @@
                               and sfsb = 3
                             GROUP BY b.SJXZQHDM) d on c.xzqh = d.xzqh2
     </select>
-    <select id="ssdkmjbyqx" resultType="map">
+    <select id="ssdkmjbyqx" resultType="java.util.HashMap">
         select VA as "value", NA as "name", VA2 as "value2"
         from (
                  select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16, 2))*0.0015),2) VA, b.XJXZQHMC na, b.XJXZQHDM xzqh, b.SJXZQHDM
@@ -343,7 +343,7 @@
 
                             GROUP BY b.XJXZQHDM) d on c.xzqh = d.xzqh2
     </select>
-    <select id="szdkmj" resultType="map">
+    <select id="szdkmj" resultType="java.util.HashMap">
         select VA as "value", NA as "name", VA2 as "value2"
         from (
                  select ROUND(sum(SJZYTDMJ * 0.0015), 2) VA, b.SJXZQHMC na, b.SJXZQHDM xzqh
@@ -363,7 +363,7 @@
                               and sfsb = 3
                             GROUP BY b.SJXZQHDM) d on c.xzqh = d.xzqh2
     </select>
-    <select id="szdkmjByqx" resultType="map">
+    <select id="szdkmjByqx" resultType="java.util.HashMap">
         select VA as "value", NA as "name", VA2 as "value2"
         from (
                  select ROUND(sum(SJZYTDMJ * 0.0015), 2) VA, b.XJXZQHMC na, b.XJXZQHDM xzqh, b.SJXZQHDM
@@ -386,7 +386,7 @@
                             GROUP BY b.XJXZQHDM) d on c.xzqh = d.xzqh2
     </select>
 <!--一级单位用地亩-->
-    <select id="yjdwhz" resultType="map">
+    <select id="yjdwhz" resultType="java.util.HashMap">
         select a.depart_name as "name", ROUND(sum(b.area), 2) as "value"
         from (select id, depart_name, org_code from sys_depart where org_type = '2' and org_code like 'A04%') a
         LEFT JOIN (

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

@@ -206,7 +206,6 @@ public class QcQyxxServiceImpl extends ServiceImpl<QcQyxxMapper, QcQyxx> impleme
 
     @Override
     public List<HashMap<String, Object>> sjyttjsz(String xzqh) {
-
         return qcQyxxMapper.sjyttjsz(xzqh);
     }