1.修改7个统计接口

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

@@ -167,7 +167,7 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
-    password: ''
+    password: 'jintian'
     port: 6379
 #mybatis plus 设置
 mybatis-plus:

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

@@ -170,7 +170,7 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
-    password: jintian
+    password: 'jintian'
     port: 6379
 #mybatis plus 设置
 mybatis-plus:

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

@@ -15,6 +15,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -306,5 +307,57 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 		return Result.OK(pageList);
 	}
 
+	/**
+	 * 编辑
+	 *
+	 * @param qcSsgqzysytdqk
+	 * @return
+	 */
+	@AutoLog(value = "省属国企占有使用土地情况调查-编辑")
+	@ApiOperation(value = "省属国企占有使用土地情况调查-编辑", notes = "省属国企占有使用土地情况调查-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+	public Result<String> edit(@RequestBody QcSsgqzysytdqkGzv qcSsgqzysytdqk) {
+		qcSsgqzysytdqkGzvService.updateById(qcSsgqzysytdqk);
+		//
+		if (qcSsgqzysytdqk.getSfsb() == 1) {
+			this.sfsh(qcSsgqzysytdqk.getId());
+		}
+		if (qcSsgqzysytdqk.getShzt().equals("通过")) {
+			//是否上报为3 审核通过状态
+			qcSsgqzysytdqk.setSfsb(3);
+			qcSsgqzysytdqkGzvService.updateById(qcSsgqzysytdqk);
+		}
+		return Result.OK("编辑成功!");
+	}
+
+	@AutoLog(value = "用地单位信息是否审核")
+	@ApiOperation(value = "用地单位信息是否审核", notes = "用地单位信息是否审核")
+	@GetMapping(value = "/sfsh")
+	public Result<String> sfsh(String id) {
+		QcSsgqzysytdqkGzv qk = qcSsgqzysytdqkGzvService.getById(id);
+		if (qk.getSfsb() == 1) {
+			qk.setSfsb(2);
+			qcSsgqzysytdqkGzvService.saveOrUpdate(qk);
+		}
+		return Result.OK("审核中!");
+	}
+
+	/**
+	 * 编辑
+	 *
+	 * @param qcSsgqzysytdqk
+	 * @return
+	 */
+	@AutoLog(value = "省属国企占有使用土地情况调查-编辑")
+	@ApiOperation(value = "省属国企占有使用土地情况调查-编辑", notes = "省属国企占有使用土地情况调查-编辑")
+	@RequestMapping(value = "/edit1", method = {RequestMethod.PUT, RequestMethod.POST})
+	public Result<String> edit1(@RequestBody QcSsgqzysytdqkGzv qcSsgqzysytdqk) {
+		//当输入的为亩时
+		if (qcSsgqzysytdqk.getSfsb() == 3) {
+			qcSsgqzysytdqk.setSfsb(1);
+			qcSsgqzysytdqkGzvService.saveOrUpdate(qcSsgqzysytdqk);
+		}
+		return Result.OK("变更成功!");
+	}
 
 }

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

@@ -588,4 +588,9 @@ public class QcSsgqzysytdqkGzv implements Serializable {
 	@Excel(name = "删除标志", width = 15)
     @ApiModelProperty(value = "删除标志")
     private String delFlag;
+
+    /**zslx*/
+    @Excel(name = "证书类型", width = 125)
+    @ApiModelProperty(value = "证书类型")
+    private String zslx;
 }

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

@@ -18,6 +18,7 @@ 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;
@@ -114,18 +115,18 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
 
     }
 
-    @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 = "/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 = "用地单位信息重新上报")
@@ -230,7 +231,6 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
         } else {
             return Result.error("请先进行审核！");
         }
-
     }
 
     @AutoLog(value = "用地单位信息审核结果")
@@ -455,138 +455,138 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
         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);
-
-        }
-
+//    /**
+//     * 编辑
+//     *
+//     * @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("编辑成功!");
+//    }
 
 
-        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删除

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

@@ -22,6 +22,7 @@ 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.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;
@@ -63,6 +64,9 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
     @Value("${jeecg.path.upload}")
     private String upLoadPath;
 
+    @Autowired
+    private IQcSsgqzysytdqkGzvService qcSsgqzysytdqkGzvService;
+
     /**
      * 查询添加的年份列表,倒叙
      *
@@ -1049,11 +1053,14 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         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"));
         /*上报地块面积*/
+        log.info("--------统计-上报地块面积 sugb----------------");
         System.out.println(map);
         return Result.OK(map);
     }
@@ -1071,6 +1078,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         return Result.OK("null");
     }
 
+
     /**
      * 统计-土地获取方式占比按照地块
      *
@@ -1088,7 +1096,8 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.groupBy("SYQSYFS");
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
         queryWrapper.eq("SFSB", 3);
-        List list = qcSsgqzysytdqkService.listMaps(queryWrapper);
+        List list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
+        log.info("--------统计-土地获取方式占比按照地块 sugb----------------");
         System.out.println(list);
         return Result.OK(list);
     }
@@ -1098,7 +1107,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
      *
      * @return
      */
-    @ApiOperation(value = "统计-土地获取方式占比", notes = "统计-土地获取方式占比")
+    @ApiOperation(value = "统计-土地获取方式占比按照面积", notes = "统计-土地获取方式占比按照面积")
     @GetMapping(value = "/tdhqfsArea")
     public Result<?> tdhqfsArea(@RequestParam(name = "xzqh") String xzqh) {
         QueryWrapper queryWrapper = new QueryWrapper<>();
@@ -1106,11 +1115,13 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
             queryWrapper.likeRight("XZQH", xzqh);
         }
         Map<String, Object> resultMap = new HashMap<>();
-        queryWrapper.select("sum(CAST(sjzytdmj_m AS DECIMAL(10,2))) as \"value\",SYQSYFS as \"name\"");
+        queryWrapper.select("sum(CAST(sjzytdmj AS DECIMAL(10,2))) as \"value\",SYQSYFS as \"name\"");
         queryWrapper.groupBy("SYQSYFS");
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
         queryWrapper.eq("SFSB", 3);
-        List list = qcSsgqzysytdqkService.listMaps(queryWrapper);
+
+        List list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
+        log.info("--------统计-土地获取方式占比按照面积 sugb----------------");
         System.out.println(list);
         return Result.OK(list);
     }
@@ -1133,7 +1144,9 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.groupBy("SYQSYFS");
         queryWrapper.likeRight("SYS_ORG_CODE", "A03");
         queryWrapper.gt("SFSB", 1);
-        List list = qcSsgqzysytdqkService.listMaps(queryWrapper);
+        List list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
+        log.info("--------统计-土地获取方式占比省直 sugb----------------");
+        System.out.println(list);
         return Result.OK(list);
     }
 
@@ -1155,7 +1168,9 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.gt("SFSB", 1);
         queryWrapper.groupBy("zslx");
         queryWrapper.likeRight("SYS_ORG_CODE", "A03");
-        List<HashMap<String, Object>> list = qcSsgqzysytdqkService.listMaps(queryWrapper);
+        List<HashMap<String, Object>> list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
+        log.info("--------统计-权证登记比例省直 sugb----------------");
+        System.out.println(list);
         return getResult(sum, list);
     }
 
@@ -1201,7 +1216,9 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.eq("SFSB", 3);
         queryWrapper.groupBy("TDSYXZ");
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
-        List<HashMap<String, Object>> list = qcSsgqzysytdqkService.listMaps(queryWrapper);
+        List<HashMap<String, Object>> list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
+        log.info("--------统计-土地使用现状占比 sugb----------------");
+        System.out.println(list);
         return Result.OK(list);
     }
 
@@ -1222,7 +1239,9 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.groupBy("wjlx");
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
         queryWrapper.eq("SFSB", 3);
-        List<HashMap<String, Object>> list = qcSsgqzysytdqkService.listMaps(queryWrapper);
+        List<HashMap<String, Object>> list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
+        log.info("--------统计-权证登记比例省属 sugb----------------");
+        System.out.println(list);
         int sum = 0;
         return getResult2(sum, list);
     }
@@ -1268,7 +1287,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
     @GetMapping(value = "/yjdwmjhz")
     public Result<?> yjdwmjhz(@RequestParam(name = "xzqh") String xzqh) {
         List<HashMap<String, Object>> list = qcQyxxService.yjdwhz(xzqh);
-
         return getResult(list);
     }
 
@@ -1397,7 +1415,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         } else {
             ssdkmj = qcQyxxService.szdkmj();
         }
-
         return getSszytdResult(ssdkmj);
     }
 
@@ -1406,8 +1423,8 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
      *
      * @return
      */
-    @AutoLog(value = "省直————统计企业自用，出租数量")
-    @ApiOperation(value = "省直————统计企业自用，出租数量", notes = "省直————统计企业自用，出租数量")
+    @AutoLog(value = "省直-统计企业自用，出租数量")
+    @ApiOperation(value = "省直-统计企业自用，出租数量", notes = "省直-统计企业自用，出租数量")
     @GetMapping(value = "/szqyzy")
     public Result<?> szqyzy() {
         List resultMap = new ArrayList();
@@ -1448,7 +1465,8 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         resultMap.add(map2);
         //总地块数量
         resultMap.add(map3);
-
+        log.info("--------省直-统计企业自用，出租数量 sugb----------------");
+        System.out.println(resultMap);
         return Result.OK(resultMap);
     }