From 2cd4748ab7518adc990e1b57dca0e989f272d6d3 Mon Sep 17 00:00:00 2001 From: liuwu <975499773@qq.com> Date: Thu, 24 Aug 2023 09:43:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TAmentBranchController.java | 128 +++++++++ .../TAmentPartyAffairsController.java | 165 +++++++++++ .../controller/TAmentPersonnelController.java | 128 +++++++++ .../com/cyx/web/base/domain/TAmentBranch.java | 166 +++++++++++ .../web/base/domain/TAmentPartyAffairs.java | 228 +++++++++++++++ .../cyx/web/base/domain/TAmentPersonnel.java | 270 ++++++++++++++++++ .../web/base/mapper/TAmentBranchMapper.java | 61 ++++ .../base/mapper/TAmentPartyAffairsMapper.java | 61 ++++ .../base/mapper/TAmentPersonnelMapper.java | 61 ++++ .../base/service/ITAmentBranchService.java | 61 ++++ .../service/ITAmentPartyAffairsService.java | 61 ++++ .../base/service/ITAmentPersonnelService.java | 61 ++++ .../service/impl/TAmentBranchServiceImpl.java | 98 +++++++ .../impl/TAmentPartyAffairsServiceImpl.java | 98 +++++++ .../impl/TAmentPersonnelServiceImpl.java | 98 +++++++ cyx-admin/src/main/resources/application.yml | 2 +- .../resources/templates/base/affairs/add.html | 114 ++++++++ .../templates/base/affairs/affairs.html | 193 +++++++++++++ .../resources/templates/base/affairs/day.html | 193 +++++++++++++ .../templates/base/affairs/edit.html | 115 ++++++++ .../templates/base/affairs/partystyle.html | 193 +++++++++++++ .../templates/base/affairs/year.html | 193 +++++++++++++ .../resources/templates/base/branch/add.html | 67 +++++ .../templates/base/branch/branch.html | 138 +++++++++ .../resources/templates/base/branch/edit.html | 62 ++++ .../templates/base/personnel/add.html | 141 +++++++++ .../templates/base/personnel/edit.html | 136 +++++++++ .../templates/base/personnel/personnel.html | 198 +++++++++++++ .../resources/templates/index-topnav.html | 4 +- .../src/main/resources/templates/index.html | 4 +- .../mapper/base/TAmentBranchMapper.xml | 112 ++++++++ .../mapper/base/TAmentPartyAffairsMapper.xml | 137 +++++++++ .../mapper/base/TAmentPersonnelMapper.xml | 153 ++++++++++ 33 files changed, 3895 insertions(+), 5 deletions(-) create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentBranchController.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPersonnelController.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentBranch.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPersonnel.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentBranchMapper.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPersonnelMapper.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentBranchService.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPersonnelService.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentBranchServiceImpl.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPersonnelServiceImpl.java create mode 100644 cyx-admin/src/main/resources/templates/base/affairs/add.html create mode 100644 cyx-admin/src/main/resources/templates/base/affairs/affairs.html create mode 100644 cyx-admin/src/main/resources/templates/base/affairs/day.html create mode 100644 cyx-admin/src/main/resources/templates/base/affairs/edit.html create mode 100644 cyx-admin/src/main/resources/templates/base/affairs/partystyle.html create mode 100644 cyx-admin/src/main/resources/templates/base/affairs/year.html create mode 100644 cyx-admin/src/main/resources/templates/base/branch/add.html create mode 100644 cyx-admin/src/main/resources/templates/base/branch/branch.html create mode 100644 cyx-admin/src/main/resources/templates/base/branch/edit.html create mode 100644 cyx-admin/src/main/resources/templates/base/personnel/add.html create mode 100644 cyx-admin/src/main/resources/templates/base/personnel/edit.html create mode 100644 cyx-admin/src/main/resources/templates/base/personnel/personnel.html create mode 100644 cyx-system/src/main/resources/mapper/base/TAmentBranchMapper.xml create mode 100644 cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml create mode 100644 cyx-system/src/main/resources/mapper/base/TAmentPersonnelMapper.xml diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentBranchController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentBranchController.java new file mode 100644 index 0000000..8331296 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentBranchController.java @@ -0,0 +1,128 @@ +package com.cyx.web.base.controller; + +import java.util.List; + +import com.cyx.common.annotation.Log; +import com.cyx.common.core.controller.BaseController; +import com.cyx.common.core.domain.AjaxResult; +import com.cyx.common.core.page.TableDataInfo; +import com.cyx.common.enums.BusinessType; +import com.cyx.common.utils.poi.ExcelUtil; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.cyx.web.base.domain.TAmentBranch; +import com.cyx.web.base.service.ITAmentBranchService; + +/** + * 支部Controller + * + * @author ruoyi + * @date 2023-08-23 + */ +@Controller +@RequestMapping("/base/branch") +public class TAmentBranchController extends BaseController +{ + private String prefix = "base/branch"; + + @Autowired + private ITAmentBranchService tAmentBranchService; + + @RequiresPermissions("base:branch:view") + @GetMapping() + public String branch() + { + return prefix + "/branch"; + } + + /** + * 查询支部列表 + */ + @RequiresPermissions("base:branch:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TAmentBranch tAmentBranch) + { + startPage(); + List list = tAmentBranchService.selectTAmentBranchList(tAmentBranch); + return getDataTable(list); + } + + /** + * 导出支部列表 + */ + @RequiresPermissions("base:branch:export") + @Log(title = "支部", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TAmentBranch tAmentBranch) + { + List list = tAmentBranchService.selectTAmentBranchList(tAmentBranch); + ExcelUtil util = new ExcelUtil(TAmentBranch.class); + return util.exportExcel(list, "支部数据"); + } + + /** + * 新增支部 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存支部 + */ + @RequiresPermissions("base:branch:add") + @Log(title = "支部", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(TAmentBranch tAmentBranch) + { + return toAjax(tAmentBranchService.insertTAmentBranch(tAmentBranch)); + } + + /** + * 修改支部 + */ + @RequiresPermissions("base:branch:edit") + @GetMapping("/edit/{branchId}") + public String edit(@PathVariable("branchId") Long branchId, ModelMap mmap) + { + TAmentBranch tAmentBranch = tAmentBranchService.selectTAmentBranchByBranchId(branchId); + mmap.put("tAmentBranch", tAmentBranch); + return prefix + "/edit"; + } + + /** + * 修改保存支部 + */ + @RequiresPermissions("base:branch:edit") + @Log(title = "支部", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(TAmentBranch tAmentBranch) + { + return toAjax(tAmentBranchService.updateTAmentBranch(tAmentBranch)); + } + + /** + * 删除支部 + */ + @RequiresPermissions("base:branch:remove") + @Log(title = "支部", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(tAmentBranchService.deleteTAmentBranchByBranchIds(ids)); + } +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java new file mode 100644 index 0000000..c3f3f8c --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java @@ -0,0 +1,165 @@ +package com.cyx.web.base.controller; + +import java.util.List; + +import com.cyx.common.annotation.Log; +import com.cyx.common.core.controller.BaseController; +import com.cyx.common.core.domain.AjaxResult; +import com.cyx.common.core.page.TableDataInfo; +import com.cyx.common.enums.BusinessType; +import com.cyx.common.utils.poi.ExcelUtil; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.cyx.web.base.domain.TAmentPartyAffairs; +import com.cyx.web.base.service.ITAmentPartyAffairsService; + +/** + * 党务Controller + * + * @author ruoyi + * @date 2023-08-23 + */ +@Controller +@RequestMapping("/base/affairs") +public class TAmentPartyAffairsController extends BaseController +{ + private String prefix = "base/affairs"; + + @Autowired + private ITAmentPartyAffairsService tAmentPartyAffairsService; + + /** + * 党建及意识形态 + * @return + */ + @RequiresPermissions("base:affairs:view") + @GetMapping() + public String affairs() + { + return prefix + "/affairs"; + } + + /** + * 党风廉政建设 + * @return + */ + @RequiresPermissions("base:affairs:view") + @GetMapping("partystyle") + public String partystyle() + { + return prefix + "/partystyle"; + } + + /** + * 日常考核指标 + * @return + */ + @RequiresPermissions("base:affairs:view") + @GetMapping("day") + public String day() + { + return prefix + "/day"; + } + + /** + * 年度考核指标 + * @return + */ + @RequiresPermissions("base:affairs:view") + @GetMapping("year") + public String year() + { + return prefix + "/year"; + } + + /** + * 查询党务列表 + */ + @RequiresPermissions("base:affairs:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TAmentPartyAffairs tAmentPartyAffairs) + { + startPage(); + List list = tAmentPartyAffairsService.selectTAmentPartyAffairsList(tAmentPartyAffairs); + return getDataTable(list); + } + + /** + * 导出党务列表 + */ + @RequiresPermissions("base:affairs:export") + @Log(title = "党务", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TAmentPartyAffairs tAmentPartyAffairs) + { + List list = tAmentPartyAffairsService.selectTAmentPartyAffairsList(tAmentPartyAffairs); + ExcelUtil util = new ExcelUtil(TAmentPartyAffairs.class); + return util.exportExcel(list, "党务数据"); + } + + /** + * 新增党务 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存党务 + */ + @RequiresPermissions("base:affairs:add") + @Log(title = "党务", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(TAmentPartyAffairs tAmentPartyAffairs) + { + return toAjax(tAmentPartyAffairsService.insertTAmentPartyAffairs(tAmentPartyAffairs)); + } + + /** + * 修改党务 + */ + @RequiresPermissions("base:affairs:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + TAmentPartyAffairs tAmentPartyAffairs = tAmentPartyAffairsService.selectTAmentPartyAffairsById(id); + mmap.put("tAmentPartyAffairs", tAmentPartyAffairs); + return prefix + "/edit"; + } + + /** + * 修改保存党务 + */ + @RequiresPermissions("base:affairs:edit") + @Log(title = "党务", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(TAmentPartyAffairs tAmentPartyAffairs) + { + return toAjax(tAmentPartyAffairsService.updateTAmentPartyAffairs(tAmentPartyAffairs)); + } + + /** + * 删除党务 + */ + @RequiresPermissions("base:affairs:remove") + @Log(title = "党务", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(tAmentPartyAffairsService.deleteTAmentPartyAffairsByIds(ids)); + } +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPersonnelController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPersonnelController.java new file mode 100644 index 0000000..7fc9bb6 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPersonnelController.java @@ -0,0 +1,128 @@ +package com.cyx.web.base.controller; + +import java.util.List; + +import com.cyx.common.annotation.Log; +import com.cyx.common.core.controller.BaseController; +import com.cyx.common.core.domain.AjaxResult; +import com.cyx.common.core.page.TableDataInfo; +import com.cyx.common.enums.BusinessType; +import com.cyx.common.utils.poi.ExcelUtil; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.cyx.web.base.domain.TAmentPersonnel; +import com.cyx.web.base.service.ITAmentPersonnelService; + +/** + * 人员Controller + * + * @author ruoyi + * @date 2023-08-23 + */ +@Controller +@RequestMapping("/base/personnel") +public class TAmentPersonnelController extends BaseController +{ + private String prefix = "base/personnel"; + + @Autowired + private ITAmentPersonnelService tAmentPersonnelService; + + @RequiresPermissions("base:personnel:view") + @GetMapping() + public String personnel() + { + return prefix + "/personnel"; + } + + /** + * 查询人员列表 + */ + @RequiresPermissions("base:personnel:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TAmentPersonnel tAmentPersonnel) + { + startPage(); + List list = tAmentPersonnelService.selectTAmentPersonnelList(tAmentPersonnel); + return getDataTable(list); + } + + /** + * 导出人员列表 + */ + @RequiresPermissions("base:personnel:export") + @Log(title = "人员", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TAmentPersonnel tAmentPersonnel) + { + List list = tAmentPersonnelService.selectTAmentPersonnelList(tAmentPersonnel); + ExcelUtil util = new ExcelUtil(TAmentPersonnel.class); + return util.exportExcel(list, "人员数据"); + } + + /** + * 新增人员 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存人员 + */ + @RequiresPermissions("base:personnel:add") + @Log(title = "人员", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(TAmentPersonnel tAmentPersonnel) + { + return toAjax(tAmentPersonnelService.insertTAmentPersonnel(tAmentPersonnel)); + } + + /** + * 修改人员 + */ + @RequiresPermissions("base:personnel:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + TAmentPersonnel tAmentPersonnel = tAmentPersonnelService.selectTAmentPersonnelById(id); + mmap.put("tAmentPersonnel", tAmentPersonnel); + return prefix + "/edit"; + } + + /** + * 修改保存人员 + */ + @RequiresPermissions("base:personnel:edit") + @Log(title = "人员", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(TAmentPersonnel tAmentPersonnel) + { + return toAjax(tAmentPersonnelService.updateTAmentPersonnel(tAmentPersonnel)); + } + + /** + * 删除人员 + */ + @RequiresPermissions("base:personnel:remove") + @Log(title = "人员", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(tAmentPersonnelService.deleteTAmentPersonnelByIds(ids)); + } +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentBranch.java b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentBranch.java new file mode 100644 index 0000000..4da3697 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentBranch.java @@ -0,0 +1,166 @@ +package com.cyx.web.base.domain; + +import com.cyx.common.annotation.Excel; +import com.cyx.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 支部对象 t_ament_branch + * + * @author ruoyi + * @date 2023-08-23 + */ +public class TAmentBranch extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 支部id */ + private Long branchId; + + /** 父支部id */ + @Excel(name = "父支部id") + private Long parentId; + + /** 祖级列表 */ + @Excel(name = "祖级列表") + private String ancestors; + + /** 支部名称 */ + @Excel(name = "支部名称") + private String branchName; + + /** 显示顺序 */ + @Excel(name = "显示顺序") + private Long orderNum; + + /** 负责人 */ + @Excel(name = "负责人") + private String leader; + + /** 联系电话 */ + @Excel(name = "联系电话") + private String phone; + + /** 邮箱 */ + @Excel(name = "邮箱") + private String email; + + /** 支部状态（0正常 1停用） */ + @Excel(name = "支部状态", readConverterExp = "0=正常,1=停用") + private String status; + + /** 删除标志（0代表存在 1代表删除） */ + private String delFlag; + + public void setBranchId(Long branchId) + { + this.branchId = branchId; + } + + public Long getBranchId() + { + return branchId; + } + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + public Long getParentId() + { + return parentId; + } + public void setAncestors(String ancestors) + { + this.ancestors = ancestors; + } + + public String getAncestors() + { + return ancestors; + } + public void setBranchName(String branchName) + { + this.branchName = branchName; + } + + public String getBranchName() + { + return branchName; + } + public void setOrderNum(Long orderNum) + { + this.orderNum = orderNum; + } + + public Long getOrderNum() + { + return orderNum; + } + public void setLeader(String leader) + { + this.leader = leader; + } + + public String getLeader() + { + return leader; + } + public void setPhone(String phone) + { + this.phone = phone; + } + + public String getPhone() + { + return phone; + } + public void setEmail(String email) + { + this.email = email; + } + + public String getEmail() + { + return email; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("branchId", getBranchId()) + .append("parentId", getParentId()) + .append("ancestors", getAncestors()) + .append("branchName", getBranchName()) + .append("orderNum", getOrderNum()) + .append("leader", getLeader()) + .append("phone", getPhone()) + .append("email", getEmail()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java new file mode 100644 index 0000000..dfab524 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java @@ -0,0 +1,228 @@ +package com.cyx.web.base.domain; + +import java.util.Date; + +import com.cyx.common.annotation.Excel; +import com.cyx.common.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 党务对象 t_ament_party_affairs + * + * @author ruoyi + * @date 2023-08-23 + */ +public class TAmentPartyAffairs extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 自增ID */ + private Long id; + + /** 作用于附件（主键ID和type同时出现） */ + @Excel(name = "作用于附件", readConverterExp = "主=键ID和type同时出现") + private String type; + + /** 单位名称 */ + @Excel(name = "单位名称") + private String unit; + + /** 目标项及分值 */ + @Excel(name = "目标项及分值") + private String target; + + /** 目标要求 */ + @Excel(name = "目标要求") + private String demand; + + /** 评分细则 */ + @Excel(name = "评分细则") + private String detailed; + + /** 达标分 */ + @Excel(name = "达标分") + private String score; + + /** 考核方式 */ + @Excel(name = "考核方式") + private String method; + + /** 负责人 */ + @Excel(name = "负责人") + private String head; + + /** 审核人 */ + @Excel(name = "审核人") + private String reviewed; + + /** 完成截止时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "完成截止时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date finishDate; + + /** 操作人员ID */ + @Excel(name = "操作人员ID") + private Long perId; + + /** 部门ID */ + @Excel(name = "部门ID") + private Long deptId; + + /** 支部ID */ + @Excel(name = "支部ID") + private Long branchId; + + 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 setUnit(String unit) + { + this.unit = unit; + } + + public String getUnit() + { + return unit; + } + public void setTarget(String target) + { + this.target = target; + } + + public String getTarget() + { + return target; + } + public void setDemand(String demand) + { + this.demand = demand; + } + + public String getDemand() + { + return demand; + } + public void setDetailed(String detailed) + { + this.detailed = detailed; + } + + public String getDetailed() + { + return detailed; + } + public void setScore(String score) + { + this.score = score; + } + + public String getScore() + { + return score; + } + public void setMethod(String method) + { + this.method = method; + } + + public String getMethod() + { + return method; + } + public void setHead(String head) + { + this.head = head; + } + + public String getHead() + { + return head; + } + public void setReviewed(String reviewed) + { + this.reviewed = reviewed; + } + + public String getReviewed() + { + return reviewed; + } + public void setFinishDate(Date finishDate) + { + this.finishDate = finishDate; + } + + public Date getFinishDate() + { + return finishDate; + } + public void setPerId(Long perId) + { + this.perId = perId; + } + + public Long getPerId() + { + return perId; + } + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + public Long getDeptId() + { + return deptId; + } + public void setBranchId(Long branchId) + { + this.branchId = branchId; + } + + public Long getBranchId() + { + return branchId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("type", getType()) + .append("unit", getUnit()) + .append("target", getTarget()) + .append("demand", getDemand()) + .append("detailed", getDetailed()) + .append("score", getScore()) + .append("method", getMethod()) + .append("head", getHead()) + .append("reviewed", getReviewed()) + .append("finishDate", getFinishDate()) + .append("perId", getPerId()) + .append("deptId", getDeptId()) + .append("branchId", getBranchId()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPersonnel.java b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPersonnel.java new file mode 100644 index 0000000..416f183 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPersonnel.java @@ -0,0 +1,270 @@ +package com.cyx.web.base.domain; + +import java.util.Date; + +import com.cyx.common.annotation.Excel; +import com.cyx.common.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 人员对象 t_ament_personnel + * + * @author ruoyi + * @date 2023-08-23 + */ +public class TAmentPersonnel extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** */ + private Long id; + + /** 单位名称 */ + @Excel(name = "单位名称") + private String unit; + + /** 人员姓名 */ + @Excel(name = "人员姓名") + private String name; + + /** 人员性别 */ + @Excel(name = "人员性别") + private String sex; + + /** 民族 */ + @Excel(name = "民族") + private String nation; + + /** 部门ID */ + @Excel(name = "部门ID") + private Long deptId; + + /** 手机号码 */ + @Excel(name = "手机号码") + private String mphone; + + /** 邮箱 */ + @Excel(name = "邮箱") + private String email; + + /** 籍贯 */ + @Excel(name = "籍贯") + private String nativePlace; + + /** 岗位 */ + @Excel(name = "岗位") + private String post; + + /** 职务 */ + @Excel(name = "职务") + private String duties; + + /** 职称 */ + @Excel(name = "职称") + private String title; + + /** 参加工作时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "参加工作时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date workDate; + + /** 支部ID */ + @Excel(name = "支部ID") + private Long branchId; + + /** 入党时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "入党时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date partyDate; + + /** 党内职务 */ + @Excel(name = "党内职务") + private String partyDuties; + + /** 删除标志（0代表存在 1代表删除） */ + private String delFlag; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setUnit(String unit) + { + this.unit = unit; + } + + public String getUnit() + { + return unit; + } + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + public void setSex(String sex) + { + this.sex = sex; + } + + public String getSex() + { + return sex; + } + public void setNation(String nation) + { + this.nation = nation; + } + + public String getNation() + { + return nation; + } + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + public Long getDeptId() + { + return deptId; + } + public void setMphone(String mphone) + { + this.mphone = mphone; + } + + public String getMphone() + { + return mphone; + } + public void setEmail(String email) + { + this.email = email; + } + + public String getEmail() + { + return email; + } + public void setNativePlace(String nativePlace) + { + this.nativePlace = nativePlace; + } + + public String getNativePlace() + { + return nativePlace; + } + public void setPost(String post) + { + this.post = post; + } + + public String getPost() + { + return post; + } + public void setDuties(String duties) + { + this.duties = duties; + } + + public String getDuties() + { + return duties; + } + public void setTitle(String title) + { + this.title = title; + } + + public String getTitle() + { + return title; + } + public void setWorkDate(Date workDate) + { + this.workDate = workDate; + } + + public Date getWorkDate() + { + return workDate; + } + public void setBranchId(Long branchId) + { + this.branchId = branchId; + } + + public Long getBranchId() + { + return branchId; + } + public void setPartyDate(Date partyDate) + { + this.partyDate = partyDate; + } + + public Date getPartyDate() + { + return partyDate; + } + public void setPartyDuties(String partyDuties) + { + this.partyDuties = partyDuties; + } + + public String getPartyDuties() + { + return partyDuties; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("unit", getUnit()) + .append("name", getName()) + .append("sex", getSex()) + .append("nation", getNation()) + .append("deptId", getDeptId()) + .append("mphone", getMphone()) + .append("email", getEmail()) + .append("nativePlace", getNativePlace()) + .append("post", getPost()) + .append("duties", getDuties()) + .append("title", getTitle()) + .append("workDate", getWorkDate()) + .append("branchId", getBranchId()) + .append("partyDate", getPartyDate()) + .append("partyDuties", getPartyDuties()) + .append("remark", getRemark()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentBranchMapper.java b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentBranchMapper.java new file mode 100644 index 0000000..e067648 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentBranchMapper.java @@ -0,0 +1,61 @@ +package com.cyx.web.base.mapper; + +import java.util.List; +import com.cyx.web.base.domain.TAmentBranch; + +/** + * 支部Mapper接口 + * + * @author ruoyi + * @date 2023-08-23 + */ +public interface TAmentBranchMapper +{ + /** + * 查询支部 + * + * @param branchId 支部主键 + * @return 支部 + */ + public TAmentBranch selectTAmentBranchByBranchId(Long branchId); + + /** + * 查询支部列表 + * + * @param tAmentBranch 支部 + * @return 支部集合 + */ + public List selectTAmentBranchList(TAmentBranch tAmentBranch); + + /** + * 新增支部 + * + * @param tAmentBranch 支部 + * @return 结果 + */ + public int insertTAmentBranch(TAmentBranch tAmentBranch); + + /** + * 修改支部 + * + * @param tAmentBranch 支部 + * @return 结果 + */ + public int updateTAmentBranch(TAmentBranch tAmentBranch); + + /** + * 删除支部 + * + * @param branchId 支部主键 + * @return 结果 + */ + public int deleteTAmentBranchByBranchId(Long branchId); + + /** + * 批量删除支部 + * + * @param branchIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTAmentBranchByBranchIds(String[] branchIds); +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java new file mode 100644 index 0000000..866d73d --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java @@ -0,0 +1,61 @@ +package com.cyx.web.base.mapper; + +import java.util.List; +import com.cyx.web.base.domain.TAmentPartyAffairs; + +/** + * 党务Mapper接口 + * + * @author ruoyi + * @date 2023-08-23 + */ +public interface TAmentPartyAffairsMapper +{ + /** + * 查询党务 + * + * @param id 党务主键 + * @return 党务 + */ + public TAmentPartyAffairs selectTAmentPartyAffairsById(Long id); + + /** + * 查询党务列表 + * + * @param tAmentPartyAffairs 党务 + * @return 党务集合 + */ + public List selectTAmentPartyAffairsList(TAmentPartyAffairs tAmentPartyAffairs); + + /** + * 新增党务 + * + * @param tAmentPartyAffairs 党务 + * @return 结果 + */ + public int insertTAmentPartyAffairs(TAmentPartyAffairs tAmentPartyAffairs); + + /** + * 修改党务 + * + * @param tAmentPartyAffairs 党务 + * @return 结果 + */ + public int updateTAmentPartyAffairs(TAmentPartyAffairs tAmentPartyAffairs); + + /** + * 删除党务 + * + * @param id 党务主键 + * @return 结果 + */ + public int deleteTAmentPartyAffairsById(Long id); + + /** + * 批量删除党务 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTAmentPartyAffairsByIds(String[] ids); +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPersonnelMapper.java b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPersonnelMapper.java new file mode 100644 index 0000000..7ddaee2 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPersonnelMapper.java @@ -0,0 +1,61 @@ +package com.cyx.web.base.mapper; + +import java.util.List; +import com.cyx.web.base.domain.TAmentPersonnel; + +/** + * 人员Mapper接口 + * + * @author ruoyi + * @date 2023-08-23 + */ +public interface TAmentPersonnelMapper +{ + /** + * 查询人员 + * + * @param id 人员主键 + * @return 人员 + */ + public TAmentPersonnel selectTAmentPersonnelById(Long id); + + /** + * 查询人员列表 + * + * @param tAmentPersonnel 人员 + * @return 人员集合 + */ + public List selectTAmentPersonnelList(TAmentPersonnel tAmentPersonnel); + + /** + * 新增人员 + * + * @param tAmentPersonnel 人员 + * @return 结果 + */ + public int insertTAmentPersonnel(TAmentPersonnel tAmentPersonnel); + + /** + * 修改人员 + * + * @param tAmentPersonnel 人员 + * @return 结果 + */ + public int updateTAmentPersonnel(TAmentPersonnel tAmentPersonnel); + + /** + * 删除人员 + * + * @param id 人员主键 + * @return 结果 + */ + public int deleteTAmentPersonnelById(Long id); + + /** + * 批量删除人员 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTAmentPersonnelByIds(String[] ids); +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentBranchService.java b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentBranchService.java new file mode 100644 index 0000000..a79f62c --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentBranchService.java @@ -0,0 +1,61 @@ +package com.cyx.web.base.service; + +import java.util.List; +import com.cyx.web.base.domain.TAmentBranch; + +/** + * 支部Service接口 + * + * @author ruoyi + * @date 2023-08-23 + */ +public interface ITAmentBranchService +{ + /** + * 查询支部 + * + * @param branchId 支部主键 + * @return 支部 + */ + public TAmentBranch selectTAmentBranchByBranchId(Long branchId); + + /** + * 查询支部列表 + * + * @param tAmentBranch 支部 + * @return 支部集合 + */ + public List selectTAmentBranchList(TAmentBranch tAmentBranch); + + /** + * 新增支部 + * + * @param tAmentBranch 支部 + * @return 结果 + */ + public int insertTAmentBranch(TAmentBranch tAmentBranch); + + /** + * 修改支部 + * + * @param tAmentBranch 支部 + * @return 结果 + */ + public int updateTAmentBranch(TAmentBranch tAmentBranch); + + /** + * 批量删除支部 + * + * @param branchIds 需要删除的支部主键集合 + * @return 结果 + */ + public int deleteTAmentBranchByBranchIds(String branchIds); + + /** + * 删除支部信息 + * + * @param branchId 支部主键 + * @return 结果 + */ + public int deleteTAmentBranchByBranchId(Long branchId); +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java new file mode 100644 index 0000000..2cee05f --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java @@ -0,0 +1,61 @@ +package com.cyx.web.base.service; + +import java.util.List; +import com.cyx.web.base.domain.TAmentPartyAffairs; + +/** + * 党务Service接口 + * + * @author ruoyi + * @date 2023-08-23 + */ +public interface ITAmentPartyAffairsService +{ + /** + * 查询党务 + * + * @param id 党务主键 + * @return 党务 + */ + public TAmentPartyAffairs selectTAmentPartyAffairsById(Long id); + + /** + * 查询党务列表 + * + * @param tAmentPartyAffairs 党务 + * @return 党务集合 + */ + public List selectTAmentPartyAffairsList(TAmentPartyAffairs tAmentPartyAffairs); + + /** + * 新增党务 + * + * @param tAmentPartyAffairs 党务 + * @return 结果 + */ + public int insertTAmentPartyAffairs(TAmentPartyAffairs tAmentPartyAffairs); + + /** + * 修改党务 + * + * @param tAmentPartyAffairs 党务 + * @return 结果 + */ + public int updateTAmentPartyAffairs(TAmentPartyAffairs tAmentPartyAffairs); + + /** + * 批量删除党务 + * + * @param ids 需要删除的党务主键集合 + * @return 结果 + */ + public int deleteTAmentPartyAffairsByIds(String ids); + + /** + * 删除党务信息 + * + * @param id 党务主键 + * @return 结果 + */ + public int deleteTAmentPartyAffairsById(Long id); +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPersonnelService.java b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPersonnelService.java new file mode 100644 index 0000000..3b1c15a --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPersonnelService.java @@ -0,0 +1,61 @@ +package com.cyx.web.base.service; + +import java.util.List; +import com.cyx.web.base.domain.TAmentPersonnel; + +/** + * 人员Service接口 + * + * @author ruoyi + * @date 2023-08-23 + */ +public interface ITAmentPersonnelService +{ + /** + * 查询人员 + * + * @param id 人员主键 + * @return 人员 + */ + public TAmentPersonnel selectTAmentPersonnelById(Long id); + + /** + * 查询人员列表 + * + * @param tAmentPersonnel 人员 + * @return 人员集合 + */ + public List selectTAmentPersonnelList(TAmentPersonnel tAmentPersonnel); + + /** + * 新增人员 + * + * @param tAmentPersonnel 人员 + * @return 结果 + */ + public int insertTAmentPersonnel(TAmentPersonnel tAmentPersonnel); + + /** + * 修改人员 + * + * @param tAmentPersonnel 人员 + * @return 结果 + */ + public int updateTAmentPersonnel(TAmentPersonnel tAmentPersonnel); + + /** + * 批量删除人员 + * + * @param ids 需要删除的人员主键集合 + * @return 结果 + */ + public int deleteTAmentPersonnelByIds(String ids); + + /** + * 删除人员信息 + * + * @param id 人员主键 + * @return 结果 + */ + public int deleteTAmentPersonnelById(Long id); +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentBranchServiceImpl.java b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentBranchServiceImpl.java new file mode 100644 index 0000000..100a57a --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentBranchServiceImpl.java @@ -0,0 +1,98 @@ +package com.cyx.web.base.service.impl; + +import java.util.List; + +import com.cyx.common.core.text.Convert; +import com.cyx.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.cyx.web.base.mapper.TAmentBranchMapper; +import com.cyx.web.base.domain.TAmentBranch; +import com.cyx.web.base.service.ITAmentBranchService; + +/** + * 支部Service业务层处理 + * + * @author ruoyi + * @date 2023-08-23 + */ +@Service +public class TAmentBranchServiceImpl implements ITAmentBranchService +{ + @Autowired + private TAmentBranchMapper tAmentBranchMapper; + + /** + * 查询支部 + * + * @param branchId 支部主键 + * @return 支部 + */ + @Override + public TAmentBranch selectTAmentBranchByBranchId(Long branchId) + { + return tAmentBranchMapper.selectTAmentBranchByBranchId(branchId); + } + + /** + * 查询支部列表 + * + * @param tAmentBranch 支部 + * @return 支部 + */ + @Override + public List selectTAmentBranchList(TAmentBranch tAmentBranch) + { + return tAmentBranchMapper.selectTAmentBranchList(tAmentBranch); + } + + /** + * 新增支部 + * + * @param tAmentBranch 支部 + * @return 结果 + */ + @Override + public int insertTAmentBranch(TAmentBranch tAmentBranch) + { + tAmentBranch.setCreateTime(DateUtils.getNowDate()); + return tAmentBranchMapper.insertTAmentBranch(tAmentBranch); + } + + /** + * 修改支部 + * + * @param tAmentBranch 支部 + * @return 结果 + */ + @Override + public int updateTAmentBranch(TAmentBranch tAmentBranch) + { + tAmentBranch.setUpdateTime(DateUtils.getNowDate()); + return tAmentBranchMapper.updateTAmentBranch(tAmentBranch); + } + + /** + * 批量删除支部 + * + * @param branchIds 需要删除的支部主键 + * @return 结果 + */ + @Override + public int deleteTAmentBranchByBranchIds(String branchIds) + { + return tAmentBranchMapper.deleteTAmentBranchByBranchIds(Convert.toStrArray(branchIds)); + } + + /** + * 删除支部信息 + * + * @param branchId 支部主键 + * @return 结果 + */ + @Override + public int deleteTAmentBranchByBranchId(Long branchId) + { + return tAmentBranchMapper.deleteTAmentBranchByBranchId(branchId); + } +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java new file mode 100644 index 0000000..a0aca8f --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java @@ -0,0 +1,98 @@ +package com.cyx.web.base.service.impl; + +import java.util.List; + +import com.cyx.common.core.text.Convert; +import com.cyx.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.cyx.web.base.mapper.TAmentPartyAffairsMapper; +import com.cyx.web.base.domain.TAmentPartyAffairs; +import com.cyx.web.base.service.ITAmentPartyAffairsService; + +/** + * 党务Service业务层处理 + * + * @author ruoyi + * @date 2023-08-23 + */ +@Service +public class TAmentPartyAffairsServiceImpl implements ITAmentPartyAffairsService +{ + @Autowired + private TAmentPartyAffairsMapper tAmentPartyAffairsMapper; + + /** + * 查询党务 + * + * @param id 党务主键 + * @return 党务 + */ + @Override + public TAmentPartyAffairs selectTAmentPartyAffairsById(Long id) + { + return tAmentPartyAffairsMapper.selectTAmentPartyAffairsById(id); + } + + /** + * 查询党务列表 + * + * @param tAmentPartyAffairs 党务 + * @return 党务 + */ + @Override + public List selectTAmentPartyAffairsList(TAmentPartyAffairs tAmentPartyAffairs) + { + return tAmentPartyAffairsMapper.selectTAmentPartyAffairsList(tAmentPartyAffairs); + } + + /** + * 新增党务 + * + * @param tAmentPartyAffairs 党务 + * @return 结果 + */ + @Override + public int insertTAmentPartyAffairs(TAmentPartyAffairs tAmentPartyAffairs) + { + tAmentPartyAffairs.setCreateTime(DateUtils.getNowDate()); + return tAmentPartyAffairsMapper.insertTAmentPartyAffairs(tAmentPartyAffairs); + } + + /** + * 修改党务 + * + * @param tAmentPartyAffairs 党务 + * @return 结果 + */ + @Override + public int updateTAmentPartyAffairs(TAmentPartyAffairs tAmentPartyAffairs) + { + tAmentPartyAffairs.setUpdateTime(DateUtils.getNowDate()); + return tAmentPartyAffairsMapper.updateTAmentPartyAffairs(tAmentPartyAffairs); + } + + /** + * 批量删除党务 + * + * @param ids 需要删除的党务主键 + * @return 结果 + */ + @Override + public int deleteTAmentPartyAffairsByIds(String ids) + { + return tAmentPartyAffairsMapper.deleteTAmentPartyAffairsByIds(Convert.toStrArray(ids)); + } + + /** + * 删除党务信息 + * + * @param id 党务主键 + * @return 结果 + */ + @Override + public int deleteTAmentPartyAffairsById(Long id) + { + return tAmentPartyAffairsMapper.deleteTAmentPartyAffairsById(id); + } +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPersonnelServiceImpl.java b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPersonnelServiceImpl.java new file mode 100644 index 0000000..89ef1c4 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPersonnelServiceImpl.java @@ -0,0 +1,98 @@ +package com.cyx.web.base.service.impl; + +import java.util.List; + +import com.cyx.common.core.text.Convert; +import com.cyx.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.cyx.web.base.mapper.TAmentPersonnelMapper; +import com.cyx.web.base.domain.TAmentPersonnel; +import com.cyx.web.base.service.ITAmentPersonnelService; + +/** + * 人员Service业务层处理 + * + * @author ruoyi + * @date 2023-08-23 + */ +@Service +public class TAmentPersonnelServiceImpl implements ITAmentPersonnelService +{ + @Autowired + private TAmentPersonnelMapper tAmentPersonnelMapper; + + /** + * 查询人员 + * + * @param id 人员主键 + * @return 人员 + */ + @Override + public TAmentPersonnel selectTAmentPersonnelById(Long id) + { + return tAmentPersonnelMapper.selectTAmentPersonnelById(id); + } + + /** + * 查询人员列表 + * + * @param tAmentPersonnel 人员 + * @return 人员 + */ + @Override + public List selectTAmentPersonnelList(TAmentPersonnel tAmentPersonnel) + { + return tAmentPersonnelMapper.selectTAmentPersonnelList(tAmentPersonnel); + } + + /** + * 新增人员 + * + * @param tAmentPersonnel 人员 + * @return 结果 + */ + @Override + public int insertTAmentPersonnel(TAmentPersonnel tAmentPersonnel) + { + tAmentPersonnel.setCreateTime(DateUtils.getNowDate()); + return tAmentPersonnelMapper.insertTAmentPersonnel(tAmentPersonnel); + } + + /** + * 修改人员 + * + * @param tAmentPersonnel 人员 + * @return 结果 + */ + @Override + public int updateTAmentPersonnel(TAmentPersonnel tAmentPersonnel) + { + tAmentPersonnel.setUpdateTime(DateUtils.getNowDate()); + return tAmentPersonnelMapper.updateTAmentPersonnel(tAmentPersonnel); + } + + /** + * 批量删除人员 + * + * @param ids 需要删除的人员主键 + * @return 结果 + */ + @Override + public int deleteTAmentPersonnelByIds(String ids) + { + return tAmentPersonnelMapper.deleteTAmentPersonnelByIds(Convert.toStrArray(ids)); + } + + /** + * 删除人员信息 + * + * @param id 人员主键 + * @return 结果 + */ + @Override + public int deleteTAmentPersonnelById(Long id) + { + return tAmentPersonnelMapper.deleteTAmentPersonnelById(id); + } +} diff --git a/cyx-admin/src/main/resources/application.yml b/cyx-admin/src/main/resources/application.yml index c53bd27..ce42c5a 100644 --- a/cyx-admin/src/main/resources/application.yml +++ b/cyx-admin/src/main/resources/application.yml @@ -7,7 +7,7 @@ ruoyi: # 版权年份 copyrightYear: 2023 # 实例演示开关 - demoEnabled: true + demoEnabled: false # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） profile: D:/ruoyi/uploadPath # 获取ip地址开关 diff --git a/cyx-admin/src/main/resources/templates/base/affairs/add.html b/cyx-admin/src/main/resources/templates/base/affairs/add.html new file mode 100644 index 0000000..a0c2a47 --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/affairs/add.html @@ -0,0 +1,114 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html new file mode 100644 index 0000000..5109574 --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html @@ -0,0 +1,193 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/affairs/day.html b/cyx-admin/src/main/resources/templates/base/affairs/day.html new file mode 100644 index 0000000..cdb8e1b --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/affairs/day.html @@ -0,0 +1,193 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/affairs/edit.html b/cyx-admin/src/main/resources/templates/base/affairs/edit.html new file mode 100644 index 0000000..15229f0 --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/affairs/edit.html @@ -0,0 +1,115 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html new file mode 100644 index 0000000..9cf41e8 --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html @@ -0,0 +1,193 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/affairs/year.html b/cyx-admin/src/main/resources/templates/base/affairs/year.html new file mode 100644 index 0000000..ed410c4 --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/affairs/year.html @@ -0,0 +1,193 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/branch/add.html b/cyx-admin/src/main/resources/templates/base/branch/add.html new file mode 100644 index 0000000..757f738 --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/branch/add.html @@ -0,0 +1,67 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/branch/branch.html b/cyx-admin/src/main/resources/templates/base/branch/branch.html new file mode 100644 index 0000000..d37f53d --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/branch/branch.html @@ -0,0 +1,138 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/branch/edit.html b/cyx-admin/src/main/resources/templates/base/branch/edit.html new file mode 100644 index 0000000..6a98db8 --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/branch/edit.html @@ -0,0 +1,62 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/personnel/add.html b/cyx-admin/src/main/resources/templates/base/personnel/add.html new file mode 100644 index 0000000..f13dec2 --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/personnel/add.html @@ -0,0 +1,141 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/personnel/edit.html b/cyx-admin/src/main/resources/templates/base/personnel/edit.html new file mode 100644 index 0000000..72df79c --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/personnel/edit.html @@ -0,0 +1,136 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/personnel/personnel.html b/cyx-admin/src/main/resources/templates/base/personnel/personnel.html new file mode 100644 index 0000000..6c52d51 --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/personnel/personnel.html @@ -0,0 +1,198 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/index-topnav.html b/cyx-admin/src/main/resources/templates/index-topnav.html index 12b77d7..a48989e 100644 --- a/cyx-admin/src/main/resources/templates/index-topnav.html +++ b/cyx-admin/src/main/resources/templates/index-topnav.html @@ -84,7 +84,7 @@ @@ -288,7 +288,7 @@