From dd3cdb75d0b444b40d373977bc2d1d185d04e986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?= <14103883+leaf-phos@user.noreply.gitee.com> Date: Fri, 18 Oct 2024 18:08:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4=EF=BC=88?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=EF=BC=8C=E5=9C=A8=E5=81=9A=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=8D=95=E4=BB=B7=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/core/domain/BaseEntity.java | 13 +- .../framework/aspectj/DataScopeAspect.java | 105 ++--------- .../ruoyi/framework/util/DataScopeUtil.java | 153 ++++++++++++++++ .../yh/price/controller/PriceController.java | 11 ++ .../ruoyi/web/yh/price/domain/PriceQuery.java | 3 + .../ruoyi/web/yh/price/mapper/PriceMapper.xml | 7 + .../service/impl/PriceConverterImpl.java | 4 +- .../report/controller/ReportController.java | 107 +++++++++++ .../ruoyi/web/yh/report/domain/Report.java | 103 +++++++++++ .../web/yh/report/domain/ReportQuery.java | 13 ++ .../ruoyi/web/yh/report/domain/ReportVO.java | 18 ++ .../web/yh/report/mapper/ReportMapper.java | 64 +++++++ .../web/yh/report/mapper/ReportMapper.xml | 172 ++++++++++++++++++ .../web/yh/report/service/IReportService.java | 63 +++++++ .../service/impl/ReportServiceImpl.java | 98 ++++++++++ 15 files changed, 838 insertions(+), 96 deletions(-) create mode 100644 common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/util/DataScopeUtil.java create mode 100644 ruoyi-web/src/main/java/com/ruoyi/web/yh/report/controller/ReportController.java create mode 100644 ruoyi-web/src/main/java/com/ruoyi/web/yh/report/domain/Report.java create mode 100644 ruoyi-web/src/main/java/com/ruoyi/web/yh/report/domain/ReportQuery.java create mode 100644 ruoyi-web/src/main/java/com/ruoyi/web/yh/report/domain/ReportVO.java create mode 100644 ruoyi-web/src/main/java/com/ruoyi/web/yh/report/mapper/ReportMapper.java create mode 100644 ruoyi-web/src/main/java/com/ruoyi/web/yh/report/mapper/ReportMapper.xml create mode 100644 ruoyi-web/src/main/java/com/ruoyi/web/yh/report/service/IReportService.java create mode 100644 ruoyi-web/src/main/java/com/ruoyi/web/yh/report/service/impl/ReportServiceImpl.java diff --git a/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index 15bf66b..2f3eca9 100644 --- a/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; /** * Entity基类 - * + * * @author ruoyi */ public class BaseEntity implements Serializable @@ -38,10 +38,21 @@ public class BaseEntity implements Serializable /** 备注 */ private String remark; + /** 是否需要数据隔离 */ + private Boolean needScope; + /** 请求参数 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map params; + public Boolean getNeedScope() { + return needScope; + } + + public void setNeedScope(Boolean needScope) { + this.needScope = needScope; + } + public String getSearchValue() { return searchValue; diff --git a/common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java index b2337c9..cd4c434 100644 --- a/common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java @@ -2,6 +2,8 @@ package com.ruoyi.framework.aspectj; import java.util.ArrayList; import java.util.List; + +import com.ruoyi.framework.util.DataScopeUtil; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; @@ -26,30 +28,6 @@ import com.ruoyi.framework.security.context.PermissionContextHolder; @Component public class DataScopeAspect { - /** - * 全部数据权限 - */ - public static final String DATA_SCOPE_ALL = "1"; - - /** - * 自定数据权限 - */ - public static final String DATA_SCOPE_CUSTOM = "2"; - - /** - * 部门数据权限 - */ - public static final String DATA_SCOPE_DEPT = "3"; - - /** - * 部门及以下数据权限 - */ - public static final String DATA_SCOPE_DEPT_AND_CHILD = "4"; - - /** - * 仅本人数据权限 - */ - public static final String DATA_SCOPE_SELF = "5"; /** * 数据权限过滤关键字 @@ -90,81 +68,22 @@ public class DataScopeAspect */ public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, String permission) { - StringBuilder sqlString = new StringBuilder(); - List conditions = new ArrayList(); - List scopeCustomIds = new ArrayList(); - user.getRoles().forEach(role -> { - if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))) - { - scopeCustomIds.add(Convert.toStr(role.getRoleId())); - } - }); - - for (SysRole role : user.getRoles()) - { - String dataScope = role.getDataScope(); - if (conditions.contains(dataScope) || StringUtils.equals(role.getStatus(), UserConstants.ROLE_DISABLE)) - { - continue; - } - if (!StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))) - { - continue; - } - if (DATA_SCOPE_ALL.equals(dataScope)) - { - sqlString = new StringBuilder(); - conditions.add(dataScope); - break; - } - else if (DATA_SCOPE_CUSTOM.equals(dataScope)) - { - if (scopeCustomIds.size() > 1) - { - // 多个自定数据权限使用in查询，避免多次拼接。 - sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, String.join(",", scopeCustomIds))); - } - else - { - sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId())); - } - } - else if (DATA_SCOPE_DEPT.equals(dataScope)) - { - sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId())); - } - else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) - { - sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, user.getDeptId(), user.getDeptId())); - } - else if (DATA_SCOPE_SELF.equals(dataScope)) - { - if (StringUtils.isNotBlank(userAlias)) - { - sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId())); - } - else - { - // 数据权限为仅本人且没有userAlias别名不查询任何数据 - sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias)); - } - } - conditions.add(dataScope); - } - - // 角色都不包含传递过来的权限字符，这个时候sqlString也会为空，所以要限制一下,不查询任何数据 - if (StringUtils.isEmpty(conditions)) - { - sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias)); - } + StringBuilder sqlString = DataScopeUtil.getSqlString(user, deptAlias, userAlias, permission); + JoinSqlString(joinPoint, sqlString); + } + /** + * 将sql拼接 + * @param joinPoint 切点 + * @param sqlString sql字符串 + */ + private static void JoinSqlString(JoinPoint joinPoint, StringBuilder sqlString) { if (StringUtils.isNotBlank(sqlString.toString())) { Object params = joinPoint.getArgs()[0]; if (StringUtils.isNotNull(params) && params instanceof BaseEntity) { - BaseEntity baseEntity = (BaseEntity) params; - baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")"); + DataScopeUtil.joinSqlString((BaseEntity) params, sqlString); } } } diff --git a/common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/util/DataScopeUtil.java b/common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/util/DataScopeUtil.java new file mode 100644 index 0000000..6ff15ca --- /dev/null +++ b/common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/util/DataScopeUtil.java @@ -0,0 +1,153 @@ +package com.ruoyi.framework.util; + +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.framework.security.context.PermissionContextHolder; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author wjh + * 2024/6/13 + * 更新时间 2024-10-18 + */ +public class DataScopeUtil { + + /** + * 数据权限过滤关键字 + */ + public static final String DATA_SCOPE = "dataScope"; + + /** + * 全部数据权限 + */ + public static final String DATA_SCOPE_ALL = "1"; + + /** + * 自定数据权限 + */ + public static final String DATA_SCOPE_CUSTOM = "2"; + + /** + * 部门数据权限 + */ + public static final String DATA_SCOPE_DEPT = "3"; + + /** + * 部门及以下数据权限 + */ + public static final String DATA_SCOPE_DEPT_AND_CHILD = "4"; + + /** + * 仅本人数据权限 + */ + public static final String DATA_SCOPE_SELF = "5"; + + public static String dataScope(String deptAlias, String userAlias, boolean needScope) { + if (needScope) { + // 获取当前的用户 + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (StringUtils.isNotNull(loginUser)) + { + SysUser currentUser = loginUser.getUser(); + // 如果是超级管理员，则不过滤数据 + if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) + { + StringBuilder sqlString = getSqlString(currentUser, deptAlias, userAlias, PermissionContextHolder.getContext()); + return getJoinSqlString(sqlString, ""); + } + } + } + return ""; + } + + public static StringBuilder getSqlString(SysUser user, String deptAlias, String userAlias, String permission) { + + StringBuilder sqlString = new StringBuilder(); + List conditions = new ArrayList(); + List scopeCustomIds = new ArrayList(); + user.getRoles().forEach(role -> { + if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))) + { + scopeCustomIds.add(Convert.toStr(role.getRoleId())); + } + }); + + for (SysRole role : user.getRoles()) + { + String dataScope = role.getDataScope(); + if (conditions.contains(dataScope) || StringUtils.equals(role.getStatus(), UserConstants.ROLE_DISABLE)) + { + continue; + } + if (!StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))) + { + continue; + } + if (DATA_SCOPE_ALL.equals(dataScope)) + { + sqlString = new StringBuilder(); + conditions.add(dataScope); + break; + } + else if (DATA_SCOPE_CUSTOM.equals(dataScope)) + { + if (scopeCustomIds.size() > 1) + { + // 多个自定数据权限使用in查询，避免多次拼接。 + sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, String.join(",", scopeCustomIds))); + } + else + { + sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId())); + } + } + else if (DATA_SCOPE_DEPT.equals(dataScope)) + { + sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId())); + } + else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) + { + sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, user.getDeptId(), user.getDeptId())); + } + else if (DATA_SCOPE_SELF.equals(dataScope)) + { + if (StringUtils.isNotBlank(userAlias)) + { + sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId())); + } + else + { + // 数据权限为仅本人且没有userAlias别名不查询任何数据 + sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias)); + } + } + conditions.add(dataScope); + } + + // 角色都不包含传递过来的权限字符，这个时候sqlString也会为空，所以要限制一下,不查询任何数据 + if (StringUtils.isEmpty(conditions)) + { + sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias)); + } + + return sqlString; + } + + public static void joinSqlString(BaseEntity baseEntity, StringBuilder sqlString) { + String scope = (String) baseEntity.getParams().get(DATA_SCOPE); + baseEntity.getParams().put(DATA_SCOPE, getJoinSqlString(sqlString, scope)); + } + + private static String getJoinSqlString(StringBuilder sqlString, String scope) { + return " AND (" + scope + sqlString.substring(4) + ")"; + } + +} diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/yh/price/controller/PriceController.java b/ruoyi-web/src/main/java/com/ruoyi/web/yh/price/controller/PriceController.java index db75e4f..d25e944 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/yh/price/controller/PriceController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/yh/price/controller/PriceController.java @@ -50,6 +50,17 @@ public class PriceController extends BaseController return getDataTable(list); } + @PreAuthorize("@ss.hasPermi('yh:price:list')") + @PostMapping("/listByIds") + public AjaxResult listByIds(@RequestBody List priceIds) + { + PriceQuery query = new PriceQuery(); + query.setPriceIds(priceIds); + query.setNeedScope(true); + List list = priceService.selectPriceList(query); + return success(list); + } + @PreAuthorize("@ss.hasPermi('yh:price:export')") @Log(title = "单价", businessType = BusinessType.EXPORT) @PostMapping("/export") diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/yh/price/domain/PriceQuery.java b/ruoyi-web/src/main/java/com/ruoyi/web/yh/price/domain/PriceQuery.java index 298676c..31ba699 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/yh/price/domain/PriceQuery.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/yh/price/domain/PriceQuery.java @@ -17,4 +17,7 @@ public class PriceQuery extends PriceVO { @ApiModelProperty("状态列表") private List statusList; + @ApiModelProperty("单价ID列表") + private List priceIds; + } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/yh/price/mapper/PriceMapper.xml b/ruoyi-web/src/main/java/com/ruoyi/web/yh/price/mapper/PriceMapper.xml index d6f8342..d781f64 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/yh/price/mapper/PriceMapper.xml +++ b/ruoyi-web/src/main/java/com/ruoyi/web/yh/price/mapper/PriceMapper.xml @@ -65,6 +65,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item} + + and bp.price_id in + + #{item} + + + ${@com.ruoyi.framework.util.DataScopeUtil@dataScope("sd", null, query.needScope)} ${query.params.dataScope} diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/yh/price/service/impl/PriceConverterImpl.java b/ruoyi-web/src/main/java/com/ruoyi/web/yh/price/service/impl/PriceConverterImpl.java index 5cab8a8..18851b7 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/yh/price/service/impl/PriceConverterImpl.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/yh/price/service/impl/PriceConverterImpl.java @@ -26,7 +26,7 @@ public class PriceConverterImpl implements PriceConverter { LoginUser loginUser = SecurityUtils.getLoginUser(); Price po = new Price(); - po.setStatus(PriceStatus.WAIT_SUBMIT.getStatus()); + po.setStatus(PriceStatus.WAIT_VERIFY.getStatus()); po.setDisabled(false); po.setDeptId(data.getDeptId()); po.setCategory(data.getCategory()); @@ -53,7 +53,7 @@ public class PriceConverterImpl implements PriceConverter { LoginUser loginUser = SecurityUtils.getLoginUser(); Price po = new Price(); - po.setStatus(PriceStatus.WAIT_SUBMIT.getStatus()); + po.setStatus(PriceStatus.WAIT_VERIFY.getStatus()); po.setPriceId(data.getPriceId()); po.setDeptId(data.getDeptId()); po.setCategory(data.getCategory()); diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/controller/ReportController.java b/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/controller/ReportController.java new file mode 100644 index 0000000..e609399 --- /dev/null +++ b/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/controller/ReportController.java @@ -0,0 +1,107 @@ +package com.ruoyi.web.yh.report.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.web.yh.report.domain.Report; +import com.ruoyi.web.yh.report.domain.ReportVO; +import com.ruoyi.web.yh.report.domain.ReportQuery; +import com.ruoyi.web.yh.report.service.IReportService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 报表Controller + * + * @author ruoyi + * @date 2024-10-18 + */ +@RestController +@RequestMapping("/yh/report") +public class ReportController extends BaseController +{ + @Autowired + private IReportService reportService; + + /** + * 查询报表列表 + */ + @PreAuthorize("@ss.hasPermi('yh:report:list')") + @GetMapping("/list") + public TableDataInfo list(ReportQuery query) + { + startPage(); + startOrderBy(); + List list = reportService.selectReportList(query); + return getDataTable(list); + } + + /** + * 导出报表列表 + */ + @PreAuthorize("@ss.hasPermi('yh:report:export')") + @Log(title = "报表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ReportQuery query) + { + List list = reportService.selectReportList(query); + ExcelUtil util = new ExcelUtil(ReportVO.class); + util.exportExcel(response, list, "报表数据"); + } + + /** + * 获取报表详细信息 + */ + @PreAuthorize("@ss.hasPermi('yh:report:query')") + @GetMapping(value = "/{reportId}") + public AjaxResult getInfo(@PathVariable("reportId") Long reportId) + { + return success(reportService.selectReportByReportId(reportId)); + } + + /** + * 新增报表 + */ + @PreAuthorize("@ss.hasPermi('yh:report:add')") + @Log(title = "报表", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody Report report) + { + return toAjax(reportService.insertReport(report)); + } + + /** + * 修改报表 + */ + @PreAuthorize("@ss.hasPermi('yh:report:edit')") + @Log(title = "报表", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody Report report) + { + return toAjax(reportService.updateReport(report)); + } + + /** + * 删除报表 + */ + @PreAuthorize("@ss.hasPermi('yh:report:remove')") + @Log(title = "报表", businessType = BusinessType.DELETE) + @DeleteMapping("/{reportIds}") + public AjaxResult remove(@PathVariable Long[] reportIds) + { + return toAjax(reportService.deleteReportByReportIds(reportIds)); + } +} diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/domain/Report.java b/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/domain/Report.java new file mode 100644 index 0000000..6a97b16 --- /dev/null +++ b/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/domain/Report.java @@ -0,0 +1,103 @@ +package com.ruoyi.web.yh.report.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 报表对象 bst_report + * + * @author ruoyi + * @date 2024-10-18 + */ +@Data +public class Report extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + private Long reportId; + + @Excel(name = "部门ID") + @ApiModelProperty("部门ID") + private Long deptId; + + @Excel(name = "工序完成数量") + @ApiModelProperty("工序完成数量") + private BigDecimal num; + + @Excel(name = "状态", readConverterExp = "1=未提交,2=待审核,3=已通过,4=已驳回") + @ApiModelProperty("状态") + private String status; + + @Excel(name = "单价ID") + @ApiModelProperty("单价ID") + private Long priceId; + + @Excel(name = "单价类别") + @ApiModelProperty("单价类别") + private String priceCategory; + + @Excel(name = "单价大小") + @ApiModelProperty("单价大小") + private String priceSize; + + @Excel(name = "单价工序名称") + @ApiModelProperty("单价工序名称") + private String priceName; + + @Excel(name = "单价子工序名称") + @ApiModelProperty("单价子工序名称") + private String priceSubName; + + @Excel(name = "单价图案") + @ApiModelProperty("单价图案") + private String pricePattern; + + @Excel(name = "单价规格") + @ApiModelProperty("单价规格") + private String priceSpec; + + @Excel(name = "单价单价(元)") + @ApiModelProperty("单价单价(元)") + private BigDecimal pricePrice; + + @Excel(name = "单价单位") + @ApiModelProperty("单价单位") + private String priceUnit; + + @Excel(name = "单价分类") + @ApiModelProperty("单价分类") + private String priceClassify; + + @Excel(name = "单价生产数量倍数(个)") + @ApiModelProperty("单价生产数量倍数(个)") + private BigDecimal priceQuantity; + + @Excel(name = "创建人ID") + @ApiModelProperty("创建人ID") + private Long createId; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("审核时间") + private Date verifyTime; + + @Excel(name = "审核人ID") + @ApiModelProperty("审核人ID") + private Long verifyId; + + @Excel(name = "审核人名称") + @ApiModelProperty("审核人名称") + private String verifyBy; + + @Excel(name = "更新人ID") + @ApiModelProperty("更新人ID") + private Long updateId; + +} diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/domain/ReportQuery.java b/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/domain/ReportQuery.java new file mode 100644 index 0000000..70f4fe9 --- /dev/null +++ b/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/domain/ReportQuery.java @@ -0,0 +1,13 @@ +package com.ruoyi.web.yh.report.domain; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author wjh + * 2024/10/18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ReportQuery extends ReportVO { +} diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/domain/ReportVO.java b/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/domain/ReportVO.java new file mode 100644 index 0000000..5a19b7e --- /dev/null +++ b/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/domain/ReportVO.java @@ -0,0 +1,18 @@ +package com.ruoyi.web.yh.report.domain; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author wjh + * 2024/10/18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ReportVO extends Report { + + @ApiModelProperty("部门名称") + private String deptName; + +} diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/mapper/ReportMapper.java b/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/mapper/ReportMapper.java new file mode 100644 index 0000000..2bf3602 --- /dev/null +++ b/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/mapper/ReportMapper.java @@ -0,0 +1,64 @@ +package com.ruoyi.web.yh.report.mapper; + +import java.util.List; +import com.ruoyi.web.yh.report.domain.Report; +import com.ruoyi.web.yh.report.domain.ReportVO; +import com.ruoyi.web.yh.report.domain.ReportQuery; +import org.apache.ibatis.annotations.Param; + +/** + * 报表Mapper接口 + * + * @author ruoyi + * @date 2024-10-18 + */ +public interface ReportMapper +{ + /** + * 查询报表 + * + * @param reportId 报表主键 + * @return 报表 + */ + public ReportVO selectReportByReportId(Long reportId); + + /** + * 查询报表列表 + * + * @param query 报表 + * @return 报表集合 + */ + public List selectReportList(@Param("query")ReportQuery query); + + /** + * 新增报表 + * + * @param report 报表 + * @return 结果 + */ + public int insertReport(Report report); + + /** + * 修改报表 + * + * @param report 报表 + * @return 结果 + */ + public int updateReport(@Param("data") Report report); + + /** + * 删除报表 + * + * @param reportId 报表主键 + * @return 结果 + */ + public int deleteReportByReportId(Long reportId); + + /** + * 批量删除报表 + * + * @param reportIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteReportByReportIds(Long[] reportIds); +} diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/mapper/ReportMapper.xml b/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/mapper/ReportMapper.xml new file mode 100644 index 0000000..e597075 --- /dev/null +++ b/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/mapper/ReportMapper.xml @@ -0,0 +1,172 @@ + + + + + + + + select + br.report_id, + br.dept_id, + br.num, + br.status, + br.price_id, + br.price_category, + br.price_size, + br.price_name, + br.price_sub_name, + br.price_pattern, + br.price_spec, + br.price_price, + br.price_unit, + br.price_classify, + br.price_quantity, + br.create_time, + br.create_id, + br.create_by, + br.verify_time, + br.verify_id, + br.verify_by, + br.update_time, + br.update_id, + br.update_by, + sd.dept_name as dept_name + from bst_report br + left join sys_dept sd on sd.dept_id = br.dept_id + + + + and br.report_id = #{query.reportId} + and br.dept_id = #{query.deptId} + and br.status = #{query.status} + and br.price_id = #{query.priceId} + and br.price_category like concat('%', #{query.priceCategory}, '%') + and br.price_size like concat('%', #{query.priceSize}, '%') + and br.price_name like concat('%', #{query.priceName}, '%') + and br.price_sub_name like concat('%', #{query.priceSubName}, '%') + and br.price_pattern like concat('%', #{query.pricePattern}, '%') + and br.price_spec like concat('%', #{query.priceSpec}, '%') + and br.price_unit like concat('%', #{query.priceUnit}, '%') + and br.price_classify like concat('%', #{query.priceClassify}, '%') + and br.create_id = #{query.createId} + and br.create_by like concat('%', #{query.createBy}, '%') + and br.verify_id = #{query.verifyId} + and br.verify_by like concat('%', #{query.verifyBy}, '%') + and br.update_id = #{query.updateId} + and br.update_by like concat('%', #{query.updateBy}, '%') + ${query.params.dataScope} + + + + + + + + insert into bst_report + + dept_id, + num, + status, + price_id, + price_category, + price_size, + price_name, + price_sub_name, + price_pattern, + price_spec, + price_price, + price_unit, + price_classify, + price_quantity, + create_time, + create_id, + create_by, + verify_time, + verify_id, + verify_by, + update_time, + update_id, + update_by, + + + #{deptId}, + #{num}, + #{status}, + #{priceId}, + #{priceCategory}, + #{priceSize}, + #{priceName}, + #{priceSubName}, + #{pricePattern}, + #{priceSpec}, + #{pricePrice}, + #{priceUnit}, + #{priceClassify}, + #{priceQuantity}, + #{createTime}, + #{createId}, + #{createBy}, + #{verifyTime}, + #{verifyId}, + #{verifyBy}, + #{updateTime}, + #{updateId}, + #{updateBy}, + + + + + update bst_report + + + + where report_id = #{data.reportId} + + + + dept_id = #{data.deptId}, + num = #{data.num}, + status = #{data.status}, + price_id = #{data.priceId}, + price_category = #{data.priceCategory}, + price_size = #{data.priceSize}, + price_name = #{data.priceName}, + price_sub_name = #{data.priceSubName}, + price_pattern = #{data.pricePattern}, + price_spec = #{data.priceSpec}, + price_price = #{data.pricePrice}, + price_unit = #{data.priceUnit}, + price_classify = #{data.priceClassify}, + price_quantity = #{data.priceQuantity}, + create_time = #{data.createTime}, + create_id = #{data.createId}, + create_by = #{data.createBy}, + verify_time = #{data.verifyTime}, + verify_id = #{data.verifyId}, + verify_by = #{data.verifyBy}, + update_time = #{data.updateTime}, + update_id = #{data.updateId}, + update_by = #{data.updateBy}, + + + + delete from bst_report where report_id = #{reportId} + + + + delete from bst_report where report_id in + + #{reportId} + + + diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/service/IReportService.java b/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/service/IReportService.java new file mode 100644 index 0000000..8df1804 --- /dev/null +++ b/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/service/IReportService.java @@ -0,0 +1,63 @@ +package com.ruoyi.web.yh.report.service; + +import java.util.List; +import com.ruoyi.web.yh.report.domain.Report; +import com.ruoyi.web.yh.report.domain.ReportVO; +import com.ruoyi.web.yh.report.domain.ReportQuery; + +/** + * 报表Service接口 + * + * @author ruoyi + * @date 2024-10-18 + */ +public interface IReportService +{ + /** + * 查询报表 + * + * @param reportId 报表主键 + * @return 报表 + */ + public ReportVO selectReportByReportId(Long reportId); + + /** + * 查询报表列表 + * + * @param report 报表 + * @return 报表集合 + */ + public List selectReportList(ReportQuery report); + + /** + * 新增报表 + * + * @param report 报表 + * @return 结果 + */ + public int insertReport(Report report); + + /** + * 修改报表 + * + * @param report 报表 + * @return 结果 + */ + public int updateReport(Report report); + + /** + * 批量删除报表 + * + * @param reportIds 需要删除的报表主键集合 + * @return 结果 + */ + public int deleteReportByReportIds(Long[] reportIds); + + /** + * 删除报表信息 + * + * @param reportId 报表主键 + * @return 结果 + */ + public int deleteReportByReportId(Long reportId); +} diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/service/impl/ReportServiceImpl.java b/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/service/impl/ReportServiceImpl.java new file mode 100644 index 0000000..de87236 --- /dev/null +++ b/ruoyi-web/src/main/java/com/ruoyi/web/yh/report/service/impl/ReportServiceImpl.java @@ -0,0 +1,98 @@ +package com.ruoyi.web.yh.report.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.web.yh.report.mapper.ReportMapper; +import com.ruoyi.web.yh.report.domain.Report; +import com.ruoyi.web.yh.report.domain.ReportVO; +import com.ruoyi.web.yh.report.domain.ReportQuery; +import com.ruoyi.web.yh.report.service.IReportService; + +/** + * 报表Service业务层处理 + * + * @author ruoyi + * @date 2024-10-18 + */ +@Service +public class ReportServiceImpl implements IReportService +{ + @Autowired + private ReportMapper reportMapper; + + /** + * 查询报表 + * + * @param reportId 报表主键 + * @return 报表 + */ + @Override + public ReportVO selectReportByReportId(Long reportId) + { + return reportMapper.selectReportByReportId(reportId); + } + + /** + * 查询报表列表 + * + * @param report 报表 + * @return 报表 + */ + @Override + public List selectReportList(ReportQuery report) + { + return reportMapper.selectReportList(report); + } + + /** + * 新增报表 + * + * @param report 报表 + * @return 结果 + */ + @Override + public int insertReport(Report report) + { + report.setCreateTime(DateUtils.getNowDate()); + return reportMapper.insertReport(report); + } + + /** + * 修改报表 + * + * @param report 报表 + * @return 结果 + */ + @Override + public int updateReport(Report report) + { + report.setUpdateTime(DateUtils.getNowDate()); + return reportMapper.updateReport(report); + } + + /** + * 批量删除报表 + * + * @param reportIds 需要删除的报表主键 + * @return 结果 + */ + @Override + public int deleteReportByReportIds(Long[] reportIds) + { + return reportMapper.deleteReportByReportIds(reportIds); + } + + /** + * 删除报表信息 + * + * @param reportId 报表主键 + * @return 结果 + */ + @Override + public int deleteReportByReportId(Long reportId) + { + return reportMapper.deleteReportByReportId(reportId); + } +}