wangjinsheng преди 3 години
родител
ревизия
13b4473daf

+ 83 - 21
mybusiness/src/main/java/com/sooka/system/controller/TGuijiNaturalresourcesBdcdjxxController.java

@@ -1,6 +1,7 @@
 package com.sooka.system.controller;
 
 import java.util.List;
+
 import com.sooka.common.annotation.Log;
 import com.sooka.common.core.controller.BaseController;
 import com.sooka.common.core.domain.AjaxResult;
@@ -21,34 +22,101 @@ import com.sooka.system.service.ITGuijiNaturalresourcesBdcdjxxService;
 
 /**
  * 不动产登记信息Controller
- * 
+ *
  * @author lei
  * @date 2021-10-29
  */
 @Controller
 @RequestMapping("/system/bdcdjxx")
-public class TGuijiNaturalresourcesBdcdjxxController extends BaseController
-{
+public class TGuijiNaturalresourcesBdcdjxxController extends BaseController {
     private String prefix = "system/bdcdjxx";
 
     @Autowired
     private ITGuijiNaturalresourcesBdcdjxxService tGuijiNaturalresourcesBdcdjxxService;
 
-    @RequiresPermissions("system:bdcdjxx:view")
+    //不动产住宅
+    @RequiresPermissions("system:bdczz:view")
     @GetMapping()
-    public String bdcdjxx()
-    {
+    public String bdcdjxx(ModelMap map) {
+        map.put("flag","bdczz");
+        return prefix + "/bdcdjxx";
+    }
+
+    //不动产办公
+    @RequiresPermissions("system:bdcbg:view")
+    @GetMapping("/bdcbg")
+    public String bdcbg(ModelMap map) {
+        map.put("flag","bdcbg");
+        return prefix + "/bdcdjxx";
+    }
+
+    //不动产商业服务
+    @RequiresPermissions("system:bdcsyfw:view")
+    @GetMapping("/bdcsyfw")
+    public String bdcsyfw(ModelMap map) {
+        map.put("flag","bdcsyfw");
+        return prefix + "/bdcdjxx";
+    }
+
+    //不动产其他
+    @RequiresPermissions("system:bdcqt:view")
+    @GetMapping("/bdcqt")
+    public String bdcqt(ModelMap map) {
+        map.put("flag","bdcqt");
         return prefix + "/bdcdjxx";
     }
 
+    //不动产住宅
+    @RequiresPermissions("system:bdcdjxx:list")
+    @PostMapping("/bdczzList")
+    @ResponseBody
+    public TableDataInfo bdczzList(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx) {
+        startPage();
+        tGuijiNaturalresourcesBdcdjxx.setGhyt("住宅");
+        List<TGuijiNaturalresourcesBdcdjxx> list = tGuijiNaturalresourcesBdcdjxxService.selectTGuijiNaturalresourcesBdcdjxxList(tGuijiNaturalresourcesBdcdjxx);
+        return getDataTable(list);
+    }
+
+    //不动产办公
+    @RequiresPermissions("system:bdcdjxx:list")
+    @PostMapping("/bdcbgList")
+    @ResponseBody
+    public TableDataInfo bdcbg(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx) {
+        startPage();
+        tGuijiNaturalresourcesBdcdjxx.setGhyt("办公");
+        List<TGuijiNaturalresourcesBdcdjxx> list = tGuijiNaturalresourcesBdcdjxxService.selectTGuijiNaturalresourcesBdcdjxxList(tGuijiNaturalresourcesBdcdjxx);
+        return getDataTable(list);
+    }
+
+    //不动产商业服务
+    @RequiresPermissions("system:bdcdjxx:list")
+    @PostMapping("/bdcsyfwList")
+    @ResponseBody
+    public TableDataInfo bdcsyfw(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx) {
+        startPage();
+        tGuijiNaturalresourcesBdcdjxx.setGhyt("商业服务");
+        List<TGuijiNaturalresourcesBdcdjxx> list = tGuijiNaturalresourcesBdcdjxxService.selectTGuijiNaturalresourcesBdcdjxxList(tGuijiNaturalresourcesBdcdjxx);
+        return getDataTable(list);
+    }
+
+    //不动产其他
+    @RequiresPermissions("system:bdcdjxx:list")
+    @PostMapping("/bdcqtList")
+    @ResponseBody
+    public TableDataInfo bdcqt(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx) {
+        startPage();
+//        tGuijiNaturalresourcesBdcdjxx.setGhyt("商业服务");
+        List<TGuijiNaturalresourcesBdcdjxx> list = tGuijiNaturalresourcesBdcdjxxService.selectTGuijiNaturalresourcesBdcdjxxQtList(tGuijiNaturalresourcesBdcdjxx);
+        return getDataTable(list);
+    }
+
     /**
      * 查询不动产登记信息列表
      */
     @RequiresPermissions("system:bdcdjxx:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx)
-    {
+    public TableDataInfo list(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx) {
         startPage();
         List<TGuijiNaturalresourcesBdcdjxx> list = tGuijiNaturalresourcesBdcdjxxService.selectTGuijiNaturalresourcesBdcdjxxList(tGuijiNaturalresourcesBdcdjxx);
         return getDataTable(list);
@@ -61,8 +129,7 @@ public class TGuijiNaturalresourcesBdcdjxxController extends BaseController
     @Log(title = "不动产登记信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx)
-    {
+    public AjaxResult export(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx) {
         List<TGuijiNaturalresourcesBdcdjxx> list = tGuijiNaturalresourcesBdcdjxxService.selectTGuijiNaturalresourcesBdcdjxxList(tGuijiNaturalresourcesBdcdjxx);
         ExcelUtil<TGuijiNaturalresourcesBdcdjxx> util = new ExcelUtil<TGuijiNaturalresourcesBdcdjxx>(TGuijiNaturalresourcesBdcdjxx.class);
         return util.exportExcel(list, "bdcdjxx");
@@ -72,8 +139,7 @@ public class TGuijiNaturalresourcesBdcdjxxController extends BaseController
      * 新增不动产登记信息
      */
     @GetMapping("/add")
-    public String add()
-    {
+    public String add() {
         return prefix + "/add";
     }
 
@@ -84,8 +150,7 @@ public class TGuijiNaturalresourcesBdcdjxxController extends BaseController
     @Log(title = "不动产登记信息", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx)
-    {
+    public AjaxResult addSave(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx) {
         return toAjax(tGuijiNaturalresourcesBdcdjxxService.insertTGuijiNaturalresourcesBdcdjxx(tGuijiNaturalresourcesBdcdjxx));
     }
 
@@ -93,8 +158,7 @@ public class TGuijiNaturalresourcesBdcdjxxController extends BaseController
      * 修改不动产登记信息
      */
     @GetMapping("/edit/{id}")
-    public String edit(@PathVariable("id") String id, ModelMap mmap)
-    {
+    public String edit(@PathVariable("id") String id, ModelMap mmap) {
         TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx = tGuijiNaturalresourcesBdcdjxxService.selectTGuijiNaturalresourcesBdcdjxxById(id);
         mmap.put("tGuijiNaturalresourcesBdcdjxx", tGuijiNaturalresourcesBdcdjxx);
         return prefix + "/edit";
@@ -107,8 +171,7 @@ public class TGuijiNaturalresourcesBdcdjxxController extends BaseController
     @Log(title = "不动产登记信息", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx)
-    {
+    public AjaxResult editSave(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx) {
         return toAjax(tGuijiNaturalresourcesBdcdjxxService.updateTGuijiNaturalresourcesBdcdjxx(tGuijiNaturalresourcesBdcdjxx));
     }
 
@@ -117,10 +180,9 @@ public class TGuijiNaturalresourcesBdcdjxxController extends BaseController
      */
     @RequiresPermissions("system:bdcdjxx:remove")
     @Log(title = "不动产登记信息", businessType = BusinessType.DELETE)
-    @PostMapping( "/remove")
+    @PostMapping("/remove")
     @ResponseBody
-    public AjaxResult remove(String ids)
-    {
+    public AjaxResult remove(String ids) {
         return toAjax(tGuijiNaturalresourcesBdcdjxxService.deleteTGuijiNaturalresourcesBdcdjxxByIds(ids));
     }
 }

+ 72 - 3
mybusiness/src/main/java/com/sooka/system/controller/TGuijiNaturalresourcesBdcdjzxxController.java

@@ -7,6 +7,7 @@ import com.sooka.common.core.domain.AjaxResult;
 import com.sooka.common.core.page.TableDataInfo;
 import com.sooka.common.enums.BusinessType;
 import com.sooka.common.utils.poi.ExcelUtil;
+import com.sooka.system.domain.TGuijiNaturalresourcesBdcdjxx;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -34,13 +35,81 @@ public class TGuijiNaturalresourcesBdcdjzxxController extends BaseController
     @Autowired
     private ITGuijiNaturalresourcesBdcdjzxxService tGuijiNaturalresourcesBdcdjzxxService;
 
-    @RequiresPermissions("system:bdcdjzxx:view")
+    //不动产住宅证信息
+    @RequiresPermissions("system:bdcqt:view")
     @GetMapping()
-    public String bdcdjzxx()
-    {
+    public String bdcdjzxx(ModelMap map) {
+        map.put("flag","bdczz");
         return prefix + "/bdcdjzxx";
     }
 
+    //不动产办公
+    @RequiresPermissions("system:bdcqt:view")
+    @GetMapping("/bdcbg")
+    public String bdcbg(ModelMap map) {
+        map.put("flag","bdcbg");
+        return prefix + "/bdcdjzxx";
+    }
+
+    //不动产商业服务
+    @RequiresPermissions("system:bdcqt:view")
+    @GetMapping("/bdcsyfw")
+    public String bdcsyfw(ModelMap map) {
+        map.put("flag","bdcsyfw");
+        return prefix + "/bdcdjzxx";
+    }
+
+    //不动产其他
+    @RequiresPermissions("system:bdcqt:view")
+    @GetMapping("/bdcqt")
+    public String bdcqt(ModelMap map) {
+        map.put("flag","bdcqt");
+        return prefix + "/bdcdjzxx";
+    }
+
+    //不动产住宅
+    @RequiresPermissions("system:bdcdjxx:list")
+    @PostMapping("/bdczzList")
+    @ResponseBody
+    public TableDataInfo bdczzList(TGuijiNaturalresourcesBdcdjzxx tGuijiNaturalresourcesBdcdjzxx) {
+        startPage();
+        tGuijiNaturalresourcesBdcdjzxx.setYt("住宅");
+        List<TGuijiNaturalresourcesBdcdjzxx> list = tGuijiNaturalresourcesBdcdjzxxService.selectTGuijiNaturalresourcesBdcdjzxxList(tGuijiNaturalresourcesBdcdjzxx);
+        return getDataTable(list);
+    }
+
+    //不动产办公
+    @RequiresPermissions("system:bdcdjxx:list")
+    @PostMapping("/bdcbgList")
+    @ResponseBody
+    public TableDataInfo bdcbg(TGuijiNaturalresourcesBdcdjzxx tGuijiNaturalresourcesBdcdjzxx) {
+        startPage();
+        tGuijiNaturalresourcesBdcdjzxx.setYt("办公");
+        List<TGuijiNaturalresourcesBdcdjzxx> list = tGuijiNaturalresourcesBdcdjzxxService.selectTGuijiNaturalresourcesBdcdjzxxList(tGuijiNaturalresourcesBdcdjzxx);
+        return getDataTable(list);
+    }
+
+    //不动产商业服务
+    @RequiresPermissions("system:bdcdjxx:list")
+    @PostMapping("/bdcsyfwList")
+    @ResponseBody
+    public TableDataInfo bdcsyfw(TGuijiNaturalresourcesBdcdjzxx tGuijiNaturalresourcesBdcdjzxx) {
+        startPage();
+        tGuijiNaturalresourcesBdcdjzxx.setYt("商业服务");
+        List<TGuijiNaturalresourcesBdcdjzxx> list = tGuijiNaturalresourcesBdcdjzxxService.selectTGuijiNaturalresourcesBdcdjzxxList(tGuijiNaturalresourcesBdcdjzxx);
+        return getDataTable(list);
+    }
+
+    //不动产其他
+    @RequiresPermissions("system:bdcdjxx:list")
+    @PostMapping("/bdcqtList")
+    @ResponseBody
+    public TableDataInfo bdcqt(TGuijiNaturalresourcesBdcdjzxx tGuijiNaturalresourcesBdcdjzxx) {
+        startPage();
+        List<TGuijiNaturalresourcesBdcdjzxx> list = tGuijiNaturalresourcesBdcdjzxxService.selectTGuijiNaturalresourcesBdcdjxxQtList(tGuijiNaturalresourcesBdcdjzxx);
+        return getDataTable(list);
+    }
+
     /**
      * 查询不动产登记证信息列表
      */

+ 11 - 9
mybusiness/src/main/java/com/sooka/system/mapper/TGuijiNaturalresourcesBdcdjxxMapper.java

@@ -1,19 +1,19 @@
 package com.sooka.system.mapper;
 
 import java.util.List;
+
 import com.sooka.system.domain.TGuijiNaturalresourcesBdcdjxx;
 
 /**
  * 不动产登记信息Mapper接口
- * 
+ *
  * @author lei
  * @date 2021-10-29
  */
-public interface TGuijiNaturalresourcesBdcdjxxMapper 
-{
+public interface TGuijiNaturalresourcesBdcdjxxMapper {
     /**
      * 查询不动产登记信息
-     * 
+     *
      * @param id 不动产登记信息ID
      * @return 不动产登记信息
      */
@@ -21,15 +21,17 @@ public interface TGuijiNaturalresourcesBdcdjxxMapper
 
     /**
      * 查询不动产登记信息列表
-     * 
+     *
      * @param tGuijiNaturalresourcesBdcdjxx 不动产登记信息
      * @return 不动产登记信息集合
      */
     public List<TGuijiNaturalresourcesBdcdjxx> selectTGuijiNaturalresourcesBdcdjxxList(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx);
 
+    public List<TGuijiNaturalresourcesBdcdjxx> selectTGuijiNaturalresourcesBdcdjxxQtList(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx);
+
     /**
      * 新增不动产登记信息
-     * 
+     *
      * @param tGuijiNaturalresourcesBdcdjxx 不动产登记信息
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface TGuijiNaturalresourcesBdcdjxxMapper
 
     /**
      * 修改不动产登记信息
-     * 
+     *
      * @param tGuijiNaturalresourcesBdcdjxx 不动产登记信息
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface TGuijiNaturalresourcesBdcdjxxMapper
 
     /**
      * 删除不动产登记信息
-     * 
+     *
      * @param id 不动产登记信息ID
      * @return 结果
      */
@@ -53,7 +55,7 @@ public interface TGuijiNaturalresourcesBdcdjxxMapper
 
     /**
      * 批量删除不动产登记信息
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 2 - 0
mybusiness/src/main/java/com/sooka/system/mapper/TGuijiNaturalresourcesBdcdjzxxMapper.java

@@ -27,6 +27,8 @@ public interface TGuijiNaturalresourcesBdcdjzxxMapper
      */
     public List<TGuijiNaturalresourcesBdcdjzxx> selectTGuijiNaturalresourcesBdcdjzxxList(TGuijiNaturalresourcesBdcdjzxx tGuijiNaturalresourcesBdcdjzxx);
 
+    public List<TGuijiNaturalresourcesBdcdjzxx> selectTGuijiNaturalresourcesBdcdjxxQtList(TGuijiNaturalresourcesBdcdjzxx tGuijiNaturalresourcesBdcdjzxx);
+
     /**
      * 新增不动产登记证信息
      * 

+ 11 - 9
mybusiness/src/main/java/com/sooka/system/service/ITGuijiNaturalresourcesBdcdjxxService.java

@@ -1,19 +1,19 @@
 package com.sooka.system.service;
 
 import java.util.List;
+
 import com.sooka.system.domain.TGuijiNaturalresourcesBdcdjxx;
 
 /**
  * 不动产登记信息Service接口
- * 
+ *
  * @author lei
  * @date 2021-10-29
  */
-public interface ITGuijiNaturalresourcesBdcdjxxService 
-{
+public interface ITGuijiNaturalresourcesBdcdjxxService {
     /**
      * 查询不动产登记信息
-     * 
+     *
      * @param id 不动产登记信息ID
      * @return 不动产登记信息
      */
@@ -21,15 +21,17 @@ public interface ITGuijiNaturalresourcesBdcdjxxService
 
     /**
      * 查询不动产登记信息列表
-     * 
+     *
      * @param tGuijiNaturalresourcesBdcdjxx 不动产登记信息
      * @return 不动产登记信息集合
      */
     public List<TGuijiNaturalresourcesBdcdjxx> selectTGuijiNaturalresourcesBdcdjxxList(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx);
 
+    public List<TGuijiNaturalresourcesBdcdjxx> selectTGuijiNaturalresourcesBdcdjxxQtList(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx);
+
     /**
      * 新增不动产登记信息
-     * 
+     *
      * @param tGuijiNaturalresourcesBdcdjxx 不动产登记信息
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface ITGuijiNaturalresourcesBdcdjxxService
 
     /**
      * 修改不动产登记信息
-     * 
+     *
      * @param tGuijiNaturalresourcesBdcdjxx 不动产登记信息
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface ITGuijiNaturalresourcesBdcdjxxService
 
     /**
      * 批量删除不动产登记信息
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
@@ -53,7 +55,7 @@ public interface ITGuijiNaturalresourcesBdcdjxxService
 
     /**
      * 删除不动产登记信息信息
-     * 
+     *
      * @param id 不动产登记信息ID
      * @return 结果
      */

+ 2 - 0
mybusiness/src/main/java/com/sooka/system/service/ITGuijiNaturalresourcesBdcdjzxxService.java

@@ -27,6 +27,8 @@ public interface ITGuijiNaturalresourcesBdcdjzxxService
      */
     public List<TGuijiNaturalresourcesBdcdjzxx> selectTGuijiNaturalresourcesBdcdjzxxList(TGuijiNaturalresourcesBdcdjzxx tGuijiNaturalresourcesBdcdjzxx);
 
+    public List<TGuijiNaturalresourcesBdcdjzxx> selectTGuijiNaturalresourcesBdcdjxxQtList(TGuijiNaturalresourcesBdcdjzxx tGuijiNaturalresourcesBdcdjzxx);
+
     /**
      * 新增不动产登记证信息
      * 

+ 20 - 21
mybusiness/src/main/java/com/sooka/system/service/impl/TGuijiNaturalresourcesBdcdjxxServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sooka.system.service.impl;
 
 import java.util.List;
+
 import com.sooka.common.core.text.Convert;
 import com.sooka.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,86 +12,84 @@ import com.sooka.system.service.ITGuijiNaturalresourcesBdcdjxxService;
 
 /**
  * 不动产登记信息Service业务层处理
- * 
+ *
  * @author lei
  * @date 2021-10-29
  */
 @Service
-public class TGuijiNaturalresourcesBdcdjxxServiceImpl implements ITGuijiNaturalresourcesBdcdjxxService 
-{
+public class TGuijiNaturalresourcesBdcdjxxServiceImpl implements ITGuijiNaturalresourcesBdcdjxxService {
     @Autowired
     private TGuijiNaturalresourcesBdcdjxxMapper tGuijiNaturalresourcesBdcdjxxMapper;
 
     /**
      * 查询不动产登记信息
-     * 
+     *
      * @param id 不动产登记信息ID
      * @return 不动产登记信息
      */
     @Override
-    public TGuijiNaturalresourcesBdcdjxx selectTGuijiNaturalresourcesBdcdjxxById(String id)
-    {
+    public TGuijiNaturalresourcesBdcdjxx selectTGuijiNaturalresourcesBdcdjxxById(String id) {
         return tGuijiNaturalresourcesBdcdjxxMapper.selectTGuijiNaturalresourcesBdcdjxxById(id);
     }
 
     /**
      * 查询不动产登记信息列表
-     * 
+     *
      * @param tGuijiNaturalresourcesBdcdjxx 不动产登记信息
      * @return 不动产登记信息
      */
     @Override
-    public List<TGuijiNaturalresourcesBdcdjxx> selectTGuijiNaturalresourcesBdcdjxxList(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx)
-    {
+    public List<TGuijiNaturalresourcesBdcdjxx> selectTGuijiNaturalresourcesBdcdjxxList(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx) {
         return tGuijiNaturalresourcesBdcdjxxMapper.selectTGuijiNaturalresourcesBdcdjxxList(tGuijiNaturalresourcesBdcdjxx);
     }
 
+    @Override
+    public List<TGuijiNaturalresourcesBdcdjxx> selectTGuijiNaturalresourcesBdcdjxxQtList(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx) {
+        return tGuijiNaturalresourcesBdcdjxxMapper.selectTGuijiNaturalresourcesBdcdjxxQtList(tGuijiNaturalresourcesBdcdjxx);
+    }
+
     /**
      * 新增不动产登记信息
-     * 
+     *
      * @param tGuijiNaturalresourcesBdcdjxx 不动产登记信息
      * @return 结果
      */
     @Override
-    public int insertTGuijiNaturalresourcesBdcdjxx(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx)
-    {
+    public int insertTGuijiNaturalresourcesBdcdjxx(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx) {
         tGuijiNaturalresourcesBdcdjxx.setCreateTime(DateUtils.getNowDate());
         return tGuijiNaturalresourcesBdcdjxxMapper.insertTGuijiNaturalresourcesBdcdjxx(tGuijiNaturalresourcesBdcdjxx);
     }
 
     /**
      * 修改不动产登记信息
-     * 
+     *
      * @param tGuijiNaturalresourcesBdcdjxx 不动产登记信息
      * @return 结果
      */
     @Override
-    public int updateTGuijiNaturalresourcesBdcdjxx(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx)
-    {
+    public int updateTGuijiNaturalresourcesBdcdjxx(TGuijiNaturalresourcesBdcdjxx tGuijiNaturalresourcesBdcdjxx) {
         return tGuijiNaturalresourcesBdcdjxxMapper.updateTGuijiNaturalresourcesBdcdjxx(tGuijiNaturalresourcesBdcdjxx);
     }
 
     /**
      * 删除不动产登记信息对象
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
     @Override
-    public int deleteTGuijiNaturalresourcesBdcdjxxByIds(String ids)
-    {
+    public int deleteTGuijiNaturalresourcesBdcdjxxByIds(String ids) {
         return tGuijiNaturalresourcesBdcdjxxMapper.deleteTGuijiNaturalresourcesBdcdjxxByIds(Convert.toStrArray(ids));
     }
 
     /**
      * 删除不动产登记信息信息
-     * 
+     *
      * @param id 不动产登记信息ID
      * @return 结果
      */
     @Override
-    public int deleteTGuijiNaturalresourcesBdcdjxxById(String id)
-    {
+    public int deleteTGuijiNaturalresourcesBdcdjxxById(String id) {
         return tGuijiNaturalresourcesBdcdjxxMapper.deleteTGuijiNaturalresourcesBdcdjxxById(id);
     }
 }

+ 19 - 21
mybusiness/src/main/java/com/sooka/system/service/impl/TGuijiNaturalresourcesBdcdjzxxServiceImpl.java

@@ -12,86 +12,84 @@ import com.sooka.system.service.ITGuijiNaturalresourcesBdcdjzxxService;
 
 /**
  * 不动产登记证信息Service业务层处理
- * 
+ *
  * @author lei
  * @date 2021-10-29
  */
 @Service
-public class TGuijiNaturalresourcesBdcdjzxxServiceImpl implements ITGuijiNaturalresourcesBdcdjzxxService 
-{
+public class TGuijiNaturalresourcesBdcdjzxxServiceImpl implements ITGuijiNaturalresourcesBdcdjzxxService {
     @Autowired
     private TGuijiNaturalresourcesBdcdjzxxMapper tGuijiNaturalresourcesBdcdjzxxMapper;
 
     /**
      * 查询不动产登记证信息
-     * 
+     *
      * @param id 不动产登记证信息ID
      * @return 不动产登记证信息
      */
     @Override
-    public TGuijiNaturalresourcesBdcdjzxx selectTGuijiNaturalresourcesBdcdjzxxById(String id)
-    {
+    public TGuijiNaturalresourcesBdcdjzxx selectTGuijiNaturalresourcesBdcdjzxxById(String id) {
         return tGuijiNaturalresourcesBdcdjzxxMapper.selectTGuijiNaturalresourcesBdcdjzxxById(id);
     }
 
     /**
      * 查询不动产登记证信息列表
-     * 
+     *
      * @param tGuijiNaturalresourcesBdcdjzxx 不动产登记证信息
      * @return 不动产登记证信息
      */
     @Override
-    public List<TGuijiNaturalresourcesBdcdjzxx> selectTGuijiNaturalresourcesBdcdjzxxList(TGuijiNaturalresourcesBdcdjzxx tGuijiNaturalresourcesBdcdjzxx)
-    {
+    public List<TGuijiNaturalresourcesBdcdjzxx> selectTGuijiNaturalresourcesBdcdjzxxList(TGuijiNaturalresourcesBdcdjzxx tGuijiNaturalresourcesBdcdjzxx) {
         return tGuijiNaturalresourcesBdcdjzxxMapper.selectTGuijiNaturalresourcesBdcdjzxxList(tGuijiNaturalresourcesBdcdjzxx);
     }
 
+    @Override
+    public List<TGuijiNaturalresourcesBdcdjzxx> selectTGuijiNaturalresourcesBdcdjxxQtList(TGuijiNaturalresourcesBdcdjzxx tGuijiNaturalresourcesBdcdjzxx) {
+        return tGuijiNaturalresourcesBdcdjzxxMapper.selectTGuijiNaturalresourcesBdcdjxxQtList(tGuijiNaturalresourcesBdcdjzxx);
+    }
+
     /**
      * 新增不动产登记证信息
-     * 
+     *
      * @param tGuijiNaturalresourcesBdcdjzxx 不动产登记证信息
      * @return 结果
      */
     @Override
-    public int insertTGuijiNaturalresourcesBdcdjzxx(TGuijiNaturalresourcesBdcdjzxx tGuijiNaturalresourcesBdcdjzxx)
-    {
+    public int insertTGuijiNaturalresourcesBdcdjzxx(TGuijiNaturalresourcesBdcdjzxx tGuijiNaturalresourcesBdcdjzxx) {
         tGuijiNaturalresourcesBdcdjzxx.setCreateTime(DateUtils.getNowDate());
         return tGuijiNaturalresourcesBdcdjzxxMapper.insertTGuijiNaturalresourcesBdcdjzxx(tGuijiNaturalresourcesBdcdjzxx);
     }
 
     /**
      * 修改不动产登记证信息
-     * 
+     *
      * @param tGuijiNaturalresourcesBdcdjzxx 不动产登记证信息
      * @return 结果
      */
     @Override
-    public int updateTGuijiNaturalresourcesBdcdjzxx(TGuijiNaturalresourcesBdcdjzxx tGuijiNaturalresourcesBdcdjzxx)
-    {
+    public int updateTGuijiNaturalresourcesBdcdjzxx(TGuijiNaturalresourcesBdcdjzxx tGuijiNaturalresourcesBdcdjzxx) {
         return tGuijiNaturalresourcesBdcdjzxxMapper.updateTGuijiNaturalresourcesBdcdjzxx(tGuijiNaturalresourcesBdcdjzxx);
     }
 
     /**
      * 删除不动产登记证信息对象
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
     @Override
-    public int deleteTGuijiNaturalresourcesBdcdjzxxByIds(String ids)
-    {
+    public int deleteTGuijiNaturalresourcesBdcdjzxxByIds(String ids) {
         return tGuijiNaturalresourcesBdcdjzxxMapper.deleteTGuijiNaturalresourcesBdcdjzxxByIds(Convert.toStrArray(ids));
     }
 
     /**
      * 删除不动产登记证信息信息
-     * 
+     *
      * @param id 不动产登记证信息ID
      * @return 结果
      */
     @Override
-    public int deleteTGuijiNaturalresourcesBdcdjzxxById(String id)
-    {
+    public int deleteTGuijiNaturalresourcesBdcdjzxxById(String id) {
         return tGuijiNaturalresourcesBdcdjzxxMapper.deleteTGuijiNaturalresourcesBdcdjzxxById(id);
     }
 }

+ 11 - 22
mybusiness/src/main/resources/mapper/system/TGuijiNaturalresourcesBdcdjxxMapper.xml

@@ -59,30 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTGuijiNaturalresourcesBdcdjxxList" parameterType="TGuijiNaturalresourcesBdcdjxx" resultMap="TGuijiNaturalresourcesBdcdjxxResult">
         <include refid="selectTGuijiNaturalresourcesBdcdjxxVo"/>
-        <where>  
-            <if test="cdTime != null  and cdTime != ''"> and cd_time = #{cdTime}</if>
-            <if test="cdBatch != null  and cdBatch != ''"> and cd_batch = #{cdBatch}</if>
-            <if test="cdOperation != null  and cdOperation != ''"> and cd_operation = #{cdOperation}</if>
-            <if test="cdSource != null  and cdSource != ''"> and cd_source = #{cdSource}</if>
+        <where>
             <if test="djbh != null  and djbh != ''"> and djbh = #{djbh}</if>
             <if test="fdzl != null  and fdzl != ''"> and fdzl like concat('%', #{fdzl}, '%')</if>
-            <if test="gyfs != null  and gyfs != ''"> and gyfs = #{gyfs}</if>
-            <if test="qllx != null  and qllx != ''"> and qllx = #{qllx}</if>
-            <if test="cqxz != null  and cqxz != ''"> and cqxz = #{cqxz}</if>
-            <if test="czfs != null  and czfs != ''"> and czfs = #{czfs}</if>
-            <if test="zpgj != null  and zpgj != ''"> and zpgj = #{zpgj}</if>
-            <if test="qsje != null  and qsje != ''"> and qsje = #{qsje}</if>
-            <if test="zcjj != null  and zcjj != ''"> and zcjj = #{zcjj}</if>
-            <if test="qsjs != null  and qsjs != ''"> and qsjs = #{qsjs}</if>
-            <if test="wxzj != null  and wxzj != ''"> and wxzj = #{wxzj}</if>
-            <if test="yys != null  and yys != ''"> and yys = #{yys}</if>
-            <if test="wsrq != null  and wsrq != ''"> and wsrq = #{wsrq}</if>
-            <if test="cqazhtrq != null  and cqazhtrq != ''"> and cqazhtrq = #{cqazhtrq}</if>
-            <if test="djyy != null  and djyy != ''"> and djyy = #{djyy}</if>
-            <if test="fj != null  and fj != ''"> and fj = #{fj}</if>
-            <if test="hh != null  and hh != ''"> and hh = #{hh}</if>
-            <if test="zcs != null  and zcs != ''"> and zcs = #{zcs}</if>
-            <if test="szc != null  and szc != ''"> and szc = #{szc}</if>
             <if test="ghyt != null  and ghyt != ''"> and ghyt = #{ghyt}</if>
             <if test="fwjg != null  and fwjg != ''"> and fwjg = #{fwjg}</if>
             <if test="scjzmj != null  and scjzmj != ''"> and scjzmj = #{scjzmj}</if>
@@ -107,6 +86,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
+
+    <select id="selectTGuijiNaturalresourcesBdcdjxxQtList" parameterType="TGuijiNaturalresourcesBdcdjxx" resultMap="TGuijiNaturalresourcesBdcdjxxResult">
+        <include refid="selectTGuijiNaturalresourcesBdcdjxxVo"/>
+        <where>
+            ghyt != '住宅' and ghyt != '办公' and ghyt != '商业服务'
+            <if test="djbh != null  and djbh != ''"> and djbh = #{djbh}</if>
+            <if test="fdzl != null  and fdzl != ''"> and fdzl like concat('%', #{fdzl}, '%')</if>
+        </where>
+        order by create_time desc
+    </select>
     
     <select id="selectTGuijiNaturalresourcesBdcdjxxById" parameterType="String" resultMap="TGuijiNaturalresourcesBdcdjxxResult">
         <include refid="selectTGuijiNaturalresourcesBdcdjxxVo"/>

+ 15 - 1
mybusiness/src/main/resources/mapper/system/TGuijiNaturalresourcesBdcdjzxxMapper.xml

@@ -62,7 +62,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTGuijiNaturalresourcesBdcdjzxxList" parameterType="TGuijiNaturalresourcesBdcdjzxx" resultMap="TGuijiNaturalresourcesBdcdjzxxResult">
         <include refid="selectTGuijiNaturalresourcesBdcdjzxxVo"/>
-        <where>  
+        <where>
+            <if test="yt != null  and yt != ''"> and yt = #{yt}</if>
+            <if test="djbh != null  and djbh != ''"> and djbh like concat('%', #{djbh}, '%')</if>
+            <if test="qlrmc != null  and qlrmc != ''"> and qlrmc like concat('%', #{qlrmc}, '%')</if>
+            <if test="fwzl != null  and fwzl != ''"> and fwzl like concat('%', #{fwzl}, '%')</if>
+            <if test="zsbh != null  and zsbh != ''"> and zsbh = #{zsbh}</if>
+            <if test="qzh != null  and qzh != ''"> and qzh = #{qzh}</if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectTGuijiNaturalresourcesBdcdjxxQtList" parameterType="TGuijiNaturalresourcesBdcdjzxx" resultMap="TGuijiNaturalresourcesBdcdjzxxResult">
+        <include refid="selectTGuijiNaturalresourcesBdcdjzxxVo"/>
+        <where>
+            yt != '住宅' and yt != '办公' and yt != '商业服务'
             <if test="djbh != null  and djbh != ''"> and djbh like concat('%', #{djbh}, '%')</if>
             <if test="qlrmc != null  and qlrmc != ''"> and qlrmc like concat('%', #{qlrmc}, '%')</if>
             <if test="fwzl != null  and fwzl != ''"> and fwzl like concat('%', #{fwzl}, '%')</if>

+ 30 - 10
mybusiness/src/main/resources/templates/system/bdcdjxx/bdcdjxx.html

@@ -8,6 +8,7 @@
     <div class="row">
         <div class="col-sm-12 search-collapse">
             <form id="formId">
+                <input type="hidden" th:value="${flag}"/>
                 <div class="select-list">
                     <ul>
                         <!--<li>-->
@@ -118,10 +119,10 @@
                         <!--<label>竣工时间 日期格式:yyyy-mm-dd:</label>-->
                         <!--<input type="text" name="jgsj"/>-->
                         <!--</li>-->
-                        <li>
-                            <label>户室坐落:</label>
-                            <input type="text" name="fwzl"/>
-                        </li>
+                        <!--<li>-->
+                            <!--<label>户室坐落:</label>-->
+                            <!--<input type="text" name="fwzl"/>-->
+                        <!--</li>-->
                         <!--<li>-->
                         <!--<label>土地性质 100-国有土地;101-划拨;102-出让;103-作价出资:</label>-->
                         <!--<input type="text" name="tdqlxz"/>-->
@@ -205,9 +206,28 @@
     var removeFlag = [[${@permission.hasPermi('system:bdcdjxx:remove')}]];
     var prefix = ctx + "system/bdcdjxx";
 
+    var flag = [[${flag}]];
+    var urlV;
+    if (flag == "bdczz") {//不动产住宅
+        urlV = prefix + "/bdczzList";
+    }
+    if (flag == "bdcbg") {//不动产办公
+        urlV = prefix + "/bdcbgList";
+    }
+    if (flag == "bdcsyfw") {//不动产商业服务
+        urlV = prefix + "/bdcsyfwList";
+    }
+    if (flag == "bdcqt") {//不动产其他
+        urlV = prefix + "/bdcqtList";
+    }
+    if (flag == "") {//不动产其他
+        urlV = prefix + "/list";
+    }
+
     $(function () {
         var options = {
-            url: prefix + "/list",
+            // url: prefix + "/list",
+            url: urlV,
             createUrl: prefix + "/add",
             updateUrl: prefix + "/edit/{id}",
             removeUrl: prefix + "/remove",
@@ -265,7 +285,7 @@
                 },
                 {
                     field: 'zpgj',
-                    title: '计税价格(万元)',
+                    title: '计税价格',
                     visible: false
                 },
                 {
@@ -273,10 +293,10 @@
                     title: '契税',
                     visible: false
                 },
-                {
-                    field: 'zcjj',
-                    title: '总成交价(万元)'
-                },
+                // {
+                //     field: 'zcjj',
+                //     title: '总成交价'
+                // },
                 {
                     field: 'qsjs',
                     title: '契税基数',

+ 27 - 4
mybusiness/src/main/resources/templates/system/bdcdjzxx/bdcdjzxx.html

@@ -8,6 +8,7 @@
     <div class="row">
         <div class="col-sm-12 search-collapse">
             <form id="formId">
+                <input type="hidden" th:value="${flag}"/>
                 <div class="select-list">
                     <ul>
                         <li>
@@ -57,9 +58,28 @@
     var removeFlag = [[${@permission.hasPermi('system:bdcdjzxx:remove')}]];
     var prefix = ctx + "system/bdcdjzxx";
 
+    var flag = [[${flag}]];
+    var urlV;
+    if (flag == "bdczz") {//不动产住宅
+        urlV = prefix + "/bdczzList";
+    }
+    if (flag == "bdcbg") {//不动产办公
+        urlV = prefix + "/bdcbgList";
+    }
+    if (flag == "bdcsyfw") {//不动产商业服务
+        urlV = prefix + "/bdcsyfwList";
+    }
+    if (flag == "bdcqt") {//不动产其他
+        urlV = prefix + "/bdcqtList";
+    }
+    if (flag == "") {//不动产其他
+        urlV = prefix + "/list";
+    }
+
     $(function () {
         var options = {
-            url: prefix + "/list",
+            // url: prefix + "/list",
+            url: urlV,
             createUrl: prefix + "/add",
             updateUrl: prefix + "/edit/{id}",
             removeUrl: prefix + "/remove",
@@ -122,7 +142,8 @@
                 },
                 {
                     field: 'mj',
-                    title: '面积/抵押总面积'
+                    title: '面积/抵押总面积',
+                    visible: false
                 },
                 {
                     field: 'qzh',
@@ -269,11 +290,13 @@
                 },
                 {
                     field: 'lx',
-                    title: '土地使用取得方式'
+                    title: '土地使用取得方式',
+                    visible: false
                 },
                 {
                     field: 'tdyt',
-                    title: '土地用途'
+                    title: '土地用途',
+                    visible: false
                 },
                 {
                     field: 'tdsyqxks',