数据表添加、字段修改等

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcJmInfoController.java

@@ -1,31 +1,25 @@
 package com.ruoyi.szxc.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.szxc.domain.SzxcJmInfo;
 import com.ruoyi.szxc.service.ISzxcJmInfoService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 居民信息Controller
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-16
  */
 @RestController
 @RequestMapping("/szxc/jminfo")

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcLdInfoController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.szxc.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.szxc.domain.SzxcLdInfo;
+import com.ruoyi.szxc.service.ISzxcLdInfoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 楼栋信息Controller
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+@RestController
+@RequestMapping("/szxc/ldinfo")
+public class SzxcLdInfoController extends BaseController
+{
+    @Autowired
+    private ISzxcLdInfoService szxcLdInfoService;
+
+    /**
+     * 查询楼栋信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:ldinfo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SzxcLdInfo szxcLdInfo)
+    {
+        startPage();
+        List<SzxcLdInfo> list = szxcLdInfoService.selectSzxcLdInfoList(szxcLdInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出楼栋信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:ldinfo:export')")
+    @Log(title = "楼栋信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SzxcLdInfo szxcLdInfo)
+    {
+        List<SzxcLdInfo> list = szxcLdInfoService.selectSzxcLdInfoList(szxcLdInfo);
+        ExcelUtil<SzxcLdInfo> util = new ExcelUtil<SzxcLdInfo>(SzxcLdInfo.class);
+        util.exportExcel(response, list, "楼栋信息数据");
+    }
+
+    /**
+     * 获取楼栋信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:ldinfo:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(szxcLdInfoService.selectSzxcLdInfoById(id));
+    }
+
+    /**
+     * 新增楼栋信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:ldinfo:add')")
+    @Log(title = "楼栋信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SzxcLdInfo szxcLdInfo)
+    {
+        return toAjax(szxcLdInfoService.insertSzxcLdInfo(szxcLdInfo));
+    }
+
+    /**
+     * 修改楼栋信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:ldinfo:edit')")
+    @Log(title = "楼栋信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SzxcLdInfo szxcLdInfo)
+    {
+        return toAjax(szxcLdInfoService.updateSzxcLdInfo(szxcLdInfo));
+    }
+
+    /**
+     * 删除楼栋信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:ldinfo:remove')")
+    @Log(title = "楼栋信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(szxcLdInfoService.deleteSzxcLdInfoByIds(ids));
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcLunboController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.szxc.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.szxc.domain.SzxcLunbo;
+import com.ruoyi.szxc.service.ISzxcLunboService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 轮播设置Controller
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+@RestController
+@RequestMapping("/szxc/lunbo")
+public class SzxcLunboController extends BaseController
+{
+    @Autowired
+    private ISzxcLunboService szxcLunboService;
+
+    /**
+     * 查询轮播设置列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:lunbo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SzxcLunbo szxcLunbo)
+    {
+        startPage();
+        List<SzxcLunbo> list = szxcLunboService.selectSzxcLunboList(szxcLunbo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出轮播设置列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:lunbo:export')")
+    @Log(title = "轮播设置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SzxcLunbo szxcLunbo)
+    {
+        List<SzxcLunbo> list = szxcLunboService.selectSzxcLunboList(szxcLunbo);
+        ExcelUtil<SzxcLunbo> util = new ExcelUtil<SzxcLunbo>(SzxcLunbo.class);
+        util.exportExcel(response, list, "轮播设置数据");
+    }
+
+    /**
+     * 获取轮播设置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:lunbo:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(szxcLunboService.selectSzxcLunboById(id));
+    }
+
+    /**
+     * 新增轮播设置
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:lunbo:add')")
+    @Log(title = "轮播设置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SzxcLunbo szxcLunbo)
+    {
+        return toAjax(szxcLunboService.insertSzxcLunbo(szxcLunbo));
+    }
+
+    /**
+     * 修改轮播设置
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:lunbo:edit')")
+    @Log(title = "轮播设置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SzxcLunbo szxcLunbo)
+    {
+        return toAjax(szxcLunboService.updateSzxcLunbo(szxcLunbo));
+    }
+
+    /**
+     * 删除轮播设置
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:lunbo:remove')")
+    @Log(title = "轮播设置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(szxcLunboService.deleteSzxcLunboByIds(ids));
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcPublicActivilyController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.szxc.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.szxc.domain.SzxcPublicActivily;
+import com.ruoyi.szxc.service.ISzxcPublicActivilyService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 公益活动Controller
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+@RestController
+@RequestMapping("/szxc/activily")
+public class SzxcPublicActivilyController extends BaseController
+{
+    @Autowired
+    private ISzxcPublicActivilyService szxcPublicActivilyService;
+
+    /**
+     * 查询公益活动列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:activily:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SzxcPublicActivily szxcPublicActivily)
+    {
+        startPage();
+        List<SzxcPublicActivily> list = szxcPublicActivilyService.selectSzxcPublicActivilyList(szxcPublicActivily);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出公益活动列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:activily:export')")
+    @Log(title = "公益活动", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SzxcPublicActivily szxcPublicActivily)
+    {
+        List<SzxcPublicActivily> list = szxcPublicActivilyService.selectSzxcPublicActivilyList(szxcPublicActivily);
+        ExcelUtil<SzxcPublicActivily> util = new ExcelUtil<SzxcPublicActivily>(SzxcPublicActivily.class);
+        util.exportExcel(response, list, "公益活动数据");
+    }
+
+    /**
+     * 获取公益活动详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:activily:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(szxcPublicActivilyService.selectSzxcPublicActivilyById(id));
+    }
+
+    /**
+     * 新增公益活动
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:activily:add')")
+    @Log(title = "公益活动", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SzxcPublicActivily szxcPublicActivily)
+    {
+        return toAjax(szxcPublicActivilyService.insertSzxcPublicActivily(szxcPublicActivily));
+    }
+
+    /**
+     * 修改公益活动
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:activily:edit')")
+    @Log(title = "公益活动", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SzxcPublicActivily szxcPublicActivily)
+    {
+        return toAjax(szxcPublicActivilyService.updateSzxcPublicActivily(szxcPublicActivily));
+    }
+
+    /**
+     * 删除公益活动
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:activily:remove')")
+    @Log(title = "公益活动", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(szxcPublicActivilyService.deleteSzxcPublicActivilyByIds(ids));
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVisitRecardController.java

@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 走访记录Controller
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-16
  */
 @RestController
 @RequestMapping("/szxc/visitrecard")

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWorkGuideController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.szxc.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.szxc.domain.SzxcWorkGuide;
+import com.ruoyi.szxc.service.ISzxcWorkGuideService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 办事指南Controller
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+@RestController
+@RequestMapping("/szxc/guide")
+public class SzxcWorkGuideController extends BaseController
+{
+    @Autowired
+    private ISzxcWorkGuideService szxcWorkGuideService;
+
+    /**
+     * 查询办事指南列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:guide:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SzxcWorkGuide szxcWorkGuide)
+    {
+        startPage();
+        List<SzxcWorkGuide> list = szxcWorkGuideService.selectSzxcWorkGuideList(szxcWorkGuide);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出办事指南列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:guide:export')")
+    @Log(title = "办事指南", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SzxcWorkGuide szxcWorkGuide)
+    {
+        List<SzxcWorkGuide> list = szxcWorkGuideService.selectSzxcWorkGuideList(szxcWorkGuide);
+        ExcelUtil<SzxcWorkGuide> util = new ExcelUtil<SzxcWorkGuide>(SzxcWorkGuide.class);
+        util.exportExcel(response, list, "办事指南数据");
+    }
+
+    /**
+     * 获取办事指南详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:guide:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(szxcWorkGuideService.selectSzxcWorkGuideById(id));
+    }
+
+    /**
+     * 新增办事指南
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:guide:add')")
+    @Log(title = "办事指南", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SzxcWorkGuide szxcWorkGuide)
+    {
+        return toAjax(szxcWorkGuideService.insertSzxcWorkGuide(szxcWorkGuide));
+    }
+
+    /**
+     * 修改办事指南
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:guide:edit')")
+    @Log(title = "办事指南", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SzxcWorkGuide szxcWorkGuide)
+    {
+        return toAjax(szxcWorkGuideService.updateSzxcWorkGuide(szxcWorkGuide));
+    }
+
+    /**
+     * 删除办事指南
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:guide:remove')")
+    @Log(title = "办事指南", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(szxcWorkGuideService.deleteSzxcWorkGuideByIds(ids));
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXcRecardController.java

@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 巡查记录Controller
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-16
  */
 @RestController
 @RequestMapping("/szxc/xcrecard")

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXqInfoController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.szxc.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.szxc.domain.SzxcXqInfo;
+import com.ruoyi.szxc.service.ISzxcXqInfoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 小区信息Controller
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+@RestController
+@RequestMapping("/szxc/xqinfo")
+public class SzxcXqInfoController extends BaseController
+{
+    @Autowired
+    private ISzxcXqInfoService szxcXqInfoService;
+
+    /**
+     * 查询小区信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:xqinfo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SzxcXqInfo szxcXqInfo)
+    {
+        startPage();
+        List<SzxcXqInfo> list = szxcXqInfoService.selectSzxcXqInfoList(szxcXqInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出小区信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:xqinfo:export')")
+    @Log(title = "小区信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SzxcXqInfo szxcXqInfo)
+    {
+        List<SzxcXqInfo> list = szxcXqInfoService.selectSzxcXqInfoList(szxcXqInfo);
+        ExcelUtil<SzxcXqInfo> util = new ExcelUtil<SzxcXqInfo>(SzxcXqInfo.class);
+        util.exportExcel(response, list, "小区信息数据");
+    }
+
+    /**
+     * 获取小区信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:xqinfo:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(szxcXqInfoService.selectSzxcXqInfoById(id));
+    }
+
+    /**
+     * 新增小区信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:xqinfo:add')")
+    @Log(title = "小区信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SzxcXqInfo szxcXqInfo)
+    {
+        return toAjax(szxcXqInfoService.insertSzxcXqInfo(szxcXqInfo));
+    }
+
+    /**
+     * 修改小区信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:xqinfo:edit')")
+    @Log(title = "小区信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SzxcXqInfo szxcXqInfo)
+    {
+        return toAjax(szxcXqInfoService.updateSzxcXqInfo(szxcXqInfo));
+    }
+
+    /**
+     * 删除小区信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:xqinfo:remove')")
+    @Log(title = "小区信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(szxcXqInfoService.deleteSzxcXqInfoByIds(ids));
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmInfo.java

@@ -66,8 +66,8 @@ public class SzxcJmInfo extends BaseEntity
     @Excel(name = "与户主关系")
     private String relation;
 
-    /** 籍贯性质 */
+    /** 户籍性质 */
-    @Excel(name = "籍贯性质")
+    @Excel(name = "户籍性质")
     private String jgNature;
 
     /** 是否常住（0是 1否） */
@@ -82,6 +82,38 @@ public class SzxcJmInfo extends BaseEntity
     @Excel(name = "手机号")
     private String phone;
 
+    /** 现居住地 */
+    @Excel(name = "现居住地")
+    private String currentAddress;
+
+    /** 本人情况 */
+    @Excel(name = "本人情况")
+    private String brqk;
+
+    /** 婚姻 */
+    @Excel(name = "婚姻")
+    private String hy;
+
+    /** 学历 */
+    @Excel(name = "学历")
+    private String xueli;
+
+    /** 政治面貌 */
+    @Excel(name = "政治面貌")
+    private String zzmm;
+
+    /** 宗教信仰 */
+    @Excel(name = "宗教信仰")
+    private String zjxy;
+
+    /** 健康状况 */
+    @Excel(name = "健康状况")
+    private String jkzk;
+
+    /** 疾病描述 */
+    @Excel(name = "疾病描述")
+    private String ills;
+
     /** 是否户主 0:户主 1:非户主 */
     @Excel(name = "是否户主 0:户主 1:非户主")
     private String head;
@@ -242,6 +274,78 @@ public class SzxcJmInfo extends BaseEntity
     {
         return phone;
     }
+    public void setCurrentAddress(String currentAddress) 
+    {
+        this.currentAddress = currentAddress;
+    }
+
+    public String getCurrentAddress() 
+    {
+        return currentAddress;
+    }
+    public void setBrqk(String brqk) 
+    {
+        this.brqk = brqk;
+    }
+
+    public String getBrqk() 
+    {
+        return brqk;
+    }
+    public void setHy(String hy) 
+    {
+        this.hy = hy;
+    }
+
+    public String getHy() 
+    {
+        return hy;
+    }
+    public void setXueli(String xueli) 
+    {
+        this.xueli = xueli;
+    }
+
+    public String getXueli() 
+    {
+        return xueli;
+    }
+    public void setZzmm(String zzmm) 
+    {
+        this.zzmm = zzmm;
+    }
+
+    public String getZzmm() 
+    {
+        return zzmm;
+    }
+    public void setZjxy(String zjxy) 
+    {
+        this.zjxy = zjxy;
+    }
+
+    public String getZjxy() 
+    {
+        return zjxy;
+    }
+    public void setJkzk(String jkzk) 
+    {
+        this.jkzk = jkzk;
+    }
+
+    public String getJkzk() 
+    {
+        return jkzk;
+    }
+    public void setIlls(String ills) 
+    {
+        this.ills = ills;
+    }
+
+    public String getIlls() 
+    {
+        return ills;
+    }
     public void setHead(String head) 
     {
         this.head = head;
@@ -298,6 +402,14 @@ public class SzxcJmInfo extends BaseEntity
             .append("longLive", getLongLive())
             .append("hjAddress", getHjAddress())
             .append("phone", getPhone())
+            .append("currentAddress", getCurrentAddress())
+            .append("brqk", getBrqk())
+            .append("hy", getHy())
+            .append("xueli", getXueli())
+            .append("zzmm", getZzmm())
+            .append("zjxy", getZjxy())
+            .append("jkzk", getJkzk())
+            .append("ills", getIlls())
             .append("head", getHead())
             .append("sameHeadIds", getSameHeadIds())
             .append("off", getOff())

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcLdInfo.java

@@ -0,0 +1,223 @@
+package com.ruoyi.szxc.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 楼栋信息对象 szxc_ld_info
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+public class SzxcLdInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 所属小区 */
+    @Excel(name = "所属小区")
+    private Long xqId;
+
+    /** 楼栋名称 */
+    @Excel(name = "楼栋名称")
+    private String ldName;
+
+    /** 类型(0小区楼栋1独立房2其它) */
+    @Excel(name = "类型(0小区楼栋1独立房2其它)")
+    private String xqType;
+
+    /** 类别字典 */
+    @Excel(name = "类别字典")
+    private String ldSort;
+
+    /** 楼栋结构字典 */
+    @Excel(name = "楼栋结构字典")
+    private String ldjg;
+
+    /** 取暖方式 */
+    @Excel(name = "取暖方式")
+    private String qnfs;
+
+    /** 楼层数 */
+    @Excel(name = "楼层数")
+    private Long lcNum;
+
+    /** 单元数 */
+    @Excel(name = "单元数")
+    private Long unitNum;
+
+    /** 户数 */
+    @Excel(name = "户数")
+    private Long huNum;
+
+    /** 楼栋描述 */
+    @Excel(name = "楼栋描述")
+    private String ldDescribe;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    /** 所属网格 */
+    @Excel(name = "所属网格")
+    private String deptName;
+
+    /** 创建者ID */
+    @Excel(name = "创建者ID")
+    private Long userId;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setXqId(Long xqId) 
+    {
+        this.xqId = xqId;
+    }
+
+    public Long getXqId() 
+    {
+        return xqId;
+    }
+    public void setLdName(String ldName) 
+    {
+        this.ldName = ldName;
+    }
+
+    public String getLdName() 
+    {
+        return ldName;
+    }
+    public void setXqType(String xqType) 
+    {
+        this.xqType = xqType;
+    }
+
+    public String getXqType() 
+    {
+        return xqType;
+    }
+    public void setLdSort(String ldSort) 
+    {
+        this.ldSort = ldSort;
+    }
+
+    public String getLdSort() 
+    {
+        return ldSort;
+    }
+    public void setLdjg(String ldjg) 
+    {
+        this.ldjg = ldjg;
+    }
+
+    public String getLdjg() 
+    {
+        return ldjg;
+    }
+    public void setQnfs(String qnfs) 
+    {
+        this.qnfs = qnfs;
+    }
+
+    public String getQnfs() 
+    {
+        return qnfs;
+    }
+    public void setLcNum(Long lcNum) 
+    {
+        this.lcNum = lcNum;
+    }
+
+    public Long getLcNum() 
+    {
+        return lcNum;
+    }
+    public void setUnitNum(Long unitNum) 
+    {
+        this.unitNum = unitNum;
+    }
+
+    public Long getUnitNum() 
+    {
+        return unitNum;
+    }
+    public void setHuNum(Long huNum) 
+    {
+        this.huNum = huNum;
+    }
+
+    public Long getHuNum() 
+    {
+        return huNum;
+    }
+    public void setLdDescribe(String ldDescribe) 
+    {
+        this.ldDescribe = ldDescribe;
+    }
+
+    public String getLdDescribe() 
+    {
+        return ldDescribe;
+    }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+    public void setDeptName(String deptName) 
+    {
+        this.deptName = deptName;
+    }
+
+    public String getDeptName() 
+    {
+        return deptName;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("xqId", getXqId())
+            .append("ldName", getLdName())
+            .append("xqType", getXqType())
+            .append("ldSort", getLdSort())
+            .append("ldjg", getLdjg())
+            .append("qnfs", getQnfs())
+            .append("lcNum", getLcNum())
+            .append("unitNum", getUnitNum())
+            .append("huNum", getHuNum())
+            .append("ldDescribe", getLdDescribe())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("deptId", getDeptId())
+            .append("deptName", getDeptName())
+            .append("userId", getUserId())
+            .toString();
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcLunbo.java

@@ -0,0 +1,84 @@
+package com.ruoyi.szxc.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 轮播设置对象 szxc_lunbo
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+public class SzxcLunbo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    private String title;
+
+    /** 图片地址 */
+    @Excel(name = "图片地址")
+    private String picture;
+
+    /** 简介 */
+    @Excel(name = "简介")
+    private String content;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+    public void setPicture(String picture) 
+    {
+        this.picture = picture;
+    }
+
+    public String getPicture() 
+    {
+        return picture;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("title", getTitle())
+            .append("picture", getPicture())
+            .append("content", getContent())
+            .append("remark", getRemark())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcPublicActivily.java

@@ -0,0 +1,200 @@
+package com.ruoyi.szxc.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 公益活动对象 szxc_public_activily
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+public class SzxcPublicActivily extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    private String title;
+
+    /** 负责人 */
+    @Excel(name = "负责人")
+    private String leader;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String phone;
+
+    /** 类型(公告/咨询) */
+    @Excel(name = "类型(公告/咨询)")
+    private String type;
+
+    /** 活动介绍 */
+    @Excel(name = "活动介绍")
+    private String content;
+
+    /** 级别(县/乡/村) */
+    @Excel(name = "级别(县/乡/村)")
+    private String leave;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    /** 所属网格 */
+    @Excel(name = "所属网格")
+    private String deptName;
+
+    /** 创建者ID */
+    @Excel(name = "创建者ID")
+    private Long userId;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+    public void setLeader(String leader) 
+    {
+        this.leader = leader;
+    }
+
+    public String getLeader() 
+    {
+        return leader;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setLeave(String leave) 
+    {
+        this.leave = leave;
+    }
+
+    public String getLeave() 
+    {
+        return leave;
+    }
+    public void setStartTime(Date startTime) 
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime() 
+    {
+        return startTime;
+    }
+    public void setEndTime(Date endTime) 
+    {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime() 
+    {
+        return endTime;
+    }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+    public void setDeptName(String deptName) 
+    {
+        this.deptName = deptName;
+    }
+
+    public String getDeptName() 
+    {
+        return deptName;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("title", getTitle())
+            .append("leader", getLeader())
+            .append("phone", getPhone())
+            .append("type", getType())
+            .append("content", getContent())
+            .append("leave", getLeave())
+            .append("startTime", getStartTime())
+            .append("endTime", getEndTime())
+            .append("createBy", getCreateBy())
+            .append("remark", getRemark())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("deptId", getDeptId())
+            .append("deptName", getDeptName())
+            .append("userId", getUserId())
+            .toString();
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcVisitRecard.java

@@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 走访记录对象 szxc_visit_recard
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-16
  */
 public class SzxcVisitRecard extends BaseEntity
 {
@@ -38,6 +38,10 @@ public class SzxcVisitRecard extends BaseEntity
     @Excel(name = "类别")
     private String type;
 
+    /** 走访对像id */
+    @Excel(name = "走访对像id")
+    private Long jmId;
+
     /** 走访对象 */
     @Excel(name = "走访对象")
     private String visitObj;
@@ -115,6 +119,15 @@ public class SzxcVisitRecard extends BaseEntity
     {
         return type;
     }
+    public void setJmId(Long jmId) 
+    {
+        this.jmId = jmId;
+    }
+
+    public Long getJmId() 
+    {
+        return jmId;
+    }
     public void setVisitObj(String visitObj) 
     {
         this.visitObj = visitObj;
@@ -196,6 +209,7 @@ public class SzxcVisitRecard extends BaseEntity
             .append("submitDate", getSubmitDate())
             .append("visitDate", getVisitDate())
             .append("type", getType())
+            .append("jmId", getJmId())
             .append("visitObj", getVisitObj())
             .append("title", getTitle())
             .append("picture", getPicture())

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcWorkGuide.java

@@ -0,0 +1,84 @@
+package com.ruoyi.szxc.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 办事指南对象 szxc_work_guide
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+public class SzxcWorkGuide extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    private String title;
+
+    /** 简介 */
+    @Excel(name = "简介")
+    private String content;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String status;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("title", getTitle())
+            .append("content", getContent())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXcRecard.java

@@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 巡查记录对象 szxc_xc_recard
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-16
  */
 public class SzxcXcRecard extends BaseEntity
 {
@@ -22,7 +22,7 @@ public class SzxcXcRecard extends BaseEntity
 
     /** 巡查人 */
     @Excel(name = "巡查人")
-    private String visiterName;
+    private String xcName;
 
     /** 提报日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -32,15 +32,19 @@ public class SzxcXcRecard extends BaseEntity
     /** 巡查日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "巡查日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date visitDate;
+    private Date xcDate;
 
     /** 巡查类别 */
     @Excel(name = "巡查类别")
     private String type;
 
+    /** 巡查对像id */
+    @Excel(name = "巡查对像id")
+    private Long jmId;
+
     /** 被巡查对象 */
     @Excel(name = "被巡查对象")
-    private String visitObj;
+    private String xcObj;
 
     /** 巡查主题 */
     @Excel(name = "巡查主题")
@@ -83,14 +87,14 @@ public class SzxcXcRecard extends BaseEntity
     {
         return id;
     }
-    public void setVisiterName(String visiterName) 
+    public void setXcName(String xcName) 
     {
-        this.visiterName = visiterName;
+        this.xcName = xcName;
     }
 
-    public String getVisiterName() 
+    public String getXcName() 
     {
-        return visiterName;
+        return xcName;
     }
     public void setSubmitDate(Date submitDate) 
     {
@@ -101,14 +105,14 @@ public class SzxcXcRecard extends BaseEntity
     {
         return submitDate;
     }
-    public void setVisitDate(Date visitDate) 
+    public void setXcDate(Date xcDate) 
     {
-        this.visitDate = visitDate;
+        this.xcDate = xcDate;
     }
 
-    public Date getVisitDate() 
+    public Date getXcDate() 
     {
-        return visitDate;
+        return xcDate;
     }
     public void setType(String type) 
     {
@@ -119,14 +123,23 @@ public class SzxcXcRecard extends BaseEntity
     {
         return type;
     }
-    public void setVisitObj(String visitObj) 
+    public void setJmId(Long jmId) 
+    {
+        this.jmId = jmId;
+    }
+
+    public Long getJmId() 
+    {
+        return jmId;
+    }
+    public void setXcObj(String xcObj) 
     {
-        this.visitObj = visitObj;
+        this.xcObj = xcObj;
     }
 
-    public String getVisitObj() 
+    public String getXcObj() 
     {
-        return visitObj;
+        return xcObj;
     }
     public void setTitle(String title) 
     {
@@ -205,11 +218,12 @@ public class SzxcXcRecard extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("visiterName", getVisiterName())
+            .append("xcName", getXcName())
             .append("submitDate", getSubmitDate())
-            .append("visitDate", getVisitDate())
+            .append("xcDate", getXcDate())
             .append("type", getType())
-            .append("visitObj", getVisitObj())
+            .append("jmId", getJmId())
+            .append("xcObj", getXcObj())
             .append("title", getTitle())
             .append("picture", getPicture())
             .append("content", getContent())

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXqInfo.java

@@ -0,0 +1,226 @@
+package com.ruoyi.szxc.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 小区信息对象 szxc_xq_info
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+public class SzxcXqInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 类型(0老旧1新2片区散户) */
+    @Excel(name = "类型(0老旧1新2片区散户)")
+    private String xqType;
+
+    /** 楼栋数 */
+    @Excel(name = "楼栋数")
+    private Long ldNum;
+
+    /** 建筑面积 */
+    @Excel(name = "建筑面积")
+    private String jzArea;
+
+    /** 占地面积 */
+    @Excel(name = "占地面积")
+    private String zdArea;
+
+    /** 物业管理方式(0物业公司1业主自治2其他) */
+    @Excel(name = "物业管理方式(0物业公司1业主自治2其他)")
+    private String wyType;
+
+    /** 物业负责人 */
+    @Excel(name = "物业负责人")
+    private String wyResponse;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String wyPhone;
+
+    /** 小区地址 */
+    @Excel(name = "小区地址")
+    private String xqAddress;
+
+    /** 建成日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "建成日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date buildDate;
+
+    /** 小区描述 */
+    @Excel(name = "小区描述")
+    private String xqDescribe;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    /** 所属网格 */
+    @Excel(name = "所属网格")
+    private String deptName;
+
+    /** 创建者ID */
+    @Excel(name = "创建者ID")
+    private Long userId;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setXqType(String xqType) 
+    {
+        this.xqType = xqType;
+    }
+
+    public String getXqType() 
+    {
+        return xqType;
+    }
+    public void setLdNum(Long ldNum) 
+    {
+        this.ldNum = ldNum;
+    }
+
+    public Long getLdNum() 
+    {
+        return ldNum;
+    }
+    public void setJzArea(String jzArea) 
+    {
+        this.jzArea = jzArea;
+    }
+
+    public String getJzArea() 
+    {
+        return jzArea;
+    }
+    public void setZdArea(String zdArea) 
+    {
+        this.zdArea = zdArea;
+    }
+
+    public String getZdArea() 
+    {
+        return zdArea;
+    }
+    public void setWyType(String wyType) 
+    {
+        this.wyType = wyType;
+    }
+
+    public String getWyType() 
+    {
+        return wyType;
+    }
+    public void setWyResponse(String wyResponse) 
+    {
+        this.wyResponse = wyResponse;
+    }
+
+    public String getWyResponse() 
+    {
+        return wyResponse;
+    }
+    public void setWyPhone(String wyPhone) 
+    {
+        this.wyPhone = wyPhone;
+    }
+
+    public String getWyPhone() 
+    {
+        return wyPhone;
+    }
+    public void setXqAddress(String xqAddress) 
+    {
+        this.xqAddress = xqAddress;
+    }
+
+    public String getXqAddress() 
+    {
+        return xqAddress;
+    }
+    public void setBuildDate(Date buildDate) 
+    {
+        this.buildDate = buildDate;
+    }
+
+    public Date getBuildDate() 
+    {
+        return buildDate;
+    }
+    public void setXqDescribe(String xqDescribe) 
+    {
+        this.xqDescribe = xqDescribe;
+    }
+
+    public String getXqDescribe() 
+    {
+        return xqDescribe;
+    }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+    public void setDeptName(String deptName) 
+    {
+        this.deptName = deptName;
+    }
+
+    public String getDeptName() 
+    {
+        return deptName;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("xqType", getXqType())
+            .append("ldNum", getLdNum())
+            .append("jzArea", getJzArea())
+            .append("zdArea", getZdArea())
+            .append("wyType", getWyType())
+            .append("wyResponse", getWyResponse())
+            .append("wyPhone", getWyPhone())
+            .append("xqAddress", getXqAddress())
+            .append("buildDate", getBuildDate())
+            .append("xqDescribe", getXqDescribe())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("deptId", getDeptId())
+            .append("deptName", getDeptName())
+            .append("userId", getUserId())
+            .toString();
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmInfoMapper.java

@@ -1,13 +1,14 @@
 package com.ruoyi.szxc.mapper;
 
-import java.util.List;
 import com.ruoyi.szxc.domain.SzxcJmInfo;
 
+import java.util.List;
+
 /**
  * 居民信息Mapper接口
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-16
  */
 public interface SzxcJmInfoMapper 
 {

ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcLdInfoMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.mapper;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcLdInfo;
+
+/**
+ * 楼栋信息Mapper接口
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+public interface SzxcLdInfoMapper 
+{
+    /**
+     * 查询楼栋信息
+     * 
+     * @param id 楼栋信息主键
+     * @return 楼栋信息
+     */
+    public SzxcLdInfo selectSzxcLdInfoById(Long id);
+
+    /**
+     * 查询楼栋信息列表
+     * 
+     * @param szxcLdInfo 楼栋信息
+     * @return 楼栋信息集合
+     */
+    public List<SzxcLdInfo> selectSzxcLdInfoList(SzxcLdInfo szxcLdInfo);
+
+    /**
+     * 新增楼栋信息
+     * 
+     * @param szxcLdInfo 楼栋信息
+     * @return 结果
+     */
+    public int insertSzxcLdInfo(SzxcLdInfo szxcLdInfo);
+
+    /**
+     * 修改楼栋信息
+     * 
+     * @param szxcLdInfo 楼栋信息
+     * @return 结果
+     */
+    public int updateSzxcLdInfo(SzxcLdInfo szxcLdInfo);
+
+    /**
+     * 删除楼栋信息
+     * 
+     * @param id 楼栋信息主键
+     * @return 结果
+     */
+    public int deleteSzxcLdInfoById(Long id);
+
+    /**
+     * 批量删除楼栋信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSzxcLdInfoByIds(Long[] ids);
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcLunboMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.mapper;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcLunbo;
+
+/**
+ * 轮播设置Mapper接口
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+public interface SzxcLunboMapper 
+{
+    /**
+     * 查询轮播设置
+     * 
+     * @param id 轮播设置主键
+     * @return 轮播设置
+     */
+    public SzxcLunbo selectSzxcLunboById(Long id);
+
+    /**
+     * 查询轮播设置列表
+     * 
+     * @param szxcLunbo 轮播设置
+     * @return 轮播设置集合
+     */
+    public List<SzxcLunbo> selectSzxcLunboList(SzxcLunbo szxcLunbo);
+
+    /**
+     * 新增轮播设置
+     * 
+     * @param szxcLunbo 轮播设置
+     * @return 结果
+     */
+    public int insertSzxcLunbo(SzxcLunbo szxcLunbo);
+
+    /**
+     * 修改轮播设置
+     * 
+     * @param szxcLunbo 轮播设置
+     * @return 结果
+     */
+    public int updateSzxcLunbo(SzxcLunbo szxcLunbo);
+
+    /**
+     * 删除轮播设置
+     * 
+     * @param id 轮播设置主键
+     * @return 结果
+     */
+    public int deleteSzxcLunboById(Long id);
+
+    /**
+     * 批量删除轮播设置
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSzxcLunboByIds(Long[] ids);
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcPublicActivilyMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.mapper;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcPublicActivily;
+
+/**
+ * 公益活动Mapper接口
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+public interface SzxcPublicActivilyMapper 
+{
+    /**
+     * 查询公益活动
+     * 
+     * @param id 公益活动主键
+     * @return 公益活动
+     */
+    public SzxcPublicActivily selectSzxcPublicActivilyById(Long id);
+
+    /**
+     * 查询公益活动列表
+     * 
+     * @param szxcPublicActivily 公益活动
+     * @return 公益活动集合
+     */
+    public List<SzxcPublicActivily> selectSzxcPublicActivilyList(SzxcPublicActivily szxcPublicActivily);
+
+    /**
+     * 新增公益活动
+     * 
+     * @param szxcPublicActivily 公益活动
+     * @return 结果
+     */
+    public int insertSzxcPublicActivily(SzxcPublicActivily szxcPublicActivily);
+
+    /**
+     * 修改公益活动
+     * 
+     * @param szxcPublicActivily 公益活动
+     * @return 结果
+     */
+    public int updateSzxcPublicActivily(SzxcPublicActivily szxcPublicActivily);
+
+    /**
+     * 删除公益活动
+     * 
+     * @param id 公益活动主键
+     * @return 结果
+     */
+    public int deleteSzxcPublicActivilyById(Long id);
+
+    /**
+     * 批量删除公益活动
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSzxcPublicActivilyByIds(Long[] ids);
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcVisitRecardMapper.java

@@ -7,7 +7,7 @@ import com.ruoyi.szxc.domain.SzxcVisitRecard;
  * 走访记录Mapper接口
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-16
  */
 public interface SzxcVisitRecardMapper 
 {

ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcWorkGuideMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.mapper;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcWorkGuide;
+
+/**
+ * 办事指南Mapper接口
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+public interface SzxcWorkGuideMapper 
+{
+    /**
+     * 查询办事指南
+     * 
+     * @param id 办事指南主键
+     * @return 办事指南
+     */
+    public SzxcWorkGuide selectSzxcWorkGuideById(Long id);
+
+    /**
+     * 查询办事指南列表
+     * 
+     * @param szxcWorkGuide 办事指南
+     * @return 办事指南集合
+     */
+    public List<SzxcWorkGuide> selectSzxcWorkGuideList(SzxcWorkGuide szxcWorkGuide);
+
+    /**
+     * 新增办事指南
+     * 
+     * @param szxcWorkGuide 办事指南
+     * @return 结果
+     */
+    public int insertSzxcWorkGuide(SzxcWorkGuide szxcWorkGuide);
+
+    /**
+     * 修改办事指南
+     * 
+     * @param szxcWorkGuide 办事指南
+     * @return 结果
+     */
+    public int updateSzxcWorkGuide(SzxcWorkGuide szxcWorkGuide);
+
+    /**
+     * 删除办事指南
+     * 
+     * @param id 办事指南主键
+     * @return 结果
+     */
+    public int deleteSzxcWorkGuideById(Long id);
+
+    /**
+     * 批量删除办事指南
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSzxcWorkGuideByIds(Long[] ids);
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcXcRecardMapper.java

@@ -7,7 +7,7 @@ import com.ruoyi.szxc.domain.SzxcXcRecard;
  * 巡查记录Mapper接口
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-16
  */
 public interface SzxcXcRecardMapper 
 {

ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcXqInfoMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.mapper;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcXqInfo;
+
+/**
+ * 小区信息Mapper接口
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+public interface SzxcXqInfoMapper 
+{
+    /**
+     * 查询小区信息
+     * 
+     * @param id 小区信息主键
+     * @return 小区信息
+     */
+    public SzxcXqInfo selectSzxcXqInfoById(Long id);
+
+    /**
+     * 查询小区信息列表
+     * 
+     * @param szxcXqInfo 小区信息
+     * @return 小区信息集合
+     */
+    public List<SzxcXqInfo> selectSzxcXqInfoList(SzxcXqInfo szxcXqInfo);
+
+    /**
+     * 新增小区信息
+     * 
+     * @param szxcXqInfo 小区信息
+     * @return 结果
+     */
+    public int insertSzxcXqInfo(SzxcXqInfo szxcXqInfo);
+
+    /**
+     * 修改小区信息
+     * 
+     * @param szxcXqInfo 小区信息
+     * @return 结果
+     */
+    public int updateSzxcXqInfo(SzxcXqInfo szxcXqInfo);
+
+    /**
+     * 删除小区信息
+     * 
+     * @param id 小区信息主键
+     * @return 结果
+     */
+    public int deleteSzxcXqInfoById(Long id);
+
+    /**
+     * 批量删除小区信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSzxcXqInfoByIds(Long[] ids);
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmInfoService.java

@@ -1,13 +1,14 @@
 package com.ruoyi.szxc.service;
 
-import java.util.List;
 import com.ruoyi.szxc.domain.SzxcJmInfo;
 
+import java.util.List;
+
 /**
  * 居民信息Service接口
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-16
  */
 public interface ISzxcJmInfoService 
 {

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcLdInfoService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.service;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcLdInfo;
+
+/**
+ * 楼栋信息Service接口
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+public interface ISzxcLdInfoService 
+{
+    /**
+     * 查询楼栋信息
+     * 
+     * @param id 楼栋信息主键
+     * @return 楼栋信息
+     */
+    public SzxcLdInfo selectSzxcLdInfoById(Long id);
+
+    /**
+     * 查询楼栋信息列表
+     * 
+     * @param szxcLdInfo 楼栋信息
+     * @return 楼栋信息集合
+     */
+    public List<SzxcLdInfo> selectSzxcLdInfoList(SzxcLdInfo szxcLdInfo);
+
+    /**
+     * 新增楼栋信息
+     * 
+     * @param szxcLdInfo 楼栋信息
+     * @return 结果
+     */
+    public int insertSzxcLdInfo(SzxcLdInfo szxcLdInfo);
+
+    /**
+     * 修改楼栋信息
+     * 
+     * @param szxcLdInfo 楼栋信息
+     * @return 结果
+     */
+    public int updateSzxcLdInfo(SzxcLdInfo szxcLdInfo);
+
+    /**
+     * 批量删除楼栋信息
+     * 
+     * @param ids 需要删除的楼栋信息主键集合
+     * @return 结果
+     */
+    public int deleteSzxcLdInfoByIds(Long[] ids);
+
+    /**
+     * 删除楼栋信息信息
+     * 
+     * @param id 楼栋信息主键
+     * @return 结果
+     */
+    public int deleteSzxcLdInfoById(Long id);
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcLunboService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.service;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcLunbo;
+
+/**
+ * 轮播设置Service接口
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+public interface ISzxcLunboService 
+{
+    /**
+     * 查询轮播设置
+     * 
+     * @param id 轮播设置主键
+     * @return 轮播设置
+     */
+    public SzxcLunbo selectSzxcLunboById(Long id);
+
+    /**
+     * 查询轮播设置列表
+     * 
+     * @param szxcLunbo 轮播设置
+     * @return 轮播设置集合
+     */
+    public List<SzxcLunbo> selectSzxcLunboList(SzxcLunbo szxcLunbo);
+
+    /**
+     * 新增轮播设置
+     * 
+     * @param szxcLunbo 轮播设置
+     * @return 结果
+     */
+    public int insertSzxcLunbo(SzxcLunbo szxcLunbo);
+
+    /**
+     * 修改轮播设置
+     * 
+     * @param szxcLunbo 轮播设置
+     * @return 结果
+     */
+    public int updateSzxcLunbo(SzxcLunbo szxcLunbo);
+
+    /**
+     * 批量删除轮播设置
+     * 
+     * @param ids 需要删除的轮播设置主键集合
+     * @return 结果
+     */
+    public int deleteSzxcLunboByIds(Long[] ids);
+
+    /**
+     * 删除轮播设置信息
+     * 
+     * @param id 轮播设置主键
+     * @return 结果
+     */
+    public int deleteSzxcLunboById(Long id);
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcPublicActivilyService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.service;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcPublicActivily;
+
+/**
+ * 公益活动Service接口
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+public interface ISzxcPublicActivilyService 
+{
+    /**
+     * 查询公益活动
+     * 
+     * @param id 公益活动主键
+     * @return 公益活动
+     */
+    public SzxcPublicActivily selectSzxcPublicActivilyById(Long id);
+
+    /**
+     * 查询公益活动列表
+     * 
+     * @param szxcPublicActivily 公益活动
+     * @return 公益活动集合
+     */
+    public List<SzxcPublicActivily> selectSzxcPublicActivilyList(SzxcPublicActivily szxcPublicActivily);
+
+    /**
+     * 新增公益活动
+     * 
+     * @param szxcPublicActivily 公益活动
+     * @return 结果
+     */
+    public int insertSzxcPublicActivily(SzxcPublicActivily szxcPublicActivily);
+
+    /**
+     * 修改公益活动
+     * 
+     * @param szxcPublicActivily 公益活动
+     * @return 结果
+     */
+    public int updateSzxcPublicActivily(SzxcPublicActivily szxcPublicActivily);
+
+    /**
+     * 批量删除公益活动
+     * 
+     * @param ids 需要删除的公益活动主键集合
+     * @return 结果
+     */
+    public int deleteSzxcPublicActivilyByIds(Long[] ids);
+
+    /**
+     * 删除公益活动信息
+     * 
+     * @param id 公益活动主键
+     * @return 结果
+     */
+    public int deleteSzxcPublicActivilyById(Long id);
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcVisitRecardService.java

@@ -7,7 +7,7 @@ import com.ruoyi.szxc.domain.SzxcVisitRecard;
  * 走访记录Service接口
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-16
  */
 public interface ISzxcVisitRecardService 
 {

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcWorkGuideService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.service;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcWorkGuide;
+
+/**
+ * 办事指南Service接口
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+public interface ISzxcWorkGuideService 
+{
+    /**
+     * 查询办事指南
+     * 
+     * @param id 办事指南主键
+     * @return 办事指南
+     */
+    public SzxcWorkGuide selectSzxcWorkGuideById(Long id);
+
+    /**
+     * 查询办事指南列表
+     * 
+     * @param szxcWorkGuide 办事指南
+     * @return 办事指南集合
+     */
+    public List<SzxcWorkGuide> selectSzxcWorkGuideList(SzxcWorkGuide szxcWorkGuide);
+
+    /**
+     * 新增办事指南
+     * 
+     * @param szxcWorkGuide 办事指南
+     * @return 结果
+     */
+    public int insertSzxcWorkGuide(SzxcWorkGuide szxcWorkGuide);
+
+    /**
+     * 修改办事指南
+     * 
+     * @param szxcWorkGuide 办事指南
+     * @return 结果
+     */
+    public int updateSzxcWorkGuide(SzxcWorkGuide szxcWorkGuide);
+
+    /**
+     * 批量删除办事指南
+     * 
+     * @param ids 需要删除的办事指南主键集合
+     * @return 结果
+     */
+    public int deleteSzxcWorkGuideByIds(Long[] ids);
+
+    /**
+     * 删除办事指南信息
+     * 
+     * @param id 办事指南主键
+     * @return 结果
+     */
+    public int deleteSzxcWorkGuideById(Long id);
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcXcRecardService.java

@@ -7,7 +7,7 @@ import com.ruoyi.szxc.domain.SzxcXcRecard;
  * 巡查记录Service接口
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-16
  */
 public interface ISzxcXcRecardService 
 {

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcXqInfoService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.service;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcXqInfo;
+
+/**
+ * 小区信息Service接口
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+public interface ISzxcXqInfoService 
+{
+    /**
+     * 查询小区信息
+     * 
+     * @param id 小区信息主键
+     * @return 小区信息
+     */
+    public SzxcXqInfo selectSzxcXqInfoById(Long id);
+
+    /**
+     * 查询小区信息列表
+     * 
+     * @param szxcXqInfo 小区信息
+     * @return 小区信息集合
+     */
+    public List<SzxcXqInfo> selectSzxcXqInfoList(SzxcXqInfo szxcXqInfo);
+
+    /**
+     * 新增小区信息
+     * 
+     * @param szxcXqInfo 小区信息
+     * @return 结果
+     */
+    public int insertSzxcXqInfo(SzxcXqInfo szxcXqInfo);
+
+    /**
+     * 修改小区信息
+     * 
+     * @param szxcXqInfo 小区信息
+     * @return 结果
+     */
+    public int updateSzxcXqInfo(SzxcXqInfo szxcXqInfo);
+
+    /**
+     * 批量删除小区信息
+     * 
+     * @param ids 需要删除的小区信息主键集合
+     * @return 结果
+     */
+    public int deleteSzxcXqInfoByIds(Long[] ids);
+
+    /**
+     * 删除小区信息信息
+     * 
+     * @param id 小区信息主键
+     * @return 结果
+     */
+    public int deleteSzxcXqInfoById(Long id);
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmInfoServiceImpl.java

@@ -1,18 +1,19 @@
 package com.ruoyi.szxc.service.impl;
 
-import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.szxc.mapper.SzxcJmInfoMapper;
 import com.ruoyi.szxc.domain.SzxcJmInfo;
+import com.ruoyi.szxc.mapper.SzxcJmInfoMapper;
 import com.ruoyi.szxc.service.ISzxcJmInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 居民信息Service业务层处理
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-16
  */
 @Service
 public class SzxcJmInfoServiceImpl implements ISzxcJmInfoService 

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcLdInfoServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.szxc.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.szxc.mapper.SzxcLdInfoMapper;
+import com.ruoyi.szxc.domain.SzxcLdInfo;
+import com.ruoyi.szxc.service.ISzxcLdInfoService;
+
+/**
+ * 楼栋信息Service业务层处理
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+@Service
+public class SzxcLdInfoServiceImpl implements ISzxcLdInfoService 
+{
+    @Autowired
+    private SzxcLdInfoMapper szxcLdInfoMapper;
+
+    /**
+     * 查询楼栋信息
+     * 
+     * @param id 楼栋信息主键
+     * @return 楼栋信息
+     */
+    @Override
+    public SzxcLdInfo selectSzxcLdInfoById(Long id)
+    {
+        return szxcLdInfoMapper.selectSzxcLdInfoById(id);
+    }
+
+    /**
+     * 查询楼栋信息列表
+     * 
+     * @param szxcLdInfo 楼栋信息
+     * @return 楼栋信息
+     */
+    @Override
+    public List<SzxcLdInfo> selectSzxcLdInfoList(SzxcLdInfo szxcLdInfo)
+    {
+        return szxcLdInfoMapper.selectSzxcLdInfoList(szxcLdInfo);
+    }
+
+    /**
+     * 新增楼栋信息
+     * 
+     * @param szxcLdInfo 楼栋信息
+     * @return 结果
+     */
+    @Override
+    public int insertSzxcLdInfo(SzxcLdInfo szxcLdInfo)
+    {
+        szxcLdInfo.setCreateTime(DateUtils.getNowDate());
+        return szxcLdInfoMapper.insertSzxcLdInfo(szxcLdInfo);
+    }
+
+    /**
+     * 修改楼栋信息
+     * 
+     * @param szxcLdInfo 楼栋信息
+     * @return 结果
+     */
+    @Override
+    public int updateSzxcLdInfo(SzxcLdInfo szxcLdInfo)
+    {
+        szxcLdInfo.setUpdateTime(DateUtils.getNowDate());
+        return szxcLdInfoMapper.updateSzxcLdInfo(szxcLdInfo);
+    }
+
+    /**
+     * 批量删除楼栋信息
+     * 
+     * @param ids 需要删除的楼栋信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcLdInfoByIds(Long[] ids)
+    {
+        return szxcLdInfoMapper.deleteSzxcLdInfoByIds(ids);
+    }
+
+    /**
+     * 删除楼栋信息信息
+     * 
+     * @param id 楼栋信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcLdInfoById(Long id)
+    {
+        return szxcLdInfoMapper.deleteSzxcLdInfoById(id);
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcLunboServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.szxc.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.szxc.mapper.SzxcLunboMapper;
+import com.ruoyi.szxc.domain.SzxcLunbo;
+import com.ruoyi.szxc.service.ISzxcLunboService;
+
+/**
+ * 轮播设置Service业务层处理
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+@Service
+public class SzxcLunboServiceImpl implements ISzxcLunboService 
+{
+    @Autowired
+    private SzxcLunboMapper szxcLunboMapper;
+
+    /**
+     * 查询轮播设置
+     * 
+     * @param id 轮播设置主键
+     * @return 轮播设置
+     */
+    @Override
+    public SzxcLunbo selectSzxcLunboById(Long id)
+    {
+        return szxcLunboMapper.selectSzxcLunboById(id);
+    }
+
+    /**
+     * 查询轮播设置列表
+     * 
+     * @param szxcLunbo 轮播设置
+     * @return 轮播设置
+     */
+    @Override
+    public List<SzxcLunbo> selectSzxcLunboList(SzxcLunbo szxcLunbo)
+    {
+        return szxcLunboMapper.selectSzxcLunboList(szxcLunbo);
+    }
+
+    /**
+     * 新增轮播设置
+     * 
+     * @param szxcLunbo 轮播设置
+     * @return 结果
+     */
+    @Override
+    public int insertSzxcLunbo(SzxcLunbo szxcLunbo)
+    {
+        szxcLunbo.setCreateTime(DateUtils.getNowDate());
+        return szxcLunboMapper.insertSzxcLunbo(szxcLunbo);
+    }
+
+    /**
+     * 修改轮播设置
+     * 
+     * @param szxcLunbo 轮播设置
+     * @return 结果
+     */
+    @Override
+    public int updateSzxcLunbo(SzxcLunbo szxcLunbo)
+    {
+        szxcLunbo.setUpdateTime(DateUtils.getNowDate());
+        return szxcLunboMapper.updateSzxcLunbo(szxcLunbo);
+    }
+
+    /**
+     * 批量删除轮播设置
+     * 
+     * @param ids 需要删除的轮播设置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcLunboByIds(Long[] ids)
+    {
+        return szxcLunboMapper.deleteSzxcLunboByIds(ids);
+    }
+
+    /**
+     * 删除轮播设置信息
+     * 
+     * @param id 轮播设置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcLunboById(Long id)
+    {
+        return szxcLunboMapper.deleteSzxcLunboById(id);
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPublicActivilyServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.szxc.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.szxc.mapper.SzxcPublicActivilyMapper;
+import com.ruoyi.szxc.domain.SzxcPublicActivily;
+import com.ruoyi.szxc.service.ISzxcPublicActivilyService;
+
+/**
+ * 公益活动Service业务层处理
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+@Service
+public class SzxcPublicActivilyServiceImpl implements ISzxcPublicActivilyService 
+{
+    @Autowired
+    private SzxcPublicActivilyMapper szxcPublicActivilyMapper;
+
+    /**
+     * 查询公益活动
+     * 
+     * @param id 公益活动主键
+     * @return 公益活动
+     */
+    @Override
+    public SzxcPublicActivily selectSzxcPublicActivilyById(Long id)
+    {
+        return szxcPublicActivilyMapper.selectSzxcPublicActivilyById(id);
+    }
+
+    /**
+     * 查询公益活动列表
+     * 
+     * @param szxcPublicActivily 公益活动
+     * @return 公益活动
+     */
+    @Override
+    public List<SzxcPublicActivily> selectSzxcPublicActivilyList(SzxcPublicActivily szxcPublicActivily)
+    {
+        return szxcPublicActivilyMapper.selectSzxcPublicActivilyList(szxcPublicActivily);
+    }
+
+    /**
+     * 新增公益活动
+     * 
+     * @param szxcPublicActivily 公益活动
+     * @return 结果
+     */
+    @Override
+    public int insertSzxcPublicActivily(SzxcPublicActivily szxcPublicActivily)
+    {
+        szxcPublicActivily.setCreateTime(DateUtils.getNowDate());
+        return szxcPublicActivilyMapper.insertSzxcPublicActivily(szxcPublicActivily);
+    }
+
+    /**
+     * 修改公益活动
+     * 
+     * @param szxcPublicActivily 公益活动
+     * @return 结果
+     */
+    @Override
+    public int updateSzxcPublicActivily(SzxcPublicActivily szxcPublicActivily)
+    {
+        szxcPublicActivily.setUpdateTime(DateUtils.getNowDate());
+        return szxcPublicActivilyMapper.updateSzxcPublicActivily(szxcPublicActivily);
+    }
+
+    /**
+     * 批量删除公益活动
+     * 
+     * @param ids 需要删除的公益活动主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcPublicActivilyByIds(Long[] ids)
+    {
+        return szxcPublicActivilyMapper.deleteSzxcPublicActivilyByIds(ids);
+    }
+
+    /**
+     * 删除公益活动信息
+     * 
+     * @param id 公益活动主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcPublicActivilyById(Long id)
+    {
+        return szxcPublicActivilyMapper.deleteSzxcPublicActivilyById(id);
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVisitRecardServiceImpl.java

@@ -12,7 +12,7 @@ import com.ruoyi.szxc.service.ISzxcVisitRecardService;
  * 走访记录Service业务层处理
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-16
  */
 @Service
 public class SzxcVisitRecardServiceImpl implements ISzxcVisitRecardService 

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWorkGuideServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.szxc.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.szxc.mapper.SzxcWorkGuideMapper;
+import com.ruoyi.szxc.domain.SzxcWorkGuide;
+import com.ruoyi.szxc.service.ISzxcWorkGuideService;
+
+/**
+ * 办事指南Service业务层处理
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+@Service
+public class SzxcWorkGuideServiceImpl implements ISzxcWorkGuideService 
+{
+    @Autowired
+    private SzxcWorkGuideMapper szxcWorkGuideMapper;
+
+    /**
+     * 查询办事指南
+     * 
+     * @param id 办事指南主键
+     * @return 办事指南
+     */
+    @Override
+    public SzxcWorkGuide selectSzxcWorkGuideById(Long id)
+    {
+        return szxcWorkGuideMapper.selectSzxcWorkGuideById(id);
+    }
+
+    /**
+     * 查询办事指南列表
+     * 
+     * @param szxcWorkGuide 办事指南
+     * @return 办事指南
+     */
+    @Override
+    public List<SzxcWorkGuide> selectSzxcWorkGuideList(SzxcWorkGuide szxcWorkGuide)
+    {
+        return szxcWorkGuideMapper.selectSzxcWorkGuideList(szxcWorkGuide);
+    }
+
+    /**
+     * 新增办事指南
+     * 
+     * @param szxcWorkGuide 办事指南
+     * @return 结果
+     */
+    @Override
+    public int insertSzxcWorkGuide(SzxcWorkGuide szxcWorkGuide)
+    {
+        szxcWorkGuide.setCreateTime(DateUtils.getNowDate());
+        return szxcWorkGuideMapper.insertSzxcWorkGuide(szxcWorkGuide);
+    }
+
+    /**
+     * 修改办事指南
+     * 
+     * @param szxcWorkGuide 办事指南
+     * @return 结果
+     */
+    @Override
+    public int updateSzxcWorkGuide(SzxcWorkGuide szxcWorkGuide)
+    {
+        szxcWorkGuide.setUpdateTime(DateUtils.getNowDate());
+        return szxcWorkGuideMapper.updateSzxcWorkGuide(szxcWorkGuide);
+    }
+
+    /**
+     * 批量删除办事指南
+     * 
+     * @param ids 需要删除的办事指南主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcWorkGuideByIds(Long[] ids)
+    {
+        return szxcWorkGuideMapper.deleteSzxcWorkGuideByIds(ids);
+    }
+
+    /**
+     * 删除办事指南信息
+     * 
+     * @param id 办事指南主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcWorkGuideById(Long id)
+    {
+        return szxcWorkGuideMapper.deleteSzxcWorkGuideById(id);
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXcRecardServiceImpl.java

@@ -12,7 +12,7 @@ import com.ruoyi.szxc.service.ISzxcXcRecardService;
  * 巡查记录Service业务层处理
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-16
  */
 @Service
 public class SzxcXcRecardServiceImpl implements ISzxcXcRecardService 

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXqInfoServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.szxc.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.szxc.mapper.SzxcXqInfoMapper;
+import com.ruoyi.szxc.domain.SzxcXqInfo;
+import com.ruoyi.szxc.service.ISzxcXqInfoService;
+
+/**
+ * 小区信息Service业务层处理
+ * 
+ * @author hs
+ * @date 2024-03-16
+ */
+@Service
+public class SzxcXqInfoServiceImpl implements ISzxcXqInfoService 
+{
+    @Autowired
+    private SzxcXqInfoMapper szxcXqInfoMapper;
+
+    /**
+     * 查询小区信息
+     * 
+     * @param id 小区信息主键
+     * @return 小区信息
+     */
+    @Override
+    public SzxcXqInfo selectSzxcXqInfoById(Long id)
+    {
+        return szxcXqInfoMapper.selectSzxcXqInfoById(id);
+    }
+
+    /**
+     * 查询小区信息列表
+     * 
+     * @param szxcXqInfo 小区信息
+     * @return 小区信息
+     */
+    @Override
+    public List<SzxcXqInfo> selectSzxcXqInfoList(SzxcXqInfo szxcXqInfo)
+    {
+        return szxcXqInfoMapper.selectSzxcXqInfoList(szxcXqInfo);
+    }
+
+    /**
+     * 新增小区信息
+     * 
+     * @param szxcXqInfo 小区信息
+     * @return 结果
+     */
+    @Override
+    public int insertSzxcXqInfo(SzxcXqInfo szxcXqInfo)
+    {
+        szxcXqInfo.setCreateTime(DateUtils.getNowDate());
+        return szxcXqInfoMapper.insertSzxcXqInfo(szxcXqInfo);
+    }
+
+    /**
+     * 修改小区信息
+     * 
+     * @param szxcXqInfo 小区信息
+     * @return 结果
+     */
+    @Override
+    public int updateSzxcXqInfo(SzxcXqInfo szxcXqInfo)
+    {
+        szxcXqInfo.setUpdateTime(DateUtils.getNowDate());
+        return szxcXqInfoMapper.updateSzxcXqInfo(szxcXqInfo);
+    }
+
+    /**
+     * 批量删除小区信息
+     * 
+     * @param ids 需要删除的小区信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcXqInfoByIds(Long[] ids)
+    {
+        return szxcXqInfoMapper.deleteSzxcXqInfoByIds(ids);
+    }
+
+    /**
+     * 删除小区信息信息
+     * 
+     * @param id 小区信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcXqInfoById(Long id)
+    {
+        return szxcXqInfoMapper.deleteSzxcXqInfoById(id);
+    }
+}

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml

@@ -21,6 +21,14 @@
         <result property="longLive"    column="long_live"    />
         <result property="hjAddress"    column="hj_address"    />
         <result property="phone"    column="phone"    />
+        <result property="currentAddress"    column="current_address"    />
+        <result property="brqk"    column="brqk"    />
+        <result property="hy"    column="hy"    />
+        <result property="xueli"    column="xueli"    />
+        <result property="zzmm"    column="zzmm"    />
+        <result property="zjxy"    column="zjxy"    />
+        <result property="jkzk"    column="jkzk"    />
+        <result property="ills"    column="ills"    />
         <result property="head"    column="head"    />
         <result property="sameHeadIds"    column="same_head_ids"    />
         <result property="off"    column="off"    />
@@ -32,7 +40,7 @@
     </resultMap>
 
     <sql id="selectSzxcJmInfoVo">
-        select id, dept_id, dept_name, name, old_name, nationality, card_id, born_date, age, sex, jg, relation, jg_nature, long_live, hj_address, phone, head, same_head_ids, off, create_by, create_time, update_by, update_time, user_id from szxc_jm_info
+        select id, dept_id, dept_name, name, old_name, nationality, card_id, born_date, age, sex, jg, relation, jg_nature, long_live, hj_address, phone, current_address, brqk, hy, xueli, zzmm, zjxy, jkzk, ills, head, same_head_ids, off, create_by, create_time, update_by, update_time, user_id from szxc_jm_info
     </sql>
 
     <select id="selectSzxcJmInfoList" parameterType="SzxcJmInfo" resultMap="SzxcJmInfoResult">
@@ -53,6 +61,14 @@
             <if test="longLive != null  and longLive != ''"> and long_live = #{longLive}</if>
             <if test="hjAddress != null  and hjAddress != ''"> and hj_address = #{hjAddress}</if>
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="currentAddress != null  and currentAddress != ''"> and current_address = #{currentAddress}</if>
+            <if test="brqk != null  and brqk != ''"> and brqk = #{brqk}</if>
+            <if test="hy != null  and hy != ''"> and hy = #{hy}</if>
+            <if test="xueli != null  and xueli != ''"> and xueli = #{xueli}</if>
+            <if test="zzmm != null  and zzmm != ''"> and zzmm = #{zzmm}</if>
+            <if test="zjxy != null  and zjxy != ''"> and zjxy = #{zjxy}</if>
+            <if test="jkzk != null  and jkzk != ''"> and jkzk = #{jkzk}</if>
+            <if test="ills != null  and ills != ''"> and ills = #{ills}</if>
             <if test="head != null  and head != ''"> and head = #{head}</if>
             <if test="sameHeadIds != null  and sameHeadIds != ''"> and same_head_ids = #{sameHeadIds}</if>
             <if test="off != null  and off != ''"> and off = #{off}</if>
@@ -83,6 +99,14 @@
             <if test="longLive != null">long_live,</if>
             <if test="hjAddress != null">hj_address,</if>
             <if test="phone != null">phone,</if>
+            <if test="currentAddress != null">current_address,</if>
+            <if test="brqk != null">brqk,</if>
+            <if test="hy != null">hy,</if>
+            <if test="xueli != null">xueli,</if>
+            <if test="zzmm != null">zzmm,</if>
+            <if test="zjxy != null">zjxy,</if>
+            <if test="jkzk != null">jkzk,</if>
+            <if test="ills != null">ills,</if>
             <if test="head != null and head != ''">head,</if>
             <if test="sameHeadIds != null">same_head_ids,</if>
             <if test="off != null and off != ''">off,</if>
@@ -108,6 +132,14 @@
             <if test="longLive != null">#{longLive},</if>
             <if test="hjAddress != null">#{hjAddress},</if>
             <if test="phone != null">#{phone},</if>
+            <if test="currentAddress != null">#{currentAddress},</if>
+            <if test="brqk != null">#{brqk},</if>
+            <if test="hy != null">#{hy},</if>
+            <if test="xueli != null">#{xueli},</if>
+            <if test="zzmm != null">#{zzmm},</if>
+            <if test="zjxy != null">#{zjxy},</if>
+            <if test="jkzk != null">#{jkzk},</if>
+            <if test="ills != null">#{ills},</if>
             <if test="head != null and head != ''">#{head},</if>
             <if test="sameHeadIds != null">#{sameHeadIds},</if>
             <if test="off != null and off != ''">#{off},</if>
@@ -137,6 +169,14 @@
             <if test="longLive != null">long_live = #{longLive},</if>
             <if test="hjAddress != null">hj_address = #{hjAddress},</if>
             <if test="phone != null">phone = #{phone},</if>
+            <if test="currentAddress != null">current_address = #{currentAddress},</if>
+            <if test="brqk != null">brqk = #{brqk},</if>
+            <if test="hy != null">hy = #{hy},</if>
+            <if test="xueli != null">xueli = #{xueli},</if>
+            <if test="zzmm != null">zzmm = #{zzmm},</if>
+            <if test="zjxy != null">zjxy = #{zjxy},</if>
+            <if test="jkzk != null">jkzk = #{jkzk},</if>
+            <if test="ills != null">ills = #{ills},</if>
             <if test="head != null and head != ''">head = #{head},</if>
             <if test="sameHeadIds != null">same_head_ids = #{sameHeadIds},</if>
             <if test="off != null and off != ''">off = #{off},</if>

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcLdInfoMapper.xml

@@ -0,0 +1,132 @@
+<?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="com.ruoyi.szxc.mapper.SzxcLdInfoMapper">
+    
+    <resultMap type="SzxcLdInfo" id="SzxcLdInfoResult">
+        <result property="id"    column="id"    />
+        <result property="xqId"    column="xq_id"    />
+        <result property="ldName"    column="ld_name"    />
+        <result property="xqType"    column="xq_type"    />
+        <result property="ldSort"    column="ld_sort"    />
+        <result property="ldjg"    column="ldjg"    />
+        <result property="qnfs"    column="qnfs"    />
+        <result property="lcNum"    column="lc_num"    />
+        <result property="unitNum"    column="unit_num"    />
+        <result property="huNum"    column="hu_num"    />
+        <result property="ldDescribe"    column="ld_describe"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="userId"    column="user_id"    />
+    </resultMap>
+
+    <sql id="selectSzxcLdInfoVo">
+        select id, xq_id, ld_name, xq_type, ld_sort, ldjg, qnfs, lc_num, unit_num, hu_num, ld_describe, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_ld_info
+    </sql>
+
+    <select id="selectSzxcLdInfoList" parameterType="SzxcLdInfo" resultMap="SzxcLdInfoResult">
+        <include refid="selectSzxcLdInfoVo"/>
+        <where>  
+            <if test="xqId != null "> and xq_id = #{xqId}</if>
+            <if test="ldName != null  and ldName != ''"> and ld_name like concat('%', #{ldName}, '%')</if>
+            <if test="xqType != null  and xqType != ''"> and xq_type = #{xqType}</if>
+            <if test="ldSort != null  and ldSort != ''"> and ld_sort = #{ldSort}</if>
+            <if test="ldjg != null  and ldjg != ''"> and ldjg = #{ldjg}</if>
+            <if test="qnfs != null  and qnfs != ''"> and qnfs = #{qnfs}</if>
+            <if test="lcNum != null "> and lc_num = #{lcNum}</if>
+            <if test="unitNum != null "> and unit_num = #{unitNum}</if>
+            <if test="huNum != null "> and hu_num = #{huNum}</if>
+            <if test="ldDescribe != null  and ldDescribe != ''"> and ld_describe = #{ldDescribe}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSzxcLdInfoById" parameterType="Long" resultMap="SzxcLdInfoResult">
+        <include refid="selectSzxcLdInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSzxcLdInfo" parameterType="SzxcLdInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into szxc_ld_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="xqId != null">xq_id,</if>
+            <if test="ldName != null">ld_name,</if>
+            <if test="xqType != null">xq_type,</if>
+            <if test="ldSort != null">ld_sort,</if>
+            <if test="ldjg != null">ldjg,</if>
+            <if test="qnfs != null">qnfs,</if>
+            <if test="lcNum != null">lc_num,</if>
+            <if test="unitNum != null">unit_num,</if>
+            <if test="huNum != null">hu_num,</if>
+            <if test="ldDescribe != null">ld_describe,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null">dept_name,</if>
+            <if test="userId != null">user_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="xqId != null">#{xqId},</if>
+            <if test="ldName != null">#{ldName},</if>
+            <if test="xqType != null">#{xqType},</if>
+            <if test="ldSort != null">#{ldSort},</if>
+            <if test="ldjg != null">#{ldjg},</if>
+            <if test="qnfs != null">#{qnfs},</if>
+            <if test="lcNum != null">#{lcNum},</if>
+            <if test="unitNum != null">#{unitNum},</if>
+            <if test="huNum != null">#{huNum},</if>
+            <if test="ldDescribe != null">#{ldDescribe},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null">#{deptName},</if>
+            <if test="userId != null">#{userId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSzxcLdInfo" parameterType="SzxcLdInfo">
+        update szxc_ld_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xqId != null">xq_id = #{xqId},</if>
+            <if test="ldName != null">ld_name = #{ldName},</if>
+            <if test="xqType != null">xq_type = #{xqType},</if>
+            <if test="ldSort != null">ld_sort = #{ldSort},</if>
+            <if test="ldjg != null">ldjg = #{ldjg},</if>
+            <if test="qnfs != null">qnfs = #{qnfs},</if>
+            <if test="lcNum != null">lc_num = #{lcNum},</if>
+            <if test="unitNum != null">unit_num = #{unitNum},</if>
+            <if test="huNum != null">hu_num = #{huNum},</if>
+            <if test="ldDescribe != null">ld_describe = #{ldDescribe},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="deptName != null">dept_name = #{deptName},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSzxcLdInfoById" parameterType="Long">
+        delete from szxc_ld_info where id = #{id}
+    </delete>
+
+    <delete id="deleteSzxcLdInfoByIds" parameterType="String">
+        delete from szxc_ld_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcLunboMapper.xml

@@ -0,0 +1,86 @@
+<?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="com.ruoyi.szxc.mapper.SzxcLunboMapper">
+    
+    <resultMap type="SzxcLunbo" id="SzxcLunboResult">
+        <result property="id"    column="id"    />
+        <result property="title"    column="title"    />
+        <result property="picture"    column="picture"    />
+        <result property="content"    column="content"    />
+        <result property="remark"    column="remark"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectSzxcLunboVo">
+        select id, title, picture, content, remark, create_by, create_time, update_by, update_time from szxc_lunbo
+    </sql>
+
+    <select id="selectSzxcLunboList" parameterType="SzxcLunbo" resultMap="SzxcLunboResult">
+        <include refid="selectSzxcLunboVo"/>
+        <where>  
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="picture != null  and picture != ''"> and picture = #{picture}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+        </where>
+    </select>
+    
+    <select id="selectSzxcLunboById" parameterType="Long" resultMap="SzxcLunboResult">
+        <include refid="selectSzxcLunboVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSzxcLunbo" parameterType="SzxcLunbo" useGeneratedKeys="true" keyProperty="id">
+        insert into szxc_lunbo
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="title != null">title,</if>
+            <if test="picture != null">picture,</if>
+            <if test="content != null">content,</if>
+            <if test="remark != null">remark,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="title != null">#{title},</if>
+            <if test="picture != null">#{picture},</if>
+            <if test="content != null">#{content},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSzxcLunbo" parameterType="SzxcLunbo">
+        update szxc_lunbo
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null">title = #{title},</if>
+            <if test="picture != null">picture = #{picture},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSzxcLunboById" parameterType="Long">
+        delete from szxc_lunbo where id = #{id}
+    </delete>
+
+    <delete id="deleteSzxcLunboByIds" parameterType="String">
+        delete from szxc_lunbo where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPublicActivilyMapper.xml

@@ -0,0 +1,126 @@
+<?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="com.ruoyi.szxc.mapper.SzxcPublicActivilyMapper">
+    
+    <resultMap type="SzxcPublicActivily" id="SzxcPublicActivilyResult">
+        <result property="id"    column="id"    />
+        <result property="title"    column="title"    />
+        <result property="leader"    column="leader"    />
+        <result property="phone"    column="phone"    />
+        <result property="type"    column="type"    />
+        <result property="content"    column="content"    />
+        <result property="leave"    column="leave"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="endTime"    column="end_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="remark"    column="remark"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="userId"    column="user_id"    />
+    </resultMap>
+
+    <sql id="selectSzxcPublicActivilyVo">
+        select id, title, leader, phone, type, content, leave, start_time, end_time, create_by, remark, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_public_activily
+    </sql>
+
+    <select id="selectSzxcPublicActivilyList" parameterType="SzxcPublicActivily" resultMap="SzxcPublicActivilyResult">
+        <include refid="selectSzxcPublicActivilyVo"/>
+        <where>  
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="leader != null  and leader != ''"> and leader = #{leader}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="leave != null  and leave != ''"> and leave = #{leave}</if>
+            <if test="startTime != null "> and start_time = #{startTime}</if>
+            <if test="endTime != null "> and end_time = #{endTime}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSzxcPublicActivilyById" parameterType="Long" resultMap="SzxcPublicActivilyResult">
+        <include refid="selectSzxcPublicActivilyVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSzxcPublicActivily" parameterType="SzxcPublicActivily" useGeneratedKeys="true" keyProperty="id">
+        insert into szxc_public_activily
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="title != null and title != ''">title,</if>
+            <if test="leader != null">leader,</if>
+            <if test="phone != null">phone,</if>
+            <if test="type != null">type,</if>
+            <if test="content != null">content,</if>
+            <if test="leave != null">leave,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="endTime != null">end_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="remark != null">remark,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null">dept_name,</if>
+            <if test="userId != null">user_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="title != null and title != ''">#{title},</if>
+            <if test="leader != null">#{leader},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="type != null">#{type},</if>
+            <if test="content != null">#{content},</if>
+            <if test="leave != null">#{leave},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="endTime != null">#{endTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null">#{deptName},</if>
+            <if test="userId != null">#{userId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSzxcPublicActivily" parameterType="SzxcPublicActivily">
+        update szxc_public_activily
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null and title != ''">title = #{title},</if>
+            <if test="leader != null">leader = #{leader},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="leave != null">leave = #{leave},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="deptName != null">dept_name = #{deptName},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSzxcPublicActivilyById" parameterType="Long">
+        delete from szxc_public_activily where id = #{id}
+    </delete>
+
+    <delete id="deleteSzxcPublicActivilyByIds" parameterType="String">
+        delete from szxc_public_activily where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVisitRecardMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="submitDate"    column="submit_date"    />
         <result property="visitDate"    column="visit_date"    />
         <result property="type"    column="type"    />
+        <result property="jmId"    column="jm_id"    />
         <result property="visitObj"    column="visit_obj"    />
         <result property="title"    column="title"    />
         <result property="picture"    column="picture"    />
@@ -25,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSzxcVisitRecardVo">
-        select id, visiter_name, submit_date, visit_date, type, visit_obj, title, picture, content, flow_people, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_visit_recard
+        select id, visiter_name, submit_date, visit_date, type, jm_id, visit_obj, title, picture, content, flow_people, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_visit_recard
     </sql>
 
     <select id="selectSzxcVisitRecardList" parameterType="SzxcVisitRecard" resultMap="SzxcVisitRecardResult">
@@ -35,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="submitDate != null "> and submit_date = #{submitDate}</if>
             <if test="visitDate != null "> and visit_date = #{visitDate}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="jmId != null "> and jm_id = #{jmId}</if>
             <if test="visitObj != null  and visitObj != ''"> and visit_obj = #{visitObj}</if>
             <if test="title != null  and title != ''"> and title = #{title}</if>
             <if test="picture != null  and picture != ''"> and picture = #{picture}</if>
@@ -58,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="submitDate != null">submit_date,</if>
             <if test="visitDate != null">visit_date,</if>
             <if test="type != null">type,</if>
+            <if test="jmId != null">jm_id,</if>
             <if test="visitObj != null">visit_obj,</if>
             <if test="title != null and title != ''">title,</if>
             <if test="picture != null">picture,</if>
@@ -76,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="submitDate != null">#{submitDate},</if>
             <if test="visitDate != null">#{visitDate},</if>
             <if test="type != null">#{type},</if>
+            <if test="jmId != null">#{jmId},</if>
             <if test="visitObj != null">#{visitObj},</if>
             <if test="title != null and title != ''">#{title},</if>
             <if test="picture != null">#{picture},</if>
@@ -98,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="submitDate != null">submit_date = #{submitDate},</if>
             <if test="visitDate != null">visit_date = #{visitDate},</if>
             <if test="type != null">type = #{type},</if>
+            <if test="jmId != null">jm_id = #{jmId},</if>
             <if test="visitObj != null">visit_obj = #{visitObj},</if>
             <if test="title != null and title != ''">title = #{title},</if>
             <if test="picture != null">picture = #{picture},</if>

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkGuideMapper.xml

@@ -0,0 +1,86 @@
+<?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="com.ruoyi.szxc.mapper.SzxcWorkGuideMapper">
+    
+    <resultMap type="SzxcWorkGuide" id="SzxcWorkGuideResult">
+        <result property="id"    column="id"    />
+        <result property="title"    column="title"    />
+        <result property="content"    column="content"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSzxcWorkGuideVo">
+        select id, title, content, status, create_by, create_time, update_by, update_time, remark from szxc_work_guide
+    </sql>
+
+    <select id="selectSzxcWorkGuideList" parameterType="SzxcWorkGuide" resultMap="SzxcWorkGuideResult">
+        <include refid="selectSzxcWorkGuideVo"/>
+        <where>  
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+        </where>
+    </select>
+    
+    <select id="selectSzxcWorkGuideById" parameterType="Long" resultMap="SzxcWorkGuideResult">
+        <include refid="selectSzxcWorkGuideVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSzxcWorkGuide" parameterType="SzxcWorkGuide" useGeneratedKeys="true" keyProperty="id">
+        insert into szxc_work_guide
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="title != null">title,</if>
+            <if test="content != null">content,</if>
+            <if test="status != null">status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="title != null">#{title},</if>
+            <if test="content != null">#{content},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSzxcWorkGuide" parameterType="SzxcWorkGuide">
+        update szxc_work_guide
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null">title = #{title},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSzxcWorkGuideById" parameterType="Long">
+        delete from szxc_work_guide where id = #{id}
+    </delete>
+
+    <delete id="deleteSzxcWorkGuideByIds" parameterType="String">
+        delete from szxc_work_guide where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXcRecardMapper.xml

@@ -6,11 +6,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="SzxcXcRecard" id="SzxcXcRecardResult">
         <result property="id"    column="id"    />
-        <result property="visiterName"    column="visiter_name"    />
+        <result property="xcName"    column="xc_name"    />
         <result property="submitDate"    column="submit_date"    />
-        <result property="visitDate"    column="visit_date"    />
+        <result property="xcDate"    column="xc_date"    />
         <result property="type"    column="type"    />
-        <result property="visitObj"    column="visit_obj"    />
+        <result property="jmId"    column="jm_id"    />
+        <result property="xcObj"    column="xc_obj"    />
         <result property="title"    column="title"    />
         <result property="picture"    column="picture"    />
         <result property="content"    column="content"    />
@@ -26,17 +27,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSzxcXcRecardVo">
-        select id, visiter_name, submit_date, visit_date, type, visit_obj, title, picture, content, flow_people, reform, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_xc_recard
+        select id, xc_name, submit_date, xc_date, type, jm_id, xc_obj, title, picture, content, flow_people, reform, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_xc_recard
     </sql>
 
     <select id="selectSzxcXcRecardList" parameterType="SzxcXcRecard" resultMap="SzxcXcRecardResult">
         <include refid="selectSzxcXcRecardVo"/>
         <where>  
-            <if test="visiterName != null  and visiterName != ''"> and visiter_name like concat('%', #{visiterName}, '%')</if>
+            <if test="xcName != null  and xcName != ''"> and xc_name like concat('%', #{xcName}, '%')</if>
             <if test="submitDate != null "> and submit_date = #{submitDate}</if>
-            <if test="visitDate != null "> and visit_date = #{visitDate}</if>
+            <if test="xcDate != null "> and xc_date = #{xcDate}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="visitObj != null  and visitObj != ''"> and visit_obj = #{visitObj}</if>
+            <if test="jmId != null "> and jm_id = #{jmId}</if>
+            <if test="xcObj != null  and xcObj != ''"> and xc_obj = #{xcObj}</if>
             <if test="title != null  and title != ''"> and title = #{title}</if>
             <if test="picture != null  and picture != ''"> and picture = #{picture}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
@@ -56,11 +58,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertSzxcXcRecard" parameterType="SzxcXcRecard" useGeneratedKeys="true" keyProperty="id">
         insert into szxc_xc_recard
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="visiterName != null and visiterName != ''">visiter_name,</if>
+            <if test="xcName != null and xcName != ''">xc_name,</if>
             <if test="submitDate != null">submit_date,</if>
-            <if test="visitDate != null">visit_date,</if>
+            <if test="xcDate != null">xc_date,</if>
             <if test="type != null and type != ''">type,</if>
-            <if test="visitObj != null">visit_obj,</if>
+            <if test="jmId != null">jm_id,</if>
+            <if test="xcObj != null">xc_obj,</if>
             <if test="title != null and title != ''">title,</if>
             <if test="picture != null">picture,</if>
             <if test="content != null">content,</if>
@@ -75,11 +78,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">user_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="visiterName != null and visiterName != ''">#{visiterName},</if>
+            <if test="xcName != null and xcName != ''">#{xcName},</if>
             <if test="submitDate != null">#{submitDate},</if>
-            <if test="visitDate != null">#{visitDate},</if>
+            <if test="xcDate != null">#{xcDate},</if>
             <if test="type != null and type != ''">#{type},</if>
-            <if test="visitObj != null">#{visitObj},</if>
+            <if test="jmId != null">#{jmId},</if>
+            <if test="xcObj != null">#{xcObj},</if>
             <if test="title != null and title != ''">#{title},</if>
             <if test="picture != null">#{picture},</if>
             <if test="content != null">#{content},</if>
@@ -98,11 +102,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateSzxcXcRecard" parameterType="SzxcXcRecard">
         update szxc_xc_recard
         <trim prefix="SET" suffixOverrides=",">
-            <if test="visiterName != null and visiterName != ''">visiter_name = #{visiterName},</if>
+            <if test="xcName != null and xcName != ''">xc_name = #{xcName},</if>
             <if test="submitDate != null">submit_date = #{submitDate},</if>
-            <if test="visitDate != null">visit_date = #{visitDate},</if>
+            <if test="xcDate != null">xc_date = #{xcDate},</if>
             <if test="type != null and type != ''">type = #{type},</if>
-            <if test="visitObj != null">visit_obj = #{visitObj},</if>
+            <if test="jmId != null">jm_id = #{jmId},</if>
+            <if test="xcObj != null">xc_obj = #{xcObj},</if>
             <if test="title != null and title != ''">title = #{title},</if>
             <if test="picture != null">picture = #{picture},</if>
             <if test="content != null">content = #{content},</if>

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXqInfoMapper.xml

@@ -0,0 +1,132 @@
+<?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="com.ruoyi.szxc.mapper.SzxcXqInfoMapper">
+    
+    <resultMap type="SzxcXqInfo" id="SzxcXqInfoResult">
+        <result property="id"    column="id"    />
+        <result property="xqType"    column="xq_type"    />
+        <result property="ldNum"    column="ld_num"    />
+        <result property="jzArea"    column="jz_area"    />
+        <result property="zdArea"    column="zd_area"    />
+        <result property="wyType"    column="wy_type"    />
+        <result property="wyResponse"    column="wy_response"    />
+        <result property="wyPhone"    column="wy_phone"    />
+        <result property="xqAddress"    column="xq_address"    />
+        <result property="buildDate"    column="build_date"    />
+        <result property="xqDescribe"    column="xq_describe"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="userId"    column="user_id"    />
+    </resultMap>
+
+    <sql id="selectSzxcXqInfoVo">
+        select id, xq_type, ld_num, jz_area, zd_area, wy_type, wy_response, wy_phone, xq_address, build_date, xq_describe, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_xq_info
+    </sql>
+
+    <select id="selectSzxcXqInfoList" parameterType="SzxcXqInfo" resultMap="SzxcXqInfoResult">
+        <include refid="selectSzxcXqInfoVo"/>
+        <where>  
+            <if test="xqType != null  and xqType != ''"> and xq_type = #{xqType}</if>
+            <if test="ldNum != null "> and ld_num = #{ldNum}</if>
+            <if test="jzArea != null  and jzArea != ''"> and jz_area = #{jzArea}</if>
+            <if test="zdArea != null  and zdArea != ''"> and zd_area = #{zdArea}</if>
+            <if test="wyType != null  and wyType != ''"> and wy_type = #{wyType}</if>
+            <if test="wyResponse != null  and wyResponse != ''"> and wy_response = #{wyResponse}</if>
+            <if test="wyPhone != null  and wyPhone != ''"> and wy_phone = #{wyPhone}</if>
+            <if test="xqAddress != null  and xqAddress != ''"> and xq_address = #{xqAddress}</if>
+            <if test="buildDate != null "> and build_date = #{buildDate}</if>
+            <if test="xqDescribe != null  and xqDescribe != ''"> and xq_describe = #{xqDescribe}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSzxcXqInfoById" parameterType="Long" resultMap="SzxcXqInfoResult">
+        <include refid="selectSzxcXqInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSzxcXqInfo" parameterType="SzxcXqInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into szxc_xq_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="xqType != null">xq_type,</if>
+            <if test="ldNum != null">ld_num,</if>
+            <if test="jzArea != null">jz_area,</if>
+            <if test="zdArea != null">zd_area,</if>
+            <if test="wyType != null">wy_type,</if>
+            <if test="wyResponse != null">wy_response,</if>
+            <if test="wyPhone != null">wy_phone,</if>
+            <if test="xqAddress != null">xq_address,</if>
+            <if test="buildDate != null">build_date,</if>
+            <if test="xqDescribe != null">xq_describe,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null">dept_name,</if>
+            <if test="userId != null">user_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="xqType != null">#{xqType},</if>
+            <if test="ldNum != null">#{ldNum},</if>
+            <if test="jzArea != null">#{jzArea},</if>
+            <if test="zdArea != null">#{zdArea},</if>
+            <if test="wyType != null">#{wyType},</if>
+            <if test="wyResponse != null">#{wyResponse},</if>
+            <if test="wyPhone != null">#{wyPhone},</if>
+            <if test="xqAddress != null">#{xqAddress},</if>
+            <if test="buildDate != null">#{buildDate},</if>
+            <if test="xqDescribe != null">#{xqDescribe},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null">#{deptName},</if>
+            <if test="userId != null">#{userId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSzxcXqInfo" parameterType="SzxcXqInfo">
+        update szxc_xq_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xqType != null">xq_type = #{xqType},</if>
+            <if test="ldNum != null">ld_num = #{ldNum},</if>
+            <if test="jzArea != null">jz_area = #{jzArea},</if>
+            <if test="zdArea != null">zd_area = #{zdArea},</if>
+            <if test="wyType != null">wy_type = #{wyType},</if>
+            <if test="wyResponse != null">wy_response = #{wyResponse},</if>
+            <if test="wyPhone != null">wy_phone = #{wyPhone},</if>
+            <if test="xqAddress != null">xq_address = #{xqAddress},</if>
+            <if test="buildDate != null">build_date = #{buildDate},</if>
+            <if test="xqDescribe != null">xq_describe = #{xqDescribe},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="deptName != null">dept_name = #{deptName},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSzxcXqInfoById" parameterType="Long">
+        delete from szxc_xq_info where id = #{id}
+    </delete>
+
+    <delete id="deleteSzxcXqInfoByIds" parameterType="String">
+        delete from szxc_xq_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-ui/src/api/szxc/activily.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询公益活动列表
+export function listActivily(query) {
+  return request({
+    url: '/szxc/activily/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询公益活动详细
+export function getActivily(id) {
+  return request({
+    url: '/szxc/activily/' + id,
+    method: 'get'
+  })
+}
+
+// 新增公益活动
+export function addActivily(data) {
+  return request({
+    url: '/szxc/activily',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改公益活动
+export function updateActivily(data) {
+  return request({
+    url: '/szxc/activily',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除公益活动
+export function delActivily(id) {
+  return request({
+    url: '/szxc/activily/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/szxc/guide.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询办事指南列表
+export function listGuide(query) {
+  return request({
+    url: '/szxc/guide/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询办事指南详细
+export function getGuide(id) {
+  return request({
+    url: '/szxc/guide/' + id,
+    method: 'get'
+  })
+}
+
+// 新增办事指南
+export function addGuide(data) {
+  return request({
+    url: '/szxc/guide',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改办事指南
+export function updateGuide(data) {
+  return request({
+    url: '/szxc/guide',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除办事指南
+export function delGuide(id) {
+  return request({
+    url: '/szxc/guide/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/szxc/ldinfo.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询楼栋信息列表
+export function listLdinfo(query) {
+  return request({
+    url: '/szxc/ldinfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询楼栋信息详细
+export function getLdinfo(id) {
+  return request({
+    url: '/szxc/ldinfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增楼栋信息
+export function addLdinfo(data) {
+  return request({
+    url: '/szxc/ldinfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改楼栋信息
+export function updateLdinfo(data) {
+  return request({
+    url: '/szxc/ldinfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除楼栋信息
+export function delLdinfo(id) {
+  return request({
+    url: '/szxc/ldinfo/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/szxc/lunbo.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询轮播设置列表
+export function listLunbo(query) {
+  return request({
+    url: '/szxc/lunbo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询轮播设置详细
+export function getLunbo(id) {
+  return request({
+    url: '/szxc/lunbo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增轮播设置
+export function addLunbo(data) {
+  return request({
+    url: '/szxc/lunbo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改轮播设置
+export function updateLunbo(data) {
+  return request({
+    url: '/szxc/lunbo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除轮播设置
+export function delLunbo(id) {
+  return request({
+    url: '/szxc/lunbo/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/szxc/xqinfo.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询小区信息列表
+export function listXqinfo(query) {
+  return request({
+    url: '/szxc/xqinfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询小区信息详细
+export function getXqinfo(id) {
+  return request({
+    url: '/szxc/xqinfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增小区信息
+export function addXqinfo(data) {
+  return request({
+    url: '/szxc/xqinfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改小区信息
+export function updateXqinfo(data) {
+  return request({
+    url: '/szxc/xqinfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除小区信息
+export function delXqinfo(id) {
+  return request({
+    url: '/szxc/xqinfo/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/szxc/activily/index.vue

@@ -0,0 +1,399 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入标题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="负责人" prop="leader">
+        <el-input
+          v-model="queryParams.leader"
+          placeholder="请输入负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入联系电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="级别(县/乡/村)" prop="leave">
+        <el-input
+          v-model="queryParams.leave"
+          placeholder="请输入级别(县/乡/村)"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="startTime">
+        <el-date-picker clearable
+          v-model="queryParams.startTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择创建时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="endTime">
+        <el-date-picker clearable
+          v-model="queryParams.endTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择创建时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="部门id" prop="deptId">
+        <el-input
+          v-model="queryParams.deptId"
+          placeholder="请输入部门id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属网格" prop="deptName">
+        <el-input
+          v-model="queryParams.deptName"
+          placeholder="请输入所属网格"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建者ID" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入创建者ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['szxc:activily:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['szxc:activily:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['szxc:activily:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['szxc:activily:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="activilyList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="负责人" align="center" prop="leader" />
+      <el-table-column label="联系电话" align="center" prop="phone" />
+      <el-table-column label="类型(公告/咨询)" align="center" prop="type" />
+      <el-table-column label="活动介绍" align="center" prop="content" />
+      <el-table-column label="级别(县/乡/村)" align="center" prop="leave" />
+      <el-table-column label="创建时间" align="center" prop="startTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="endTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="部门id" align="center" prop="deptId" />
+      <el-table-column label="所属网格" align="center" prop="deptName" />
+      <el-table-column label="创建者ID" align="center" prop="userId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['szxc:activily:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['szxc:activily:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改公益活动对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="负责人" prop="leader">
+          <el-input v-model="form.leader" placeholder="请输入负责人" />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入联系电话" />
+        </el-form-item>
+        <el-form-item label="活动介绍">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="级别(县/乡/村)" prop="leave">
+          <el-input v-model="form.leave" placeholder="请输入级别(县/乡/村)" />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="startTime">
+          <el-date-picker clearable
+            v-model="form.startTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="endTime">
+          <el-date-picker clearable
+            v-model="form.endTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="部门id" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入部门id" />
+        </el-form-item>
+        <el-form-item label="所属网格" prop="deptName">
+          <el-input v-model="form.deptName" placeholder="请输入所属网格" />
+        </el-form-item>
+        <el-form-item label="创建者ID" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listActivily, getActivily, delActivily, addActivily, updateActivily } from "@/api/szxc/activily";
+
+export default {
+  name: "Activily",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 公益活动表格数据
+      activilyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title: null,
+        leader: null,
+        phone: null,
+        type: null,
+        content: null,
+        leave: null,
+        startTime: null,
+        endTime: null,
+        deptId: null,
+        deptName: null,
+        userId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        title: [
+          { required: true, message: "标题不能为空", trigger: "blur" }
+        ],
+        deptId: [
+          { required: true, message: "部门id不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询公益活动列表 */
+    getList() {
+      this.loading = true;
+      listActivily(this.queryParams).then(response => {
+        this.activilyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        title: null,
+        leader: null,
+        phone: null,
+        type: null,
+        content: null,
+        leave: null,
+        startTime: null,
+        endTime: null,
+        createBy: null,
+        remark: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        deptId: null,
+        deptName: null,
+        userId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加公益活动";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getActivily(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改公益活动";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateActivily(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addActivily(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除公益活动编号为"' + ids + '"的数据项？').then(function() {
+        return delActivily(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('szxc/activily/export', {
+        ...this.queryParams
+      }, `activily_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/szxc/guide/index.vue

@@ -0,0 +1,263 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入标题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['szxc:guide:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['szxc:guide:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['szxc:guide:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['szxc:guide:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="guideList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="简介" align="center" prop="content" />
+      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['szxc:guide:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['szxc:guide:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改办事指南对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="简介">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listGuide, getGuide, delGuide, addGuide, updateGuide } from "@/api/szxc/guide";
+
+export default {
+  name: "Guide",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 办事指南表格数据
+      guideList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title: null,
+        content: null,
+        status: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询办事指南列表 */
+    getList() {
+      this.loading = true;
+      listGuide(this.queryParams).then(response => {
+        this.guideList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        title: null,
+        content: null,
+        status: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加办事指南";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getGuide(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改办事指南";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateGuide(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGuide(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除办事指南编号为"' + ids + '"的数据项？').then(function() {
+        return delGuide(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('szxc/guide/export', {
+        ...this.queryParams
+      }, `guide_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/szxc/jminfo/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="所属组织" prop="deptId">
+      <el-form-item label="部门id" prop="deptId">
         <el-input
           v-model="queryParams.deptId"
-          placeholder="请输入所属组织"
+          placeholder="请输入部门id"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -57,14 +57,14 @@
           placeholder="请选择出生日期">
         </el-date-picker>
       </el-form-item>
-<!--      <el-form-item label="年龄" prop="age">
+      <el-form-item label="年龄" prop="age">
         <el-input
           v-model="queryParams.age"
           placeholder="请输入年龄"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>-->
+      </el-form-item>
       <el-form-item label="籍贯" prop="jg">
         <el-input
           v-model="queryParams.jg"
@@ -73,30 +73,30 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="与户主关系" prop="relation">
+      <el-form-item label="与户主关系" prop="relation">
         <el-input
           v-model="queryParams.relation"
           placeholder="请输入与户主关系"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>-->
+      </el-form-item>
-      <el-form-item label="籍贯性质" prop="jgNature">
+      <el-form-item label="户籍性质" prop="jgNature">
         <el-input
           v-model="queryParams.jgNature"
-          placeholder="请输入籍贯性质"
+          placeholder="请输入户籍性质"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="是否常住" prop="longLive">
+      <el-form-item label="是否常住" prop="longLive">
         <el-input
           v-model="queryParams.longLive"
           placeholder="请输入是否常住"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>-->
+      </el-form-item>
       <el-form-item label="户籍地址" prop="hjAddress">
         <el-input
           v-model="queryParams.hjAddress"
@@ -113,50 +113,102 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否户主" prop="head">
+      <el-form-item label="现居住地" prop="currentAddress">
-        <el-select
+        <el-input
+          v-model="queryParams.currentAddress"
+          placeholder="请输入现居住地"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="本人情况" prop="brqk">
+        <el-input
+          v-model="queryParams.brqk"
+          placeholder="请输入本人情况"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="婚姻" prop="hy">
+        <el-input
+          v-model="queryParams.hy"
+          placeholder="请输入婚姻"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="学历" prop="xueli">
+        <el-input
+          v-model="queryParams.xueli"
+          placeholder="请输入学历"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="政治面貌" prop="zzmm">
+        <el-input
+          v-model="queryParams.zzmm"
+          placeholder="请输入政治面貌"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="宗教信仰" prop="zjxy">
+        <el-input
+          v-model="queryParams.zjxy"
+          placeholder="请输入宗教信仰"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="健康状况" prop="jkzk">
+        <el-input
+          v-model="queryParams.jkzk"
+          placeholder="请输入健康状况"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="疾病描述" prop="ills">
+        <el-input
+          v-model="queryParams.ills"
+          placeholder="请输入疾病描述"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否户主 0:户主 1:非户主" prop="head">
+        <el-input
           v-model="queryParams.head"
-          placeholder="是否户主"
+          placeholder="请输入是否户主 0:户主 1:非户主"
           clearable
-        >
+          @keyup.enter.native="handleQuery"
-          <el-option
-            v-for="dict in dict.type.szxc_head"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
         />
-        </el-select>
       </el-form-item>
-<!--      <el-form-item label="同户人员ids" prop="sameHeadIds">
+      <el-form-item label="同户人员ids" prop="sameHeadIds">
         <el-input
           v-model="queryParams.sameHeadIds"
           placeholder="请输入同户人员ids"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>-->
+      </el-form-item>
-      <el-form-item label="是否注销" prop="off">
+      <el-form-item label="是否注销 0:正常 1:注销" prop="off">
-        <el-select
+        <el-input
           v-model="queryParams.off"
-          placeholder="是否注销"
+          placeholder="请输入是否注销 0:正常 1:注销"
           clearable
-        >
+          @keyup.enter.native="handleQuery"
-          <el-option
-            v-for="dict in dict.type.szxc_off"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
         />
-        </el-select>
       </el-form-item>
-<!--      <el-form-item label="创建者ID" prop="userId">
+      <el-form-item label="创建者ID" prop="userId">
         <el-input
           v-model="queryParams.userId"
           placeholder="请输入创建者ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>-->
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -209,10 +261,10 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="jminfoList" @selection-change="handleSelectionChange" border>
+    <el-table v-loading="loading" :data="jminfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="居民id" align="center" prop="id" />
-      <el-table-column label="所属组织" align="center" prop="deptId" />
+      <el-table-column label="部门id" align="center" prop="deptId" />
       <el-table-column label="所属网格" align="center" prop="deptName" />
       <el-table-column label="姓名" align="center" prop="name" />
       <el-table-column label="曾用名" align="center" prop="oldName" />
@@ -227,10 +279,18 @@
       <el-table-column label="性别" align="center" prop="sex" />
       <el-table-column label="籍贯" align="center" prop="jg" />
       <el-table-column label="与户主关系" align="center" prop="relation" />
-      <el-table-column label="籍贯性质" align="center" prop="jgNature" />
+      <el-table-column label="户籍性质" align="center" prop="jgNature" />
       <el-table-column label="是否常住" align="center" prop="longLive" />
       <el-table-column label="户籍地址" align="center" prop="hjAddress" />
       <el-table-column label="手机号" align="center" prop="phone" />
+      <el-table-column label="现居住地" align="center" prop="currentAddress" />
+      <el-table-column label="本人情况" align="center" prop="brqk" />
+      <el-table-column label="婚姻" align="center" prop="hy" />
+      <el-table-column label="学历" align="center" prop="xueli" />
+      <el-table-column label="政治面貌" align="center" prop="zzmm" />
+      <el-table-column label="宗教信仰" align="center" prop="zjxy" />
+      <el-table-column label="健康状况" align="center" prop="jkzk" />
+      <el-table-column label="疾病描述" align="center" prop="ills" />
       <el-table-column label="是否户主 0:户主 1:非户主" align="center" prop="head" />
       <el-table-column label="同户人员ids" align="center" prop="sameHeadIds" />
       <el-table-column label="是否注销 0:正常 1:注销" align="center" prop="off" />
@@ -264,173 +324,91 @@
     />
 
     <!-- 添加或修改居民信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-
+        <el-form-item label="部门id" prop="deptId">
-        <el-row>
+          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-          <el-col :span="12">
-            <el-form-item label="所属组织" prop="deptId">
-              <el-input v-model="form.deptId" placeholder="请输入所属组织" />
         </el-form-item>
-          </el-col>
-          <el-col :span="12">
         <el-form-item label="所属网格" prop="deptName">
           <el-input v-model="form.deptName" placeholder="请输入所属网格" />
         </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="12">
         <el-form-item label="姓名" prop="name">
           <el-input v-model="form.name" placeholder="请输入姓名" />
         </el-form-item>
-          </el-col>
-          <el-col :span="12">
         <el-form-item label="曾用名" prop="oldName">
           <el-input v-model="form.oldName" placeholder="请输入曾用名" />
         </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="12">
         <el-form-item label="国籍" prop="nationality">
           <el-input v-model="form.nationality" placeholder="请输入国籍" />
         </el-form-item>
-          </el-col>
-          <el-col :span="12">
         <el-form-item label="身份证号" prop="cardId">
           <el-input v-model="form.cardId" placeholder="请输入身份证号" />
         </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="12">
         <el-form-item label="出生日期" prop="bornDate">
-              <el-date-picker clearable style="width:100%;"
+          <el-date-picker clearable
             v-model="form.bornDate"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="请选择出生日期">
           </el-date-picker>
         </el-form-item>
-          </el-col>
-          <el-col :span="12">
         <el-form-item label="年龄" prop="age">
           <el-input v-model="form.age" placeholder="请输入年龄" />
         </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="12">
         <el-form-item label="籍贯" prop="jg">
-              <el-select v-model="form.jg" placeholder="请选择籍贯" style="width:100%;">
+          <el-input v-model="form.jg" placeholder="请输入籍贯" />
-                <el-option
-                  v-for="dict in dict.type.szxc_gj"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
         </el-form-item>
-          </el-col>
-          <el-col :span="12">
         <el-form-item label="与户主关系" prop="relation">
-              <el-select v-model="form.relation" placeholder="请选择户主关系" style="width:100%;">
+          <el-input v-model="form.relation" placeholder="请输入与户主关系" />
-                <el-option
-                  v-for="dict in dict.type.szxc_hzgx"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
         </el-form-item>
-          </el-col>
+        <el-form-item label="户籍性质" prop="jgNature">
-        </el-row>
+          <el-input v-model="form.jgNature" placeholder="请输入户籍性质" />
-
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="籍贯性质" prop="jgNature">
-              <el-select v-model="form.jgNature" placeholder="请选择籍贯性质" style="width:100%;">
-                <el-option
-                  v-for="dict in dict.type.szxc_hjxz"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
         </el-form-item>
-          </el-col>
-          <el-col :span="12">
         <el-form-item label="是否常住" prop="longLive">
-              <el-select v-model="form.longLive" placeholder="请选择是否常住" style="width:100%;">
+          <el-input v-model="form.longLive" placeholder="请输入是否常住" />
-                <el-option
-                  v-for="dict in dict.type.szxc_long_live"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
         </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="12">
         <el-form-item label="户籍地址" prop="hjAddress">
           <el-input v-model="form.hjAddress" placeholder="请输入户籍地址" />
         </el-form-item>
-          </el-col>
-          <el-col :span="12">
         <el-form-item label="手机号" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入手机号" />
         </el-form-item>
-          </el-col>
+        <el-form-item label="现居住地" prop="currentAddress">
-        </el-row>
+          <el-input v-model="form.currentAddress" placeholder="请输入现居住地" />
-
+        </el-form-item>
-        <el-row>
+        <el-form-item label="本人情况" prop="brqk">
-          <el-col :span="12">
+          <el-input v-model="form.brqk" placeholder="请输入本人情况" />
-            <el-form-item label="是否户主" prop="head">
+        </el-form-item>
-              <el-select v-model="form.head" placeholder="请选择籍贯" style="width:100%;">
+        <el-form-item label="婚姻" prop="hy">
-                <el-option
+          <el-input v-model="form.hy" placeholder="请输入婚姻" />
-                  v-for="dict in dict.type.szxc_head"
+        </el-form-item>
-                  :key="dict.value"
+        <el-form-item label="学历" prop="xueli">
-                  :label="dict.label"
+          <el-input v-model="form.xueli" placeholder="请输入学历" />
-                  :value="dict.value"
+        </el-form-item>
-                ></el-option>
+        <el-form-item label="政治面貌" prop="zzmm">
-              </el-select>
+          <el-input v-model="form.zzmm" placeholder="请输入政治面貌" />
+        </el-form-item>
+        <el-form-item label="宗教信仰" prop="zjxy">
+          <el-input v-model="form.zjxy" placeholder="请输入宗教信仰" />
+        </el-form-item>
+        <el-form-item label="健康状况" prop="jkzk">
+          <el-input v-model="form.jkzk" placeholder="请输入健康状况" />
+        </el-form-item>
+        <el-form-item label="疾病描述" prop="ills">
+          <el-input v-model="form.ills" placeholder="请输入疾病描述" />
+        </el-form-item>
+        <el-form-item label="是否户主 0:户主 1:非户主" prop="head">
+          <el-input v-model="form.head" placeholder="请输入是否户主 0:户主 1:非户主" />
         </el-form-item>
-          </el-col>
-          <el-col :span="12">
         <el-form-item label="同户人员ids" prop="sameHeadIds">
           <el-input v-model="form.sameHeadIds" placeholder="请输入同户人员ids" />
         </el-form-item>
-          </el-col>
+        <el-form-item label="是否注销 0:正常 1:注销" prop="off">
-        </el-row>
+          <el-input v-model="form.off" placeholder="请输入是否注销 0:正常 1:注销" />
-
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="是否注销" prop="off">
-              <el-select v-model="form.off" placeholder="请选择是否注销" style="width:100%;">
-                <el-option
-                  v-for="dict in dict.type.szxc_off"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
         </el-form-item>
-          </el-col>
-          <el-col :span="12">
         <el-form-item label="创建者ID" prop="userId">
           <el-input v-model="form.userId" placeholder="请输入创建者ID" />
         </el-form-item>
-          </el-col>
-        </el-row>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -445,7 +423,6 @@
 
 export default {
   name: "Jminfo",
-    dicts: ['szxc_gj', 'szxc_hjxz', 'szxc_long_live', 'szxc_head', 'szxc_off', 'szxc_hzgx'],
   data() {
     return {
       // 遮罩层
@@ -485,6 +462,14 @@
         longLive: null,
         hjAddress: null,
         phone: null,
+        currentAddress: null,
+        brqk: null,
+        hy: null,
+        xueli: null,
+        zzmm: null,
+        zjxy: null,
+        jkzk: null,
+        ills: null,
         head: null,
         sameHeadIds: null,
         off: null,
@@ -495,7 +480,7 @@
       // 表单校验
       rules: {
         deptId: [
-            { required: true, message: "组织id不能为空", trigger: "blur" }
+          { required: true, message: "部门id不能为空", trigger: "blur" }
         ],
         head: [
           { required: true, message: "是否户主 0:户主 1:非户主不能为空", trigger: "blur" }
@@ -543,6 +528,14 @@
         longLive: null,
         hjAddress: null,
         phone: null,
+        currentAddress: null,
+        brqk: null,
+        hy: null,
+        xueli: null,
+        zzmm: null,
+        zjxy: null,
+        jkzk: null,
+        ills: null,
         head: null,
         sameHeadIds: null,
         off: null,

ruoyi-ui/src/views/szxc/ldinfo/index.vue

@@ -0,0 +1,412 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="所属小区" prop="xqId">
+        <el-input
+          v-model="queryParams.xqId"
+          placeholder="请输入所属小区"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="楼栋名称" prop="ldName">
+        <el-input
+          v-model="queryParams.ldName"
+          placeholder="请输入楼栋名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="类别字典" prop="ldSort">
+        <el-input
+          v-model="queryParams.ldSort"
+          placeholder="请输入类别字典"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="楼栋结构字典" prop="ldjg">
+        <el-input
+          v-model="queryParams.ldjg"
+          placeholder="请输入楼栋结构字典"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="取暖方式" prop="qnfs">
+        <el-input
+          v-model="queryParams.qnfs"
+          placeholder="请输入取暖方式"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="楼层数" prop="lcNum">
+        <el-input
+          v-model="queryParams.lcNum"
+          placeholder="请输入楼层数"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单元数" prop="unitNum">
+        <el-input
+          v-model="queryParams.unitNum"
+          placeholder="请输入单元数"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="户数" prop="huNum">
+        <el-input
+          v-model="queryParams.huNum"
+          placeholder="请输入户数"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="楼栋描述" prop="ldDescribe">
+        <el-input
+          v-model="queryParams.ldDescribe"
+          placeholder="请输入楼栋描述"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门id" prop="deptId">
+        <el-input
+          v-model="queryParams.deptId"
+          placeholder="请输入部门id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属网格" prop="deptName">
+        <el-input
+          v-model="queryParams.deptName"
+          placeholder="请输入所属网格"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建者ID" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入创建者ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['szxc:ldinfo:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['szxc:ldinfo:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['szxc:ldinfo:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['szxc:ldinfo:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="ldinfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="所属小区" align="center" prop="xqId" />
+      <el-table-column label="楼栋名称" align="center" prop="ldName" />
+      <el-table-column label="类型(0小区楼栋1独立房2其它)" align="center" prop="xqType" />
+      <el-table-column label="类别字典" align="center" prop="ldSort" />
+      <el-table-column label="楼栋结构字典" align="center" prop="ldjg" />
+      <el-table-column label="取暖方式" align="center" prop="qnfs" />
+      <el-table-column label="楼层数" align="center" prop="lcNum" />
+      <el-table-column label="单元数" align="center" prop="unitNum" />
+      <el-table-column label="户数" align="center" prop="huNum" />
+      <el-table-column label="楼栋描述" align="center" prop="ldDescribe" />
+      <el-table-column label="部门id" align="center" prop="deptId" />
+      <el-table-column label="所属网格" align="center" prop="deptName" />
+      <el-table-column label="创建者ID" align="center" prop="userId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['szxc:ldinfo:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['szxc:ldinfo:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改楼栋信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="所属小区" prop="xqId">
+          <el-input v-model="form.xqId" placeholder="请输入所属小区" />
+        </el-form-item>
+        <el-form-item label="楼栋名称" prop="ldName">
+          <el-input v-model="form.ldName" placeholder="请输入楼栋名称" />
+        </el-form-item>
+        <el-form-item label="类别字典" prop="ldSort">
+          <el-input v-model="form.ldSort" placeholder="请输入类别字典" />
+        </el-form-item>
+        <el-form-item label="楼栋结构字典" prop="ldjg">
+          <el-input v-model="form.ldjg" placeholder="请输入楼栋结构字典" />
+        </el-form-item>
+        <el-form-item label="取暖方式" prop="qnfs">
+          <el-input v-model="form.qnfs" placeholder="请输入取暖方式" />
+        </el-form-item>
+        <el-form-item label="楼层数" prop="lcNum">
+          <el-input v-model="form.lcNum" placeholder="请输入楼层数" />
+        </el-form-item>
+        <el-form-item label="单元数" prop="unitNum">
+          <el-input v-model="form.unitNum" placeholder="请输入单元数" />
+        </el-form-item>
+        <el-form-item label="户数" prop="huNum">
+          <el-input v-model="form.huNum" placeholder="请输入户数" />
+        </el-form-item>
+        <el-form-item label="楼栋描述" prop="ldDescribe">
+          <el-input v-model="form.ldDescribe" placeholder="请输入楼栋描述" />
+        </el-form-item>
+        <el-form-item label="部门id" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入部门id" />
+        </el-form-item>
+        <el-form-item label="所属网格" prop="deptName">
+          <el-input v-model="form.deptName" placeholder="请输入所属网格" />
+        </el-form-item>
+        <el-form-item label="创建者ID" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listLdinfo, getLdinfo, delLdinfo, addLdinfo, updateLdinfo } from "@/api/szxc/ldinfo";
+
+export default {
+  name: "Ldinfo",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 楼栋信息表格数据
+      ldinfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        xqId: null,
+        ldName: null,
+        xqType: null,
+        ldSort: null,
+        ldjg: null,
+        qnfs: null,
+        lcNum: null,
+        unitNum: null,
+        huNum: null,
+        ldDescribe: null,
+        deptId: null,
+        deptName: null,
+        userId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        xqId: [
+          { required: true, message: "所属小区不能为空", trigger: "blur" }
+        ],
+        deptId: [
+          { required: true, message: "部门id不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询楼栋信息列表 */
+    getList() {
+      this.loading = true;
+      listLdinfo(this.queryParams).then(response => {
+        this.ldinfoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        xqId: null,
+        ldName: null,
+        xqType: null,
+        ldSort: null,
+        ldjg: null,
+        qnfs: null,
+        lcNum: null,
+        unitNum: null,
+        huNum: null,
+        ldDescribe: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        deptId: null,
+        deptName: null,
+        userId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加楼栋信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getLdinfo(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改楼栋信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateLdinfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addLdinfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除楼栋信息编号为"' + ids + '"的数据项？').then(function() {
+        return delLdinfo(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('szxc/ldinfo/export', {
+        ...this.queryParams
+      }, `ldinfo_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/szxc/lunbo/index.vue

@@ -0,0 +1,274 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入标题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="图片地址" prop="picture">
+        <el-input
+          v-model="queryParams.picture"
+          placeholder="请输入图片地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['szxc:lunbo:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['szxc:lunbo:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['szxc:lunbo:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['szxc:lunbo:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="lunboList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="图片地址" align="center" prop="picture" />
+      <el-table-column label="简介" align="center" prop="content" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['szxc:lunbo:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['szxc:lunbo:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改轮播设置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="图片地址" prop="picture">
+          <el-input v-model="form.picture" placeholder="请输入图片地址" />
+        </el-form-item>
+        <el-form-item label="简介">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listLunbo, getLunbo, delLunbo, addLunbo, updateLunbo } from "@/api/szxc/lunbo";
+
+export default {
+  name: "Lunbo",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 轮播设置表格数据
+      lunboList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title: null,
+        picture: null,
+        content: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询轮播设置列表 */
+    getList() {
+      this.loading = true;
+      listLunbo(this.queryParams).then(response => {
+        this.lunboList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        title: null,
+        picture: null,
+        content: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加轮播设置";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getLunbo(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改轮播设置";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateLunbo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addLunbo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除轮播设置编号为"' + ids + '"的数据项？').then(function() {
+        return delLunbo(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('szxc/lunbo/export', {
+        ...this.queryParams
+      }, `lunbo_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/szxc/visitrecard/index.vue

@@ -25,6 +25,14 @@
           placeholder="请选择走访日期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="走访对像id" prop="jmId">
+        <el-input
+          v-model="queryParams.jmId"
+          placeholder="请输入走访对像id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="走访对象" prop="visitObj">
         <el-input
           v-model="queryParams.visitObj"
@@ -148,6 +156,7 @@
         </template>
       </el-table-column>
       <el-table-column label="类别" align="center" prop="type" />
+      <el-table-column label="走访对像id" align="center" prop="jmId" />
       <el-table-column label="走访对象" align="center" prop="visitObj" />
       <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="图片" align="center" prop="picture" />
@@ -206,6 +215,9 @@
             placeholder="请选择走访日期">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="走访对像id" prop="jmId">
+          <el-input v-model="form.jmId" placeholder="请输入走访对像id" />
+        </el-form-item>
         <el-form-item label="走访对象" prop="visitObj">
           <el-input v-model="form.visitObj" placeholder="请输入走访对象" />
         </el-form-item>
@@ -272,6 +284,7 @@ export default {
         submitDate: null,
         visitDate: null,
         type: null,
+        jmId: null,
         visitObj: null,
         title: null,
         picture: null,
@@ -323,6 +336,7 @@ export default {
         submitDate: null,
         visitDate: null,
         type: null,
+        jmId: null,
         visitObj: null,
         title: null,
         picture: null,

ruoyi-ui/src/views/szxc/xcrecard/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="巡查人" prop="visiterName">
+      <el-form-item label="巡查人" prop="xcName">
         <el-input
-          v-model="queryParams.visiterName"
+          v-model="queryParams.xcName"
           placeholder="请输入巡查人"
           clearable
           @keyup.enter.native="handleQuery"
@@ -17,17 +17,25 @@
           placeholder="请选择提报日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="巡查日期" prop="visitDate">
+      <el-form-item label="巡查日期" prop="xcDate">
         <el-date-picker clearable
-          v-model="queryParams.visitDate"
+          v-model="queryParams.xcDate"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="请选择巡查日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="被巡查对象" prop="visitObj">
+      <el-form-item label="巡查对像id" prop="jmId">
         <el-input
-          v-model="queryParams.visitObj"
+          v-model="queryParams.jmId"
+          placeholder="请输入巡查对像id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="被巡查对象" prop="xcObj">
+        <el-input
+          v-model="queryParams.xcObj"
           placeholder="请输入被巡查对象"
           clearable
           @keyup.enter.native="handleQuery"
@@ -144,19 +152,20 @@
     <el-table v-loading="loading" :data="xcrecardList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="巡查人" align="center" prop="visiterName" />
+      <el-table-column label="巡查人" align="center" prop="xcName" />
       <el-table-column label="提报日期" align="center" prop="submitDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="巡查日期" align="center" prop="visitDate" width="180">
+      <el-table-column label="巡查日期" align="center" prop="xcDate" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.visitDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.xcDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="巡查类别" align="center" prop="type" />
-      <el-table-column label="被巡查对象" align="center" prop="visitObj" />
+      <el-table-column label="巡查对像id" align="center" prop="jmId" />
+      <el-table-column label="被巡查对象" align="center" prop="xcObj" />
       <el-table-column label="巡查主题" align="center" prop="title" />
       <el-table-column label="图片" align="center" prop="picture" />
       <el-table-column label="巡查情况描述" align="center" prop="content" />
@@ -196,8 +205,8 @@
     <!-- 添加或修改巡查记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="巡查人" prop="visiterName">
+        <el-form-item label="巡查人" prop="xcName">
-          <el-input v-model="form.visiterName" placeholder="请输入巡查人" />
+          <el-input v-model="form.xcName" placeholder="请输入巡查人" />
         </el-form-item>
         <el-form-item label="提报日期" prop="submitDate">
           <el-date-picker clearable
@@ -207,16 +216,19 @@
             placeholder="请选择提报日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="巡查日期" prop="visitDate">
+        <el-form-item label="巡查日期" prop="xcDate">
           <el-date-picker clearable
-            v-model="form.visitDate"
+            v-model="form.xcDate"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="请选择巡查日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="被巡查对象" prop="visitObj">
+        <el-form-item label="巡查对像id" prop="jmId">
-          <el-input v-model="form.visitObj" placeholder="请输入被巡查对象" />
+          <el-input v-model="form.jmId" placeholder="请输入巡查对像id" />
+        </el-form-item>
+        <el-form-item label="被巡查对象" prop="xcObj">
+          <el-input v-model="form.xcObj" placeholder="请输入被巡查对象" />
         </el-form-item>
         <el-form-item label="巡查主题" prop="title">
           <el-input v-model="form.title" placeholder="请输入巡查主题" />
@@ -280,11 +292,12 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        visiterName: null,
+        xcName: null,
         submitDate: null,
-        visitDate: null,
+        xcDate: null,
         type: null,
-        visitObj: null,
+        jmId: null,
+        xcObj: null,
         title: null,
         picture: null,
         content: null,
@@ -298,7 +311,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        visiterName: [
+        xcName: [
           { required: true, message: "巡查人不能为空", trigger: "blur" }
         ],
         type: [
@@ -335,11 +348,12 @@ export default {
     reset() {
       this.form = {
         id: null,
-        visiterName: null,
+        xcName: null,
         submitDate: null,
-        visitDate: null,
+        xcDate: null,
         type: null,
-        visitObj: null,
+        jmId: null,
+        xcObj: null,
         title: null,
         picture: null,
         content: null,

ruoyi-ui/src/views/szxc/xqinfo/index.vue

@@ -0,0 +1,407 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="楼栋数" prop="ldNum">
+        <el-input
+          v-model="queryParams.ldNum"
+          placeholder="请输入楼栋数"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="建筑面积" prop="jzArea">
+        <el-input
+          v-model="queryParams.jzArea"
+          placeholder="请输入建筑面积"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="占地面积" prop="zdArea">
+        <el-input
+          v-model="queryParams.zdArea"
+          placeholder="请输入占地面积"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物业负责人" prop="wyResponse">
+        <el-input
+          v-model="queryParams.wyResponse"
+          placeholder="请输入物业负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="wyPhone">
+        <el-input
+          v-model="queryParams.wyPhone"
+          placeholder="请输入联系电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="小区地址" prop="xqAddress">
+        <el-input
+          v-model="queryParams.xqAddress"
+          placeholder="请输入小区地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="建成日期" prop="buildDate">
+        <el-date-picker clearable
+          v-model="queryParams.buildDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择建成日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="小区描述" prop="xqDescribe">
+        <el-input
+          v-model="queryParams.xqDescribe"
+          placeholder="请输入小区描述"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门id" prop="deptId">
+        <el-input
+          v-model="queryParams.deptId"
+          placeholder="请输入部门id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属网格" prop="deptName">
+        <el-input
+          v-model="queryParams.deptName"
+          placeholder="请输入所属网格"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建者ID" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入创建者ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['szxc:xqinfo:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['szxc:xqinfo:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['szxc:xqinfo:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['szxc:xqinfo:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="xqinfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="类型(0老旧1新2片区散户)" align="center" prop="xqType" />
+      <el-table-column label="楼栋数" align="center" prop="ldNum" />
+      <el-table-column label="建筑面积" align="center" prop="jzArea" />
+      <el-table-column label="占地面积" align="center" prop="zdArea" />
+      <el-table-column label="物业管理方式(0物业公司1业主自治2其他)" align="center" prop="wyType" />
+      <el-table-column label="物业负责人" align="center" prop="wyResponse" />
+      <el-table-column label="联系电话" align="center" prop="wyPhone" />
+      <el-table-column label="小区地址" align="center" prop="xqAddress" />
+      <el-table-column label="建成日期" align="center" prop="buildDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.buildDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="小区描述" align="center" prop="xqDescribe" />
+      <el-table-column label="部门id" align="center" prop="deptId" />
+      <el-table-column label="所属网格" align="center" prop="deptName" />
+      <el-table-column label="创建者ID" align="center" prop="userId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['szxc:xqinfo:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['szxc:xqinfo:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改小区信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="楼栋数" prop="ldNum">
+          <el-input v-model="form.ldNum" placeholder="请输入楼栋数" />
+        </el-form-item>
+        <el-form-item label="建筑面积" prop="jzArea">
+          <el-input v-model="form.jzArea" placeholder="请输入建筑面积" />
+        </el-form-item>
+        <el-form-item label="占地面积" prop="zdArea">
+          <el-input v-model="form.zdArea" placeholder="请输入占地面积" />
+        </el-form-item>
+        <el-form-item label="物业负责人" prop="wyResponse">
+          <el-input v-model="form.wyResponse" placeholder="请输入物业负责人" />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="wyPhone">
+          <el-input v-model="form.wyPhone" placeholder="请输入联系电话" />
+        </el-form-item>
+        <el-form-item label="小区地址" prop="xqAddress">
+          <el-input v-model="form.xqAddress" placeholder="请输入小区地址" />
+        </el-form-item>
+        <el-form-item label="建成日期" prop="buildDate">
+          <el-date-picker clearable
+            v-model="form.buildDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择建成日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="小区描述" prop="xqDescribe">
+          <el-input v-model="form.xqDescribe" placeholder="请输入小区描述" />
+        </el-form-item>
+        <el-form-item label="部门id" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入部门id" />
+        </el-form-item>
+        <el-form-item label="所属网格" prop="deptName">
+          <el-input v-model="form.deptName" placeholder="请输入所属网格" />
+        </el-form-item>
+        <el-form-item label="创建者ID" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listXqinfo, getXqinfo, delXqinfo, addXqinfo, updateXqinfo } from "@/api/szxc/xqinfo";
+
+export default {
+  name: "Xqinfo",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 小区信息表格数据
+      xqinfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        xqType: null,
+        ldNum: null,
+        jzArea: null,
+        zdArea: null,
+        wyType: null,
+        wyResponse: null,
+        wyPhone: null,
+        xqAddress: null,
+        buildDate: null,
+        xqDescribe: null,
+        deptId: null,
+        deptName: null,
+        userId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        deptId: [
+          { required: true, message: "部门id不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询小区信息列表 */
+    getList() {
+      this.loading = true;
+      listXqinfo(this.queryParams).then(response => {
+        this.xqinfoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        xqType: null,
+        ldNum: null,
+        jzArea: null,
+        zdArea: null,
+        wyType: null,
+        wyResponse: null,
+        wyPhone: null,
+        xqAddress: null,
+        buildDate: null,
+        xqDescribe: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        deptId: null,
+        deptName: null,
+        userId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加小区信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getXqinfo(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改小区信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateXqinfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addXqinfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除小区信息编号为"' + ids + '"的数据项？').then(function() {
+        return delXqinfo(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('szxc/xqinfo/export', {
+        ...this.queryParams
+      }, `xqinfo_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>