From ef6d7cb76d73eff80c93c13536242dac55de687d Mon Sep 17 00:00:00 2001 From: hansha Date: Mon, 15 Apr 2024 16:56:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=AE=B0=E5=BD=95=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SzxcXyAuditRecardController.java | 52 ++- .../ruoyi/szxc/domain/SzxcXyAuditRecard.java | 104 ++++-- .../szxc/mapper/SzxcXyAuditRecardMapper.java | 46 +-- .../service/ISzxcXyAuditRecardService.java | 48 +-- .../impl/SzxcXyAuditRecardServiceImpl.java | 48 +-- .../mapper/szxc/SzxcXyAuditRecardMapper.xml | 50 +-- ruoyi-ui/src/api/szxc/xyrecard.js | 10 +- ruoyi-ui/src/views/szxc/xyrecard/index.vue | 331 +++++++++--------- 8 files changed, 369 insertions(+), 320 deletions(-) diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXyAuditRecardController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXyAuditRecardController.java index 8195801..491527b 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXyAuditRecardController.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXyAuditRecardController.java @@ -1,31 +1,25 @@ package com.ruoyi.szxc.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.szxc.domain.SzxcXyAuditRecard; import com.ruoyi.szxc.service.ISzxcXyAuditRecardService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** - * 心愿审核记录Controller - * + * 审核记录Controller + * * @author hs - * @date 2024-04-13 + * @date 2024-04-15 */ @RestController @RequestMapping("/szxc/xyrecard") @@ -35,7 +29,7 @@ public class SzxcXyAuditRecardController extends BaseController private ISzxcXyAuditRecardService szxcXyAuditRecardService; /** - * 查询心愿审核记录列表 + * 查询审核记录列表 */ @PreAuthorize("@ss.hasPermi('szxc:xyrecard:list')") @GetMapping("/list") @@ -47,20 +41,20 @@ public class SzxcXyAuditRecardController extends BaseController } /** - * 导出心愿审核记录列表 + * 导出审核记录列表 */ @PreAuthorize("@ss.hasPermi('szxc:xyrecard:export')") - @Log(title = "心愿审核记录", businessType = BusinessType.EXPORT) + @Log(title = "审核记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, SzxcXyAuditRecard szxcXyAuditRecard) { List list = szxcXyAuditRecardService.selectSzxcXyAuditRecardList(szxcXyAuditRecard); ExcelUtil util = new ExcelUtil(SzxcXyAuditRecard.class); - util.exportExcel(response, list, "心愿审核记录数据"); + util.exportExcel(response, list, "审核记录数据"); } /** - * 获取心愿审核记录详细信息 + * 获取审核记录详细信息 */ @PreAuthorize("@ss.hasPermi('szxc:xyrecard:query')") @GetMapping(value = "/{id}") @@ -70,10 +64,10 @@ public class SzxcXyAuditRecardController extends BaseController } /** - * 新增心愿审核记录 + * 新增审核记录 */ @PreAuthorize("@ss.hasPermi('szxc:xyrecard:add')") - @Log(title = "心愿审核记录", businessType = BusinessType.INSERT) + @Log(title = "审核记录", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody SzxcXyAuditRecard szxcXyAuditRecard) { @@ -81,10 +75,10 @@ public class SzxcXyAuditRecardController extends BaseController } /** - * 修改心愿审核记录 + * 修改审核记录 */ @PreAuthorize("@ss.hasPermi('szxc:xyrecard:edit')") - @Log(title = "心愿审核记录", businessType = BusinessType.UPDATE) + @Log(title = "审核记录", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody SzxcXyAuditRecard szxcXyAuditRecard) { @@ -92,11 +86,11 @@ public class SzxcXyAuditRecardController extends BaseController } /** - * 删除心愿审核记录 + * 删除审核记录 */ @PreAuthorize("@ss.hasPermi('szxc:xyrecard:remove')") - @Log(title = "心愿审核记录", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") + @Log(title = "审核记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(szxcXyAuditRecardService.deleteSzxcXyAuditRecardByIds(ids)); diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXyAuditRecard.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXyAuditRecard.java index 8782c17..f1e030c 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXyAuditRecard.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXyAuditRecard.java @@ -6,21 +6,33 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 心愿审核记录对象 szxc_xy_audit_recard - * + * 审核记录对象 szxc_xy_audit_recard + * * @author hs - * @date 2024-04-13 + * @date 2024-04-15 */ public class SzxcXyAuditRecard extends BaseEntity { private static final long serialVersionUID = 1L; - /** */ + /** id */ private Long id; - /** 心愿id */ - @Excel(name = "心愿id") - private Long xyId; + /** 审核记录类型(字典) */ + @Excel(name = "审核记录类型(字典)") + private String shRecardType; + + /** 对应记录id */ + @Excel(name = "对应记录id") + private Long jlId; + + /** 审核部门 */ + @Excel(name = "审核部门") + private String auditDept; + + /** 审核人 */ + @Excel(name = "审核人") + private String auditName; /** 审核结果 */ @Excel(name = "审核结果") @@ -30,69 +42,85 @@ public class SzxcXyAuditRecard extends BaseEntity @Excel(name = "审核原因") private String auditReason; - /** 审核人 */ - @Excel(name = "审核人") - private String auditName; - - public void setId(Long id) + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setXyId(Long xyId) + public void setShRecardType(String shRecardType) { - this.xyId = xyId; + this.shRecardType = shRecardType; } - public Long getXyId() + public String getShRecardType() { - return xyId; + return shRecardType; } - public void setAuditResult(String auditResult) + public void setJlId(Long jlId) { - this.auditResult = auditResult; + this.jlId = jlId; } - public String getAuditResult() + public Long getJlId() { - return auditResult; + return jlId; } - public void setAuditReason(String auditReason) + public void setAuditDept(String auditDept) { - this.auditReason = auditReason; + this.auditDept = auditDept; } - public String getAuditReason() + public String getAuditDept() { - return auditReason; + return auditDept; } - public void setAuditName(String auditName) + public void setAuditName(String auditName) { this.auditName = auditName; } - public String getAuditName() + public String getAuditName() { return auditName; } + public void setAuditResult(String auditResult) + { + this.auditResult = auditResult; + } + + public String getAuditResult() + { + return auditResult; + } + public void setAuditReason(String auditReason) + { + this.auditReason = auditReason; + } + + public String getAuditReason() + { + return auditReason; + } @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("xyId", getXyId()) - .append("auditResult", getAuditResult()) - .append("auditReason", getAuditReason()) - .append("auditName", getAuditName()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + .append("id", getId()) + .append("shRecardType", getShRecardType()) + .append("jlId", getJlId()) + .append("auditDept", getAuditDept()) + .append("auditName", getAuditName()) + .append("auditResult", getAuditResult()) + .append("auditReason", getAuditReason()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); } } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcXyAuditRecardMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcXyAuditRecardMapper.java index 4d8cb4f..cb43eab 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcXyAuditRecardMapper.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcXyAuditRecardMapper.java @@ -5,56 +5,56 @@ import com.ruoyi.szxc.domain.SzxcXyAuditRecard; import java.util.List; /** - * 心愿审核记录Mapper接口 - * + * 审核记录Mapper接口 + * * @author hs - * @date 2024-04-13 + * @date 2024-04-15 */ -public interface SzxcXyAuditRecardMapper +public interface SzxcXyAuditRecardMapper { /** - * 查询心愿审核记录 - * - * @param id 心愿审核记录主键 - * @return 心愿审核记录 + * 查询审核记录 + * + * @param id 审核记录主键 + * @return 审核记录 */ public SzxcXyAuditRecard selectSzxcXyAuditRecardById(Long id); /** - * 查询心愿审核记录列表 - * - * @param szxcXyAuditRecard 心愿审核记录 - * @return 心愿审核记录集合 + * 查询审核记录列表 + * + * @param szxcXyAuditRecard 审核记录 + * @return 审核记录集合 */ public List selectSzxcXyAuditRecardList(SzxcXyAuditRecard szxcXyAuditRecard); /** - * 新增心愿审核记录 - * - * @param szxcXyAuditRecard 心愿审核记录 + * 新增审核记录 + * + * @param szxcXyAuditRecard 审核记录 * @return 结果 */ public int insertSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard); /** - * 修改心愿审核记录 - * - * @param szxcXyAuditRecard 心愿审核记录 + * 修改审核记录 + * + * @param szxcXyAuditRecard 审核记录 * @return 结果 */ public int updateSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard); /** - * 删除心愿审核记录 - * - * @param id 心愿审核记录主键 + * 删除审核记录 + * + * @param id 审核记录主键 * @return 结果 */ public int deleteSzxcXyAuditRecardById(Long id); /** - * 批量删除心愿审核记录 - * + * 批量删除审核记录 + * * @param ids 需要删除的数据主键集合 * @return 结果 */ diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcXyAuditRecardService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcXyAuditRecardService.java index 07e091e..2759433 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcXyAuditRecardService.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcXyAuditRecardService.java @@ -5,57 +5,57 @@ import com.ruoyi.szxc.domain.SzxcXyAuditRecard; import java.util.List; /** - * 心愿审核记录Service接口 - * + * 审核记录Service接口 + * * @author hs - * @date 2024-04-13 + * @date 2024-04-15 */ -public interface ISzxcXyAuditRecardService +public interface ISzxcXyAuditRecardService { /** - * 查询心愿审核记录 - * - * @param id 心愿审核记录主键 - * @return 心愿审核记录 + * 查询审核记录 + * + * @param id 审核记录主键 + * @return 审核记录 */ public SzxcXyAuditRecard selectSzxcXyAuditRecardById(Long id); /** - * 查询心愿审核记录列表 - * - * @param szxcXyAuditRecard 心愿审核记录 - * @return 心愿审核记录集合 + * 查询审核记录列表 + * + * @param szxcXyAuditRecard 审核记录 + * @return 审核记录集合 */ public List selectSzxcXyAuditRecardList(SzxcXyAuditRecard szxcXyAuditRecard); /** - * 新增心愿审核记录 - * - * @param szxcXyAuditRecard 心愿审核记录 + * 新增审核记录 + * + * @param szxcXyAuditRecard 审核记录 * @return 结果 */ public int insertSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard); /** - * 修改心愿审核记录 - * - * @param szxcXyAuditRecard 心愿审核记录 + * 修改审核记录 + * + * @param szxcXyAuditRecard 审核记录 * @return 结果 */ public int updateSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard); /** - * 批量删除心愿审核记录 - * - * @param ids 需要删除的心愿审核记录主键集合 + * 批量删除审核记录 + * + * @param ids 需要删除的审核记录主键集合 * @return 结果 */ public int deleteSzxcXyAuditRecardByIds(Long[] ids); /** - * 删除心愿审核记录信息 - * - * @param id 心愿审核记录主键 + * 删除审核记录信息 + * + * @param id 审核记录主键 * @return 结果 */ public int deleteSzxcXyAuditRecardById(Long id); diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXyAuditRecardServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXyAuditRecardServiceImpl.java index 7cbfec2..86f11a0 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXyAuditRecardServiceImpl.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXyAuditRecardServiceImpl.java @@ -10,22 +10,22 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * 心愿审核记录Service业务层处理 - * + * 审核记录Service业务层处理 + * * @author hs - * @date 2024-04-13 + * @date 2024-04-15 */ @Service -public class SzxcXyAuditRecardServiceImpl implements ISzxcXyAuditRecardService +public class SzxcXyAuditRecardServiceImpl implements ISzxcXyAuditRecardService { @Autowired private SzxcXyAuditRecardMapper szxcXyAuditRecardMapper; /** - * 查询心愿审核记录 - * - * @param id 心愿审核记录主键 - * @return 心愿审核记录 + * 查询审核记录 + * + * @param id 审核记录主键 + * @return 审核记录 */ @Override public SzxcXyAuditRecard selectSzxcXyAuditRecardById(Long id) @@ -34,10 +34,10 @@ public class SzxcXyAuditRecardServiceImpl implements ISzxcXyAuditRecardService } /** - * 查询心愿审核记录列表 - * - * @param szxcXyAuditRecard 心愿审核记录 - * @return 心愿审核记录 + * 查询审核记录列表 + * + * @param szxcXyAuditRecard 审核记录 + * @return 审核记录 */ @Override public List selectSzxcXyAuditRecardList(SzxcXyAuditRecard szxcXyAuditRecard) @@ -46,9 +46,9 @@ public class SzxcXyAuditRecardServiceImpl implements ISzxcXyAuditRecardService } /** - * 新增心愿审核记录 - * - * @param szxcXyAuditRecard 心愿审核记录 + * 新增审核记录 + * + * @param szxcXyAuditRecard 审核记录 * @return 结果 */ @Override @@ -59,9 +59,9 @@ public class SzxcXyAuditRecardServiceImpl implements ISzxcXyAuditRecardService } /** - * 修改心愿审核记录 - * - * @param szxcXyAuditRecard 心愿审核记录 + * 修改审核记录 + * + * @param szxcXyAuditRecard 审核记录 * @return 结果 */ @Override @@ -72,9 +72,9 @@ public class SzxcXyAuditRecardServiceImpl implements ISzxcXyAuditRecardService } /** - * 批量删除心愿审核记录 - * - * @param ids 需要删除的心愿审核记录主键 + * 批量删除审核记录 + * + * @param ids 需要删除的审核记录主键 * @return 结果 */ @Override @@ -84,9 +84,9 @@ public class SzxcXyAuditRecardServiceImpl implements ISzxcXyAuditRecardService } /** - * 删除心愿审核记录信息 - * - * @param id 心愿审核记录主键 + * 删除审核记录信息 + * + * @param id 审核记录主键 * @return 结果 */ @Override diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXyAuditRecardMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXyAuditRecardMapper.xml index 0136a2c..a9e7798 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXyAuditRecardMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXyAuditRecardMapper.xml @@ -1,15 +1,17 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + + + + - @@ -18,57 +20,65 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, xy_id, audit_result, audit_reason, audit_name, remark, create_by, create_time, update_by, update_time from szxc_xy_audit_recard + select id, sh_recard_type, jl_id, audit_dept, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from szxc_xy_audit_recard - + - + insert into szxc_xy_audit_recard - xy_id, + sh_recard_type, + jl_id, + audit_dept, + audit_name, audit_result, audit_reason, - audit_name, remark, create_by, create_time, update_by, update_time, - + - #{xyId}, + #{shRecardType}, + #{jlId}, + #{auditDept}, + #{auditName}, #{auditResult}, #{auditReason}, - #{auditName}, #{remark}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, - + update szxc_xy_audit_recard - xy_id = #{xyId}, + sh_recard_type = #{shRecardType}, + jl_id = #{jlId}, + audit_dept = #{auditDept}, + audit_name = #{auditName}, audit_result = #{auditResult}, audit_reason = #{auditReason}, - audit_name = #{auditName}, remark = #{remark}, create_by = #{createBy}, create_time = #{createTime}, @@ -83,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from szxc_xy_audit_recard where id in + delete from szxc_xy_audit_recard where id in #{id} diff --git a/ruoyi-ui/src/api/szxc/xyrecard.js b/ruoyi-ui/src/api/szxc/xyrecard.js index 34d9210..6dce41a 100644 --- a/ruoyi-ui/src/api/szxc/xyrecard.js +++ b/ruoyi-ui/src/api/szxc/xyrecard.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询心愿审核记录列表 +// 查询审核记录列表 export function listXyrecard(query) { return request({ url: '/szxc/xyrecard/list', @@ -9,7 +9,7 @@ export function listXyrecard(query) { }) } -// 查询心愿审核记录详细 +// 查询审核记录详细 export function getXyrecard(id) { return request({ url: '/szxc/xyrecard/' + id, @@ -17,7 +17,7 @@ export function getXyrecard(id) { }) } -// 新增心愿审核记录 +// 新增审核记录 export function addXyrecard(data) { return request({ url: '/szxc/xyrecard', @@ -26,7 +26,7 @@ export function addXyrecard(data) { }) } -// 修改心愿审核记录 +// 修改审核记录 export function updateXyrecard(data) { return request({ url: '/szxc/xyrecard', @@ -35,7 +35,7 @@ export function updateXyrecard(data) { }) } -// 删除心愿审核记录 +// 删除审核记录 export function delXyrecard(id) { return request({ url: '/szxc/xyrecard/' + id, diff --git a/ruoyi-ui/src/views/szxc/xyrecard/index.vue b/ruoyi-ui/src/views/szxc/xyrecard/index.vue index 9babb0f..f296f69 100644 --- a/ruoyi-ui/src/views/szxc/xyrecard/index.vue +++ b/ruoyi-ui/src/views/szxc/xyrecard/index.vue @@ -1,10 +1,26 @@