From f250de843da6a32ebebd0d390a842bd103926035 Mon Sep 17 00:00:00 2001 From: liuwu <975499773@qq.com> Date: Mon, 28 Aug 2023 17:07:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TAmentPartyAffairsController.java | 66 ++++++++++ .../cyx/web/base/domain/TAmentCommitHis.java | 112 ++++++++++++++++ .../web/base/domain/TAmentPartyAffairs.java | 38 ++++++ .../web/base/domain/TAmentReviewedHis.java | 84 ++++++++++++ .../base/mapper/TAmentCommitHisMapper.java | 61 +++++++++ .../base/mapper/TAmentReviewedHisMapper.java | 61 +++++++++ .../base/service/ITAmentCommitHisService.java | 61 +++++++++ .../service/ITAmentReviewedHisService.java | 61 +++++++++ .../impl/TAmentCommitHisServiceImpl.java | 95 ++++++++++++++ .../impl/TAmentReviewedHisServiceImpl.java | 95 ++++++++++++++ .../base/advanceddept/advanceddept.html | 2 +- .../base/advancedparty/advancedparty.html | 2 +- .../resources/templates/base/affairs/add.html | 14 +- .../templates/base/affairs/affairs.html | 27 +++- .../resources/templates/base/affairs/day.html | 6 +- .../templates/base/affairs/partystyle.html | 13 +- .../templates/base/affairs/reviewed.html | 108 ++++++++++++++++ .../templates/base/affairs/upload.html | 9 +- .../templates/base/affairs/warn.html | 40 +++++- .../templates/base/affairs/year.html | 6 +- .../resources/templates/base/his/add.html | 72 +++++++++++ .../resources/templates/base/his/edit.html | 73 +++++++++++ .../resources/templates/base/his/his.html | 122 ++++++++++++++++++ .../mapper/base/TAmentCommitHisMapper.xml | 83 ++++++++++++ .../mapper/base/TAmentPartyAffairsMapper.xml | 69 +++++++--- .../mapper/base/TAmentReviewedHisMapper.xml | 73 +++++++++++ 26 files changed, 1418 insertions(+), 35 deletions(-) create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentCommitHis.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentReviewedHis.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentCommitHisMapper.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentReviewedHisMapper.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentCommitHisService.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentReviewedHisService.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentCommitHisServiceImpl.java create mode 100644 cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentReviewedHisServiceImpl.java create mode 100644 cyx-admin/src/main/resources/templates/base/affairs/reviewed.html create mode 100644 cyx-admin/src/main/resources/templates/base/his/add.html create mode 100644 cyx-admin/src/main/resources/templates/base/his/edit.html create mode 100644 cyx-admin/src/main/resources/templates/base/his/his.html create mode 100644 cyx-system/src/main/resources/mapper/base/TAmentCommitHisMapper.xml create mode 100644 cyx-system/src/main/resources/mapper/base/TAmentReviewedHisMapper.xml 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 index 6ab53a4..cc014f3 100644 --- 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 @@ -1,5 +1,6 @@ package com.cyx.web.base.controller; +import java.util.Date; import java.util.List; import java.util.Map; @@ -10,6 +11,12 @@ import com.cyx.common.core.domain.entity.SysDept; import com.cyx.common.core.page.TableDataInfo; import com.cyx.common.enums.BusinessType; import com.cyx.common.utils.poi.ExcelUtil; +import com.cyx.web.base.domain.TAmentCommitHis; +import com.cyx.web.base.domain.TAmentPersonnel; +import com.cyx.web.base.domain.TAmentReviewedHis; +import com.cyx.web.base.service.ITAmentCommitHisService; +import com.cyx.web.base.service.ITAmentPersonnelService; +import com.cyx.web.base.service.ITAmentReviewedHisService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -56,6 +63,10 @@ public class TAmentPartyAffairsController extends BaseController @Autowired private ITAmentPartyAffairsService tAmentPartyAffairsService; + @Autowired + private ITAmentCommitHisService commitHisService; + @Autowired + private ITAmentReviewedHisService reviewedHisService; /** * 党务及意识形态 * @return @@ -78,6 +89,60 @@ public class TAmentPartyAffairsController extends BaseController return prefix + "/upload"; } + /** + * + * @return + */ + @RequiresPermissions("base:affairs:view") + @GetMapping("reviewed") + public String reviewed() + { + return prefix + "/reviewed"; + } + + /** + * 提交附件 + */ + @RequiresPermissions("base:affairs:edit") + @Log(title = "党务", businessType = BusinessType.UPDATE) + @PostMapping("/commit") + @ResponseBody + public AjaxResult commit(TAmentPartyAffairs tAmentPartyAffairs) + { + TAmentCommitHis his = new TAmentCommitHis(); + his.setPer(tAmentPartyAffairs.getHeader()); + his.setDept(tAmentPartyAffairs.getDeptName()); + his.setTarget(tAmentPartyAffairs.getShotName()); + his.setCommitTime(new Date()); + his.setDept(tAmentPartyAffairs.getDeptName()); + his.setRemark(tAmentPartyAffairs.getRemark()); + his.setFiles(tAmentPartyAffairs.getFiles()); + tAmentPartyAffairs.setStatus("2"); + commitHisService.insertTAmentCommitHis(his); + tAmentPartyAffairs.setCommitId(his.getId()); + return toAjax(tAmentPartyAffairsService.updateTAmentPartyAffairs(tAmentPartyAffairs)); + } + + /** + * 审核 + */ + @RequiresPermissions("base:affairs:edit") + @Log(title = "党务", businessType = BusinessType.UPDATE) + @GetMapping("/reviewedSave") + @ResponseBody + public AjaxResult reviewedSave(TAmentPartyAffairs tAmentPartyAffairs) + { + TAmentReviewedHis his = new TAmentReviewedHis(); + his.setPer(tAmentPartyAffairs.getReviewer()); + his.setReviewedTime(new Date()); + his.setScore(tAmentPartyAffairs.getScore()); + his.setRemark(tAmentPartyAffairs.getRemark()); + reviewedHisService.insertTAmentReviewedHis(his); + tAmentPartyAffairs.setReviewedId(his.getId()); + tAmentPartyAffairs.setStatus("4"); + return toAjax(tAmentPartyAffairsService.updateTAmentPartyAffairs(tAmentPartyAffairs)); + } + @RequiresPermissions("base:affairs:view") @GetMapping("viewImages") public String viewImages() @@ -185,6 +250,7 @@ public class TAmentPartyAffairsController extends BaseController public AjaxResult addSave(TAmentPartyAffairs tAmentPartyAffairs) { tAmentPartyAffairs.setUnit(getSysUser().getDept().getDeptName()); + tAmentPartyAffairs.setStatus("1"); return toAjax(tAmentPartyAffairsService.insertTAmentPartyAffairs(tAmentPartyAffairs)); } diff --git a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentCommitHis.java b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentCommitHis.java new file mode 100644 index 0000000..fe5afc4 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentCommitHis.java @@ -0,0 +1,112 @@ +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_commit_his + * + * @author ruoyi + * @date 2023-08-28 + */ +public class TAmentCommitHis extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** */ + private Long id; + + /** 提交人 */ + @Excel(name = "提交人") + private String per; + + /** 提交时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date commitTime; + + /** 部门 */ + @Excel(name = "部门") + private String dept; + + /** 指标 */ + @Excel(name = "指标") + private String target; + + /** 附件信息 */ + @Excel(name = "附件信息") + private String files; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setPer(String per) + { + this.per = per; + } + + public String getPer() + { + return per; + } + public void setCommitTime(Date commitTime) + { + this.commitTime = commitTime; + } + + public Date getCommitTime() + { + return commitTime; + } + public void setDept(String dept) + { + this.dept = dept; + } + + public String getDept() + { + return dept; + } + public void setTarget(String target) + { + this.target = target; + } + + public String getTarget() + { + return target; + } + public void setFiles(String files) + { + this.files = files; + } + + public String getFiles() + { + return files; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("per", getPer()) + .append("commitTime", getCommitTime()) + .append("dept", getDept()) + .append("target", getTarget()) + .append("remark", getRemark()) + .append("files", getFiles()) + .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 0ffa3d4..044d438 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 @@ -29,10 +29,48 @@ public class TAmentPartyAffairs extends BaseEntity // @Excel(name = "单位名称") private String unit; + private String shotName; + + public String getShotName() { + return shotName; + } + + public void setShotName(String shotName) { + this.shotName = shotName; + } + /** 目标项及分值 */ @Excel(name = "目标项及分值") private String target; + private String status; + private Long commitId; + private Long reviewedId; + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getCommitId() { + return commitId; + } + + public void setCommitId(Long commitId) { + this.commitId = commitId; + } + + public Long getReviewedId() { + return reviewedId; + } + + public void setReviewedId(Long reviewedId) { + this.reviewedId = reviewedId; + } + /** 目标要求 */ @Excel(name = "目标要求") private String demand; diff --git a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentReviewedHis.java b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentReviewedHis.java new file mode 100644 index 0000000..eccfa42 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentReviewedHis.java @@ -0,0 +1,84 @@ +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_reviewed_his + * + * @author ruoyi + * @date 2023-08-28 + */ +public class TAmentReviewedHis extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** */ + private Long id; + + /** 审批人 */ + @Excel(name = "审批人") + private String per; + + /** 审批时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "审批时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date reviewedTime; + + /** 审批得分 */ + @Excel(name = "审批得分") + private String score; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setPer(String per) + { + this.per = per; + } + + public String getPer() + { + return per; + } + public void setReviewedTime(Date reviewedTime) + { + this.reviewedTime = reviewedTime; + } + + public Date getReviewedTime() + { + return reviewedTime; + } + public void setScore(String score) + { + this.score = score; + } + + public String getScore() + { + return score; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("per", getPer()) + .append("reviewedTime", getReviewedTime()) + .append("remark", getRemark()) + .append("score", getScore()) + .toString(); + } +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentCommitHisMapper.java b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentCommitHisMapper.java new file mode 100644 index 0000000..9eee529 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentCommitHisMapper.java @@ -0,0 +1,61 @@ +package com.cyx.web.base.mapper; + +import java.util.List; +import com.cyx.web.base.domain.TAmentCommitHis; + +/** + * 提交记录Mapper接口 + * + * @author ruoyi + * @date 2023-08-28 + */ +public interface TAmentCommitHisMapper +{ + /** + * 查询提交记录 + * + * @param id 提交记录主键 + * @return 提交记录 + */ + public TAmentCommitHis selectTAmentCommitHisById(Long id); + + /** + * 查询提交记录列表 + * + * @param tAmentCommitHis 提交记录 + * @return 提交记录集合 + */ + public List selectTAmentCommitHisList(TAmentCommitHis tAmentCommitHis); + + /** + * 新增提交记录 + * + * @param tAmentCommitHis 提交记录 + * @return 结果 + */ + public int insertTAmentCommitHis(TAmentCommitHis tAmentCommitHis); + + /** + * 修改提交记录 + * + * @param tAmentCommitHis 提交记录 + * @return 结果 + */ + public int updateTAmentCommitHis(TAmentCommitHis tAmentCommitHis); + + /** + * 删除提交记录 + * + * @param id 提交记录主键 + * @return 结果 + */ + public int deleteTAmentCommitHisById(Long id); + + /** + * 批量删除提交记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTAmentCommitHisByIds(String[] ids); +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentReviewedHisMapper.java b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentReviewedHisMapper.java new file mode 100644 index 0000000..7983328 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentReviewedHisMapper.java @@ -0,0 +1,61 @@ +package com.cyx.web.base.mapper; + +import java.util.List; +import com.cyx.web.base.domain.TAmentReviewedHis; + +/** + * 审批记录信息Mapper接口 + * + * @author ruoyi + * @date 2023-08-28 + */ +public interface TAmentReviewedHisMapper +{ + /** + * 查询审批记录信息 + * + * @param id 审批记录信息主键 + * @return 审批记录信息 + */ + public TAmentReviewedHis selectTAmentReviewedHisById(Long id); + + /** + * 查询审批记录信息列表 + * + * @param tAmentReviewedHis 审批记录信息 + * @return 审批记录信息集合 + */ + public List selectTAmentReviewedHisList(TAmentReviewedHis tAmentReviewedHis); + + /** + * 新增审批记录信息 + * + * @param tAmentReviewedHis 审批记录信息 + * @return 结果 + */ + public int insertTAmentReviewedHis(TAmentReviewedHis tAmentReviewedHis); + + /** + * 修改审批记录信息 + * + * @param tAmentReviewedHis 审批记录信息 + * @return 结果 + */ + public int updateTAmentReviewedHis(TAmentReviewedHis tAmentReviewedHis); + + /** + * 删除审批记录信息 + * + * @param id 审批记录信息主键 + * @return 结果 + */ + public int deleteTAmentReviewedHisById(Long id); + + /** + * 批量删除审批记录信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTAmentReviewedHisByIds(String[] ids); +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentCommitHisService.java b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentCommitHisService.java new file mode 100644 index 0000000..b57e939 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentCommitHisService.java @@ -0,0 +1,61 @@ +package com.cyx.web.base.service; + +import java.util.List; +import com.cyx.web.base.domain.TAmentCommitHis; + +/** + * 提交记录Service接口 + * + * @author ruoyi + * @date 2023-08-28 + */ +public interface ITAmentCommitHisService +{ + /** + * 查询提交记录 + * + * @param id 提交记录主键 + * @return 提交记录 + */ + public TAmentCommitHis selectTAmentCommitHisById(Long id); + + /** + * 查询提交记录列表 + * + * @param tAmentCommitHis 提交记录 + * @return 提交记录集合 + */ + public List selectTAmentCommitHisList(TAmentCommitHis tAmentCommitHis); + + /** + * 新增提交记录 + * + * @param tAmentCommitHis 提交记录 + * @return 结果 + */ + public int insertTAmentCommitHis(TAmentCommitHis tAmentCommitHis); + + /** + * 修改提交记录 + * + * @param tAmentCommitHis 提交记录 + * @return 结果 + */ + public int updateTAmentCommitHis(TAmentCommitHis tAmentCommitHis); + + /** + * 批量删除提交记录 + * + * @param ids 需要删除的提交记录主键集合 + * @return 结果 + */ + public int deleteTAmentCommitHisByIds(String ids); + + /** + * 删除提交记录信息 + * + * @param id 提交记录主键 + * @return 结果 + */ + public int deleteTAmentCommitHisById(Long id); +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentReviewedHisService.java b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentReviewedHisService.java new file mode 100644 index 0000000..1fe7116 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentReviewedHisService.java @@ -0,0 +1,61 @@ +package com.cyx.web.base.service; + +import java.util.List; +import com.cyx.web.base.domain.TAmentReviewedHis; + +/** + * 审批记录信息Service接口 + * + * @author ruoyi + * @date 2023-08-28 + */ +public interface ITAmentReviewedHisService +{ + /** + * 查询审批记录信息 + * + * @param id 审批记录信息主键 + * @return 审批记录信息 + */ + public TAmentReviewedHis selectTAmentReviewedHisById(Long id); + + /** + * 查询审批记录信息列表 + * + * @param tAmentReviewedHis 审批记录信息 + * @return 审批记录信息集合 + */ + public List selectTAmentReviewedHisList(TAmentReviewedHis tAmentReviewedHis); + + /** + * 新增审批记录信息 + * + * @param tAmentReviewedHis 审批记录信息 + * @return 结果 + */ + public int insertTAmentReviewedHis(TAmentReviewedHis tAmentReviewedHis); + + /** + * 修改审批记录信息 + * + * @param tAmentReviewedHis 审批记录信息 + * @return 结果 + */ + public int updateTAmentReviewedHis(TAmentReviewedHis tAmentReviewedHis); + + /** + * 批量删除审批记录信息 + * + * @param ids 需要删除的审批记录信息主键集合 + * @return 结果 + */ + public int deleteTAmentReviewedHisByIds(String ids); + + /** + * 删除审批记录信息信息 + * + * @param id 审批记录信息主键 + * @return 结果 + */ + public int deleteTAmentReviewedHisById(Long id); +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentCommitHisServiceImpl.java b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentCommitHisServiceImpl.java new file mode 100644 index 0000000..fc5c695 --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentCommitHisServiceImpl.java @@ -0,0 +1,95 @@ +package com.cyx.web.base.service.impl; + +import java.util.List; + +import com.cyx.common.core.text.Convert; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.cyx.web.base.mapper.TAmentCommitHisMapper; +import com.cyx.web.base.domain.TAmentCommitHis; +import com.cyx.web.base.service.ITAmentCommitHisService; + +/** + * 提交记录Service业务层处理 + * + * @author ruoyi + * @date 2023-08-28 + */ +@Service +public class TAmentCommitHisServiceImpl implements ITAmentCommitHisService +{ + @Autowired + private TAmentCommitHisMapper tAmentCommitHisMapper; + + /** + * 查询提交记录 + * + * @param id 提交记录主键 + * @return 提交记录 + */ + @Override + public TAmentCommitHis selectTAmentCommitHisById(Long id) + { + return tAmentCommitHisMapper.selectTAmentCommitHisById(id); + } + + /** + * 查询提交记录列表 + * + * @param tAmentCommitHis 提交记录 + * @return 提交记录 + */ + @Override + public List selectTAmentCommitHisList(TAmentCommitHis tAmentCommitHis) + { + return tAmentCommitHisMapper.selectTAmentCommitHisList(tAmentCommitHis); + } + + /** + * 新增提交记录 + * + * @param tAmentCommitHis 提交记录 + * @return 结果 + */ + @Override + public int insertTAmentCommitHis(TAmentCommitHis tAmentCommitHis) + { + return tAmentCommitHisMapper.insertTAmentCommitHis(tAmentCommitHis); + } + + /** + * 修改提交记录 + * + * @param tAmentCommitHis 提交记录 + * @return 结果 + */ + @Override + public int updateTAmentCommitHis(TAmentCommitHis tAmentCommitHis) + { + return tAmentCommitHisMapper.updateTAmentCommitHis(tAmentCommitHis); + } + + /** + * 批量删除提交记录 + * + * @param ids 需要删除的提交记录主键 + * @return 结果 + */ + @Override + public int deleteTAmentCommitHisByIds(String ids) + { + return tAmentCommitHisMapper.deleteTAmentCommitHisByIds(Convert.toStrArray(ids)); + } + + /** + * 删除提交记录信息 + * + * @param id 提交记录主键 + * @return 结果 + */ + @Override + public int deleteTAmentCommitHisById(Long id) + { + return tAmentCommitHisMapper.deleteTAmentCommitHisById(id); + } +} diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentReviewedHisServiceImpl.java b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentReviewedHisServiceImpl.java new file mode 100644 index 0000000..63f00df --- /dev/null +++ b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentReviewedHisServiceImpl.java @@ -0,0 +1,95 @@ +package com.cyx.web.base.service.impl; + +import java.util.List; + +import com.cyx.common.core.text.Convert; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.cyx.web.base.mapper.TAmentReviewedHisMapper; +import com.cyx.web.base.domain.TAmentReviewedHis; +import com.cyx.web.base.service.ITAmentReviewedHisService; + +/** + * 审批记录信息Service业务层处理 + * + * @author ruoyi + * @date 2023-08-28 + */ +@Service +public class TAmentReviewedHisServiceImpl implements ITAmentReviewedHisService +{ + @Autowired + private TAmentReviewedHisMapper tAmentReviewedHisMapper; + + /** + * 查询审批记录信息 + * + * @param id 审批记录信息主键 + * @return 审批记录信息 + */ + @Override + public TAmentReviewedHis selectTAmentReviewedHisById(Long id) + { + return tAmentReviewedHisMapper.selectTAmentReviewedHisById(id); + } + + /** + * 查询审批记录信息列表 + * + * @param tAmentReviewedHis 审批记录信息 + * @return 审批记录信息 + */ + @Override + public List selectTAmentReviewedHisList(TAmentReviewedHis tAmentReviewedHis) + { + return tAmentReviewedHisMapper.selectTAmentReviewedHisList(tAmentReviewedHis); + } + + /** + * 新增审批记录信息 + * + * @param tAmentReviewedHis 审批记录信息 + * @return 结果 + */ + @Override + public int insertTAmentReviewedHis(TAmentReviewedHis tAmentReviewedHis) + { + return tAmentReviewedHisMapper.insertTAmentReviewedHis(tAmentReviewedHis); + } + + /** + * 修改审批记录信息 + * + * @param tAmentReviewedHis 审批记录信息 + * @return 结果 + */ + @Override + public int updateTAmentReviewedHis(TAmentReviewedHis tAmentReviewedHis) + { + return tAmentReviewedHisMapper.updateTAmentReviewedHis(tAmentReviewedHis); + } + + /** + * 批量删除审批记录信息 + * + * @param ids 需要删除的审批记录信息主键 + * @return 结果 + */ + @Override + public int deleteTAmentReviewedHisByIds(String ids) + { + return tAmentReviewedHisMapper.deleteTAmentReviewedHisByIds(Convert.toStrArray(ids)); + } + + /** + * 删除审批记录信息信息 + * + * @param id 审批记录信息主键 + * @return 结果 + */ + @Override + public int deleteTAmentReviewedHisById(Long id) + { + return tAmentReviewedHisMapper.deleteTAmentReviewedHisById(id); + } +} diff --git a/cyx-admin/src/main/resources/templates/base/advanceddept/advanceddept.html b/cyx-admin/src/main/resources/templates/base/advanceddept/advanceddept.html index e2af08b..e0d247a 100644 --- a/cyx-admin/src/main/resources/templates/base/advanceddept/advanceddept.html +++ b/cyx-admin/src/main/resources/templates/base/advanceddept/advanceddept.html @@ -122,7 +122,7 @@ formatter: function(value, row, index) { var actions = []; actions.push('上传附件 '); - actions.push('查看详情 '); + actions.push('查看详情 '); // actions.push('删除'); return actions.join(''); } diff --git a/cyx-admin/src/main/resources/templates/base/advancedparty/advancedparty.html b/cyx-admin/src/main/resources/templates/base/advancedparty/advancedparty.html index 13464b1..898ebf1 100644 --- a/cyx-admin/src/main/resources/templates/base/advancedparty/advancedparty.html +++ b/cyx-admin/src/main/resources/templates/base/advancedparty/advancedparty.html @@ -106,7 +106,7 @@ formatter: function(value, row, index) { var actions = []; actions.push('上传附件 '); - actions.push('查看详情 '); + actions.push('查看详情 '); // actions.push('编辑 '); // actions.push('删除'); 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 f8a7379..afb1d72 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/add.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/add.html @@ -34,7 +34,7 @@
- +
@@ -58,7 +58,7 @@
-
@@ -66,7 +66,7 @@
-
@@ -75,7 +75,7 @@
- +
@@ -128,7 +128,7 @@ data: { }, success: function(data) { - var opt = ''; + var opt = ''; data.data.forEach(d=>{ opt += ''; }) @@ -144,7 +144,7 @@ data: { }, success: function(data) { - var opt = ''; + var opt = ''; data.data.forEach(d=>{ opt += ''; }) @@ -158,7 +158,7 @@ data: { }, success: function(data) { - var opt = ''; + var opt = ''; data.data.forEach(d=>{ opt += ''; }) 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 e4c387c..2f16a0f 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html @@ -113,6 +113,10 @@ field: 'target', title: '目标项' }, + { + field: 'shotName', + title: '简写' + }, { field: 'demand', title: '目标要求', @@ -135,6 +139,10 @@ field: 'score', title: '达标分' }, + { + field: 'nowScore', + title: '当前得分' + }, { field: 'method', title: '考核方式', @@ -177,8 +185,17 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('上传附件 '); - actions.push('查看详情 '); + if (row.status === '1'){ + actions.push('上传附件 '); + }else if (row.status === '2'){ + actions.push('待审核 '); + }else if(row.status === '3'){ + actions.push('已驳回 '); + actions.push('重新上传附件 '); + }else if (row.status === '4'){ + actions.push('已完成 '); + } + actions.push('查看详情 '); // actions.push('编辑 '); // actions.push('删除'); @@ -189,6 +206,9 @@ $.table.init(options); $("#bootstrap-table").on('click','.openUpload',function () { let _id = $(this)[0].dataset.id; + let header = $(this)[0].dataset.header; + let deptName = $(this)[0].dataset.deptname; + let shotName = $(this)[0].dataset.shotname; layer.open({ title:'上传附件', area:['80%','80%'], @@ -197,6 +217,9 @@ success(res,index){ //传值 parent.a_upload_id = _id; + parent.a_header = header; + parent.a_deptName = deptName; + parent.a_shotName = shotName; parent.a_upload_index = index; parent.a_upload_type = "1"; }, 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 3083fca..0db143b 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/day.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/day.html @@ -113,6 +113,10 @@ field: 'target', title: '考核内容' }, + { + field: 'shotName', + title: '简写' + }, { field: 'demand', title: '考核目标', @@ -186,7 +190,7 @@ formatter: function(value, row, index) { var actions = []; actions.push('上传附件 '); - actions.push('查看详情 '); + actions.push('查看详情 '); // actions.push('编辑 '); // actions.push('删除'); diff --git a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html index 7ac59d9..ae94f6f 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html @@ -111,7 +111,16 @@ }, { field: 'target', - title: '责任类别' + title: '责任类别', + width:200, + align: 'center', + formatter: function(value, row, index) { + return $.table.tooltip(value); + } + }, + { + field: 'shotName', + title: '简写' }, { field: 'demand', @@ -178,7 +187,7 @@ formatter: function(value, row, index) { var actions = []; actions.push('上传附件 '); - actions.push('查看详情 '); + actions.push('查看详情 '); // actions.push('编辑 '); // actions.push('删除'); diff --git a/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html b/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html new file mode 100644 index 0000000..1b57360 --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html @@ -0,0 +1,108 @@ + + + + + + + +
+
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+ + + +
+
+
+ + + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/affairs/upload.html b/cyx-admin/src/main/resources/templates/base/affairs/upload.html index 1a8317a..574b75e 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/upload.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/upload.html @@ -34,14 +34,20 @@ } }).on('filebatchuploadsuccess', function (event, data, previewId, index) { let _type = parent.parent.a_upload_type; - let _url = _type === '1'?'/base/affairs/edit':'/base/advancedparty/edit'; + let _url = _type === '1'?'/base/affairs/commit':'/base/advancedparty/edit'; let _id = parent.parent.a_upload_id; + let header = parent.parent.a_header; + let deptName = parent.parent.a_deptName; + let shotName = parent.parent.a_shotName; let _index = parent.parent.a_upload_index; let _data = null; let _fileNames = data.response.fileNames; if(_type === '1'){ _data = { id:_id, + header:header, + deptName:deptName, + shotName:shotName, files:_fileNames } }else{ @@ -50,6 +56,7 @@ events:_fileNames } } + console.log(_data) $.ajax({ url:_url, type:'post', diff --git a/cyx-admin/src/main/resources/templates/base/affairs/warn.html b/cyx-admin/src/main/resources/templates/base/affairs/warn.html index f853076..42d96db 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/warn.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/warn.html @@ -181,8 +181,15 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('上传附件 '); - actions.push('查看详情 '); + if (row.status === '1'){ + actions.push('上传附件 '); + }else if (row.status === '2'){ + actions.push('审批 '); + }else if (row.status === '3'){ + actions.push('已驳回 '); + actions.push('重新上传附件 '); + } + actions.push('查看详情 '); // actions.push('编辑 '); // actions.push('删除'); @@ -191,7 +198,36 @@ }] }; $.table.init(options); + $("#bootstrap-table").on('click','.shenhe',function () { + let _id = $(this)[0].dataset.id; + let header = $(this)[0].dataset.header; + let nowScore = $(this)[0].dataset.nowscore; + let deptName = $(this)[0].dataset.deptname; + let shotName = $(this)[0].dataset.shotname; + let reviewer = $(this)[0].dataset.reviewer; + layer.open({ + title:'审批', + area:['40%','50%'], + type:2, + content:'/base/affairs/reviewed', + success(res,index){ + //传值 + parent.a_upload_id = _id; + parent.a_header = header; + parent.a_nowScore = nowScore; + parent.a_deptName = deptName; + parent.a_shotName = shotName; + parent.a_reviewer = reviewer; + parent.a_upload_index = index; + parent.a_upload_type = "1"; + }, + end(){ + $.table.search() + } + }) + }) }); + \ 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 index 9a3ca90..2871dd3 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/year.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/year.html @@ -89,6 +89,10 @@ field: 'target', title: '考核内容' }, + { + field: 'shotName', + title: '简写' + }, { field: 'demand', title: '考核目标', @@ -162,7 +166,7 @@ formatter: function(value, row, index) { var actions = []; actions.push('上传附件 '); - actions.push('查看详情 '); + actions.push('查看详情 '); // actions.push('编辑 '); // actions.push('删除'); diff --git a/cyx-admin/src/main/resources/templates/base/his/add.html b/cyx-admin/src/main/resources/templates/base/his/add.html new file mode 100644 index 0000000..66139a5 --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/his/add.html @@ -0,0 +1,72 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/his/edit.html b/cyx-admin/src/main/resources/templates/base/his/edit.html new file mode 100644 index 0000000..f424903 --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/his/edit.html @@ -0,0 +1,73 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/his/his.html b/cyx-admin/src/main/resources/templates/base/his/his.html new file mode 100644 index 0000000..a70482d --- /dev/null +++ b/cyx-admin/src/main/resources/templates/base/his/his.html @@ -0,0 +1,122 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/cyx-system/src/main/resources/mapper/base/TAmentCommitHisMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentCommitHisMapper.xml new file mode 100644 index 0000000..49a59de --- /dev/null +++ b/cyx-system/src/main/resources/mapper/base/TAmentCommitHisMapper.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + select id, per, commit_time, dept, target, remark, files from t_ament_commit_his + + + + + + + + insert into t_ament_commit_his + + id, + per, + commit_time, + dept, + target, + remark, + files, + + + #{id}, + #{per}, + #{commitTime}, + #{dept}, + #{target}, + #{remark}, + #{files}, + + + + + update t_ament_commit_his + + per = #{per}, + commit_time = #{commitTime}, + dept = #{dept}, + target = #{target}, + remark = #{remark}, + files = #{files}, + + where id = #{id} + + + + delete from t_ament_commit_his where id = #{id} + + + + delete from t_ament_commit_his where id in + + #{id} + + + + \ No newline at end of file diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml index ff3c9e3..739ab80 100644 --- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml +++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -29,29 +30,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, type, files, unit, target, demand, detailed, score,now_score, method, head, reviewed, finish_date, per_id, dept_id, branch_id, create_by, create_time, update_by, update_time, remark from t_ament_party_affairs + select id, type, files, unit, target, status, demand, detailed, score,now_score, method, head, reviewed, finish_date, per_id, dept_id, branch_id, create_by, create_time, update_by, update_time, remark from t_ament_party_affairs @@ -73,8 +90,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + and per = #{per} + and reviewed_time = #{reviewedTime} + and score = #{score} + + + + + + + insert into t_ament_reviewed_his + + id, + per, + reviewed_time, + remark, + score, + + + #{id}, + #{per}, + #{reviewedTime}, + #{remark}, + #{score}, + + + + + update t_ament_reviewed_his + + per = #{per}, + reviewed_time = #{reviewedTime}, + remark = #{remark}, + score = #{score}, + + where id = #{id} + + + + delete from t_ament_reviewed_his where id = #{id} + + + + delete from t_ament_reviewed_his where id in + + #{id} + + + + \ No newline at end of file