diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java index 8c07a54..72b072d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/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(); } } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 65d3079..9aaa28a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -15,10 +15,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + - 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 @@ -39,6 +42,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND create_by like concat('%', #{createBy}, '%') + and status = #{status} + and dept_id = #{deptId} + and dept_name like concat('%', #{deptName}, '%') + and user_id = #{userId} @@ -50,6 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status, remark, create_by, + dept_id, + dept_name, + user_id, create_time )values( #{noticeTitle}, @@ -58,6 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{remark}, #{createBy}, + #{deptId}, + #{deptName}, + #{userId}, sysdate() ) @@ -70,6 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" notice_content = #{noticeContent}, status = #{status}, update_by = #{updateBy}, + dept_id = #{deptId}, + dept_name = #{deptName}, + user_id = #{userId}, update_time = sysdate() where notice_id = #{noticeId} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcButieController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcButieController.java new file mode 100644 index 0000000..72c8e73 --- /dev/null +++ b/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 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 list = szxcButieService.selectSzxcButieList(szxcButie); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcDiscussCentreController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcDiscussCentreController.java new file mode 100644 index 0000000..73db5b4 --- /dev/null +++ b/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 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 list = szxcDiscussCentreService.selectSzxcDiscussCentreList(szxcDiscussCentre); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcGyApplyController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcGyApplyController.java new file mode 100644 index 0000000..14ddebc --- /dev/null +++ b/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 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 list = szxcGyApplyService.selectSzxcGyApplyList(szxcGyApply); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHelpController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHelpController.java new file mode 100644 index 0000000..7f96966 --- /dev/null +++ b/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 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 list = szxcHelpService.selectSzxcHelpList(szxcHelp); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcOffRecardController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcOffRecardController.java new file mode 100644 index 0000000..0ff92ff --- /dev/null +++ b/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 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 list = szxcOffRecardService.selectSzxcOffRecardList(szxcOffRecard); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcPublicActivilyController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcPublicActivilyController.java index a1949a2..846effe 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcPublicActivilyController.java +++ b/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") diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcSbzlController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcSbzlController.java new file mode 100644 index 0000000..44b4bb4 --- /dev/null +++ b/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 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 list = szxcSbzlService.selectSzxcSbzlList(szxcSbzl); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVisitRecardController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVisitRecardController.java index 8f903b4..33b957b 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVisitRecardController.java +++ b/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") diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVoteResultController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVoteResultController.java new file mode 100644 index 0000000..143cefb --- /dev/null +++ b/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 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 list = szxcVoteResultService.selectSzxcVoteResultList(szxcVoteResult); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWorkGuideController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWorkGuideController.java index cf770b4..28a5c55 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWorkGuideController.java +++ b/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") diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWorkRecardController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWorkRecardController.java index d786aa3..dc8bbb3 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWorkRecardController.java +++ b/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") diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXcRecardController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXcRecardController.java index da87a86..800c5c5 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXcRecardController.java +++ b/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") diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcButie.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcButie.java new file mode 100644 index 0000000..6197502 --- /dev/null +++ b/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(); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcDiscussCentre.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcDiscussCentre.java new file mode 100644 index 0000000..ca5488c --- /dev/null +++ b/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(); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcGyApply.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcGyApply.java new file mode 100644 index 0000000..31a3601 --- /dev/null +++ b/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(); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHelp.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHelp.java new file mode 100644 index 0000000..d1e074c --- /dev/null +++ b/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(); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmInfo.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmInfo.java index c049317..ec47b87 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmInfo.java +++ b/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(); } } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcOffRecard.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcOffRecard.java new file mode 100644 index 0000000..ca8b4c1 --- /dev/null +++ b/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(); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcPublicActivily.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcPublicActivily.java index 0dd5c73..e2ccf18 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcPublicActivily.java +++ b/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()) diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcSbzl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcSbzl.java new file mode 100644 index 0000000..a19e7f3 --- /dev/null +++ b/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(); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcVisitRecard.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcVisitRecard.java index ffb800b..287a27b 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcVisitRecard.java +++ b/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()) diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcVoteResult.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcVoteResult.java new file mode 100644 index 0000000..eb92e2b --- /dev/null +++ b/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(); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcWorkGuide.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcWorkGuide.java index 61a846c..3d7ce47 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcWorkGuide.java +++ b/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 { diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcWorkRecard.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcWorkRecard.java index c96d99b..1351348 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcWorkRecard.java +++ b/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()) diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXcRecard.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXcRecard.java index c53f710..6254d32 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXcRecard.java +++ b/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()) diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcButieMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcButieMapper.java new file mode 100644 index 0000000..e071843 --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcDiscussCentreMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcDiscussCentreMapper.java new file mode 100644 index 0000000..b01eb09 --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcGyApplyMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcGyApplyMapper.java new file mode 100644 index 0000000..927607a --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcHelpMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcHelpMapper.java new file mode 100644 index 0000000..141646c --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcOffRecardMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcOffRecardMapper.java new file mode 100644 index 0000000..da427f6 --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcPublicActivilyMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcPublicActivilyMapper.java index 104c83f..5d552cc 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcPublicActivilyMapper.java +++ b/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 { diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcSbzlMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcSbzlMapper.java new file mode 100644 index 0000000..8a1e593 --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcVisitRecardMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcVisitRecardMapper.java index 03e3bf5..538a27e 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcVisitRecardMapper.java +++ b/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 { diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcVoteResultMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcVoteResultMapper.java new file mode 100644 index 0000000..3e064f7 --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcWorkGuideMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcWorkGuideMapper.java index ce16f69..fbbe347 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcWorkGuideMapper.java +++ b/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 { diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcWorkRecardMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcWorkRecardMapper.java index 31ec585..76bf196 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcWorkRecardMapper.java +++ b/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 { diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcXcRecardMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcXcRecardMapper.java index e037713..21c04fa 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcXcRecardMapper.java +++ b/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 { diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcButieService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcButieService.java new file mode 100644 index 0000000..83706da --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcDiscussCentreService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcDiscussCentreService.java new file mode 100644 index 0000000..998e97b --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcGyApplyService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcGyApplyService.java new file mode 100644 index 0000000..d5adac9 --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcHelpService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcHelpService.java new file mode 100644 index 0000000..4584251 --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcOffRecardService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcOffRecardService.java new file mode 100644 index 0000000..fa119b4 --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcPublicActivilyService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcPublicActivilyService.java index bef9ea1..c1d3c15 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcPublicActivilyService.java +++ b/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 { diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcSbzlService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcSbzlService.java new file mode 100644 index 0000000..0082f77 --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcVisitRecardService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcVisitRecardService.java index 42e624b..178275d 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcVisitRecardService.java +++ b/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 { diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcVoteResultService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcVoteResultService.java new file mode 100644 index 0000000..a7c983c --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcWorkGuideService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcWorkGuideService.java index 194c8f5..c4662e4 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcWorkGuideService.java +++ b/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 { diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcWorkRecardService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcWorkRecardService.java index b7a2327..1f76bea 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcWorkRecardService.java +++ b/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 { diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcXcRecardService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcXcRecardService.java index 184a2c4..95f5f86 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcXcRecardService.java +++ b/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 { diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcButieServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcButieServiceImpl.java new file mode 100644 index 0000000..481c32c --- /dev/null +++ b/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 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); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcDiscussCentreServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcDiscussCentreServiceImpl.java new file mode 100644 index 0000000..98240e6 --- /dev/null +++ b/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 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); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcGyApplyServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcGyApplyServiceImpl.java new file mode 100644 index 0000000..1eb62ff --- /dev/null +++ b/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 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); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHelpServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHelpServiceImpl.java new file mode 100644 index 0000000..4cfd2e9 --- /dev/null +++ b/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 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); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcOffRecardServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcOffRecardServiceImpl.java new file mode 100644 index 0000000..b5b9a7f --- /dev/null +++ b/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 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); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPublicActivilyServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPublicActivilyServiceImpl.java index a67fce7..8d12703 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPublicActivilyServiceImpl.java +++ b/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 diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcSbzlServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcSbzlServiceImpl.java new file mode 100644 index 0000000..8858480 --- /dev/null +++ b/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 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); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVisitRecardServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVisitRecardServiceImpl.java index b61698f..258c86c 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVisitRecardServiceImpl.java +++ b/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 diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVoteResultServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVoteResultServiceImpl.java new file mode 100644 index 0000000..3f54b02 --- /dev/null +++ b/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 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); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWorkGuideServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWorkGuideServiceImpl.java index dc95008..881403b 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWorkGuideServiceImpl.java +++ b/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 diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWorkRecardServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWorkRecardServiceImpl.java index 3fe1276..66377f0 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWorkRecardServiceImpl.java +++ b/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 diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXcRecardServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXcRecardServiceImpl.java index 88dd936..9ead555 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXcRecardServiceImpl.java +++ b/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 diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.xml new file mode 100644 index 0000000..09846ba --- /dev/null +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.xml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into szxc_butie + + 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, + + + #{type}, + #{xmTitle}, + #{xmId}, + #{year}, + #{money}, + #{jmId}, + #{name}, + #{content}, + #{zfStatus}, + #{shRemark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{deptId}, + #{deptName}, + #{userId}, + + + + + update szxc_butie + + type = #{type}, + xm_title = #{xmTitle}, + xm_id = #{xmId}, + year = #{year}, + money = #{money}, + jm_id = #{jmId}, + name = #{name}, + content = #{content}, + zf_status = #{zfStatus}, + sh_remark = #{shRemark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + dept_id = #{deptId}, + dept_name = #{deptName}, + user_id = #{userId}, + + where id = #{id} + + + + delete from szxc_butie where id = #{id} + + + + delete from szxc_butie where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcDiscussCentreMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcDiscussCentreMapper.xml new file mode 100644 index 0000000..e4dfaf4 --- /dev/null +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcDiscussCentreMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into szxc_discuss_centre + + title, + content, + channel, + start_date, + end_date, + status, + picture, + create_by, + create_time, + update_by, + update_time, + user_id, + dept_id, + dept_name, + + + #{title}, + #{content}, + #{channel}, + #{startDate}, + #{endDate}, + #{status}, + #{picture}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{userId}, + #{deptId}, + #{deptName}, + + + + + update szxc_discuss_centre + + title = #{title}, + content = #{content}, + channel = #{channel}, + start_date = #{startDate}, + end_date = #{endDate}, + status = #{status}, + picture = #{picture}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + user_id = #{userId}, + dept_id = #{deptId}, + dept_name = #{deptName}, + + where id = #{id} + + + + delete from szxc_discuss_centre where id = #{id} + + + + delete from szxc_discuss_centre where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcGyApplyMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcGyApplyMapper.xml new file mode 100644 index 0000000..f93ed19 --- /dev/null +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcGyApplyMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + select id, jm_id, gy_id, card_id, name, create_by, create_time, update_by, update_time, user_id from szxc_gy_apply + + + + + + + + insert into szxc_gy_apply + + jm_id, + gy_id, + card_id, + name, + create_by, + create_time, + update_by, + update_time, + user_id, + + + #{jmId}, + #{gyId}, + #{cardId}, + #{name}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{userId}, + + + + + update szxc_gy_apply + + jm_id = #{jmId}, + gy_id = #{gyId}, + card_id = #{cardId}, + name = #{name}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + user_id = #{userId}, + + where id = #{id} + + + + delete from szxc_gy_apply where id = #{id} + + + + delete from szxc_gy_apply where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHelpMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHelpMapper.xml new file mode 100644 index 0000000..8c29771 --- /dev/null +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHelpMapper.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into szxc_help + + 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, + + + #{subName}, + #{subDate}, + #{phone}, + #{sbType}, + #{title}, + #{content}, + #{helpStatus}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{deptId}, + #{deptName}, + #{userId}, + + + + + update szxc_help + + sub_name = #{subName}, + sub_date = #{subDate}, + phone = #{phone}, + sb_type = #{sbType}, + title = #{title}, + content = #{content}, + help_status = #{helpStatus}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + dept_id = #{deptId}, + dept_name = #{deptName}, + user_id = #{userId}, + + where id = #{id} + + + + delete from szxc_help where id = #{id} + + + + delete from szxc_help where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml index 66edb96..66cccd0 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml @@ -1,9 +1,9 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -40,16 +40,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 - + - + insert into szxc_jm_info @@ -115,14 +116,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" jkzk, ills, head, - same_head_ids, + acount_no, off, create_by, create_time, update_by, update_time, user_id, - + #{deptId}, #{deptName}, @@ -148,14 +149,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{jkzk}, #{ills}, #{head}, - #{sameHeadIds}, + #{acountNo}, #{off}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{userId}, - + @@ -185,7 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" jkzk = #{jkzk}, ills = #{ills}, head = #{head}, - same_head_ids = #{sameHeadIds}, + acount_no = #{acountNo}, off = #{off}, create_by = #{createBy}, create_time = #{createTime}, @@ -201,7 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from szxc_jm_info where id in + delete from szxc_jm_info where id in #{id} diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcOffRecardMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcOffRecardMapper.xml new file mode 100644 index 0000000..1a30117 --- /dev/null +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcOffRecardMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + select id, jm_id, name, card_id, reason, remark, create_by, create_time, update_by, update_time, user_id from szxc_off_recard + + + + + + + + insert into szxc_off_recard + + jm_id, + name, + card_id, + reason, + remark, + create_by, + create_time, + update_by, + update_time, + user_id, + + + #{jmId}, + #{name}, + #{cardId}, + #{reason}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{userId}, + + + + + update szxc_off_recard + + jm_id = #{jmId}, + name = #{name}, + card_id = #{cardId}, + reason = #{reason}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + user_id = #{userId}, + + where id = #{id} + + + + delete from szxc_off_recard where id = #{id} + + + + delete from szxc_off_recard where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPublicActivilyMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPublicActivilyMapper.xml index 36831ce..f626148 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPublicActivilyMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPublicActivilyMapper.xml @@ -9,13 +9,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + @@ -25,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 + + + and sub_name like concat('%', #{subName}, '%') + and sub_date = #{subDate} + and sub_type = #{subType} + and title = #{title} + and content = #{content} + and dept_id = #{deptId} + and dept_name like concat('%', #{deptName}, '%') + and user_id = #{userId} + + + + + + + insert into szxc_sbzl + + sub_name, + sub_date, + sub_type, + title, + content, + create_by, + create_time, + update_by, + update_time, + dept_id, + dept_name, + user_id, + + + #{subName}, + #{subDate}, + #{subType}, + #{title}, + #{content}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{deptId}, + #{deptName}, + #{userId}, + + + + + update szxc_sbzl + + sub_name = #{subName}, + sub_date = #{subDate}, + sub_type = #{subType}, + title = #{title}, + content = #{content}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + dept_id = #{deptId}, + dept_name = #{deptName}, + user_id = #{userId}, + + where id = #{id} + + + + delete from szxc_sbzl where id = #{id} + + + + delete from szxc_sbzl where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVisitRecardMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVisitRecardMapper.xml index 85ea702..66f8fab 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVisitRecardMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVisitRecardMapper.xml @@ -8,7 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + @@ -16,6 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -26,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 + + + and jm_id = #{jmId} + and card_id = #{cardId} + and vote_name like concat('%', #{voteName}, '%') + and ys_id = #{ysId} + and vote = #{vote} + and opinion = #{opinion} + and user_id = #{userId} + + + + + + + insert into szxc_vote_result + + jm_id, + card_id, + vote_name, + ys_id, + vote, + opinion, + create_by, + create_time, + update_by, + update_time, + user_id, + + + #{jmId}, + #{cardId}, + #{voteName}, + #{ysId}, + #{vote}, + #{opinion}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{userId}, + + + + + update szxc_vote_result + + jm_id = #{jmId}, + card_id = #{cardId}, + vote_name = #{voteName}, + ys_id = #{ysId}, + vote = #{vote}, + opinion = #{opinion}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + user_id = #{userId}, + + where id = #{id} + + + + delete from szxc_vote_result where id = #{id} + + + + delete from szxc_vote_result where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkRecardMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkRecardMapper.xml index 7e20102..df35fa8 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkRecardMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWorkRecardMapper.xml @@ -7,11 +7,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + @@ -22,18 +26,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 @@ -44,6 +47,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and content = #{content} and flow_people = #{flowPeople} and reform = #{reform} + and zg_progress = #{zgProgress} + and xc_status = #{xcStatus} + and sh_remark = #{shRemark} and dept_id = #{deptId} and dept_name like concat('%', #{deptName}, '%') and user_id = #{userId} @@ -61,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" xc_name, submit_date, xc_date, - type, + type, jm_id, xc_obj, title, @@ -69,6 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content, flow_people, reform, + zg_progress, + xc_status, + sh_remark, create_by, create_time, update_by, @@ -81,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{xcName}, #{submitDate}, #{xcDate}, - #{type}, + #{type}, #{jmId}, #{xcObj}, #{title}, @@ -89,6 +98,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{content}, #{flowPeople}, #{reform}, + #{zgProgress}, + #{xcStatus}, + #{shRemark}, #{createBy}, #{createTime}, #{updateBy}, @@ -105,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" xc_name = #{xcName}, submit_date = #{submitDate}, xc_date = #{xcDate}, - type = #{type}, + type = #{type}, jm_id = #{jmId}, xc_obj = #{xcObj}, title = #{title}, @@ -113,6 +125,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" content = #{content}, flow_people = #{flowPeople}, reform = #{reform}, + zg_progress = #{zgProgress}, + xc_status = #{xcStatus}, + sh_remark = #{shRemark}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, diff --git a/ruoyi-ui/src/api/szxc/apply.js b/ruoyi-ui/src/api/szxc/apply.js new file mode 100644 index 0000000..5163f63 --- /dev/null +++ b/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' + }) +} diff --git a/ruoyi-ui/src/api/szxc/butie.js b/ruoyi-ui/src/api/szxc/butie.js new file mode 100644 index 0000000..ac45e52 --- /dev/null +++ b/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' + }) +} diff --git a/ruoyi-ui/src/api/szxc/help.js b/ruoyi-ui/src/api/szxc/help.js new file mode 100644 index 0000000..203425f --- /dev/null +++ b/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' + }) +} diff --git a/ruoyi-ui/src/api/szxc/offrecard.js b/ruoyi-ui/src/api/szxc/offrecard.js new file mode 100644 index 0000000..6f6075f --- /dev/null +++ b/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' + }) +} diff --git a/ruoyi-ui/src/api/szxc/sbzl.js b/ruoyi-ui/src/api/szxc/sbzl.js new file mode 100644 index 0000000..68ba17c --- /dev/null +++ b/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' + }) +} diff --git a/ruoyi-ui/src/api/szxc/voteresut.js b/ruoyi-ui/src/api/szxc/voteresut.js new file mode 100644 index 0000000..ef2ad56 --- /dev/null +++ b/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' + }) +} diff --git a/ruoyi-ui/src/api/szxc/yscentre.js b/ruoyi-ui/src/api/szxc/yscentre.js new file mode 100644 index 0000000..6575f66 --- /dev/null +++ b/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' + }) +} diff --git a/ruoyi-ui/src/views/szxc/activily/index.vue b/ruoyi-ui/src/views/szxc/activily/index.vue index 9744ee6..1fa28e6 100644 --- a/ruoyi-ui/src/views/szxc/activily/index.vue +++ b/ruoyi-ui/src/views/szxc/activily/index.vue @@ -25,28 +25,20 @@ @keyup.enter.native="handleQuery" /> - - - - + + placeholder="请选择开始时间"> - + + placeholder="请选择结束时间"> @@ -131,20 +123,19 @@ - - - + - + + @@ -191,23 +182,20 @@ - - - - + + placeholder="请选择开始时间"> - + + placeholder="请选择结束时间"> @@ -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, diff --git a/ruoyi-ui/src/views/szxc/apply/index.vue b/ruoyi-ui/src/views/szxc/apply/index.vue new file mode 100644 index 0000000..39c9609 --- /dev/null +++ b/ruoyi-ui/src/views/szxc/apply/index.vue @@ -0,0 +1,308 @@ + + + diff --git a/ruoyi-ui/src/views/szxc/butie/index.vue b/ruoyi-ui/src/views/szxc/butie/index.vue new file mode 100644 index 0000000..d109eaa --- /dev/null +++ b/ruoyi-ui/src/views/szxc/butie/index.vue @@ -0,0 +1,387 @@ + + + diff --git a/ruoyi-ui/src/views/szxc/help/index.vue b/ruoyi-ui/src/views/szxc/help/index.vue new file mode 100644 index 0000000..20c681d --- /dev/null +++ b/ruoyi-ui/src/views/szxc/help/index.vue @@ -0,0 +1,368 @@ + + + diff --git a/ruoyi-ui/src/views/szxc/offrecard/index.vue b/ruoyi-ui/src/views/szxc/offrecard/index.vue new file mode 100644 index 0000000..72c295e --- /dev/null +++ b/ruoyi-ui/src/views/szxc/offrecard/index.vue @@ -0,0 +1,310 @@ + + + diff --git a/ruoyi-ui/src/views/szxc/sbzl/index.vue b/ruoyi-ui/src/views/szxc/sbzl/index.vue new file mode 100644 index 0000000..619cb62 --- /dev/null +++ b/ruoyi-ui/src/views/szxc/sbzl/index.vue @@ -0,0 +1,346 @@ + + + diff --git a/ruoyi-ui/src/views/szxc/visitrecard/index.vue b/ruoyi-ui/src/views/szxc/visitrecard/index.vue index ea78085..78fd401 100644 --- a/ruoyi-ui/src/views/szxc/visitrecard/index.vue +++ b/ruoyi-ui/src/views/szxc/visitrecard/index.vue @@ -17,12 +17,20 @@ placeholder="请选择提报日期"> - + + placeholder="请选择开始时间"> + + + + @@ -65,6 +73,14 @@ @keyup.enter.native="handleQuery" /> + + + {{ parseTime(scope.row.submitDate, '{y}-{m}-{d}') }} - + + + + @@ -162,6 +183,8 @@ + + @@ -207,12 +230,20 @@ placeholder="请选择提报日期"> - + + + + + + placeholder="请选择结束时间"> @@ -233,6 +264,9 @@ + + + @@ -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, diff --git a/ruoyi-ui/src/views/szxc/voteresut/index.vue b/ruoyi-ui/src/views/szxc/voteresut/index.vue new file mode 100644 index 0000000..881ce66 --- /dev/null +++ b/ruoyi-ui/src/views/szxc/voteresut/index.vue @@ -0,0 +1,336 @@ + + + diff --git a/ruoyi-ui/src/views/szxc/workrecard/index.vue b/ruoyi-ui/src/views/szxc/workrecard/index.vue index bfd66e8..bf43b4d 100644 --- a/ruoyi-ui/src/views/szxc/workrecard/index.vue +++ b/ruoyi-ui/src/views/szxc/workrecard/index.vue @@ -9,12 +9,28 @@ @keyup.enter.native="handleQuery" /> - + + placeholder="请选择提报日期"> + + + + + + + + @@ -33,6 +49,14 @@ @keyup.enter.native="handleQuery" /> + + + - + + + + + + + + + @@ -159,12 +195,28 @@ - + + + + + + + + + + placeholder="请选择结束时间"> @@ -176,6 +228,9 @@ + + + @@ -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, diff --git a/ruoyi-ui/src/views/szxc/xcrecard/index.vue b/ruoyi-ui/src/views/szxc/xcrecard/index.vue index c8d89e3..f051081 100644 --- a/ruoyi-ui/src/views/szxc/xcrecard/index.vue +++ b/ruoyi-ui/src/views/szxc/xcrecard/index.vue @@ -73,6 +73,22 @@ @keyup.enter.native="handleQuery" /> + + + + + + + + + @@ -245,6 +264,12 @@ + + + + + + @@ -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, diff --git a/ruoyi-ui/src/views/szxc/yscentre/index.vue b/ruoyi-ui/src/views/szxc/yscentre/index.vue new file mode 100644 index 0000000..72e313d --- /dev/null +++ b/ruoyi-ui/src/views/szxc/yscentre/index.vue @@ -0,0 +1,374 @@ + + +