数据表修改、添加

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java

@@ -1,11 +1,13 @@
 package com.ruoyi.system.domain;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-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;
 import com.ruoyi.common.xss.Xss;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 
 /**
  * 通知公告表 sys_notice
@@ -30,6 +32,17 @@ public class SysNotice extends BaseEntity
 
     /** 公告状态（0正常 1关闭） */
     private String status;
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    /** 通知网格 */
+    @Excel(name = "通知网格")
+    private String deptName;
+
+    /** 创建者ID */
+    @Excel(name = "创建者ID")
+    private Long userId;
 
     public Long getNoticeId()
     {
@@ -83,7 +96,33 @@ public class SysNotice extends BaseEntity
     {
         return status;
     }
+    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)
@@ -97,6 +136,9 @@ public class SysNotice extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("deptId", getDeptId())
+            .append("deptName", getDeptName())
+            .append("userId", getUserId())
             .toString();
     }
 }

ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -15,10 +15,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"       column="update_by"       />
         <result property="updateTime"     column="update_time"     />
         <result property="remark"         column="remark"          />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="userId"    column="user_id"    />
     </resultMap>
     
     <sql id="selectNoticeVo">
-        select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark 
+        select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark , dept_id, dept_name, user_id
 		from sys_notice
     </sql>
     
@@ -39,6 +42,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="createBy != null and createBy != ''">
 				AND create_by like concat('%', #{createBy}, '%')
 			</if>
+            <if test="status != null  and status != ''"> and status = #{status}</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>
     
@@ -50,6 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null and status != '' ">status, </if>
 			<if test="remark != null and remark != ''">remark,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
+        <if test="deptId != null">dept_id,</if>
+        <if test="deptName != null">dept_name,</if>
+        <if test="userId != null">user_id,</if>
  			create_time
  		)values(
 			<if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle}, </if>
@@ -58,6 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null and status != ''">#{status}, </if>
 			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
+        <if test="deptId != null">#{deptId},</if>
+        <if test="deptName != null">#{deptName},</if>
+        <if test="userId != null">#{userId},</if>
  			sysdate()
 		)
     </insert>
@@ -70,6 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="noticeContent != null">notice_content = #{noticeContent}, </if>
             <if test="status != null and status != ''">status = #{status}, </if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</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>
  			update_time = sysdate()
         </set>
         where notice_id = #{noticeId}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcButieController.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.SzxcButie;
+import com.ruoyi.szxc.service.ISzxcButieService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 补贴管理Controller
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+@RestController
+@RequestMapping("/szxc/butie")
+public class SzxcButieController extends BaseController
+{
+    @Autowired
+    private ISzxcButieService szxcButieService;
+
+    /**
+     * 查询补贴管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:butie:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SzxcButie szxcButie)
+    {
+        startPage();
+        List<SzxcButie> list = szxcButieService.selectSzxcButieList(szxcButie);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出补贴管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:butie:export')")
+    @Log(title = "补贴管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SzxcButie szxcButie)
+    {
+        List<SzxcButie> list = szxcButieService.selectSzxcButieList(szxcButie);
+        ExcelUtil<SzxcButie> util = new ExcelUtil<SzxcButie>(SzxcButie.class);
+        util.exportExcel(response, list, "补贴管理数据");
+    }
+
+    /**
+     * 获取补贴管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:butie:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(szxcButieService.selectSzxcButieById(id));
+    }
+
+    /**
+     * 新增补贴管理
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:butie:add')")
+    @Log(title = "补贴管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SzxcButie szxcButie)
+    {
+        return toAjax(szxcButieService.insertSzxcButie(szxcButie));
+    }
+
+    /**
+     * 修改补贴管理
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:butie:edit')")
+    @Log(title = "补贴管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SzxcButie szxcButie)
+    {
+        return toAjax(szxcButieService.updateSzxcButie(szxcButie));
+    }
+
+    /**
+     * 删除补贴管理
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:butie:remove')")
+    @Log(title = "补贴管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(szxcButieService.deleteSzxcButieByIds(ids));
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcDiscussCentreController.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.SzxcDiscussCentre;
+import com.ruoyi.szxc.service.ISzxcDiscussCentreService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 议事中心Controller
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+@RestController
+@RequestMapping("/szxc/yscentre")
+public class SzxcDiscussCentreController extends BaseController
+{
+    @Autowired
+    private ISzxcDiscussCentreService szxcDiscussCentreService;
+
+    /**
+     * 查询议事中心列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:yscentre:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SzxcDiscussCentre szxcDiscussCentre)
+    {
+        startPage();
+        List<SzxcDiscussCentre> list = szxcDiscussCentreService.selectSzxcDiscussCentreList(szxcDiscussCentre);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出议事中心列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:yscentre:export')")
+    @Log(title = "议事中心", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SzxcDiscussCentre szxcDiscussCentre)
+    {
+        List<SzxcDiscussCentre> list = szxcDiscussCentreService.selectSzxcDiscussCentreList(szxcDiscussCentre);
+        ExcelUtil<SzxcDiscussCentre> util = new ExcelUtil<SzxcDiscussCentre>(SzxcDiscussCentre.class);
+        util.exportExcel(response, list, "议事中心数据");
+    }
+
+    /**
+     * 获取议事中心详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:yscentre:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(szxcDiscussCentreService.selectSzxcDiscussCentreById(id));
+    }
+
+    /**
+     * 新增议事中心
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:yscentre:add')")
+    @Log(title = "议事中心", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SzxcDiscussCentre szxcDiscussCentre)
+    {
+        return toAjax(szxcDiscussCentreService.insertSzxcDiscussCentre(szxcDiscussCentre));
+    }
+
+    /**
+     * 修改议事中心
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:yscentre:edit')")
+    @Log(title = "议事中心", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SzxcDiscussCentre szxcDiscussCentre)
+    {
+        return toAjax(szxcDiscussCentreService.updateSzxcDiscussCentre(szxcDiscussCentre));
+    }
+
+    /**
+     * 删除议事中心
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:yscentre:remove')")
+    @Log(title = "议事中心", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(szxcDiscussCentreService.deleteSzxcDiscussCentreByIds(ids));
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcGyApplyController.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.SzxcGyApply;
+import com.ruoyi.szxc.service.ISzxcGyApplyService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 公益报名情况Controller
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+@RestController
+@RequestMapping("/szxc/apply")
+public class SzxcGyApplyController extends BaseController
+{
+    @Autowired
+    private ISzxcGyApplyService szxcGyApplyService;
+
+    /**
+     * 查询公益报名情况列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:apply:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SzxcGyApply szxcGyApply)
+    {
+        startPage();
+        List<SzxcGyApply> list = szxcGyApplyService.selectSzxcGyApplyList(szxcGyApply);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出公益报名情况列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:apply:export')")
+    @Log(title = "公益报名情况", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SzxcGyApply szxcGyApply)
+    {
+        List<SzxcGyApply> list = szxcGyApplyService.selectSzxcGyApplyList(szxcGyApply);
+        ExcelUtil<SzxcGyApply> util = new ExcelUtil<SzxcGyApply>(SzxcGyApply.class);
+        util.exportExcel(response, list, "公益报名情况数据");
+    }
+
+    /**
+     * 获取公益报名情况详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:apply:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(szxcGyApplyService.selectSzxcGyApplyById(id));
+    }
+
+    /**
+     * 新增公益报名情况
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:apply:add')")
+    @Log(title = "公益报名情况", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SzxcGyApply szxcGyApply)
+    {
+        return toAjax(szxcGyApplyService.insertSzxcGyApply(szxcGyApply));
+    }
+
+    /**
+     * 修改公益报名情况
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:apply:edit')")
+    @Log(title = "公益报名情况", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SzxcGyApply szxcGyApply)
+    {
+        return toAjax(szxcGyApplyService.updateSzxcGyApply(szxcGyApply));
+    }
+
+    /**
+     * 删除公益报名情况
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:apply:remove')")
+    @Log(title = "公益报名情况", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(szxcGyApplyService.deleteSzxcGyApplyByIds(ids));
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHelpController.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.SzxcHelp;
+import com.ruoyi.szxc.service.ISzxcHelpService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 帮办事Controller
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+@RestController
+@RequestMapping("/szxc/help")
+public class SzxcHelpController extends BaseController
+{
+    @Autowired
+    private ISzxcHelpService szxcHelpService;
+
+    /**
+     * 查询帮办事列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:help:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SzxcHelp szxcHelp)
+    {
+        startPage();
+        List<SzxcHelp> list = szxcHelpService.selectSzxcHelpList(szxcHelp);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出帮办事列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:help:export')")
+    @Log(title = "帮办事", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SzxcHelp szxcHelp)
+    {
+        List<SzxcHelp> list = szxcHelpService.selectSzxcHelpList(szxcHelp);
+        ExcelUtil<SzxcHelp> util = new ExcelUtil<SzxcHelp>(SzxcHelp.class);
+        util.exportExcel(response, list, "帮办事数据");
+    }
+
+    /**
+     * 获取帮办事详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:help:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(szxcHelpService.selectSzxcHelpById(id));
+    }
+
+    /**
+     * 新增帮办事
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:help:add')")
+    @Log(title = "帮办事", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SzxcHelp szxcHelp)
+    {
+        return toAjax(szxcHelpService.insertSzxcHelp(szxcHelp));
+    }
+
+    /**
+     * 修改帮办事
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:help:edit')")
+    @Log(title = "帮办事", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SzxcHelp szxcHelp)
+    {
+        return toAjax(szxcHelpService.updateSzxcHelp(szxcHelp));
+    }
+
+    /**
+     * 删除帮办事
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:help:remove')")
+    @Log(title = "帮办事", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(szxcHelpService.deleteSzxcHelpByIds(ids));
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcOffRecardController.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.SzxcOffRecard;
+import com.ruoyi.szxc.service.ISzxcOffRecardService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 注销登记记录Controller
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+@RestController
+@RequestMapping("/szxc/offrecard")
+public class SzxcOffRecardController extends BaseController
+{
+    @Autowired
+    private ISzxcOffRecardService szxcOffRecardService;
+
+    /**
+     * 查询注销登记记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:offrecard:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SzxcOffRecard szxcOffRecard)
+    {
+        startPage();
+        List<SzxcOffRecard> list = szxcOffRecardService.selectSzxcOffRecardList(szxcOffRecard);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出注销登记记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:offrecard:export')")
+    @Log(title = "注销登记记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SzxcOffRecard szxcOffRecard)
+    {
+        List<SzxcOffRecard> list = szxcOffRecardService.selectSzxcOffRecardList(szxcOffRecard);
+        ExcelUtil<SzxcOffRecard> util = new ExcelUtil<SzxcOffRecard>(SzxcOffRecard.class);
+        util.exportExcel(response, list, "注销登记记录数据");
+    }
+
+    /**
+     * 获取注销登记记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:offrecard:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(szxcOffRecardService.selectSzxcOffRecardById(id));
+    }
+
+    /**
+     * 新增注销登记记录
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:offrecard:add')")
+    @Log(title = "注销登记记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SzxcOffRecard szxcOffRecard)
+    {
+        return toAjax(szxcOffRecardService.insertSzxcOffRecard(szxcOffRecard));
+    }
+
+    /**
+     * 修改注销登记记录
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:offrecard:edit')")
+    @Log(title = "注销登记记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SzxcOffRecard szxcOffRecard)
+    {
+        return toAjax(szxcOffRecardService.updateSzxcOffRecard(szxcOffRecard));
+    }
+
+    /**
+     * 删除注销登记记录
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:offrecard:remove')")
+    @Log(title = "注销登记记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(szxcOffRecardService.deleteSzxcOffRecardByIds(ids));
+    }
+}

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

@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 公益活动Controller
  * 
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-20
  */
 @RestController
 @RequestMapping("/szxc/activily")

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcSbzlController.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.SzxcSbzl;
+import com.ruoyi.szxc.service.ISzxcSbzlService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 上报资料Controller
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+@RestController
+@RequestMapping("/szxc/sbzl")
+public class SzxcSbzlController extends BaseController
+{
+    @Autowired
+    private ISzxcSbzlService szxcSbzlService;
+
+    /**
+     * 查询上报资料列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:sbzl:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SzxcSbzl szxcSbzl)
+    {
+        startPage();
+        List<SzxcSbzl> list = szxcSbzlService.selectSzxcSbzlList(szxcSbzl);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出上报资料列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:sbzl:export')")
+    @Log(title = "上报资料", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SzxcSbzl szxcSbzl)
+    {
+        List<SzxcSbzl> list = szxcSbzlService.selectSzxcSbzlList(szxcSbzl);
+        ExcelUtil<SzxcSbzl> util = new ExcelUtil<SzxcSbzl>(SzxcSbzl.class);
+        util.exportExcel(response, list, "上报资料数据");
+    }
+
+    /**
+     * 获取上报资料详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:sbzl:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(szxcSbzlService.selectSzxcSbzlById(id));
+    }
+
+    /**
+     * 新增上报资料
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:sbzl:add')")
+    @Log(title = "上报资料", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SzxcSbzl szxcSbzl)
+    {
+        return toAjax(szxcSbzlService.insertSzxcSbzl(szxcSbzl));
+    }
+
+    /**
+     * 修改上报资料
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:sbzl:edit')")
+    @Log(title = "上报资料", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SzxcSbzl szxcSbzl)
+    {
+        return toAjax(szxcSbzlService.updateSzxcSbzl(szxcSbzl));
+    }
+
+    /**
+     * 删除上报资料
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:sbzl:remove')")
+    @Log(title = "上报资料", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(szxcSbzlService.deleteSzxcSbzlByIds(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-16
+ * @date 2024-03-20
  */
 @RestController
 @RequestMapping("/szxc/visitrecard")

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVoteResultController.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.SzxcVoteResult;
+import com.ruoyi.szxc.service.ISzxcVoteResultService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 议事投票情况Controller
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+@RestController
+@RequestMapping("/szxc/voteresut")
+public class SzxcVoteResultController extends BaseController
+{
+    @Autowired
+    private ISzxcVoteResultService szxcVoteResultService;
+
+    /**
+     * 查询议事投票情况列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:voteresut:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SzxcVoteResult szxcVoteResult)
+    {
+        startPage();
+        List<SzxcVoteResult> list = szxcVoteResultService.selectSzxcVoteResultList(szxcVoteResult);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出议事投票情况列表
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:voteresut:export')")
+    @Log(title = "议事投票情况", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SzxcVoteResult szxcVoteResult)
+    {
+        List<SzxcVoteResult> list = szxcVoteResultService.selectSzxcVoteResultList(szxcVoteResult);
+        ExcelUtil<SzxcVoteResult> util = new ExcelUtil<SzxcVoteResult>(SzxcVoteResult.class);
+        util.exportExcel(response, list, "议事投票情况数据");
+    }
+
+    /**
+     * 获取议事投票情况详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:voteresut:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(szxcVoteResultService.selectSzxcVoteResultById(id));
+    }
+
+    /**
+     * 新增议事投票情况
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:voteresut:add')")
+    @Log(title = "议事投票情况", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SzxcVoteResult szxcVoteResult)
+    {
+        return toAjax(szxcVoteResultService.insertSzxcVoteResult(szxcVoteResult));
+    }
+
+    /**
+     * 修改议事投票情况
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:voteresut:edit')")
+    @Log(title = "议事投票情况", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SzxcVoteResult szxcVoteResult)
+    {
+        return toAjax(szxcVoteResultService.updateSzxcVoteResult(szxcVoteResult));
+    }
+
+    /**
+     * 删除议事投票情况
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:voteresut:remove')")
+    @Log(title = "议事投票情况", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(szxcVoteResultService.deleteSzxcVoteResultByIds(ids));
+    }
+}

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

@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 办事指南Controller
  * 
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-20
  */
 @RestController
 @RequestMapping("/szxc/guide")

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

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

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-16
+ * @date 2024-03-20
  */
 @RestController
 @RequestMapping("/szxc/xcrecard")

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcButie.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_butie
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public class SzxcButie extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 补贴类别 */
+    @Excel(name = "补贴类别")
+    private String type;
+
+    /** 补贴项目名称 */
+    @Excel(name = "补贴项目名称")
+    private String xmTitle;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private Long xmId;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private String year;
+
+    /** 标准金额 */
+    @Excel(name = "标准金额")
+    private String money;
+
+    /** 补贴居民id */
+    @Excel(name = "补贴居民id")
+    private Long jmId;
+
+    /** 补贴人 */
+    @Excel(name = "补贴人")
+    private String name;
+
+    /** 内容描述 */
+    @Excel(name = "内容描述")
+    private String content;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private String zfStatus;
+
+    /** 审核备注 */
+    @Excel(name = "审核备注")
+    private String shRemark;
+
+    /** 部门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 setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setXmTitle(String xmTitle) 
+    {
+        this.xmTitle = xmTitle;
+    }
+
+    public String getXmTitle() 
+    {
+        return xmTitle;
+    }
+    public void setXmId(Long xmId) 
+    {
+        this.xmId = xmId;
+    }
+
+    public Long getXmId() 
+    {
+        return xmId;
+    }
+    public void setYear(String year) 
+    {
+        this.year = year;
+    }
+
+    public String getYear() 
+    {
+        return year;
+    }
+    public void setMoney(String money) 
+    {
+        this.money = money;
+    }
+
+    public String getMoney() 
+    {
+        return money;
+    }
+    public void setJmId(Long jmId) 
+    {
+        this.jmId = jmId;
+    }
+
+    public Long getJmId() 
+    {
+        return jmId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setZfStatus(String zfStatus) 
+    {
+        this.zfStatus = zfStatus;
+    }
+
+    public String getZfStatus() 
+    {
+        return zfStatus;
+    }
+    public void setShRemark(String shRemark) 
+    {
+        this.shRemark = shRemark;
+    }
+
+    public String getShRemark() 
+    {
+        return shRemark;
+    }
+    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("type", getType())
+            .append("xmTitle", getXmTitle())
+            .append("xmId", getXmId())
+            .append("year", getYear())
+            .append("money", getMoney())
+            .append("jmId", getJmId())
+            .append("name", getName())
+            .append("content", getContent())
+            .append("zfStatus", getZfStatus())
+            .append("shRemark", getShRemark())
+            .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/SzxcDiscussCentre.java

@@ -0,0 +1,185 @@
+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_discuss_centre
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public class SzxcDiscussCentre 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 channel;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startDate;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endDate;
+
+    /** 状态(待开始、进行中、已结束) */
+    @Excel(name = "状态(待开始、进行中、已结束)")
+    private String status;
+
+    /** 图片 */
+    @Excel(name = "图片")
+    private String picture;
+
+    /** 创建者ID */
+    @Excel(name = "创建者ID")
+    private Long userId;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    /** 所属网格 */
+    @Excel(name = "所属网格")
+    private String deptName;
+
+    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 setChannel(String channel) 
+    {
+        this.channel = channel;
+    }
+
+    public String getChannel() 
+    {
+        return channel;
+    }
+    public void setStartDate(Date startDate) 
+    {
+        this.startDate = startDate;
+    }
+
+    public Date getStartDate() 
+    {
+        return startDate;
+    }
+    public void setEndDate(Date endDate) 
+    {
+        this.endDate = endDate;
+    }
+
+    public Date getEndDate() 
+    {
+        return endDate;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setPicture(String picture) 
+    {
+        this.picture = picture;
+    }
+
+    public String getPicture() 
+    {
+        return picture;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    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;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("title", getTitle())
+            .append("content", getContent())
+            .append("channel", getChannel())
+            .append("startDate", getStartDate())
+            .append("endDate", getEndDate())
+            .append("status", getStatus())
+            .append("picture", getPicture())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("userId", getUserId())
+            .append("deptId", getDeptId())
+            .append("deptName", getDeptName())
+            .toString();
+    }
+}

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

@@ -0,0 +1,111 @@
+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_gy_apply
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public class SzxcGyApply extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 居民id */
+    @Excel(name = "居民id")
+    private Long jmId;
+
+    /** 公益id */
+    @Excel(name = "公益id")
+    private Long gyId;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String cardId;
+
+    /** 报名人 */
+    @Excel(name = "报名人")
+    private String name;
+
+    /** 创建者ID */
+    @Excel(name = "创建者ID")
+    private Long userId;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setJmId(Long jmId) 
+    {
+        this.jmId = jmId;
+    }
+
+    public Long getJmId() 
+    {
+        return jmId;
+    }
+    public void setGyId(Long gyId) 
+    {
+        this.gyId = gyId;
+    }
+
+    public Long getGyId() 
+    {
+        return gyId;
+    }
+    public void setCardId(String cardId) 
+    {
+        this.cardId = cardId;
+    }
+
+    public String getCardId() 
+    {
+        return cardId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    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("jmId", getJmId())
+            .append("gyId", getGyId())
+            .append("cardId", getCardId())
+            .append("name", getName())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("userId", getUserId())
+            .toString();
+    }
+}

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

@@ -0,0 +1,185 @@
+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_help
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public class SzxcHelp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 提报人 */
+    @Excel(name = "提报人")
+    private String subName;
+
+    /** 提报日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "提报日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date subDate;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String phone;
+
+    /** 事项类型 */
+    @Excel(name = "事项类型")
+    private String sbType;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    private String title;
+
+    /** 事项描述 */
+    @Excel(name = "事项描述")
+    private String content;
+
+    /** 处理进度(字典审核状态) */
+    @Excel(name = "处理进度(字典审核状态)")
+    private String helpStatus;
+
+    /** 部门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 setSubName(String subName) 
+    {
+        this.subName = subName;
+    }
+
+    public String getSubName() 
+    {
+        return subName;
+    }
+    public void setSubDate(Date subDate) 
+    {
+        this.subDate = subDate;
+    }
+
+    public Date getSubDate() 
+    {
+        return subDate;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setSbType(String sbType) 
+    {
+        this.sbType = sbType;
+    }
+
+    public String getSbType() 
+    {
+        return sbType;
+    }
+    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 setHelpStatus(String helpStatus) 
+    {
+        this.helpStatus = helpStatus;
+    }
+
+    public String getHelpStatus() 
+    {
+        return helpStatus;
+    }
+    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("subName", getSubName())
+            .append("subDate", getSubDate())
+            .append("phone", getPhone())
+            .append("sbType", getSbType())
+            .append("title", getTitle())
+            .append("content", getContent())
+            .append("helpStatus", getHelpStatus())
+            .append("remark", getRemark())
+            .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/SzxcJmInfo.java

@@ -10,9 +10,9 @@ import java.util.Date;
 
 /**
  * 居民信息对象 szxc_jm_info
- * 
+ *
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-18
  */
 public class SzxcJmInfo extends BaseEntity
 {
@@ -118,9 +118,9 @@ public class SzxcJmInfo extends BaseEntity
     @Excel(name = "是否户主 0:户主 1:非户主")
     private String head;
 
-    /** 同户人员ids */
-    @Excel(name = "同户人员ids")
-    private String sameHeadIds;
+    /** 户号 */
+    @Excel(name = "户号")
+    private Long acountNo;
 
     /** 是否注销 0:正常 1:注销 */
     @Excel(name = "是否注销 0:正常 1:注销")
@@ -130,255 +130,255 @@ public class SzxcJmInfo extends BaseEntity
     @Excel(name = "创建者ID")
     private Long userId;
 
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setDeptId(Long deptId) 
+    public void setDeptId(Long deptId)
     {
         this.deptId = deptId;
     }
 
-    public Long getDeptId() 
+    public Long getDeptId()
     {
         return deptId;
     }
-    public void setDeptName(String deptName) 
+    public void setDeptName(String deptName)
     {
         this.deptName = deptName;
     }
 
-    public String getDeptName() 
+    public String getDeptName()
     {
         return deptName;
     }
-    public void setName(String name) 
+    public void setName(String name)
     {
         this.name = name;
     }
 
-    public String getName() 
+    public String getName()
     {
         return name;
     }
-    public void setOldName(String oldName) 
+    public void setOldName(String oldName)
     {
         this.oldName = oldName;
     }
 
-    public String getOldName() 
+    public String getOldName()
     {
         return oldName;
     }
-    public void setNationality(String nationality) 
+    public void setNationality(String nationality)
     {
         this.nationality = nationality;
     }
 
-    public String getNationality() 
+    public String getNationality()
     {
         return nationality;
     }
-    public void setCardId(String cardId) 
+    public void setCardId(String cardId)
     {
         this.cardId = cardId;
     }
 
-    public String getCardId() 
+    public String getCardId()
     {
         return cardId;
     }
-    public void setBornDate(Date bornDate) 
+    public void setBornDate(Date bornDate)
     {
         this.bornDate = bornDate;
     }
 
-    public Date getBornDate() 
+    public Date getBornDate()
     {
         return bornDate;
     }
-    public void setAge(Long age) 
+    public void setAge(Long age)
     {
         this.age = age;
     }
 
-    public Long getAge() 
+    public Long getAge()
     {
         return age;
     }
-    public void setSex(String sex) 
+    public void setSex(String sex)
     {
         this.sex = sex;
     }
 
-    public String getSex() 
+    public String getSex()
     {
         return sex;
     }
-    public void setJg(String jg) 
+    public void setJg(String jg)
     {
         this.jg = jg;
     }
 
-    public String getJg() 
+    public String getJg()
     {
         return jg;
     }
-    public void setRelation(String relation) 
+    public void setRelation(String relation)
     {
         this.relation = relation;
     }
 
-    public String getRelation() 
+    public String getRelation()
     {
         return relation;
     }
-    public void setJgNature(String jgNature) 
+    public void setJgNature(String jgNature)
     {
         this.jgNature = jgNature;
     }
 
-    public String getJgNature() 
+    public String getJgNature()
     {
         return jgNature;
     }
-    public void setLongLive(String longLive) 
+    public void setLongLive(String longLive)
     {
         this.longLive = longLive;
     }
 
-    public String getLongLive() 
+    public String getLongLive()
     {
         return longLive;
     }
-    public void setHjAddress(String hjAddress) 
+    public void setHjAddress(String hjAddress)
     {
         this.hjAddress = hjAddress;
     }
 
-    public String getHjAddress() 
+    public String getHjAddress()
     {
         return hjAddress;
     }
-    public void setPhone(String phone) 
+    public void setPhone(String phone)
     {
         this.phone = phone;
     }
 
-    public String getPhone() 
+    public String getPhone()
     {
         return phone;
     }
-    public void setCurrentAddress(String currentAddress) 
+    public void setCurrentAddress(String currentAddress)
     {
         this.currentAddress = currentAddress;
     }
 
-    public String getCurrentAddress() 
+    public String getCurrentAddress()
     {
         return currentAddress;
     }
-    public void setBrqk(String brqk) 
+    public void setBrqk(String brqk)
     {
         this.brqk = brqk;
     }
 
-    public String getBrqk() 
+    public String getBrqk()
     {
         return brqk;
     }
-    public void setHy(String hy) 
+    public void setHy(String hy)
     {
         this.hy = hy;
     }
 
-    public String getHy() 
+    public String getHy()
     {
         return hy;
     }
-    public void setXueli(String xueli) 
+    public void setXueli(String xueli)
     {
         this.xueli = xueli;
     }
 
-    public String getXueli() 
+    public String getXueli()
     {
         return xueli;
     }
-    public void setZzmm(String zzmm) 
+    public void setZzmm(String zzmm)
     {
         this.zzmm = zzmm;
     }
 
-    public String getZzmm() 
+    public String getZzmm()
     {
         return zzmm;
     }
-    public void setZjxy(String zjxy) 
+    public void setZjxy(String zjxy)
     {
         this.zjxy = zjxy;
     }
 
-    public String getZjxy() 
+    public String getZjxy()
     {
         return zjxy;
     }
-    public void setJkzk(String jkzk) 
+    public void setJkzk(String jkzk)
     {
         this.jkzk = jkzk;
     }
 
-    public String getJkzk() 
+    public String getJkzk()
     {
         return jkzk;
     }
-    public void setIlls(String ills) 
+    public void setIlls(String ills)
     {
         this.ills = ills;
     }
 
-    public String getIlls() 
+    public String getIlls()
     {
         return ills;
     }
-    public void setHead(String head) 
+    public void setHead(String head)
     {
         this.head = head;
     }
 
-    public String getHead() 
+    public String getHead()
     {
         return head;
     }
-    public void setSameHeadIds(String sameHeadIds) 
+    public void setAcountNo(Long acountNo)
     {
-        this.sameHeadIds = sameHeadIds;
+        this.acountNo = acountNo;
     }
 
-    public String getSameHeadIds() 
+    public Long getAcountNo()
     {
-        return sameHeadIds;
+        return acountNo;
     }
-    public void setOff(String off) 
+    public void setOff(String off)
     {
         this.off = off;
     }
 
-    public String getOff() 
+    public String getOff()
     {
         return off;
     }
-    public void setUserId(Long userId) 
+    public void setUserId(Long userId)
     {
         this.userId = userId;
     }
 
-    public Long getUserId() 
+    public Long getUserId()
     {
         return userId;
     }
@@ -386,38 +386,38 @@ public class SzxcJmInfo extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("deptId", getDeptId())
-            .append("deptName", getDeptName())
-            .append("name", getName())
-            .append("oldName", getOldName())
-            .append("nationality", getNationality())
-            .append("cardId", getCardId())
-            .append("bornDate", getBornDate())
-            .append("age", getAge())
-            .append("sex", getSex())
-            .append("jg", getJg())
-            .append("relation", getRelation())
-            .append("jgNature", getJgNature())
-            .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())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("userId", getUserId())
-            .toString();
+                .append("id", getId())
+                .append("deptId", getDeptId())
+                .append("deptName", getDeptName())
+                .append("name", getName())
+                .append("oldName", getOldName())
+                .append("nationality", getNationality())
+                .append("cardId", getCardId())
+                .append("bornDate", getBornDate())
+                .append("age", getAge())
+                .append("sex", getSex())
+                .append("jg", getJg())
+                .append("relation", getRelation())
+                .append("jgNature", getJgNature())
+                .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("acountNo", getAcountNo())
+                .append("off", getOff())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("userId", getUserId())
+                .toString();
     }
 }

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

@@ -0,0 +1,112 @@
+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_off_recard
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public class SzxcOffRecard extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 居民id */
+    @Excel(name = "居民id")
+    private Long jmId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String cardId;
+
+    /** 注销原因 */
+    @Excel(name = "注销原因")
+    private String reason;
+
+    /** 创建者ID */
+    @Excel(name = "创建者ID")
+    private Long userId;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setJmId(Long jmId) 
+    {
+        this.jmId = jmId;
+    }
+
+    public Long getJmId() 
+    {
+        return jmId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setCardId(String cardId) 
+    {
+        this.cardId = cardId;
+    }
+
+    public String getCardId() 
+    {
+        return cardId;
+    }
+    public void setReason(String reason) 
+    {
+        this.reason = reason;
+    }
+
+    public String getReason() 
+    {
+        return reason;
+    }
+    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("jmId", getJmId())
+            .append("name", getName())
+            .append("cardId", getCardId())
+            .append("reason", getReason())
+            .append("remark", getRemark())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("userId", getUserId())
+            .toString();
+    }
+}

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

@@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 公益活动对象 szxc_public_activily
  * 
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-20
  */
 public class SzxcPublicActivily extends BaseEntity
 {
@@ -32,28 +32,24 @@ public class SzxcPublicActivily extends BaseEntity
     @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")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date startTime;
 
-    /** 创建时间 */
+    /** 结束时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endTime;
 
+    /** 活动状态(带开始、进行中、已结束) */
+    @Excel(name = "活动状态(带开始、进行中、已结束)")
+    private String status;
+
     /** 部门id */
     @Excel(name = "部门id")
     private Long deptId;
@@ -102,15 +98,6 @@ public class SzxcPublicActivily extends BaseEntity
     {
         return phone;
     }
-    public void setType(String type) 
-    {
-        this.type = type;
-    }
-
-    public String getType() 
-    {
-        return type;
-    }
     public void setContent(String content) 
     {
         this.content = content;
@@ -120,15 +107,6 @@ public class SzxcPublicActivily extends BaseEntity
     {
         return content;
     }
-    public void setLeave(String leave) 
-    {
-        this.leave = leave;
-    }
-
-    public String getLeave() 
-    {
-        return leave;
-    }
     public void setStartTime(Date startTime) 
     {
         this.startTime = startTime;
@@ -147,6 +125,15 @@ public class SzxcPublicActivily extends BaseEntity
     {
         return endTime;
     }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
     public void setDeptId(Long deptId) 
     {
         this.deptId = deptId;
@@ -182,13 +169,12 @@ public class SzxcPublicActivily extends BaseEntity
             .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("status", getStatus())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())

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

@@ -0,0 +1,156 @@
+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_sbzl
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public class SzxcSbzl extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 上报人 */
+    @Excel(name = "上报人")
+    private String subName;
+
+    /** 上报日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date subDate;
+
+    /** 上报分类 */
+    @Excel(name = "上报分类")
+    private String subType;
+
+    /** 上报标题 */
+    @Excel(name = "上报标题")
+    private String title;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String content;
+
+    /** 部门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 setSubName(String subName) 
+    {
+        this.subName = subName;
+    }
+
+    public String getSubName() 
+    {
+        return subName;
+    }
+    public void setSubDate(Date subDate) 
+    {
+        this.subDate = subDate;
+    }
+
+    public Date getSubDate() 
+    {
+        return subDate;
+    }
+    public void setSubType(String subType) 
+    {
+        this.subType = subType;
+    }
+
+    public String getSubType() 
+    {
+        return subType;
+    }
+    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 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("subName", getSubName())
+            .append("subDate", getSubDate())
+            .append("subType", getSubType())
+            .append("title", getTitle())
+            .append("content", getContent())
+            .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/SzxcVisitRecard.java

@@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 走访记录对象 szxc_visit_recard
  * 
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-20
  */
 public class SzxcVisitRecard extends BaseEntity
 {
@@ -29,10 +29,15 @@ public class SzxcVisitRecard extends BaseEntity
     @Excel(name = "提报日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date submitDate;
 
-    /** 走访日期 */
+    /** 开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "走访日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date visitDate;
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startDate;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endDate;
 
     /** 类别 */
     @Excel(name = "类别")
@@ -62,6 +67,14 @@ public class SzxcVisitRecard extends BaseEntity
     @Excel(name = "随行走访人")
     private String flowPeople;
 
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private String zfStatus;
+
+    /** 审核备注 */
+    @Excel(name = "审核备注")
+    private String shRemark;
+
     /** 部门id */
     @Excel(name = "部门id")
     private Long deptId;
@@ -101,14 +114,23 @@ public class SzxcVisitRecard extends BaseEntity
     {
         return submitDate;
     }
-    public void setVisitDate(Date visitDate) 
+    public void setStartDate(Date startDate) 
+    {
+        this.startDate = startDate;
+    }
+
+    public Date getStartDate() 
     {
-        this.visitDate = visitDate;
+        return startDate;
+    }
+    public void setEndDate(Date endDate) 
+    {
+        this.endDate = endDate;
     }
 
-    public Date getVisitDate() 
+    public Date getEndDate() 
     {
-        return visitDate;
+        return endDate;
     }
     public void setType(String type) 
     {
@@ -173,6 +195,24 @@ public class SzxcVisitRecard extends BaseEntity
     {
         return flowPeople;
     }
+    public void setZfStatus(String zfStatus) 
+    {
+        this.zfStatus = zfStatus;
+    }
+
+    public String getZfStatus() 
+    {
+        return zfStatus;
+    }
+    public void setShRemark(String shRemark) 
+    {
+        this.shRemark = shRemark;
+    }
+
+    public String getShRemark() 
+    {
+        return shRemark;
+    }
     public void setDeptId(Long deptId) 
     {
         this.deptId = deptId;
@@ -207,7 +247,8 @@ public class SzxcVisitRecard extends BaseEntity
             .append("id", getId())
             .append("visiterName", getVisiterName())
             .append("submitDate", getSubmitDate())
-            .append("visitDate", getVisitDate())
+            .append("startDate", getStartDate())
+            .append("endDate", getEndDate())
             .append("type", getType())
             .append("jmId", getJmId())
             .append("visitObj", getVisitObj())
@@ -215,6 +256,8 @@ public class SzxcVisitRecard extends BaseEntity
             .append("picture", getPicture())
             .append("content", getContent())
             .append("flowPeople", getFlowPeople())
+            .append("zfStatus", getZfStatus())
+            .append("shRemark", getShRemark())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

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

@@ -0,0 +1,139 @@
+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_vote_result
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public class SzxcVoteResult extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 居民id */
+    @Excel(name = "居民id")
+    private Long jmId;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String cardId;
+
+    /** 投票人 */
+    @Excel(name = "投票人")
+    private String voteName;
+
+    /** 议事id */
+    @Excel(name = "议事id")
+    private Long ysId;
+
+    /** 同意、反对、弃权 */
+    @Excel(name = "同意、反对、弃权")
+    private String vote;
+
+    /** 意见建议 */
+    @Excel(name = "意见建议")
+    private String opinion;
+
+    /** 创建者ID */
+    @Excel(name = "创建者ID")
+    private Long userId;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setJmId(Long jmId) 
+    {
+        this.jmId = jmId;
+    }
+
+    public Long getJmId() 
+    {
+        return jmId;
+    }
+    public void setCardId(String cardId) 
+    {
+        this.cardId = cardId;
+    }
+
+    public String getCardId() 
+    {
+        return cardId;
+    }
+    public void setVoteName(String voteName) 
+    {
+        this.voteName = voteName;
+    }
+
+    public String getVoteName() 
+    {
+        return voteName;
+    }
+    public void setYsId(Long ysId) 
+    {
+        this.ysId = ysId;
+    }
+
+    public Long getYsId() 
+    {
+        return ysId;
+    }
+    public void setVote(String vote) 
+    {
+        this.vote = vote;
+    }
+
+    public String getVote() 
+    {
+        return vote;
+    }
+    public void setOpinion(String opinion) 
+    {
+        this.opinion = opinion;
+    }
+
+    public String getOpinion() 
+    {
+        return opinion;
+    }
+    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("jmId", getJmId())
+            .append("cardId", getCardId())
+            .append("voteName", getVoteName())
+            .append("ysId", getYsId())
+            .append("vote", getVote())
+            .append("opinion", getOpinion())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("userId", getUserId())
+            .toString();
+    }
+}

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

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 办事指南对象 szxc_work_guide
  * 
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-20
  */
 public class SzxcWorkGuide extends BaseEntity
 {

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

@@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 工作记录对象 szxc_work_recard
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-20
  */
 public class SzxcWorkRecard extends BaseEntity
 {
@@ -24,10 +24,20 @@ public class SzxcWorkRecard extends BaseEntity
     @Excel(name = "工作人员")
     private String workerName;
 
-    /** 工作日期 */
+    /** 提报日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "工作日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date workerDate;
+    @Excel(name = "提报日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date submitDate;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startDate;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endDate;
 
     /** 类别 */
     @Excel(name = "类别")
@@ -45,6 +55,14 @@ public class SzxcWorkRecard extends BaseEntity
     @Excel(name = "内容")
     private String content;
 
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private String gzStatus;
+
+    /** 审核备注 */
+    @Excel(name = "审核备注")
+    private String shRemark;
+
     /** 部门id */
     @Excel(name = "部门id")
     private Long deptId;
@@ -75,14 +93,32 @@ public class SzxcWorkRecard extends BaseEntity
     {
         return workerName;
     }
-    public void setWorkerDate(Date workerDate) 
+    public void setSubmitDate(Date submitDate) 
+    {
+        this.submitDate = submitDate;
+    }
+
+    public Date getSubmitDate() 
+    {
+        return submitDate;
+    }
+    public void setStartDate(Date startDate) 
+    {
+        this.startDate = startDate;
+    }
+
+    public Date getStartDate() 
+    {
+        return startDate;
+    }
+    public void setEndDate(Date endDate) 
     {
-        this.workerDate = workerDate;
+        this.endDate = endDate;
     }
 
-    public Date getWorkerDate() 
+    public Date getEndDate() 
     {
-        return workerDate;
+        return endDate;
     }
     public void setType(String type) 
     {
@@ -120,6 +156,24 @@ public class SzxcWorkRecard extends BaseEntity
     {
         return content;
     }
+    public void setGzStatus(String gzStatus) 
+    {
+        this.gzStatus = gzStatus;
+    }
+
+    public String getGzStatus() 
+    {
+        return gzStatus;
+    }
+    public void setShRemark(String shRemark) 
+    {
+        this.shRemark = shRemark;
+    }
+
+    public String getShRemark() 
+    {
+        return shRemark;
+    }
     public void setDeptId(Long deptId) 
     {
         this.deptId = deptId;
@@ -153,11 +207,15 @@ public class SzxcWorkRecard extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("workerName", getWorkerName())
-            .append("workerDate", getWorkerDate())
+            .append("submitDate", getSubmitDate())
+            .append("startDate", getStartDate())
+            .append("endDate", getEndDate())
             .append("type", getType())
             .append("title", getTitle())
             .append("picture", getPicture())
             .append("content", getContent())
+            .append("gzStatus", getGzStatus())
+            .append("shRemark", getShRemark())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

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-16
+ * @date 2024-03-20
  */
 public class SzxcXcRecard extends BaseEntity
 {
@@ -66,6 +66,18 @@ public class SzxcXcRecard extends BaseEntity
     @Excel(name = "是否需要整改")
     private String reform;
 
+    /** 整改进度 */
+    @Excel(name = "整改进度")
+    private String zgProgress;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private String xcStatus;
+
+    /** 审核备注 */
+    @Excel(name = "审核备注")
+    private String shRemark;
+
     /** 部门id */
     @Excel(name = "部门id")
     private Long deptId;
@@ -186,6 +198,33 @@ public class SzxcXcRecard extends BaseEntity
     {
         return reform;
     }
+    public void setZgProgress(String zgProgress) 
+    {
+        this.zgProgress = zgProgress;
+    }
+
+    public String getZgProgress() 
+    {
+        return zgProgress;
+    }
+    public void setXcStatus(String xcStatus) 
+    {
+        this.xcStatus = xcStatus;
+    }
+
+    public String getXcStatus() 
+    {
+        return xcStatus;
+    }
+    public void setShRemark(String shRemark) 
+    {
+        this.shRemark = shRemark;
+    }
+
+    public String getShRemark() 
+    {
+        return shRemark;
+    }
     public void setDeptId(Long deptId) 
     {
         this.deptId = deptId;
@@ -229,6 +268,9 @@ public class SzxcXcRecard extends BaseEntity
             .append("content", getContent())
             .append("flowPeople", getFlowPeople())
             .append("reform", getReform())
+            .append("zgProgress", getZgProgress())
+            .append("xcStatus", getXcStatus())
+            .append("shRemark", getShRemark())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

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

@@ -0,0 +1,62 @@
+package com.ruoyi.szxc.mapper;
+
+import com.ruoyi.szxc.domain.SzxcButie;
+
+import java.util.List;
+
+/**
+ * 补贴管理Mapper接口
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public interface SzxcButieMapper 
+{
+    /**
+     * 查询补贴管理
+     * 
+     * @param id 补贴管理主键
+     * @return 补贴管理
+     */
+    public SzxcButie selectSzxcButieById(Long id);
+
+    /**
+     * 查询补贴管理列表
+     * 
+     * @param szxcButie 补贴管理
+     * @return 补贴管理集合
+     */
+    public List<SzxcButie> selectSzxcButieList(SzxcButie szxcButie);
+
+    /**
+     * 新增补贴管理
+     * 
+     * @param szxcButie 补贴管理
+     * @return 结果
+     */
+    public int insertSzxcButie(SzxcButie szxcButie);
+
+    /**
+     * 修改补贴管理
+     * 
+     * @param szxcButie 补贴管理
+     * @return 结果
+     */
+    public int updateSzxcButie(SzxcButie szxcButie);
+
+    /**
+     * 删除补贴管理
+     * 
+     * @param id 补贴管理主键
+     * @return 结果
+     */
+    public int deleteSzxcButieById(Long id);
+
+    /**
+     * 批量删除补贴管理
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSzxcButieByIds(Long[] ids);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.mapper;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcDiscussCentre;
+
+/**
+ * 议事中心Mapper接口
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public interface SzxcDiscussCentreMapper 
+{
+    /**
+     * 查询议事中心
+     * 
+     * @param id 议事中心主键
+     * @return 议事中心
+     */
+    public SzxcDiscussCentre selectSzxcDiscussCentreById(Long id);
+
+    /**
+     * 查询议事中心列表
+     * 
+     * @param szxcDiscussCentre 议事中心
+     * @return 议事中心集合
+     */
+    public List<SzxcDiscussCentre> selectSzxcDiscussCentreList(SzxcDiscussCentre szxcDiscussCentre);
+
+    /**
+     * 新增议事中心
+     * 
+     * @param szxcDiscussCentre 议事中心
+     * @return 结果
+     */
+    public int insertSzxcDiscussCentre(SzxcDiscussCentre szxcDiscussCentre);
+
+    /**
+     * 修改议事中心
+     * 
+     * @param szxcDiscussCentre 议事中心
+     * @return 结果
+     */
+    public int updateSzxcDiscussCentre(SzxcDiscussCentre szxcDiscussCentre);
+
+    /**
+     * 删除议事中心
+     * 
+     * @param id 议事中心主键
+     * @return 结果
+     */
+    public int deleteSzxcDiscussCentreById(Long id);
+
+    /**
+     * 批量删除议事中心
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSzxcDiscussCentreByIds(Long[] ids);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.mapper;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcGyApply;
+
+/**
+ * 公益报名情况Mapper接口
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public interface SzxcGyApplyMapper 
+{
+    /**
+     * 查询公益报名情况
+     * 
+     * @param id 公益报名情况主键
+     * @return 公益报名情况
+     */
+    public SzxcGyApply selectSzxcGyApplyById(Long id);
+
+    /**
+     * 查询公益报名情况列表
+     * 
+     * @param szxcGyApply 公益报名情况
+     * @return 公益报名情况集合
+     */
+    public List<SzxcGyApply> selectSzxcGyApplyList(SzxcGyApply szxcGyApply);
+
+    /**
+     * 新增公益报名情况
+     * 
+     * @param szxcGyApply 公益报名情况
+     * @return 结果
+     */
+    public int insertSzxcGyApply(SzxcGyApply szxcGyApply);
+
+    /**
+     * 修改公益报名情况
+     * 
+     * @param szxcGyApply 公益报名情况
+     * @return 结果
+     */
+    public int updateSzxcGyApply(SzxcGyApply szxcGyApply);
+
+    /**
+     * 删除公益报名情况
+     * 
+     * @param id 公益报名情况主键
+     * @return 结果
+     */
+    public int deleteSzxcGyApplyById(Long id);
+
+    /**
+     * 批量删除公益报名情况
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSzxcGyApplyByIds(Long[] ids);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.mapper;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcHelp;
+
+/**
+ * 帮办事Mapper接口
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public interface SzxcHelpMapper 
+{
+    /**
+     * 查询帮办事
+     * 
+     * @param id 帮办事主键
+     * @return 帮办事
+     */
+    public SzxcHelp selectSzxcHelpById(Long id);
+
+    /**
+     * 查询帮办事列表
+     * 
+     * @param szxcHelp 帮办事
+     * @return 帮办事集合
+     */
+    public List<SzxcHelp> selectSzxcHelpList(SzxcHelp szxcHelp);
+
+    /**
+     * 新增帮办事
+     * 
+     * @param szxcHelp 帮办事
+     * @return 结果
+     */
+    public int insertSzxcHelp(SzxcHelp szxcHelp);
+
+    /**
+     * 修改帮办事
+     * 
+     * @param szxcHelp 帮办事
+     * @return 结果
+     */
+    public int updateSzxcHelp(SzxcHelp szxcHelp);
+
+    /**
+     * 删除帮办事
+     * 
+     * @param id 帮办事主键
+     * @return 结果
+     */
+    public int deleteSzxcHelpById(Long id);
+
+    /**
+     * 批量删除帮办事
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSzxcHelpByIds(Long[] ids);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.mapper;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcOffRecard;
+
+/**
+ * 注销登记记录Mapper接口
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public interface SzxcOffRecardMapper 
+{
+    /**
+     * 查询注销登记记录
+     * 
+     * @param id 注销登记记录主键
+     * @return 注销登记记录
+     */
+    public SzxcOffRecard selectSzxcOffRecardById(Long id);
+
+    /**
+     * 查询注销登记记录列表
+     * 
+     * @param szxcOffRecard 注销登记记录
+     * @return 注销登记记录集合
+     */
+    public List<SzxcOffRecard> selectSzxcOffRecardList(SzxcOffRecard szxcOffRecard);
+
+    /**
+     * 新增注销登记记录
+     * 
+     * @param szxcOffRecard 注销登记记录
+     * @return 结果
+     */
+    public int insertSzxcOffRecard(SzxcOffRecard szxcOffRecard);
+
+    /**
+     * 修改注销登记记录
+     * 
+     * @param szxcOffRecard 注销登记记录
+     * @return 结果
+     */
+    public int updateSzxcOffRecard(SzxcOffRecard szxcOffRecard);
+
+    /**
+     * 删除注销登记记录
+     * 
+     * @param id 注销登记记录主键
+     * @return 结果
+     */
+    public int deleteSzxcOffRecardById(Long id);
+
+    /**
+     * 批量删除注销登记记录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSzxcOffRecardByIds(Long[] ids);
+}

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

@@ -7,7 +7,7 @@ import com.ruoyi.szxc.domain.SzxcPublicActivily;
  * 公益活动Mapper接口
  * 
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-20
  */
 public interface SzxcPublicActivilyMapper 
 {

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

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.mapper;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcSbzl;
+
+/**
+ * 上报资料Mapper接口
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public interface SzxcSbzlMapper 
+{
+    /**
+     * 查询上报资料
+     * 
+     * @param id 上报资料主键
+     * @return 上报资料
+     */
+    public SzxcSbzl selectSzxcSbzlById(Long id);
+
+    /**
+     * 查询上报资料列表
+     * 
+     * @param szxcSbzl 上报资料
+     * @return 上报资料集合
+     */
+    public List<SzxcSbzl> selectSzxcSbzlList(SzxcSbzl szxcSbzl);
+
+    /**
+     * 新增上报资料
+     * 
+     * @param szxcSbzl 上报资料
+     * @return 结果
+     */
+    public int insertSzxcSbzl(SzxcSbzl szxcSbzl);
+
+    /**
+     * 修改上报资料
+     * 
+     * @param szxcSbzl 上报资料
+     * @return 结果
+     */
+    public int updateSzxcSbzl(SzxcSbzl szxcSbzl);
+
+    /**
+     * 删除上报资料
+     * 
+     * @param id 上报资料主键
+     * @return 结果
+     */
+    public int deleteSzxcSbzlById(Long id);
+
+    /**
+     * 批量删除上报资料
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSzxcSbzlByIds(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-16
+ * @date 2024-03-20
  */
 public interface SzxcVisitRecardMapper 
 {

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

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.mapper;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcVoteResult;
+
+/**
+ * 议事投票情况Mapper接口
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public interface SzxcVoteResultMapper 
+{
+    /**
+     * 查询议事投票情况
+     * 
+     * @param id 议事投票情况主键
+     * @return 议事投票情况
+     */
+    public SzxcVoteResult selectSzxcVoteResultById(Long id);
+
+    /**
+     * 查询议事投票情况列表
+     * 
+     * @param szxcVoteResult 议事投票情况
+     * @return 议事投票情况集合
+     */
+    public List<SzxcVoteResult> selectSzxcVoteResultList(SzxcVoteResult szxcVoteResult);
+
+    /**
+     * 新增议事投票情况
+     * 
+     * @param szxcVoteResult 议事投票情况
+     * @return 结果
+     */
+    public int insertSzxcVoteResult(SzxcVoteResult szxcVoteResult);
+
+    /**
+     * 修改议事投票情况
+     * 
+     * @param szxcVoteResult 议事投票情况
+     * @return 结果
+     */
+    public int updateSzxcVoteResult(SzxcVoteResult szxcVoteResult);
+
+    /**
+     * 删除议事投票情况
+     * 
+     * @param id 议事投票情况主键
+     * @return 结果
+     */
+    public int deleteSzxcVoteResultById(Long id);
+
+    /**
+     * 批量删除议事投票情况
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSzxcVoteResultByIds(Long[] ids);
+}

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

@@ -7,7 +7,7 @@ import com.ruoyi.szxc.domain.SzxcWorkGuide;
  * 办事指南Mapper接口
  * 
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-20
  */
 public interface SzxcWorkGuideMapper 
 {

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

@@ -7,7 +7,7 @@ import com.ruoyi.szxc.domain.SzxcWorkRecard;
  * 工作记录Mapper接口
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-20
  */
 public interface SzxcWorkRecardMapper 
 {

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-16
+ * @date 2024-03-20
  */
 public interface SzxcXcRecardMapper 
 {

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

@@ -0,0 +1,62 @@
+package com.ruoyi.szxc.service;
+
+import com.ruoyi.szxc.domain.SzxcButie;
+
+import java.util.List;
+
+/**
+ * 补贴管理Service接口
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public interface ISzxcButieService 
+{
+    /**
+     * 查询补贴管理
+     * 
+     * @param id 补贴管理主键
+     * @return 补贴管理
+     */
+    public SzxcButie selectSzxcButieById(Long id);
+
+    /**
+     * 查询补贴管理列表
+     * 
+     * @param szxcButie 补贴管理
+     * @return 补贴管理集合
+     */
+    public List<SzxcButie> selectSzxcButieList(SzxcButie szxcButie);
+
+    /**
+     * 新增补贴管理
+     * 
+     * @param szxcButie 补贴管理
+     * @return 结果
+     */
+    public int insertSzxcButie(SzxcButie szxcButie);
+
+    /**
+     * 修改补贴管理
+     * 
+     * @param szxcButie 补贴管理
+     * @return 结果
+     */
+    public int updateSzxcButie(SzxcButie szxcButie);
+
+    /**
+     * 批量删除补贴管理
+     * 
+     * @param ids 需要删除的补贴管理主键集合
+     * @return 结果
+     */
+    public int deleteSzxcButieByIds(Long[] ids);
+
+    /**
+     * 删除补贴管理信息
+     * 
+     * @param id 补贴管理主键
+     * @return 结果
+     */
+    public int deleteSzxcButieById(Long id);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.service;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcDiscussCentre;
+
+/**
+ * 议事中心Service接口
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public interface ISzxcDiscussCentreService 
+{
+    /**
+     * 查询议事中心
+     * 
+     * @param id 议事中心主键
+     * @return 议事中心
+     */
+    public SzxcDiscussCentre selectSzxcDiscussCentreById(Long id);
+
+    /**
+     * 查询议事中心列表
+     * 
+     * @param szxcDiscussCentre 议事中心
+     * @return 议事中心集合
+     */
+    public List<SzxcDiscussCentre> selectSzxcDiscussCentreList(SzxcDiscussCentre szxcDiscussCentre);
+
+    /**
+     * 新增议事中心
+     * 
+     * @param szxcDiscussCentre 议事中心
+     * @return 结果
+     */
+    public int insertSzxcDiscussCentre(SzxcDiscussCentre szxcDiscussCentre);
+
+    /**
+     * 修改议事中心
+     * 
+     * @param szxcDiscussCentre 议事中心
+     * @return 结果
+     */
+    public int updateSzxcDiscussCentre(SzxcDiscussCentre szxcDiscussCentre);
+
+    /**
+     * 批量删除议事中心
+     * 
+     * @param ids 需要删除的议事中心主键集合
+     * @return 结果
+     */
+    public int deleteSzxcDiscussCentreByIds(Long[] ids);
+
+    /**
+     * 删除议事中心信息
+     * 
+     * @param id 议事中心主键
+     * @return 结果
+     */
+    public int deleteSzxcDiscussCentreById(Long id);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.service;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcGyApply;
+
+/**
+ * 公益报名情况Service接口
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public interface ISzxcGyApplyService 
+{
+    /**
+     * 查询公益报名情况
+     * 
+     * @param id 公益报名情况主键
+     * @return 公益报名情况
+     */
+    public SzxcGyApply selectSzxcGyApplyById(Long id);
+
+    /**
+     * 查询公益报名情况列表
+     * 
+     * @param szxcGyApply 公益报名情况
+     * @return 公益报名情况集合
+     */
+    public List<SzxcGyApply> selectSzxcGyApplyList(SzxcGyApply szxcGyApply);
+
+    /**
+     * 新增公益报名情况
+     * 
+     * @param szxcGyApply 公益报名情况
+     * @return 结果
+     */
+    public int insertSzxcGyApply(SzxcGyApply szxcGyApply);
+
+    /**
+     * 修改公益报名情况
+     * 
+     * @param szxcGyApply 公益报名情况
+     * @return 结果
+     */
+    public int updateSzxcGyApply(SzxcGyApply szxcGyApply);
+
+    /**
+     * 批量删除公益报名情况
+     * 
+     * @param ids 需要删除的公益报名情况主键集合
+     * @return 结果
+     */
+    public int deleteSzxcGyApplyByIds(Long[] ids);
+
+    /**
+     * 删除公益报名情况信息
+     * 
+     * @param id 公益报名情况主键
+     * @return 结果
+     */
+    public int deleteSzxcGyApplyById(Long id);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.service;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcHelp;
+
+/**
+ * 帮办事Service接口
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public interface ISzxcHelpService 
+{
+    /**
+     * 查询帮办事
+     * 
+     * @param id 帮办事主键
+     * @return 帮办事
+     */
+    public SzxcHelp selectSzxcHelpById(Long id);
+
+    /**
+     * 查询帮办事列表
+     * 
+     * @param szxcHelp 帮办事
+     * @return 帮办事集合
+     */
+    public List<SzxcHelp> selectSzxcHelpList(SzxcHelp szxcHelp);
+
+    /**
+     * 新增帮办事
+     * 
+     * @param szxcHelp 帮办事
+     * @return 结果
+     */
+    public int insertSzxcHelp(SzxcHelp szxcHelp);
+
+    /**
+     * 修改帮办事
+     * 
+     * @param szxcHelp 帮办事
+     * @return 结果
+     */
+    public int updateSzxcHelp(SzxcHelp szxcHelp);
+
+    /**
+     * 批量删除帮办事
+     * 
+     * @param ids 需要删除的帮办事主键集合
+     * @return 结果
+     */
+    public int deleteSzxcHelpByIds(Long[] ids);
+
+    /**
+     * 删除帮办事信息
+     * 
+     * @param id 帮办事主键
+     * @return 结果
+     */
+    public int deleteSzxcHelpById(Long id);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.service;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcOffRecard;
+
+/**
+ * 注销登记记录Service接口
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public interface ISzxcOffRecardService 
+{
+    /**
+     * 查询注销登记记录
+     * 
+     * @param id 注销登记记录主键
+     * @return 注销登记记录
+     */
+    public SzxcOffRecard selectSzxcOffRecardById(Long id);
+
+    /**
+     * 查询注销登记记录列表
+     * 
+     * @param szxcOffRecard 注销登记记录
+     * @return 注销登记记录集合
+     */
+    public List<SzxcOffRecard> selectSzxcOffRecardList(SzxcOffRecard szxcOffRecard);
+
+    /**
+     * 新增注销登记记录
+     * 
+     * @param szxcOffRecard 注销登记记录
+     * @return 结果
+     */
+    public int insertSzxcOffRecard(SzxcOffRecard szxcOffRecard);
+
+    /**
+     * 修改注销登记记录
+     * 
+     * @param szxcOffRecard 注销登记记录
+     * @return 结果
+     */
+    public int updateSzxcOffRecard(SzxcOffRecard szxcOffRecard);
+
+    /**
+     * 批量删除注销登记记录
+     * 
+     * @param ids 需要删除的注销登记记录主键集合
+     * @return 结果
+     */
+    public int deleteSzxcOffRecardByIds(Long[] ids);
+
+    /**
+     * 删除注销登记记录信息
+     * 
+     * @param id 注销登记记录主键
+     * @return 结果
+     */
+    public int deleteSzxcOffRecardById(Long id);
+}

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

@@ -7,7 +7,7 @@ import com.ruoyi.szxc.domain.SzxcPublicActivily;
  * 公益活动Service接口
  * 
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-20
  */
 public interface ISzxcPublicActivilyService 
 {

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

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.service;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcSbzl;
+
+/**
+ * 上报资料Service接口
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public interface ISzxcSbzlService 
+{
+    /**
+     * 查询上报资料
+     * 
+     * @param id 上报资料主键
+     * @return 上报资料
+     */
+    public SzxcSbzl selectSzxcSbzlById(Long id);
+
+    /**
+     * 查询上报资料列表
+     * 
+     * @param szxcSbzl 上报资料
+     * @return 上报资料集合
+     */
+    public List<SzxcSbzl> selectSzxcSbzlList(SzxcSbzl szxcSbzl);
+
+    /**
+     * 新增上报资料
+     * 
+     * @param szxcSbzl 上报资料
+     * @return 结果
+     */
+    public int insertSzxcSbzl(SzxcSbzl szxcSbzl);
+
+    /**
+     * 修改上报资料
+     * 
+     * @param szxcSbzl 上报资料
+     * @return 结果
+     */
+    public int updateSzxcSbzl(SzxcSbzl szxcSbzl);
+
+    /**
+     * 批量删除上报资料
+     * 
+     * @param ids 需要删除的上报资料主键集合
+     * @return 结果
+     */
+    public int deleteSzxcSbzlByIds(Long[] ids);
+
+    /**
+     * 删除上报资料信息
+     * 
+     * @param id 上报资料主键
+     * @return 结果
+     */
+    public int deleteSzxcSbzlById(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-16
+ * @date 2024-03-20
  */
 public interface ISzxcVisitRecardService 
 {

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

@@ -0,0 +1,61 @@
+package com.ruoyi.szxc.service;
+
+import java.util.List;
+import com.ruoyi.szxc.domain.SzxcVoteResult;
+
+/**
+ * 议事投票情况Service接口
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+public interface ISzxcVoteResultService 
+{
+    /**
+     * 查询议事投票情况
+     * 
+     * @param id 议事投票情况主键
+     * @return 议事投票情况
+     */
+    public SzxcVoteResult selectSzxcVoteResultById(Long id);
+
+    /**
+     * 查询议事投票情况列表
+     * 
+     * @param szxcVoteResult 议事投票情况
+     * @return 议事投票情况集合
+     */
+    public List<SzxcVoteResult> selectSzxcVoteResultList(SzxcVoteResult szxcVoteResult);
+
+    /**
+     * 新增议事投票情况
+     * 
+     * @param szxcVoteResult 议事投票情况
+     * @return 结果
+     */
+    public int insertSzxcVoteResult(SzxcVoteResult szxcVoteResult);
+
+    /**
+     * 修改议事投票情况
+     * 
+     * @param szxcVoteResult 议事投票情况
+     * @return 结果
+     */
+    public int updateSzxcVoteResult(SzxcVoteResult szxcVoteResult);
+
+    /**
+     * 批量删除议事投票情况
+     * 
+     * @param ids 需要删除的议事投票情况主键集合
+     * @return 结果
+     */
+    public int deleteSzxcVoteResultByIds(Long[] ids);
+
+    /**
+     * 删除议事投票情况信息
+     * 
+     * @param id 议事投票情况主键
+     * @return 结果
+     */
+    public int deleteSzxcVoteResultById(Long id);
+}

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

@@ -7,7 +7,7 @@ import com.ruoyi.szxc.domain.SzxcWorkGuide;
  * 办事指南Service接口
  * 
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-20
  */
 public interface ISzxcWorkGuideService 
 {

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

@@ -7,7 +7,7 @@ import com.ruoyi.szxc.domain.SzxcWorkRecard;
  * 工作记录Service接口
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-20
  */
 public interface ISzxcWorkRecardService 
 {

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-16
+ * @date 2024-03-20
  */
 public interface ISzxcXcRecardService 
 {

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

@@ -0,0 +1,97 @@
+package com.ruoyi.szxc.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.szxc.domain.SzxcButie;
+import com.ruoyi.szxc.mapper.SzxcButieMapper;
+import com.ruoyi.szxc.service.ISzxcButieService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 补贴管理Service业务层处理
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+@Service
+public class SzxcButieServiceImpl implements ISzxcButieService 
+{
+    @Autowired
+    private SzxcButieMapper szxcButieMapper;
+
+    /**
+     * 查询补贴管理
+     * 
+     * @param id 补贴管理主键
+     * @return 补贴管理
+     */
+    @Override
+    public SzxcButie selectSzxcButieById(Long id)
+    {
+        return szxcButieMapper.selectSzxcButieById(id);
+    }
+
+    /**
+     * 查询补贴管理列表
+     * 
+     * @param szxcButie 补贴管理
+     * @return 补贴管理
+     */
+    @Override
+    public List<SzxcButie> selectSzxcButieList(SzxcButie szxcButie)
+    {
+        return szxcButieMapper.selectSzxcButieList(szxcButie);
+    }
+
+    /**
+     * 新增补贴管理
+     * 
+     * @param szxcButie 补贴管理
+     * @return 结果
+     */
+    @Override
+    public int insertSzxcButie(SzxcButie szxcButie)
+    {
+        szxcButie.setCreateTime(DateUtils.getNowDate());
+        return szxcButieMapper.insertSzxcButie(szxcButie);
+    }
+
+    /**
+     * 修改补贴管理
+     * 
+     * @param szxcButie 补贴管理
+     * @return 结果
+     */
+    @Override
+    public int updateSzxcButie(SzxcButie szxcButie)
+    {
+        szxcButie.setUpdateTime(DateUtils.getNowDate());
+        return szxcButieMapper.updateSzxcButie(szxcButie);
+    }
+
+    /**
+     * 批量删除补贴管理
+     * 
+     * @param ids 需要删除的补贴管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcButieByIds(Long[] ids)
+    {
+        return szxcButieMapper.deleteSzxcButieByIds(ids);
+    }
+
+    /**
+     * 删除补贴管理信息
+     * 
+     * @param id 补贴管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcButieById(Long id)
+    {
+        return szxcButieMapper.deleteSzxcButieById(id);
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcDiscussCentreServiceImpl.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.SzxcDiscussCentreMapper;
+import com.ruoyi.szxc.domain.SzxcDiscussCentre;
+import com.ruoyi.szxc.service.ISzxcDiscussCentreService;
+
+/**
+ * 议事中心Service业务层处理
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+@Service
+public class SzxcDiscussCentreServiceImpl implements ISzxcDiscussCentreService 
+{
+    @Autowired
+    private SzxcDiscussCentreMapper szxcDiscussCentreMapper;
+
+    /**
+     * 查询议事中心
+     * 
+     * @param id 议事中心主键
+     * @return 议事中心
+     */
+    @Override
+    public SzxcDiscussCentre selectSzxcDiscussCentreById(Long id)
+    {
+        return szxcDiscussCentreMapper.selectSzxcDiscussCentreById(id);
+    }
+
+    /**
+     * 查询议事中心列表
+     * 
+     * @param szxcDiscussCentre 议事中心
+     * @return 议事中心
+     */
+    @Override
+    public List<SzxcDiscussCentre> selectSzxcDiscussCentreList(SzxcDiscussCentre szxcDiscussCentre)
+    {
+        return szxcDiscussCentreMapper.selectSzxcDiscussCentreList(szxcDiscussCentre);
+    }
+
+    /**
+     * 新增议事中心
+     * 
+     * @param szxcDiscussCentre 议事中心
+     * @return 结果
+     */
+    @Override
+    public int insertSzxcDiscussCentre(SzxcDiscussCentre szxcDiscussCentre)
+    {
+        szxcDiscussCentre.setCreateTime(DateUtils.getNowDate());
+        return szxcDiscussCentreMapper.insertSzxcDiscussCentre(szxcDiscussCentre);
+    }
+
+    /**
+     * 修改议事中心
+     * 
+     * @param szxcDiscussCentre 议事中心
+     * @return 结果
+     */
+    @Override
+    public int updateSzxcDiscussCentre(SzxcDiscussCentre szxcDiscussCentre)
+    {
+        szxcDiscussCentre.setUpdateTime(DateUtils.getNowDate());
+        return szxcDiscussCentreMapper.updateSzxcDiscussCentre(szxcDiscussCentre);
+    }
+
+    /**
+     * 批量删除议事中心
+     * 
+     * @param ids 需要删除的议事中心主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcDiscussCentreByIds(Long[] ids)
+    {
+        return szxcDiscussCentreMapper.deleteSzxcDiscussCentreByIds(ids);
+    }
+
+    /**
+     * 删除议事中心信息
+     * 
+     * @param id 议事中心主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcDiscussCentreById(Long id)
+    {
+        return szxcDiscussCentreMapper.deleteSzxcDiscussCentreById(id);
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcGyApplyServiceImpl.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.SzxcGyApplyMapper;
+import com.ruoyi.szxc.domain.SzxcGyApply;
+import com.ruoyi.szxc.service.ISzxcGyApplyService;
+
+/**
+ * 公益报名情况Service业务层处理
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+@Service
+public class SzxcGyApplyServiceImpl implements ISzxcGyApplyService 
+{
+    @Autowired
+    private SzxcGyApplyMapper szxcGyApplyMapper;
+
+    /**
+     * 查询公益报名情况
+     * 
+     * @param id 公益报名情况主键
+     * @return 公益报名情况
+     */
+    @Override
+    public SzxcGyApply selectSzxcGyApplyById(Long id)
+    {
+        return szxcGyApplyMapper.selectSzxcGyApplyById(id);
+    }
+
+    /**
+     * 查询公益报名情况列表
+     * 
+     * @param szxcGyApply 公益报名情况
+     * @return 公益报名情况
+     */
+    @Override
+    public List<SzxcGyApply> selectSzxcGyApplyList(SzxcGyApply szxcGyApply)
+    {
+        return szxcGyApplyMapper.selectSzxcGyApplyList(szxcGyApply);
+    }
+
+    /**
+     * 新增公益报名情况
+     * 
+     * @param szxcGyApply 公益报名情况
+     * @return 结果
+     */
+    @Override
+    public int insertSzxcGyApply(SzxcGyApply szxcGyApply)
+    {
+        szxcGyApply.setCreateTime(DateUtils.getNowDate());
+        return szxcGyApplyMapper.insertSzxcGyApply(szxcGyApply);
+    }
+
+    /**
+     * 修改公益报名情况
+     * 
+     * @param szxcGyApply 公益报名情况
+     * @return 结果
+     */
+    @Override
+    public int updateSzxcGyApply(SzxcGyApply szxcGyApply)
+    {
+        szxcGyApply.setUpdateTime(DateUtils.getNowDate());
+        return szxcGyApplyMapper.updateSzxcGyApply(szxcGyApply);
+    }
+
+    /**
+     * 批量删除公益报名情况
+     * 
+     * @param ids 需要删除的公益报名情况主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcGyApplyByIds(Long[] ids)
+    {
+        return szxcGyApplyMapper.deleteSzxcGyApplyByIds(ids);
+    }
+
+    /**
+     * 删除公益报名情况信息
+     * 
+     * @param id 公益报名情况主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcGyApplyById(Long id)
+    {
+        return szxcGyApplyMapper.deleteSzxcGyApplyById(id);
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHelpServiceImpl.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.SzxcHelpMapper;
+import com.ruoyi.szxc.domain.SzxcHelp;
+import com.ruoyi.szxc.service.ISzxcHelpService;
+
+/**
+ * 帮办事Service业务层处理
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+@Service
+public class SzxcHelpServiceImpl implements ISzxcHelpService 
+{
+    @Autowired
+    private SzxcHelpMapper szxcHelpMapper;
+
+    /**
+     * 查询帮办事
+     * 
+     * @param id 帮办事主键
+     * @return 帮办事
+     */
+    @Override
+    public SzxcHelp selectSzxcHelpById(Long id)
+    {
+        return szxcHelpMapper.selectSzxcHelpById(id);
+    }
+
+    /**
+     * 查询帮办事列表
+     * 
+     * @param szxcHelp 帮办事
+     * @return 帮办事
+     */
+    @Override
+    public List<SzxcHelp> selectSzxcHelpList(SzxcHelp szxcHelp)
+    {
+        return szxcHelpMapper.selectSzxcHelpList(szxcHelp);
+    }
+
+    /**
+     * 新增帮办事
+     * 
+     * @param szxcHelp 帮办事
+     * @return 结果
+     */
+    @Override
+    public int insertSzxcHelp(SzxcHelp szxcHelp)
+    {
+        szxcHelp.setCreateTime(DateUtils.getNowDate());
+        return szxcHelpMapper.insertSzxcHelp(szxcHelp);
+    }
+
+    /**
+     * 修改帮办事
+     * 
+     * @param szxcHelp 帮办事
+     * @return 结果
+     */
+    @Override
+    public int updateSzxcHelp(SzxcHelp szxcHelp)
+    {
+        szxcHelp.setUpdateTime(DateUtils.getNowDate());
+        return szxcHelpMapper.updateSzxcHelp(szxcHelp);
+    }
+
+    /**
+     * 批量删除帮办事
+     * 
+     * @param ids 需要删除的帮办事主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcHelpByIds(Long[] ids)
+    {
+        return szxcHelpMapper.deleteSzxcHelpByIds(ids);
+    }
+
+    /**
+     * 删除帮办事信息
+     * 
+     * @param id 帮办事主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcHelpById(Long id)
+    {
+        return szxcHelpMapper.deleteSzxcHelpById(id);
+    }
+}

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcOffRecardServiceImpl.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.SzxcOffRecardMapper;
+import com.ruoyi.szxc.domain.SzxcOffRecard;
+import com.ruoyi.szxc.service.ISzxcOffRecardService;
+
+/**
+ * 注销登记记录Service业务层处理
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+@Service
+public class SzxcOffRecardServiceImpl implements ISzxcOffRecardService 
+{
+    @Autowired
+    private SzxcOffRecardMapper szxcOffRecardMapper;
+
+    /**
+     * 查询注销登记记录
+     * 
+     * @param id 注销登记记录主键
+     * @return 注销登记记录
+     */
+    @Override
+    public SzxcOffRecard selectSzxcOffRecardById(Long id)
+    {
+        return szxcOffRecardMapper.selectSzxcOffRecardById(id);
+    }
+
+    /**
+     * 查询注销登记记录列表
+     * 
+     * @param szxcOffRecard 注销登记记录
+     * @return 注销登记记录
+     */
+    @Override
+    public List<SzxcOffRecard> selectSzxcOffRecardList(SzxcOffRecard szxcOffRecard)
+    {
+        return szxcOffRecardMapper.selectSzxcOffRecardList(szxcOffRecard);
+    }
+
+    /**
+     * 新增注销登记记录
+     * 
+     * @param szxcOffRecard 注销登记记录
+     * @return 结果
+     */
+    @Override
+    public int insertSzxcOffRecard(SzxcOffRecard szxcOffRecard)
+    {
+        szxcOffRecard.setCreateTime(DateUtils.getNowDate());
+        return szxcOffRecardMapper.insertSzxcOffRecard(szxcOffRecard);
+    }
+
+    /**
+     * 修改注销登记记录
+     * 
+     * @param szxcOffRecard 注销登记记录
+     * @return 结果
+     */
+    @Override
+    public int updateSzxcOffRecard(SzxcOffRecard szxcOffRecard)
+    {
+        szxcOffRecard.setUpdateTime(DateUtils.getNowDate());
+        return szxcOffRecardMapper.updateSzxcOffRecard(szxcOffRecard);
+    }
+
+    /**
+     * 批量删除注销登记记录
+     * 
+     * @param ids 需要删除的注销登记记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcOffRecardByIds(Long[] ids)
+    {
+        return szxcOffRecardMapper.deleteSzxcOffRecardByIds(ids);
+    }
+
+    /**
+     * 删除注销登记记录信息
+     * 
+     * @param id 注销登记记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcOffRecardById(Long id)
+    {
+        return szxcOffRecardMapper.deleteSzxcOffRecardById(id);
+    }
+}

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

@@ -12,7 +12,7 @@ import com.ruoyi.szxc.service.ISzxcPublicActivilyService;
  * 公益活动Service业务层处理
  * 
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-20
  */
 @Service
 public class SzxcPublicActivilyServiceImpl implements ISzxcPublicActivilyService 

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcSbzlServiceImpl.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.SzxcSbzlMapper;
+import com.ruoyi.szxc.domain.SzxcSbzl;
+import com.ruoyi.szxc.service.ISzxcSbzlService;
+
+/**
+ * 上报资料Service业务层处理
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+@Service
+public class SzxcSbzlServiceImpl implements ISzxcSbzlService 
+{
+    @Autowired
+    private SzxcSbzlMapper szxcSbzlMapper;
+
+    /**
+     * 查询上报资料
+     * 
+     * @param id 上报资料主键
+     * @return 上报资料
+     */
+    @Override
+    public SzxcSbzl selectSzxcSbzlById(Long id)
+    {
+        return szxcSbzlMapper.selectSzxcSbzlById(id);
+    }
+
+    /**
+     * 查询上报资料列表
+     * 
+     * @param szxcSbzl 上报资料
+     * @return 上报资料
+     */
+    @Override
+    public List<SzxcSbzl> selectSzxcSbzlList(SzxcSbzl szxcSbzl)
+    {
+        return szxcSbzlMapper.selectSzxcSbzlList(szxcSbzl);
+    }
+
+    /**
+     * 新增上报资料
+     * 
+     * @param szxcSbzl 上报资料
+     * @return 结果
+     */
+    @Override
+    public int insertSzxcSbzl(SzxcSbzl szxcSbzl)
+    {
+        szxcSbzl.setCreateTime(DateUtils.getNowDate());
+        return szxcSbzlMapper.insertSzxcSbzl(szxcSbzl);
+    }
+
+    /**
+     * 修改上报资料
+     * 
+     * @param szxcSbzl 上报资料
+     * @return 结果
+     */
+    @Override
+    public int updateSzxcSbzl(SzxcSbzl szxcSbzl)
+    {
+        szxcSbzl.setUpdateTime(DateUtils.getNowDate());
+        return szxcSbzlMapper.updateSzxcSbzl(szxcSbzl);
+    }
+
+    /**
+     * 批量删除上报资料
+     * 
+     * @param ids 需要删除的上报资料主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcSbzlByIds(Long[] ids)
+    {
+        return szxcSbzlMapper.deleteSzxcSbzlByIds(ids);
+    }
+
+    /**
+     * 删除上报资料信息
+     * 
+     * @param id 上报资料主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcSbzlById(Long id)
+    {
+        return szxcSbzlMapper.deleteSzxcSbzlById(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-16
+ * @date 2024-03-20
  */
 @Service
 public class SzxcVisitRecardServiceImpl implements ISzxcVisitRecardService 

ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVoteResultServiceImpl.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.SzxcVoteResultMapper;
+import com.ruoyi.szxc.domain.SzxcVoteResult;
+import com.ruoyi.szxc.service.ISzxcVoteResultService;
+
+/**
+ * 议事投票情况Service业务层处理
+ * 
+ * @author hs
+ * @date 2024-03-20
+ */
+@Service
+public class SzxcVoteResultServiceImpl implements ISzxcVoteResultService 
+{
+    @Autowired
+    private SzxcVoteResultMapper szxcVoteResultMapper;
+
+    /**
+     * 查询议事投票情况
+     * 
+     * @param id 议事投票情况主键
+     * @return 议事投票情况
+     */
+    @Override
+    public SzxcVoteResult selectSzxcVoteResultById(Long id)
+    {
+        return szxcVoteResultMapper.selectSzxcVoteResultById(id);
+    }
+
+    /**
+     * 查询议事投票情况列表
+     * 
+     * @param szxcVoteResult 议事投票情况
+     * @return 议事投票情况
+     */
+    @Override
+    public List<SzxcVoteResult> selectSzxcVoteResultList(SzxcVoteResult szxcVoteResult)
+    {
+        return szxcVoteResultMapper.selectSzxcVoteResultList(szxcVoteResult);
+    }
+
+    /**
+     * 新增议事投票情况
+     * 
+     * @param szxcVoteResult 议事投票情况
+     * @return 结果
+     */
+    @Override
+    public int insertSzxcVoteResult(SzxcVoteResult szxcVoteResult)
+    {
+        szxcVoteResult.setCreateTime(DateUtils.getNowDate());
+        return szxcVoteResultMapper.insertSzxcVoteResult(szxcVoteResult);
+    }
+
+    /**
+     * 修改议事投票情况
+     * 
+     * @param szxcVoteResult 议事投票情况
+     * @return 结果
+     */
+    @Override
+    public int updateSzxcVoteResult(SzxcVoteResult szxcVoteResult)
+    {
+        szxcVoteResult.setUpdateTime(DateUtils.getNowDate());
+        return szxcVoteResultMapper.updateSzxcVoteResult(szxcVoteResult);
+    }
+
+    /**
+     * 批量删除议事投票情况
+     * 
+     * @param ids 需要删除的议事投票情况主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcVoteResultByIds(Long[] ids)
+    {
+        return szxcVoteResultMapper.deleteSzxcVoteResultByIds(ids);
+    }
+
+    /**
+     * 删除议事投票情况信息
+     * 
+     * @param id 议事投票情况主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSzxcVoteResultById(Long id)
+    {
+        return szxcVoteResultMapper.deleteSzxcVoteResultById(id);
+    }
+}

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

@@ -12,7 +12,7 @@ import com.ruoyi.szxc.service.ISzxcWorkGuideService;
  * 办事指南Service业务层处理
  * 
  * @author hs
- * @date 2024-03-16
+ * @date 2024-03-20
  */
 @Service
 public class SzxcWorkGuideServiceImpl implements ISzxcWorkGuideService 

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

@@ -12,7 +12,7 @@ import com.ruoyi.szxc.service.ISzxcWorkRecardService;
  * 工作记录Service业务层处理
  * 
  * @author hs
- * @date 2024-03-15
+ * @date 2024-03-20
  */
 @Service
 public class SzxcWorkRecardServiceImpl implements ISzxcWorkRecardService 

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-16
+ * @date 2024-03-20
  */
 @Service
 public class SzxcXcRecardServiceImpl implements ISzxcXcRecardService 

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.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.SzxcButieMapper">
+    
+    <resultMap type="SzxcButie" id="SzxcButieResult">
+        <result property="id"    column="id"    />
+        <result property="type"    column="type"    />
+        <result property="xmTitle"    column="xm_title"    />
+        <result property="xmId"    column="xm_id"    />
+        <result property="year"    column="year"    />
+        <result property="money"    column="money"    />
+        <result property="jmId"    column="jm_id"    />
+        <result property="name"    column="name"    />
+        <result property="content"    column="content"    />
+        <result property="zfStatus"    column="zf_status"    />
+        <result property="shRemark"    column="sh_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"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="userId"    column="user_id"    />
+    </resultMap>
+
+    <sql id="selectSzxcButieVo">
+        select id, type, xm_title, xm_id, year, money, jm_id, name, content, zf_status, sh_remark, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_butie
+    </sql>
+
+    <select id="selectSzxcButieList" parameterType="SzxcButie" resultMap="SzxcButieResult">
+        <include refid="selectSzxcButieVo"/>
+        <where>  
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="xmTitle != null  and xmTitle != ''"> and xm_title = #{xmTitle}</if>
+            <if test="xmId != null "> and xm_id = #{xmId}</if>
+            <if test="year != null  and year != ''"> and year = #{year}</if>
+            <if test="money != null  and money != ''"> and money = #{money}</if>
+            <if test="jmId != null "> and jm_id = #{jmId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="zfStatus != null  and zfStatus != ''"> and zf_status = #{zfStatus}</if>
+            <if test="shRemark != null  and shRemark != ''"> and sh_remark = #{shRemark}</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="selectSzxcButieById" parameterType="Long" resultMap="SzxcButieResult">
+        <include refid="selectSzxcButieVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSzxcButie" parameterType="SzxcButie" useGeneratedKeys="true" keyProperty="id">
+        insert into szxc_butie
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="type != null">type,</if>
+            <if test="xmTitle != null">xm_title,</if>
+            <if test="xmId != null">xm_id,</if>
+            <if test="year != null">year,</if>
+            <if test="money != null">money,</if>
+            <if test="jmId != null">jm_id,</if>
+            <if test="name != null">name,</if>
+            <if test="content != null">content,</if>
+            <if test="zfStatus != null">zf_status,</if>
+            <if test="shRemark != null">sh_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>
+            <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="type != null">#{type},</if>
+            <if test="xmTitle != null">#{xmTitle},</if>
+            <if test="xmId != null">#{xmId},</if>
+            <if test="year != null">#{year},</if>
+            <if test="money != null">#{money},</if>
+            <if test="jmId != null">#{jmId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="content != null">#{content},</if>
+            <if test="zfStatus != null">#{zfStatus},</if>
+            <if test="shRemark != null">#{shRemark},</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="updateSzxcButie" parameterType="SzxcButie">
+        update szxc_butie
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="type != null">type = #{type},</if>
+            <if test="xmTitle != null">xm_title = #{xmTitle},</if>
+            <if test="xmId != null">xm_id = #{xmId},</if>
+            <if test="year != null">year = #{year},</if>
+            <if test="money != null">money = #{money},</if>
+            <if test="jmId != null">jm_id = #{jmId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="zfStatus != null">zf_status = #{zfStatus},</if>
+            <if test="shRemark != null">sh_remark = #{shRemark},</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="deleteSzxcButieById" parameterType="Long">
+        delete from szxc_butie where id = #{id}
+    </delete>
+
+    <delete id="deleteSzxcButieByIds" parameterType="String">
+        delete from szxc_butie where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,117 @@
+<?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.SzxcDiscussCentreMapper">
+    
+    <resultMap type="SzxcDiscussCentre" id="SzxcDiscussCentreResult">
+        <result property="id"    column="id"    />
+        <result property="title"    column="title"    />
+        <result property="content"    column="content"    />
+        <result property="channel"    column="channel"    />
+        <result property="startDate"    column="start_date"    />
+        <result property="endDate"    column="end_date"    />
+        <result property="status"    column="status"    />
+        <result property="picture"    column="picture"    />
+        <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="userId"    column="user_id"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+    </resultMap>
+
+    <sql id="selectSzxcDiscussCentreVo">
+        select id, title, content, channel, start_date, end_date, status, picture, create_by, create_time, update_by, update_time, user_id, dept_id, dept_name from szxc_discuss_centre
+    </sql>
+
+    <select id="selectSzxcDiscussCentreList" parameterType="SzxcDiscussCentre" resultMap="SzxcDiscussCentreResult">
+        <include refid="selectSzxcDiscussCentreVo"/>
+        <where>  
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="channel != null  and channel != ''"> and channel = #{channel}</if>
+            <if test="startDate != null "> and start_date = #{startDate}</if>
+            <if test="endDate != null "> and end_date = #{endDate}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="picture != null  and picture != ''"> and picture = #{picture}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectSzxcDiscussCentreById" parameterType="Long" resultMap="SzxcDiscussCentreResult">
+        <include refid="selectSzxcDiscussCentreVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSzxcDiscussCentre" parameterType="SzxcDiscussCentre" useGeneratedKeys="true" keyProperty="id">
+        insert into szxc_discuss_centre
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="title != null">title,</if>
+            <if test="content != null">content,</if>
+            <if test="channel != null">channel,</if>
+            <if test="startDate != null">start_date,</if>
+            <if test="endDate != null">end_date,</if>
+            <if test="status != null">status,</if>
+            <if test="picture != null">picture,</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="userId != null">user_id,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null">dept_name,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="title != null">#{title},</if>
+            <if test="content != null">#{content},</if>
+            <if test="channel != null">#{channel},</if>
+            <if test="startDate != null">#{startDate},</if>
+            <if test="endDate != null">#{endDate},</if>
+            <if test="status != null">#{status},</if>
+            <if test="picture != null">#{picture},</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="userId != null">#{userId},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null">#{deptName},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSzxcDiscussCentre" parameterType="SzxcDiscussCentre">
+        update szxc_discuss_centre
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null">title = #{title},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="channel != null">channel = #{channel},</if>
+            <if test="startDate != null">start_date = #{startDate},</if>
+            <if test="endDate != null">end_date = #{endDate},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="picture != null">picture = #{picture},</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="userId != null">user_id = #{userId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="deptName != null">dept_name = #{deptName},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSzxcDiscussCentreById" parameterType="Long">
+        delete from szxc_discuss_centre where id = #{id}
+    </delete>
+
+    <delete id="deleteSzxcDiscussCentreByIds" parameterType="String">
+        delete from szxc_discuss_centre where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,92 @@
+<?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.SzxcGyApplyMapper">
+    
+    <resultMap type="SzxcGyApply" id="SzxcGyApplyResult">
+        <result property="id"    column="id"    />
+        <result property="jmId"    column="jm_id"    />
+        <result property="gyId"    column="gy_id"    />
+        <result property="cardId"    column="card_id"    />
+        <result property="name"    column="name"    />
+        <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="userId"    column="user_id"    />
+    </resultMap>
+
+    <sql id="selectSzxcGyApplyVo">
+        select id, jm_id, gy_id, card_id, name, create_by, create_time, update_by, update_time, user_id from szxc_gy_apply
+    </sql>
+
+    <select id="selectSzxcGyApplyList" parameterType="SzxcGyApply" resultMap="SzxcGyApplyResult">
+        <include refid="selectSzxcGyApplyVo"/>
+        <where>  
+            <if test="jmId != null "> and jm_id = #{jmId}</if>
+            <if test="gyId != null "> and gy_id = #{gyId}</if>
+            <if test="cardId != null  and cardId != ''"> and card_id = #{cardId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSzxcGyApplyById" parameterType="Long" resultMap="SzxcGyApplyResult">
+        <include refid="selectSzxcGyApplyVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSzxcGyApply" parameterType="SzxcGyApply" useGeneratedKeys="true" keyProperty="id">
+        insert into szxc_gy_apply
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jmId != null">jm_id,</if>
+            <if test="gyId != null">gy_id,</if>
+            <if test="cardId != null">card_id,</if>
+            <if test="name != null and name != ''">name,</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="userId != null">user_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jmId != null">#{jmId},</if>
+            <if test="gyId != null">#{gyId},</if>
+            <if test="cardId != null">#{cardId},</if>
+            <if test="name != null and name != ''">#{name},</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="userId != null">#{userId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSzxcGyApply" parameterType="SzxcGyApply">
+        update szxc_gy_apply
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jmId != null">jm_id = #{jmId},</if>
+            <if test="gyId != null">gy_id = #{gyId},</if>
+            <if test="cardId != null">card_id = #{cardId},</if>
+            <if test="name != null and name != ''">name = #{name},</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="userId != null">user_id = #{userId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSzxcGyApplyById" parameterType="Long">
+        delete from szxc_gy_apply where id = #{id}
+    </delete>
+
+    <delete id="deleteSzxcGyApplyByIds" parameterType="String">
+        delete from szxc_gy_apply where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,121 @@
+<?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.SzxcHelpMapper">
+    
+    <resultMap type="SzxcHelp" id="SzxcHelpResult">
+        <result property="id"    column="id"    />
+        <result property="subName"    column="sub_name"    />
+        <result property="subDate"    column="sub_date"    />
+        <result property="phone"    column="phone"    />
+        <result property="sbType"    column="sb_type"    />
+        <result property="title"    column="title"    />
+        <result property="content"    column="content"    />
+        <result property="helpStatus"    column="help_status"    />
+        <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"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="userId"    column="user_id"    />
+    </resultMap>
+
+    <sql id="selectSzxcHelpVo">
+        select id, sub_name, sub_date, phone, sb_type, title, content, help_status, remark, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_help
+    </sql>
+
+    <select id="selectSzxcHelpList" parameterType="SzxcHelp" resultMap="SzxcHelpResult">
+        <include refid="selectSzxcHelpVo"/>
+        <where>  
+            <if test="subName != null  and subName != ''"> and sub_name like concat('%', #{subName}, '%')</if>
+            <if test="subDate != null "> and sub_date = #{subDate}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="sbType != null  and sbType != ''"> and sb_type = #{sbType}</if>
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="helpStatus != null  and helpStatus != ''"> and help_status = #{helpStatus}</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="selectSzxcHelpById" parameterType="Long" resultMap="SzxcHelpResult">
+        <include refid="selectSzxcHelpVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSzxcHelp" parameterType="SzxcHelp" useGeneratedKeys="true" keyProperty="id">
+        insert into szxc_help
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="subName != null and subName != ''">sub_name,</if>
+            <if test="subDate != null">sub_date,</if>
+            <if test="phone != null">phone,</if>
+            <if test="sbType != null">sb_type,</if>
+            <if test="title != null and title != ''">title,</if>
+            <if test="content != null">content,</if>
+            <if test="helpStatus != null">help_status,</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>
+            <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="subName != null and subName != ''">#{subName},</if>
+            <if test="subDate != null">#{subDate},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="sbType != null">#{sbType},</if>
+            <if test="title != null and title != ''">#{title},</if>
+            <if test="content != null">#{content},</if>
+            <if test="helpStatus != null">#{helpStatus},</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>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null">#{deptName},</if>
+            <if test="userId != null">#{userId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSzxcHelp" parameterType="SzxcHelp">
+        update szxc_help
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="subName != null and subName != ''">sub_name = #{subName},</if>
+            <if test="subDate != null">sub_date = #{subDate},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="sbType != null">sb_type = #{sbType},</if>
+            <if test="title != null and title != ''">title = #{title},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="helpStatus != null">help_status = #{helpStatus},</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>
+            <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="deleteSzxcHelpById" parameterType="Long">
+        delete from szxc_help where id = #{id}
+    </delete>
+
+    <delete id="deleteSzxcHelpByIds" parameterType="String">
+        delete from szxc_help where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -1,9 +1,9 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.szxc.mapper.SzxcJmInfoMapper">
-    
+
     <resultMap type="SzxcJmInfo" id="SzxcJmInfoResult">
         <result property="id"    column="id"    />
         <result property="deptId"    column="dept_id"    />
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="jkzk"    column="jkzk"    />
         <result property="ills"    column="ills"    />
         <result property="head"    column="head"    />
-        <result property="sameHeadIds"    column="same_head_ids"    />
+        <result property="acountNo"    column="acount_no"    />
         <result property="off"    column="off"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -40,16 +40,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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, 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
+        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, acount_no, off, create_by, create_time, update_by, update_time, user_id from szxc_jm_info
     </sql>
 
     <select id="selectSzxcJmInfoList" parameterType="SzxcJmInfo" resultMap="SzxcJmInfoResult">
-        <include refid="selectSzxcJmInfoVo"/>  j
-        <where>  
-           <!-- <if test="deptId != null "> and dept_id = #{deptId}</if>-->
-            <if test="deptId != null and deptId != 0">
-                AND (d.dept_id = #{deptId} OR d.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
-            </if>
+        <include refid="selectSzxcJmInfoVo"/>
+        <where>
+            <!--<if test="deptId != null "> and dept_id = #{deptId}</if>-->
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="oldName != null  and oldName != ''"> and old_name like concat('%', #{oldName}, '%')</if>
@@ -73,21 +70,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="acountNo != null "> and acount_no = #{acountNo}</if>
             <if test="off != null  and off != ''"> and off = #{off}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
+            <!-- <if test="deptId != null "> and dept_id = #{deptId}</if>-->
+            <if test="deptId != null and deptId != 0">
+                AND (d.dept_id = #{deptId} OR d.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
+            </if>
             <!-- 数据范围过滤 -->
             <if test="params.dataScope != null and params.dataScope !=''">
                 ${params.dataScope}
             </if>
         </where>
     </select>
-    
+
     <select id="selectSzxcJmInfoById" parameterType="Long" resultMap="SzxcJmInfoResult">
         <include refid="selectSzxcJmInfoVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertSzxcJmInfo" parameterType="SzxcJmInfo" useGeneratedKeys="true" keyProperty="id">
         insert into szxc_jm_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -115,14 +116,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="acountNo != null">acount_no,</if>
             <if test="off != null and off != ''">off,</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="userId != null">user_id,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deptId != null">#{deptId},</if>
             <if test="deptName != null">#{deptName},</if>
@@ -148,14 +149,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="acountNo != null">#{acountNo},</if>
             <if test="off != null and off != ''">#{off},</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="userId != null">#{userId},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateSzxcJmInfo" parameterType="SzxcJmInfo">
@@ -185,7 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="acountNo != null">acount_no = #{acountNo},</if>
             <if test="off != null and off != ''">off = #{off},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -201,7 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteSzxcJmInfoByIds" parameterType="String">
-        delete from szxc_jm_info where id in 
+        delete from szxc_jm_info where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

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

@@ -0,0 +1,96 @@
+<?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.SzxcOffRecardMapper">
+    
+    <resultMap type="SzxcOffRecard" id="SzxcOffRecardResult">
+        <result property="id"    column="id"    />
+        <result property="jmId"    column="jm_id"    />
+        <result property="name"    column="name"    />
+        <result property="cardId"    column="card_id"    />
+        <result property="reason"    column="reason"    />
+        <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"    />
+        <result property="userId"    column="user_id"    />
+    </resultMap>
+
+    <sql id="selectSzxcOffRecardVo">
+        select id, jm_id, name, card_id, reason, remark, create_by, create_time, update_by, update_time, user_id from szxc_off_recard
+    </sql>
+
+    <select id="selectSzxcOffRecardList" parameterType="SzxcOffRecard" resultMap="SzxcOffRecardResult">
+        <include refid="selectSzxcOffRecardVo"/>
+        <where>  
+            <if test="jmId != null "> and jm_id = #{jmId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="cardId != null  and cardId != ''"> and card_id = #{cardId}</if>
+            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSzxcOffRecardById" parameterType="Long" resultMap="SzxcOffRecardResult">
+        <include refid="selectSzxcOffRecardVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSzxcOffRecard" parameterType="SzxcOffRecard" useGeneratedKeys="true" keyProperty="id">
+        insert into szxc_off_recard
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jmId != null">jm_id,</if>
+            <if test="name != null">name,</if>
+            <if test="cardId != null">card_id,</if>
+            <if test="reason != null">reason,</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>
+            <if test="userId != null">user_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jmId != null">#{jmId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="cardId != null">#{cardId},</if>
+            <if test="reason != null">#{reason},</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>
+            <if test="userId != null">#{userId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSzxcOffRecard" parameterType="SzxcOffRecard">
+        update szxc_off_recard
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jmId != null">jm_id = #{jmId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="cardId != null">card_id = #{cardId},</if>
+            <if test="reason != null">reason = #{reason},</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>
+            <if test="userId != null">user_id = #{userId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSzxcOffRecardById" parameterType="Long">
+        delete from szxc_off_recard where id = #{id}
+    </delete>
+
+    <delete id="deleteSzxcOffRecardByIds" parameterType="String">
+        delete from szxc_off_recard where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -9,13 +9,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="status"    column="status"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
@@ -25,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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
+        select id, title, leader, phone, content, start_time, end_time, create_by, remark, status, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_public_activily
     </sql>
 
     <select id="selectSzxcPublicActivilyList" parameterType="SzxcPublicActivily" resultMap="SzxcPublicActivilyResult">
@@ -34,11 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="status != null  and status != ''"> and status = #{status}</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>
@@ -56,13 +54,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="status != null">status,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
@@ -74,13 +71,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="status != null">#{status},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
@@ -96,13 +92,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="status != null">status = #{status},</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>

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

@@ -0,0 +1,107 @@
+<?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.SzxcSbzlMapper">
+    
+    <resultMap type="SzxcSbzl" id="SzxcSbzlResult">
+        <result property="id"    column="id"    />
+        <result property="subName"    column="sub_name"    />
+        <result property="subDate"    column="sub_date"    />
+        <result property="subType"    column="sub_type"    />
+        <result property="title"    column="title"    />
+        <result property="content"    column="content"    />
+        <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="selectSzxcSbzlVo">
+        select id, sub_name, sub_date, sub_type, title, content, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_sbzl
+    </sql>
+
+    <select id="selectSzxcSbzlList" parameterType="SzxcSbzl" resultMap="SzxcSbzlResult">
+        <include refid="selectSzxcSbzlVo"/>
+        <where>  
+            <if test="subName != null  and subName != ''"> and sub_name like concat('%', #{subName}, '%')</if>
+            <if test="subDate != null "> and sub_date = #{subDate}</if>
+            <if test="subType != null  and subType != ''"> and sub_type = #{subType}</if>
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</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="selectSzxcSbzlById" parameterType="Long" resultMap="SzxcSbzlResult">
+        <include refid="selectSzxcSbzlVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSzxcSbzl" parameterType="SzxcSbzl" useGeneratedKeys="true" keyProperty="id">
+        insert into szxc_sbzl
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="subName != null and subName != ''">sub_name,</if>
+            <if test="subDate != null">sub_date,</if>
+            <if test="subType != null">sub_type,</if>
+            <if test="title != null and title != ''">title,</if>
+            <if test="content != null">content,</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="subName != null and subName != ''">#{subName},</if>
+            <if test="subDate != null">#{subDate},</if>
+            <if test="subType != null">#{subType},</if>
+            <if test="title != null and title != ''">#{title},</if>
+            <if test="content != null">#{content},</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="updateSzxcSbzl" parameterType="SzxcSbzl">
+        update szxc_sbzl
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="subName != null and subName != ''">sub_name = #{subName},</if>
+            <if test="subDate != null">sub_date = #{subDate},</if>
+            <if test="subType != null">sub_type = #{subType},</if>
+            <if test="title != null and title != ''">title = #{title},</if>
+            <if test="content != null">content = #{content},</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="deleteSzxcSbzlById" parameterType="Long">
+        delete from szxc_sbzl where id = #{id}
+    </delete>
+
+    <delete id="deleteSzxcSbzlByIds" parameterType="String">
+        delete from szxc_sbzl where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -8,7 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="visiterName"    column="visiter_name"    />
         <result property="submitDate"    column="submit_date"    />
-        <result property="visitDate"    column="visit_date"    />
+        <result property="startDate"    column="start_date"    />
+        <result property="endDate"    column="end_date"    />
         <result property="type"    column="type"    />
         <result property="jmId"    column="jm_id"    />
         <result property="visitObj"    column="visit_obj"    />
@@ -16,6 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="picture"    column="picture"    />
         <result property="content"    column="content"    />
         <result property="flowPeople"    column="flow_people"    />
+        <result property="zfStatus"    column="zf_status"    />
+        <result property="shRemark"    column="sh_remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -26,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSzxcVisitRecardVo">
-        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
+        select id, visiter_name, submit_date, start_date, end_date, type, jm_id, visit_obj, title, picture, content, flow_people, zf_status, sh_remark, 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">
@@ -34,7 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="visiterName != null  and visiterName != ''"> and visiter_name like concat('%', #{visiterName}, '%')</if>
             <if test="submitDate != null "> and submit_date = #{submitDate}</if>
-            <if test="visitDate != null "> and visit_date = #{visitDate}</if>
+            <if test="startDate != null "> and start_date = #{startDate}</if>
+            <if test="endDate != null "> and end_date = #{endDate}</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>
@@ -42,6 +46,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="picture != null  and picture != ''"> and picture = #{picture}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="flowPeople != null  and flowPeople != ''"> and flow_people = #{flowPeople}</if>
+            <if test="zfStatus != null  and zfStatus != ''"> and zf_status = #{zfStatus}</if>
+            <if test="shRemark != null  and shRemark != ''"> and sh_remark = #{shRemark}</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>
@@ -58,14 +64,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="visiterName != null and visiterName != ''">visiter_name,</if>
             <if test="submitDate != null">submit_date,</if>
-            <if test="visitDate != null">visit_date,</if>
+            <if test="startDate != null">start_date,</if>
+            <if test="endDate != null">end_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="title != null">title,</if>
             <if test="picture != null">picture,</if>
             <if test="content != null">content,</if>
             <if test="flowPeople != null">flow_people,</if>
+            <if test="zfStatus != null">zf_status,</if>
+            <if test="shRemark != null">sh_remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -77,14 +86,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="visiterName != null and visiterName != ''">#{visiterName},</if>
             <if test="submitDate != null">#{submitDate},</if>
-            <if test="visitDate != null">#{visitDate},</if>
+            <if test="startDate != null">#{startDate},</if>
+            <if test="endDate != null">#{endDate},</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="title != null">#{title},</if>
             <if test="picture != null">#{picture},</if>
             <if test="content != null">#{content},</if>
             <if test="flowPeople != null">#{flowPeople},</if>
+            <if test="zfStatus != null">#{zfStatus},</if>
+            <if test="shRemark != null">#{shRemark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -100,14 +112,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="visiterName != null and visiterName != ''">visiter_name = #{visiterName},</if>
             <if test="submitDate != null">submit_date = #{submitDate},</if>
-            <if test="visitDate != null">visit_date = #{visitDate},</if>
+            <if test="startDate != null">start_date = #{startDate},</if>
+            <if test="endDate != null">end_date = #{endDate},</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="title != null">title = #{title},</if>
             <if test="picture != null">picture = #{picture},</if>
             <if test="content != null">content = #{content},</if>
             <if test="flowPeople != null">flow_people = #{flowPeople},</if>
+            <if test="zfStatus != null">zf_status = #{zfStatus},</if>
+            <if test="shRemark != null">sh_remark = #{shRemark},</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>

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

@@ -0,0 +1,102 @@
+<?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.SzxcVoteResultMapper">
+    
+    <resultMap type="SzxcVoteResult" id="SzxcVoteResultResult">
+        <result property="id"    column="id"    />
+        <result property="jmId"    column="jm_id"    />
+        <result property="cardId"    column="card_id"    />
+        <result property="voteName"    column="vote_name"    />
+        <result property="ysId"    column="ys_id"    />
+        <result property="vote"    column="vote"    />
+        <result property="opinion"    column="opinion"    />
+        <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="userId"    column="user_id"    />
+    </resultMap>
+
+    <sql id="selectSzxcVoteResultVo">
+        select id, jm_id, card_id, vote_name, ys_id, vote, opinion, create_by, create_time, update_by, update_time, user_id from szxc_vote_result
+    </sql>
+
+    <select id="selectSzxcVoteResultList" parameterType="SzxcVoteResult" resultMap="SzxcVoteResultResult">
+        <include refid="selectSzxcVoteResultVo"/>
+        <where>  
+            <if test="jmId != null "> and jm_id = #{jmId}</if>
+            <if test="cardId != null  and cardId != ''"> and card_id = #{cardId}</if>
+            <if test="voteName != null  and voteName != ''"> and vote_name like concat('%', #{voteName}, '%')</if>
+            <if test="ysId != null "> and ys_id = #{ysId}</if>
+            <if test="vote != null  and vote != ''"> and vote = #{vote}</if>
+            <if test="opinion != null  and opinion != ''"> and opinion = #{opinion}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+        </where>
+    </select>
+    
+    <select id="selectSzxcVoteResultById" parameterType="Long" resultMap="SzxcVoteResultResult">
+        <include refid="selectSzxcVoteResultVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSzxcVoteResult" parameterType="SzxcVoteResult" useGeneratedKeys="true" keyProperty="id">
+        insert into szxc_vote_result
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jmId != null">jm_id,</if>
+            <if test="cardId != null">card_id,</if>
+            <if test="voteName != null and voteName != ''">vote_name,</if>
+            <if test="ysId != null">ys_id,</if>
+            <if test="vote != null">vote,</if>
+            <if test="opinion != null">opinion,</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="userId != null">user_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jmId != null">#{jmId},</if>
+            <if test="cardId != null">#{cardId},</if>
+            <if test="voteName != null and voteName != ''">#{voteName},</if>
+            <if test="ysId != null">#{ysId},</if>
+            <if test="vote != null">#{vote},</if>
+            <if test="opinion != null">#{opinion},</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="userId != null">#{userId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSzxcVoteResult" parameterType="SzxcVoteResult">
+        update szxc_vote_result
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jmId != null">jm_id = #{jmId},</if>
+            <if test="cardId != null">card_id = #{cardId},</if>
+            <if test="voteName != null and voteName != ''">vote_name = #{voteName},</if>
+            <if test="ysId != null">ys_id = #{ysId},</if>
+            <if test="vote != null">vote = #{vote},</if>
+            <if test="opinion != null">opinion = #{opinion},</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="userId != null">user_id = #{userId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSzxcVoteResultById" parameterType="Long">
+        delete from szxc_vote_result where id = #{id}
+    </delete>
+
+    <delete id="deleteSzxcVoteResultByIds" parameterType="String">
+        delete from szxc_vote_result where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -7,11 +7,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="SzxcWorkRecard" id="SzxcWorkRecardResult">
         <result property="id"    column="id"    />
         <result property="workerName"    column="worker_name"    />
-        <result property="workerDate"    column="worker_date"    />
+        <result property="submitDate"    column="submit_date"    />
+        <result property="startDate"    column="start_date"    />
+        <result property="endDate"    column="end_date"    />
         <result property="type"    column="type"    />
         <result property="title"    column="title"    />
         <result property="picture"    column="picture"    />
         <result property="content"    column="content"    />
+        <result property="gzStatus"    column="gz_status"    />
+        <result property="shRemark"    column="sh_remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -22,18 +26,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSzxcWorkRecardVo">
-        select id, worker_name, worker_date, type, title, picture, content, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_work_recard
+        select id, worker_name, submit_date, start_date, end_date, type, title, picture, content, gz_status, sh_remark, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_work_recard
     </sql>
 
     <select id="selectSzxcWorkRecardList" parameterType="SzxcWorkRecard" resultMap="SzxcWorkRecardResult">
         <include refid="selectSzxcWorkRecardVo"/>
         <where>  
             <if test="workerName != null  and workerName != ''"> and worker_name like concat('%', #{workerName}, '%')</if>
-            <if test="workerDate != null "> and worker_date = #{workerDate}</if>
+            <if test="submitDate != null "> and submit_date = #{submitDate}</if>
+            <if test="startDate != null "> and start_date = #{startDate}</if>
+            <if test="endDate != null "> and end_date = #{endDate}</if>
             <if test="type != null  and type != ''"> and type = #{type}</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>
+            <if test="gzStatus != null  and gzStatus != ''"> and gz_status = #{gzStatus}</if>
+            <if test="shRemark != null  and shRemark != ''"> and sh_remark = #{shRemark}</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>
@@ -49,11 +57,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into szxc_work_recard
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="workerName != null and workerName != ''">worker_name,</if>
-            <if test="workerDate != null">worker_date,</if>
+            <if test="submitDate != null">submit_date,</if>
+            <if test="startDate != null">start_date,</if>
+            <if test="endDate != null">end_date,</if>
             <if test="type != null">type,</if>
             <if test="title != null and title != ''">title,</if>
             <if test="picture != null">picture,</if>
             <if test="content != null">content,</if>
+            <if test="gzStatus != null">gz_status,</if>
+            <if test="shRemark != null">sh_remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -64,11 +76,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workerName != null and workerName != ''">#{workerName},</if>
-            <if test="workerDate != null">#{workerDate},</if>
+            <if test="submitDate != null">#{submitDate},</if>
+            <if test="startDate != null">#{startDate},</if>
+            <if test="endDate != null">#{endDate},</if>
             <if test="type != null">#{type},</if>
             <if test="title != null and title != ''">#{title},</if>
             <if test="picture != null">#{picture},</if>
             <if test="content != null">#{content},</if>
+            <if test="gzStatus != null">#{gzStatus},</if>
+            <if test="shRemark != null">#{shRemark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -83,11 +99,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update szxc_work_recard
         <trim prefix="SET" suffixOverrides=",">
             <if test="workerName != null and workerName != ''">worker_name = #{workerName},</if>
-            <if test="workerDate != null">worker_date = #{workerDate},</if>
+            <if test="submitDate != null">submit_date = #{submitDate},</if>
+            <if test="startDate != null">start_date = #{startDate},</if>
+            <if test="endDate != null">end_date = #{endDate},</if>
             <if test="type != null">type = #{type},</if>
             <if test="title != null and title != ''">title = #{title},</if>
             <if test="picture != null">picture = #{picture},</if>
             <if test="content != null">content = #{content},</if>
+            <if test="gzStatus != null">gz_status = #{gzStatus},</if>
+            <if test="shRemark != null">sh_remark = #{shRemark},</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>

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

@@ -17,6 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="content"    column="content"    />
         <result property="flowPeople"    column="flow_people"    />
         <result property="reform"    column="reform"    />
+        <result property="zgProgress"    column="zg_progress"    />
+        <result property="xcStatus"    column="xc_status"    />
+        <result property="shRemark"    column="sh_remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -27,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSzxcXcRecardVo">
-        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
+        select id, xc_name, submit_date, xc_date, type, jm_id, xc_obj, title, picture, content, flow_people, reform, zg_progress, xc_status, sh_remark, 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">
@@ -44,6 +47,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="flowPeople != null  and flowPeople != ''"> and flow_people = #{flowPeople}</if>
             <if test="reform != null  and reform != ''"> and reform = #{reform}</if>
+            <if test="zgProgress != null  and zgProgress != ''"> and zg_progress = #{zgProgress}</if>
+            <if test="xcStatus != null  and xcStatus != ''"> and xc_status = #{xcStatus}</if>
+            <if test="shRemark != null  and shRemark != ''"> and sh_remark = #{shRemark}</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>
@@ -61,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xcName != null and xcName != ''">xc_name,</if>
             <if test="submitDate != null">submit_date,</if>
             <if test="xcDate != null">xc_date,</if>
-            <if test="type != null and type != ''">type,</if>
+            <if test="type != null">type,</if>
             <if test="jmId != null">jm_id,</if>
             <if test="xcObj != null">xc_obj,</if>
             <if test="title != null and title != ''">title,</if>
@@ -69,6 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null">content,</if>
             <if test="flowPeople != null">flow_people,</if>
             <if test="reform != null">reform,</if>
+            <if test="zgProgress != null">zg_progress,</if>
+            <if test="xcStatus != null">xc_status,</if>
+            <if test="shRemark != null">sh_remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -81,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xcName != null and xcName != ''">#{xcName},</if>
             <if test="submitDate != null">#{submitDate},</if>
             <if test="xcDate != null">#{xcDate},</if>
-            <if test="type != null and type != ''">#{type},</if>
+            <if test="type != null">#{type},</if>
             <if test="jmId != null">#{jmId},</if>
             <if test="xcObj != null">#{xcObj},</if>
             <if test="title != null and title != ''">#{title},</if>
@@ -89,6 +98,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null">#{content},</if>
             <if test="flowPeople != null">#{flowPeople},</if>
             <if test="reform != null">#{reform},</if>
+            <if test="zgProgress != null">#{zgProgress},</if>
+            <if test="xcStatus != null">#{xcStatus},</if>
+            <if test="shRemark != null">#{shRemark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -105,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xcName != null and xcName != ''">xc_name = #{xcName},</if>
             <if test="submitDate != null">submit_date = #{submitDate},</if>
             <if test="xcDate != null">xc_date = #{xcDate},</if>
-            <if test="type != null and type != ''">type = #{type},</if>
+            <if test="type != null">type = #{type},</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>
@@ -113,6 +125,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null">content = #{content},</if>
             <if test="flowPeople != null">flow_people = #{flowPeople},</if>
             <if test="reform != null">reform = #{reform},</if>
+            <if test="zgProgress != null">zg_progress = #{zgProgress},</if>
+            <if test="xcStatus != null">xc_status = #{xcStatus},</if>
+            <if test="shRemark != null">sh_remark = #{shRemark},</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>

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询公益报名情况列表
+export function listApply(query) {
+  return request({
+    url: '/szxc/apply/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询公益报名情况详细
+export function getApply(id) {
+  return request({
+    url: '/szxc/apply/' + id,
+    method: 'get'
+  })
+}
+
+// 新增公益报名情况
+export function addApply(data) {
+  return request({
+    url: '/szxc/apply',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改公益报名情况
+export function updateApply(data) {
+  return request({
+    url: '/szxc/apply',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除公益报名情况
+export function delApply(id) {
+  return request({
+    url: '/szxc/apply/' + id,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询补贴管理列表
+export function listButie(query) {
+  return request({
+    url: '/szxc/butie/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询补贴管理详细
+export function getButie(id) {
+  return request({
+    url: '/szxc/butie/' + id,
+    method: 'get'
+  })
+}
+
+// 新增补贴管理
+export function addButie(data) {
+  return request({
+    url: '/szxc/butie',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改补贴管理
+export function updateButie(data) {
+  return request({
+    url: '/szxc/butie',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除补贴管理
+export function delButie(id) {
+  return request({
+    url: '/szxc/butie/' + id,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询帮办事列表
+export function listHelp(query) {
+  return request({
+    url: '/szxc/help/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询帮办事详细
+export function getHelp(id) {
+  return request({
+    url: '/szxc/help/' + id,
+    method: 'get'
+  })
+}
+
+// 新增帮办事
+export function addHelp(data) {
+  return request({
+    url: '/szxc/help',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改帮办事
+export function updateHelp(data) {
+  return request({
+    url: '/szxc/help',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除帮办事
+export function delHelp(id) {
+  return request({
+    url: '/szxc/help/' + id,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询注销登记记录列表
+export function listOffrecard(query) {
+  return request({
+    url: '/szxc/offrecard/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询注销登记记录详细
+export function getOffrecard(id) {
+  return request({
+    url: '/szxc/offrecard/' + id,
+    method: 'get'
+  })
+}
+
+// 新增注销登记记录
+export function addOffrecard(data) {
+  return request({
+    url: '/szxc/offrecard',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改注销登记记录
+export function updateOffrecard(data) {
+  return request({
+    url: '/szxc/offrecard',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除注销登记记录
+export function delOffrecard(id) {
+  return request({
+    url: '/szxc/offrecard/' + id,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询上报资料列表
+export function listSbzl(query) {
+  return request({
+    url: '/szxc/sbzl/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询上报资料详细
+export function getSbzl(id) {
+  return request({
+    url: '/szxc/sbzl/' + id,
+    method: 'get'
+  })
+}
+
+// 新增上报资料
+export function addSbzl(data) {
+  return request({
+    url: '/szxc/sbzl',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改上报资料
+export function updateSbzl(data) {
+  return request({
+    url: '/szxc/sbzl',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除上报资料
+export function delSbzl(id) {
+  return request({
+    url: '/szxc/sbzl/' + id,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询议事投票情况列表
+export function listVoteresut(query) {
+  return request({
+    url: '/szxc/voteresut/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询议事投票情况详细
+export function getVoteresut(id) {
+  return request({
+    url: '/szxc/voteresut/' + id,
+    method: 'get'
+  })
+}
+
+// 新增议事投票情况
+export function addVoteresut(data) {
+  return request({
+    url: '/szxc/voteresut',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改议事投票情况
+export function updateVoteresut(data) {
+  return request({
+    url: '/szxc/voteresut',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除议事投票情况
+export function delVoteresut(id) {
+  return request({
+    url: '/szxc/voteresut/' + id,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询议事中心列表
+export function listYscentre(query) {
+  return request({
+    url: '/szxc/yscentre/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询议事中心详细
+export function getYscentre(id) {
+  return request({
+    url: '/szxc/yscentre/' + id,
+    method: 'get'
+  })
+}
+
+// 新增议事中心
+export function addYscentre(data) {
+  return request({
+    url: '/szxc/yscentre',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改议事中心
+export function updateYscentre(data) {
+  return request({
+    url: '/szxc/yscentre',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除议事中心
+export function delYscentre(id) {
+  return request({
+    url: '/szxc/yscentre/' + id,
+    method: 'delete'
+  })
+}

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

@@ -25,28 +25,20 @@
           @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-form-item label="开始时间" prop="startTime">
         <el-date-picker clearable
           v-model="queryParams.startTime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择创建时间">
+          placeholder="请选择开始时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="创建时间" prop="endTime">
+      <el-form-item label="结束时间" prop="endTime">
         <el-date-picker clearable
           v-model="queryParams.endTime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择创建时间">
+          placeholder="请选择结束时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="部门id" prop="deptId">
@@ -131,20 +123,19 @@
       <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">
+      <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">
+      <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="活动状态(带开始、进行中、已结束)" align="center" prop="status" />
       <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" />
@@ -191,23 +182,20 @@
         <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-form-item label="开始时间" prop="startTime">
           <el-date-picker clearable
             v-model="form.startTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择创建时间">
+            placeholder="请选择开始时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="创建时间" prop="endTime">
+        <el-form-item label="结束时间" prop="endTime">
           <el-date-picker clearable
             v-model="form.endTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择创建时间">
+            placeholder="请选择结束时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -263,11 +251,10 @@ export default {
         title: null,
         leader: null,
         phone: null,
-        type: null,
         content: null,
-        leave: null,
         startTime: null,
         endTime: null,
+        status: null,
         deptId: null,
         deptName: null,
         userId: null
@@ -310,13 +297,12 @@ export default {
         title: null,
         leader: null,
         phone: null,
-        type: null,
         content: null,
-        leave: null,
         startTime: null,
         endTime: null,
         createBy: null,
         remark: null,
+        status: null,
         createTime: null,
         updateBy: null,
         updateTime: null,

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

@@ -0,0 +1,308 @@
+<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="居民id" prop="jmId">
+        <el-input
+          v-model="queryParams.jmId"
+          placeholder="请输入居民id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="公益id" prop="gyId">
+        <el-input
+          v-model="queryParams.gyId"
+          placeholder="请输入公益id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="身份证号" prop="cardId">
+        <el-input
+          v-model="queryParams.cardId"
+          placeholder="请输入身份证号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="报名人" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          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:apply: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:apply: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:apply: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:apply:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="applyList" @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="居民id" align="center" prop="jmId" />
+      <el-table-column label="公益id" align="center" prop="gyId" />
+      <el-table-column label="身份证号" align="center" prop="cardId" />
+      <el-table-column label="报名人" align="center" prop="name" />
+      <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:apply:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['szxc:apply: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="居民id" prop="jmId">
+          <el-input v-model="form.jmId" placeholder="请输入居民id" />
+        </el-form-item>
+        <el-form-item label="公益id" prop="gyId">
+          <el-input v-model="form.gyId" placeholder="请输入公益id" />
+        </el-form-item>
+        <el-form-item label="身份证号" prop="cardId">
+          <el-input v-model="form.cardId" placeholder="请输入身份证号" />
+        </el-form-item>
+        <el-form-item label="报名人" prop="name">
+          <el-input v-model="form.name" 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 { listApply, getApply, delApply, addApply, updateApply } from "@/api/szxc/apply";
+
+export default {
+  name: "Apply",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 公益报名情况表格数据
+      applyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        jmId: null,
+        gyId: null,
+        cardId: null,
+        name: null,
+        userId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "报名人不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询公益报名情况列表 */
+    getList() {
+      this.loading = true;
+      listApply(this.queryParams).then(response => {
+        this.applyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        jmId: null,
+        gyId: null,
+        cardId: null,
+        name: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: 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
+      getApply(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) {
+            updateApply(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addApply(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 delApply(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('szxc/apply/export', {
+        ...this.queryParams
+      }, `apply_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -0,0 +1,387 @@
+<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="xmTitle">
+        <el-input
+          v-model="queryParams.xmTitle"
+          placeholder="请输入补贴项目名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目编号" prop="xmId">
+        <el-input
+          v-model="queryParams.xmId"
+          placeholder="请输入项目编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="年度" prop="year">
+        <el-input
+          v-model="queryParams.year"
+          placeholder="请输入年度"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="标准金额" prop="money">
+        <el-input
+          v-model="queryParams.money"
+          placeholder="请输入标准金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入补贴人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="审核备注" prop="shRemark">
+        <el-input
+          v-model="queryParams.shRemark"
+          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:butie: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:butie: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:butie: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:butie:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="butieList" @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="type" />
+      <el-table-column label="补贴项目名称" align="center" prop="xmTitle" />
+      <el-table-column label="项目编号" align="center" prop="xmId" />
+      <el-table-column label="年度" align="center" prop="year" />
+      <el-table-column label="标准金额" align="center" prop="money" />
+      <el-table-column label="补贴居民id" align="center" prop="jmId" />
+      <el-table-column label="补贴人" align="center" prop="name" />
+      <el-table-column label="内容描述" align="center" prop="content" />
+      <el-table-column label="审核状态" align="center" prop="zfStatus" />
+      <el-table-column label="审核备注" align="center" prop="shRemark" />
+      <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:butie:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['szxc:butie: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="xmTitle">
+          <el-input v-model="form.xmTitle" placeholder="请输入补贴项目名称" />
+        </el-form-item>
+        <el-form-item label="项目编号" prop="xmId">
+          <el-input v-model="form.xmId" placeholder="请输入项目编号" />
+        </el-form-item>
+        <el-form-item label="年度" prop="year">
+          <el-input v-model="form.year" placeholder="请输入年度" />
+        </el-form-item>
+        <el-form-item label="标准金额" prop="money">
+          <el-input v-model="form.money" placeholder="请输入标准金额" />
+        </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="name">
+          <el-input v-model="form.name" placeholder="请输入补贴人" />
+        </el-form-item>
+        <el-form-item label="内容描述">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="审核备注" prop="shRemark">
+          <el-input v-model="form.shRemark" 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 { listButie, getButie, delButie, addButie, updateButie } from "@/api/szxc/butie";
+
+export default {
+  name: "Butie",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 补贴管理表格数据
+      butieList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: null,
+        xmTitle: null,
+        xmId: null,
+        year: null,
+        money: null,
+        jmId: null,
+        name: null,
+        content: null,
+        zfStatus: null,
+        shRemark: null,
+        deptId: null,
+        deptName: null,
+        userId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询补贴管理列表 */
+    getList() {
+      this.loading = true;
+      listButie(this.queryParams).then(response => {
+        this.butieList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        type: null,
+        xmTitle: null,
+        xmId: null,
+        year: null,
+        money: null,
+        jmId: null,
+        name: null,
+        content: null,
+        zfStatus: null,
+        shRemark: 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
+      getButie(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) {
+            updateButie(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addButie(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 delButie(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('szxc/butie/export', {
+        ...this.queryParams
+      }, `butie_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -0,0 +1,368 @@
+<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="subName">
+        <el-input
+          v-model="queryParams.subName"
+          placeholder="请输入提报人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="提报日期" prop="subDate">
+        <el-date-picker clearable
+          v-model="queryParams.subDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择提报日期">
+        </el-date-picker>
+      </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="title">
+        <el-input
+          v-model="queryParams.title"
+          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:help: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:help: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:help: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:help:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="helpList" @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="subName" />
+      <el-table-column label="提报日期" align="center" prop="subDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.subDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="联系电话" align="center" prop="phone" />
+      <el-table-column label="事项类型" align="center" prop="sbType" />
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="事项描述" align="center" prop="content" />
+      <el-table-column label="处理进度(字典审核状态)" align="center" prop="helpStatus" />
+      <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:help:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['szxc:help: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="subName">
+          <el-input v-model="form.subName" placeholder="请输入提报人" />
+        </el-form-item>
+        <el-form-item label="提报日期" prop="subDate">
+          <el-date-picker clearable
+            v-model="form.subDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择提报日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="联系电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入联系电话" />
+        </el-form-item>
+        <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-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 { listHelp, getHelp, delHelp, addHelp, updateHelp } from "@/api/szxc/help";
+
+export default {
+  name: "Help",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 帮办事表格数据
+      helpList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        subName: null,
+        subDate: null,
+        phone: null,
+        sbType: null,
+        title: null,
+        content: null,
+        helpStatus: null,
+        deptId: null,
+        deptName: null,
+        userId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        subName: [
+          { required: true, message: "提报人不能为空", trigger: "blur" }
+        ],
+        title: [
+          { required: true, message: "标题不能为空", trigger: "blur" }
+        ],
+        deptId: [
+          { required: true, message: "部门id不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询帮办事列表 */
+    getList() {
+      this.loading = true;
+      listHelp(this.queryParams).then(response => {
+        this.helpList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        subName: null,
+        subDate: null,
+        phone: null,
+        sbType: null,
+        title: null,
+        content: null,
+        helpStatus: null,
+        remark: 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
+      getHelp(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) {
+            updateHelp(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addHelp(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 delHelp(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('szxc/help/export', {
+        ...this.queryParams
+      }, `help_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -0,0 +1,310 @@
+<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="居民id" prop="jmId">
+        <el-input
+          v-model="queryParams.jmId"
+          placeholder="请输入居民id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="姓名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="身份证号" prop="cardId">
+        <el-input
+          v-model="queryParams.cardId"
+          placeholder="请输入身份证号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="注销原因" prop="reason">
+        <el-input
+          v-model="queryParams.reason"
+          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:offrecard: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:offrecard: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:offrecard: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:offrecard:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="offrecardList" @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="居民id" align="center" prop="jmId" />
+      <el-table-column label="姓名" align="center" prop="name" />
+      <el-table-column label="身份证号" align="center" prop="cardId" />
+      <el-table-column label="注销原因" align="center" prop="reason" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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:offrecard:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['szxc:offrecard: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="居民id" prop="jmId">
+          <el-input v-model="form.jmId" placeholder="请输入居民id" />
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入姓名" />
+        </el-form-item>
+        <el-form-item label="身份证号" prop="cardId">
+          <el-input v-model="form.cardId" placeholder="请输入身份证号" />
+        </el-form-item>
+        <el-form-item label="注销原因" prop="reason">
+          <el-input v-model="form.reason" placeholder="请输入注销原因" />
+        </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="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 { listOffrecard, getOffrecard, delOffrecard, addOffrecard, updateOffrecard } from "@/api/szxc/offrecard";
+
+export default {
+  name: "Offrecard",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 注销登记记录表格数据
+      offrecardList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        jmId: null,
+        name: null,
+        cardId: null,
+        reason: null,
+        userId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询注销登记记录列表 */
+    getList() {
+      this.loading = true;
+      listOffrecard(this.queryParams).then(response => {
+        this.offrecardList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        jmId: null,
+        name: null,
+        cardId: null,
+        reason: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: 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
+      getOffrecard(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) {
+            updateOffrecard(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOffrecard(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 delOffrecard(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('szxc/offrecard/export', {
+        ...this.queryParams
+      }, `offrecard_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -0,0 +1,346 @@
+<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="subName">
+        <el-input
+          v-model="queryParams.subName"
+          placeholder="请输入上报人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="上报日期" prop="subDate">
+        <el-date-picker clearable
+          v-model="queryParams.subDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择上报日期">
+        </el-date-picker>
+      </el-form-item>
+      <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="部门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:sbzl: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:sbzl: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:sbzl: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:sbzl:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="sbzlList" @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="subName" />
+      <el-table-column label="上报日期" align="center" prop="subDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.subDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="上报分类" align="center" prop="subType" />
+      <el-table-column label="上报标题" align="center" prop="title" />
+      <el-table-column label="内容" align="center" prop="content" />
+      <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:sbzl:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['szxc:sbzl: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="subName">
+          <el-input v-model="form.subName" placeholder="请输入上报人" />
+        </el-form-item>
+        <el-form-item label="上报日期" prop="subDate">
+          <el-date-picker clearable
+            v-model="form.subDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择上报日期">
+          </el-date-picker>
+        </el-form-item>
+        <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="部门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 { listSbzl, getSbzl, delSbzl, addSbzl, updateSbzl } from "@/api/szxc/sbzl";
+
+export default {
+  name: "Sbzl",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 上报资料表格数据
+      sbzlList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        subName: null,
+        subDate: null,
+        subType: null,
+        title: null,
+        content: null,
+        deptId: null,
+        deptName: null,
+        userId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        subName: [
+          { required: true, message: "上报人不能为空", trigger: "blur" }
+        ],
+        title: [
+          { required: true, message: "上报标题不能为空", trigger: "blur" }
+        ],
+        deptId: [
+          { required: true, message: "部门id不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询上报资料列表 */
+    getList() {
+      this.loading = true;
+      listSbzl(this.queryParams).then(response => {
+        this.sbzlList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        subName: null,
+        subDate: null,
+        subType: null,
+        title: null,
+        content: 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
+      getSbzl(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) {
+            updateSbzl(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSbzl(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 delSbzl(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('szxc/sbzl/export', {
+        ...this.queryParams
+      }, `sbzl_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -17,12 +17,20 @@
           placeholder="请选择提报日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="走访日期" prop="visitDate">
+      <el-form-item label="开始时间" prop="startDate">
         <el-date-picker clearable
-          v-model="queryParams.visitDate"
+          v-model="queryParams.startDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择走访日期">
+          placeholder="请选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="endDate">
+        <el-date-picker clearable
+          v-model="queryParams.endDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择结束时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="走访对像id" prop="jmId">
@@ -65,6 +73,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="审核备注" prop="shRemark">
+        <el-input
+          v-model="queryParams.shRemark"
+          placeholder="请输入审核备注"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="部门id" prop="deptId">
         <el-input
           v-model="queryParams.deptId"
@@ -150,9 +166,14 @@
           <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="startDate" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.visitDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="endDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="类别" align="center" prop="type" />
@@ -162,6 +183,8 @@
       <el-table-column label="图片" align="center" prop="picture" />
       <el-table-column label="内容" align="center" prop="content" />
       <el-table-column label="随行走访人" align="center" prop="flowPeople" />
+      <el-table-column label="审核状态" align="center" prop="zfStatus" />
+      <el-table-column label="审核备注" align="center" prop="shRemark" />
       <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" />
@@ -207,12 +230,20 @@
             placeholder="请选择提报日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="走访日期" prop="visitDate">
+        <el-form-item label="开始时间" prop="startDate">
+          <el-date-picker clearable
+            v-model="form.startDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endDate">
           <el-date-picker clearable
-            v-model="form.visitDate"
+            v-model="form.endDate"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择走访日期">
+            placeholder="请选择结束时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="走访对像id" prop="jmId">
@@ -233,6 +264,9 @@
         <el-form-item label="随行走访人" prop="flowPeople">
           <el-input v-model="form.flowPeople" placeholder="请输入随行走访人" />
         </el-form-item>
+        <el-form-item label="审核备注" prop="shRemark">
+          <el-input v-model="form.shRemark" placeholder="请输入审核备注" />
+        </el-form-item>
         <el-form-item label="部门id" prop="deptId">
           <el-input v-model="form.deptId" placeholder="请输入部门id" />
         </el-form-item>
@@ -282,7 +316,8 @@ export default {
         pageSize: 10,
         visiterName: null,
         submitDate: null,
-        visitDate: null,
+        startDate: null,
+        endDate: null,
         type: null,
         jmId: null,
         visitObj: null,
@@ -290,6 +325,8 @@ export default {
         picture: null,
         content: null,
         flowPeople: null,
+        zfStatus: null,
+        shRemark: null,
         deptId: null,
         deptName: null,
         userId: null
@@ -301,12 +338,6 @@ export default {
         visiterName: [
           { required: true, message: "提报人不能为空", trigger: "blur" }
         ],
-        title: [
-          { required: true, message: "标题不能为空", trigger: "blur" }
-        ],
-        deptId: [
-          { required: true, message: "部门id不能为空", trigger: "blur" }
-        ],
       }
     };
   },
@@ -334,7 +365,8 @@ export default {
         id: null,
         visiterName: null,
         submitDate: null,
-        visitDate: null,
+        startDate: null,
+        endDate: null,
         type: null,
         jmId: null,
         visitObj: null,
@@ -342,6 +374,8 @@ export default {
         picture: null,
         content: null,
         flowPeople: null,
+        zfStatus: null,
+        shRemark: null,
         createBy: null,
         createTime: null,
         updateBy: null,

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

@@ -0,0 +1,336 @@
+<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="居民id" prop="jmId">
+        <el-input
+          v-model="queryParams.jmId"
+          placeholder="请输入居民id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="身份证号" prop="cardId">
+        <el-input
+          v-model="queryParams.cardId"
+          placeholder="请输入身份证号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="投票人" prop="voteName">
+        <el-input
+          v-model="queryParams.voteName"
+          placeholder="请输入投票人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="议事id" prop="ysId">
+        <el-input
+          v-model="queryParams.ysId"
+          placeholder="请输入议事id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="同意、反对、弃权" prop="vote">
+        <el-input
+          v-model="queryParams.vote"
+          placeholder="请输入同意、反对、弃权"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="意见建议" prop="opinion">
+        <el-input
+          v-model="queryParams.opinion"
+          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:voteresut: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:voteresut: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:voteresut: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:voteresut:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="voteresutList" @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="居民id" align="center" prop="jmId" />
+      <el-table-column label="身份证号" align="center" prop="cardId" />
+      <el-table-column label="投票人" align="center" prop="voteName" />
+      <el-table-column label="议事id" align="center" prop="ysId" />
+      <el-table-column label="同意、反对、弃权" align="center" prop="vote" />
+      <el-table-column label="意见建议" align="center" prop="opinion" />
+      <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:voteresut:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['szxc:voteresut: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="居民id" prop="jmId">
+          <el-input v-model="form.jmId" placeholder="请输入居民id" />
+        </el-form-item>
+        <el-form-item label="身份证号" prop="cardId">
+          <el-input v-model="form.cardId" placeholder="请输入身份证号" />
+        </el-form-item>
+        <el-form-item label="投票人" prop="voteName">
+          <el-input v-model="form.voteName" placeholder="请输入投票人" />
+        </el-form-item>
+        <el-form-item label="议事id" prop="ysId">
+          <el-input v-model="form.ysId" placeholder="请输入议事id" />
+        </el-form-item>
+        <el-form-item label="同意、反对、弃权" prop="vote">
+          <el-input v-model="form.vote" placeholder="请输入同意、反对、弃权" />
+        </el-form-item>
+        <el-form-item label="意见建议" prop="opinion">
+          <el-input v-model="form.opinion" 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 { listVoteresut, getVoteresut, delVoteresut, addVoteresut, updateVoteresut } from "@/api/szxc/voteresut";
+
+export default {
+  name: "Voteresut",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 议事投票情况表格数据
+      voteresutList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        jmId: null,
+        cardId: null,
+        voteName: null,
+        ysId: null,
+        vote: null,
+        opinion: null,
+        userId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        voteName: [
+          { required: true, message: "投票人不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询议事投票情况列表 */
+    getList() {
+      this.loading = true;
+      listVoteresut(this.queryParams).then(response => {
+        this.voteresutList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        jmId: null,
+        cardId: null,
+        voteName: null,
+        ysId: null,
+        vote: null,
+        opinion: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: 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
+      getVoteresut(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) {
+            updateVoteresut(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addVoteresut(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 delVoteresut(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('szxc/voteresut/export', {
+        ...this.queryParams
+      }, `voteresut_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -9,12 +9,28 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工作日期" prop="workerDate">
+      <el-form-item label="提报日期" prop="submitDate">
         <el-date-picker clearable
-          v-model="queryParams.workerDate"
+          v-model="queryParams.submitDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择工作日期">
+          placeholder="请选择提报日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startDate">
+        <el-date-picker clearable
+          v-model="queryParams.startDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="endDate">
+        <el-date-picker clearable
+          v-model="queryParams.endDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择结束时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="标题" prop="title">
@@ -33,6 +49,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="审核备注" prop="shRemark">
+        <el-input
+          v-model="queryParams.shRemark"
+          placeholder="请输入审核备注"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="部门id" prop="deptId">
         <el-input
           v-model="queryParams.deptId"
@@ -113,15 +137,27 @@
       <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="workerName" />
-      <el-table-column label="工作日期" align="center" prop="workerDate" width="180">
+      <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="startDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="endDate" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.workerDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="类别" align="center" prop="type" />
       <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="gzStatus" />
+      <el-table-column label="审核备注" align="center" prop="shRemark" />
       <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" />
@@ -159,12 +195,28 @@
         <el-form-item label="工作人员" prop="workerName">
           <el-input v-model="form.workerName" placeholder="请输入工作人员" />
         </el-form-item>
-        <el-form-item label="工作日期" prop="workerDate">
+        <el-form-item label="提报日期" prop="submitDate">
+          <el-date-picker clearable
+            v-model="form.submitDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择提报日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startDate">
+          <el-date-picker clearable
+            v-model="form.startDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endDate">
           <el-date-picker clearable
-            v-model="form.workerDate"
+            v-model="form.endDate"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择工作日期">
+            placeholder="请选择结束时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="标题" prop="title">
@@ -176,6 +228,9 @@
         <el-form-item label="内容">
           <editor v-model="form.content" :min-height="192"/>
         </el-form-item>
+        <el-form-item label="审核备注" prop="shRemark">
+          <el-input v-model="form.shRemark" placeholder="请输入审核备注" />
+        </el-form-item>
         <el-form-item label="部门id" prop="deptId">
           <el-input v-model="form.deptId" placeholder="请输入部门id" />
         </el-form-item>
@@ -224,11 +279,15 @@ export default {
         pageNum: 1,
         pageSize: 10,
         workerName: null,
-        workerDate: null,
+        submitDate: null,
+        startDate: null,
+        endDate: null,
         type: null,
         title: null,
         picture: null,
         content: null,
+        gzStatus: null,
+        shRemark: null,
         deptId: null,
         deptName: null,
         userId: null
@@ -272,11 +331,15 @@ export default {
       this.form = {
         id: null,
         workerName: null,
-        workerDate: null,
+        submitDate: null,
+        startDate: null,
+        endDate: null,
         type: null,
         title: null,
         picture: null,
         content: null,
+        gzStatus: null,
+        shRemark: null,
         createBy: null,
         createTime: null,
         updateBy: null,

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

@@ -73,6 +73,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="整改进度" prop="zgProgress">
+        <el-input
+          v-model="queryParams.zgProgress"
+          placeholder="请输入整改进度"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="审核备注" prop="shRemark">
+        <el-input
+          v-model="queryParams.shRemark"
+          placeholder="请输入审核备注"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="部门id" prop="deptId">
         <el-input
           v-model="queryParams.deptId"
@@ -171,6 +187,9 @@
       <el-table-column label="巡查情况描述" align="center" prop="content" />
       <el-table-column label="随行巡查人" align="center" prop="flowPeople" />
       <el-table-column label="是否需要整改" align="center" prop="reform" />
+      <el-table-column label="整改进度" align="center" prop="zgProgress" />
+      <el-table-column label="审核状态" align="center" prop="xcStatus" />
+      <el-table-column label="审核备注" align="center" prop="shRemark" />
       <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" />
@@ -245,6 +264,12 @@
         <el-form-item label="是否需要整改" prop="reform">
           <el-input v-model="form.reform" placeholder="请输入是否需要整改" />
         </el-form-item>
+        <el-form-item label="整改进度" prop="zgProgress">
+          <el-input v-model="form.zgProgress" placeholder="请输入整改进度" />
+        </el-form-item>
+        <el-form-item label="审核备注" prop="shRemark">
+          <el-input v-model="form.shRemark" placeholder="请输入审核备注" />
+        </el-form-item>
         <el-form-item label="部门id" prop="deptId">
           <el-input v-model="form.deptId" placeholder="请输入部门id" />
         </el-form-item>
@@ -303,6 +328,9 @@ export default {
         content: null,
         flowPeople: null,
         reform: null,
+        zgProgress: null,
+        xcStatus: null,
+        shRemark: null,
         deptId: null,
         deptName: null,
         userId: null
@@ -314,15 +342,9 @@ export default {
         xcName: [
           { required: true, message: "巡查人不能为空", trigger: "blur" }
         ],
-        type: [
-          { required: true, message: "巡查类别不能为空", trigger: "change" }
-        ],
         title: [
           { required: true, message: "巡查主题不能为空", trigger: "blur" }
         ],
-        deptId: [
-          { required: true, message: "部门id不能为空", trigger: "blur" }
-        ],
       }
     };
   },
@@ -359,6 +381,9 @@ export default {
         content: null,
         flowPeople: null,
         reform: null,
+        zgProgress: null,
+        xcStatus: null,
+        shRemark: null,
         createBy: null,
         createTime: null,
         updateBy: null,

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

@@ -0,0 +1,374 @@
+<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="channel">
+        <el-input
+          v-model="queryParams.channel"
+          placeholder="请输入渠道"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startDate">
+        <el-date-picker clearable
+          v-model="queryParams.startDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="endDate">
+        <el-date-picker clearable
+          v-model="queryParams.endDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择结束时间">
+        </el-date-picker>
+      </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 label="创建者ID" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入创建者ID"
+          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>
+        <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:yscentre: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:yscentre: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:yscentre: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:yscentre:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="yscentreList" @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="channel" />
+      <el-table-column label="开始时间" align="center" prop="startDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="endDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态(待开始、进行中、已结束)" align="center" prop="status" />
+      <el-table-column label="图片" align="center" prop="picture" />
+      <el-table-column label="创建者ID" align="center" prop="userId" />
+      <el-table-column label="部门id" align="center" prop="deptId" />
+      <el-table-column label="所属网格" align="center" prop="deptName" />
+      <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:yscentre:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['szxc:yscentre: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="channel">
+          <el-input v-model="form.channel" placeholder="请输入渠道" />
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startDate">
+          <el-date-picker clearable
+            v-model="form.startDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endDate">
+          <el-date-picker clearable
+            v-model="form.endDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="图片" prop="picture">
+          <el-input v-model="form.picture" placeholder="请输入图片" />
+        </el-form-item>
+        <el-form-item label="创建者ID" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
+        </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>
+      <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 { listYscentre, getYscentre, delYscentre, addYscentre, updateYscentre } from "@/api/szxc/yscentre";
+
+export default {
+  name: "Yscentre",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 议事中心表格数据
+      yscentreList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title: null,
+        content: null,
+        channel: null,
+        startDate: null,
+        endDate: null,
+        status: null,
+        picture: null,
+        userId: null,
+        deptId: null,
+        deptName: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询议事中心列表 */
+    getList() {
+      this.loading = true;
+      listYscentre(this.queryParams).then(response => {
+        this.yscentreList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        title: null,
+        content: null,
+        channel: null,
+        startDate: null,
+        endDate: null,
+        status: null,
+        picture: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        userId: null,
+        deptId: null,
+        deptName: 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
+      getYscentre(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) {
+            updateYscentre(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addYscentre(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 delYscentre(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('szxc/yscentre/export', {
+        ...this.queryParams
+      }, `yscentre_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>