From ea0a79f6a948b702f7666a24c6f34c456c3035f5 Mon Sep 17 00:00:00 2001 From: liuwu <975499773@qq.com> Date: Fri, 1 Sep 2023 15:38:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TAmentDaySeasonController.java | 128 ++++++ .../web/base/domain/TAmentAdvancedDept.java | 19 + .../web/base/domain/TAmentAdvancedParty.java | 19 + .../cyx/web/base/domain/TAmentDaySeason.java | 410 ++++++++++++++++++ .../web/base/domain/TAmentPartyAffairs.java | 144 +++--- .../cyx/web/base/domain/TAmentPersonnel.java | 19 + .../base/mapper/TAmentDaySeasonMapper.java | 61 +++ .../base/service/ITAmentDaySeasonService.java | 61 +++ .../impl/TAmentDaySeasonServiceImpl.java | 98 +++++ .../resources/templates/base/affairs/add.html | 2 + .../templates/base/affairs/affairs.html | 85 ++-- .../resources/templates/base/affairs/day.html | 104 ++--- .../base/affairs/finishedstatic.html | 42 +- .../templates/base/affairs/partystyle.html | 117 +++-- .../templates/base/affairs/year.html | 78 +++- .../src/main/resources/templates/main.html | 6 + .../cyx/common/core/domain/BaseEntity.java | 19 - .../java/com/cyx/common/utils/PageUtils.java | 2 +- .../mapper/base/TAmentDaySeasonMapper.xml | 189 ++++++++ .../mapper/base/TAmentPartyAffairsMapper.xml | 6 +- 20 files changed, 1307 insertions(+), 302 deletions(-) create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentDaySeasonController.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentDaySeason.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentDaySeasonMapper.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentDaySeasonService.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentDaySeasonServiceImpl.java create mode 100644 cyx-system/src/main/resources/mapper/base/TAmentDaySeasonMapper.xml diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentDaySeasonController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentDaySeasonController.java new file mode 100644 index 0000000..1cba1e4 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentDaySeasonController.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.TAmentDaySeason; +import com.cyx.web.base.service.ITAmentDaySeasonService; + +/** + * 日常季度考核Controller + * + * @author ruoyi + * @date 2023-09-01 + */ +@Controller +@RequestMapping("/base/season") +public class TAmentDaySeasonController extends BaseController +{ + private String prefix = "base/season"; + + @Autowired + private ITAmentDaySeasonService tAmentDaySeasonService; + + @RequiresPermissions("base:season:view") + @GetMapping() + public String season() + { + return prefix + "/season"; + } + + /** + * 查询日常季度考核列表 + */ + @RequiresPermissions("base:season:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TAmentDaySeason tAmentDaySeason) + { + startPage(); + List list = tAmentDaySeasonService.selectTAmentDaySeasonList(tAmentDaySeason); + return getDataTable(list); + } + + /** + * 导出日常季度考核列表 + */ + @RequiresPermissions("base:season:export") + @Log(title = "日常季度考核", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TAmentDaySeason tAmentDaySeason) + { + List list = tAmentDaySeasonService.selectTAmentDaySeasonList(tAmentDaySeason); + ExcelUtil util = new ExcelUtil(TAmentDaySeason.class); + return util.exportExcel(list, "日常季度考核数据"); + } + + /** + * 新增日常季度考核 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存日常季度考核 + */ + @RequiresPermissions("base:season:add") + @Log(title = "日常季度考核", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(TAmentDaySeason tAmentDaySeason) + { + return toAjax(tAmentDaySeasonService.insertTAmentDaySeason(tAmentDaySeason)); + } + + /** + * 修改日常季度考核 + */ + @RequiresPermissions("base:season:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + TAmentDaySeason tAmentDaySeason = tAmentDaySeasonService.selectTAmentDaySeasonById(id); + mmap.put("tAmentDaySeason", tAmentDaySeason); + return prefix + "/edit"; + } + + /** + * 修改保存日常季度考核 + */ + @RequiresPermissions("base:season:edit") + @Log(title = "日常季度考核", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(TAmentDaySeason tAmentDaySeason) + { + return toAjax(tAmentDaySeasonService.updateTAmentDaySeason(tAmentDaySeason)); + } + + /** + * 删除日常季度考核 + */ + @RequiresPermissions("base:season:remove") + @Log(title = "日常季度考核", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(tAmentDaySeasonService.deleteTAmentDaySeasonByIds(ids)); + } +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentAdvancedDept.java b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentAdvancedDept.java index 1987203..798740a 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentAdvancedDept.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentAdvancedDept.java @@ -21,6 +21,25 @@ public class TAmentAdvancedDept extends BaseEntity /** */ private Long id; + private Integer pageNum; + private Integer pageSize; + + public Integer getPageNum() { + return pageNum; + } + + public void setPageNum(Integer pageNum) { + this.pageNum = pageNum; + } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + /** 年度 */ @Excel(name = "年度") private String year; diff --git a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentAdvancedParty.java b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentAdvancedParty.java index 9b45a7a..b2897fb 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentAdvancedParty.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentAdvancedParty.java @@ -21,6 +21,25 @@ public class TAmentAdvancedParty extends BaseEntity /** */ private Long id; + private Integer pageNum; + private Integer pageSize; + + public Integer getPageNum() { + return pageNum; + } + + public void setPageNum(Integer pageNum) { + this.pageNum = pageNum; + } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + /** 年度 */ @Excel(name = "年度") private String year; diff --git a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentDaySeason.java b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentDaySeason.java new file mode 100644 index 0000000..a108645 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentDaySeason.java @@ -0,0 +1,410 @@ +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_day_season + * + * @author ruoyi + * @date 2023-09-01 + */ +public class TAmentDaySeason extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 自增ID */ + private Long id; + + /** 日常考核/季度考核 */ + @Excel(name = "日常考核/季度考核") + private String type; + + /** 指标简称 */ + @Excel(name = "指标简称") + private String shotName; + + /** 考核方式(周，月，季，年) */ + @Excel(name = "考核方式(周，月，季，年)") + private String unit; + + /** 考核内容 */ + @Excel(name = "考核内容") + private String target; + + /** 考核目标 */ + @Excel(name = "考核目标") + private String demand; + + /** 任务程度 */ + @Excel(name = "任务程度") + private String degree; + + /** 工作任务 */ + @Excel(name = "工作任务") + private String detailed; + + /** 达标分 */ + @Excel(name = "达标分") + private String score; + + /** 考核类别 日常监控 */ + @Excel(name = "考核类别 日常监控") + private String method; + + /** 状态 */ + @Excel(name = "状态") + private String status; + + /** 负责人 */ + @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; + + /** 文件 */ + @Excel(name = "文件") + private String files; + + /** 当前得分 */ + @Excel(name = "当前得分") + private String nowScore; + + /** 提交记录id */ + @Excel(name = "提交记录id") + private Long commitId; + + /** 审批记录id */ + @Excel(name = "审批记录id") + private Long reviewedId; + + /** 驳回次数 */ + @Excel(name = "驳回次数") + private Long times; + + private Integer pageNum; + private Integer pageSize; + + @Excel(name = "负责人") + private String header; + @Excel(name = "审核人") + private String reviewer; + @Excel(name = "操作人") + private String oprator; + @Excel(name = "支部") + private String branch; + @Excel(name = "部门") + private String deptName; + + public String getHeader() { + return header; + } + + public void setHeader(String header) { + this.header = header; + } + + public String getReviewer() { + return reviewer; + } + + public void setReviewer(String reviewer) { + this.reviewer = reviewer; + } + + public String getOprator() { + return oprator; + } + + public void setOprator(String oprator) { + this.oprator = oprator; + } + + public String getBranch() { + return branch; + } + + public void setBranch(String branch) { + this.branch = branch; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public Integer getPageNum() { + return pageNum; + } + + public void setPageNum(Integer pageNum) { + this.pageNum = pageNum; + } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + + 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 setShotName(String shotName) + { + this.shotName = shotName; + } + + public String getShotName() + { + return shotName; + } + 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 setDegree(String degree) + { + this.degree = degree; + } + + public String getDegree() + { + return degree; + } + 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 setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + 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; + } + public void setFiles(String files) + { + this.files = files; + } + + public String getFiles() + { + return files; + } + public void setNowScore(String nowScore) + { + this.nowScore = nowScore; + } + + public String getNowScore() + { + return nowScore; + } + public void setCommitId(Long commitId) + { + this.commitId = commitId; + } + + public Long getCommitId() + { + return commitId; + } + public void setReviewedId(Long reviewedId) + { + this.reviewedId = reviewedId; + } + + public Long getReviewedId() + { + return reviewedId; + } + public void setTimes(Long times) + { + this.times = times; + } + + public Long getTimes() + { + return times; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("type", getType()) + .append("shotName", getShotName()) + .append("unit", getUnit()) + .append("target", getTarget()) + .append("demand", getDemand()) + .append("degree", getDegree()) + .append("detailed", getDetailed()) + .append("score", getScore()) + .append("method", getMethod()) + .append("status", getStatus()) + .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()) + .append("files", getFiles()) + .append("nowScore", getNowScore()) + .append("commitId", getCommitId()) + .append("reviewedId", getReviewedId()) + .append("times", getTimes()) + .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 index 044d438..7e0068f 100644 --- 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 @@ -21,6 +21,9 @@ public class TAmentPartyAffairs extends BaseEntity /** 自增ID */ private Long id; + private Integer pageNum; + private Integer pageSize; + /** 作用于附件（主键ID和type同时出现） */ @Excel(name = "作用于附件", readConverterExp = "主=键ID和type同时出现") private String type; @@ -31,14 +34,6 @@ public class TAmentPartyAffairs extends BaseEntity private String shotName; - public String getShotName() { - return shotName; - } - - public void setShotName(String shotName) { - this.shotName = shotName; - } - /** 目标项及分值 */ @Excel(name = "目标项及分值") private String target; @@ -47,6 +42,83 @@ public class TAmentPartyAffairs extends BaseEntity private Long commitId; private Long reviewedId; + /** 目标要求 */ + @Excel(name = "目标要求") + private String demand; + + /** 评分细则 */ + @Excel(name = "评分细则") + private String detailed; + + /** 达标分 */ + @Excel(name = "达标分") + private String score; + private String nowScore; + + /** 考核方式 */ + @Excel(name = "考核方式") + private String method; + + /** 负责人 */ + private String files; + + private String head; + @Excel(name = "负责人") + private String header; + @Excel(name = "审核人") + private String reviewer; + @Excel(name = "操作人") + private String oprator; + @Excel(name = "支部") + private String branch; + @Excel(name = "部门") + private String deptName; + + /** 审核人 */ + @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 Integer getPageNum() { + return pageNum; + } + + public void setPageNum(Integer pageNum) { + this.pageNum = pageNum; + } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + + public String getShotName() { + return shotName; + } + + public void setShotName(String shotName) { + this.shotName = shotName; + } + public String getStatus() { return status; } @@ -71,19 +143,6 @@ public class TAmentPartyAffairs extends BaseEntity this.reviewedId = reviewedId; } - /** 目标要求 */ - @Excel(name = "目标要求") - private String demand; - - /** 评分细则 */ - @Excel(name = "评分细则") - private String detailed; - - /** 达标分 */ - @Excel(name = "达标分") - private String score; - private String nowScore; - public String getNowScore() { return nowScore; } @@ -92,14 +151,6 @@ public class TAmentPartyAffairs extends BaseEntity this.nowScore = nowScore; } - /** 考核方式 */ - @Excel(name = "考核方式") - private String method; - - /** 负责人 */ - - private String files; - public String getFiles() { return files; } @@ -108,18 +159,6 @@ public class TAmentPartyAffairs extends BaseEntity this.files = files; } - private String head; - @Excel(name = "负责人") - private String header; - @Excel(name = "审核人") - private String reviewer; - @Excel(name = "操作人") - private String oprator; - @Excel(name = "支部") - private String branch; - @Excel(name = "部门") - private String deptName; - public String getHeader() { return header; } @@ -160,28 +199,7 @@ public class TAmentPartyAffairs extends BaseEntity this.deptName = deptName; } - /** 审核人 */ - @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) + public void setId(Long id) { this.id = id; } 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 index b2c4769..a0e6fb2 100644 --- 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 @@ -21,6 +21,25 @@ public class TAmentPersonnel extends BaseEntity /** */ private Long id; + private Integer pageNum; + private Integer pageSize; + + public Integer getPageNum() { + return pageNum; + } + + public void setPageNum(Integer pageNum) { + this.pageNum = pageNum; + } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + /** 单位名称 */ @Excel(name = "单位名称") private String unit; diff --git a/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentDaySeasonMapper.java b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentDaySeasonMapper.java new file mode 100644 index 0000000..89bf45a --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentDaySeasonMapper.java @@ -0,0 +1,61 @@ +package com.cyx.web.base.mapper; + +import java.util.List; +import com.cyx.web.base.domain.TAmentDaySeason; + +/** + * 日常季度考核Mapper接口 + * + * @author ruoyi + * @date 2023-09-01 + */ +public interface TAmentDaySeasonMapper +{ + /** + * 查询日常季度考核 + * + * @param id 日常季度考核主键 + * @return 日常季度考核 + */ + public TAmentDaySeason selectTAmentDaySeasonById(Long id); + + /** + * 查询日常季度考核列表 + * + * @param tAmentDaySeason 日常季度考核 + * @return 日常季度考核集合 + */ + public List selectTAmentDaySeasonList(TAmentDaySeason tAmentDaySeason); + + /** + * 新增日常季度考核 + * + * @param tAmentDaySeason 日常季度考核 + * @return 结果 + */ + public int insertTAmentDaySeason(TAmentDaySeason tAmentDaySeason); + + /** + * 修改日常季度考核 + * + * @param tAmentDaySeason 日常季度考核 + * @return 结果 + */ + public int updateTAmentDaySeason(TAmentDaySeason tAmentDaySeason); + + /** + * 删除日常季度考核 + * + * @param id 日常季度考核主键 + * @return 结果 + */ + public int deleteTAmentDaySeasonById(Long id); + + /** + * 批量删除日常季度考核 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTAmentDaySeasonByIds(String[] ids); +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentDaySeasonService.java b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentDaySeasonService.java new file mode 100644 index 0000000..2c2248d --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentDaySeasonService.java @@ -0,0 +1,61 @@ +package com.cyx.web.base.service; + +import java.util.List; +import com.cyx.web.base.domain.TAmentDaySeason; + +/** + * 日常季度考核Service接口 + * + * @author ruoyi + * @date 2023-09-01 + */ +public interface ITAmentDaySeasonService +{ + /** + * 查询日常季度考核 + * + * @param id 日常季度考核主键 + * @return 日常季度考核 + */ + public TAmentDaySeason selectTAmentDaySeasonById(Long id); + + /** + * 查询日常季度考核列表 + * + * @param tAmentDaySeason 日常季度考核 + * @return 日常季度考核集合 + */ + public List selectTAmentDaySeasonList(TAmentDaySeason tAmentDaySeason); + + /** + * 新增日常季度考核 + * + * @param tAmentDaySeason 日常季度考核 + * @return 结果 + */ + public int insertTAmentDaySeason(TAmentDaySeason tAmentDaySeason); + + /** + * 修改日常季度考核 + * + * @param tAmentDaySeason 日常季度考核 + * @return 结果 + */ + public int updateTAmentDaySeason(TAmentDaySeason tAmentDaySeason); + + /** + * 批量删除日常季度考核 + * + * @param ids 需要删除的日常季度考核主键集合 + * @return 结果 + */ + public int deleteTAmentDaySeasonByIds(String ids); + + /** + * 删除日常季度考核信息 + * + * @param id 日常季度考核主键 + * @return 结果 + */ + public int deleteTAmentDaySeasonById(Long id); +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentDaySeasonServiceImpl.java b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentDaySeasonServiceImpl.java new file mode 100644 index 0000000..f73757b --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentDaySeasonServiceImpl.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.TAmentDaySeasonMapper; +import com.cyx.web.base.domain.TAmentDaySeason; +import com.cyx.web.base.service.ITAmentDaySeasonService; + +/** + * 日常季度考核Service业务层处理 + * + * @author ruoyi + * @date 2023-09-01 + */ +@Service +public class TAmentDaySeasonServiceImpl implements ITAmentDaySeasonService +{ + @Autowired + private TAmentDaySeasonMapper tAmentDaySeasonMapper; + + /** + * 查询日常季度考核 + * + * @param id 日常季度考核主键 + * @return 日常季度考核 + */ + @Override + public TAmentDaySeason selectTAmentDaySeasonById(Long id) + { + return tAmentDaySeasonMapper.selectTAmentDaySeasonById(id); + } + + /** + * 查询日常季度考核列表 + * + * @param tAmentDaySeason 日常季度考核 + * @return 日常季度考核 + */ + @Override + public List selectTAmentDaySeasonList(TAmentDaySeason tAmentDaySeason) + { + return tAmentDaySeasonMapper.selectTAmentDaySeasonList(tAmentDaySeason); + } + + /** + * 新增日常季度考核 + * + * @param tAmentDaySeason 日常季度考核 + * @return 结果 + */ + @Override + public int insertTAmentDaySeason(TAmentDaySeason tAmentDaySeason) + { + tAmentDaySeason.setCreateTime(DateUtils.getNowDate()); + return tAmentDaySeasonMapper.insertTAmentDaySeason(tAmentDaySeason); + } + + /** + * 修改日常季度考核 + * + * @param tAmentDaySeason 日常季度考核 + * @return 结果 + */ + @Override + public int updateTAmentDaySeason(TAmentDaySeason tAmentDaySeason) + { + tAmentDaySeason.setUpdateTime(DateUtils.getNowDate()); + return tAmentDaySeasonMapper.updateTAmentDaySeason(tAmentDaySeason); + } + + /** + * 批量删除日常季度考核 + * + * @param ids 需要删除的日常季度考核主键 + * @return 结果 + */ + @Override + public int deleteTAmentDaySeasonByIds(String ids) + { + return tAmentDaySeasonMapper.deleteTAmentDaySeasonByIds(Convert.toStrArray(ids)); + } + + /** + * 删除日常季度考核信息 + * + * @param id 日常季度考核主键 + * @return 结果 + */ + @Override + public int deleteTAmentDaySeasonById(Long id) + { + return tAmentDaySeasonMapper.deleteTAmentDaySeasonById(id); + } +} diff --git a/cyx-admin/src/main/resources/templates/base/affairs/add.html b/cyx-admin/src/main/resources/templates/base/affairs/add.html index afb1d72..56b3ad2 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/add.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/add.html @@ -176,6 +176,7 @@ var method = $("#method"); switch (type) { case "党务及意识形态": + $("#deptId").hide() target[0].innerHTML = '目标项：' demand[0].innerHTML = '目标要求：' detailed[0].innerHTML = '评分细则：' @@ -183,6 +184,7 @@ method[0].innerHTML = '考核方式：' break; case "党风廉政建设": + $("#deptId").hide() target[0].innerHTML = '责任类别：' demand[0].innerHTML = '目标要求：' detailed[0].innerHTML = '指标明细：' diff --git a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html index 56575ad..b8b8a63 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html @@ -11,42 +11,18 @@
    - - - -
  • - - + + +
    • +
  • + + +
    • +
  • + +
    • - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  •  搜索  重置 @@ -81,6 +57,29 @@ var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]]; var prefix = ctx + "base/affairs"; + if(window.parent.parent){ + $("#shotName").val(window.parent.parent._shotName) + }else { + $("#shotName").val('') + } + + $(document).ready(function () { + $.ajax({ + type: "post", + url: ctx + "base/personnel/personnelList", + data: { + }, + success: function(data) { + var opt = ''; + data.data.forEach(d=>{ + opt += ''; + }) + $("#head")[0].innerHTML=opt; + $("#reviewed")[0].innerHTML=opt; + } + }); + }) + $(function() { var options = { url: prefix + "/list", @@ -97,14 +96,10 @@ title: '自增ID', visible: false }, - // { - // field: 'type', - // title: '作用于附件' - // }, - // { - // field: 'unit', - // title: '单位名称' - // }, + { + field: 'branch', + title: '支部名称' + }, { field: 'type', title: '类型' @@ -128,7 +123,7 @@ }, { field: 'detailed', - title: '评分细则', + title: '工作任务', width:200, align: 'center', formatter: function(value, row, index) { @@ -164,10 +159,6 @@ field: 'finishDate', title: '完成截止时间' }, - { - field: 'deptName', - title: '部门' - }, { field: 'remark', title: '备注' diff --git a/cyx-admin/src/main/resources/templates/base/affairs/day.html b/cyx-admin/src/main/resources/templates/base/affairs/day.html index f218e89..66b82cc 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/day.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/day.html @@ -11,42 +11,22 @@
      - - - -
    • - - + +
    • - - + + +
      • +
    • + + +
      • +
    • + +
      • - - - - - - - - - - - - - - - - - - - - - - - -
    •  搜索  重置 @@ -79,7 +59,37 @@