1.切换所有QcSsgqzysytdqk 对象的方法到QcSsgqzysytdqkGzv 下

2.修改启动预警的信息(无id,el告警这个没启用)
3.修改是否上报查询条件(1,2)包含关系

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java

@@ -50,7 +50,7 @@ public class JeecgElasticsearchTemplate {
                     log.info("ElasticSearch version: " + this.version);
                 } catch (Exception e) {
                     this.version = "";
-                    log.warn("ElasticSearch 服务连接失败，原因：配置未通过。可能是BaseURL未配置或配置有误，也可能是Elasticsearch服务未启动。接下来将会拒绝执行任何方法！");
+                    //log.warn("ElasticSearch 服务连接失败，原因：配置未通过。可能是BaseURL未配置或配置有误，也可能是Elasticsearch服务未启动。接下来将会拒绝执行任何方法！");
                 }
             }
         }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java

@@ -193,33 +193,34 @@ public class RestUtil {
      * @return ResponseEntity<responseType>
      */
     public static <T> ResponseEntity<T> request(String url, HttpMethod method, HttpHeaders headers, JSONObject variables, Object params, Class<T> responseType) {
-        log.info(" RestUtil  --- request ---  url = "+ url);
-        if (StringUtils.isEmpty(url)) {
-            throw new RuntimeException("url 不能为空");
-        }
-        if (method == null) {
-            throw new RuntimeException("method 不能为空");
-        }
-        if (headers == null) {
-            headers = new HttpHeaders();
-        }
-        // 请求体
-        String body = "";
-        if (params != null) {
-            if (params instanceof JSONObject) {
-                body = ((JSONObject) params).toJSONString();
-
-            } else {
-                body = params.toString();
-            }
-        }
-        // 拼接 url 参数
-        if (variables != null) {
-            url += ("?" + asUrlVariables(variables));
-        }
-        // 发送请求
-        HttpEntity<String> request = new HttpEntity<>(body, headers);
-        return RT.exchange(url, method, request, responseType);
+//        log.info(" RestUtil  --- request ---  url = "+ url);
+//        if (StringUtils.isEmpty(url)) {
+//            throw new RuntimeException("url 不能为空");
+//        }
+//        if (method == null) {
+//            throw new RuntimeException("method 不能为空");
+//        }
+//        if (headers == null) {
+//            headers = new HttpHeaders();
+//        }
+//        // 请求体
+//        String body = "";
+//        if (params != null) {
+//            if (params instanceof JSONObject) {
+//                body = ((JSONObject) params).toJSONString();
+//
+//            } else {
+//                body = params.toString();
+//            }
+//        }
+//        // 拼接 url 参数
+//        if (variables != null) {
+//            url += ("?" + asUrlVariables(variables));
+//        }
+//        // 发送请求
+//        HttpEntity<String> request = new HttpEntity<>(body, headers);
+//        return RT.exchange(url, method, request, responseType);
+        return null;
     }
 
     /**

jeecg-boot-module-gis/src/main/java/org/jeecg/modules/geoAnalysis/entity/GeoAnalysis.java

@@ -10,4 +10,5 @@ public class GeoAnalysis implements Serializable {
     private String type;
     private String afieldcname;
     private Result result;
+    private String id; //sugb 添加id 避免警告
 }

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -180,9 +180,10 @@ mybatis-plus:
       id-type: ASSIGN_ID
       # 默认数据库表下划线命名
       table-underline: true
+  sql-parser-cache-enabled: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置

jeecg-boot-module-system/src/test/java/org/jeecg/TestMain.java

@@ -1,15 +1,9 @@
 package org.jeecg;
 
-import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
-import org.jeecg.common.util.RestUtil;
-import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqk;
-import org.jeecg.modules.zrzyqc.qcsb.service.impl.QcSsgqzysytdqkServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
@@ -21,9 +15,6 @@ import java.util.*;
  * @date: 2022年05月10日 14:02
  */
 public class TestMain {
-    @Autowired
-
-    QcSsgqzysytdqkServiceImpl qcSsgqzysytdqk;
 
     public static void main(String[] args) {
 

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

@@ -1,31 +1,59 @@
 package org.jeecg.modules.zrzyqc.gzvhb.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.PermissionData;
+import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.config.GuavaRateLimiter.RateLimiter;
 import org.jeecg.modules.zrzyqc.gzvhb.entity.QcSsgqzysytdqkGzv;
 import org.jeecg.modules.zrzyqc.gzvhb.service.IQcSsgqzysytdqkGzvService;
-import org.jeecg.modules.zrzyqc.qcsb.Untils.Zh;
-import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqk;
+import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqk1;
+import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqkzc;
+import org.jeecg.modules.zrzyqc.qcsb.service.IQcSsgqzysytdqk1Service;
+import org.jeecg.modules.zrzyqc.qcsb.service.IQcSsgqzysytdqkzcService;
+import org.jeecg.modules.zrzyqc.qcsb.vo.QcSsgqzysytdqkVo;
+import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
+import org.jeecg.modules.zrzyqc.qyxx.service.IQcQyxxService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 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.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+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;
 
 /**
  * @Description: qc_ssgqzysytdqk_gzv
@@ -41,6 +69,16 @@ import java.util.List;
 public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkGzv, IQcSsgqzysytdqkGzvService> {
 	@Autowired
 	private IQcSsgqzysytdqkGzvService qcSsgqzysytdqkGzvService;
+	@Autowired
+	private IQcSsgqzysytdqkzcService qcSsgqzysytdqkzcService;
+	@Value("${jeecg.path.upload}")
+	private String upLoadPath;
+	@Autowired
+	private IQcSsgqzysytdqk1Service qcSsgqzysytdqkService1;
+	@Autowired
+	private IQcQyxxService qcQyxxService;
+	@Autowired
+	private ISysBaseAPI sysBaseAPI;
 
 	/**
 	 * 分页列表查询
@@ -181,6 +219,7 @@ 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 + "%");
@@ -359,5 +398,1603 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 		}
 		return Result.OK("变更成功!");
 	}
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "省属国企占有使用土地情况调查-通过id删除")
+	@ApiOperation(value = "省属国企占有使用土地情况调查-通过id删除", notes = "省属国企占有使用土地情况调查-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+		qcSsgqzysytdqkGzvService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "省属国企占有使用土地情况调查-批量删除")
+	@ApiOperation(value = "省属国企占有使用土地情况调查-批量删除", notes = "省属国企占有使用土地情况调查-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+		this.qcSsgqzysytdqkGzvService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "省属国企占有使用土地情况调查-通过id查询")
+	@ApiOperation(value = "省属国企占有使用土地情况调查-通过id查询", notes = "省属国企占有使用土地情况调查-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<QcSsgqzysytdqkGzv> queryById(@RequestParam(name = "id", required = true) String id) {
+		QcSsgqzysytdqkGzv qcSsgqzysytdqk = qcSsgqzysytdqkGzvService.getById(id);
+		if (qcSsgqzysytdqk == null) {
+			return Result.error("未找到对应数据");
+		}
+		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 省属企业
+	 *
+	 * @param request
+	 * @param qcSsgqzysytdqk
+	 */
+	@RateLimiter(permitRate = 0.1, timeout = 5, timeUnit = TimeUnit.SECONDS)
+	@RequestMapping(value = "/exportXls")
+	@PermissionData(pageComponent = "qcsb/QcSsgqzysytdqkList")
+	public ModelAndView exportXls(HttpServletRequest request, QcSsgqzysytdqkGzv qcSsgqzysytdqk,String year) {
+
+		// Step.1 组装查询条件
+		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, request.getParameterMap());
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		queryWrapper.likeRight("sys_org_code", "A04");
+		if (year!=null){
+			queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
+		}
+		// Step.2 获取导出数据
+		List<QcSsgqzysytdqkGzv> pageList = qcSsgqzysytdqkGzvService.list(queryWrapper);
+		List<QcSsgqzysytdqkGzv> exportList = null;
+
+		// 过滤选中数据
+		String selections = request.getParameter("selections");
+		if (oConvertUtils.isNotEmpty(selections)) {
+			List<String> selectionList = Arrays.asList(selections.split(","));
+			exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
+		} else {
+			exportList = pageList;
+		}
+		for (QcSsgqzysytdqkGzv ssqydk : exportList) {
+			ssqydk.setXq(ssqydk.getXzqh().substring(0, 4));
+		}
+		// Step.3 AutoPoi 导出Excel
+		ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+		//此处设置的filename无效 ,前端会重更新设置一下
+		mv.addObject(NormalExcelConstants.FILE_NAME, "省属国企占有使用土地情况调查");
+		mv.addObject(NormalExcelConstants.CLASS, QcSsgqzysytdqkGzv.class);
+		//update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+		ExportParams exportParams = new ExportParams("省属国企占有使用土地情况调查" + "报表", "导出人:" + sysUser.getRealname(), "省属国企占有使用土地情况调查");
+		exportParams.setImageBasePath(upLoadPath);
+		//update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+		mv.addObject(NormalExcelConstants.PARAMS, exportParams);
+		mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+		return mv;
+	}
+
+	/**
+	 * 事业单位导出excel
+	 *
+	 * @param request
+	 * @param qcSsgqzysytdqk
+	 */
+	@RequestMapping(value = "/exportXls2")
+	@PermissionData(pageComponent = "sydwqcsb/QcSsgqzysytdqkList")
+	public ModelAndView exportXls2(HttpServletRequest request, QcSsgqzysytdqk1 qcSsgqzysytdqk) {
+		// Step.1 组装查询条件
+		QueryWrapper<QcSsgqzysytdqk1> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, request.getParameterMap());
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		// Step.2 获取导出数据
+		List<QcSsgqzysytdqk1> pageList = qcSsgqzysytdqkService1.list(queryWrapper.likeRight("sys_org_code", "A03"));
+		List<QcSsgqzysytdqk1> exportList = null;
+
+		// 过滤选中数据
+		String selections = request.getParameter("selections");
+		if (oConvertUtils.isNotEmpty(selections)) {
+			List<String> selectionList = Arrays.asList(selections.split(","));
+			exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
+		} else {
+			exportList = pageList;
+		}
+		for (QcSsgqzysytdqk1 qcSsgqzysytdqk1 : exportList) {
+			QueryWrapper<QcQyxx> qcQyxxQueryWrapper = new QueryWrapper<>();
+			QcQyxx createBy = qcQyxxService.getOne(qcQyxxQueryWrapper.eq("create_by", qcSsgqzysytdqk1.getCreateBy()));
+			qcSsgqzysytdqk1.setZgdw(createBy.getSjdw());
+		}
+		// Step.3 AutoPoi 导出Excel
+		ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+		//此处设置的filename无效 ,前端会重更新设置一下
+		mv.addObject(NormalExcelConstants.FILE_NAME, "用地单位占有使用土地情况调查");
+		mv.addObject(NormalExcelConstants.CLASS, QcSsgqzysytdqk1.class);
+		//update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+		ExportParams exportParams = new ExportParams("用地单位占有使用土地情况调查" + "报表", "导出人:" + sysUser.getRealname(), "用地单位占有使用土地情况调查");
+		exportParams.setImageBasePath(upLoadPath);
+		//update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+		mv.addObject(NormalExcelConstants.PARAMS, exportParams);
+		mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+		return mv;
+	}
+
+	/**
+	 * 事业单位地块管理导出excel
+	 *
+	 * @param request
+	 * @param qcSsgqzysytdqk
+	 */
+	@RequestMapping(value = "/exportXls3")
+	@PermissionData(pageComponent = "sydwqcsb/QcSsgqzysytdqkList")
+	public ModelAndView exportXls3(HttpServletRequest request, QcSsgqzysytdqk1 qcSsgqzysytdqk,String year) {
+		// Step.1 组装查询条件
+		QueryWrapper<QcSsgqzysytdqk1> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, request.getParameterMap());
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		// Step.2 获取导出数据
+		queryWrapper.likeRight("sys_org_code", "A03");
+		queryWrapper.gt("sfsb", 0);
+		if (year!=null){
+			queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
+		}
+		List<QcSsgqzysytdqk1> pageList = qcSsgqzysytdqkService1.list(queryWrapper);
+		List<QcSsgqzysytdqk1> exportList = null;
+
+		// 过滤选中数据
+		String selections = request.getParameter("selections");
+		if (oConvertUtils.isNotEmpty(selections)) {
+			List<String> selectionList = Arrays.asList(selections.split(","));
+			exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
+		} else {
+			exportList = pageList;
+		}
+		QueryWrapper<QcQyxx> qcQyxxQueryWrapper = new QueryWrapper<>();
+		List<QcQyxx> list = qcQyxxService.list(qcQyxxQueryWrapper.likeRight("sys_org_code", "A03"));
+		for (QcSsgqzysytdqk1 qcSsgqzysytdqk1 : exportList) {
+			qcSsgqzysytdqk1.setXq(qcSsgqzysytdqk1.getXzqh().substring(0, 4));
+			for (QcQyxx qcQyxx : list) {
+				if (qcQyxx.getCreateBy().equals(qcSsgqzysytdqk1.getCreateBy())) {
+					qcSsgqzysytdqk1.setZgdw(qcQyxx.getSjdw());
+					break;
+				}
+			}
+		}
+		// Step.3 AutoPoi 导出Excel
+		ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+		//此处设置的filename无效 ,前端会重更新设置一下
+		mv.addObject(NormalExcelConstants.FILE_NAME, "用地单位占有使用土地情况调查");
+		mv.addObject(NormalExcelConstants.CLASS, QcSsgqzysytdqk1.class);
+		//update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+		ExportParams exportParams = new ExportParams("用地单位占有使用土地情况调查" + "报表", "导出人:" + sysUser.getRealname(), "用地单位占有使用土地情况调查");
+		exportParams.setImageBasePath(upLoadPath);
+		//update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+		mv.addObject(NormalExcelConstants.PARAMS, exportParams);
+		mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+		return mv;
+	}
+
+	/**
+	 * 通过excel导入数据
+	 *
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+		return super.importExcel(request, response, QcSsgqzysytdqkGzv.class);
+	}
+
+	/**
+	 * 事业单位通过excel导入数据
+	 *
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@RequestMapping(value = "/importExcel2", method = RequestMethod.POST)
+	public Result<?> importExcel2(HttpServletRequest request, HttpServletResponse response) {
+		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+		Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+			// 获取上传文件对象
+			MultipartFile file = entity.getValue();
+			ImportParams params = new ImportParams();
+			params.setTitleRows(2);
+			params.setHeadRows(1);
+			params.setNeedSave(true);
+			try {
+				List<QcSsgqzysytdqk1> list = ExcelImportUtil.importExcel(file.getInputStream(), QcSsgqzysytdqk1.class, params);
+				//update-begin-author:taoyan date:20190528 for:批量插入数据
+				for (QcSsgqzysytdqk1 qcSsgqzysytdqk : list) {
+					qcSsgqzysytdqk.setSysOrgCode(sysUser.getOrgCode());
+					qcSsgqzysytdqk.setSfsb(0);
+					qcSsgqzysytdqk.setSjsyjzmjdw("平方米");
+					qcSsgqzysytdqk.setSjzytdmjdw("平方米");
+				}
+				long start = System.currentTimeMillis();
+				qcSsgqzysytdqkService1.saveBatch(list);
+				//400条 saveBatch消耗时间1592毫秒  循环插入消耗时间1947毫秒
+				//1200条  saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
+				log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
+				//update-end-author:taoyan date:20190528 for:批量插入数据
+				return Result.ok("文件导入成功！数据行数：" + list.size());
+			} catch (Exception e) {
+				//update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示
+				String msg = e.getMessage();
+				log.error(msg, e);
+				if (msg != null && msg.indexOf("Duplicate entry") >= 0) {
+					return Result.error("文件导入失败:有重复数据！");
+				} else {
+					return Result.error("文件导入失败:" + e.getMessage());
+				}
+				//update-end-author:taoyan date:20211124 for: 导入数据重复增加提示
+			} finally {
+				try {
+					file.getInputStream().close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return Result.error("文件导入失败！");
+	}
+	/*----------------------------------------------暂存开始------------------------------------------------*/
+
+	/**
+	 * 添加
+	 *
+	 * @param qcSsgqzysytdqk
+	 * @return
+	 */
+	@AutoLog(value = "省直单位占有使用土地情况调查-添加暂存")
+	@ApiOperation(value = "省直单位占有使用土地情况调查-添加暂存", notes = "省直单位占有使用土地情况调查-添加暂存")
+	@PostMapping(value = "/addStag")
+	public Result<String> addStag(@RequestBody QcSsgqzysytdqkzc qcSsgqzysytdqk) {
+		qcSsgqzysytdqkzcService.save(qcSsgqzysytdqk);
+		return Result.OK("暂存成功！请到草稿箱查看！");
+	}
+
+	/**
+	 * 草稿箱分页列表查询
+	 *
+	 * @param qcSsgqzysytdqk
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "省属国企占有使用土地情况调查-分页列表查询")
+	@ApiOperation(value = "草稿箱分页列表查询", notes = "草稿箱分页列表查询")
+	@GetMapping(value = "/listStag")
+	@PermissionData(pageComponent = "sydwqcsb/listStag")
+	public Result<IPage<QcSsgqzysytdqkzc>> queryPagelistStag(QcSsgqzysytdqkzc qcSsgqzysytdqk,
+															 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+															 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+															 HttpServletRequest req) {
+		QueryWrapper<QcSsgqzysytdqkzc> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
+		Page<QcSsgqzysytdqkzc> page = new Page<QcSsgqzysytdqkzc>(pageNo, pageSize);
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		queryWrapper.eq("sys_org_code", sysUser.getOrgCode());
+		IPage<QcSsgqzysytdqkzc> pageList = qcSsgqzysytdqkzcService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 * 暂存
+	 *
+	 * @param qcSsgqzysytdqk
+	 * @return
+	 */
+	@AutoLog(value = "暂存")
+	@ApiOperation(value = "暂存", notes = "暂存")
+	@RequestMapping(value = "/editStag", method = {RequestMethod.PUT, RequestMethod.POST})
+	public Result<String> editStag(@RequestBody QcSsgqzysytdqkzc qcSsgqzysytdqk) {
+		qcSsgqzysytdqkzcService.saveOrUpdate(qcSsgqzysytdqk);
+		return Result.OK("暂存成功!");
+	}
+
+	/**
+	 * 将地块暂存转为填报列表
+	 *
+	 * @param qcSsgqzysytdqk
+	 * @return
+	 */
+	@AutoLog(value = "将地块暂存转为填报列表-编辑")
+	@ApiOperation(value = "将地块暂存转为填报列表-编辑", notes = "将地块暂存转为填报列表-编辑")
+	@RequestMapping(value = "/addToList", method = {RequestMethod.PUT, RequestMethod.POST})
+	public Result<String> addToList(@RequestBody QcSsgqzysytdqkzc qcSsgqzysytdqk) {
+		QcSsgqzysytdqkGzv result = new QcSsgqzysytdqkGzv();
+		BeanUtils.copyProperties(qcSsgqzysytdqk, result);
+		this.add2(result);
+		qcSsgqzysytdqkzcService.removeById(qcSsgqzysytdqk.getId());
+		return Result.OK("转入成功!");
+	}
+
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "省属国企占有使用土地情况调查-通过id删除")
+	@ApiOperation(value = "省属国企占有使用土地情况调查-通过id删除", notes = "省属国企占有使用土地情况调查-通过id删除")
+	@DeleteMapping(value = "/deleteStag")
+	public Result<String> deleteStag(@RequestParam(name = "id", required = true) String id) {
+		qcSsgqzysytdqkzcService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 * 通过DKBH进行查询
+	 *
+	 * @param DKBH
+	 * @return
+	 */
+	@AutoLog(value = "省属国企占有使用土地情况调查-通过DKBH进行查询")
+	@ApiOperation(value = "省属国企占有使用土地情况调查-通过DKBH进行查询", notes = "省属国企占有使用土地情况调查-通过DKBH进行查询")
+	@GetMapping(value = "/queryBydkbh")
+	public Result<QcSsgqzysytdqkVo> queryBydkbh(@RequestParam(name = "DKBH", required = true) String DKBH) {
+		LambdaQueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(QcSsgqzysytdqkGzv::getDkbh, DKBH);
+		QcSsgqzysytdqkGzv one = qcSsgqzysytdqkGzvService.getOne(queryWrapper);
+		QcSsgqzysytdqkVo Vo = new QcSsgqzysytdqkVo();
+		BeanUtils.copyProperties(one, Vo);
+		if (ENTERPRISE_CODE_SQ.equals(one.getSysOrgCode().substring(0, 3))) {
+			List<String> strings = sysBaseAPI.loadCategoryDictItem(one.getSjyt());
+			Vo.setSjytText(strings.get(0));
+		} else if (ENTERPRISE_CODE_SZ.equals(one.getSysOrgCode().substring(0, 3))) {
+			Vo.setSjytText(one.getSjyt());
+		}
+		return Result.OK("查询成功!", Vo);
+	}
+
+
+
+	/**
+	 * 列表查询图表统计
+	 *
+	 * @param qcSsgqzysytdqk
+	 * @param req
+	 * @return
+	 */
+	/**
+	 * @AutoLog(value = "省属列表数据查询)
+	 */
+	@ApiOperation(value = "省属列表数据查询", notes = "省属列表数据查询")
+	@GetMapping(value = "/sumList")
+	@PermissionData(pageComponent = "qcsb/QcSsgqzysytdqkList")
+	public Result<?> queryPageList(QcSsgqzysytdqkGzv qcSsgqzysytdqk,
+								   HttpServletRequest req) {
+		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
+		queryWrapper.likeRight("sys_org_code", "A04");
+		queryWrapper.gt("sfsb", 0);
+		List<QcSsgqzysytdqkGzv> list = qcSsgqzysytdqkGzvService.list(queryWrapper);
+		List<Map<String, Double>> map = qcSsgqzysytdqkGzvService.sumList(list);
+		return Result.OK(map);
+	}
+
+	/**
+	 * 列表查询图表统计
+	 *
+	 * @param qcSsgqzysytdqk
+	 * @param req
+	 * @return
+	 */
+	/**
+	 * @AutoLog(value = "省直列表数据查询)
+	 */
+	@ApiOperation(value = "省直列表数据查询", notes = "省直列表数据查询")
+	@GetMapping(value = "/sumListBysz")
+	public Result<?> sumListBysz(QcSsgqzysytdqkGzv qcSsgqzysytdqk,
+								 HttpServletRequest req) {
+		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
+		queryWrapper.likeRight("sys_org_code", "A03");
+		queryWrapper.gt("sfsb", 0);
+		List<QcSsgqzysytdqkGzv> list = qcSsgqzysytdqkGzvService.list(queryWrapper);
+		List<Map<String, Double>> map = qcSsgqzysytdqkGzvService.sumListBysz(list);
+		return Result.OK(map);
+	}
+
+
+	/**
+	 * 更新图片
+	 *
+	 * @param qcSsgqzysytdqk
+	 * @param req
+	 * @return
+	 */
+	/**
+	 * @AutoLog(value = "更新图片)
+	 */
+	@ApiOperation(value = "更新图片", notes = "更新图片")
+	@GetMapping(value = "/updateImages")
+	public Result<?> updateImages() {
+
+		List<QcSsgqzysytdqkGzv> list = qcSsgqzysytdqkGzvService.list();
+		//初始目录
+		File dir = new File("D:\\images\\temp");
+		Date beginDate = new Date();
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String beginDateStr = simpleDateFormat.format(beginDate);
+		System.out.println("开始时间：" + beginDateStr);
+		printDirByRecursive(dir, 2,list);
+		//searchDir(dir);
+		Date endDate = new Date();
+		String endDateStr = simpleDateFormat.format(endDate);
+		System.out.println("结束时间：" + endDateStr);
+		return Result.OK("成功");
+	}
+
+	/**
+	 * 遍历文件夹（递归）
+	 *
+	 * @param dir
+	 * @param level
+	 */
+	public  void printDirByRecursive(File dir, int level,List<QcSsgqzysytdqkGzv> qcSsgqzysytdqks) {
+		//System.out.println(dir.getAbsolutePath());
+		//输出层次数
+//        for (int i = 0; i < level; i++) {
+//            System.out.print("-");
+//        }
+		//获取这个目录下所有的子文件和子目录的数组。
+		Map map=new HashMap<>();
+		List list = new ArrayList<>();
+		File[] files = dir.listFiles();
+		String a=null;
+		//遍历这个数组，取出每个File对象
+		if (files != null) {
+			for (File f : files) {
+
+				//判断这个File是否是一个文件，是：
+				if (f.isFile() ) {
+
+					a = f.getParentFile().getName();
+//                    System.out.println(f.toString().substring(10));
+					if(a.equals(f.getParentFile().getName())&& !f.getParentFile().getName().equals("desktop.ini")){
+						list.add(f.toString().substring(10));
+					}
+				} else {//否则就是一个目录，继续递归
+					//递归调用
+					printDirByRecursive(f, level,qcSsgqzysytdqks);
+
+				}
+			}
+			if(list.size()>0){
+				for (QcSsgqzysytdqkGzv qcSsgqzysytdqk : qcSsgqzysytdqks) {
+					if(qcSsgqzysytdqk.getDkbh().equals(a)){
+						System.out.println(a);
+						UpdateWrapper<QcSsgqzysytdqkGzv> updateWrapper = new UpdateWrapper<>();
+						updateWrapper.eq("DKBH",a);
+						updateWrapper.set("IMAGES", StringUtils.join(list,","));
+						qcSsgqzysytdqkGzvService.update(null,updateWrapper);
+
+					}
+				}
+
+			}
+
+		}
+	}
+	@ApiOperation(value = "省属国企占有使用土地情况调查-已上报待审核分页列表查询", notes = "省属国企占有使用土地情况调查-已上报待审核分页列表查询")
+	@GetMapping(value = "/listByglyy")
+	public Result<IPage<QcSsgqzysytdqkGzv>> queryPageListBygly2(QcSsgqzysytdqkGzv qcSsgqzysytdqk,String year,
+																@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+																@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+																HttpServletRequest req) {
+		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 + "%");
+		}
+		Page<QcSsgqzysytdqkGzv> page = new Page<QcSsgqzysytdqkGzv>(pageNo, pageSize);
+		IPage<QcSsgqzysytdqkGzv> pageList = qcSsgqzysytdqkGzvService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+
+	@AutoLog(value = "用地单位信息是否可以撤回")
+	@ApiOperation(value = "用地单位信息是否可以撤回", notes = "用地单位信息是否可以撤回")
+	@GetMapping(value = "/sfch")
+	public Result<String> sfch(String id) {
+		QcSsgqzysytdqkGzv qk = new QcSsgqzysytdqkGzv();
+		qk = qcSsgqzysytdqkGzvService.getById(id);
+		if (qk.getSfsb() == 1) {
+			qk.setSfsb(0);
+			qcSsgqzysytdqkGzvService.saveOrUpdate(qk);
+			return Result.OK("撤回成功!");
+		}
+		return Result.error("无法撤回！");
+
+	}
+
+//    @AutoLog(value = "用地单位信息是否审核")
+//    @ApiOperation(value = "用地单位信息是否审核", notes = "用地单位信息是否审核")
+//    @GetMapping(value = "/sfsh")
+//    public Result<String> sfsh(String id) {
+//        QcSsgqzysytdqk qk = new QcSsgqzysytdqk();
+//        qk = qcSsgqzysytdqkService.getById(id);
+//        if (qk.getSfsb() == 1) {
+//            qk.setSfsb(2);
+//            qcSsgqzysytdqkService.saveOrUpdate(qk);
+//        }
+//        return Result.OK("审核中!");
+//    }
+
+	@AutoLog(value = "用地单位信息重新上报")
+	@ApiOperation(value = "用地单位信息重新上报", notes = "用地单位信息重新上报")
+	@GetMapping(value = "/cxsb")
+	public Result<String> cxsb(String id) {
+		QcSsgqzysytdqkGzv qk = new QcSsgqzysytdqkGzv();
+		qk = qcSsgqzysytdqkGzvService.getById(id);
+		if (qk.getSfsb() == 4) {
+			qk.setSfsb(0);
+			qcSsgqzysytdqkGzvService.saveOrUpdate(qk);
+		}
+		return Result.OK("审核中!");
+	}
+
+	@GetMapping(value = "/wjcl")
+	public Result<String> wjcl() throws IOException {
+		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = new QueryWrapper<>();
+		queryWrapper.isNotNull("zbwzxgzmcl");
+		List<QcSsgqzysytdqkGzv> list = qcSsgqzysytdqkGzvService.list(queryWrapper);
+		for (QcSsgqzysytdqkGzv qcSsgqzysytdqk : list) {
+			String wjbh = qcSsgqzysytdqk.getWjbh().trim();
+			String zbwzxgzmcl = qcSsgqzysytdqk.getZbwzxgzmcl();
+			if (zbwzxgzmcl.contains(",")) {
+				String[] split = zbwzxgzmcl.split(",");
+				List<String> strings = Arrays.asList(split);
+				for (int i = 0; i < strings.toArray().length; i++) {
+					String str1 = strings.get(i).substring(0, strings.get(i).indexOf("."));
+					String str2 = strings.get(i).substring(str1.length(), strings.get(i).length());
+					System.out.println(str2);
+					/*File result =new File("D:/opt/result/"+wjbh+i+str2);*/
+					File result = new File("D:/opt/result/" + wjbh + i + str2);
+					if (!result.getParentFile().exists()) {
+						result.getParentFile().mkdirs();
+					}
+					//需要复制的原图的路径+图片名+ .png(这是该图片的格式)
+					/*FileInputStream input = new FileInputStream("D:/upload/"+strings.get(i));*/
+					FileInputStream input = new FileInputStream("D:/upload/" + strings.get(i));
+					FileOutputStream out = new FileOutputStream(result);
+					//一个容量，相当于打水的桶，可以自定义大小
+					byte[] buffer = new byte[100];
+					int hasRead = 0;
+					while ((hasRead = input.read(buffer)) > 0) {
+						//0：表示每次从0开始
+						out.write(buffer, 0, hasRead);
+					}
+					System.out.println(result.getAbsolutePath());
+					input.close();
+					out.close();
+				}
+			} else {
+				String str1 = zbwzxgzmcl.substring(0, zbwzxgzmcl.indexOf("."));
+				String str2 = zbwzxgzmcl.substring(str1.length(), zbwzxgzmcl.length());
+				System.out.println(str2);
+				File result = new File("D:/opt/result/" + wjbh + str2);
+
+				if (!result.getParentFile().exists()) {
+					result.getParentFile().mkdirs();
+				}
+
+				//需要复制的原图的路径+图片名+ .png(这是该图片的格式)
+				FileInputStream input = new FileInputStream("D:/upload/" + zbwzxgzmcl);
+				FileOutputStream out = new FileOutputStream(result);
+				//一个容量，相当于打水的桶，可以自定义大小
+				byte[] buffer = new byte[100];
+				int hasRead = 0;
+				while ((hasRead = input.read(buffer)) > 0) {
+					//0：表示每次从0开始
+					out.write(buffer, 0, hasRead);
+				}
+				input.close();
+				out.close();
+			}
+		}
+
+		return Result.OK(" ");
+	}
+
+
+	@AutoLog(value = "用地单位信息审核结果")
+	@ApiOperation(value = "用地单位信息审核结果", notes = "用地单位信息审核结果")
+	@GetMapping(value = "/wcsh")
+	public Result<String> wcsh(String id) {
+		QcSsgqzysytdqkGzv qk= qcSsgqzysytdqkGzvService.getById(id);
+		if (qk.getShzt() != null) {
+			if (qk.getShzt().equals("通过")) {
+				qk.setSfsb(3);
+			} else if (qk.getShzt().equals("不通过")) {
+				qk.setSfsb(4);
+			}
+			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			String username = sysUser.getUsername();
+			qk.setShren(username);
+			Date date = new Date();
+			qk.setShrq(date);
+			qcSsgqzysytdqkGzvService.saveOrUpdate(qk);
+			return Result.OK("完成审核!");
+		} else {
+			return Result.error("请先进行审核！");
+		}
+	}
+
+	@AutoLog(value = "用地单位信息审核结果")
+	@ApiOperation(value = "用地单位信息审核结果", notes = "用地单位信息审核结果")
+	@GetMapping(value = "/hfysh")
+	public Result<String> hfysh(String id) {
+		QcSsgqzysytdqkGzv qk = new QcSsgqzysytdqkGzv();
+		qk = qcSsgqzysytdqkGzvService.getById(id);
+		qk.setSfsb(3);
+		qk.setShzt("通过");
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		String username = sysUser.getUsername();
+		qk.setShren(username);
+		Date date = new Date();
+		qk.setShrq(date);
+		qcSsgqzysytdqkGzvService.saveOrUpdate(qk);
+		return Result.OK("已经恢复!");
+	}
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param qcSsgqzysytdqk
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "省属国企占有使用土地情况调查-审核正确的分页列表查询")
+	@ApiOperation(value = "省属国企占有使用土地情况调查-审核正确的分页列表查询", notes = "省属国企占有使用土地情况调查-审核正确的分页列表查询")
+	@GetMapping(value = "/list3")
+	public Result<IPage<QcSsgqzysytdqkGzv>> queryPageList3(QcSsgqzysytdqkGzv qcSsgqzysytdqk,
+														   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+														   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+														   HttpServletRequest req) {
+		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
+		Page<QcSsgqzysytdqkGzv> page = new Page<QcSsgqzysytdqkGzv>(pageNo, pageSize);
+		queryWrapper.eq("sfsb", 3);
+		IPage<QcSsgqzysytdqkGzv> pageList = qcSsgqzysytdqkGzvService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 * 查询是否存在用地单位信息
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "省属国企占有使用土地情况调查-添加")
+	@ApiOperation(value = "省属国企占有使用土地情况调查-添加", notes = "省属国企占有使用土地情况调查-添加")
+	@GetMapping(value = "/selectQyxx")
+	public Result<?> selectQyxx() {
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		String username = sysUser.getUsername();
+		String orgCode = sysUser.getOrgCode();
+		//可用 qcSsgqzysytdqkService
+		QcQyxx qcQyxx = qcSsgqzysytdqkGzvService.selectQyxx(username, orgCode);
+		if (qcQyxx.getTyshxybm() != null && qcQyxx.getSfsb() > 0) {
+			return Result.ok(qcQyxx);
+		}
+		return Result.error("请补全用地单位信息并进行上报");
+	}
+
+	/**
+	 * 添加
+	 *
+	 * @param qcSsgqzysytdqk
+	 * @return
+	 */
+	@AutoLog(value = "省属国企占有使用土地情况调查-添加")
+	@ApiOperation(value = "省属国企占有使用土地情况调查-添加", notes = "省属国企占有使用土地情况调查-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody QcSsgqzysytdqkGzv qcSsgqzysytdqk) {
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		QueryWrapper queryWrapper = new QueryWrapper<>();
+		if (sysUser.getOrgCode().substring(0, 3).equals("A04")) {
+			queryWrapper.likeRight("sys_org_code", "A04");
+			queryWrapper.orderByDesc("DKBH");
+			List<QcSsgqzysytdqkGzv> list = qcSsgqzysytdqkGzvService.list(queryWrapper);
+			QcSsgqzysytdqkGzv qcdk = list.get(0);
+			if (StringUtils.isNotEmpty(qcdk.getDkbh())) {
+				qcSsgqzysytdqk.setDkbh("SQ" + (Integer.valueOf(qcdk.getDkbh().substring(qcdk.getDkbh().length() - 4, qcdk.getDkbh().length())) + 1));
+			}
+			//可用qcSsgqzysytdqkService
+			QcQyxx qcQyxx = qcSsgqzysytdqkGzvService.selectQyxx(sysUser.getUsername(), sysUser.getOrgCode());
+			//qcSsgqzysytdqk.setTyshxydm(qcQyxx.getTyshxybm());
+			qcSsgqzysytdqk.setSjdw(qcQyxx.getSjdw()); //上级单位
+			//qcSsgqzysytdqk.setJglx(qcQyxx.getJglx());
+		}
+//        if (qcSsgqzysytdqk.getSjzytdmjdw().equals("1")) {
+//            qcSsgqzysytdqk.setSjzytdmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjzytdmj()));
+//            qcSsgqzysytdqk.setSjzytdmjPf(Zh.MzP(qcSsgqzysytdqk.getSjzytdmj()));
+//            qcSsgqzysytdqk.setSjzytdmjM(qcSsgqzysytdqk.getSjzytdmj());
+//            qcSsgqzysytdqk.setQzpztdmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj()));
+//            qcSsgqzysytdqk.setQzpztdmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj()));
+//            qcSsgqzysytdqk.setQzpztdmjM(qcSsgqzysytdqk.getQzpzsymj());
+//
+//        }
+		//当输入的为公顷时
+//        else if (qcSsgqzysytdqk.getSjzytdmjdw().equals("2")) {
+//            qcSsgqzysytdqk.setSjzytdmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjzytdmj()));
+//            qcSsgqzysytdqk.setSjzytdmjM(Zh.GqZm(qcSsgqzysytdqk.getSjzytdmj()));
+//            qcSsgqzysytdqk.setSjzytdmjGq(qcSsgqzysytdqk.getSjzytdmj());
+//            qcSsgqzysytdqk.setQzpztdmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj()));
+//            qcSsgqzysytdqk.setQzpztdmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj()));
+//            qcSsgqzysytdqk.setQzpztdmjGq(qcSsgqzysytdqk.getQzpzsymj());
+//        } else if (qcSsgqzysytdqk.getSjzytdmjdw().equals("3")) {//当输入的为平方米时
+//            qcSsgqzysytdqk.setSjzytdmjM(Zh.PzM(qcSsgqzysytdqk.getSjzytdmj()));
+//            qcSsgqzysytdqk.setSjzytdmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjzytdmj()));
+//            qcSsgqzysytdqk.setSjzytdmjPf(qcSsgqzysytdqk.getSjzytdmj());
+//            qcSsgqzysytdqk.setQzpztdmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj()));
+//            qcSsgqzysytdqk.setQzpztdmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj()));
+//            qcSsgqzysytdqk.setQzpztdmjPf(qcSsgqzysytdqk.getQzpzsymj());
+//        }
+//        if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("1")) {//当输入的为亩时
+//            qcSsgqzysytdqk.setSjsyjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjsyjzmj()));
+//            qcSsgqzysytdqk.setSjsyjzmjPf(Zh.MzP(qcSsgqzysytdqk.getSjsyjzmj()));
+//            qcSsgqzysytdqk.setSjsyjzmjM(qcSsgqzysytdqk.getSjsyjzmj());
+//            qcSsgqzysytdqk.setQzpzjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj2()));
+//            qcSsgqzysytdqk.setQzpzjzmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj2()));
+//            qcSsgqzysytdqk.setQzpzjzmjM(qcSsgqzysytdqk.getQzpzsymj2());
+//        } else if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("2")) {//当输入的为公顷时
+//            qcSsgqzysytdqk.setSjsyjzmjM(Zh.GqZm(qcSsgqzysytdqk.getSjsyjzmj()));
+//            qcSsgqzysytdqk.setSjsyjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjsyjzmj()));
+//            qcSsgqzysytdqk.setSjsyjzmjGq(qcSsgqzysytdqk.getSjsyjzmj());
+//            qcSsgqzysytdqk.setQzpzjzmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj2()));
+//            qcSsgqzysytdqk.setQzpzjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj2()));
+//            qcSsgqzysytdqk.setQzpzjzmjGq(qcSsgqzysytdqk.getQzpzsymj2());
+//        } else if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("3")) {//当输入的为平方米时
+//            qcSsgqzysytdqk.setSjsyjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjsyjzmj()));
+//            qcSsgqzysytdqk.setSjsyjzmjM(Zh.PzM(qcSsgqzysytdqk.getSjsyjzmj()));
+//            qcSsgqzysytdqk.setSjsyjzmjPf(qcSsgqzysytdqk.getSjsyjzmj());
+//            qcSsgqzysytdqk.setQzpzjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj2()));
+//            qcSsgqzysytdqk.setQzpzjzmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj2()));
+//            qcSsgqzysytdqk.setQzpzjzmjPf(qcSsgqzysytdqk.getQzpzsymj2());
+//        }
+		qcSsgqzysytdqkGzvService.save(qcSsgqzysytdqk);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 * 添加
+	 *
+	 * @param qcSsgqzysytdqk
+	 * @return
+	 */
+	@AutoLog(value = "省直单位有使用土地情况调查-添加")
+	@ApiOperation(value = "省直单位有使用土地情况调查-添加", notes = "省直单位有使用土地情况调查-添加")
+	@PostMapping(value = "/add2")
+	public Result<String> add2(@RequestBody QcSsgqzysytdqkGzv qcSsgqzysytdqk) {
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		QueryWrapper queryWrapper = new QueryWrapper<>();
+		queryWrapper.likeRight("sys_org_code", "A03");
+		queryWrapper.orderByDesc("DKBH");
+		List<QcSsgqzysytdqkGzv> list = qcSsgqzysytdqkGzvService.list(queryWrapper);
+		QcSsgqzysytdqkGzv qcdk = list.get(0);
+		if (StringUtils.isNotEmpty(qcdk.getDkbh())) {
+			qcSsgqzysytdqk.setDkbh("SZ" + (Integer.valueOf(qcdk.getDkbh().substring(qcdk.getDkbh().length() - 4, qcdk.getDkbh().length())) + 1));
+		}
+//        if (StringUtils.isNotEmpty(qcSsgqzysytdqk.getSjzytdmjdw()) && qcSsgqzysytdqk.getSjzytdmjdw().equals("1")) {
+//            qcSsgqzysytdqk.setSjzytdmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjzytdmj()));
+//            qcSsgqzysytdqk.setSjzytdmjPf(Zh.MzP(qcSsgqzysytdqk.getSjzytdmj()));
+//            qcSsgqzysytdqk.setSjzytdmjM(qcSsgqzysytdqk.getSjzytdmj());
+//            qcSsgqzysytdqk.setQzpztdmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj()));
+//            qcSsgqzysytdqk.setQzpztdmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj()));
+//            qcSsgqzysytdqk.setQzpztdmjM(qcSsgqzysytdqk.getQzpzsymj());
+//        } else if (StringUtils.isNotEmpty(qcSsgqzysytdqk.getSjzytdmjdw()) && qcSsgqzysytdqk.getSjzytdmjdw().equals("2")) {//当输入的为公顷时
+//            qcSsgqzysytdqk.setSjzytdmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjzytdmj()));
+//            qcSsgqzysytdqk.setSjzytdmjM(Zh.GqZm(qcSsgqzysytdqk.getSjzytdmj()));
+//            qcSsgqzysytdqk.setSjzytdmjGq(qcSsgqzysytdqk.getSjzytdmj());
+//            qcSsgqzysytdqk.setQzpztdmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj()));
+//            qcSsgqzysytdqk.setQzpztdmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj()));
+//            qcSsgqzysytdqk.setQzpztdmjGq(qcSsgqzysytdqk.getQzpzsymj());
+//        } else if (StringUtils.isNotEmpty(qcSsgqzysytdqk.getSjzytdmjdw()) && qcSsgqzysytdqk.getSjzytdmjdw().equals("3")) {//当输入的为平方米时
+//            qcSsgqzysytdqk.setSjzytdmjM(Zh.PzM(qcSsgqzysytdqk.getSjzytdmj()));
+//            qcSsgqzysytdqk.setSjzytdmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjzytdmj()));
+//            qcSsgqzysytdqk.setSjzytdmjPf(qcSsgqzysytdqk.getSjzytdmj());
+//            qcSsgqzysytdqk.setQzpztdmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj()));
+//            qcSsgqzysytdqk.setQzpztdmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj()));
+//            qcSsgqzysytdqk.setQzpztdmjPf(qcSsgqzysytdqk.getQzpzsymj());
+//        }
+//        if (StringUtils.isNotEmpty(qcSsgqzysytdqk.getSjsyjzmjdw()) && qcSsgqzysytdqk.getSjsyjzmjdw().equals("1")) {//当输入的为亩时
+//            qcSsgqzysytdqk.setSjsyjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjsyjzmj()));
+//            qcSsgqzysytdqk.setSjsyjzmjPf(Zh.MzP(qcSsgqzysytdqk.getSjsyjzmj()));
+//            qcSsgqzysytdqk.setSjsyjzmjM(qcSsgqzysytdqk.getSjsyjzmj());
+//            qcSsgqzysytdqk.setQzpzjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj2()));
+//            qcSsgqzysytdqk.setQzpzjzmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj2()));
+//            qcSsgqzysytdqk.setQzpzjzmjM(qcSsgqzysytdqk.getQzpzsymj2());
+//        } else if (StringUtils.isNotEmpty(qcSsgqzysytdqk.getSjsyjzmjdw()) && qcSsgqzysytdqk.getSjsyjzmjdw().equals("2")) {//当输入的为公顷时
+//            qcSsgqzysytdqk.setSjsyjzmjM(Zh.GqZm(qcSsgqzysytdqk.getSjsyjzmj()));
+//            qcSsgqzysytdqk.setSjsyjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjsyjzmj()));
+//            qcSsgqzysytdqk.setSjsyjzmjGq(qcSsgqzysytdqk.getSjsyjzmj());
+//            qcSsgqzysytdqk.setQzpzjzmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj2()));
+//            qcSsgqzysytdqk.setQzpzjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj2()));
+//            qcSsgqzysytdqk.setQzpzjzmjGq(qcSsgqzysytdqk.getQzpzsymj2());
+//        } else if (StringUtils.isNotEmpty(qcSsgqzysytdqk.getSjsyjzmjdw()) && qcSsgqzysytdqk.getSjsyjzmjdw().equals("3")) {//当输入的为平方米时
+//            qcSsgqzysytdqk.setSjsyjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjsyjzmj()));
+//            qcSsgqzysytdqk.setSjsyjzmjM(Zh.PzM(qcSsgqzysytdqk.getSjsyjzmj()));
+//            qcSsgqzysytdqk.setSjsyjzmjPf(qcSsgqzysytdqk.getSjsyjzmj());
+//            qcSsgqzysytdqk.setQzpzjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj2()));
+//            qcSsgqzysytdqk.setQzpzjzmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj2()));
+//            qcSsgqzysytdqk.setQzpzjzmjPf(qcSsgqzysytdqk.getQzpzsymj2());
+//        }
+		qcSsgqzysytdqkGzvService.save(qcSsgqzysytdqk);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 * 添加
+	 */
+	@AutoLog(value = "查询存在的用户")
+	@ApiOperation(value = "查询存在的用户-添加", notes = "查询存在的用户-添加")
+	@GetMapping(value = "/selectUser")
+	public Result<QcSsgqzysytdqkGzv> selectUser() {
+		QcSsgqzysytdqkGzv qcSsgqzysytdqk = null;
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		String orgCode = sysUser.getOrgCode();
+		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = new QueryWrapper<QcSsgqzysytdqkGzv>();
+		queryWrapper.eq("sys_org_code", orgCode);
+		List<QcSsgqzysytdqkGzv> list = qcSsgqzysytdqkGzvService.list(queryWrapper);
+		if (list.size() > 0) {
+			qcSsgqzysytdqk = list.get(0);
+		}
+
+		return Result.ok(qcSsgqzysytdqk);
+	}
+
+
+	//    /**
+//     * 编辑
+//     *
+//     * @param qcSsgqzysytdqk
+//     * @return
+//     */
+//    @AutoLog(value = "省属国企占有使用土地情况调查-编辑")
+//    @ApiOperation(value = "省属国企占有使用土地情况调查-编辑", notes = "省属国企占有使用土地情况调查-编辑")
+//    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+//    public Result<String> edit(@RequestBody QcSsgqzysytdqk qcSsgqzysytdqk) {
+//        qcSsgqzysytdqkService.updateById(qcSsgqzysytdqk);
+//        //当输入的为亩时
+//        if (qcSsgqzysytdqk.getSfsb() == 0) {
+//            if (qcSsgqzysytdqk.getSjzytdmjdw().equals("1")) {
+//                qcSsgqzysytdqk.setSjzytdmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjzytdmj()));
+//                qcSsgqzysytdqk.setSjzytdmjPf(Zh.MzP(qcSsgqzysytdqk.getSjzytdmj()));
+//                qcSsgqzysytdqk.setSjzytdmjM(qcSsgqzysytdqk.getSjzytdmj());
+//                qcSsgqzysytdqk.setQzpztdmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj()));
+//                qcSsgqzysytdqk.setQzpztdmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj()));
+//                qcSsgqzysytdqk.setQzpztdmjM(qcSsgqzysytdqk.getQzpzsymj());
+//            } else if (qcSsgqzysytdqk.getSjzytdmjdw().equals("2")) {//当输入的为公顷时
+//                qcSsgqzysytdqk.setSjzytdmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjzytdmj()));
+//                qcSsgqzysytdqk.setSjzytdmjM(Zh.GqZm(qcSsgqzysytdqk.getSjzytdmj()));
+//                qcSsgqzysytdqk.setSjzytdmjGq(qcSsgqzysytdqk.getSjzytdmj());
+//                qcSsgqzysytdqk.setQzpztdmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj()));
+//                qcSsgqzysytdqk.setQzpztdmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj()));
+//                qcSsgqzysytdqk.setQzpztdmjGq(qcSsgqzysytdqk.getQzpzsymj());
+//            } else if (qcSsgqzysytdqk.getSjzytdmjdw().equals("3")) {//当输入的为平方米时
+//                qcSsgqzysytdqk.setSjzytdmjM(Zh.PzM(qcSsgqzysytdqk.getSjzytdmj()));
+//                qcSsgqzysytdqk.setSjzytdmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjzytdmj()));
+//                qcSsgqzysytdqk.setSjzytdmjPf(qcSsgqzysytdqk.getSjzytdmj());
+//                qcSsgqzysytdqk.setQzpztdmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj()));
+//                qcSsgqzysytdqk.setQzpztdmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj()));
+//                qcSsgqzysytdqk.setQzpztdmjPf(qcSsgqzysytdqk.getQzpzsymj());
+//            }
+//            if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("1")) {//当输入的为亩时
+//                qcSsgqzysytdqk.setSjsyjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjsyjzmj()));
+//                qcSsgqzysytdqk.setSjsyjzmjPf(Zh.MzP(qcSsgqzysytdqk.getSjsyjzmj()));
+//                qcSsgqzysytdqk.setSjsyjzmjM(qcSsgqzysytdqk.getSjsyjzmj());
+//                qcSsgqzysytdqk.setQzpzjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj2()));
+//                qcSsgqzysytdqk.setQzpzjzmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj2()));
+//                qcSsgqzysytdqk.setQzpzjzmjM(qcSsgqzysytdqk.getQzpzsymj2());
+//            } else if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("2")) {//当输入的为公顷时
+//                qcSsgqzysytdqk.setSjsyjzmjM(Zh.GqZm(qcSsgqzysytdqk.getSjsyjzmj()));
+//                qcSsgqzysytdqk.setSjsyjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjsyjzmj()));
+//                qcSsgqzysytdqk.setSjsyjzmjGq(qcSsgqzysytdqk.getSjsyjzmj());
+//                qcSsgqzysytdqk.setQzpzjzmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj2()));
+//                qcSsgqzysytdqk.setQzpzjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj2()));
+//                qcSsgqzysytdqk.setQzpzjzmjGq(qcSsgqzysytdqk.getQzpzsymj2());
+//            } else if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("3")) {//当输入的为平方米时
+//                qcSsgqzysytdqk.setSjsyjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjsyjzmj()));
+//                qcSsgqzysytdqk.setSjsyjzmjM(Zh.PzM(qcSsgqzysytdqk.getSjsyjzmj()));
+//                qcSsgqzysytdqk.setSjsyjzmjPf(qcSsgqzysytdqk.getSjsyjzmj());
+//                qcSsgqzysytdqk.setQzpzjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj2()));
+//                qcSsgqzysytdqk.setQzpzjzmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj2()));
+//                qcSsgqzysytdqk.setQzpzjzmjPf(qcSsgqzysytdqk.getQzpzsymj2());
+//            }
+//
+//            qcSsgqzysytdqkService.saveOrUpdate(qcSsgqzysytdqk);
+//
+//        } else if (qcSsgqzysytdqk.getSfsb() == 1) {
+//            this.sfsh(qcSsgqzysytdqk.getId());
+//        }
+//        return Result.OK("编辑成功!");
+//    }
+
+
+//    /**
+//     * 编辑
+//     *
+//     * @param qcSsgqzysytdqk
+//     * @return
+//     */
+//    @AutoLog(value = "省属国企占有使用土地情况调查-编辑")
+//    @ApiOperation(value = "省属国企占有使用土地情况调查-编辑", notes = "省属国企占有使用土地情况调查-编辑")
+//    @RequestMapping(value = "/edit1", method = {RequestMethod.PUT, RequestMethod.POST})
+//    public Result<String> edit1(@RequestBody QcSsgqzysytdqk qcSsgqzysytdqk) {
+//        //当输入的为亩时
+//        if (qcSsgqzysytdqk.getSfsb() == 3) {
+//            if (qcSsgqzysytdqk.getSjzytdmjdw().equals("1")) {
+//                qcSsgqzysytdqk.setSjzytdmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjzytdmj()));
+//                qcSsgqzysytdqk.setSjzytdmjPf(Zh.MzP(qcSsgqzysytdqk.getSjzytdmj()));
+//                qcSsgqzysytdqk.setSjzytdmjM(qcSsgqzysytdqk.getSjzytdmj());
+//                qcSsgqzysytdqk.setQzpztdmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj()));
+//                qcSsgqzysytdqk.setQzpztdmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj()));
+//                qcSsgqzysytdqk.setQzpztdmjM(qcSsgqzysytdqk.getQzpzsymj());
+//            } else if (qcSsgqzysytdqk.getSjzytdmjdw().equals("2")) {//当输入的为公顷时
+//                qcSsgqzysytdqk.setSjzytdmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjzytdmj()));
+//                qcSsgqzysytdqk.setSjzytdmjM(Zh.GqZm(qcSsgqzysytdqk.getSjzytdmj()));
+//                qcSsgqzysytdqk.setSjzytdmjGq(qcSsgqzysytdqk.getSjzytdmj());
+//                qcSsgqzysytdqk.setQzpztdmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj()));
+//                qcSsgqzysytdqk.setQzpztdmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj()));
+//                qcSsgqzysytdqk.setQzpztdmjGq(qcSsgqzysytdqk.getQzpzsymj());
+//            } else if (qcSsgqzysytdqk.getSjzytdmjdw().equals("3")) {//当输入的为平方米时
+//                qcSsgqzysytdqk.setSjzytdmjM(Zh.PzM(qcSsgqzysytdqk.getSjzytdmj()));
+//                qcSsgqzysytdqk.setSjzytdmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjzytdmj()));
+//                qcSsgqzysytdqk.setSjzytdmjPf(qcSsgqzysytdqk.getSjzytdmj());
+//                qcSsgqzysytdqk.setQzpztdmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj()));
+//                qcSsgqzysytdqk.setQzpztdmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj()));
+//                qcSsgqzysytdqk.setQzpztdmjPf(qcSsgqzysytdqk.getQzpzsymj());
+//            }
+//            if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("1")) {//当输入的为亩时
+//                qcSsgqzysytdqk.setSjsyjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjsyjzmj()));
+//                qcSsgqzysytdqk.setSjsyjzmjPf(Zh.MzP(qcSsgqzysytdqk.getSjsyjzmj()));
+//                qcSsgqzysytdqk.setSjsyjzmjM(qcSsgqzysytdqk.getSjsyjzmj());
+//                qcSsgqzysytdqk.setQzpzjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj2()));
+//                qcSsgqzysytdqk.setQzpzjzmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj2()));
+//                qcSsgqzysytdqk.setQzpzjzmjM(qcSsgqzysytdqk.getQzpzsymj2());
+//            } else if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("2")) {//当输入的为公顷时
+//                qcSsgqzysytdqk.setSjsyjzmjM(Zh.GqZm(qcSsgqzysytdqk.getSjsyjzmj()));
+//                qcSsgqzysytdqk.setSjsyjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjsyjzmj()));
+//                qcSsgqzysytdqk.setSjsyjzmjGq(qcSsgqzysytdqk.getSjsyjzmj());
+//                qcSsgqzysytdqk.setQzpzjzmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj2()));
+//                qcSsgqzysytdqk.setQzpzjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj2()));
+//                qcSsgqzysytdqk.setQzpzjzmjGq(qcSsgqzysytdqk.getQzpzsymj2());
+//            } else if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("3")) {//当输入的为平方米时
+//                qcSsgqzysytdqk.setSjsyjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjsyjzmj()));
+//                qcSsgqzysytdqk.setSjsyjzmjM(Zh.PzM(qcSsgqzysytdqk.getSjsyjzmj()));
+//                qcSsgqzysytdqk.setSjsyjzmjPf(qcSsgqzysytdqk.getSjsyjzmj());
+//                qcSsgqzysytdqk.setQzpzjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj2()));
+//                qcSsgqzysytdqk.setQzpzjzmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj2()));
+//                qcSsgqzysytdqk.setQzpzjzmjPf(qcSsgqzysytdqk.getQzpzsymj2());
+//            }
+//            qcSsgqzysytdqk.setSfsb(1);
+//            qcSsgqzysytdqkService.saveOrUpdate(qcSsgqzysytdqk);
+//
+//        }
+//
+//
+//
+//        return Result.OK("变更成功!");
+//    }
+
+
+
+
+//    /**
+//     * 分页列表查询
+//     *
+//     * @param qcSsgqzysytdqk
+//     * @param pageNo
+//     * @param pageSize
+//     * @param req
+//     * @return
+//     */
+//    /**
+//     * @AutoLog(value = "省属国企占有使用土地情况调查-分页列表查询")
+//     */
+//    @ApiOperation(value = "省属国企占有使用土地情况调查-分页列表查询", notes = "省属国企占有使用土地情况调查-分页列表查询")
+//    @GetMapping(value = "/list")
+//    @PermissionData(pageComponent = "qcsb/QcSsgqzysytdqkList")
+//    public Result<IPage<QcSsgqzysytdqk>> queryPageList(QcSsgqzysytdqk qcSsgqzysytdqk,
+//                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+//                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+//                                                       HttpServletRequest req) {
+//        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
+//        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
+//        List<Integer> sbzts = new ArrayList<>();
+//        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        System.out.println(sysUser);
+//        if ("gzw".equals(sysUser.getUsername())) {
+//            queryWrapper.likeRight("sys_org_code", "A04");
+//        }
+//        queryWrapper.likeRight("sys_org_code", "A04");
+//        //sbzts.add(0);
+//        //sbzts.add(1);
+//        //queryWrapper.in("sfsb",sbzts);
+//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
+//        return Result.OK(pageList);
+//    }
+//
+//    @AutoLog(value = "用地单位信息是否上报")
+//    @ApiOperation(value = "用地单位信息是否上报", notes = "用地单位信息是否上报")
+//    @GetMapping(value = "/sfsb")
+//    public Result<String> sfshz(String id) {
+//        qcSsgqzysytdqkService.upSfsb(id);
+//        return Result.OK("提交成功!");
+//    }
+
+//    /**
+//     * 分页列表查询
+//     *
+//     * @param qcSsgqzysytdqk
+//     * @param pageNo
+//     * @param pageSize
+//     * @param req
+//     * @return
+//     */
+//    //@AutoLog(value = "省属国企占有使用土地情况调查-已上报待审核分页列表查询")
+//    @ApiOperation(value = "省属国企占有使用土地情况调查-已上报待审核分页列表查询", notes = "省属国企占有使用土地情况调查-已上报待审核分页列表查询")
+//    @GetMapping(value = "/list1")
+//    public Result<IPage<QcSsgqzysytdqk>> queryPageList1(QcSsgqzysytdqk qcSsgqzysytdqk,
+//                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+//                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+//                                                        HttpServletRequest req) {
+//        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
+//        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
+//        List<Integer> sbzts = new ArrayList<>();
+//        sbzts.add(1);
+//        sbzts.add(2);
+//        queryWrapper.in("sfsb", sbzts);
+//        if (qcSsgqzysytdqk.getShzt() != null) {
+//            queryWrapper.eq("shzt", qcSsgqzysytdqk.getShzt());
+//        }
+//        queryWrapper.likeRight("sys_org_code", "A04");
+//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
+//        return Result.OK(pageList);
+//    }
+
+//    @ApiOperation(value = "省属国企占有使用土地情况调查-已上报待审核分页列表查询", notes = "省属国企占有使用土地情况调查-已上报待审核分页列表查询")
+//    @GetMapping(value = "/listBygly")
+//    public Result<IPage<QcSsgqzysytdqk>> queryPageListBygly(QcSsgqzysytdqk qcSsgqzysytdqk,String year,
+//                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+//                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+//                                                            HttpServletRequest req) {
+//        QueryWrapper<QcSsgqzysytdqk> 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<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
+//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
+//        return Result.OK(pageList);
+//    }
+//    /**
+//     * 分页列表查询
+//     *
+//     * @param qcSsgqzysytdqk
+//     * @param pageNo
+//     * @param pageSize
+//     * @param req
+//     * @return
+//     */
+//    //@AutoLog(value = "省属国企占有使用土地情况调查-所有已经审核分页列表查询")
+//    @ApiOperation(value = "省属国企占有使用土地情况调查-所有已经审核分页列表查询", notes = "省属国企占有使用土地情况调查-所有已经审核分页列表查询")
+//    @GetMapping(value = "/list2")
+//    public Result<IPage<QcSsgqzysytdqk>> queryPageList2(QcSsgqzysytdqk qcSsgqzysytdqk,String year,
+//                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+//                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+//                                                        HttpServletRequest req) {
+//        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
+//        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
+//        List<Integer> sbzts = new ArrayList<>();
+//        sbzts.add(3);
+//        sbzts.add(4);
+//        queryWrapper.in("sfsb", sbzts);
+//        queryWrapper.likeRight("sys_org_code", "A04");
+//        if (year!=null){
+//            queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
+//        }
+//        if (qcSsgqzysytdqk.getShzt() != null) {
+//            queryWrapper.eq("shzt", qcSsgqzysytdqk.getShzt());
+//        }
+//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
+//        return Result.OK(pageList);
+//    }
+
+//    /**
+//     * 分页列表查询
+//     *
+//     * @param qcSsgqzysytdqk
+//     * @param pageNo
+//     * @param pageSize
+//     * @param req
+//     * @return
+//     */
+//    //@AutoLog(value = "省属国企占有使用土地情况调查-审核错误退回分页列表查询")
+//    @ApiOperation(value = "省属国企占有使用土地情况调查-审核错误退回分页列表查询", notes = "省属国企占有使用土地情况调查-审核错误退回分页列表查询")
+//    @GetMapping(value = "/list4")
+//    @PermissionData(pageComponent = "qcsb/QcSsgqzysytdqkList4")
+//    public Result<IPage<QcSsgqzysytdqk>> queryPageList4(QcSsgqzysytdqk qcSsgqzysytdqk,
+//                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+//                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+//                                                        HttpServletRequest req) {
+//        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
+//        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
+//        queryWrapper.eq("sfsb", 4);
+//        queryWrapper.likeRight("sys_org_code", "A04");
+//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
+//        return Result.OK(pageList);
+//    }
+
+//    /**
+//     * 分页列表查询
+//     *
+//     * @param qcSsgqzysytdqk
+//     * @param pageNo
+//     * @param pageSize
+//     * @param req
+//     * @return
+//     */
+//    //@AutoLog(value = "省属国企占有使用土地情况调查-分页列表查询")
+//    @ApiOperation(value = "省属国企占有使用土地情况调查-分页列表查询", notes = "机关事业单位占有使用土地情况调查-分页列表查询")
+//    @GetMapping(value = "/list5")
+//    @PermissionData(pageComponent = "sydwqcsb/QcSsgqzysytdqkList")
+//    public Result<IPage<QcSsgqzysytdqk>> queryPageList5(QcSsgqzysytdqk qcSsgqzysytdqk,
+//                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+//                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+//                                                        HttpServletRequest req) {
+//        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
+//        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
+//        List<Integer> sbzts = new ArrayList<>();
+//        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        queryWrapper.likeRight("sys_org_code", "A03");
+//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
+//        return Result.OK(pageList);
+//    }
+
+//    /**
+//     * 分页列表查询
+//     *
+//     * @param qcSsgqzysytdqk
+//     * @param pageNo
+//     * @param pageSize
+//     * @param req
+//     * @return
+//     */
+//    //@AutoLog(value = "省属国企占有使用土地情况调查-已上报待审核分页列表查询")
+//    @ApiOperation(value = "省属国企占有使用土地情况调查-已上报待审核分页列表查询", notes = "省属国企占有使用土地情况调查-已上报待审核分页列表查询")
+//    @GetMapping(value = "/list6")
+//    public Result<IPage<QcSsgqzysytdqk>> queryPageList6(QcSsgqzysytdqk qcSsgqzysytdqk,
+//                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+//                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+//                                                        HttpServletRequest req) {
+//        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
+//        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
+//        List sbzts = new ArrayList<>();
+//        sbzts.add(1);
+//        sbzts.add(2);
+//        queryWrapper.in("sfsb", sbzts);
+//        queryWrapper.likeRight("sys_org_code", "A03");
+//        if (qcSsgqzysytdqk.getShzt() != null) {
+//            queryWrapper.eq("shzt", qcSsgqzysytdqk.getShzt());
+//        }
+//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
+//        return Result.OK(pageList);
+//    }
+
+//    /**
+//     * 分页列表查询
+//     *
+//     * @param qcSsgqzysytdqk
+//     * @param pageNo
+//     * @param pageSize
+//     * @param req
+//     * @return
+//     */
+//    //@AutoLog(value = "省属国企占有使用土地情况调查-所有已经审核分页列表查询")
+//    @ApiOperation(value = "省属国企占有使用土地情况调查-所有已经审核分页列表查询", notes = "省属国企占有使用土地情况调查-所有已经审核分页列表查询")
+//    @GetMapping(value = "/list7")
+//    public Result<IPage<QcSsgqzysytdqk>> queryPageList7(QcSsgqzysytdqk qcSsgqzysytdqk,String year,
+//                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+//                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+//                                                        HttpServletRequest req) {
+//        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
+//        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
+//        List<Integer> sbzts = new ArrayList<>();
+//        sbzts.add(3);
+//        sbzts.add(4);
+//        queryWrapper.in("sfsb", sbzts);
+//        queryWrapper.likeRight("sys_org_code", "A03");
+//        if (year!=null){
+//            queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
+//        }
+//        if (qcSsgqzysytdqk.getShzt() != null) {
+//            queryWrapper.eq("shzt", qcSsgqzysytdqk.getShzt());
+//        }
+//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
+//        return Result.OK(pageList);
+//    }
+
+//    /**
+//     * 分页列表查询
+//     *
+//     * @param qcSsgqzysytdqk
+//     * @param pageNo
+//     * @param pageSize
+//     * @param req
+//     * @return
+//     */
+//    //@AutoLog(value = "省属国企占有使用土地情况调查-所有已经审核分页列表查询")
+//    @ApiOperation(value = "省属国企占有使用土地情况调查-所有已经审核分页列表查询", notes = "省属国企占有使用土地情况调查-所有已经审核分页列表查询")
+//    @GetMapping(value = "/list9")
+//    @PermissionData(pageComponent = "sydwqcsb/QcSsgqzysytdqkList4")
+//
+//    public Result<IPage<QcSsgqzysytdqk>> queryPageList9(QcSsgqzysytdqk qcSsgqzysytdqk,
+//                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+//                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+//                                                        HttpServletRequest req) {
+//        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
+//        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
+//        List<Integer> sbzts = new ArrayList<>();
+//        sbzts.add(4);
+//        queryWrapper.in("sfsb", sbzts);
+//        queryWrapper.likeRight("sys_org_code", "A03");
+//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
+//        return Result.OK(pageList);
+//    }
+
+
+	/* *//**
+	 * 导入shp数据
+	 *
+	 * @param request
+	 * @param response
+	 * @return
+	 *//*
+    @RequestMapping(value = "/importDkxxExcel/{id}")
+    @Transactional(rollbackFor = {Exception.class})
+    public Result<?> importDkxxExcel(HttpServletRequest request, HttpServletResponse response, @PathVariable("id") String id) throws IOException {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Result<QcSsgqzysytdqk> gdXmResult = queryById(id);
+        String dkmc = gdXmResult.getResult().getDk();
+        System.out.println(dkmc);
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            // 获取上传文件对象
+            MultipartFile file = entity.getValue();
+            System.out.println(file.getContentType());
+            if (file.getContentType().equals("text/plain")) {
+                GisUtil zh = new GisUtil();
+                HashMap<String, Object> map = new HashMap<String, Object>();
+                String dkid = UUID.randomUUID().toString().replaceAll("-", "");
+                int i1 = (int) (Math.random() * 100 + 1);
+               *//* String dkmc = "地块" + i1;*//*
+                List list = new ArrayList();
+                List Zblist = new ArrayList();
+                List result=new ArrayList();
+                String encoding = "GBK";
+                try {
+                    InputStreamReader inputStream = new InputStreamReader(file.getInputStream(), encoding);
+                    BufferedReader bufferedReader = new BufferedReader(inputStream);
+                    String strTmp = "";
+                    while ((strTmp = bufferedReader.readLine()) != null) {
+                        list.add(strTmp);
+                    }
+                    for (int i = 0; i < list.size(); i++) {
+                        if (list.get(i).toString().contains("@")) {
+                            for (int j = i + 1; j < list.size(); j++) {
+                                Zblist.add(list.get(j));
+                            }
+                        }
+                    }
+                    String s2="1";
+                    System.out.println(Zblist);
+                    ArrayList<Integer> ordinate =new ArrayList<>();
+                    for (int i = 0; i < Zblist.size(); i++) {
+                        String[] split = String.valueOf(Zblist.get(i)).split(",");
+                        for (int j = 0; j + 4 <= split.length; j = j + 4) {
+                            String s = zh.coordinateTransform(Double.valueOf(split[j + 2]), Double.valueOf(split[j + 3]), 117);
+                            String[] zb = s.split(",");
+                            for (String s1 : zb) {
+                                result.add(s1);
+                            }
+                            if(!split[j+1].equals(s2)){
+                                ordinate.add(i*2+1);//判断圈号开始的位置
+                            }
+                            s2=split[j+1];//标记位
+                        }
+                    }
+                    //组合sdo_elem_info_array
+                    StringBuilder recod =new StringBuilder();
+                    recod.append("1,1003,1");
+                    if(!s2.equals("1")){
+                        for (int i = 0; i <ordinate.size() ; i++) {
+                            recod.append(","+ordinate.get(i).toString()+",2003,1");
+                        }
+                    }
+                    System.out.println(recod);
+                    //判断单个地块首尾是否闭合
+                    for (int i = 0; i <result.size() ; i++) {
+                        String jd = result.get(0).toString();
+                        String wd =result.get(1).toString();
+                        if(!result.get(result.size()-1).equals(wd) && s2.equals("1")){
+                            result.add(jd);
+                            result.add(wd);
+                        }
+                    }
+                   *//* HashMap map1=new HashMap();
+                    map1.put("shape",result);
+                    List<Object> repeatedland = gdDkxxService.Repeatedland(map1);
+                    if(repeatedland.size()>0){
+                        System.out.println(repeatedland);
+                        return Result.error("重复供地");
+                    }*//*
+                    System.out.println(result);
+                    map.put("id",dkid);
+                   *//* map.put("dz_ba_bh",gdXmResult.getResult().getDzBaBh());*//*
+                    map.put("dkmc", dkmc);
+                    map.put("xmid", id);
+                   *//* map.put("xmmc", xmmc);;*//*
+                    map.put("shape", result);
+                    map.put("area",result);
+                    map.put("recod", Arrays.asList(recod.toString().split(",")));
+                    qcSsgqzysytdqkService.insertDkxx(map);
+                   *//* gdDkxxService.getwkt(dkid);*//*
+	 *//*gdDkxxService.insertDkxxFx(id);*//*
+	 *//* gdDkxxService.UpdateSt(id);*//*
+                    return Result.OK("文件导入成功");
+                } catch (Exception E) {
+                    log.error(E.getMessage(), E);
+                    return Result.error("文件导入失败:" + E.getMessage());
+                }
+
+            } else if (file.getContentType().equals("application/vnd.ms-excel")) {
+                int i1 = (int) (Math.random() * 100 + 1);
+                *//*String dkmc = "地块" + i1;*//*
+                String dkid = UUID.randomUUID().toString().replaceAll("-", "");
+                ImportParams params = new ImportParams();
+                params.setTitleRows(0);
+                params.setHeadRows(1);
+                params.setNeedSave(true);
+                ArrayList<Integer> ordinate =new ArrayList<>();
+                String s2="1";
+                try {
+                    GisUtil zh=new GisUtil();
+                    HashMap<String, Object> map = new HashMap<String, Object>();
+                    ArrayList<String> arr=new ArrayList<>();
+                    List<excleTable> list = ExcelImportUtil.importExcel(file.getInputStream(), excleTable.class, params);
+                    for (int i = 0; i < list.size() ; i++)
+                    {
+                        String zb = zh.coordinateTransform(list.get(i).getXcoord(), list.get(i).getYcoord(),117);
+                        String[] split = zb.split(",");
+                        for (int j = 0; j <split.length ; j++) {
+                            arr.add(split[j]);
+                        }
+                        if(!list.get(i).getQh().equals(s2)){
+                            ordinate.add(i*2+1);//判断圈号开始的位置
+                        }
+                        s2=list.get(i).getQh();//标记位
+
+                    }
+                    StringBuilder recod =new StringBuilder(); //创建recod用来存储sdo_elem_info_array();
+                    recod.append("1,1003,1");
+                    if(!s2.equals("1")){
+                        for (int i = 0; i <ordinate.size() ; i++) {
+                            recod.append(","+ordinate.get(i).toString()+",2003,1");
+                        }
+                    }
+                    //判断单个地块首尾是否闭合
+                    for (int i = 0; i <arr.size() ; i++) {
+                        String jd = arr.get(0).toString();
+                        String wd =arr.get(1).toString();
+                        if(!arr.get(arr.size()-1).equals(wd) && s2.equals("1")){
+                            arr.add(jd);
+                            arr.add(wd);
+                        }
+                    }
+                   *//* HashMap map1=new HashMap();
+                    map1.put("shape",arr);
+                    List<Object> repeatedland = gdDkxxService.Repeatedland(map1);
+                    if(repeatedland.size()>0){
+                        System.out.println(repeatedland);
+                        return Result.error("重复供地");
+                    }*//*
+                    map.put("id",dkid);
+                   *//* map.put("dz_ba_bh",gdXmResult.getResult().getDzBaBh());*//*
+                    map.put("dkmc", dkmc);
+                    map.put("xmid", id);
+                   *//* map.put("xmmc", xmmc);*//*
+                    map.put("shape", arr);
+                    map.put("area",arr);
+                    map.put("recod",Arrays.asList(recod.toString().split(",")));
+                    System.out.println(Arrays.asList(recod.toString().split(",")));
+                    qcSsgqzysytdqkService.insertDkxx(map);
+                   *//* gdDkxxService.getwkt(dkid);
+                    gdDkxxService.insertDkxxFx(id);
+                    gdDkxxService.UpdateSt(id);*//*
+                    return Result.OK("EXCEL文件导入成功！");
+                } catch (Exception e) {
+                    log.error(e.getMessage(), e);
+                    return Result.error("文件导入失败:" + e.getMessage());
+                } finally {
+                    try {
+                        file.getInputStream().close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            } else if (file.getContentType().equals("application/x-zip-compressed")) {
+                String fileSavePath = uploadLocal(file, "shpPath");
+                try {
+                    //1、解压上传的zip文件
+                    String upFileName = fileSavePath.substring(fileSavePath.lastIndexOf("/") + 1);
+                    System.out.println(upFileName);
+                    String fileNameNoExt = upFileName.substring(0, upFileName.lastIndexOf('.'));
+                    String unZipPath = upLoadPath + "/shpPath/" + fileNameNoExt;
+                    ZipAndRarTools.unZip(fileSavePath, unZipPath);
+                    //2、获取shp文件及坐标系文件的路径
+                    String shpfilepath = "";
+                    File shpdir = new File(unZipPath);
+                    File[] files = shpdir.listFiles();
+                    for (int i = 0; i < files.length; i++) {
+                        File shpFile = files[i];
+                        String fileName = shpFile.getName();
+                        if (fileName.endsWith(".shp")) {
+                            shpfilepath = unZipPath + "/" + fileName;
+                            continue;
+                        }
+                    }
+                    List<Map<String, Object>> maps = readShpFile(shpfilepath);
+                    List list = new ArrayList();
+                    for (Map<String, Object> map : maps) {
+                        for (String s : map.keySet()) {
+                            if (s.equals("the_geom")) {
+                                list.add(map.get("the_geom").toString());
+                            }
+                        }
+                    }
+                    System.out.println(list);
+                    for (int i = 0; i < list.size(); i++) {
+                        String dkid = UUID.randomUUID().toString().replaceAll("-", "");
+                        int i1 = (int) (Math.random() * 100 + 1);
+                        *//*String dkmc = "地块" + i1;*//*
+                        HashMap<String, Object> map = new HashMap<String, Object>();
+                        int j = list.get(i).toString().lastIndexOf("(");
+                        String substring = list.get(i).toString().substring(j + 1, (list.get(i).toString().length() - 3));
+                        String replace = substring.replace(",", "");
+                        String result = replace.replace(" ", ",");
+                        String[] split1 = result.split(",");
+                        StringBuilder recod =new StringBuilder(); //创建recod用来存储sdo_elem_info_array();
+                        recod.append("1,1003,1");
+                        map.put("id",dkid);
+                        map.put("dkmc", dkmc);
+                       *//* map.put("dzBaBh",gdXmResult.getResult().getDzBaBh());*//*
+                        map.put("xmid", id);
+                       *//* map.put("xmmc", xmmc);*//*
+                        map.put("shape", Arrays.asList(split1));
+                        map.put("area",Arrays.asList(split1));
+                        map.put("recod",Arrays.asList(recod.toString().split(",")));
+                        System.out.println(map);
+                        qcSsgqzysytdqkService.insertDkxx(map);
+                       *//* gdDkxxService.getwkt(dkid);*//*
+	 *//* gdDkxxService.insertDkxxFx(id);*//*
+	 *//* gdDkxxService.UpdateSt(id);*//*
+	 *//*String wkt = zdDkxxbService.SelectLocation(dkid);//wkt*//*
+                    }
+                    return Result.OK("zip压缩包导入成功");
+                } catch (Exception E) {
+                    log.error(E.getMessage(), E);
+                    return Result.error("文件导入失败:" + E.getMessage());
+                }
+            }
+        }
+        return Result.error("文件导入失败！");
+
+    }
+    *//**
+	 * 读取shp文件属性
+	 *
+	 * @param shapePath
+	 * @return
+	 *//*
+    public static List<Map<String, Object>> readShpFile(String shapePath) {
+        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+        ShapefileDataStoreFactory factory = new ShapefileDataStoreFactory();
+        ShapefileDataStore dataStore = null;
+        try {
+            dataStore = (ShapefileDataStore) factory.createDataStore(new File(shapePath).toURI().toURL());
+            if (dataStore != null) {
+//                dataStore.setCharset(Charset.forName("UTF-8"));
+                dataStore.setCharset(ShpCharset.GBK);
+            }
+            SimpleFeatureSource featureSource = dataStore.getFeatureSource();
+            SimpleFeatureIterator itertor = featureSource.getFeatures().features();
+            while (itertor.hasNext()) {
+                SimpleFeature feature = itertor.next();
+                Iterator<Property> itprop = feature.getProperties().iterator();
+                Map<String, Object> map = new HashMap<String, Object>();
+                while (itprop.hasNext()) {
+                    Property prop = itprop.next();
+                    map.put(String.valueOf(prop.getName()), String.valueOf(prop.getValue()));
+                }
+                list.add(map);
+            }
+            itertor.close();
+        } catch (Exception e) {
+            log.error("解析shp异常：", e.getMessage());
+        } finally {
+            if (dataStore != null) {
+                dataStore.dispose();
+            }
+        }
+        return list;
+    }
+
+    *//**
+	 * 本地文件上传
+	 *
+	 * @param mf      文件
+	 * @param bizPath 自定义路径
+	 * @return
+	 *//*
+    private String uploadLocal(MultipartFile mf, String bizPath) {
+        try {
+            String ctxPath = upLoadPath;
+            String fileName = null;
+            File file = new File(ctxPath + File.separator + bizPath + File.separator);
+            if (!file.exists()) {
+                file.mkdirs();// 创建文件根目录
+            }
+            String orgName = mf.getOriginalFilename();// 获取文件名
+            orgName = CommonUtils.getFileName(orgName);
+            if (orgName.indexOf(".") != -1) {
+                fileName = orgName.substring(0, orgName.lastIndexOf(".")) + "_" + System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf("."));
+            } else {
+                fileName = orgName + "_" + System.currentTimeMillis();
+            }
+            String savePath = file.getPath() + File.separator + fileName;
+            File savefile = new File(savePath);
+            FileCopyUtils.copy(mf.getBytes(), savefile);
+            if (savePath.contains("\\")) {
+                savePath = savePath.replace("\\", "/");
+            }
+            return savePath;
+        } catch (IOException e) {
+            log.error(e.getMessage(), e);
+        }
+        return "";
+    }*/
 
 }

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/gzvhb/entity/QcSsgqzysytdqkGzv.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;
@@ -138,7 +139,7 @@ public class QcSsgqzysytdqkGzv implements Serializable {
 	/**其中批准使用面积(㎡)*/
 	@Excel(name = "其中批准使用面积(㎡)", width = 15)
     @ApiModelProperty(value = "其中批准使用面积(㎡)")
-    private BigDecimal qzpzsymj;
+    private java.lang.Double qzpzsymj;
 	/**证载批准用途代码*/
 	@Excel(name = "证载批准用途代码", width = 15)
     @ApiModelProperty(value = "证载批准用途代码")
@@ -193,7 +194,7 @@ public class QcSsgqzysytdqkGzv implements Serializable {
 	/**实际占用土地面积(㎡)*/
 	@Excel(name = "实际占用土地面积(㎡)", width = 15)
     @ApiModelProperty(value = "实际占用土地面积(㎡)")
-    private BigDecimal sjzytdmj;
+    private java.lang.Double sjzytdmj;
 	/**政府规划用途是否与实际用途一致代码*/
 	@Excel(name = "政府规划用途是否与实际用途一致代码", width = 15)
     @ApiModelProperty(value = "政府规划用途是否与实际用途一致代码")
@@ -227,7 +228,7 @@ public class QcSsgqzysytdqkGzv implements Serializable {
 	/**产权变更需补交的土地出让金数额(万元)*/
 	@Excel(name = "产权变更需补交的土地出让金数额(万元)", width = 15)
     @ApiModelProperty(value = "产权变更需补交的土地出让金数额(万元)")
-    private BigDecimal cqbgbjtdje;
+    private java.lang.Double cqbgbjtdje;
 	/**是否需要缴纳土地使用税代码*/
 	@Excel(name = "是否需要缴纳土地使用税代码", width = 15)
     @ApiModelProperty(value = "是否需要缴纳土地使用税代码")
@@ -240,23 +241,23 @@ public class QcSsgqzysytdqkGzv implements Serializable {
 	/**土地使用税缴纳金额*/
 	@Excel(name = "土地使用税缴纳金额", width = 15)
     @ApiModelProperty(value = "土地使用税缴纳金额")
-    private BigDecimal tdsysjnje;
+    private java.lang.Double tdsysjnje;
 	/**土地账面原值(万元)*/
 	@Excel(name = "土地账面原值(万元)", width = 15)
     @ApiModelProperty(value = "土地账面原值(万元)")
-    private BigDecimal tdzmyz;
+    private java.lang.Double tdzmyz;
 	/**土地账面净值(万元)*/
 	@Excel(name = "土地账面净值(万元)", width = 15)
     @ApiModelProperty(value = "土地账面净值(万元)")
-    private BigDecimal tdzmjz;
+    private java.lang.Double tdzmjz;
 	/**土地市场价值(万元)*/
 	@Excel(name = "土地市场价值(万元)", width = 15)
     @ApiModelProperty(value = "土地市场价值(万元)")
-    private BigDecimal tdscjz;
+    private java.lang.Double tdscjz;
 	/**土地租赁价值(万元)*/
 	@Excel(name = "土地租赁价值(万元)", width = 15)
     @ApiModelProperty(value = "土地租赁价值(万元)")
-    private BigDecimal tdzljz;
+    private java.lang.Double tdzljz;
 	/**土地使用现状编码*/
 	@Excel(name = "土地使用现状编码", width = 15)
     @ApiModelProperty(value = "土地使用现状编码")
@@ -343,19 +344,19 @@ public class QcSsgqzysytdqkGzv implements Serializable {
 	/**实际使用建筑面积(㎡)*/
 	@Excel(name = "实际使用建筑面积(㎡)", width = 15)
     @ApiModelProperty(value = "实际使用建筑面积(㎡)")
-    private BigDecimal sjsyjzmj;
+    private java.lang.Double sjsyjzmj;
 	/**其中批准使用面积(㎡)*/
 	@Excel(name = "其中批准使用面积(㎡)", width = 15)
     @ApiModelProperty(value = "其中批准使用面积(㎡)")
-    private BigDecimal qzpzsymj2;
+    private java.lang.Double qzpzsymj2;
 	/**总建筑面积(㎡)*/
 	@Excel(name = "总建筑面积(㎡)", width = 15)
     @ApiModelProperty(value = "总建筑面积(㎡)")
-    private BigDecimal zjzmj;
+    private java.lang.Double zjzmj;
 	/**实际容积率*/
 	@Excel(name = "实际容积率", width = 15)
     @ApiModelProperty(value = "实际容积率")
-    private BigDecimal sjrjl;
+    private java.lang.Double sjrjl;
 	/**权属到期时间*/
 	@Excel(name = "权属到期时间", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -472,7 +473,7 @@ public class QcSsgqzysytdqkGzv implements Serializable {
 	/**主营业务收入*/
 	@Excel(name = "主营业务收入", width = 15)
     @ApiModelProperty(value = "主营业务收入")
-    private BigDecimal yysr;
+    private java.lang.Double yysr;
 	/**就业人数*/
 	@Excel(name = "就业人数", width = 15)
     @ApiModelProperty(value = "就业人数")
@@ -480,11 +481,11 @@ public class QcSsgqzysytdqkGzv implements Serializable {
 	/**净利润*/
 	@Excel(name = "净利润", width = 15)
     @ApiModelProperty(value = "净利润")
-    private BigDecimal lirun;
+    private java.lang.Double lirun;
 	/**营业税金及附加*/
 	@Excel(name = "营业税金及附加", width = 15)
     @ApiModelProperty(value = "营业税金及附加")
-    private BigDecimal yys;
+    private java.lang.Double yys;
 	/**上级单位*/
 	@Excel(name = "上级单位", width = 15)
     @ApiModelProperty(value = "上级单位")
@@ -492,7 +493,7 @@ public class QcSsgqzysytdqkGzv implements Serializable {
 	/**国有资产持股比例*/
 	@Excel(name = "国有资产持股比例", width = 15)
     @ApiModelProperty(value = "国有资产持股比例")
-    private BigDecimal gyzccgbl;
+    private java.lang.Double gyzccgbl;
 	/**企业编码*/
 	@Excel(name = "企业编码", width = 15)
     @ApiModelProperty(value = "企业编码")
@@ -594,4 +595,11 @@ public class QcSsgqzysytdqkGzv implements Serializable {
     @ApiModelProperty(value = "证书类型")
     @Dict(dicCode = "zslx")
     private String zslx;
+
+    //增加,过滤导出条件用
+    /**县区*/
+    @Excel(name = "地市", width = 15,dicCode = "xq")
+    @TableField(exist = false)
+    @ApiModelProperty(value = "县区" )
+    private String xq;
 }

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/gzvhb/mapper/QcSsgqzysytdqkGzvMapper.java

@@ -1,10 +1,12 @@
 package org.jeecg.modules.zrzyqc.gzvhb.mapper;
 
+import java.util.HashMap;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.zrzyqc.gzvhb.entity.QcSsgqzysytdqkGzv;
+import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
 
 /**
  * @Description: qc_ssgqzysytdqk_gzv
@@ -14,4 +16,10 @@ import org.jeecg.modules.zrzyqc.gzvhb.entity.QcSsgqzysytdqkGzv;
  */
 public interface QcSsgqzysytdqkGzvMapper extends BaseMapper<QcSsgqzysytdqkGzv> {
 
+    QcQyxx selectQyxx(@Param("username") String username, @Param("orgCode") String orCode);
+    void upSfsb(String id);
+    void insertDkxx(HashMap<String, Object> map);
+    void upSfsh(String id);
+    void upShjg(String id);
+
 }

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/gzvhb/mapper/xml/QcSsgqzysytdqkGzvMapper.xml

@@ -2,4 +2,32 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.zrzyqc.gzvhb.mapper.QcSsgqzysytdqkGzvMapper">
 
+    <update id="upSfsb" parameterType="String">
+        update qc_ssgqzysytdqkGzv set sfsb=1 where id=#{id} and sfsb=0
+    </update>
+    <select id="selectQyxx" parameterType="String" resultType="org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx">
+        select * from qc_qyxx where create_by=#{username} and sys_org_code=#{orgCode}
+    </select>
+    <insert id="insertDkxx" parameterType="hashmap"  >
+        insert into dkxx(id,dkmc,xmid,shape,area)
+        values (#{id},#{dkmc}, #{xmid},MDSYS.sdo_geometry(2003,'4326',null,sdo_elem_info_array(
+        <foreach collection="recod" item="item" index="index" separator=",">
+            #{item}
+        </foreach>
+        ),sdo_ordinate_array(
+        <foreach collection="shape" item="item" index="index" separator=",">
+            #{item}
+        </foreach>
+        )),
+        round(SDO_GEOM.SDO_AREA(sdo_cs.transform((sdo_geometry(2003,'4326',null,sdo_elem_info_array(
+        <foreach collection="recod" item="item" index="index" separator=",">
+            #{item}
+        </foreach>
+        ),sdo_ordinate_array(
+        <foreach collection="shape" item="item" index="index" separator=",">
+            #{item}
+        </foreach>
+        ))),4527),0.05)*0.0001,4)
+        )
+    </insert>
 </mapper>

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

@@ -2,6 +2,11 @@ package org.jeecg.modules.zrzyqc.gzvhb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.zrzyqc.gzvhb.entity.QcSsgqzysytdqkGzv;
+import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: qc_ssgqzysytdqk_gzv
@@ -11,4 +16,12 @@ import org.jeecg.modules.zrzyqc.gzvhb.entity.QcSsgqzysytdqkGzv;
  */
 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);
+    QcQyxx selectQyxx(String username, String orCode);
+    void insertDkxx(HashMap<String, Object> map);
 }

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

@@ -1,12 +1,20 @@
 package org.jeecg.modules.zrzyqc.gzvhb.service.impl;
 
+import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.common.system.vo.SysCategoryModel;
 import org.jeecg.modules.zrzyqc.gzvhb.entity.QcSsgqzysytdqkGzv;
 import org.jeecg.modules.zrzyqc.gzvhb.mapper.QcSsgqzysytdqkGzvMapper;
 import org.jeecg.modules.zrzyqc.gzvhb.service.IQcSsgqzysytdqkGzvService;
+import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
  * @Description: qc_ssgqzysytdqk_gzv
  * @Author: jeecg-boot
@@ -15,5 +23,159 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvMapper, QcSsgqzysytdqkGzv> implements IQcSsgqzysytdqkGzvService {
+    @Autowired
+    private ISysBaseAPI sysBaseAPI;
+
+    @Autowired
+    private QcSsgqzysytdqkGzvMapper qcSsgqzysytdqkGzvMapper;
+
+    @Override
+    public void upSfsb(String id) {
+        qcSsgqzysytdqkGzvMapper.upSfsb(id);
+    }
+
+    @Override
+    public QcQyxx selectQyxx(String username, String orCode) {
+        return qcSsgqzysytdqkGzvMapper.selectQyxx(username, orCode);
+    }
+
+    @Override
+    public void insertDkxx(HashMap<String, Object> map) {
+        qcSsgqzysytdqkGzvMapper.insertDkxx(map);
+    }
+
+
+    @Override
+    public List<Map<String, Double>> sumList(List<QcSsgqzysytdqkGzv> list) {
+        List<DictModel> xzqh = sysBaseAPI.getDictItems("xq");
+        List<SysCategoryModel> sysCategoryModels = sysBaseAPI.queryAllSysCategory();
+        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, 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);
+        //区划
+        for (QcSsgqzysytdqkGzv qcSsgqzysytdqk : list) {
+            String qh = qcSsgqzysytdqk.getXzqh().substring(0, 4);
+            for (DictModel dictModel : xzqh) {
+                if (qh.equals(dictModel.getValue())) {
+                    qcSsgqzysytdqk.setXzqh(dictModel.getText());
+                }
+            }
+        }
+        //面积亩
+        Map<String, Double> xzqhByAreaCollect = list.stream().collect(
+                Collectors.groupingBy(QcSsgqzysytdqkGzv::getXzqh,
+                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjsyjzmj()*0.0015).orElse(0.0))));
+        result.add(xzqhByAreaCollect);
+
+        Map<String, List<QcSsgqzysytdqkGzv>> syxzCollect = list.stream().collect(
+                Collectors.groupingBy((QcSsgqzysytdqkGzv::getTdsyxz)));
+        for (String s : syxzCollect.keySet()) {
+            syxzMap.put(s, (double) syxzCollect.get(s).size());
+        }
+        result.add(syxzMap);
+
+        Map<String, Double> syxzByAreaCollect = list.stream().collect(
+                Collectors.groupingBy(QcSsgqzysytdqkGzv::getSyqsyfs,
+                        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,
+                        Collectors.counting())
+        );
+        for (String s : wjlxCollect.keySet()) {
+            wjbhMap.put(s, (double) wjlxCollect.get(s));
+        }
+        result.add(wjbhMap);
+
+        for (QcSsgqzysytdqkGzv qcSsgqzysytdqk : list) {
+            for (SysCategoryModel sysCategoryModel : sysCategoryModels) {
+                if (qcSsgqzysytdqk.getSjyt().equals(sysCategoryModel.getId())) {
+                    qcSsgqzysytdqk.setSjyt(sysCategoryModel.getName());
+                }
+            }
+        }
+        Map<String, List<QcSsgqzysytdqkGzv>> collectBysjyt = list.stream().collect(Collectors.groupingBy((QcSsgqzysytdqkGzv::getSjyt)));
+        for (String s : collectBysjyt.keySet()) {
+            sjytMap.put(s, (double) collectBysjyt.get(s).size());
+        }
+        result.add(sjytMap);
+        return result;
+    }
+
+    @Override
+    public List<Map<String, Double>> sumListBysz(List<QcSsgqzysytdqkGzv> list) {
+        List<DictModel> xzqh = sysBaseAPI.getDictItems("xq");
+        List<SysCategoryModel> sysCategoryModels = sysBaseAPI.queryAllSysCategory();
+        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, 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);
+
+        for (QcSsgqzysytdqkGzv qcSsgqzysytdqk : list) {
+            String qh = qcSsgqzysytdqk.getXzqh().substring(0, 4);
+            for (DictModel dictModel : xzqh) {
+                if (qh.equals(dictModel.getValue())) {
+                    qcSsgqzysytdqk.setXzqh(dictModel.getText());
+                }
+            }
+        }
+        //前端进行了亩的处理转换
+        Map<String, Double> xzqhByAreaCollect = list.stream().collect(
+                Collectors.groupingBy(QcSsgqzysytdqkGzv::getXzqh,
+                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjzytdmj()).orElse(0.0))));
+        result.add(xzqhByAreaCollect);
+
+        Map<String, List<QcSsgqzysytdqkGzv>> syxzCollect = list.stream().collect(
+                Collectors.groupingBy((QcSsgqzysytdqkGzv::getTdsyxz)));
+        for (String s : syxzCollect.keySet()) {
+            syxzMap.put(s, (double) syxzCollect.get(s).size());
+        }
+        result.add(syxzMap);
+
+        Map<String, Double> syxzByAreaCollect = list.stream().collect(
+                Collectors.groupingBy(QcSsgqzysytdqkGzv::getSyqsyfs,
+                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjzytdmj()).orElse(0.0))));
+        result.add(syxzByAreaCollect);
+
+        Map<String, Long> wjlxCollect = list.stream().collect(
+                Collectors.groupingBy(QcSsgqzysytdqkGzv::getZslx,
+                        Collectors.counting())
+        );
+        for (String s : wjlxCollect.keySet()) {
+            wjbhMap.put(s, (double) wjlxCollect.get(s));
+        }
+        result.add(wjbhMap);
+
+        for (QcSsgqzysytdqkGzv qcSsgqzysytdqk : list) {
+            for (SysCategoryModel sysCategoryModel : sysCategoryModels) {
+                if (qcSsgqzysytdqk.getPzyt().equals(sysCategoryModel.getId())) {
+                    qcSsgqzysytdqk.setPzyt(sysCategoryModel.getName());
+                }
+            }
+        }
+        Map<String, List<QcSsgqzysytdqkGzv>> collectBysjyt = list.stream().collect(Collectors.groupingBy((QcSsgqzysytdqkGzv::getPzyt)));
+        for (String s : collectBysjyt.keySet()) {
+            sjytMap.put(s, (double) collectBysjyt.get(s).size());
+        }
+        result.add(sjytMap);
+        return result;
+    }
 
 }

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/controller/QcSsgqzysytdqkController.java

@@ -1,1684 +0,0 @@
-package org.jeecg.modules.zrzyqc.qcsb.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.aspect.annotation.PermissionData;
-import org.jeecg.common.system.api.ISysBaseAPI;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.zrzyqc.gzvhb.entity.QcSsgqzysytdqkGzv;
-import org.jeecg.modules.zrzyqc.qcsb.Untils.Zh;
-import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqk;
-import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqk1;
-import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqkzc;
-import org.jeecg.modules.zrzyqc.qcsb.service.IQcSsgqzysytdqk1Service;
-import org.jeecg.modules.zrzyqc.qcsb.service.IQcSsgqzysytdqkService;
-import org.jeecg.modules.zrzyqc.qcsb.service.IQcSsgqzysytdqkzcService;
-import org.jeecg.modules.zrzyqc.qcsb.vo.QcSsgqzysytdqkVo;
-import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
-import org.jeecg.modules.zrzyqc.qyxx.service.IQcQyxxService;
-import org.jeecg.config.GuavaRateLimiter.RateLimiter;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-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;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-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;
-
-/**
- * @Description: 省属国企占有使用土地情况调查
- * @Author: jeecg-boot
- * @Date: 2022-06-29
- * @Version: V1.0
- */
-@Api(tags = "省属国企占有使用土地情况调查")
-@RestController
-@RequestMapping("/qcsb/qcSsgqzysytdqk")
-@Slf4j
-public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQcSsgqzysytdqkService> {
-    @Autowired
-    private IQcSsgqzysytdqkService qcSsgqzysytdqkService;
-    @Value("${jeecg.path.upload}")
-    private String upLoadPath;
-    @Autowired
-    private IQcSsgqzysytdqk1Service qcSsgqzysytdqkService1;
-    @Autowired
-    private IQcSsgqzysytdqkzcService qcSsgqzysytdqkzcService;
-    @Autowired
-    private IQcQyxxService qcQyxxService;
-    @Autowired
-    private ISysBaseAPI sysBaseAPI;
-
-    @ApiOperation(value = "省属国企占有使用土地情况调查-已上报待审核分页列表查询", notes = "省属国企占有使用土地情况调查-已上报待审核分页列表查询")
-    @GetMapping(value = "/listByglyy")
-    public Result<IPage<QcSsgqzysytdqk>> queryPageListBygly2(QcSsgqzysytdqk qcSsgqzysytdqk,String year,
-                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                             HttpServletRequest req) {
-        QueryWrapper<QcSsgqzysytdqk> 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 + "%");
-        }
-        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
-        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
-        return Result.OK(pageList);
-    }
-
-
-    @AutoLog(value = "用地单位信息是否可以撤回")
-    @ApiOperation(value = "用地单位信息是否可以撤回", notes = "用地单位信息是否可以撤回")
-    @GetMapping(value = "/sfch")
-    public Result<String> sfch(String id) {
-        QcSsgqzysytdqk qk = new QcSsgqzysytdqk();
-        qk = qcSsgqzysytdqkService.getById(id);
-        if (qk.getSfsb() == 1) {
-            qk.setSfsb(0);
-            qcSsgqzysytdqkService.saveOrUpdate(qk);
-            return Result.OK("撤回成功!");
-        }
-        return Result.error("无法撤回！");
-
-    }
-
-//    @AutoLog(value = "用地单位信息是否审核")
-//    @ApiOperation(value = "用地单位信息是否审核", notes = "用地单位信息是否审核")
-//    @GetMapping(value = "/sfsh")
-//    public Result<String> sfsh(String id) {
-//        QcSsgqzysytdqk qk = new QcSsgqzysytdqk();
-//        qk = qcSsgqzysytdqkService.getById(id);
-//        if (qk.getSfsb() == 1) {
-//            qk.setSfsb(2);
-//            qcSsgqzysytdqkService.saveOrUpdate(qk);
-//        }
-//        return Result.OK("审核中!");
-//    }
-
-    @AutoLog(value = "用地单位信息重新上报")
-    @ApiOperation(value = "用地单位信息重新上报", notes = "用地单位信息重新上报")
-    @GetMapping(value = "/cxsb")
-    public Result<String> cxsb(String id) {
-        QcSsgqzysytdqk qk = new QcSsgqzysytdqk();
-        qk = qcSsgqzysytdqkService.getById(id);
-        if (qk.getSfsb() == 4) {
-            qk.setSfsb(0);
-            qcSsgqzysytdqkService.saveOrUpdate(qk);
-        }
-        return Result.OK("审核中!");
-    }
-
-    @GetMapping(value = "/wjcl")
-    public Result<String> wjcl() throws IOException {
-        QueryWrapper<QcSsgqzysytdqk> queryWrapper = new QueryWrapper<>();
-        queryWrapper.isNotNull("zbwzxgzmcl");
-        List<QcSsgqzysytdqk> list = qcSsgqzysytdqkService.list(queryWrapper);
-        for (QcSsgqzysytdqk qcSsgqzysytdqk : list) {
-            String wjbh = qcSsgqzysytdqk.getWjbh().trim();
-            String zbwzxgzmcl = qcSsgqzysytdqk.getZbwzxgzmcl();
-            if (zbwzxgzmcl.contains(",")) {
-                String[] split = zbwzxgzmcl.split(",");
-                List<String> strings = Arrays.asList(split);
-                for (int i = 0; i < strings.toArray().length; i++) {
-                    String str1 = strings.get(i).substring(0, strings.get(i).indexOf("."));
-                    String str2 = strings.get(i).substring(str1.length(), strings.get(i).length());
-                    System.out.println(str2);
-                    /*File result =new File("D:/opt/result/"+wjbh+i+str2);*/
-                    File result = new File("D:/opt/result/" + wjbh + i + str2);
-
-                    if (!result.getParentFile().exists()) {
-                        result.getParentFile().mkdirs();
-                    }
-                    //需要复制的原图的路径+图片名+ .png(这是该图片的格式)
-                    /*FileInputStream input = new FileInputStream("D:/upload/"+strings.get(i));*/
-                    FileInputStream input = new FileInputStream("D:/upload/" + strings.get(i));
-                    FileOutputStream out = new FileOutputStream(result);
-                    //一个容量，相当于打水的桶，可以自定义大小
-                    byte[] buffer = new byte[100];
-                    int hasRead = 0;
-                    while ((hasRead = input.read(buffer)) > 0) {
-                        //0：表示每次从0开始
-                        out.write(buffer, 0, hasRead);
-                    }
-                    System.out.println(result.getAbsolutePath());
-                    input.close();
-                    out.close();
-                }
-
-
-            } else {
-                String str1 = zbwzxgzmcl.substring(0, zbwzxgzmcl.indexOf("."));
-                String str2 = zbwzxgzmcl.substring(str1.length(), zbwzxgzmcl.length());
-                System.out.println(str2);
-                File result = new File("D:/opt/result/" + wjbh + str2);
-
-                if (!result.getParentFile().exists()) {
-                    result.getParentFile().mkdirs();
-                }
-
-                //需要复制的原图的路径+图片名+ .png(这是该图片的格式)
-                FileInputStream input = new FileInputStream("D:/upload/" + zbwzxgzmcl);
-                FileOutputStream out = new FileOutputStream(result);
-                //一个容量，相当于打水的桶，可以自定义大小
-                byte[] buffer = new byte[100];
-                int hasRead = 0;
-                while ((hasRead = input.read(buffer)) > 0) {
-                    //0：表示每次从0开始
-                    out.write(buffer, 0, hasRead);
-                }
-                System.out.println(result.getAbsolutePath());
-                input.close();
-                out.close();
-            }
-        }
-
-        return Result.OK(" ");
-    }
-
-
-    @AutoLog(value = "用地单位信息审核结果")
-    @ApiOperation(value = "用地单位信息审核结果", notes = "用地单位信息审核结果")
-    @GetMapping(value = "/wcsh")
-    public Result<String> wcsh(String id) {
-        QcSsgqzysytdqk qk = new QcSsgqzysytdqk();
-        qk = qcSsgqzysytdqkService.getById(id);
-        if (qk.getShzt() != null) {
-            if (qk.getShzt().equals("通过")) {
-                qk.setSfsb(3);
-            } else if (qk.getShzt().equals("不通过")) {
-                qk.setSfsb(4);
-            }
-            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            String username = sysUser.getUsername();
-            qk.setShren(username);
-            Date date = new Date();
-            qk.setShrq(date);
-            qcSsgqzysytdqkService.saveOrUpdate(qk);
-            return Result.OK("完成审核!");
-        } else {
-            return Result.error("请先进行审核！");
-        }
-    }
-
-    @AutoLog(value = "用地单位信息审核结果")
-    @ApiOperation(value = "用地单位信息审核结果", notes = "用地单位信息审核结果")
-    @GetMapping(value = "/hfysh")
-    public Result<String> hfysh(String id) {
-        QcSsgqzysytdqk qk = new QcSsgqzysytdqk();
-        qk = qcSsgqzysytdqkService.getById(id);
-        qk.setSfsb(3);
-        qk.setShzt("通过");
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String username = sysUser.getUsername();
-        qk.setShren(username);
-        Date date = new Date();
-        qk.setShrq(date);
-        qcSsgqzysytdqkService.saveOrUpdate(qk);
-        return Result.OK("已经恢复!");
-    }
-
-    /**
-     * 分页列表查询
-     *
-     * @param qcSsgqzysytdqk
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    //@AutoLog(value = "省属国企占有使用土地情况调查-审核正确的分页列表查询")
-    @ApiOperation(value = "省属国企占有使用土地情况调查-审核正确的分页列表查询", notes = "省属国企占有使用土地情况调查-审核正确的分页列表查询")
-    @GetMapping(value = "/list3")
-    public Result<IPage<QcSsgqzysytdqk>> queryPageList3(QcSsgqzysytdqk qcSsgqzysytdqk,
-                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                        HttpServletRequest req) {
-        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
-        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
-        queryWrapper.eq("sfsb", 3);
-        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
-        return Result.OK(pageList);
-    }
-
-    /**
-     * 查询是否存在用地单位信息
-     *
-     * @return
-     */
-    @AutoLog(value = "省属国企占有使用土地情况调查-添加")
-    @ApiOperation(value = "省属国企占有使用土地情况调查-添加", notes = "省属国企占有使用土地情况调查-添加")
-    @GetMapping(value = "/selectQyxx")
-    public Result<?> selectQyxx() {
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String username = sysUser.getUsername();
-        String orgCode = sysUser.getOrgCode();
-        QcQyxx qcQyxx = qcSsgqzysytdqkService.selectQyxx(username, orgCode);
-        if (qcQyxx.getTyshxybm() != null && qcQyxx.getSfsb() > 0) {
-            return Result.ok(qcQyxx);
-        }
-        return Result.error("请补全用地单位信息并进行上报");
-
-    }
-
-    /**
-     * 添加
-     *
-     * @param qcSsgqzysytdqk
-     * @return
-     */
-    @AutoLog(value = "省属国企占有使用土地情况调查-添加")
-    @ApiOperation(value = "省属国企占有使用土地情况调查-添加", notes = "省属国企占有使用土地情况调查-添加")
-    @PostMapping(value = "/add")
-    public Result<String> add(@RequestBody QcSsgqzysytdqk qcSsgqzysytdqk) {
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        QueryWrapper queryWrapper = new QueryWrapper<>();
-        if (sysUser.getOrgCode().substring(0, 3).equals("A04")) {
-            queryWrapper.likeRight("sys_org_code", "A04");
-            queryWrapper.orderByDesc("DKBH");
-            List<QcSsgqzysytdqk> list = qcSsgqzysytdqkService.list(queryWrapper);
-            QcSsgqzysytdqk qcdk = list.get(0);
-            if (StringUtils.isNotEmpty(qcdk.getDkbh())) {
-                qcSsgqzysytdqk.setDkbh("SQ" + (Integer.valueOf(qcdk.getDkbh().substring(qcdk.getDkbh().length() - 4, qcdk.getDkbh().length())) + 1));
-            }
-            QcQyxx qcQyxx = qcSsgqzysytdqkService.selectQyxx(sysUser.getUsername(), sysUser.getOrgCode());
-            qcSsgqzysytdqk.setTyshxydm(qcQyxx.getTyshxybm());
-            qcSsgqzysytdqk.setSjdw(qcQyxx.getSjdw());
-            qcSsgqzysytdqk.setJglx(qcQyxx.getJglx());
-        }
-        if (qcSsgqzysytdqk.getSjzytdmjdw().equals("1")) {
-            qcSsgqzysytdqk.setSjzytdmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjzytdmj()));
-            qcSsgqzysytdqk.setSjzytdmjPf(Zh.MzP(qcSsgqzysytdqk.getSjzytdmj()));
-            qcSsgqzysytdqk.setSjzytdmjM(qcSsgqzysytdqk.getSjzytdmj());
-            qcSsgqzysytdqk.setQzpztdmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj()));
-            qcSsgqzysytdqk.setQzpztdmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj()));
-            qcSsgqzysytdqk.setQzpztdmjM(qcSsgqzysytdqk.getQzpzsymj());
-
-        }//当输入的为公顷时
-        else if (qcSsgqzysytdqk.getSjzytdmjdw().equals("2")) {
-            qcSsgqzysytdqk.setSjzytdmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjzytdmj()));
-            qcSsgqzysytdqk.setSjzytdmjM(Zh.GqZm(qcSsgqzysytdqk.getSjzytdmj()));
-            qcSsgqzysytdqk.setSjzytdmjGq(qcSsgqzysytdqk.getSjzytdmj());
-            qcSsgqzysytdqk.setQzpztdmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj()));
-            qcSsgqzysytdqk.setQzpztdmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj()));
-            qcSsgqzysytdqk.setQzpztdmjGq(qcSsgqzysytdqk.getQzpzsymj());
-        } else if (qcSsgqzysytdqk.getSjzytdmjdw().equals("3")) {//当输入的为平方米时
-            qcSsgqzysytdqk.setSjzytdmjM(Zh.PzM(qcSsgqzysytdqk.getSjzytdmj()));
-            qcSsgqzysytdqk.setSjzytdmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjzytdmj()));
-            qcSsgqzysytdqk.setSjzytdmjPf(qcSsgqzysytdqk.getSjzytdmj());
-            qcSsgqzysytdqk.setQzpztdmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj()));
-            qcSsgqzysytdqk.setQzpztdmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj()));
-            qcSsgqzysytdqk.setQzpztdmjPf(qcSsgqzysytdqk.getQzpzsymj());
-        }
-        if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("1")) {//当输入的为亩时
-            qcSsgqzysytdqk.setSjsyjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjsyjzmj()));
-            qcSsgqzysytdqk.setSjsyjzmjPf(Zh.MzP(qcSsgqzysytdqk.getSjsyjzmj()));
-            qcSsgqzysytdqk.setSjsyjzmjM(qcSsgqzysytdqk.getSjsyjzmj());
-            qcSsgqzysytdqk.setQzpzjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj2()));
-            qcSsgqzysytdqk.setQzpzjzmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj2()));
-            qcSsgqzysytdqk.setQzpzjzmjM(qcSsgqzysytdqk.getQzpzsymj2());
-        } else if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("2")) {//当输入的为公顷时
-            qcSsgqzysytdqk.setSjsyjzmjM(Zh.GqZm(qcSsgqzysytdqk.getSjsyjzmj()));
-            qcSsgqzysytdqk.setSjsyjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjsyjzmj()));
-            qcSsgqzysytdqk.setSjsyjzmjGq(qcSsgqzysytdqk.getSjsyjzmj());
-            qcSsgqzysytdqk.setQzpzjzmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj2()));
-            qcSsgqzysytdqk.setQzpzjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj2()));
-            qcSsgqzysytdqk.setQzpzjzmjGq(qcSsgqzysytdqk.getQzpzsymj2());
-        } else if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("3")) {//当输入的为平方米时
-            qcSsgqzysytdqk.setSjsyjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjsyjzmj()));
-            qcSsgqzysytdqk.setSjsyjzmjM(Zh.PzM(qcSsgqzysytdqk.getSjsyjzmj()));
-            qcSsgqzysytdqk.setSjsyjzmjPf(qcSsgqzysytdqk.getSjsyjzmj());
-            qcSsgqzysytdqk.setQzpzjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj2()));
-            qcSsgqzysytdqk.setQzpzjzmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj2()));
-            qcSsgqzysytdqk.setQzpzjzmjPf(qcSsgqzysytdqk.getQzpzsymj2());
-        }
-        qcSsgqzysytdqkService.save(qcSsgqzysytdqk);
-        return Result.OK("添加成功！");
-    }
-
-    /**
-     * 添加
-     *
-     * @param qcSsgqzysytdqk
-     * @return
-     */
-    @AutoLog(value = "省直单位有使用土地情况调查-添加")
-    @ApiOperation(value = "省直单位有使用土地情况调查-添加", notes = "省直单位有使用土地情况调查-添加")
-    @PostMapping(value = "/add2")
-    public Result<String> add2(@RequestBody QcSsgqzysytdqk qcSsgqzysytdqk) {
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        QueryWrapper queryWrapper = new QueryWrapper<>();
-        queryWrapper.likeRight("sys_org_code", "A03");
-        queryWrapper.orderByDesc("DKBH");
-        List<QcSsgqzysytdqk> list = qcSsgqzysytdqkService.list(queryWrapper);
-        QcSsgqzysytdqk qcdk = list.get(0);
-        if (StringUtils.isNotEmpty(qcdk.getDkbh())) {
-            qcSsgqzysytdqk.setDkbh("SZ" + (Integer.valueOf(qcdk.getDkbh().substring(qcdk.getDkbh().length() - 4, qcdk.getDkbh().length())) + 1));
-        }
-        if (StringUtils.isNotEmpty(qcSsgqzysytdqk.getSjzytdmjdw()) && qcSsgqzysytdqk.getSjzytdmjdw().equals("1")) {
-            qcSsgqzysytdqk.setSjzytdmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjzytdmj()));
-            qcSsgqzysytdqk.setSjzytdmjPf(Zh.MzP(qcSsgqzysytdqk.getSjzytdmj()));
-            qcSsgqzysytdqk.setSjzytdmjM(qcSsgqzysytdqk.getSjzytdmj());
-            qcSsgqzysytdqk.setQzpztdmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj()));
-            qcSsgqzysytdqk.setQzpztdmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj()));
-            qcSsgqzysytdqk.setQzpztdmjM(qcSsgqzysytdqk.getQzpzsymj());
-        } else if (StringUtils.isNotEmpty(qcSsgqzysytdqk.getSjzytdmjdw()) && qcSsgqzysytdqk.getSjzytdmjdw().equals("2")) {//当输入的为公顷时
-            qcSsgqzysytdqk.setSjzytdmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjzytdmj()));
-            qcSsgqzysytdqk.setSjzytdmjM(Zh.GqZm(qcSsgqzysytdqk.getSjzytdmj()));
-            qcSsgqzysytdqk.setSjzytdmjGq(qcSsgqzysytdqk.getSjzytdmj());
-            qcSsgqzysytdqk.setQzpztdmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj()));
-            qcSsgqzysytdqk.setQzpztdmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj()));
-            qcSsgqzysytdqk.setQzpztdmjGq(qcSsgqzysytdqk.getQzpzsymj());
-        } else if (StringUtils.isNotEmpty(qcSsgqzysytdqk.getSjzytdmjdw()) && qcSsgqzysytdqk.getSjzytdmjdw().equals("3")) {//当输入的为平方米时
-            qcSsgqzysytdqk.setSjzytdmjM(Zh.PzM(qcSsgqzysytdqk.getSjzytdmj()));
-            qcSsgqzysytdqk.setSjzytdmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjzytdmj()));
-            qcSsgqzysytdqk.setSjzytdmjPf(qcSsgqzysytdqk.getSjzytdmj());
-            qcSsgqzysytdqk.setQzpztdmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj()));
-            qcSsgqzysytdqk.setQzpztdmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj()));
-            qcSsgqzysytdqk.setQzpztdmjPf(qcSsgqzysytdqk.getQzpzsymj());
-        }
-        if (StringUtils.isNotEmpty(qcSsgqzysytdqk.getSjsyjzmjdw()) && qcSsgqzysytdqk.getSjsyjzmjdw().equals("1")) {//当输入的为亩时
-            qcSsgqzysytdqk.setSjsyjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjsyjzmj()));
-            qcSsgqzysytdqk.setSjsyjzmjPf(Zh.MzP(qcSsgqzysytdqk.getSjsyjzmj()));
-            qcSsgqzysytdqk.setSjsyjzmjM(qcSsgqzysytdqk.getSjsyjzmj());
-            qcSsgqzysytdqk.setQzpzjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj2()));
-            qcSsgqzysytdqk.setQzpzjzmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj2()));
-            qcSsgqzysytdqk.setQzpzjzmjM(qcSsgqzysytdqk.getQzpzsymj2());
-        } else if (StringUtils.isNotEmpty(qcSsgqzysytdqk.getSjsyjzmjdw()) && qcSsgqzysytdqk.getSjsyjzmjdw().equals("2")) {//当输入的为公顷时
-            qcSsgqzysytdqk.setSjsyjzmjM(Zh.GqZm(qcSsgqzysytdqk.getSjsyjzmj()));
-            qcSsgqzysytdqk.setSjsyjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjsyjzmj()));
-            qcSsgqzysytdqk.setSjsyjzmjGq(qcSsgqzysytdqk.getSjsyjzmj());
-            qcSsgqzysytdqk.setQzpzjzmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj2()));
-            qcSsgqzysytdqk.setQzpzjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj2()));
-            qcSsgqzysytdqk.setQzpzjzmjGq(qcSsgqzysytdqk.getQzpzsymj2());
-        } else if (StringUtils.isNotEmpty(qcSsgqzysytdqk.getSjsyjzmjdw()) && qcSsgqzysytdqk.getSjsyjzmjdw().equals("3")) {//当输入的为平方米时
-            qcSsgqzysytdqk.setSjsyjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjsyjzmj()));
-            qcSsgqzysytdqk.setSjsyjzmjM(Zh.PzM(qcSsgqzysytdqk.getSjsyjzmj()));
-            qcSsgqzysytdqk.setSjsyjzmjPf(qcSsgqzysytdqk.getSjsyjzmj());
-            qcSsgqzysytdqk.setQzpzjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj2()));
-            qcSsgqzysytdqk.setQzpzjzmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj2()));
-            qcSsgqzysytdqk.setQzpzjzmjPf(qcSsgqzysytdqk.getQzpzsymj2());
-        }
-        qcSsgqzysytdqkService.save(qcSsgqzysytdqk);
-        return Result.OK("添加成功！");
-    }
-
-    /**
-     * 添加
-     */
-    @AutoLog(value = "查询存在的用户")
-    @ApiOperation(value = "查询存在的用户-添加", notes = "查询存在的用户-添加")
-    @GetMapping(value = "/selectUser")
-    public Result<QcSsgqzysytdqk> selectUser() {
-        QcSsgqzysytdqk qcSsgqzysytdqk = null;
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String orgCode = sysUser.getOrgCode();
-        QueryWrapper<QcSsgqzysytdqk> queryWrapper = new QueryWrapper<QcSsgqzysytdqk>();
-        queryWrapper.eq("sys_org_code", orgCode);
-        List<QcSsgqzysytdqk> list = qcSsgqzysytdqkService.list(queryWrapper);
-        if (list.size() > 0) {
-            qcSsgqzysytdqk = list.get(0);
-        }
-
-        return Result.ok(qcSsgqzysytdqk);
-    }
-
-//    /**
-//     * 编辑
-//     *
-//     * @param qcSsgqzysytdqk
-//     * @return
-//     */
-//    @AutoLog(value = "省属国企占有使用土地情况调查-编辑")
-//    @ApiOperation(value = "省属国企占有使用土地情况调查-编辑", notes = "省属国企占有使用土地情况调查-编辑")
-//    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
-//    public Result<String> edit(@RequestBody QcSsgqzysytdqk qcSsgqzysytdqk) {
-//        qcSsgqzysytdqkService.updateById(qcSsgqzysytdqk);
-//        //当输入的为亩时
-//        if (qcSsgqzysytdqk.getSfsb() == 0) {
-//            if (qcSsgqzysytdqk.getSjzytdmjdw().equals("1")) {
-//                qcSsgqzysytdqk.setSjzytdmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjzytdmj()));
-//                qcSsgqzysytdqk.setSjzytdmjPf(Zh.MzP(qcSsgqzysytdqk.getSjzytdmj()));
-//                qcSsgqzysytdqk.setSjzytdmjM(qcSsgqzysytdqk.getSjzytdmj());
-//                qcSsgqzysytdqk.setQzpztdmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj()));
-//                qcSsgqzysytdqk.setQzpztdmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj()));
-//                qcSsgqzysytdqk.setQzpztdmjM(qcSsgqzysytdqk.getQzpzsymj());
-//            } else if (qcSsgqzysytdqk.getSjzytdmjdw().equals("2")) {//当输入的为公顷时
-//                qcSsgqzysytdqk.setSjzytdmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjzytdmj()));
-//                qcSsgqzysytdqk.setSjzytdmjM(Zh.GqZm(qcSsgqzysytdqk.getSjzytdmj()));
-//                qcSsgqzysytdqk.setSjzytdmjGq(qcSsgqzysytdqk.getSjzytdmj());
-//                qcSsgqzysytdqk.setQzpztdmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj()));
-//                qcSsgqzysytdqk.setQzpztdmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj()));
-//                qcSsgqzysytdqk.setQzpztdmjGq(qcSsgqzysytdqk.getQzpzsymj());
-//            } else if (qcSsgqzysytdqk.getSjzytdmjdw().equals("3")) {//当输入的为平方米时
-//                qcSsgqzysytdqk.setSjzytdmjM(Zh.PzM(qcSsgqzysytdqk.getSjzytdmj()));
-//                qcSsgqzysytdqk.setSjzytdmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjzytdmj()));
-//                qcSsgqzysytdqk.setSjzytdmjPf(qcSsgqzysytdqk.getSjzytdmj());
-//                qcSsgqzysytdqk.setQzpztdmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj()));
-//                qcSsgqzysytdqk.setQzpztdmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj()));
-//                qcSsgqzysytdqk.setQzpztdmjPf(qcSsgqzysytdqk.getQzpzsymj());
-//            }
-//            if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("1")) {//当输入的为亩时
-//                qcSsgqzysytdqk.setSjsyjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjsyjzmj()));
-//                qcSsgqzysytdqk.setSjsyjzmjPf(Zh.MzP(qcSsgqzysytdqk.getSjsyjzmj()));
-//                qcSsgqzysytdqk.setSjsyjzmjM(qcSsgqzysytdqk.getSjsyjzmj());
-//                qcSsgqzysytdqk.setQzpzjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj2()));
-//                qcSsgqzysytdqk.setQzpzjzmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj2()));
-//                qcSsgqzysytdqk.setQzpzjzmjM(qcSsgqzysytdqk.getQzpzsymj2());
-//            } else if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("2")) {//当输入的为公顷时
-//                qcSsgqzysytdqk.setSjsyjzmjM(Zh.GqZm(qcSsgqzysytdqk.getSjsyjzmj()));
-//                qcSsgqzysytdqk.setSjsyjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjsyjzmj()));
-//                qcSsgqzysytdqk.setSjsyjzmjGq(qcSsgqzysytdqk.getSjsyjzmj());
-//                qcSsgqzysytdqk.setQzpzjzmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj2()));
-//                qcSsgqzysytdqk.setQzpzjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj2()));
-//                qcSsgqzysytdqk.setQzpzjzmjGq(qcSsgqzysytdqk.getQzpzsymj2());
-//            } else if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("3")) {//当输入的为平方米时
-//                qcSsgqzysytdqk.setSjsyjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjsyjzmj()));
-//                qcSsgqzysytdqk.setSjsyjzmjM(Zh.PzM(qcSsgqzysytdqk.getSjsyjzmj()));
-//                qcSsgqzysytdqk.setSjsyjzmjPf(qcSsgqzysytdqk.getSjsyjzmj());
-//                qcSsgqzysytdqk.setQzpzjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj2()));
-//                qcSsgqzysytdqk.setQzpzjzmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj2()));
-//                qcSsgqzysytdqk.setQzpzjzmjPf(qcSsgqzysytdqk.getQzpzsymj2());
-//            }
-//
-//            qcSsgqzysytdqkService.saveOrUpdate(qcSsgqzysytdqk);
-//
-//        } else if (qcSsgqzysytdqk.getSfsb() == 1) {
-//            this.sfsh(qcSsgqzysytdqk.getId());
-//        }
-//        return Result.OK("编辑成功!");
-//    }
-
-
-//    /**
-//     * 编辑
-//     *
-//     * @param qcSsgqzysytdqk
-//     * @return
-//     */
-//    @AutoLog(value = "省属国企占有使用土地情况调查-编辑")
-//    @ApiOperation(value = "省属国企占有使用土地情况调查-编辑", notes = "省属国企占有使用土地情况调查-编辑")
-//    @RequestMapping(value = "/edit1", method = {RequestMethod.PUT, RequestMethod.POST})
-//    public Result<String> edit1(@RequestBody QcSsgqzysytdqk qcSsgqzysytdqk) {
-//        //当输入的为亩时
-//        if (qcSsgqzysytdqk.getSfsb() == 3) {
-//            if (qcSsgqzysytdqk.getSjzytdmjdw().equals("1")) {
-//                qcSsgqzysytdqk.setSjzytdmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjzytdmj()));
-//                qcSsgqzysytdqk.setSjzytdmjPf(Zh.MzP(qcSsgqzysytdqk.getSjzytdmj()));
-//                qcSsgqzysytdqk.setSjzytdmjM(qcSsgqzysytdqk.getSjzytdmj());
-//                qcSsgqzysytdqk.setQzpztdmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj()));
-//                qcSsgqzysytdqk.setQzpztdmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj()));
-//                qcSsgqzysytdqk.setQzpztdmjM(qcSsgqzysytdqk.getQzpzsymj());
-//            } else if (qcSsgqzysytdqk.getSjzytdmjdw().equals("2")) {//当输入的为公顷时
-//                qcSsgqzysytdqk.setSjzytdmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjzytdmj()));
-//                qcSsgqzysytdqk.setSjzytdmjM(Zh.GqZm(qcSsgqzysytdqk.getSjzytdmj()));
-//                qcSsgqzysytdqk.setSjzytdmjGq(qcSsgqzysytdqk.getSjzytdmj());
-//                qcSsgqzysytdqk.setQzpztdmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj()));
-//                qcSsgqzysytdqk.setQzpztdmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj()));
-//                qcSsgqzysytdqk.setQzpztdmjGq(qcSsgqzysytdqk.getQzpzsymj());
-//            } else if (qcSsgqzysytdqk.getSjzytdmjdw().equals("3")) {//当输入的为平方米时
-//                qcSsgqzysytdqk.setSjzytdmjM(Zh.PzM(qcSsgqzysytdqk.getSjzytdmj()));
-//                qcSsgqzysytdqk.setSjzytdmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjzytdmj()));
-//                qcSsgqzysytdqk.setSjzytdmjPf(qcSsgqzysytdqk.getSjzytdmj());
-//                qcSsgqzysytdqk.setQzpztdmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj()));
-//                qcSsgqzysytdqk.setQzpztdmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj()));
-//                qcSsgqzysytdqk.setQzpztdmjPf(qcSsgqzysytdqk.getQzpzsymj());
-//            }
-//            if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("1")) {//当输入的为亩时
-//                qcSsgqzysytdqk.setSjsyjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjsyjzmj()));
-//                qcSsgqzysytdqk.setSjsyjzmjPf(Zh.MzP(qcSsgqzysytdqk.getSjsyjzmj()));
-//                qcSsgqzysytdqk.setSjsyjzmjM(qcSsgqzysytdqk.getSjsyjzmj());
-//                qcSsgqzysytdqk.setQzpzjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj2()));
-//                qcSsgqzysytdqk.setQzpzjzmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj2()));
-//                qcSsgqzysytdqk.setQzpzjzmjM(qcSsgqzysytdqk.getQzpzsymj2());
-//            } else if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("2")) {//当输入的为公顷时
-//                qcSsgqzysytdqk.setSjsyjzmjM(Zh.GqZm(qcSsgqzysytdqk.getSjsyjzmj()));
-//                qcSsgqzysytdqk.setSjsyjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjsyjzmj()));
-//                qcSsgqzysytdqk.setSjsyjzmjGq(qcSsgqzysytdqk.getSjsyjzmj());
-//                qcSsgqzysytdqk.setQzpzjzmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj2()));
-//                qcSsgqzysytdqk.setQzpzjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj2()));
-//                qcSsgqzysytdqk.setQzpzjzmjGq(qcSsgqzysytdqk.getQzpzsymj2());
-//            } else if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("3")) {//当输入的为平方米时
-//                qcSsgqzysytdqk.setSjsyjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjsyjzmj()));
-//                qcSsgqzysytdqk.setSjsyjzmjM(Zh.PzM(qcSsgqzysytdqk.getSjsyjzmj()));
-//                qcSsgqzysytdqk.setSjsyjzmjPf(qcSsgqzysytdqk.getSjsyjzmj());
-//                qcSsgqzysytdqk.setQzpzjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj2()));
-//                qcSsgqzysytdqk.setQzpzjzmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj2()));
-//                qcSsgqzysytdqk.setQzpzjzmjPf(qcSsgqzysytdqk.getQzpzsymj2());
-//            }
-//            qcSsgqzysytdqk.setSfsb(1);
-//            qcSsgqzysytdqkService.saveOrUpdate(qcSsgqzysytdqk);
-//
-//        }
-//
-//
-//
-//        return Result.OK("变更成功!");
-//    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "省属国企占有使用土地情况调查-通过id删除")
-    @ApiOperation(value = "省属国企占有使用土地情况调查-通过id删除", notes = "省属国企占有使用土地情况调查-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
-        qcSsgqzysytdqkService.removeById(id);
-        return Result.OK("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "省属国企占有使用土地情况调查-批量删除")
-    @ApiOperation(value = "省属国企占有使用土地情况调查-批量删除", notes = "省属国企占有使用土地情况调查-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        this.qcSsgqzysytdqkService.removeByIds(Arrays.asList(ids.split(",")));
-        return Result.OK("批量删除成功!");
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    //@AutoLog(value = "省属国企占有使用土地情况调查-通过id查询")
-    @ApiOperation(value = "省属国企占有使用土地情况调查-通过id查询", notes = "省属国企占有使用土地情况调查-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<QcSsgqzysytdqk> queryById(@RequestParam(name = "id", required = true) String id) {
-        QcSsgqzysytdqk qcSsgqzysytdqk = qcSsgqzysytdqkService.getById(id);
-        if (qcSsgqzysytdqk == null) {
-            return Result.error("未找到对应数据");
-        }
-        return Result.OK(qcSsgqzysytdqk);
-    }
-
-    //@AutoLog(value = "省属国企占有使用土地情况调查-通过id查询")
-    @RateLimiter(permitRate = 0.5, timeout = 5, timeUnit = TimeUnit.SECONDS)
-    @GetMapping(value = "/test")
-    public Result<QcSsgqzysytdqk> test() {
-
-        return Result.OK("请求成功");
-    }
-
-    /**
-     * 导出excel 省属企业
-     *
-     * @param request
-     * @param qcSsgqzysytdqk
-     */
-    @RateLimiter(permitRate = 0.1, timeout = 5, timeUnit = TimeUnit.SECONDS)
-    @RequestMapping(value = "/exportXls")
-    @PermissionData(pageComponent = "qcsb/QcSsgqzysytdqkList")
-    public ModelAndView exportXls(HttpServletRequest request, QcSsgqzysytdqk qcSsgqzysytdqk,String year) {
-
-        // Step.1 组装查询条件
-        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, request.getParameterMap());
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
-        queryWrapper.likeRight("sys_org_code", "A04");
-        if (year!=null){
-            queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
-        }
-        // Step.2 获取导出数据
-        List<QcSsgqzysytdqk> pageList = service.list(queryWrapper);
-        List<QcSsgqzysytdqk> exportList = null;
-
-        // 过滤选中数据
-        String selections = request.getParameter("selections");
-        if (oConvertUtils.isNotEmpty(selections)) {
-            List<String> selectionList = Arrays.asList(selections.split(","));
-            exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
-        } else {
-            exportList = pageList;
-        }
-        for (QcSsgqzysytdqk ssqydk : exportList) {
-            ssqydk.setXq(ssqydk.getXzqh().substring(0, 4));
-        }
-        // Step.3 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        //此处设置的filename无效 ,前端会重更新设置一下
-        mv.addObject(NormalExcelConstants.FILE_NAME, "省属国企占有使用土地情况调查");
-        mv.addObject(NormalExcelConstants.CLASS, QcSsgqzysytdqk.class);
-        //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
-        ExportParams exportParams = new ExportParams("省属国企占有使用土地情况调查" + "报表", "导出人:" + sysUser.getRealname(), "省属国企占有使用土地情况调查");
-        exportParams.setImageBasePath(upLoadPath);
-        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
-        mv.addObject(NormalExcelConstants.PARAMS, exportParams);
-        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
-        return mv;
-    }
-
-    /**
-     * 事业单位导出excel
-     *
-     * @param request
-     * @param qcSsgqzysytdqk
-     */
-    @RequestMapping(value = "/exportXls2")
-    @PermissionData(pageComponent = "sydwqcsb/QcSsgqzysytdqkList")
-    public ModelAndView exportXls2(HttpServletRequest request, QcSsgqzysytdqk1 qcSsgqzysytdqk) {
-        // Step.1 组装查询条件
-        QueryWrapper<QcSsgqzysytdqk1> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, request.getParameterMap());
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
-        // Step.2 获取导出数据
-        List<QcSsgqzysytdqk1> pageList = qcSsgqzysytdqkService1.list(queryWrapper.likeRight("sys_org_code", "A03"));
-        List<QcSsgqzysytdqk1> exportList = null;
-
-        // 过滤选中数据
-        String selections = request.getParameter("selections");
-        if (oConvertUtils.isNotEmpty(selections)) {
-            List<String> selectionList = Arrays.asList(selections.split(","));
-            exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
-        } else {
-            exportList = pageList;
-        }
-        for (QcSsgqzysytdqk1 qcSsgqzysytdqk1 : exportList) {
-            QueryWrapper<QcQyxx> qcQyxxQueryWrapper = new QueryWrapper<>();
-            QcQyxx createBy = qcQyxxService.getOne(qcQyxxQueryWrapper.eq("create_by", qcSsgqzysytdqk1.getCreateBy()));
-            qcSsgqzysytdqk1.setZgdw(createBy.getSjdw());
-        }
-        // Step.3 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        //此处设置的filename无效 ,前端会重更新设置一下
-        mv.addObject(NormalExcelConstants.FILE_NAME, "用地单位占有使用土地情况调查");
-        mv.addObject(NormalExcelConstants.CLASS, QcSsgqzysytdqk1.class);
-        //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
-        ExportParams exportParams = new ExportParams("用地单位占有使用土地情况调查" + "报表", "导出人:" + sysUser.getRealname(), "用地单位占有使用土地情况调查");
-        exportParams.setImageBasePath(upLoadPath);
-        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
-        mv.addObject(NormalExcelConstants.PARAMS, exportParams);
-        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
-        return mv;
-    }
-
-    /**
-     * 事业单位地块管理导出excel
-     *
-     * @param request
-     * @param qcSsgqzysytdqk
-     */
-    @RequestMapping(value = "/exportXls3")
-    @PermissionData(pageComponent = "sydwqcsb/QcSsgqzysytdqkList")
-    public ModelAndView exportXls3(HttpServletRequest request, QcSsgqzysytdqk1 qcSsgqzysytdqk,String year) {
-        // Step.1 组装查询条件
-        QueryWrapper<QcSsgqzysytdqk1> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, request.getParameterMap());
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
-        // Step.2 获取导出数据
-        queryWrapper.likeRight("sys_org_code", "A03");
-        queryWrapper.gt("sfsb", 0);
-        if (year!=null){
-            queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
-        }
-        List<QcSsgqzysytdqk1> pageList = qcSsgqzysytdqkService1.list(queryWrapper);
-        List<QcSsgqzysytdqk1> exportList = null;
-
-        // 过滤选中数据
-        String selections = request.getParameter("selections");
-        if (oConvertUtils.isNotEmpty(selections)) {
-            List<String> selectionList = Arrays.asList(selections.split(","));
-            exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
-        } else {
-            exportList = pageList;
-        }
-        QueryWrapper<QcQyxx> qcQyxxQueryWrapper = new QueryWrapper<>();
-        List<QcQyxx> list = qcQyxxService.list(qcQyxxQueryWrapper.likeRight("sys_org_code", "A03"));
-        for (QcSsgqzysytdqk1 qcSsgqzysytdqk1 : exportList) {
-            qcSsgqzysytdqk1.setXq(qcSsgqzysytdqk1.getXzqh().substring(0, 4));
-            for (QcQyxx qcQyxx : list) {
-                if (qcQyxx.getCreateBy().equals(qcSsgqzysytdqk1.getCreateBy())) {
-                    qcSsgqzysytdqk1.setZgdw(qcQyxx.getSjdw());
-                    break;
-                }
-            }
-        }
-        // Step.3 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        //此处设置的filename无效 ,前端会重更新设置一下
-        mv.addObject(NormalExcelConstants.FILE_NAME, "用地单位占有使用土地情况调查");
-        mv.addObject(NormalExcelConstants.CLASS, QcSsgqzysytdqk1.class);
-        //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
-        ExportParams exportParams = new ExportParams("用地单位占有使用土地情况调查" + "报表", "导出人:" + sysUser.getRealname(), "用地单位占有使用土地情况调查");
-        exportParams.setImageBasePath(upLoadPath);
-        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
-        mv.addObject(NormalExcelConstants.PARAMS, exportParams);
-        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
-        return mv;
-    }
-
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, QcSsgqzysytdqk.class);
-    }
-
-    /**
-     * 事业单位通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel2", method = RequestMethod.POST)
-    public Result<?> importExcel2(HttpServletRequest request, HttpServletResponse response) {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-            // 获取上传文件对象
-            MultipartFile file = entity.getValue();
-            ImportParams params = new ImportParams();
-            params.setTitleRows(2);
-            params.setHeadRows(1);
-            params.setNeedSave(true);
-            try {
-                List<QcSsgqzysytdqk1> list = ExcelImportUtil.importExcel(file.getInputStream(), QcSsgqzysytdqk1.class, params);
-                //update-begin-author:taoyan date:20190528 for:批量插入数据
-                for (QcSsgqzysytdqk1 qcSsgqzysytdqk : list) {
-                    qcSsgqzysytdqk.setSysOrgCode(sysUser.getOrgCode());
-                    qcSsgqzysytdqk.setSfsb(0);
-                    qcSsgqzysytdqk.setSjsyjzmjdw("平方米");
-                    qcSsgqzysytdqk.setSjzytdmjdw("平方米");
-                }
-                long start = System.currentTimeMillis();
-                qcSsgqzysytdqkService1.saveBatch(list);
-                //400条 saveBatch消耗时间1592毫秒  循环插入消耗时间1947毫秒
-                //1200条  saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
-                log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
-                //update-end-author:taoyan date:20190528 for:批量插入数据
-                return Result.ok("文件导入成功！数据行数：" + list.size());
-            } catch (Exception e) {
-                //update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示
-                String msg = e.getMessage();
-                log.error(msg, e);
-                if (msg != null && msg.indexOf("Duplicate entry") >= 0) {
-                    return Result.error("文件导入失败:有重复数据！");
-                } else {
-                    return Result.error("文件导入失败:" + e.getMessage());
-                }
-                //update-end-author:taoyan date:20211124 for: 导入数据重复增加提示
-            } finally {
-                try {
-                    file.getInputStream().close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return Result.error("文件导入失败！");
-    }
-    /*----------------------------------------------暂存开始------------------------------------------------*/
-
-    /**
-     * 添加
-     *
-     * @param qcSsgqzysytdqk
-     * @return
-     */
-    @AutoLog(value = "省直单位占有使用土地情况调查-添加暂存")
-    @ApiOperation(value = "省直单位占有使用土地情况调查-添加暂存", notes = "省直单位占有使用土地情况调查-添加暂存")
-    @PostMapping(value = "/addStag")
-    public Result<String> addStag(@RequestBody QcSsgqzysytdqkzc qcSsgqzysytdqk) {
-        qcSsgqzysytdqkzcService.save(qcSsgqzysytdqk);
-        return Result.OK("暂存成功！请到草稿箱查看！");
-    }
-
-    /**
-     * 草稿箱分页列表查询
-     *
-     * @param qcSsgqzysytdqk
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    //@AutoLog(value = "省属国企占有使用土地情况调查-分页列表查询")
-    @ApiOperation(value = "草稿箱分页列表查询", notes = "草稿箱分页列表查询")
-    @GetMapping(value = "/listStag")
-    @PermissionData(pageComponent = "sydwqcsb/listStag")
-    public Result<IPage<QcSsgqzysytdqkzc>> queryPagelistStag(QcSsgqzysytdqkzc qcSsgqzysytdqk,
-                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                             HttpServletRequest req) {
-        QueryWrapper<QcSsgqzysytdqkzc> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
-        Page<QcSsgqzysytdqkzc> page = new Page<QcSsgqzysytdqkzc>(pageNo, pageSize);
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.eq("sys_org_code", sysUser.getOrgCode());
-        IPage<QcSsgqzysytdqkzc> pageList = qcSsgqzysytdqkzcService.page(page, queryWrapper);
-        return Result.OK(pageList);
-    }
-
-    /**
-     * 暂存
-     *
-     * @param qcSsgqzysytdqk
-     * @return
-     */
-    @AutoLog(value = "暂存")
-    @ApiOperation(value = "暂存", notes = "暂存")
-    @RequestMapping(value = "/editStag", method = {RequestMethod.PUT, RequestMethod.POST})
-    public Result<String> editStag(@RequestBody QcSsgqzysytdqkzc qcSsgqzysytdqk) {
-        qcSsgqzysytdqkzcService.saveOrUpdate(qcSsgqzysytdqk);
-        return Result.OK("暂存成功!");
-    }
-
-    /**
-     * 将地块暂存转为填报列表
-     *
-     * @param qcSsgqzysytdqk
-     * @return
-     */
-    @AutoLog(value = "将地块暂存转为填报列表-编辑")
-    @ApiOperation(value = "将地块暂存转为填报列表-编辑", notes = "将地块暂存转为填报列表-编辑")
-    @RequestMapping(value = "/addToList", method = {RequestMethod.PUT, RequestMethod.POST})
-    public Result<String> addToList(@RequestBody QcSsgqzysytdqkzc qcSsgqzysytdqk) {
-        QcSsgqzysytdqk result = new QcSsgqzysytdqk();
-        BeanUtils.copyProperties(qcSsgqzysytdqk, result);
-        this.add2(result);
-        qcSsgqzysytdqkzcService.removeById(qcSsgqzysytdqk.getId());
-        return Result.OK("转入成功!");
-    }
-
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "省属国企占有使用土地情况调查-通过id删除")
-    @ApiOperation(value = "省属国企占有使用土地情况调查-通过id删除", notes = "省属国企占有使用土地情况调查-通过id删除")
-    @DeleteMapping(value = "/deleteStag")
-    public Result<String> deleteStag(@RequestParam(name = "id", required = true) String id) {
-        qcSsgqzysytdqkzcService.removeById(id);
-        return Result.OK("删除成功!");
-    }
-
-    /**
-     * 通过DKBH进行查询
-     *
-     * @param DKBH
-     * @return
-     */
-    @AutoLog(value = "省属国企占有使用土地情况调查-通过DKBH进行查询")
-    @ApiOperation(value = "省属国企占有使用土地情况调查-通过DKBH进行查询", notes = "省属国企占有使用土地情况调查-通过DKBH进行查询")
-    @GetMapping(value = "/queryBydkbh")
-    public Result<QcSsgqzysytdqkVo> queryBydkbh(@RequestParam(name = "DKBH", required = true) String DKBH) {
-        LambdaQueryWrapper<QcSsgqzysytdqk> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(QcSsgqzysytdqk::getDkbh, DKBH);
-        QcSsgqzysytdqk one = qcSsgqzysytdqkService.getOne(queryWrapper);
-        QcSsgqzysytdqkVo Vo = new QcSsgqzysytdqkVo();
-        BeanUtils.copyProperties(one, Vo);
-        if (ENTERPRISE_CODE_SQ.equals(one.getSysOrgCode().substring(0, 3))) {
-            List<String> strings = sysBaseAPI.loadCategoryDictItem(one.getSjyt());
-            Vo.setSjytText(strings.get(0));
-        } else if (ENTERPRISE_CODE_SZ.equals(one.getSysOrgCode().substring(0, 3))) {
-            Vo.setSjytText(one.getSjyt());
-        }
-        return Result.OK("查询成功!", Vo);
-    }
-
-    /**
-     * 列表查询图表统计
-     *
-     * @param qcSsgqzysytdqk
-     * @param req
-     * @return
-     */
-    /**
-     * @AutoLog(value = "省属列表数据查询)
-     */
-    @ApiOperation(value = "省属列表数据查询", notes = "省属列表数据查询")
-    @GetMapping(value = "/sumList")
-    @PermissionData(pageComponent = "qcsb/QcSsgqzysytdqkList")
-    public Result<?> queryPageList(QcSsgqzysytdqk qcSsgqzysytdqk,
-                                   HttpServletRequest req) {
-        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
-        queryWrapper.likeRight("sys_org_code", "A04");
-        queryWrapper.gt("sfsb", 0);
-        List<QcSsgqzysytdqk> list = qcSsgqzysytdqkService.list(queryWrapper);
-        List<Map<String, Double>> map = qcSsgqzysytdqkService.sumList(list);
-        return Result.OK(map);
-    }
-
-    /**
-     * 列表查询图表统计
-     *
-     * @param qcSsgqzysytdqk
-     * @param req
-     * @return
-     */
-    /**
-     * @AutoLog(value = "省直列表数据查询)
-     */
-    @ApiOperation(value = "省直列表数据查询", notes = "省直列表数据查询")
-    @GetMapping(value = "/sumListBysz")
-    public Result<?> sumListBysz(QcSsgqzysytdqk qcSsgqzysytdqk,
-                                 HttpServletRequest req) {
-        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
-        queryWrapper.likeRight("sys_org_code", "A03");
-        queryWrapper.gt("sfsb", 0);
-        List<QcSsgqzysytdqk> list = qcSsgqzysytdqkService.list(queryWrapper);
-        List<Map<String, Double>> map = qcSsgqzysytdqkService.sumListBysz(list);
-        return Result.OK(map);
-    }
-
-
-    /**
-     * 更新图片
-     *
-     * @param qcSsgqzysytdqk
-     * @param req
-     * @return
-     */
-    /**
-     * @AutoLog(value = "更新图片)
-     */
-    @ApiOperation(value = "更新图片", notes = "更新图片")
-    @GetMapping(value = "/updateImages")
-    public Result<?> updateImages() {
-
-        List<QcSsgqzysytdqk> list = qcSsgqzysytdqkService.list();
-
-        //初始目录
-        File dir = new File("D:\\images\\temp");
-        Date beginDate = new Date();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String beginDateStr = simpleDateFormat.format(beginDate);
-        System.out.println("开始时间：" + beginDateStr);
-        printDirByRecursive(dir, 2,list);
-        //searchDir(dir);
-        Date endDate = new Date();
-        String endDateStr = simpleDateFormat.format(endDate);
-        System.out.println("结束时间：" + endDateStr);
-        return Result.OK("成功");
-    }
-
-    /**
-     * 遍历文件夹（递归）
-     *
-     * @param dir
-     * @param level
-     */
-    public  void printDirByRecursive(File dir, int level,List<QcSsgqzysytdqk> qcSsgqzysytdqks) {
-        //System.out.println(dir.getAbsolutePath());
-        //输出层次数
-//        for (int i = 0; i < level; i++) {
-//            System.out.print("-");
-//        }
-        //获取这个目录下所有的子文件和子目录的数组。
-        Map map=new HashMap<>();
-        List list = new ArrayList<>();
-        File[] files = dir.listFiles();
-        String a=null;
-        //遍历这个数组，取出每个File对象
-        if (files != null) {
-            for (File f : files) {
-
-                //判断这个File是否是一个文件，是：
-                if (f.isFile() ) {
-
-                    a = f.getParentFile().getName();
-//                    System.out.println(f.toString().substring(10));
-                    if(a.equals(f.getParentFile().getName())&& !f.getParentFile().getName().equals("desktop.ini")){
-                        list.add(f.toString().substring(10));
-                    }
-                } else {//否则就是一个目录，继续递归
-                    //递归调用
-                    printDirByRecursive(f, level,qcSsgqzysytdqks);
-
-                }
-            }
-            if(list.size()>0){
-                for (QcSsgqzysytdqk qcSsgqzysytdqk : qcSsgqzysytdqks) {
-                    if(qcSsgqzysytdqk.getDkbh().equals(a)){
-                        System.out.println(a);
-                        UpdateWrapper<QcSsgqzysytdqk> updateWrapper = new UpdateWrapper<>();
-                        updateWrapper.eq("DKBH",a);
-                        updateWrapper.set("IMAGES",StringUtils.join(list,","));
-                        qcSsgqzysytdqkService.update(null,updateWrapper);
-
-                    }
-                }
-
-            }
-
-        }
-    }
-
-
-//    /**
-//     * 分页列表查询
-//     *
-//     * @param qcSsgqzysytdqk
-//     * @param pageNo
-//     * @param pageSize
-//     * @param req
-//     * @return
-//     */
-//    /**
-//     * @AutoLog(value = "省属国企占有使用土地情况调查-分页列表查询")
-//     */
-//    @ApiOperation(value = "省属国企占有使用土地情况调查-分页列表查询", notes = "省属国企占有使用土地情况调查-分页列表查询")
-//    @GetMapping(value = "/list")
-//    @PermissionData(pageComponent = "qcsb/QcSsgqzysytdqkList")
-//    public Result<IPage<QcSsgqzysytdqk>> queryPageList(QcSsgqzysytdqk qcSsgqzysytdqk,
-//                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-//                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-//                                                       HttpServletRequest req) {
-//        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
-//        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
-//        List<Integer> sbzts = new ArrayList<>();
-//        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//        System.out.println(sysUser);
-//        if ("gzw".equals(sysUser.getUsername())) {
-//            queryWrapper.likeRight("sys_org_code", "A04");
-//        }
-//        queryWrapper.likeRight("sys_org_code", "A04");
-//        //sbzts.add(0);
-//        //sbzts.add(1);
-//        //queryWrapper.in("sfsb",sbzts);
-//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
-//        return Result.OK(pageList);
-//    }
-//
-//    @AutoLog(value = "用地单位信息是否上报")
-//    @ApiOperation(value = "用地单位信息是否上报", notes = "用地单位信息是否上报")
-//    @GetMapping(value = "/sfsb")
-//    public Result<String> sfshz(String id) {
-//        qcSsgqzysytdqkService.upSfsb(id);
-//        return Result.OK("提交成功!");
-//    }
-
-//    /**
-//     * 分页列表查询
-//     *
-//     * @param qcSsgqzysytdqk
-//     * @param pageNo
-//     * @param pageSize
-//     * @param req
-//     * @return
-//     */
-//    //@AutoLog(value = "省属国企占有使用土地情况调查-已上报待审核分页列表查询")
-//    @ApiOperation(value = "省属国企占有使用土地情况调查-已上报待审核分页列表查询", notes = "省属国企占有使用土地情况调查-已上报待审核分页列表查询")
-//    @GetMapping(value = "/list1")
-//    public Result<IPage<QcSsgqzysytdqk>> queryPageList1(QcSsgqzysytdqk qcSsgqzysytdqk,
-//                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-//                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-//                                                        HttpServletRequest req) {
-//        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
-//        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
-//        List<Integer> sbzts = new ArrayList<>();
-//        sbzts.add(1);
-//        sbzts.add(2);
-//        queryWrapper.in("sfsb", sbzts);
-//        if (qcSsgqzysytdqk.getShzt() != null) {
-//            queryWrapper.eq("shzt", qcSsgqzysytdqk.getShzt());
-//        }
-//        queryWrapper.likeRight("sys_org_code", "A04");
-//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
-//        return Result.OK(pageList);
-//    }
-
-//    @ApiOperation(value = "省属国企占有使用土地情况调查-已上报待审核分页列表查询", notes = "省属国企占有使用土地情况调查-已上报待审核分页列表查询")
-//    @GetMapping(value = "/listBygly")
-//    public Result<IPage<QcSsgqzysytdqk>> queryPageListBygly(QcSsgqzysytdqk qcSsgqzysytdqk,String year,
-//                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-//                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-//                                                            HttpServletRequest req) {
-//        QueryWrapper<QcSsgqzysytdqk> 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<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
-//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
-//        return Result.OK(pageList);
-//    }
-//    /**
-//     * 分页列表查询
-//     *
-//     * @param qcSsgqzysytdqk
-//     * @param pageNo
-//     * @param pageSize
-//     * @param req
-//     * @return
-//     */
-//    //@AutoLog(value = "省属国企占有使用土地情况调查-所有已经审核分页列表查询")
-//    @ApiOperation(value = "省属国企占有使用土地情况调查-所有已经审核分页列表查询", notes = "省属国企占有使用土地情况调查-所有已经审核分页列表查询")
-//    @GetMapping(value = "/list2")
-//    public Result<IPage<QcSsgqzysytdqk>> queryPageList2(QcSsgqzysytdqk qcSsgqzysytdqk,String year,
-//                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-//                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-//                                                        HttpServletRequest req) {
-//        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
-//        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
-//        List<Integer> sbzts = new ArrayList<>();
-//        sbzts.add(3);
-//        sbzts.add(4);
-//        queryWrapper.in("sfsb", sbzts);
-//        queryWrapper.likeRight("sys_org_code", "A04");
-//        if (year!=null){
-//            queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
-//        }
-//        if (qcSsgqzysytdqk.getShzt() != null) {
-//            queryWrapper.eq("shzt", qcSsgqzysytdqk.getShzt());
-//        }
-//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
-//        return Result.OK(pageList);
-//    }
-
-//    /**
-//     * 分页列表查询
-//     *
-//     * @param qcSsgqzysytdqk
-//     * @param pageNo
-//     * @param pageSize
-//     * @param req
-//     * @return
-//     */
-//    //@AutoLog(value = "省属国企占有使用土地情况调查-审核错误退回分页列表查询")
-//    @ApiOperation(value = "省属国企占有使用土地情况调查-审核错误退回分页列表查询", notes = "省属国企占有使用土地情况调查-审核错误退回分页列表查询")
-//    @GetMapping(value = "/list4")
-//    @PermissionData(pageComponent = "qcsb/QcSsgqzysytdqkList4")
-//    public Result<IPage<QcSsgqzysytdqk>> queryPageList4(QcSsgqzysytdqk qcSsgqzysytdqk,
-//                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-//                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-//                                                        HttpServletRequest req) {
-//        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
-//        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
-//        queryWrapper.eq("sfsb", 4);
-//        queryWrapper.likeRight("sys_org_code", "A04");
-//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
-//        return Result.OK(pageList);
-//    }
-
-//    /**
-//     * 分页列表查询
-//     *
-//     * @param qcSsgqzysytdqk
-//     * @param pageNo
-//     * @param pageSize
-//     * @param req
-//     * @return
-//     */
-//    //@AutoLog(value = "省属国企占有使用土地情况调查-分页列表查询")
-//    @ApiOperation(value = "省属国企占有使用土地情况调查-分页列表查询", notes = "机关事业单位占有使用土地情况调查-分页列表查询")
-//    @GetMapping(value = "/list5")
-//    @PermissionData(pageComponent = "sydwqcsb/QcSsgqzysytdqkList")
-//    public Result<IPage<QcSsgqzysytdqk>> queryPageList5(QcSsgqzysytdqk qcSsgqzysytdqk,
-//                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-//                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-//                                                        HttpServletRequest req) {
-//        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
-//        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
-//        List<Integer> sbzts = new ArrayList<>();
-//        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//        queryWrapper.likeRight("sys_org_code", "A03");
-//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
-//        return Result.OK(pageList);
-//    }
-
-//    /**
-//     * 分页列表查询
-//     *
-//     * @param qcSsgqzysytdqk
-//     * @param pageNo
-//     * @param pageSize
-//     * @param req
-//     * @return
-//     */
-//    //@AutoLog(value = "省属国企占有使用土地情况调查-已上报待审核分页列表查询")
-//    @ApiOperation(value = "省属国企占有使用土地情况调查-已上报待审核分页列表查询", notes = "省属国企占有使用土地情况调查-已上报待审核分页列表查询")
-//    @GetMapping(value = "/list6")
-//    public Result<IPage<QcSsgqzysytdqk>> queryPageList6(QcSsgqzysytdqk qcSsgqzysytdqk,
-//                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-//                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-//                                                        HttpServletRequest req) {
-//        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
-//        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
-//        List sbzts = new ArrayList<>();
-//        sbzts.add(1);
-//        sbzts.add(2);
-//        queryWrapper.in("sfsb", sbzts);
-//        queryWrapper.likeRight("sys_org_code", "A03");
-//        if (qcSsgqzysytdqk.getShzt() != null) {
-//            queryWrapper.eq("shzt", qcSsgqzysytdqk.getShzt());
-//        }
-//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
-//        return Result.OK(pageList);
-//    }
-
-//    /**
-//     * 分页列表查询
-//     *
-//     * @param qcSsgqzysytdqk
-//     * @param pageNo
-//     * @param pageSize
-//     * @param req
-//     * @return
-//     */
-//    //@AutoLog(value = "省属国企占有使用土地情况调查-所有已经审核分页列表查询")
-//    @ApiOperation(value = "省属国企占有使用土地情况调查-所有已经审核分页列表查询", notes = "省属国企占有使用土地情况调查-所有已经审核分页列表查询")
-//    @GetMapping(value = "/list7")
-//    public Result<IPage<QcSsgqzysytdqk>> queryPageList7(QcSsgqzysytdqk qcSsgqzysytdqk,String year,
-//                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-//                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-//                                                        HttpServletRequest req) {
-//        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
-//        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
-//        List<Integer> sbzts = new ArrayList<>();
-//        sbzts.add(3);
-//        sbzts.add(4);
-//        queryWrapper.in("sfsb", sbzts);
-//        queryWrapper.likeRight("sys_org_code", "A03");
-//        if (year!=null){
-//            queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
-//        }
-//        if (qcSsgqzysytdqk.getShzt() != null) {
-//            queryWrapper.eq("shzt", qcSsgqzysytdqk.getShzt());
-//        }
-//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
-//        return Result.OK(pageList);
-//    }
-
-//    /**
-//     * 分页列表查询
-//     *
-//     * @param qcSsgqzysytdqk
-//     * @param pageNo
-//     * @param pageSize
-//     * @param req
-//     * @return
-//     */
-//    //@AutoLog(value = "省属国企占有使用土地情况调查-所有已经审核分页列表查询")
-//    @ApiOperation(value = "省属国企占有使用土地情况调查-所有已经审核分页列表查询", notes = "省属国企占有使用土地情况调查-所有已经审核分页列表查询")
-//    @GetMapping(value = "/list9")
-//    @PermissionData(pageComponent = "sydwqcsb/QcSsgqzysytdqkList4")
-//
-//    public Result<IPage<QcSsgqzysytdqk>> queryPageList9(QcSsgqzysytdqk qcSsgqzysytdqk,
-//                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-//                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-//                                                        HttpServletRequest req) {
-//        QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
-//        Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
-//        List<Integer> sbzts = new ArrayList<>();
-//        sbzts.add(4);
-//        queryWrapper.in("sfsb", sbzts);
-//        queryWrapper.likeRight("sys_org_code", "A03");
-//        IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
-//        return Result.OK(pageList);
-//    }
-
-
-    /* *//**
-     * 导入shp数据
-     *
-     * @param request
-     * @param response
-     * @return
-     *//*
-    @RequestMapping(value = "/importDkxxExcel/{id}")
-    @Transactional(rollbackFor = {Exception.class})
-    public Result<?> importDkxxExcel(HttpServletRequest request, HttpServletResponse response, @PathVariable("id") String id) throws IOException {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Result<QcSsgqzysytdqk> gdXmResult = queryById(id);
-        String dkmc = gdXmResult.getResult().getDk();
-        System.out.println(dkmc);
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-            // 获取上传文件对象
-            MultipartFile file = entity.getValue();
-            System.out.println(file.getContentType());
-            if (file.getContentType().equals("text/plain")) {
-                GisUtil zh = new GisUtil();
-                HashMap<String, Object> map = new HashMap<String, Object>();
-                String dkid = UUID.randomUUID().toString().replaceAll("-", "");
-                int i1 = (int) (Math.random() * 100 + 1);
-               *//* String dkmc = "地块" + i1;*//*
-                List list = new ArrayList();
-                List Zblist = new ArrayList();
-                List result=new ArrayList();
-                String encoding = "GBK";
-                try {
-                    InputStreamReader inputStream = new InputStreamReader(file.getInputStream(), encoding);
-                    BufferedReader bufferedReader = new BufferedReader(inputStream);
-                    String strTmp = "";
-                    while ((strTmp = bufferedReader.readLine()) != null) {
-                        list.add(strTmp);
-                    }
-                    for (int i = 0; i < list.size(); i++) {
-                        if (list.get(i).toString().contains("@")) {
-                            for (int j = i + 1; j < list.size(); j++) {
-                                Zblist.add(list.get(j));
-                            }
-                        }
-                    }
-                    String s2="1";
-                    System.out.println(Zblist);
-                    ArrayList<Integer> ordinate =new ArrayList<>();
-                    for (int i = 0; i < Zblist.size(); i++) {
-                        String[] split = String.valueOf(Zblist.get(i)).split(",");
-                        for (int j = 0; j + 4 <= split.length; j = j + 4) {
-                            String s = zh.coordinateTransform(Double.valueOf(split[j + 2]), Double.valueOf(split[j + 3]), 117);
-                            String[] zb = s.split(",");
-                            for (String s1 : zb) {
-                                result.add(s1);
-                            }
-                            if(!split[j+1].equals(s2)){
-                                ordinate.add(i*2+1);//判断圈号开始的位置
-                            }
-                            s2=split[j+1];//标记位
-                        }
-                    }
-                    //组合sdo_elem_info_array
-                    StringBuilder recod =new StringBuilder();
-                    recod.append("1,1003,1");
-                    if(!s2.equals("1")){
-                        for (int i = 0; i <ordinate.size() ; i++) {
-                            recod.append(","+ordinate.get(i).toString()+",2003,1");
-                        }
-                    }
-                    System.out.println(recod);
-                    //判断单个地块首尾是否闭合
-                    for (int i = 0; i <result.size() ; i++) {
-                        String jd = result.get(0).toString();
-                        String wd =result.get(1).toString();
-                        if(!result.get(result.size()-1).equals(wd) && s2.equals("1")){
-                            result.add(jd);
-                            result.add(wd);
-                        }
-                    }
-                   *//* HashMap map1=new HashMap();
-                    map1.put("shape",result);
-                    List<Object> repeatedland = gdDkxxService.Repeatedland(map1);
-                    if(repeatedland.size()>0){
-                        System.out.println(repeatedland);
-                        return Result.error("重复供地");
-                    }*//*
-                    System.out.println(result);
-                    map.put("id",dkid);
-                   *//* map.put("dz_ba_bh",gdXmResult.getResult().getDzBaBh());*//*
-                    map.put("dkmc", dkmc);
-                    map.put("xmid", id);
-                   *//* map.put("xmmc", xmmc);;*//*
-                    map.put("shape", result);
-                    map.put("area",result);
-                    map.put("recod", Arrays.asList(recod.toString().split(",")));
-                    qcSsgqzysytdqkService.insertDkxx(map);
-                   *//* gdDkxxService.getwkt(dkid);*//*
-     *//*gdDkxxService.insertDkxxFx(id);*//*
-     *//* gdDkxxService.UpdateSt(id);*//*
-                    return Result.OK("文件导入成功");
-                } catch (Exception E) {
-                    log.error(E.getMessage(), E);
-                    return Result.error("文件导入失败:" + E.getMessage());
-                }
-
-            } else if (file.getContentType().equals("application/vnd.ms-excel")) {
-                int i1 = (int) (Math.random() * 100 + 1);
-                *//*String dkmc = "地块" + i1;*//*
-                String dkid = UUID.randomUUID().toString().replaceAll("-", "");
-                ImportParams params = new ImportParams();
-                params.setTitleRows(0);
-                params.setHeadRows(1);
-                params.setNeedSave(true);
-                ArrayList<Integer> ordinate =new ArrayList<>();
-                String s2="1";
-                try {
-                    GisUtil zh=new GisUtil();
-                    HashMap<String, Object> map = new HashMap<String, Object>();
-                    ArrayList<String> arr=new ArrayList<>();
-                    List<excleTable> list = ExcelImportUtil.importExcel(file.getInputStream(), excleTable.class, params);
-                    for (int i = 0; i < list.size() ; i++)
-                    {
-                        String zb = zh.coordinateTransform(list.get(i).getXcoord(), list.get(i).getYcoord(),117);
-                        String[] split = zb.split(",");
-                        for (int j = 0; j <split.length ; j++) {
-                            arr.add(split[j]);
-                        }
-                        if(!list.get(i).getQh().equals(s2)){
-                            ordinate.add(i*2+1);//判断圈号开始的位置
-                        }
-                        s2=list.get(i).getQh();//标记位
-
-                    }
-                    StringBuilder recod =new StringBuilder(); //创建recod用来存储sdo_elem_info_array();
-                    recod.append("1,1003,1");
-                    if(!s2.equals("1")){
-                        for (int i = 0; i <ordinate.size() ; i++) {
-                            recod.append(","+ordinate.get(i).toString()+",2003,1");
-                        }
-                    }
-                    //判断单个地块首尾是否闭合
-                    for (int i = 0; i <arr.size() ; i++) {
-                        String jd = arr.get(0).toString();
-                        String wd =arr.get(1).toString();
-                        if(!arr.get(arr.size()-1).equals(wd) && s2.equals("1")){
-                            arr.add(jd);
-                            arr.add(wd);
-                        }
-                    }
-                   *//* HashMap map1=new HashMap();
-                    map1.put("shape",arr);
-                    List<Object> repeatedland = gdDkxxService.Repeatedland(map1);
-                    if(repeatedland.size()>0){
-                        System.out.println(repeatedland);
-                        return Result.error("重复供地");
-                    }*//*
-                    map.put("id",dkid);
-                   *//* map.put("dz_ba_bh",gdXmResult.getResult().getDzBaBh());*//*
-                    map.put("dkmc", dkmc);
-                    map.put("xmid", id);
-                   *//* map.put("xmmc", xmmc);*//*
-                    map.put("shape", arr);
-                    map.put("area",arr);
-                    map.put("recod",Arrays.asList(recod.toString().split(",")));
-                    System.out.println(Arrays.asList(recod.toString().split(",")));
-                    qcSsgqzysytdqkService.insertDkxx(map);
-                   *//* gdDkxxService.getwkt(dkid);
-                    gdDkxxService.insertDkxxFx(id);
-                    gdDkxxService.UpdateSt(id);*//*
-                    return Result.OK("EXCEL文件导入成功！");
-                } catch (Exception e) {
-                    log.error(e.getMessage(), e);
-                    return Result.error("文件导入失败:" + e.getMessage());
-                } finally {
-                    try {
-                        file.getInputStream().close();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-            } else if (file.getContentType().equals("application/x-zip-compressed")) {
-                String fileSavePath = uploadLocal(file, "shpPath");
-                try {
-                    //1、解压上传的zip文件
-                    String upFileName = fileSavePath.substring(fileSavePath.lastIndexOf("/") + 1);
-                    System.out.println(upFileName);
-                    String fileNameNoExt = upFileName.substring(0, upFileName.lastIndexOf('.'));
-                    String unZipPath = upLoadPath + "/shpPath/" + fileNameNoExt;
-                    ZipAndRarTools.unZip(fileSavePath, unZipPath);
-                    //2、获取shp文件及坐标系文件的路径
-                    String shpfilepath = "";
-                    File shpdir = new File(unZipPath);
-                    File[] files = shpdir.listFiles();
-                    for (int i = 0; i < files.length; i++) {
-                        File shpFile = files[i];
-                        String fileName = shpFile.getName();
-                        if (fileName.endsWith(".shp")) {
-                            shpfilepath = unZipPath + "/" + fileName;
-                            continue;
-                        }
-                    }
-                    List<Map<String, Object>> maps = readShpFile(shpfilepath);
-                    List list = new ArrayList();
-                    for (Map<String, Object> map : maps) {
-                        for (String s : map.keySet()) {
-                            if (s.equals("the_geom")) {
-                                list.add(map.get("the_geom").toString());
-                            }
-                        }
-                    }
-                    System.out.println(list);
-                    for (int i = 0; i < list.size(); i++) {
-                        String dkid = UUID.randomUUID().toString().replaceAll("-", "");
-                        int i1 = (int) (Math.random() * 100 + 1);
-                        *//*String dkmc = "地块" + i1;*//*
-                        HashMap<String, Object> map = new HashMap<String, Object>();
-                        int j = list.get(i).toString().lastIndexOf("(");
-                        String substring = list.get(i).toString().substring(j + 1, (list.get(i).toString().length() - 3));
-                        String replace = substring.replace(",", "");
-                        String result = replace.replace(" ", ",");
-                        String[] split1 = result.split(",");
-                        StringBuilder recod =new StringBuilder(); //创建recod用来存储sdo_elem_info_array();
-                        recod.append("1,1003,1");
-                        map.put("id",dkid);
-                        map.put("dkmc", dkmc);
-                       *//* map.put("dzBaBh",gdXmResult.getResult().getDzBaBh());*//*
-                        map.put("xmid", id);
-                       *//* map.put("xmmc", xmmc);*//*
-                        map.put("shape", Arrays.asList(split1));
-                        map.put("area",Arrays.asList(split1));
-                        map.put("recod",Arrays.asList(recod.toString().split(",")));
-                        System.out.println(map);
-                        qcSsgqzysytdqkService.insertDkxx(map);
-                       *//* gdDkxxService.getwkt(dkid);*//*
-     *//* gdDkxxService.insertDkxxFx(id);*//*
-     *//* gdDkxxService.UpdateSt(id);*//*
-     *//*String wkt = zdDkxxbService.SelectLocation(dkid);//wkt*//*
-                    }
-                    return Result.OK("zip压缩包导入成功");
-                } catch (Exception E) {
-                    log.error(E.getMessage(), E);
-                    return Result.error("文件导入失败:" + E.getMessage());
-                }
-            }
-        }
-        return Result.error("文件导入失败！");
-
-    }
-    *//**
-     * 读取shp文件属性
-     *
-     * @param shapePath
-     * @return
-     *//*
-    public static List<Map<String, Object>> readShpFile(String shapePath) {
-        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-        ShapefileDataStoreFactory factory = new ShapefileDataStoreFactory();
-        ShapefileDataStore dataStore = null;
-        try {
-            dataStore = (ShapefileDataStore) factory.createDataStore(new File(shapePath).toURI().toURL());
-            if (dataStore != null) {
-//                dataStore.setCharset(Charset.forName("UTF-8"));
-                dataStore.setCharset(ShpCharset.GBK);
-            }
-            SimpleFeatureSource featureSource = dataStore.getFeatureSource();
-            SimpleFeatureIterator itertor = featureSource.getFeatures().features();
-            while (itertor.hasNext()) {
-                SimpleFeature feature = itertor.next();
-                Iterator<Property> itprop = feature.getProperties().iterator();
-                Map<String, Object> map = new HashMap<String, Object>();
-                while (itprop.hasNext()) {
-                    Property prop = itprop.next();
-                    map.put(String.valueOf(prop.getName()), String.valueOf(prop.getValue()));
-                }
-                list.add(map);
-            }
-            itertor.close();
-        } catch (Exception e) {
-            log.error("解析shp异常：", e.getMessage());
-        } finally {
-            if (dataStore != null) {
-                dataStore.dispose();
-            }
-        }
-        return list;
-    }
-
-    *//**
-     * 本地文件上传
-     *
-     * @param mf      文件
-     * @param bizPath 自定义路径
-     * @return
-     *//*
-    private String uploadLocal(MultipartFile mf, String bizPath) {
-        try {
-            String ctxPath = upLoadPath;
-            String fileName = null;
-            File file = new File(ctxPath + File.separator + bizPath + File.separator);
-            if (!file.exists()) {
-                file.mkdirs();// 创建文件根目录
-            }
-            String orgName = mf.getOriginalFilename();// 获取文件名
-            orgName = CommonUtils.getFileName(orgName);
-            if (orgName.indexOf(".") != -1) {
-                fileName = orgName.substring(0, orgName.lastIndexOf(".")) + "_" + System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf("."));
-            } else {
-                fileName = orgName + "_" + System.currentTimeMillis();
-            }
-            String savePath = file.getPath() + File.separator + fileName;
-            File savefile = new File(savePath);
-            FileCopyUtils.copy(mf.getBytes(), savefile);
-            if (savePath.contains("\\")) {
-                savePath = savePath.replace("\\", "/");
-            }
-            return savePath;
-        } catch (IOException e) {
-            log.error(e.getMessage(), e);
-        }
-        return "";
-    }*/
-
-}

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

@@ -1,781 +0,0 @@
-package org.jeecg.modules.zrzyqc.qcsb.entity;
-
-import java.io.Serializable;
-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;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: 省属国企占有使用土地情况调查
- * @Author: jeecg-boot
- * @Date: 2022-06-29
- * @Version: V1.0
- */
-@Data
-@TableName("qc_ssgqzysytdqk")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "qc_ssgqzysytdqk对象", description = "省属国企占有使用土地情况调查")
-public class QcSsgqzysytdqk implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @Excel(name = "用地单位", width = 15)
-    private java.lang.String createBy;
-    /**
-     * 创建日期
-     */
-    @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 java.lang.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;
-    /**
-     * 所属部门
-     */
-    @ApiModelProperty(value = "所属部门")
-    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "org_code")
-    private java.lang.String sysOrgCode;
-    /**
-     * 地块名称
-     */
-    @Excel(name = "地块名称", width = 15)
-    @ApiModelProperty(value = "地块")
-    private java.lang.String dk;
-    /**
-     * 地块名称
-     */
-    @Excel(name = "地块编号", width = 15)
-    @ApiModelProperty(value = "地块编号")
-    private java.lang.String dkbh;
-    /**
-     * 文件类型
-     */
-    @Excel(name = "文件类型", width = 15, dicCode = "wjlx")
-    @Dict(dicCode = "wjlx")
-    @ApiModelProperty(value = "文件类型")
-    private java.lang.String wjlx;
-    /**
-     * 证书/合同/文件编号
-     */
-    @Excel(name = "证书/合同/文件编号", width = 15)
-    @ApiModelProperty(value = "证书/合同/文件编号")
-    private java.lang.String wjbh;
-    /**
-     * 土地使用权人
-     */
-    @Excel(name = "土地使用权人", width = 15)
-    @ApiModelProperty(value = "土地使用权人")
-    private java.lang.String tdsyqr;
-    /**
-     * 实际占用土地面积
-     */
-    @ApiModelProperty(value = "实际占用土地面积")
-    private java.lang.Double sjzytdmj;
-    /**
-     * 其中批准使用土地面积
-     */
-    @ApiModelProperty(value = "其中批准使用土地面积")
-    private java.lang.Double qzpzsymj;
-    /**
-     * 实际占用面积单位（亩）
-     */
-    @Excel(name = "实际占用土地面积单位（亩）", width = 15)
-    @ApiModelProperty(value = "实际占用土地面积单位（亩）")
-    private java.lang.Double sjzytdmjM;
-    /**
-     * 实际占用面积单位（公顷）
-     */
-    @Excel(name = "实际占用面积单位（公顷）", width = 15)
-    @ApiModelProperty(value = "实际占用土地面积单位（公顷）")
-    private java.lang.Double sjzytdmjGq;
-    /**
-     * 实际占用面积单位（平方米）
-     */
-    @ApiModelProperty(value = "实际占用土地面积单位（平方米）")
-    @Excel(name = "实际占用土地面积（平方米）", width = 15)
-    private java.lang.Double sjzytdmjPf;
-    /**
-     * 实际使用建筑面积
-     */
-    @Excel(name = "实际使用建筑面积", width = 15)
-    @ApiModelProperty(value = "实际使用建筑面积")
-    private java.lang.Double sjsyjzmj;
-    /**
-     * 实际使用建筑面积单位
-     */
-    @Excel(name = "实际使用建筑面积单位", width = 15, dicCode = "dw")
-    @ApiModelProperty(value = "实际使用建筑面积单位")
-    private java.lang.String sjsyjzmjdw;
-    /**
-     * 其中批准使用建筑面积
-     */
-    // @Excel(name = "其中批准使用建筑面积", width = 15)
-    @ApiModelProperty(value = "其中批准使用建筑面积")
-    private java.lang.Double qzpzsymj2;
-    /**
-     * 容积率
-     */
-    @Excel(name = "容积率", width = 15)
-    @ApiModelProperty(value = "容积率")
-    private java.lang.Double sjrjl;
-    /**
-     * 使用权使用方式
-     */
-    @Excel(name = "使用权使用方式", width = 15, dicCode = "syqsyfs")
-    @Dict(dicCode = "syqsyfs")
-    @ApiModelProperty(value = "使用权使用方式")
-    private java.lang.String syqsyfs;
-    /**县区*/
-    @Excel(name = "地市", width = 15,dicCode = "xq")
-    @TableField(exist = false)
-    @ApiModelProperty(value = "县区" )
-    private String xq;
-    /**
-     * 行政区划
-     */
-    @Excel(name = "县区", width = 15, dicCode = "xzqh")
-    @Dict(dicCode = "xzqh")
-    @ApiModelProperty(value = "行政区划")
-    private java.lang.String xzqh;
-    /**
-     * 坐落位置
-     */
-    @Excel(name = "坐落位置", width = 15)
-    @ApiModelProperty(value = "坐落位置")
-    private java.lang.String zlwz;
-    /**
-     * 实际用途
-     */
-    @Excel(name = "实际用途", width = 15, dicCode = "id", dictTable = "sys_category", dicText = "name")
-    @Dict(dicCode = "id", dictTable = "sys_category", dicText = "name")
-    @ApiModelProperty(value = "实际用途")
-    private java.lang.String sjyt;
-    /**
-     * 权属起始时间
-     */
-    @Excel(name = "权属起始时间", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "权属起始时间")
-    private java.util.Date qsqssj;
-    /**
-     * 权属到期时间
-     */
-    @Excel(name = "权属到期时间", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "权属到期时间")
-    private java.util.Date qsdqsj;
-    /**
-     * 土地使用现状
-     */
-    @Excel(name = "土地使用现状", width = 15, dicCode = "tdsyxz")
-    @Dict(dicCode = "tdsyxz")
-    @ApiModelProperty(value = "土地使用现状")
-    private java.lang.String tdsyxz;
-    /**
-     * 担保、抵押、查封情况
-     */
-    @Excel(name = "担保、抵押、查封情况", width = 15, dicCode = "dbdycfqk")
-    @Dict(dicCode = "dbdycfqk")
-    @ApiModelProperty(value = "担保、抵押、查封情况")
-    private java.lang.String dbdycfqk;
-    /**
-     * 备注
-     */
-    @Excel(name = "备注", width = 15)
-    @ApiModelProperty(value = "备注")
-    private java.lang.String bz;
-    /**
-     * 附件材料
-     */
-    @Excel(name = "附件材料", width = 15)
-    @ApiModelProperty(value = "附件材料")
-    private java.lang.String xgwj;
-    /**
-     * 是否上报
-     */
-    @Excel(name = "是否上报", width = 15, dicCode = "xxsbzt")
-    @Dict(dicCode = "xxsbzt")
-    @ApiModelProperty(value = "是否上报")
-    private java.lang.Integer sfsb;
-    /**
-     * 实际占用土地面积单位
-     */
-    // @Excel(name = "实际占用土地面积单位", width = 15)
-    @Dict(dicCode = "dw")
-    @ApiModelProperty(value = "实际占用土地面积单位")
-    private java.lang.String sjzytdmjdw;
-    /**
-     * 其中批准土地面积单位
-     */
-    //@Excel(name = "其中批准土地面积单位", width = 15)
-    @Dict(dicCode = "dw")
-    @ApiModelProperty(value = "其中批准土地面积单位")
-    private java.lang.String qzpztdmjdw;
-
-    /**
-     * 其中批准建筑面积单位
-     */
-//	@Excel(name = "其中批准建筑面积单位", width = 15)
-    @ApiModelProperty(value = "其中批准建筑面积单位")
-    private java.lang.String qzpzsymjdw;
-
-    /**
-     * 其中批准土地面积(亩)
-     */
-    @Excel(name = "其中批准土地面积(亩)", width = 15)
-    @ApiModelProperty(value = "其中批准土地面积(亩)")
-    private java.lang.Double qzpztdmjM;
-    /**
-     * 其中批准土地面积(公顷)
-     */
-    @Excel(name = "其中批准土地面积(公顷)", width = 15)
-    @ApiModelProperty(value = "其中批准土地面积(公顷)")
-    private java.lang.Double qzpztdmjGq;
-    /**
-     * 其中批准土地面积(平方米)
-     */
-    @Excel(name = "其中批准土地面积(平方米)", width = 15)
-    @ApiModelProperty(value = "其中批准土地面积(平方米)")
-    private java.lang.Double qzpztdmjPf;
-    /**
-     * 实际使用建筑面积(亩)
-     */
-//	@Excel(name = "实际使用建筑面积(亩)", width = 15)
-    @ApiModelProperty(value = "实际使用建筑面积(亩)")
-    private java.lang.Double sjsyjzmjM;
-    /**
-     * 实际使用建筑面积(公顷)
-     */
-//	@Excel(name = "实际使用建筑面积(公顷)", width = 15)
-    @ApiModelProperty(value = "实际使用建筑面积(公顷)")
-    private java.lang.Double sjsyjzmjGq;
-    /**
-     * 实际使用建筑面积(平方米)
-     */
-//	@Excel(name = "实际使用建筑面积(平方米)", width = 15)
-    @ApiModelProperty(value = "实际使用建筑面积(平方米)")
-    private java.lang.Double sjsyjzmjPf;
-    /**
-     * 其中批准建筑面积(亩)
-     */
-    //@Excel(name = "其中批准建筑面积(亩)", width = 15)
-    @ApiModelProperty(value = "其中批准建筑面积(亩)")
-    private java.lang.Double qzpzjzmjM;
-    /**
-     * 其中批准建筑面积(公顷)
-     */
-    //@Excel(name = "其中批准建筑面积(公顷)", width = 15)
-    @ApiModelProperty(value = "其中批准建筑面积(公顷)")
-    private java.lang.Double qzpzjzmjGq;
-    /**
-     * 其中批准建筑面积(平方米)
-     */
-    //@Excel(name = "其中批准建筑面积(平方米)", width = 15)
-    @ApiModelProperty(value = "其中批准建筑面积(平方米)")
-    private java.lang.Double qzpzjzmjPf;
-    /**
-     * 审核是否通过
-     */
-    @Excel(name = "审核是否通过", width = 15)
-    @ApiModelProperty(value = "审核是否通过")
-    private java.lang.String shzt;
-    /**
-     * 审核意见
-     */
-    @Excel(name = "审核意见", width = 15)
-    @ApiModelProperty(value = "审核意见")
-    private java.lang.String shyj;
-    /**
-     * 审核人
-     */
-    @Excel(name = "审核人", width = 15)
-    @ApiModelProperty(value = "审核人")
-    private java.lang.String shren;
-    /**
-     * 审核日期
-     */
-    @Excel(name = "审核日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @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 shrq;
-    /**
-     * 权属期限
-     */
-    @Excel(name = "权属期限", width = 15, dicCode = "qsqx")
-    @Dict(dicCode = "qsqx")
-    @ApiModelProperty(value = "权属期限")
-    private java.lang.String qsqx;
-    /**
-     * 现场照片
-     */
-    @Excel(name = "现场照片", width = 15)
-    @ApiModelProperty(value = "现场照片")
-    private java.lang.String xczp;
-    /**
-     * 统一社会信用代码证书
-     */
-    @Excel(name = "统一社会信用代码证书", width = 15)
-    @ApiModelProperty(value = "统一社会信用代码证书")
-    private java.lang.String tyshxydmzs;
-    /**
-     * 土地资产权属证明材料
-     */
-    @Excel(name = "土地资产权属证明材料", width = 15)
-    @ApiModelProperty(value = "土地资产权属证明材料")
-    private java.lang.String tdzcqszmcl;
-    /**
-     * 房屋资产权属证明材料
-     */
-    @Excel(name = "房屋资产权属证明材料", width = 15)
-    @ApiModelProperty(value = "房屋资产权属证明材料")
-    private java.lang.String fwzcqszmcl;
-    /**
-     * 坐标位置相关证明材料
-     */
-    @Excel(name = "坐标位置相关证明材料", width = 15)
-    @ApiModelProperty(value = "坐标位置相关证明材料")
-    private java.lang.String zbwzxgzmcl;
-    /**
-     * 是否共用宗
-     */
-    @Excel(name = "是否共用宗", width = 15, dicCode = "sfgyz")
-    @Dict(dicCode = "sfgyz")
-    @ApiModelProperty(value = "是否共用宗")
-    private java.lang.String sfgyz;
-    /**
-     * 总建筑面积
-     */
-    @Excel(name = "总建筑面积", width = 15)
-    @ApiModelProperty(value = "总建筑面积")
-    private java.lang.Double zjzmj;
-    /**
-     * 机构类型
-     */
-    /*@Excel(name = "机构类型", width = 15)*/
-    @ApiModelProperty(value = "机构类型")
-    private java.lang.String jglx;
-    /**
-     * 统一社会信用代码
-     */
-    //@Excel(name = "统一社会信用代码", width = 15)
-    @ApiModelProperty(value = "统一社会信用代码")
-    private java.lang.String tyshxydm;
-
-
-    //2023.09.26添加字段
-    /**
-     * 证书持有情况
-     */
-    @Excel(name = "证书持有情况", width = 15, dicCode = "sfgyz")
-    @Dict(dicCode = "sfgyz")
-    @ApiModelProperty(value = "证书持有情况")
-    private java.lang.Integer zscyqk;
-
-    /**
-     * 土地实际使用人
-     */
-    @Excel(name = "土地实际使用人", width = 15)
-    @ApiModelProperty(value = "土地实际使用人")
-    private java.lang.String tdsjsyr;
-
-    /**
-     * 权证登记使用人名
-     */
-    @Excel(name = "权证登记使用人名", width = 15)
-    @ApiModelProperty(value = "权证登记使用人名")
-    private java.lang.String qzdjsyrm;
-
-    /**
-     * 权证登记使用人名
-     */
-    @Excel(name = "权属登记使用人名称是否与实际使用人一致", width = 15)
-    @ApiModelProperty(value = "权属登记使用人名称是否与实际使用人一致")
-    private java.lang.Integer sfyz;
-
-    /**
-     * 年税收
-     */
-    @Excel(name = "年税收", width = 15)
-    @ApiModelProperty(value = "年税收")
-    private java.lang.String nss;
-
-    /**
-     * 营业收入
-     */
-    @Excel(name = "营业收入", width = 15)
-    @ApiModelProperty(value = "营业收入")
-    private java.lang.String yysr;
-    /**
-     * 营业收入
-     */
-    @Excel(name = "就业人数", width = 15)
-    @ApiModelProperty(value = "就业人数")
-    private java.lang.String jyrs;
-
-    /**
-     * 投资强度
-     */
-    @Excel(name = "投资强度", width = 15)
-    @ApiModelProperty(value = "投资强度")
-    private java.lang.String tzqd;
-
-
-    /**
-     * 上级单位
-     */
-    @Excel(name = "上级单位", width = 15)
-    @ApiModelProperty(value = "上级单位")
-    private java.lang.String sjdw;
-
-    /**
-     * 意向盘活主体
-     */
-    @Excel(name = "意向盘活主体", width = 15)
-    @ApiModelProperty(value = "意向盘活主体")
-    private java.lang.String yxphzt;
-
-    /**
-     * 意向盘活方式
-     */
-    @Excel(name = "意向盘活方式", width = 15)
-    @ApiModelProperty(value = "意向盘活方式")
-    private java.lang.String yxphfs;
-    /**
-     * 取得日期
-     */
-    /*@Excel(name = "取得日期", width = 15)*/
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "取得日期")
-    private Date qdrq;
-    /**
-     * 发证日期
-     */
-    /*@Excel(name = "发证日期", width = 15)*/
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "发证日期")
-    private Date fzrq;
-
-    /**
-     * 闲置
-     */
-    /*@Excel(name = "闲置", width = 15)*/
-    @ApiModelProperty(value = "闲置")
-    private String xz;
-    /**
-     * 待处置（待报废、毁损等）
-     */
-    /*@Excel(name = "待处置（待报废、毁损等）", width = 15)*/
-    @ApiModelProperty(value = "待处置（待报废、毁损等）")
-    private String dcz;
-    /**
-     * 权属性质
-     */
-    /*@Excel(name = "权属性质", width = 15)*/
-    @ApiModelProperty(value = "权属性质")
-    private String qsxz;
-
-
-    /**
-     * 统一社会信用编码
-     */
-    /*@Excel(name = "统一社会信用编码", width = 15)*/
-    @ApiModelProperty(value = "统一社会信用编码")
-    private String tyshxybm;
-
-
-    /**单位级别*//*
-	@Excel(name = "单位级别", width = 15,dicCode = "dwjb")
-	@ApiModelProperty(value = "单位级别")
-	@Dict(dicCode = "dwjb")
-	private String orgType;
-	*//**单位编码*//*
-	@Excel(name = "单位编码", width = 15)
-	@ApiModelProperty(value = "单位编码")
-	private String orgCode;*/
-
-    /**企业类型*//*
-	@Excel(name = "企业类型", width = 15, dicCode = "qylx")
-	@Dict(dicCode = "qylx")
-	@ApiModelProperty(value = "企业类型")
-	private String qylx;
-	*//**国有资产持股比例*//*
-	@Excel(name = "国有资产持股比例", width = 15)
-	@ApiModelProperty(value = "国有资产持股比例")
-	private Double gyzccgbl;
-	*//**联络人*//*
-	@Excel(name = "联络人", width = 15)
-	@ApiModelProperty(value = "联络人")
-	private java.lang.String tbr;
-	*//**分管领导*//*
-	@Excel(name = "分管领导", width = 15)
-	@ApiModelProperty(value = "分管领导")
-	private java.lang.String fgld;
-	*//**手机号*//*
-	@Excel(name = "分管领导手机号", width = 15)
-	@ApiModelProperty(value = "分管领导手机号")
-	private java.lang.String fgldsjh;
-	*//**手机号*//*
-	@Excel(name = "手机号", width = 15)
-	@ApiModelProperty(value = "手机号")
-	private java.lang.String sjh;
-	*//**座机号*//*
-	@Excel(name = "座机号", width = 15)
-	@ApiModelProperty(value = "座机号")
-	private java.lang.String zjh;*/
-
-
-    /**
-     * 审核时间
-     */
-    @Excel(name = "审核时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @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 shsj;
-    /**
-     * 企业编码
-     */
-    /*@Excel(name = "企业编码", width = 15)*/
-    @ApiModelProperty(value = "企业编码")
-    private java.lang.String qybm;
-    /**
-     * 是否涉及省内土地资产
-     */
-    /*@Excel(name = "是否涉及省内土地资产", width = 15)*/
-    @ApiModelProperty(value = "是否涉及省内土地资产")
-    private java.lang.String sfsjtdzc;
-    /**
-     * 权益受损情况
-     */
-    /*@Excel(name = "权益受损情况", width = 15)*/
-    @ApiModelProperty(value = "权益受损情况")
-    @Dict(dicCode = "qyssqk")
-    private java.lang.String qyssqk;
-
-
-    /**
-     * 批准用途
-     */
-    /*	@Excel(name = "批准用途", width = 15, dicCode = "id",dictTable = "sys_category",dicText = "name")*/
-    @Dict(dicCode = "id", dictTable = "sys_category", dicText = "name")
-    @ApiModelProperty(value = "批准用途")
-    private java.lang.String pzyt;
-    /**
-     * 出租出借情况
-     */
-    /*@Excel(name = "出租出借情况", width = 15)*/
-    @ApiModelProperty(value = "出租出借情况")
-    @Dict(dicCode = "czcjqk")
-    private java.lang.String czcjqk;
-    /**
-     * 证书类型
-     */
-    /*@Excel(name = "证书类型", width = 15)*/
-    @ApiModelProperty(value = "证书类型")
-    @Dict(dicCode = "zslx")
-    private java.lang.String zslx;
-    /**
-     * 纬度
-     */
-    /*	@Excel(name = "纬度", width = 15)*/
-    @ApiModelProperty(value = "纬度")
-    private java.lang.String lat;
-    /**
-     * 精度
-     */
-    /*@Excel(name = "精度", width = 15)*/
-    @ApiModelProperty(value = "精度")
-    private java.lang.String lng;
-
-
-    /*
-     * @Author lihongrui
-     * @Description //TODO
-     * @Date 10:04 2023/10/13
-     * @Param 继续添加字段，烦死了
-     * @return
-     */
-    /**
-     * 土地归属企业
-     */
-    @Excel(name = "土地归属企业", width = 15)
-    @ApiModelProperty(value = "土地归属企业")
-    private java.lang.String tdgsqyy;
-
-    /**
-     * 土地归属企业
-     */
-    @Excel(name = "政府规划用途", width = 15)
-    @Dict(dicCode = "id", dictTable = "sys_category", dicText = "name")
-    @ApiModelProperty(value = "政府规划用途")
-    private java.lang.String zfghyt;
-
-    /**
-     * 政府规划用途是否与实际用途一致
-     */
-    @Excel(name = "政府规划用途是否与实际用途一致", width = 15)
-    @Dict(dicCode = "sfgyz")
-    @ApiModelProperty(value = "政府规划用途是否与实际用途一致")
-    private java.lang.Integer sjytsffh;
-
-    /**
-     * 地上建筑物产权人是否与权证登记人使用人名称是否一致
-     */
-    @Excel(name = "地上建筑物产权人是否与权证登记人使用人名称是否一致", width = 15)
-    @Dict(dicCode = "sfgyz")
-    @ApiModelProperty(value = "地上建筑物产权人是否与权证登记人使用人名称是否一致")
-    private java.lang.Integer dsjzwsfyz;
-
-    /**
-     * 地上建筑物产权人
-     */
-    @Excel(name = "地上建筑物产权人", width = 15)
-    @ApiModelProperty(value = "地上建筑物产权人")
-    private java.lang.String dsjzwcqr;
-
-    /**
-     * 地上建筑物用途
-     */
-    @Excel(name = "地上建筑物用途", width = 15)
-    @ApiModelProperty(value = "地上建筑物用途")
-    private java.lang.String dsjzwyt;
-
-    /**
-     * 是否存在产权纠纷
-     */
-    @Excel(name = "是否存在产权纠纷", width = 15, dicCode = "sfgyz")
-    @Dict(dicCode = "sfgyz")
-    @ApiModelProperty(value = "是否存在产权纠纷")
-    private java.lang.Integer sfczjf;
-
-    /**
-     * 产权变更需补交的土地出让金数额
-     */
-    @Excel(name = "产权变更需补交的土地出让金数额", width = 15)
-    @ApiModelProperty(value = "产权变更需补交的土地出让金数额")
-    private java.lang.String cqbgbjtdje;
-
-    /**
-     * 是否需要缴纳土地使用税
-     */
-    @Excel(name = "是否需要缴纳土地使用税", width = 15, dicCode = "sfgyz")
-    @Dict(dicCode = "sfgyz")
-    @ApiModelProperty(value = "是否需要缴纳土地使用税")
-    private java.lang.Integer sfxyjntdsys;
-
-    /**
-     * 土地使用税缴纳金额
-     */
-    @Excel(name = "土地使用税缴纳金额", width = 15)
-    @ApiModelProperty(value = "土地使用税缴纳金额")
-    private java.lang.String tdsysjnje;
-
-    /**
-     * 土地账面原值
-     */
-    @Excel(name = "土地账面原值", width = 15)
-    @ApiModelProperty(value = "土地账面原值")
-    private java.lang.String tdzmyz;
-
-    /**
-     * 土地账面净值
-     */
-    @Excel(name = "土地账面净值", width = 15)
-    @ApiModelProperty(value = "土地账面净值")
-    private java.lang.String tdzmjz;
-
-    /**
-     * 土地市场价值
-     */
-    @Excel(name = "土地市场价值", width = 15)
-    @ApiModelProperty(value = "土地市场价值")
-    private java.lang.String tdscjz;
-
-
-    /**
-     * 土地租赁价值
-     */
-    @Excel(name = "土地租赁价值", width = 15)
-    @ApiModelProperty(value = "土地租赁价值")
-    private java.lang.String tdzljz;
-
-    /**
-     * 是否有盘活意愿
-     */
-    @Excel(name = "是否有盘活意愿", width = 15, dicCode = "sfgyz")
-    @Dict(dicCode = "sfgyz")
-    @ApiModelProperty(value = "是否有盘活意愿")
-    private java.lang.Integer sfyphyy;
-
-    /**
-     * 土地租赁价值
-     */
-    @Excel(name = "产权信息补充说明", width = 15)
-    @ApiModelProperty(value = "产权信息补充说明")
-    private java.lang.String cqxxbcsm;
-
-    /**
-     * 政府规划用途是否与实际用途一致
-     */
-    @Excel(name = "政府规划用途是否与实际用途一致", width = 15, dicCode = "sfgyz")
-    @ApiModelProperty(value = "政府规划用途是否与实际用途一致")
-    private java.lang.Integer zfghsfyz;
-
-    /**
-     * 现场图片
-     */
-    @ApiModelProperty(value = "现场图片")
-    private java.lang.String images;
-
-    /**
-     * VR全景
-     */
-    @ApiModelProperty(value = "VR全景")
-    private java.lang.String vr;
-    /**
-     * 是否存在矢量
-     */
-    @ApiModelProperty(value = "VR全景")
-    private java.lang.String sfczslsj;
-
-}

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

@@ -171,9 +171,6 @@ public class QcSsgqzysytdqk1 implements Serializable {
     @ApiModelProperty(value = "实际使用建筑面积单位")
     private String sjsyjzmjdw;
 
-
-
-
     /**批准用途*/
     @Excel(name = "批准用途", width = 15, dicCode = "id",dictTable = "sys_category",dicText = "name")
     @Dict(dicCode = "id",dictTable = "sys_category",dicText = "name")

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

@@ -378,9 +378,6 @@ public class QcSsgqzysytdqkzc implements Serializable {
 	@Dict(dicCode = "qyssqk")
 	private String qyssqk;
 
-
-
-
 	/**批准用途*/
 	@Excel(name = "批准用途", width = 15, dicCode = "id",dictTable = "sys_category",dicText = "name")
 	@Dict(dicCode = "id",dictTable = "sys_category",dicText = "name")

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/mapper/QcSsgqzysytdqk1Mapper.java

@@ -1,10 +1,7 @@
 package org.jeecg.modules.zrzyqc.qcsb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqk;
 import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqk1;
-import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
 
 /**
  * @Description: 省属国企占有使用土地情况调查

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/mapper/QcSsgqzysytdqkMapper.java

@@ -1,24 +0,0 @@
-package org.jeecg.modules.zrzyqc.qcsb.mapper;
-
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqk;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
-
-/**
- * @Description: 省属国企占有使用土地情况调查
- * @Author: jeecg-boot
- * @Date:   2022-06-29
- * @Version: V1.0
- */
-public interface QcSsgqzysytdqkMapper extends BaseMapper<QcSsgqzysytdqk> {
-    QcQyxx selectQyxx(@Param("username") String username,@Param("orgCode") String orCode);
-    void upSfsb(String id);
-    void upSfsh(String id);
-    void upShjg(String id);
-
-    void insertDkxx(HashMap<String, Object> map);
-}

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/mapper/xml/QcSsgqzysytdqkMapper.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.zrzyqc.qcsb.mapper.QcSsgqzysytdqkMapper">
-    <update id="upSfsb" parameterType="String">
-        update qc_ssgqzysytdqk set sfsb=1 where id=#{id} and sfsb=0
-    </update>
-    <select id="selectQyxx" parameterType="String" resultType="org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx">
-        select * from qc_qyxx where create_by=#{username} and sys_org_code=#{orgCode}
-    </select>
-    <insert id="insertDkxx" parameterType="hashmap"  >
-        insert into dkxx(id,dkmc,xmid,shape,area)
-        values (#{id},#{dkmc}, #{xmid},MDSYS.sdo_geometry(2003,'4326',null,sdo_elem_info_array(
-        <foreach collection="recod" item="item" index="index" separator=",">
-            #{item}
-        </foreach>
-        ),sdo_ordinate_array(
-        <foreach collection="shape" item="item" index="index" separator=",">
-            #{item}
-        </foreach>
-        )),
-        round(SDO_GEOM.SDO_AREA(sdo_cs.transform((sdo_geometry(2003,'4326',null,sdo_elem_info_array(
-        <foreach collection="recod" item="item" index="index" separator=",">
-            #{item}
-        </foreach>
-        ),sdo_ordinate_array(
-        <foreach collection="shape" item="item" index="index" separator=",">
-            #{item}
-        </foreach>
-        ))),4527),0.05)*0.0001,4)
-        )
-    </insert>
-</mapper>

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

@@ -1,9 +1,7 @@
 package org.jeecg.modules.zrzyqc.qcsb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqk;
 import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqk1;
-import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
 
 /**
  * @Description: 省属国企占有使用土地情况调查

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

@@ -1,31 +0,0 @@
-package org.jeecg.modules.zrzyqc.qcsb.service;
-
-import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqk;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 省属国企占有使用土地情况调查
- * @Author: jeecg-boot
- * @Date:   2022-06-29
- * @Version: V1.0
- */
-public interface IQcSsgqzysytdqkService extends IService<QcSsgqzysytdqk> {
-    void upSfsb(String id);
-    void upSfsh(String id);
-    void upShjg(String id);
-    QcQyxx selectQyxx(String username,String orCode);
-
-
-
-
-    void insertDkxx(HashMap<String, Object> map);
-
-    List<Map<String, Double>> sumList(List<QcSsgqzysytdqk> list);
-
-    List<Map<String, Double>> sumListBysz(List<QcSsgqzysytdqk> list);
-}

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

@@ -1,14 +1,9 @@
 package org.jeecg.modules.zrzyqc.qcsb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqk;
 import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqk1;
 import org.jeecg.modules.zrzyqc.qcsb.mapper.QcSsgqzysytdqk1Mapper;
-import org.jeecg.modules.zrzyqc.qcsb.mapper.QcSsgqzysytdqkMapper;
 import org.jeecg.modules.zrzyqc.qcsb.service.IQcSsgqzysytdqk1Service;
-import org.jeecg.modules.zrzyqc.qcsb.service.IQcSsgqzysytdqkService;
-import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -1,189 +0,0 @@
-package org.jeecg.modules.zrzyqc.qcsb.service.impl;
-
-import org.jeecg.common.system.api.ISysBaseAPI;
-import org.jeecg.common.system.vo.DictModel;
-import org.jeecg.common.system.vo.SysCategoryModel;
-import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqk;
-import org.jeecg.modules.zrzyqc.qcsb.mapper.QcSsgqzysytdqkMapper;
-import org.jeecg.modules.zrzyqc.qcsb.service.IQcSsgqzysytdqkService;
-import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @Description: 省属国企占有使用土地情况调查
- * @Author: jeecg-boot
- * @Date: 2022-06-29
- * @Version: V1.0
- */
-@Service
-public class QcSsgqzysytdqkServiceImpl extends ServiceImpl<QcSsgqzysytdqkMapper, QcSsgqzysytdqk> implements IQcSsgqzysytdqkService {
-    @Autowired
-    private QcSsgqzysytdqkMapper qcSsgqzysytdqkMapper;
-
-    @Autowired
-    private ISysBaseAPI sysBaseAPI;
-
-    @Override
-    public void upSfsb(String id) {
-        qcSsgqzysytdqkMapper.upSfsb(id);
-    }
-
-    @Override
-    public void upSfsh(String id) {
-
-    }
-
-    @Override
-    public void upShjg(String id) {
-
-    }
-
-    @Override
-    public QcQyxx selectQyxx(String username, String orCode) {
-        return qcSsgqzysytdqkMapper.selectQyxx(username, orCode);
-    }
-
-    @Override
-    public void insertDkxx(HashMap<String, Object> map) {
-        qcSsgqzysytdqkMapper.insertDkxx(map);
-    }
-
-    @Override
-    public List<Map<String, Double>> sumList(List<QcSsgqzysytdqk> list) {
-        List<DictModel> xzqh = sysBaseAPI.getDictItems("xq");
-        List<SysCategoryModel> sysCategoryModels = sysBaseAPI.queryAllSysCategory();
-        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, List<QcSsgqzysytdqk>> collect = list.stream().collect(Collectors.groupingBy((QcSsgqzysytdqk::getSyqsyfs)));
-        for (String s : collect.keySet()) {
-            map.put(s, (double) collect.get(s).size());
-        }
-        result.add(map);
-
-        for (QcSsgqzysytdqk qcSsgqzysytdqk : list) {
-            String qh = qcSsgqzysytdqk.getXzqh().substring(0, 4);
-            for (DictModel dictModel : xzqh) {
-                if (qh.equals(dictModel.getValue())) {
-                    qcSsgqzysytdqk.setXzqh(dictModel.getText());
-                }
-            }
-        }
-        Map<String, Double> xzqhByAreaCollect = list.stream().collect(
-                Collectors.groupingBy(QcSsgqzysytdqk::getXzqh,
-                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjzytdmjM()).orElse(0.0))));
-        result.add(xzqhByAreaCollect);
-
-        Map<String, List<QcSsgqzysytdqk>> syxzCollect = list.stream().collect(
-                Collectors.groupingBy((QcSsgqzysytdqk::getTdsyxz)));
-        for (String s : syxzCollect.keySet()) {
-            syxzMap.put(s, (double) syxzCollect.get(s).size());
-        }
-        result.add(syxzMap);
-
-        Map<String, Double> syxzByAreaCollect = list.stream().collect(
-                Collectors.groupingBy(QcSsgqzysytdqk::getSyqsyfs,
-                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjzytdmjM()).orElse(0.0))));
-        result.add(syxzByAreaCollect);
-
-        Map<String, Long> wjlxCollect = list.stream().collect(
-                Collectors.groupingBy(QcSsgqzysytdqk::getWjlx,
-                        Collectors.counting())
-        );
-        for (String s : wjlxCollect.keySet()) {
-            wjbhMap.put(s, (double) wjlxCollect.get(s));
-        }
-        result.add(wjbhMap);
-
-        for (QcSsgqzysytdqk qcSsgqzysytdqk : list) {
-//            String qh = qcSsgqzysytdqk.getXzqh().substring(0, 4);
-            for (SysCategoryModel sysCategoryModel : sysCategoryModels) {
-                if (qcSsgqzysytdqk.getSjyt().equals(sysCategoryModel.getId())) {
-                    qcSsgqzysytdqk.setSjyt(sysCategoryModel.getName());
-                }
-            }
-        }
-        Map<String, List<QcSsgqzysytdqk>> collectBysjyt = list.stream().collect(Collectors.groupingBy((QcSsgqzysytdqk::getSjyt)));
-        for (String s : collectBysjyt.keySet()) {
-            sjytMap.put(s, (double) collectBysjyt.get(s).size());
-        }
-        result.add(sjytMap);
-
-        return result;
-    }
-
-    @Override
-    public List<Map<String, Double>> sumListBysz(List<QcSsgqzysytdqk> list) {
-        List<DictModel> xzqh = sysBaseAPI.getDictItems("xq");
-        List<SysCategoryModel> sysCategoryModels = sysBaseAPI.queryAllSysCategory();
-        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, List<QcSsgqzysytdqk>> collect = list.stream().collect(Collectors.groupingBy((QcSsgqzysytdqk::getSyqsyfs)));
-        for (String s : collect.keySet()) {
-            map.put(s, (double) collect.get(s).size());
-        }
-        result.add(map);
-
-        for (QcSsgqzysytdqk qcSsgqzysytdqk : list) {
-            String qh = qcSsgqzysytdqk.getXzqh().substring(0, 4);
-            for (DictModel dictModel : xzqh) {
-                if (qh.equals(dictModel.getValue())) {
-                    qcSsgqzysytdqk.setXzqh(dictModel.getText());
-                }
-            }
-        }
-        Map<String, Double> xzqhByAreaCollect = list.stream().collect(
-                Collectors.groupingBy(QcSsgqzysytdqk::getXzqh,
-                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjzytdmj()).orElse(0.0))));
-        result.add(xzqhByAreaCollect);
-
-        Map<String, List<QcSsgqzysytdqk>> syxzCollect = list.stream().collect(
-                Collectors.groupingBy((QcSsgqzysytdqk::getTdsyxz)));
-        for (String s : syxzCollect.keySet()) {
-            syxzMap.put(s, (double) syxzCollect.get(s).size());
-        }
-        result.add(syxzMap);
-
-        Map<String, Double> syxzByAreaCollect = list.stream().collect(
-                Collectors.groupingBy(QcSsgqzysytdqk::getSyqsyfs,
-                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjzytdmj()).orElse(0.0))));
-        result.add(syxzByAreaCollect);
-
-        Map<String, Long> wjlxCollect = list.stream().collect(
-                Collectors.groupingBy(QcSsgqzysytdqk::getZslx,
-                        Collectors.counting())
-        );
-        for (String s : wjlxCollect.keySet()) {
-            wjbhMap.put(s, (double) wjlxCollect.get(s));
-        }
-        result.add(wjbhMap);
-
-        for (QcSsgqzysytdqk qcSsgqzysytdqk : list) {
-            for (SysCategoryModel sysCategoryModel : sysCategoryModels) {
-                if (qcSsgqzysytdqk.getPzyt().equals(sysCategoryModel.getId())) {
-                    qcSsgqzysytdqk.setPzyt(sysCategoryModel.getName());
-                }
-            }
-        }
-        Map<String, List<QcSsgqzysytdqk>> collectBysjyt = list.stream().collect(Collectors.groupingBy((QcSsgqzysytdqk::getPzyt)));
-        for (String s : collectBysjyt.keySet()) {
-            sjytMap.put(s, (double) collectBysjyt.get(s).size());
-        }
-        result.add(sjytMap);
-        return result;
-    }
-
-}

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

@@ -1,19 +1,13 @@
 package org.jeecg.modules.zrzyqc.qyxx.controller;
 
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import io.lettuce.core.dynamic.annotation.Param;
-import io.swagger.models.auth.In;
 import org.apache.shiro.SecurityUtils;
-import org.codehaus.jettison.json.JSONObject;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.common.system.api.ISysBaseAPI;
@@ -22,9 +16,8 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.SysDepartModel;
 import org.jeecg.common.util.SpringContextUtils;
 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.qcsb.entity.QcSsgqzysytdqk;
-import org.jeecg.modules.zrzyqc.qcsb.service.IQcSsgqzysytdqkService;
 import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
 import org.jeecg.modules.zrzyqc.qyxx.service.IQcQyxxService;
 
@@ -34,6 +27,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.zrzyqc.util.ChangeNumber;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -59,14 +53,10 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
     @Autowired
     private IQcQyxxService qcQyxxService;
-    @Autowired
-    private IQcSsgqzysytdqkService qcSsgqzysytdqkService;
     @Value("${jeecg.path.upload}")
     private String upLoadPath;
-
     @Autowired
     private IQcSsgqzysytdqkGzvService qcSsgqzysytdqkGzvService;
-
     /**
      * 查询添加的年份列表,倒叙
      *
@@ -543,13 +533,13 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         ArrayList<Long> list = new ArrayList<>();
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LambdaQueryWrapper<QcQyxx> queryWrapper = new LambdaQueryWrapper();
-        LambdaQueryWrapper<QcSsgqzysytdqk> queryWrapper1 = new LambdaQueryWrapper();
+        LambdaQueryWrapper<QcSsgqzysytdqkGzv> queryWrapper1 = new LambdaQueryWrapper();
         queryWrapper.eq(QcQyxx::getSysOrgCode, sysUser.getOrgCode());
         queryWrapper.eq(QcQyxx::getSfsb, 4);
-        queryWrapper1.eq(QcSsgqzysytdqk::getSysOrgCode, sysUser.getOrgCode());
-        queryWrapper1.eq(QcSsgqzysytdqk::getSfsb, 4);
+        queryWrapper1.eq(QcSsgqzysytdqkGzv::getSysOrgCode, sysUser.getOrgCode());
+        queryWrapper1.eq(QcSsgqzysytdqkGzv::getSfsb, 4);
         long count = qcQyxxService.count(queryWrapper);
-        long count1 = qcSsgqzysytdqkService.count(queryWrapper1);
+        long count1 = qcSsgqzysytdqkGzvService.count(queryWrapper1);
         list.add(count);//退回单位信息
         list.add(count1);//退回地块信息
 
@@ -630,8 +620,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         list.add(yxdls);//有效登录数
         list.add(sbdks);//上报地块数
         list.add(yhjs);//用戶角色
-        list.add(sbdkmj);//上报地块面积
-        System.out.println(rolesByUsername);
+        list.add(ChangeNumber.ChangeString(sbdkmj));//上报地块面积
         return Result.OK(list);
     }
 
@@ -665,14 +654,13 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
                 break;
             }
         }
-        System.out.println(rolesByUsername);
         list.add(selectqyxx);//下发任务数
         list.add(yxdls);//有效登录数
         list.add(sbdks);//上报地块数
         list.add(wsh);//未审核
         list.add(yhjs);//用戶角色
-        list.add(szsbMj);//省直上报面积
-        list.add(szwshMj);//省直未审核面积
+        list.add(ChangeNumber.ChangeString(szsbMj));//省直上报面积
+        list.add(ChangeNumber.ChangeString(szwshMj));//省直未审核面积
         return Result.OK(list);
     }
 
@@ -708,7 +696,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
                 break;
             }
         }
-
         list.add(tgsh);
         list.add(btgsh);
         list.add(wsh);
@@ -743,12 +730,10 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
                 break;
             }
         }
-
         list.add(tgsh);
         list.add(btgsh);
         list.add(wsh);
         list.add(shz);
-        System.out.println(list);
         return Result.OK(list);
     }
 
@@ -776,9 +761,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
                 dlr = "sbyh";
             }
         }
-        System.out.println(dlr);
-
-
         return Result.OK(dlr);
     }
 
@@ -820,17 +802,19 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         list.add(yhjs);
         list.add(shmj);  //审核通过
         list.add(shmj_not); //审核不通过
-        System.out.println(list);
         return Result.OK(list);
     }
 
     /**
      * 首页-未审核数量
-     *
-     * @return
+     *  0-未上报
+     *  1-已上报待审核
+     *  2-审核中
+     *  3-已审核
+     *  4-错误退回
      */
     //@AutoLog(value = "首页-未审核数量")
-    @ApiOperation(value = "首页-未审核数量", notes = "首页-未审核数量")
+    @ApiOperation(value = "首页-省属未审核数量", notes = "首页-省属未审核数量")
     @GetMapping(value = "/wshsl")
     public Result<String> wshsl() {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -840,23 +824,26 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         String wshsl = "";
         String wshslMJ = "";
         for (String s : rolesByUsername) {
+            // shyh->审核用户 gzv->国资委  xfzx->修复中心 sjzh->省级账户
             if (s.equals("shyh") || s.equals("gzw") || s.equals("xfzx") || s.equals("sjzh")) {
+                //返回省属
                 wshsl = qcQyxxService.wshslAdmin();
                 wshslMJ = qcQyxxService.wshslAdminMJ();
                 break;
+                //sbyh ->企业上报用户  jgsbyh->机关上报用户
             } else if (s.equals("sbyh") || s.equals("jgsbyh")) {
+                //返回本用户下
                 wshsl = qcQyxxService.wshsl(username);
                 wshslMJ = qcQyxxService.wshslMJ(username);
             }
         }
-        //|
         if (wshsl == null) {
             wshsl = "0";
         }
         if (wshslMJ == null) {
             wshslMJ = "0";
         }
-        return Result.OK(wshsl + "|" + wshslMJ);
+        return Result.OK(wshsl + "|" + ChangeNumber.ChangeString(wshslMJ));
     }
 
     /**
@@ -992,7 +979,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         QueryWrapper queryWrapperBydxss = new QueryWrapper<>();
         //省直闲置低效面积
         QueryWrapper queryWrapperBydxsz = new QueryWrapper<>();
-
         //已审核省属企业数量
         QueryWrapper ssQysl = new QueryWrapper<>();
         //上报地块企业数量
@@ -1001,67 +987,53 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         QueryWrapper szQysl = new QueryWrapper<>();
         //上报地块单位数量
         QueryWrapper ssDwsl = new QueryWrapper<>();
-
-        queryWrapper.select("sum(CAST(sjzytdmj_m AS DECIMAL(10,2))) as  \"SUMSS\",count(SJZYTDMJ_M) as  \"COUNTDK\"");
+        //SELECT sum(CAST(sjzytdmj AS DECIMAL(10,2)))*0.0015 as  SUMSS,count(SJZYTDMJ) as  COUNTDK from qc_ssgqzysytdqk_gzv where sfsb=3 and sys_org_code like 'A04%'
+        queryWrapper.select("sum(CAST(sjzytdmj AS DECIMAL(10,2)))*0.0015 as  \"SUMSS\",count(SJZYTDMJ) as  \"COUNTDK\"");
         queryWrapper.eq("SFSB", 3);
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
+        Map<String, Object> map = qcSsgqzysytdqkGzvService.getMap(queryWrapper);
 
-
+        //转亩
         queryWrapperBysz.select("sum(SJZYTDMJ) as  \"sumsz\",count(SJZYTDMJ) as  \"countdk\"").likeRight("SYS_ORG_CODE", "A03");
         queryWrapperBysz.eq("SFSB", 3);
+        map.put("SUMSZ", Double.parseDouble(qcSsgqzysytdqkGzvService.getMap(queryWrapperBysz).get("sumsz").toString()) * 0.0015);
+        map.put("COUNTDKBYSZ", qcSsgqzysytdqkGzvService.getMap(queryWrapperBysz).get("countdk").toString());
 
-        queryWrapperBydxss.select("sum(CAST(sjzytdmj_m AS DECIMAL(10,2))) as \"sumssxzdx\",count(SJZYTDMJ_M) as  \"countdk\"");
+        queryWrapperBydxss.select("sum(CAST(sjzytdmj AS DECIMAL(10,2)))*0.0015 as \"sumssxzdx\",count(SJZYTDMJ) as  \"countdk\"");
         queryWrapperBydxss.eq("SFSB", 3);
         queryWrapperBydxss.eq("TDSYXZ", "闲置低效土地");
         queryWrapperBydxss.likeRight("SYS_ORG_CODE", "A04");
+        map.put("SUMSSXZDX", qcSsgqzysytdqkGzvService.getMap(queryWrapperBydxss).get("sumssxzdx"));
+        map.put("COUNTDKBYSSXZDX", qcSsgqzysytdqkGzvService.getMap(queryWrapperBydxss).get("countdk"));
 
         queryWrapperBydxsz.select("sum(SJZYTDMJ) as \"sumszxzdx\",count(SJZYTDMJ) as  \"countdk\"");
         queryWrapperBydxsz.eq("SFSB", 3);
         queryWrapperBydxsz.eq("TDSYXZ", "闲置低效土地");
         queryWrapperBydxsz.likeRight("SYS_ORG_CODE", "A03");
-        Map<String, Object> map = qcSsgqzysytdqkService.getMap(queryWrapper);
+        map.put("SUMSZXZDX", Double.parseDouble(qcSsgqzysytdqkGzvService.getMap(queryWrapperBydxsz).get("sumszxzdx").toString()) * 0.0015);
+        map.put("COUNTDKBYSZXZDX", qcSsgqzysytdqkGzvService.getMap(queryWrapperBydxsz).get("countdk").toString());
 
-        queryWrapperBydxsz.select("sum(SJZYTDMJ) as \"sumszxzdx\",count(SJZYTDMJ) as  \"countdk\"");
-        queryWrapperBydxsz.eq("SFSB", 3);
-        queryWrapperBydxsz.eq("TDSYXZ", "闲置低效土地");
-        queryWrapperBydxsz.likeRight("SYS_ORG_CODE", "A03");
-
-        ssQysl.select("count(SYS_ORG_CODE) as  \"ssQysl\"");
-        ssQysl.eq("SFSB", 3);
-        ssQysl.likeRight("SYS_ORG_CODE", "A04");
 
         ssQysl.select("count(SYS_ORG_CODE) as  \"ssQysl\"");
         ssQysl.eq("SFSB", 3);
         ssQysl.likeRight("SYS_ORG_CODE", "A04");
+        map.put("SSQYSL", qcQyxxService.getMap(ssQysl).get("ssQysl").toString());
 
         sbdkQysl.select(" count(DISTINCT(SYS_ORG_CODE)) as \"sbdkQysl\"");
         sbdkQysl.eq("SFSB", 3);
         sbdkQysl.likeRight("SYS_ORG_CODE", "A04");
+        map.put("SBDKQYSL", qcSsgqzysytdqkGzvService.getMap(sbdkQysl).get("sbdkQysl"));
 
         szQysl.select("count(SYS_ORG_CODE) as  \"szQysl\"");
         szQysl.eq("SFSB", 3);
         szQysl.likeRight("SYS_ORG_CODE", "A03");
+        map.put("SZQYSL", qcQyxxService.getMap(szQysl).get("szQysl").toString());
 
         ssDwsl.select(" count(DISTINCT(SYS_ORG_CODE)) as \"ssDwsl\"");
         ssDwsl.eq("SFSB", 3);
         ssDwsl.likeRight("SYS_ORG_CODE", "A03");
-
-
-        map.put("SUMSZ", Double.parseDouble(qcSsgqzysytdqkService.getMap(queryWrapperBysz).get("sumsz").toString()) * 0.0015);
-        map.put("COUNTDKBYSZ", qcSsgqzysytdqkService.getMap(queryWrapperBysz).get("countdk").toString());
-        map.put("SUMSSXZDX", qcSsgqzysytdqkService.getMap(queryWrapperBydxss).get("sumssxzdx"));
-        map.put("COUNTDKBYSSXZDX", qcSsgqzysytdqkService.getMap(queryWrapperBydxss).get("countdk"));
-        map.put("SUMSZXZDX", Double.parseDouble(qcSsgqzysytdqkService.getMap(queryWrapperBydxsz).get("sumszxzdx").toString()) * 0.0015);
-        map.put("COUNTDKBYSZXZDX", qcSsgqzysytdqkService.getMap(queryWrapperBydxsz).get("countdk").toString());
-        //
-        map.put("SSQYSL", qcQyxxService.getMap(ssQysl).get("ssQysl").toString());
-        //
-        map.put("SBDKQYSL", qcSsgqzysytdqkService.getMap(sbdkQysl).get("sbdkQysl"));
-        map.put("SZQYSL", qcQyxxService.getMap(szQysl).get("szQysl").toString());
-        map.put("SSDWSL", qcSsgqzysytdqkService.getMap(ssDwsl).get("ssDwsl"));
+        map.put("SSDWSL", qcSsgqzysytdqkGzvService.getMap(ssDwsl).get("ssDwsl"));
         /*上报地块面积*/
-        log.info("--------统计-上报地块面积 sugb----------------");
-        System.out.println(map);
         return Result.OK(map);
     }
 
@@ -1097,8 +1069,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
         queryWrapper.eq("SFSB", 3);
         List list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
-        log.info("--------统计-土地获取方式占比按照地块 sugb----------------");
-        System.out.println(list);
         return Result.OK(list);
     }
 
@@ -1121,8 +1091,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.eq("SFSB", 3);
 
         List list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
-        log.info("--------统计-土地获取方式占比按照面积 sugb----------------");
-        System.out.println(list);
         return Result.OK(list);
     }
 
@@ -1145,8 +1113,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.likeRight("SYS_ORG_CODE", "A03");
         queryWrapper.gt("SFSB", 1);
         List list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
-        log.info("--------统计-土地获取方式占比省直 sugb----------------");
-        System.out.println(list);
         return Result.OK(list);
     }
 
@@ -1169,8 +1135,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.groupBy("zslx");
         queryWrapper.likeRight("SYS_ORG_CODE", "A03");
         List<HashMap<String, Object>> list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
-        log.info("--------统计-权证登记比例省直 sugb----------------");
-        System.out.println(list);
         return getResult(sum, list);
     }
 
@@ -1205,7 +1169,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
     @ApiOperation(value = "统计-土地使用现状占比", notes = "统计-土地使用现状占比")
     @GetMapping(value = "/tdsyxzzb")
     public Result<?> tdsyxzzb(@RequestParam(name = "xzqh") String xzqh) {
-
         QueryWrapper queryWrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(xzqh)) {
             queryWrapper.likeRight("XZQH", xzqh);
@@ -1217,8 +1180,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.groupBy("TDSYXZ");
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
         List<HashMap<String, Object>> list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
-        log.info("--------统计-土地使用现状占比 sugb----------------");
-        System.out.println(list);
         return Result.OK(list);
     }
 
@@ -1240,8 +1201,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
         queryWrapper.eq("SFSB", 3);
         List<HashMap<String, Object>> list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
-        log.info("--------统计-权证登记比例省属 sugb----------------");
-        System.out.println(list);
         int sum = 0;
         return getResult2(sum, list);
     }
@@ -1434,7 +1393,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.likeRight("SYS_ORG_CODE", "A03");
         queryWrapper.eq("SFSB", 3);
         queryWrapper.eq("CZCJQK", "出租");
-        Map map = qcSsgqzysytdqkService.getMap(queryWrapper);
+        Map map = qcSsgqzysytdqkGzvService.getMap(queryWrapper);
 
         QueryWrapper queryWrapper1 = new QueryWrapper<>();
 
@@ -1442,7 +1401,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper1.likeRight("SYS_ORG_CODE", "A03");
         queryWrapper1.eq("SFSB", 3);
         queryWrapper1.eq("CZCJQK", "无");
-        Map map1 = qcSsgqzysytdqkService.getMap(queryWrapper1);
+        Map map1 = qcSsgqzysytdqkGzvService.getMap(queryWrapper1);
 
         QueryWrapper queryWrapper2 = new QueryWrapper<>();
 
@@ -1450,13 +1409,13 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper2.likeRight("SYS_ORG_CODE", "A03");
         queryWrapper2.eq("SFSB", 3);
         queryWrapper2.eq("tdsyxz", "闲置低效土地");
-        Map map2 = qcSsgqzysytdqkService.getMap(queryWrapper2);
+        Map map2 = qcSsgqzysytdqkGzvService.getMap(queryWrapper2);
         QueryWrapper queryWrapper3 = new QueryWrapper<>();
 
         queryWrapper3.select("count(SYS_ORG_CODE) as \"value\"");
         queryWrapper3.likeRight("SYS_ORG_CODE", "A03");
         queryWrapper3.eq("SFSB", 3);
-        Map map3 = qcSsgqzysytdqkService.getMap(queryWrapper3);
+        Map map3 = qcSsgqzysytdqkGzvService.getMap(queryWrapper3);
         //出租
         resultMap.add(map);
         //企业自用
@@ -1465,8 +1424,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         resultMap.add(map2);
         //总地块数量
         resultMap.add(map3);
-        log.info("--------省直-统计企业自用，出租数量 sugb----------------");
-        System.out.println(resultMap);
         return Result.OK(resultMap);
     }
 

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

@@ -17,109 +17,109 @@
     </select>
     <select id="sbdksAdmin" resultType="String">
         select count(1) sbdk
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where sfsb > 0
           and sys_org_code like 'A04%'
     </select>
     <!--    上报地块面积-->
     <select id="sbdksMjAdmin" resultType="java.lang.String">
-        select sum(sjzytdmj) as sjmj
-        from qc_ssgqzysytdqk
+        select ROUND(sum(sjzytdmj*0.0015) ,2) as sjmj
+        from qc_ssgqzysytdqk_gzv
         where sfsb > 0
           and sys_org_code like 'A04%'
     </select>
 
     <select id="sbdks" resultType="String">
         select count(1) sbdk
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where sfsb > 0
           and create_by = #{username}
     </select>
     <!--  面积-->
     <select id="sbdksMj" resultType="java.lang.String">
-        select sum(sjzytdmj) as sjmj
-        from qc_ssgqzysytdqk
+        select ROUND(sum(sjzytdmj*0.0015),2) as sjmj
+        from qc_ssgqzysytdqk_gzv
         where sfsb > 0
           and create_by = #{username}
     </select>
 
     <select id="wsh" resultType="String" parameterType="String">
         select count(1) shzt
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where create_by = #{username}
           and sfsb = 1
     </select>
     <select id="tgsh" resultType="String" parameterType="String">
         select count(1) shzt
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where shzt = '通过'
           and create_by = #{username}
           and sfsb = 3
     </select>
     <select id="btgsh" resultType="String" parameterType="String">
         select count(1) shzt
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where shzt = '不通过'
           and create_by = #{username}
           and sfsb = 3
     </select>
     <select id="tgshAdmin" resultType="String">
         select count(1) shzt
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where shzt = '通过'
           and sfsb = 3
           and sys_org_code like 'A04%'
     </select>
     <select id="wshAdmin" resultType="String">
         select count(1) shzt
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where sfsb = 1
           and sys_org_code like 'A04%'
     </select>
     <select id="btgshAdmin" resultType="String">
         select count(1) shzt
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where shzt = '不通过'
           and sfsb = 4
           and sys_org_code like 'A04%'
     </select>
     <select id="dqsbs" resultType="String" parameterType="String">
         select count(1) sbdk
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where create_by = #{username}
           and sfsb = 1
     </select>
     <select id="cwth" resultType="String" parameterType="String">
         select count(1) sbdk
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where sfsb = 4
           and create_by = #{username}
     </select>
     <!--    审核通过-->
     <select id="shmj" resultType="java.lang.String">
-        select sum(sjzytdmj) as sjmj
-        from qc_ssgqzysytdqk
+        select ROUND(sum(sjzytdmj),2) as sjmj
+        from qc_ssgqzysytdqk_gzv
         where shzt = '通过'
           and create_by = #{username}
     </select>
     <!--    审核不通过-->
     <select id="shmjNot" resultType="java.lang.String">
-        select sum(sjzytdmj) as sjmj
-        from qc_ssgqzysytdqk
+        select ROUND(sum(sjzytdmj),2) as sjmj
+        from qc_ssgqzysytdqk_gzv
         where shzt = '不通过'
           and create_by = #{username}
     </select>
 <!--    已审核-->
     <select id="wshsl" resultType="String" parameterType="String">
         select count(1) sbdk
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where create_by = #{username}
           and sfsb in (1)
     </select>
 <!--  未审核  -->
     <select id="wshslMJ" resultType="java.lang.String">
-        select sum(sjzytdmj) as sjmj
-        from qc_ssgqzysytdqk
+        select ROUND(sum(sjzytdmj*0.0015),2)as sjmj
+        from qc_ssgqzysytdqk_gzv
         where create_by = #{username}
           and sfsb in (1)
     </select>
@@ -127,27 +127,27 @@
     <!--sfsb 是否上报-->
     <select id="wshslAdmin" resultType="String" parameterType="String">
         select count(1) sbdk
-        from qc_ssgqzysytdqk
-        where sfsb = 1
+        from qc_ssgqzysytdqk_gzv
+        where sfsb in (1,2)
           and sys_org_code like 'A04%'
     </select>
     <select id="wshslAdminMJ" resultType="java.lang.String">
-        select sum(sjzytdmj) AS mj
-        from qc_ssgqzysytdqk
-        where sfsb = 1
+        select ROUND(sum(sjzytdmj*0.0015),2) AS mj
+        from qc_ssgqzysytdqk_gzv
+        where sfsb in(1,2)
           and sys_org_code like 'A04%'
     </select>
 
 
     <select id="shzsl" resultType="String" parameterType="String">
         select count(1) sbdk
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where create_by = #{username}
           and sfsb in (2)
     </select>
     <select id="shzslAdmin" resultType="String" parameterType="String">
         select count(1) sbdk
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where sfsb = 2
           and sys_org_code like 'A04%'
     </select>
@@ -186,21 +186,21 @@
     </select>
     <select id="sydwsbdksAdmin" resultType="String">
         select count(1) sbdk
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where sfsb > 0
           and sys_org_code like 'A03%'
     </select>
     <!--省直上报面积-->
     <select id="sydwsbdksAdminMj" resultType="java.lang.String">
-        select sum(sjzytdmj) as sjmj
-        from qc_ssgqzysytdqk
+        select ROUND(sum(sjzytdmj) ,2)as sjmj
+        from qc_ssgqzysytdqk_gzv
         where sfsb > 0
           and sys_org_code like 'A03%'
     </select>
 
     <select id="sydwwshAdminWshMj" resultType="java.lang.String">
-        select sum(sjzytdmj) as sjmj
-        from qc_ssgqzysytdqk
+        select ROUND(sum(sjzytdmj),2) as sjmj
+        from qc_ssgqzysytdqk_gzv
         where shzt='未审核'
           and sys_org_code like 'A03%'
     </select>
@@ -208,27 +208,27 @@
     <!--饼图-->
     <select id="sydwtgshAdmin" resultType="String">
         select count(1) shzt
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where shzt = '通过'
           and sfsb = 3
           and sys_org_code like 'A03%'
     </select>
     <select id="sydwwshAdmin" resultType="String">
         select count(1) shzt
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where sfsb = 1
           and sys_org_code like 'A03%'
     </select>
     <select id="sydwbtgshAdmin" resultType="String">
         select count(1) shzt
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where shzt = '不通过'
           and sfsb = 4
           and sys_org_code like 'A03%'
     </select>
     <select id="sydwshzslAdmin" resultType="String" parameterType="String">
         select count(1) sbdk
-        from qc_ssgqzysytdqk
+        from qc_ssgqzysytdqk_gzv
         where sfsb = 2
           and sys_org_code like 'A03%'
     </select>
@@ -236,7 +236,7 @@
 
     <select id="sjyttjsz" resultType="map">
         select count(a.pzyt) as "value", b.name as "name"
-        from QC_SSGQZYSYTDQK a
+        from qc_ssgqzysytdqk_gzv a
         LEFT JOIN SYS_CATEGORY b
         on a.pzyt = b.id
         where a.SYS_ORG_CODE like 'A03%'
@@ -248,10 +248,10 @@
     <select id="dtdktjByxq" resultType="map" parameterType="String">
         select count(b.XJXZQHDM) as "value", b.XJXZQHMC as "name",b.XJXZQHDM as "xzqhdm",b.sjxzqhdm as "sjxzqhdm",
         <if test="orgCode=='A04'">
-            sum(CAST(sjzytdmj_m AS DECIMAL(10,2))) as "value2"
+            ROUND(sum(CAST(sjzytdmj AS DECIMAL(16,2))*0.0015),2) as "value2"
         </if>
         <if test="orgCode=='A03'">
-            sum(SJZYTDMJ*0.0015) as "value2"
+            ROUND(sum(SJZYTDMJ*0.0015),2) as "value2"
         </if>
         from QC_SSGQZYSYTDQK a
         right JOIN (select * from XZQH) b
@@ -264,10 +264,10 @@
 
         select count(b.sjxzqhdm) as "value", b.SJXZQHMC as "name",b.SJXZQHDM as "xzqhdm",
         <if test="orgCode=='A04'">
-            sum(CAST(sjzytdmj_m AS DECIMAL(10,2))) as "value2"
+            ROUND(sum(CAST(sjzytdmj AS DECIMAL(16,2))*0.0015),2) as "value2"
         </if>
         <if test="orgCode=='A03'">
-            sum(SJZYTDMJ*0.0015) as "value2"
+            ROUND(sum(SJZYTDMJ*0.0015),2) as "value2"
         </if>
         from QC_SSGQZYSYTDQK a
         LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b
@@ -289,7 +289,7 @@
     </select>
     <select id="sjyttjss" resultType="map">
         select count(a.sjyt) as "value", b.name as "name", b.id as "code"
-        from QC_SSGQZYSYTDQK a
+        from qc_ssgqzysytdqk_gzv a
         LEFT JOIN SYS_CATEGORY b
         on a.sjyt = b.id
         where a.SYS_ORG_CODE like 'A04%'
@@ -302,16 +302,16 @@
     <select id="ssdkmj" resultType="map">
         select VA as "value", NA as "name", VA2 as "value2"
         from (
-                 select ROUND(sum(CAST(sjzytdmj_m AS DECIMAL(10, 2))), 2) VA, b.SJXZQHMC na, b.SJXZQHDM xzqh
-                 from QC_SSGQZYSYTDQK a
+                 select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16, 2))*0.0015), 2) VA, b.SJXZQHMC na, b.SJXZQHDM xzqh
+                 from qc_ssgqzysytdqk_gzv a
                           LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b
                                     on a.xzqh like b.SJXZQHDM || '%'
                  where SYS_ORG_CODE like 'A04%'
                    and sfsb = 3
                  GROUP BY b.SJXZQHDM, b.SJXZQHMC
              ) c
-                 LEFT JOIN (select ROUND(sum(CAST(sjzytdmj_m AS DECIMAL(10, 2))), 2) VA2, b.SJXZQHDM as xzqh2
-                            from QC_SSGQZYSYTDQK a
+                 LEFT JOIN (select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16, 2))*0.0015), 2) VA2, b.SJXZQHDM as xzqh2
+                            from qc_ssgqzysytdqk_gzv a
                                      LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b
                                                on a.xzqh like b.SJXZQHDM || '%'
                             where TDSYXZ = '闲置低效土地'
@@ -323,8 +323,8 @@
     <select id="ssdkmjbyqx" resultType="map">
         select VA as "value", NA as "name", VA2 as "value2"
         from (
-                 select sum(CAST(sjzytdmj_m AS DECIMAL(10, 2))) VA, b.XJXZQHMC na, b.XJXZQHDM xzqh, b.SJXZQHDM
-                 from QC_SSGQZYSYTDQK a
+                 select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16, 2))*0.0015),2) VA, b.XJXZQHMC na, b.XJXZQHDM xzqh, b.SJXZQHDM
+                 from qc_ssgqzysytdqk_gzv a
                           LEFT JOIN (select * from XZQH) b
                                     on a.xzqh = b.XJXZQHDM
                  where SYS_ORG_CODE like 'A04%'
@@ -332,8 +332,8 @@
                    and xzqh like CONCAT(#{xzqh}, '%')
                  GROUP BY b.XJXZQHDM, b.XJXZQHMC, b.SJXZQHDM
              ) c
-                 LEFT JOIN (select sum(CAST(sjzytdmj_m AS DECIMAL(10, 2))) VA2, b.XJXZQHDM as xzqh2
-                            from QC_SSGQZYSYTDQK a
+                 LEFT JOIN (select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16, 2))*0.0015),2) VA2, b.XJXZQHDM as xzqh2
+                            from qc_ssgqzysytdqk_gzv a
                                      LEFT JOIN (select * from XZQH) b
                                                on a.xzqh = b.XJXZQHDM
                             where TDSYXZ = '闲置低效土地'
@@ -347,7 +347,7 @@
         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
-                 from QC_SSGQZYSYTDQK a
+                 from qc_ssgqzysytdqk_gzv a
                           LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b
                                     on a.xzqh like b.SJXZQHDM || '%'
                  where SYS_ORG_CODE like 'A03%'
@@ -355,7 +355,7 @@
                  GROUP BY b.SJXZQHDM, b.SJXZQHMC
              ) c
                  LEFT JOIN (select ROUND(sum(SJZYTDMJ * 0.0015), 2) VA2, b.SJXZQHDM as xzqh2
-                            from QC_SSGQZYSYTDQK a
+                            from qc_ssgqzysytdqk_gzv a
                                      LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b
                                                on a.xzqh like b.SJXZQHDM || '%'
                             where TDSYXZ = '闲置低效土地'
@@ -367,7 +367,7 @@
         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
-                 from QC_SSGQZYSYTDQK a
+                 from qc_ssgqzysytdqk_gzv a
                           RIGHT JOIN (select * from XZQH) b
                                      on a.xzqh = b.XJXZQHDM
                  where SYS_ORG_CODE like 'A03%'
@@ -376,7 +376,7 @@
                  GROUP BY b.XJXZQHDM, b.XJXZQHMC, b.SJXZQHDM
              ) c
                  LEFT JOIN (select ROUND(sum(SJZYTDMJ * 0.0015), 2) VA2, b.XJXZQHDM as xzqh2
-                            from QC_SSGQZYSYTDQK a
+                            from qc_ssgqzysytdqk_gzv a
                                      RIGHT JOIN (select * from XZQH) b
                                                 on a.xzqh = b.XJXZQHDM
                             where TDSYXZ = '闲置低效土地'
@@ -385,13 +385,13 @@
                               and xzqh like CONCAT(#{xzqh}, '%')
                             GROUP BY b.XJXZQHDM) d on c.xzqh = d.xzqh2
     </select>
-
+<!--一级单位用地亩-->
     <select id="yjdwhz" resultType="map">
         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 (
-        select sum(CAST(sjzytdmj_m AS DECIMAL(10,2))) as area, sys_ORG_CODE as orgcode
-        FROM QC_SSGQZYSYTDQK
+        select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16,2)))*0.0015,2) as area, sys_ORG_CODE as orgcode
+        FROM qc_ssgqzysytdqk_gzv
         where sys_ORG_CODE like 'A04A%'
         <if test="xzqh !=null">
             and xzqh like CONCAT( #{xzqh},'%')
@@ -405,7 +405,7 @@
         SELECT
             TO_CHAR( create_time, 'YYYY' ) AS YEAR
         FROM
-            qc_ssgqzysytdqk
+            qc_ssgqzysytdqk_gzv
         GROUP BY
             YEAR
         ORDER BY

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

@@ -49,6 +49,7 @@ public interface IQcQyxxService extends IService<QcQyxx> {
     String tgshAdmin();
 
     String wshAdmin();
+
     String wshslAdminMJ();
 
     String btgshAdmin();

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/util/ChangeNumber.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.zrzyqc.util;
+
+public class ChangeNumber {
+
+    /**
+     * 修改面积,小数点后面为零的直接去掉
+     * @param number
+     * @return
+     */
+    public static String ChangeString(String number){
+        if (number==null){
+            return null;
+        }
+        if (number.contains(".00")){
+            String sprx[]=number.split("\\.");
+            return sprx[0];
+        }else{
+            return number;
+        }
+    }
+}