1. 修改省属页面二次穿透

2. 修改其它字段的重新排序

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

@@ -114,10 +114,11 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 			queryWrapper.likeRight("sys_org_code", "A04");
 		}
 		queryWrapper.likeRight("sys_org_code", "A04");
-		//sbzts.add(0);
-		//sbzts.add(1);
-		//queryWrapper.in("sfsb",sbzts);
 		IPage<QcSsgqzysytdqkGzv> pageList = qcSsgqzysytdqkGzvService.page(page, queryWrapper);
+		// 生成一级单位名称
+		List<QcSsgqzysytdqkGzv> records = pageList.getRecords();
+		List<QcSsgqzysytdqkGzv> firstOrgNames = qcSsgqzysytdqkGzvService.getFirstOrgNames(records);
+		pageList.setRecords(firstOrgNames);
 		return Result.OK(pageList);
 	}
 	/**
@@ -229,13 +230,14 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 															HttpServletRequest req) {
 		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
 		queryWrapper.likeRight("sys_org_code", "A04");
-		//未上报
-//		queryWrapper.gt("sfsb", 0);
 		if (year!=null){
 			queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
 		}
 		Page<QcSsgqzysytdqkGzv> page = new Page<QcSsgqzysytdqkGzv>(pageNo, pageSize);
 		IPage<QcSsgqzysytdqkGzv> pageList = qcSsgqzysytdqkGzvService.page(page, queryWrapper);
+		List<QcSsgqzysytdqkGzv> records = pageList.getRecords();
+		List<QcSsgqzysytdqkGzv> firstOrgNames = qcSsgqzysytdqkGzvService.getFirstOrgNames(records);
+		pageList.setRecords(firstOrgNames);
 		return Result.OK(pageList);
 	}
 
@@ -258,8 +260,8 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 														HttpServletRequest req) {
 		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
 		Page<QcSsgqzysytdqkGzv> page = new Page<QcSsgqzysytdqkGzv>(pageNo, pageSize);
-		List<Integer> sbzts = new ArrayList<>();
-		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		//List<Integer> sbzts = new ArrayList<>();
+		//LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		queryWrapper.likeRight("sys_org_code", "A03");
 		IPage<QcSsgqzysytdqkGzv> pageList = qcSsgqzysytdqkGzvService.page(page, queryWrapper);
 		return Result.OK(pageList);
@@ -806,7 +808,6 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 								   HttpServletRequest req,String year) {
 		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
 		queryWrapper.likeRight("sys_org_code", "A04");
-//		queryWrapper.gt("sfsb", 0);
 		if (year!=null){
 			queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
 		}
@@ -831,7 +832,6 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 								 HttpServletRequest req,String year) {
 		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
 		queryWrapper.likeRight("sys_org_code", "A03");
-		queryWrapper.gt("sfsb", 0);
 		if (year!=null){
 			queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
 		}
@@ -853,7 +853,6 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 	@ApiOperation(value = "更新图片", notes = "更新图片")
 	@GetMapping(value = "/updateImages")
 	public Result<?> updateImages() {
-
 		List<QcSsgqzysytdqkGzv> list = qcSsgqzysytdqkGzvService.list();
 		//初始目录
 		File dir = new File("D:\\images\\temp");
@@ -969,7 +968,6 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 	public Result<ResultCount> queryPageListByglyCount(QcSsgqzysytdqkGzv qcSsgqzysytdqk,String year,HttpServletRequest req) {
 		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
 		queryWrapper.likeRight("sys_org_code", "A04");
-		//queryWrapper.gt("sfsb", 0);
 		if (year!=null){
 			queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
 		}

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

@@ -5,10 +5,12 @@ import java.io.UnsupportedEncodingException;
 import java.math.RoundingMode;
 import java.util.Date;
 import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -22,542 +24,789 @@ import lombok.experimental.Accessors;
 /**
  * @Description: qc_ssgqzysytdqk_gzv
  * @Author: jeecg-boot
- * @Date:   2024-07-27
+ * @Date: 2024-07-27
  * @Version: V1.0
  */
 @Data
 @TableName("qc_ssgqzysytdqk_gzv")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="qc_ssgqzysytdqk_gzv对象", description="qc_ssgqzysytdqk_gzv")
+@ApiModel(value = "qc_ssgqzysytdqk_gzv对象", description = "qc_ssgqzysytdqk_gzv")
 public class QcSsgqzysytdqkGzv implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private String id;
-	/**录入主体编码*/
-	@Excel(name = "录入主体编码", width = 15)
+    /**
+     * 一级企业
+     */
+    @ApiModelProperty(value = "一级企业")
+    @TableField(exist = false)
+    private String firstOrgName;
+    /**
+     * 录入主体编码
+     */
+    @Excel(name = "录入主体编码", width = 15)
     @ApiModelProperty(value = "录入主体编码")
     private String createById;
-	/**录入主体*/
+    /**
+     * 录入主体
+     */
     @ApiModelProperty(value = "录入主体")
     private String createBy;
-	/**宗地名称*/
-	@Excel(name = "宗地名称", width = 15)
+    /**
+     * 宗地名称
+     */
+    @Excel(name = "宗地名称", width = 15)
     @ApiModelProperty(value = "宗地名称")
     private String dk;
-	/**权利类型*/
-	@Excel(name = "权利类型", width = 15)
+    /**
+     * 权利类型
+     */
+    @Excel(name = "权利类型", width = 15)
     @ApiModelProperty(value = "权利类型")
     private String ssqTypeName;
-	/**其他权利类型*/
-	@Excel(name = "其他权利类型", width = 15)
+    /**
+     * 其他权利类型
+     */
+    @Excel(name = "其他权利类型", width = 15)
     @ApiModelProperty(value = "其他权利类型")
     private String ssqOtherName;
-	/**权属期限（土地使用年限）*/
-	@Excel(name = "权属期限（土地使用年限）", width = 15)
+    /**
+     * 权属期限（土地使用年限）
+     */
+    @Excel(name = "权属期限（土地使用年限）", width = 15)
     @Dict(dicCode = "qsqx")
     @ApiModelProperty(value = "权属期限（土地使用年限）")
     private String qsqx;
-	/**使用年限其它*/
-	@Excel(name = "使用年限其它", width = 15)
+    /**
+     * 使用年限其它
+     */
+    @Excel(name = "使用年限其它", width = 15)
     @ApiModelProperty(value = "使用年限其它")
     private String tdSynxOther;
-	/**土地坐落-省*/
-	@Excel(name = "土地坐落-省", width = 15)
+    /**
+     * 土地坐落-省
+     */
+    @Excel(name = "土地坐落-省", width = 15)
     @ApiModelProperty(value = "土地坐落-省")
     private String regProvince;
-	/**土地坐落-市*/
-	@Excel(name = "土地坐落-市", width = 15)
+    /**
+     * 土地坐落-市
+     */
+    @Excel(name = "土地坐落-市", width = 15)
     @ApiModelProperty(value = "土地坐落-市")
     private String regCity;
-	/**土地坐落-区*/
-	@Excel(name = "土地坐落-区", width = 15)
+    /**
+     * 土地坐落-区
+     */
+    @Excel(name = "土地坐落-区", width = 15)
     @ApiModelProperty(value = "土地坐落-区")
     private String regArea;
-	/**行政区划编码*/
-	@Excel(name = "行政区划编码", width = 15)
+    /**
+     * 行政区划编码
+     */
+    @Excel(name = "行政区划编码", width = 15)
     @Dict(dicCode = "xzqh")
     @ApiModelProperty(value = "行政区划编码")
     private String xzqh;
-	/**详细地址*/
-	@Excel(name = "详细地址", width = 15)
+    /**
+     * 详细地址
+     */
+    @Excel(name = "详细地址", width = 15)
     @ApiModelProperty(value = "详细地址")
     private String zlwz;
-	/**土地归属企业代码*/
-	@Excel(name = "土地归属企业代码", width = 15)
+    /**
+     * 土地归属企业代码
+     */
+    @Excel(name = "土地归属企业代码", width = 15)
     @ApiModelProperty(value = "土地归属企业代码")
     private String tdgsqyyId;
-	/**土地归属企业名称*/
-	@Excel(name = "土地归属企业名称", width = 15)
+    /**
+     * 土地归属企业名称
+     */
+    @Excel(name = "土地归属企业名称", width = 15)
     @ApiModelProperty(value = "土地归属企业名称")
     private String tdgsqyy;
-	/**国家出资企业*/
-	@Excel(name = "国家出资企业", width = 15)
+    /**
+     * 国家出资企业
+     */
+    @Excel(name = "国家出资企业", width = 15)
     @ApiModelProperty(value = "国家出资企业")
     private String gjczqyName;
-	/**证书持有情况*/
-	@Excel(name = "证书持有情况", width = 15)
+    /**
+     * 证书持有情况
+     */
+    @Excel(name = "证书持有情况", width = 15)
     @Dict(dicCode = "sfgyz")
     @ApiModelProperty(value = "证书持有情况")
     private String zscyqk;
-	/**其它证书*/
-	@Excel(name = "其它证书", width = 15)
+    /**
+     * 其它证书
+     */
+    @Excel(name = "其它证书", width = 15)
     @ApiModelProperty(value = "其它证书")
     private String otherZscyqk;
-	/**产权证号-证书/合同/文件编号/产权编号*/
-	@Excel(name = "产权证号-证书/合同/文件编号/产权编号", width = 15)
+    /**
+     * 产权证号-证书/合同/文件编号/产权编号
+     */
+    @Excel(name = "产权证号-证书/合同/文件编号/产权编号", width = 15)
     @ApiModelProperty(value = "产权证号-证书/合同/文件编号/产权编号")
     private String wjbh;
-	/**权证登记使用人ID*/
-	@Excel(name = "权证登记使用人ID", width = 15)
+    /**
+     * 权证登记使用人ID
+     */
+    @Excel(name = "权证登记使用人ID", width = 15)
     @ApiModelProperty(value = "权证登记使用人ID")
     private String tdsyqrCode;
-	/**权证登记使用人名称*/
-	@Excel(name = "权证登记使用人名称", width = 15)
+    /**
+     * 权证登记使用人名称
+     */
+    @Excel(name = "权证登记使用人名称", width = 15)
     @ApiModelProperty(value = "权证登记使用人名称")
     private String tdsyqr;
-	/**权属起始时间*/
-	@Excel(name = "权属起始时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    /**
+     * 权属起始时间
+     */
+    @Excel(name = "权属起始时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "权属起始时间")
     private Date qsqssj;
-	/**其中批准使用面积(㎡)*/
-	@Excel(name = "其中批准使用面积(㎡)", width = 15)
+    /**
+     * 其中批准使用面积(㎡)
+     */
+    @Excel(name = "其中批准使用面积(㎡)", width = 15)
     @ApiModelProperty(value = "其中批准使用面积(㎡)")
     private java.lang.Double qzpzsymj;
 
-	/**批准用途其它*/
-	@Excel(name = "批准用途其它", width = 15)
+    /**
+     * 批准用途其它
+     */
+    @Excel(name = "批准用途其它", width = 15)
     @ApiModelProperty(value = "批准用途其它")
     private String otherPzyt;
-	/**政府规划用途代码*/
-	@Excel(name = "政府规划用途代码", width = 15)
+    /**
+     * 政府规划用途代码
+     */
+    @Excel(name = "政府规划用途代码", width = 15)
     @ApiModelProperty(value = "政府规划用途代码")
     private String zfghytCode;
-	/**政府规划用途*/
-	@Excel(name = "政府规划用途", width = 15)
+    /**
+     * 政府规划用途
+     */
+    @Excel(name = "政府规划用途", width = 15)
     @Dict(dicCode = "id", dictTable = "sys_category", dicText = "name")
     @ApiModelProperty(value = "政府规划用途")
     private String zfghyt;
-	/**政府规划其它*/
-	@Excel(name = "政府规划其它", width = 15)
+    /**
+     * 政府规划其它
+     */
+    @Excel(name = "政府规划其它", width = 15)
     @ApiModelProperty(value = "政府规划其它")
     private String otherZfghyt;
-	/**权属登记使用人名称是否与实际使用人一致*/
-	@Excel(name = "权属登记使用人名称是否与实际使用人一致", width = 15)
+    /**
+     * 权属登记使用人名称是否与实际使用人一致
+     */
+    @Excel(name = "权属登记使用人名称是否与实际使用人一致", width = 15)
     @ApiModelProperty(value = "权属登记使用人名称是否与实际使用人一致")
     private String sfyz;
-	/**土地实际使用人*/
-	@Excel(name = "土地实际使用人", width = 15)
+    /**
+     * 土地实际使用人
+     */
+    @Excel(name = "土地实际使用人", width = 15)
     @ApiModelProperty(value = "土地实际使用人")
     private String tdsjsyr;
-	/**使用权类型使用方式*/
-	@Excel(name = "使用权类型使用方式", width = 15)
+    /**
+     * 使用权类型使用方式
+     */
+    @Excel(name = "使用权类型使用方式", width = 15)
     @ApiModelProperty(value = "使用权类型使用方式")
     @Dict(dicCode = "syqsyfs")
     private String syqsyfsCode;
-	/**使用权使用方式 */
-	@Excel(name = "使用权使用方式 ", width = 15)
+    /**
+     * 使用权使用方式
+     */
+    @Excel(name = "使用权使用方式 ", width = 15)
     @ApiModelProperty(value = "使用权使用方式 ")
     private String syqsyfs;
-	/**使用权使用方式其它*/
-	@Excel(name = "使用权使用方式其它", width = 15)
+    /**
+     * 使用权使用方式其它
+     */
+    @Excel(name = "使用权使用方式其它", width = 15)
     @ApiModelProperty(value = "使用权使用方式其它")
     private String otherSyqsyfs;
-	/**实际占用土地面积(㎡)*/
-	@Excel(name = "实际占用土地面积(㎡)", width = 15)
+    /**
+     * 实际占用土地面积(㎡)
+     */
+    @Excel(name = "实际占用土地面积(㎡)", width = 15)
     @ApiModelProperty(value = "实际占用土地面积(㎡)")
     private java.lang.Double sjzytdmj;
-	/**政府规划用途是否与实际用途一致*/
-	@Excel(name = "政府规划用途是否与实际用途一致", width = 15)
+    /**
+     * 政府规划用途是否与实际用途一致
+     */
+    @Excel(name = "政府规划用途是否与实际用途一致", width = 15)
     @ApiModelProperty(value = "政府规划用途是否与实际用途一致")
     private String zfghsfyz;
-    /**批准用途*/
+    /**
+     * 批准用途
+     */
     @Excel(name = "批准用途", width = 15)
     @Dict(dicCode = "id", dictTable = "sys_category", dicText = "name")
     @ApiModelProperty(value = "批准用途")
     private String pzyt;
-	/**实际用途*/
-	@Excel(name = "实际用途", width = 15)
+    /**
+     * 实际用途
+     */
+    @Excel(name = "实际用途", width = 15)
     @Dict(dicCode = "id", dictTable = "sys_category", dicText = "name")
     @ApiModelProperty(value = "实际用途")
     private String sjyt;
-	/**实际用途其它*/
-	@Excel(name = "实际用途其它", width = 15)
+    /**
+     * 实际用途其它
+     */
+    @Excel(name = "实际用途其它", width = 15)
     @ApiModelProperty(value = "实际用途其它")
     private String otherSjyt;
 
-	/**实际用途是否符合划拨用地目录*/
-	@Excel(name = "实际用途是否符合划拨用地目录", width = 15)
+    /**
+     * 实际用途是否符合划拨用地目录
+     */
+    @Excel(name = "实际用途是否符合划拨用地目录", width = 15)
     @Dict(dicCode = "sfgyz")
     @ApiModelProperty(value = "实际用途是否符合划拨用地目录")
     private String sjytsffh;
-	/**产权变更需补交的土地出让金数额(万元)*/
-	@Excel(name = "产权变更需补交的土地出让金数额(万元)", width = 15)
+    /**
+     * 产权变更需补交的土地出让金数额(万元)
+     */
+    @Excel(name = "产权变更需补交的土地出让金数额(万元)", width = 15)
     @ApiModelProperty(value = "产权变更需补交的土地出让金数额(万元)")
     private java.lang.Double cqbgbjtdje;
-	/**是否需要缴纳土地使用税*/
-	@Excel(name = "是否需要缴纳土地使用税", width = 15)
+    /**
+     * 是否需要缴纳土地使用税
+     */
+    @Excel(name = "是否需要缴纳土地使用税", width = 15)
     @Dict(dicCode = "sfgyz")
     @ApiModelProperty(value = "是否需要缴纳土地使用税")
     private String sfxyjntdsys;
-	/**土地使用税缴纳金额*/
-	@Excel(name = "土地使用税缴纳金额", width = 15)
+    /**
+     * 土地使用税缴纳金额
+     */
+    @Excel(name = "土地使用税缴纳金额", width = 15)
     @ApiModelProperty(value = "土地使用税缴纳金额")
     private java.lang.Double tdsysjnje;
-	/**土地账面原值(万元)*/
-	@Excel(name = "土地账面原值(万元)", width = 15)
+    /**
+     * 土地账面原值(万元)
+     */
+    @Excel(name = "土地账面原值(万元)", width = 15)
     @ApiModelProperty(value = "土地账面原值(万元)")
     private java.lang.Double tdzmyz;
-	/**土地账面净值(万元)*/
-	@Excel(name = "土地账面净值(万元)", width = 15)
+    /**
+     * 土地账面净值(万元)
+     */
+    @Excel(name = "土地账面净值(万元)", width = 15)
     @ApiModelProperty(value = "土地账面净值(万元)")
     private java.lang.Double tdzmjz;
-	/**土地市场价值(万元)*/
-	@Excel(name = "土地市场价值(万元)", width = 15)
+    /**
+     * 土地市场价值(万元)
+     */
+    @Excel(name = "土地市场价值(万元)", width = 15)
     @ApiModelProperty(value = "土地市场价值(万元)")
     private java.lang.Double tdscjz;
-	/**土地租赁价值(万元)*/
-	@Excel(name = "土地租赁价值(万元)", width = 15)
+    /**
+     * 土地租赁价值(万元)
+     */
+    @Excel(name = "土地租赁价值(万元)", width = 15)
     @ApiModelProperty(value = "土地租赁价值(万元)")
     private java.lang.Double tdzljz;
-	/**土地使用现状*/
-	@Excel(name = "土地使用现状", width = 15)
+    /**
+     * 土地使用现状
+     */
+    @Excel(name = "土地使用现状", width = 15)
     @Dict(dicCode = "tdsyxz")
     @ApiModelProperty(value = "土地使用现状")
     private String tdsyxz;
-	/**正常使用现状中文*/
-	@Excel(name = "正常使用现状中文", width = 15)
+    /**
+     * 正常使用现状中文
+     */
+    @Excel(name = "正常使用现状中文", width = 15)
     @ApiModelProperty(value = "正常使用现状中文")
     private String zcsyzx;
-	/**待盘活现状代码*/
-	@Excel(name = "待盘活现状代码", width = 15)
+    /**
+     * 待盘活现状代码
+     */
+    @Excel(name = "待盘活现状代码", width = 15)
     @ApiModelProperty(value = "待盘活现状代码")
     private String dphxzCode;
-	/**待盘活现状*/
-	@Excel(name = "待盘活现状", width = 15)
+    /**
+     * 待盘活现状
+     */
+    @Excel(name = "待盘活现状", width = 15)
     @ApiModelProperty(value = "待盘活现状")
     private String dphxz;
-	/**盘活利用途径代码*/
-	@Excel(name = "盘活利用途径代码", width = 15)
+    /**
+     * 盘活利用途径代码
+     */
+    @Excel(name = "盘活利用途径代码", width = 15)
     @ApiModelProperty(value = "盘活利用途径代码")
     private String phlytjCode;
-	/**盘活利用途径名称*/
-	@Excel(name = "盘活利用途径名称", width = 15)
+    /**
+     * 盘活利用途径名称
+     */
+    @Excel(name = "盘活利用途径名称", width = 15)
     @ApiModelProperty(value = "盘活利用途径名称")
     private String phlytj;
-	/**其他盘活利用途径*/
-	@Excel(name = "其他盘活利用途径", width = 15)
+    /**
+     * 其他盘活利用途径
+     */
+    @Excel(name = "其他盘活利用途径", width = 15)
     @ApiModelProperty(value = "其他盘活利用途径")
     private String otherPhlytj;
-	/**地上建筑物产权人是否与权证登记人使用人名称是否一致 */
-	@Excel(name = "地上建筑物产权人是否与权证登记人使用人名称是否一致 ", width = 15)
+    /**
+     * 地上建筑物产权人是否与权证登记人使用人名称是否一致
+     */
+    @Excel(name = "地上建筑物产权人是否与权证登记人使用人名称是否一致 ", width = 15)
     @Dict(dicCode = "sfgyz")
     @ApiModelProperty(value = "地上建筑物产权人是否与权证登记人使用人名称是否一致 ")
     private String dsjzwsfyz;
-	/**地上建筑物产权人*/
-	@Excel(name = "地上建筑物产权人", width = 15)
+    /**
+     * 地上建筑物产权人
+     */
+    @Excel(name = "地上建筑物产权人", width = 15)
     @ApiModelProperty(value = "地上建筑物产权人")
     private String dsjzwcqr;
-	/**地上建筑物用途*/
-	@Excel(name = "地上建筑物用途", width = 15)
+    /**
+     * 地上建筑物用途
+     */
+    @Excel(name = "地上建筑物用途", width = 15)
     @ApiModelProperty(value = "地上建筑物用途")
     private String dsjzwyt;
-    /**其中批准使用面积(㎡)*/
+    /**
+     * 其中批准使用面积(㎡)
+     */
     @Excel(name = "其中批准使用面积(㎡)", width = 15)
     @ApiModelProperty(value = "其中批准使用面积(㎡)")
     private java.lang.Double qzpzsymj2;
-	/**地理区位情况代码字典*/
-	@Excel(name = "地理区位情况代码字典", width = 15)
+    /**
+     * 地理区位情况代码字典
+     */
+    @Excel(name = "地理区位情况代码字典", width = 15)
     @ApiModelProperty(value = "地理区位情况代码字典")
     private String dlwzCode;
-	/**地理区位情况中文*/
-	@Excel(name = "地理区位情况中文", width = 15)
+    /**
+     * 地理区位情况中文
+     */
+    @Excel(name = "地理区位情况中文", width = 15)
     @ApiModelProperty(value = "地理区位情况中文")
     private String dlwzName;
-	/**填报人*/
-	@Excel(name = "填报人", width = 15)
+    /**
+     * 填报人
+     */
+    @Excel(name = "填报人", width = 15)
     @ApiModelProperty(value = "填报人")
     private String tbr;
-	/**联系电话*/
-	@Excel(name = "联系电话", width = 15)
+    /**
+     * 联系电话
+     */
+    @Excel(name = "联系电话", width = 15)
     @ApiModelProperty(value = "联系电话")
     private String lxdh;
-	/**是否存在产权纠纷*/
-	@Excel(name = "是否存在产权纠纷", width = 15)
+    /**
+     * 是否存在产权纠纷
+     */
+    @Excel(name = "是否存在产权纠纷", width = 15)
     @Dict(dicCode = "sfgyz")
     @ApiModelProperty(value = "是否存在产权纠纷")
     private String sfczjf;
-	/**产权信息补充说明*/
-	@Excel(name = "产权信息补充说明", width = 15)
+    /**
+     * 产权信息补充说明
+     */
+    @Excel(name = "产权信息补充说明", width = 15)
     @ApiModelProperty(value = "产权信息补充说明")
     private String cqxxbcsm;
-	/**实际使用建筑面积(㎡)*/
-	@Excel(name = "实际使用建筑面积(㎡)", width = 15)
+    /**
+     * 实际使用建筑面积(㎡)
+     */
+    @Excel(name = "实际使用建筑面积(㎡)", width = 15)
     @ApiModelProperty(value = "实际使用建筑面积(㎡)")
     private java.lang.Double sjsyjzmj;
-	/**实际容积率*/
-	@Excel(name = "实际容积率", width = 15)
+    /**
+     * 实际容积率
+     */
+    @Excel(name = "实际容积率", width = 15)
     @ApiModelProperty(value = "实际容积率")
     private java.lang.Double sjrjl;
-	/**权属到期时间*/
-	@Excel(name = "权属到期时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    /**
+     * 权属到期时间
+     */
+    @Excel(name = "权属到期时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "权属到期时间")
     private Date qsdqsj;
-	/**担保、抵押、查封情况*/
-	@Excel(name = "担保、抵押、查封情况", width = 15)
+    /**
+     * 担保、抵押、查封情况
+     */
+    @Excel(name = "担保、抵押、查封情况", width = 15)
     @Dict(dicCode = "dbdycfqk")
     @ApiModelProperty(value = "担保、抵押、查封情况")
     private String dbdycfqk;
-	/**相关文件*/
-	@Excel(name = "相关文件", width = 15)
+    /**
+     * 相关文件
+     */
+    @Excel(name = "相关文件", width = 15)
     @ApiModelProperty(value = "相关文件")
     private String xgwj;
-	/**文件类型*/
-	@Excel(name = "文件类型", width = 15)
+    /**
+     * 文件类型
+     */
+    @Excel(name = "文件类型", width = 15)
     @Dict(dicCode = "wjlx")
     @ApiModelProperty(value = "文件类型")
     private String wjlx;
-	/**是否上报*/
+    /**
+     * 是否上报
+     */
     @Excel(name = "是否上报", width = 15, dicCode = "xxsbzt")
     @Dict(dicCode = "xxsbzt")
     @ApiModelProperty(value = "是否上报")
     private java.lang.Integer sfsb;
-	/**审核意见*/
-	@Excel(name = "审核意见", width = 15)
+    /**
+     * 审核意见
+     */
+    @Excel(name = "审核意见", width = 15)
     @ApiModelProperty(value = "审核意见")
     private String shyj;
-	/**审核日期*/
-	@Excel(name = "审核日期", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    /**
+     * 审核日期
+     */
+    @Excel(name = "审核日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "审核日期")
     private Date shrq;
-	/**审核是否通过*/
-	@Excel(name = "审核是否通过", width = 15)
+    /**
+     * 审核是否通过
+     */
+    @Excel(name = "审核是否通过", width = 15)
     @ApiModelProperty(value = "审核是否通过")
     private String shzt;
-	/**审核人*/
-	@Excel(name = "审核人", width = 15)
+    /**
+     * 审核人
+     */
+    @Excel(name = "审核人", width = 15)
     @ApiModelProperty(value = "审核人")
     private String shren;
-	/**坐标位置相关证明材料*/
-	@Excel(name = "坐标位置相关证明材料", width = 15)
+    /**
+     * 坐标位置相关证明材料
+     */
+    @Excel(name = "坐标位置相关证明材料", width = 15)
     @ApiModelProperty(value = "坐标位置相关证明材料")
     private String zbwzxgzmcl;
-	/**土地资产权属证明材料*/
-	@Excel(name = "土地资产权属证明材料", width = 15)
+    /**
+     * 土地资产权属证明材料
+     */
+    @Excel(name = "土地资产权属证明材料", width = 15)
     @ApiModelProperty(value = "土地资产权属证明材料")
     private String tdzcqszmcl;
-	/**统一社会信用代码证书*/
-	@Excel(name = "统一社会信用代码证书", width = 15)
+    /**
+     * 统一社会信用代码证书
+     */
+    @Excel(name = "统一社会信用代码证书", width = 15)
     @ApiModelProperty(value = "统一社会信用代码证书")
     private String tyshxydmzs;
-	/**房屋资产权属证明材料*/
-	@Excel(name = "房屋资产权属证明材料", width = 15)
+    /**
+     * 房屋资产权属证明材料
+     */
+    @Excel(name = "房屋资产权属证明材料", width = 15)
     @ApiModelProperty(value = "房屋资产权属证明材料")
     private String fwzcqszmcl;
-	/**面积单位*/
-	@Excel(name = "面积单位", width = 15)
+    /**
+     * 面积单位
+     */
+    @Excel(name = "面积单位", width = 15)
     @ApiModelProperty(value = "面积单位")
     private String sjsyjzmjdw;
-	/**是否共用宗地*/
-	@Excel(name = "是否共用宗地", width = 15)
+    /**
+     * 是否共用宗地
+     */
+    @Excel(name = "是否共用宗地", width = 15)
     @Dict(dicCode = "sfgyz")
     @ApiModelProperty(value = "是否共用宗地")
     private String sfgyz;
-	/**权益受损情况*/
-	@Excel(name = "权益受损情况", width = 15)
+    /**
+     * 权益受损情况
+     */
+    @Excel(name = "权益受损情况", width = 15)
     @Dict(dicCode = "qyssqk")
     @ApiModelProperty(value = "权益受损情况")
     private String qyssqk;
-	/**出租出借情况*/
-	@Excel(name = "出租出借情况", width = 15)
+    /**
+     * 出租出借情况
+     */
+    @Excel(name = "出租出借情况", width = 15)
     @Dict(dicCode = "czcjqk")
     @ApiModelProperty(value = "出租出借情况")
     private String czcjqk;
-	/**地块编号-标识*/
-	@Excel(name = "地块编号-标识", width = 15)
+    /**
+     * 地块编号-标识
+     */
+    @Excel(name = "地块编号-标识", width = 15)
     @ApiModelProperty(value = "地块编号-标识")
     private String dkbh;
-	/**所属部门*/
+    /**
+     * 所属部门
+     */
     @ApiModelProperty(value = "所属部门")
     @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "org_code")
     private String sysOrgCode;
-	/**是否有盘活意愿*/
-	@Excel(name = "是否有盘活意愿", width = 15)
+    /**
+     * 是否有盘活意愿
+     */
+    @Excel(name = "是否有盘活意愿", width = 15)
     @Dict(dicCode = "sfgyz")
     @ApiModelProperty(value = "是否有盘活意愿")
     private String sfyphyy;
-	/**意向盘活主体*/
-	@Excel(name = "意向盘活主体", width = 15)
+    /**
+     * 意向盘活主体
+     */
+    @Excel(name = "意向盘活主体", width = 15)
     @ApiModelProperty(value = "意向盘活主体")
     private String yxphzt;
-	/**意向盘活方式*/
-	@Excel(name = "意向盘活方式", width = 15)
+    /**
+     * 意向盘活方式
+     */
+    @Excel(name = "意向盘活方式", width = 15)
     @ApiModelProperty(value = "意向盘活方式")
     private String yxphfs;
-	/**盘活时间*/
-	@Excel(name = "盘活时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    /**
+     * 盘活时间
+     */
+    @Excel(name = "盘活时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "盘活时间")
     private Date phsj;
-	/**盘活计划*/
-	@Excel(name = "盘活计划", width = 15)
+    /**
+     * 盘活计划
+     */
+    @Excel(name = "盘活计划", width = 15)
     @ApiModelProperty(value = "盘活计划")
     private String phjh;
-	/**企业所得税*/
-	@Excel(name = "企业所得税", width = 15)
+    /**
+     * 企业所得税
+     */
+    @Excel(name = "企业所得税", width = 15)
     @ApiModelProperty(value = "企业所得税")
     private String nss;
-	/**主营业务收入*/
-	@Excel(name = "主营业务收入", width = 15)
+    /**
+     * 主营业务收入
+     */
+    @Excel(name = "主营业务收入", width = 15)
     @ApiModelProperty(value = "主营业务收入")
     private java.lang.Double yysr;
-	/**就业人数*/
-	@Excel(name = "就业人数", width = 15)
+    /**
+     * 就业人数
+     */
+    @Excel(name = "就业人数", width = 15)
     @ApiModelProperty(value = "就业人数")
     private Integer jyrs;
-	/**净利润*/
-	@Excel(name = "净利润", width = 15)
+    /**
+     * 净利润
+     */
+    @Excel(name = "净利润", width = 15)
     @ApiModelProperty(value = "净利润")
     private java.lang.Double lirun;
-	/**营业税金及附加*/
-	@Excel(name = "营业税金及附加", width = 15)
+    /**
+     * 营业税金及附加
+     */
+    @Excel(name = "营业税金及附加", width = 15)
     @ApiModelProperty(value = "营业税金及附加")
     private java.lang.Double yys;
-	/**上级单位*/
-	@Excel(name = "上级单位", width = 15)
+    /**
+     * 上级单位
+     */
+    @Excel(name = "上级单位", width = 15)
     @ApiModelProperty(value = "上级单位")
     private String sjdw;
-	/**国有资产持股比例*/
-	@Excel(name = "国有资产持股比例", width = 15)
+    /**
+     * 国有资产持股比例
+     */
+    @Excel(name = "国有资产持股比例", width = 15)
     @ApiModelProperty(value = "国有资产持股比例")
     private java.lang.Double gyzccgbl;
-	/**企业编码*/
-	@Excel(name = "企业编码", width = 15)
+    /**
+     * 企业编码
+     */
+    @Excel(name = "企业编码", width = 15)
     @ApiModelProperty(value = "企业编码")
     private String qybm;
-	/**单位级别*/
-	@Excel(name = "单位级别", width = 15)
+    /**
+     * 单位级别
+     */
+    @Excel(name = "单位级别", width = 15)
     @ApiModelProperty(value = "单位级别")
     private String orgType;
-	/**单位编码*/
-	@Excel(name = "单位编码", width = 15)
+    /**
+     * 单位编码
+     */
+    @Excel(name = "单位编码", width = 15)
     @ApiModelProperty(value = "单位编码")
     private String orgCode;
-	/**主管部门*/
-	@Excel(name = "主管部门", width = 15)
+    /**
+     * 主管部门
+     */
+    @Excel(name = "主管部门", width = 15)
     @ApiModelProperty(value = "主管部门")
     private String sjdwdm;
-	/**分管领导*/
-	@Excel(name = "分管领导", width = 15)
+    /**
+     * 分管领导
+     */
+    @Excel(name = "分管领导", width = 15)
     @ApiModelProperty(value = "分管领导")
     private String fgld;
-	/**分管领导手机号*/
-	@Excel(name = "分管领导手机号", width = 15)
+    /**
+     * 分管领导手机号
+     */
+    @Excel(name = "分管领导手机号", width = 15)
     @ApiModelProperty(value = "分管领导手机号")
     private String fgldsjh;
-	/**手机号*/
-	@Excel(name = "手机号", width = 15)
+    /**
+     * 手机号
+     */
+    @Excel(name = "手机号", width = 15)
     @ApiModelProperty(value = "手机号")
     private String sjh;
-	/**证件号*/
-	@Excel(name = "证件号", width = 15)
+    /**
+     * 证件号
+     */
+    @Excel(name = "证件号", width = 15)
     @ApiModelProperty(value = "证件号")
     private String zjh;
-	/**是否涉及省内土地资产*/
-	@Excel(name = "是否涉及省内土地资产", width = 15)
+    /**
+     * 是否涉及省内土地资产
+     */
+    @Excel(name = "是否涉及省内土地资产", width = 15)
     @ApiModelProperty(value = "是否涉及省内土地资产")
     private String sfsjtdzc;
-	/**审核时间*/
-	@Excel(name = "审核时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    /**
+     * 审核时间
+     */
+    @Excel(name = "审核时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "审核时间")
     private Date shsj;
-	/**备注*/
-	@Excel(name = "备注", width = 15)
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String bz;
-	/**是否存在图片*/
-	@Excel(name = "是否存在图片", width = 15)
+    /**
+     * 是否存在图片
+     */
+    @Excel(name = "是否存在图片", width = 15)
     @ApiModelProperty(value = "是否存在图片")
     private String sfcztp;
-	/**是否存在VR*/
-	@Excel(name = "是否存在VR", width = 15)
+    /**
+     * 是否存在VR
+     */
+    @Excel(name = "是否存在VR", width = 15)
     @ApiModelProperty(value = "是否存在VR")
     private String sfczvr;
-	/**是否存在矢量数据*/
-	@Excel(name = "是否存在矢量数据", width = 15)
+    /**
+     * 是否存在矢量数据
+     */
+    @Excel(name = "是否存在矢量数据", width = 15)
     @ApiModelProperty(value = "是否存在矢量数据")
     private String sfczslsj;
-	/**全景图片*/
-	@Excel(name = "全景图片", width = 15)
+    /**
+     * 全景图片
+     */
+    @Excel(name = "全景图片", width = 15)
     @ApiModelProperty(value = "全景图片")
     private String vr;
-	/**现场图片*/
-	@Excel(name = "现场图片", width = 15)
+    /**
+     * 现场图片
+     */
+    @Excel(name = "现场图片", width = 15)
     @ApiModelProperty(value = "现场图片")
     private String images;
-	/**创建日期*/
+    /**
+     * 创建日期
+     */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
     private java.util.Date createTime;
-	/**更新人*/
+    /**
+     * 更新人
+     */
     @ApiModelProperty(value = "更新人")
     private String updateBy;
-	/**更新日期*/
+    /**
+     * 更新日期
+     */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**修复中心id*/
-	@Excel(name = "修复中心id", width = 15)
+    /**
+     * 修复中心id
+     */
+    @Excel(name = "修复中心id", width = 15)
     @ApiModelProperty(value = "修复中心id")
     private String xfzxId;
-	/**国资委id*/
-	@Excel(name = "国资委id", width = 15)
+    /**
+     * 国资委id
+     */
+    @Excel(name = "国资委id", width = 15)
     @ApiModelProperty(value = "国资委id")
     private String gzvId;
-	/**数据状态*/
-	@Excel(name = "数据状态", width = 15)
+    /**
+     * 数据状态
+     */
+    @Excel(name = "数据状态", width = 15)
     @ApiModelProperty(value = "数据状态")
     private String state;
-	/**删除标志*/
-	@Excel(name = "删除标志", width = 15)
+    /**
+     * 删除标志
+     */
+    @Excel(name = "删除标志", width = 15)
     @ApiModelProperty(value = "删除标志")
     private String delFlag;
 
-    /**zslx*/
+    /**
+     * zslx
+     */
     @Excel(name = "证书类型", width = 125)
     @ApiModelProperty(value = "证书类型")
     @Dict(dicCode = "zslx")
     private String zslx;
 
     //增加,过滤导出条件用
-    /**县区*/
-    @Excel(name = "地市", width = 15,dicCode = "xq")
+    /**
+     * 县区
+     */
+    @Excel(name = "地市", width = 15, dicCode = "xq")
     @TableField(exist = false)
-    @ApiModelProperty(value = "县区" )
+    @ApiModelProperty(value = "县区")
     private String xq;
 
     @Excel(name = "数据源", width = 15)
-    @ApiModelProperty(value = "数据原" )
+    @ApiModelProperty(value = "数据原")
     private String source;
 
     @Excel(name = "地块价值", width = 15)
-    @ApiModelProperty(value = "地块价值" )
+    @ApiModelProperty(value = "地块价值")
     //保留2位小数
     private Double worth;
+
     public Double getWorth() {
 
         if (this.worth == null) {

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/gzvhb/service/IQcSsgqzysytdqkGzvService.java

@@ -13,14 +13,19 @@ import java.util.Map;
 /**
  * @Description: qc_ssgqzysytdqk_gzv
  * @Author: jeecg-boot
- * @Date:   2024-07-27
+ * @Date: 2024-07-27
  * @Version: V1.0
  */
 public interface IQcSsgqzysytdqkGzvService extends IService<QcSsgqzysytdqkGzv> {
 
-    //省属
+    /**
+     * 省属
+     */
     List<Map<String, Double>> sumList(List<QcSsgqzysytdqkGzv> list);
-    //省直
+
+    /**
+     * 省直
+     */
     List<Map<String, Double>> sumListBysz(List<QcSsgqzysytdqkGzv> list);
 
     void upSfsb(String id);
@@ -32,4 +37,19 @@ public interface IQcSsgqzysytdqkGzvService extends IService<QcSsgqzysytdqkGzv> {
     ResultCount queryResultCount(QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper);
 
     ResultCount queryResultCountMoney(QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper);
+
+    /**
+     * 获取一级企业列表,并进行一级企业组装
+     */
+    List<QcSsgqzysytdqkGzv> getFirstOrgNames(List<QcSsgqzysytdqkGzv> list);
+
+    /**
+     * 获取一级企业列表,并进行一级企业组装(实体)
+     */
+    QcSsgqzysytdqkGzv getFirstOrgName(QcSsgqzysytdqkGzv qcSsgqzysytdqkGzv);
+
+    /**
+     * 获取一级企业列表,并进行一级企业组装
+     */
+    List<QcQyxx> getFirstOrgNamesQyxx(List<QcQyxx> list);
 }

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/gzvhb/service/impl/QcSsgqzysytdqkGzvServiceImpl.java

@@ -9,6 +9,7 @@ import org.jeecg.modules.zrzyqc.gzvhb.mapper.QcSsgqzysytdqkGzvMapper;
 import org.jeecg.modules.zrzyqc.gzvhb.model.ResultCount;
 import org.jeecg.modules.zrzyqc.gzvhb.service.IQcSsgqzysytdqkGzvService;
 import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
+import org.jeecg.modules.zrzyqc.qyxx.mapper.QcQyxxMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,22 +22,22 @@ import java.util.stream.Collectors;
 /**
  * @Description: qc_ssgqzysytdqk_gzv
  * @Author: jeecg-boot
- * @Date:   2024-07-27
+ * @Date: 2024-07-27
  * @Version: V1.0
  */
 @Service
 public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvMapper, QcSsgqzysytdqkGzv> implements IQcSsgqzysytdqkGzvService {
     @Autowired
     private ISysBaseAPI sysBaseAPI;
-
     @Autowired
     private QcSsgqzysytdqkGzvMapper qcSsgqzysytdqkGzvMapper;
+    @Autowired
+    private QcQyxxMapper qcQyxxMapper;
 
     @Override
     public void upSfsb(String id) {
         qcSsgqzysytdqkGzvMapper.upSfsb(id);
     }
-
     @Override
     public QcQyxx selectQyxx(String username, String orCode) {
         return qcSsgqzysytdqkGzvMapper.selectQyxx(username, orCode);
@@ -49,6 +50,7 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
 
     /**
      * 查询地块面积和数量
+     *
      * @param queryWrapper
      * @return
      */
@@ -58,7 +60,7 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
         if (!qcSsgqzysytdqkGzvs.isEmpty()) {
             ResultCount resultCount = new ResultCount();
             resultCount.setCountDk(qcSsgqzysytdqkGzvs.size());
-            resultCount.setAreaDk((qcSsgqzysytdqkGzvs.stream().mapToDouble(QcSsgqzysytdqkGzv::getSjzytdmj).sum())*0.0015);
+            resultCount.setAreaDk((qcSsgqzysytdqkGzvs.stream().mapToDouble(QcSsgqzysytdqkGzv::getSjzytdmj).sum()) * 0.0015);
             return resultCount;
         }
         return null;
@@ -73,14 +75,79 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
             resultCount.setAreaDk(qcSsgqzysytdqkGzvs.stream()
                     .filter(qc -> qc.getWorth() != null) // 过滤掉 null 值
                     .mapToDouble(QcSsgqzysytdqkGzv::getWorth)
-                    .sum()/10000);
+                    .sum() / 10000);
             return resultCount;
         }
         return null;
     }
 
+    /**
+     * 获取所有一级企业名称
+     *
+     * @return
+     */
+    @Override
+    public List<QcSsgqzysytdqkGzv> getFirstOrgNames(List<QcSsgqzysytdqkGzv> list) {
+        Map<String, Map<String, Object>> resultMap = qcQyxxMapper.getFirstOrgNames();
+        Map<String, String> map = resultMap.entrySet().stream()
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey,
+                        entry -> entry.getValue().get("value").toString()
+                ));
+        for (QcSsgqzysytdqkGzv qcSsgqzysytdqkGzv : list) {
+            if (qcSsgqzysytdqkGzv.getSysOrgCode() != null && qcSsgqzysytdqkGzv.getSysOrgCode().length()>=6) {
+                String code = qcSsgqzysytdqkGzv.getSysOrgCode().substring(0, 6);
+                String value = map.get(code).toString();
+                qcSsgqzysytdqkGzv.setFirstOrgName(value);
+            }
+        }
+        return list;
+    }
 
     @Override
+    public QcSsgqzysytdqkGzv getFirstOrgName(QcSsgqzysytdqkGzv qcSsgqzysytdqkGzv) {
+        Map<String, Map<String, Object>> resultMap = qcQyxxMapper.getFirstOrgNames();
+        Map<String, String> map = resultMap.entrySet().stream()
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey,
+                        entry -> entry.getValue().get("value").toString()
+                ));
+        if (null != qcSsgqzysytdqkGzv) {
+
+            if (qcSsgqzysytdqkGzv.getSysOrgCode() != null && qcSsgqzysytdqkGzv.getSysOrgCode().length()>=6) {
+                String code = qcSsgqzysytdqkGzv.getSysOrgCode().substring(0, 6);
+                String value = map.get(code).toString();
+                qcSsgqzysytdqkGzv.setFirstOrgName(value);
+            }
+        }
+        return qcSsgqzysytdqkGzv;
+    }
+
+    @Override
+    public List<QcQyxx> getFirstOrgNamesQyxx(List<QcQyxx> list) {
+        Map<String, Map<String, Object>> resultMap = qcQyxxMapper.getFirstOrgNames();
+        Map<String, String> map = resultMap.entrySet().stream()
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey,
+                        entry -> entry.getValue().get("value").toString()
+                ));
+        for (QcQyxx qcQyxx : list) {
+            if (qcQyxx.getSysOrgCode() != null && qcQyxx.getSysOrgCode().length()>=6) {
+                String code = qcQyxx.getSysOrgCode().substring(0, 6);
+                String value = map.get(code).toString();
+                qcQyxx.setFirstOrgName(value);
+            }
+        }
+        return list;
+    }
+
+
+    /**
+     * 省属企业统计图表
+     * @param list
+     * @return
+     */
+    @Override
     public List<Map<String, Double>> sumList(List<QcSsgqzysytdqkGzv> list) {
         List<DictModel> xzqh = sysBaseAPI.getDictItems("xq");
         //获取字典列表
@@ -88,16 +155,16 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
         Double num = Double.valueOf(0);
         List<Map<String, Double>> result = new ArrayList<>();
         Map<String, Double> map = new HashMap<>();
-        Map<String, Double> sjytMap = new HashMap<>();
-        Map<String, Double> syxzMap = new HashMap<>();
-        Map<String, Double> wjbhMap = new HashMap<>();
+        Map<String, Double> sjytMap = new LinkedHashMap<>();  //实际用途
+        Map<String, Double> syxzMap = new LinkedHashMap<>();  //使用现状
+        Map<String, Double> wjbhMap = new LinkedHashMap<>();  //文件
+        //1-使用权使用方式,占比地块数量
         Map<String, List<QcSsgqzysytdqkGzv>> collect = list.stream().collect(Collectors.groupingBy((QcSsgqzysytdqkGzv::getSyqsyfs)));
         for (String s : collect.keySet()) {
             map.put(s, (double) collect.get(s).size());
         }
-        //占比地块数量
         result.add(map);
-        //区划
+        //2-行政区划
         for (QcSsgqzysytdqkGzv qcSsgqzysytdqk : list) {
             String qh = qcSsgqzysytdqk.getXzqh().substring(0, 4);
             for (DictModel dictModel : xzqh) {
@@ -106,10 +173,10 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
                 }
             }
         }
-        //面积亩
+        //面积转换亩省属企业实际使用买面积
         Map<String, Double> xzqhByAreaCollect = list.stream().collect(
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getXzqh,
-                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjsyjzmj()*0.0015).orElse(0.0))));
+                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjsyjzmj() * 0.0015).orElse(0.0))));
         result.add(xzqhByAreaCollect);
         //土地使用现状编码
         Map<String, List<QcSsgqzysytdqkGzv>> syxzCollect = list.stream().collect(
@@ -121,9 +188,8 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
         //实际占用面积
         Map<String, Double> syxzByAreaCollect = list.stream().collect(
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getSyqsyfs,
-                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjzytdmj()*0.0015).orElse(0.0))));
+                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjzytdmj() * 0.0015).orElse(0.0))));
         result.add(syxzByAreaCollect);
-
         //文件类型
         Map<String, Long> wjlxCollect = list.stream().collect(
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getWjlx,
@@ -149,6 +215,11 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
         return result;
     }
 
+    /**
+     * 省直企业统计图表
+     * @param list
+     * @return
+     */
     @Override
     public List<Map<String, Double>> sumListBysz(List<QcSsgqzysytdqkGzv> list) {
         List<DictModel> xzqh = sysBaseAPI.getDictItems("xq");
@@ -156,9 +227,9 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
         Double num = Double.valueOf(0);
         List<Map<String, Double>> result = new ArrayList<>();
         Map<String, Double> map = new HashMap<>();
-        Map<String, Double> sjytMap = new HashMap<>();
-        Map<String, Double> syxzMap = new HashMap<>();
-        Map<String, Double> wjbhMap = new HashMap<>();
+        Map<String, Double> sjytMap = new LinkedHashMap<>();
+        Map<String, Double> syxzMap = new LinkedHashMap<>();
+        Map<String, Double> wjbhMap = new LinkedHashMap<>();
         Map<String, List<QcSsgqzysytdqkGzv>> collect = list.stream().collect(Collectors.groupingBy((QcSsgqzysytdqkGzv::getSyqsyfs)));
         for (String s : collect.keySet()) {
             map.put(s, (double) collect.get(s).size());
@@ -176,7 +247,7 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
         //实际使用
         Map<String, Double> xzqhByAreaCollect = list.stream().collect(
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getXzqh,
-                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjsyjzmj()*0.0015).orElse(0.0))));
+                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjsyjzmj() * 0.0015).orElse(0.0))));
         result.add(xzqhByAreaCollect);
         //土地使用方式
         Map<String, List<QcSsgqzysytdqkGzv>> syxzCollect = list.stream().collect(
@@ -188,7 +259,7 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
         //实际占用面积
         Map<String, Double> syxzByAreaCollect = list.stream().collect(
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getSyqsyfs,
-                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjzytdmj()*0.0015).orElse(0.0))));
+                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjzytdmj() * 0.0015).orElse(0.0))));
         result.add(syxzByAreaCollect);
         //文件类型
         Map<String, Long> wjlxCollect = list.stream().collect(

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

@@ -19,6 +19,7 @@ import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.zrzyqc.gzvhb.entity.QcSsgqzysytdqkGzv;
 import org.jeecg.modules.zrzyqc.gzvhb.service.IQcSsgqzysytdqkGzvService;
 import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
+import org.jeecg.modules.zrzyqc.qyxx.entity.XzdxVO;
 import org.jeecg.modules.zrzyqc.qyxx.service.IQcQyxxService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -142,6 +143,10 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.likeRight("sys_org_code", "A04");
         Page<QcQyxx> page = new Page<QcQyxx>(pageNo, pageSize);
         IPage<QcQyxx> pageList = qcQyxxService.page(page, queryWrapper);
+        // 生成一级单位名称
+        List<QcQyxx> records = pageList.getRecords();
+        List<QcQyxx> firstOrgNames = qcSsgqzysytdqkGzvService.getFirstOrgNamesQyxx(records);
+        pageList.setRecords(firstOrgNames);
         return Result.OK(pageList);
     }
 
@@ -587,8 +592,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
      *
      * @return
      */
-    //@AutoLog(value = "首页数据-下发任务数、有效登录数")
-    @ApiOperation(value = "首页数据-下发任务数、有效登录数", notes = "首页数据-下发任务数、有效登录数")
+    @ApiOperation(value = "省属企业:首页数据-下发任务数、有效登录数", notes = "首页数据-下发任务数、有效登录数")
     @GetMapping(value = "/rwdls")
     public Result<List> rwdls() {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -597,29 +601,36 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         ArrayList list = new ArrayList();
         String username = sysUser.getUsername();
         String orgCode = sysUser.getOrgCode();
-        String selectqyxx = qcQyxxService.selectqyxx();
+        String selectqyxx = qcQyxxService.selectqyxx(); //下发任务数
         String yxdls = qcQyxxService.yxdls();
         String sbdks = null;
         String yhjs = null;
-        String sbdkmj = null; //上报地块面积
+        String sbdkmj = null;      //上报地块面积
+        XzdxVO xzdx=new XzdxVO();  //闲置低效
         for (String s : rolesByUsername) {
             if (s.equals("shyh") || s.equals("gzw") || s.equals("xfzx") || s.equals("sjzh")) {
                 yhjs = "shyh";
                 sbdks = qcQyxxService.sbdksAdmin();
                 sbdkmj = qcQyxxService.sbdksMjAdmin();
+                xzdx=qcQyxxService.getXzdx("");
                 break;
             } else {
                 yhjs = "sbyh";
                 sbdks = qcQyxxService.sbdks(username);
                 sbdkmj = qcQyxxService.sbdksMj(username);
+                xzdx=qcQyxxService.getXzdx(username);
             }
         }
-        list.add(selectqyxx);//下发任务数
-        list.add(yxdls);//有效登录数
-        list.add(sbdks);//上报地块数
-        list.add(yhjs);//用戶角色
-        list.add(ChangeNumber.ChangeString(sbdkmj));//上报地块面积
-        return Result.OK(list);
+        //企业数量、上报地块企业数、地块数量、地块面积、闲置地块数、闲置地块面积
+        list.add(selectqyxx);  //下发任务数
+        list.add(yxdls);       //有效登录数
+        list.add(sbdks);       //上报地块数
+        list.add(yhjs);        //用戶角色
+        list.add(ChangeNumber.ChangeString(sbdkmj));   //上报地块面积
+        list.add(xzdx.getXzdxNum());
+        list.add(xzdx.getXzdxArea());
+        String message="下发任务数,有效登录数,上报地块数,用戶角色,省属上报面积,闲置地块数、闲置地块面积";
+        return Result.OK(message,list);
     }
 
     /**
@@ -627,8 +638,8 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
      *
      * @return
      */
-    //@AutoLog(value = "首页数据-下发任务数、有效登录数")
-    @ApiOperation(value = "首页数据-下发任务数、有效登录数", notes = "首页数据-下发任务数、有效登录数")
+
+    @ApiOperation(value = "省直单位:首页数据-下发任务数、有效登录数", notes = "首页数据-下发任务数、有效登录数")
     @GetMapping(value = "/sydw")
     public Result<List> sydw() {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -642,24 +653,30 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         String wsh = null;
         String szsbMj = null;
         String szwshMj = null;
+        XzdxVO xzdx=new XzdxVO();  //闲置低效
         for (String s : rolesByUsername) {
             if (s.equals("shyh") || s.equals("gzw") || s.equals("xfzx") || s.equals("sjzh")) {
                 yhjs = "shyh";
                 sbdks = qcQyxxService.sydwsbdksAdmin();
-                wsh = qcQyxxService.sydwwshAdmin();
+                //wsh = qcQyxxService.sydwwshAdmin();
                 szsbMj = qcQyxxService.sydwwshAdminMj();
-                szwshMj = qcQyxxService.sydwwshAdminWshMj();
+                //szwshMj = qcQyxxService.sydwwshAdminWshMj();
+                xzdx=qcQyxxService.getXzdxSz();
                 break;
             }
         }
+        //企业数量、上报地块企业数、地块数量、地块面积、闲置地块数、闲置地块面积
         list.add(selectqyxx);//下发任务数
         list.add(yxdls);//有效登录数
         list.add(sbdks);//上报地块数
-        list.add(wsh);//未审核
+        //list.add(wsh);//未审核
         list.add(yhjs);//用戶角色
         list.add(ChangeNumber.ChangeString(szsbMj));//省直上报面积
-        list.add(ChangeNumber.ChangeString(szwshMj));//省直未审核面积
-        return Result.OK(list);
+        //list.add(ChangeNumber.ChangeString(szwshMj));//省直未审核面积
+        list.add(xzdx.getXzdxNum());
+        list.add(xzdx.getXzdxArea());
+        String message="下发任务数,有效登录数,上报地块数,用戶角色,省直上报面积,闲置地块数、闲置地块面积";
+        return Result.OK(message,list);
     }
 
     /**
@@ -1068,6 +1085,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
         queryWrapper.eq("SFSB", 3);
         List list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
+        Collections.reverse(list);
         return Result.OK(list);
     }
 
@@ -1088,8 +1106,9 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.groupBy("SYQSYFS");
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
         queryWrapper.eq("SFSB", 3);
-
         List list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
+        //其它类放后面
+        Collections.reverse(list);
         return Result.OK(list);
     }
 
@@ -1112,6 +1131,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.likeRight("SYS_ORG_CODE", "A03");
         queryWrapper.gt("SFSB", 1);
         List list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
+        Collections.reverse(list);
         return Result.OK(list);
     }
 
@@ -1237,6 +1257,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
     @GetMapping(value = "/sjyttjsz")
     public Result<?> sjyttjsz(@RequestParam(name = "xzqh") String xzqh) {
         List<HashMap<String, Object>> list = qcQyxxService.sjyttjsz(xzqh);
+        Collections.reverse(list);
         return getResult(list);
     }
 

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/entity/QcQyxx.java

@@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -154,5 +155,11 @@ public class QcQyxx implements Serializable {
     @Excel(name = "机构类型", width = 15)
     @ApiModelProperty(value = "机构类型")
     private java.lang.String jglx;
+    /**
+     * 一级企业
+     */
+    @ApiModelProperty(value = "一级企业")
+    @TableField(exist = false)
+    private String firstOrgName;
 
 }

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/entity/XzdxVO.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.zrzyqc.qyxx.entity;
+
+import lombok.Data;
+
+/**
+ * @author 天气预报
+ * @date 2025/5/23 9:29
+ * @package: org.jeecg.modules.zrzyqc.qyxx.entity
+ * @description
+ */
+@Data
+public class XzdxVO {
+    private int xzdxNum;
+    private double xzdxArea;
+}

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

@@ -2,10 +2,15 @@ package org.jeecg.modules.zrzyqc.qyxx.mapper;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
 import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.zrzyqc.qyxx.entity.XzdxVO;
 
 /**
  * @Description: 用地单位信息
@@ -99,4 +104,20 @@ public interface QcQyxxMapper extends BaseMapper<QcQyxx> {
     String sydwwshAdminWshMj();
 
     List<String> queryYears();
+
+    /**
+     * 统计闲置低效
+     * @param userName
+     * @return
+     */
+    XzdxVO getXzdx(@Param("userName") String userName);
+
+    XzdxVO getXzdxSz();
+
+    /**
+     * 获取所有企业信息
+     * @return
+     */
+    @MapKey("key") // 指定键字段
+    Map<String, Map<String, Object>> getFirstOrgNames();
 }

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

@@ -18,29 +18,25 @@
     <select id="sbdksAdmin" resultType="String">
         select count(1) sbdk
         from qc_ssgqzysytdqk_gzv
-        where sfsb > 0
-          and sys_org_code like 'A04%'
+        where sys_org_code like 'A04%'
     </select>
     <!--    上报地块面积-->
     <select id="sbdksMjAdmin" resultType="java.lang.String">
         select ROUND(sum(sjzytdmj*0.0015) ,2) as sjmj
         from qc_ssgqzysytdqk_gzv
-        where sfsb > 0
-          and sys_org_code like 'A04%'
+        where sys_org_code like 'A04%'
     </select>
 
     <select id="sbdks" resultType="String">
         select count(1) sbdk
         from qc_ssgqzysytdqk_gzv
-        where sfsb > 0
-          and create_by = #{username}
+        where create_by = #{username}
     </select>
     <!--  面积-->
     <select id="sbdksMj" resultType="java.lang.String">
         select ROUND(sum(sjzytdmj*0.0015),2) as sjmj
         from qc_ssgqzysytdqk_gzv
-        where sfsb > 0
-          and create_by = #{username}
+        where create_by = #{username}
     </select>
 
     <select id="wsh" resultType="String" parameterType="String">
@@ -171,13 +167,11 @@
 
     <!--省直单位信息-->
     <select id="selectdwxx" resultType="String">
-        /*   select count(1) xfrwsl  from qc_qyxx where  sys_org_code like 'A02%'*/
         select count(1) xfrwsl
         from sys_user
         where org_code like 'A03%'
     </select>
     <select id="sydwyxdls" resultType="String">
-        /* select count(DISTINCT create_by)   from qc_ssgqzysytdqk where sys_org_code like 'A03%'*/
         select count(1) yxdls
         from qc_qyxx
         where qymc is not null
@@ -187,15 +181,13 @@
     <select id="sydwsbdksAdmin" resultType="String">
         select count(1) sbdk
         from qc_ssgqzysytdqk_gzv
-        where sfsb > 0
-          and sys_org_code like 'A03%'
+        where sys_org_code like 'A03%'
     </select>
     <!--省直上报面积-->
     <select id="sydwsbdksAdminMj" resultType="java.lang.String">
         select ROUND(sum(sjzytdmj*0.0015) ,2)as sjmj
         from qc_ssgqzysytdqk_gzv
-        where sfsb > 0
-          and sys_org_code like 'A03%'
+        where sys_org_code like 'A03%'
     </select>
 
     <select id="sydwwshAdminWshMj" resultType="java.lang.String">
@@ -216,8 +208,7 @@
     <select id="sydwwshAdmin" resultType="String">
         select count(1) shzt
         from qc_ssgqzysytdqk_gzv
-        where sfsb = 1
-          and sys_org_code like 'A03%'
+        where sys_org_code like 'A03%'
     </select>
     <select id="sydwbtgshAdmin" resultType="String">
         select count(1) shzt
@@ -399,4 +390,20 @@
         ORDER BY
             YEAR DESC
     </select>
+    <select id="getXzdx" resultType="org.jeecg.modules.zrzyqc.qyxx.entity.XzdxVO">
+        select count(*) as xzdxNum, round(sum(sjzytdmj)* 0.0015,2) as xzdxArea
+        from qc_ssgqzysytdqk_gzv
+        where tdsyxz='闲置低效土地' and sys_org_code like 'A04%'
+        <if test="userName!='' and userName!=null">
+            and create_by = #{username}
+        </if>
+    </select>
+    <select id="getXzdxSz" resultType="org.jeecg.modules.zrzyqc.qyxx.entity.XzdxVO">
+        select count(*) as xzdxNum, round(sum(sjzytdmj)* 0.0015,2) as xzdxArea
+        from qc_ssgqzysytdqk_gzv
+        where tdsyxz='闲置低效土地' and sys_org_code like 'A03%'
+    </select>
+    <select id="getFirstOrgNames" resultType="java.util.Map">
+        select sys_org_code AS key,qymc AS value from qc_qyxx where org_type='2' and sys_org_code like 'A04%' GROUP BY key,value
+    </select>
 </mapper>

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.zrzyqc.qyxx.service;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.zrzyqc.qyxx.entity.XzdxVO;
 
 import java.util.HashMap;
 import java.util.List;
@@ -105,4 +106,17 @@ public interface IQcQyxxService extends IService<QcQyxx> {
     String sydwwshAdminWshMj();
     /*查询年份*/
     List<String> queryYears();
+
+    /**
+     * 统计闲置低效
+     * @param s
+     * @return
+     */
+    XzdxVO getXzdx(String s);
+
+    /**
+     * 省直
+     * @return
+     */
+    XzdxVO getXzdxSz();
 }

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.zrzyqc.qyxx.service.impl;
 
 import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
+import org.jeecg.modules.zrzyqc.qyxx.entity.XzdxVO;
 import org.jeecg.modules.zrzyqc.qyxx.mapper.QcQyxxMapper;
 import org.jeecg.modules.zrzyqc.qyxx.service.IQcQyxxService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -185,6 +186,20 @@ public class QcQyxxServiceImpl extends ServiceImpl<QcQyxxMapper, QcQyxx> impleme
     }
 
     @Override
+    public XzdxVO getXzdx(String s) {
+        return qcQyxxMapper.getXzdx(s);
+    }
+
+    /**
+     * 省直
+     * @return
+     */
+    @Override
+    public XzdxVO getXzdxSz() {
+        return qcQyxxMapper.getXzdxSz();
+    }
+
+    @Override
     public String sydwtgshAdmin() {
         return qcQyxxMapper.sydwtgshAdmin();
     }