lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11-5-修改

Browse Source
This commit is contained in:
青云
2025-11-05 16:18:32 +08:00
parent fae046885e
commit 30f916f8eb
4 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdBusinessSealController.java
View File

@ -1,26 +1,26 @@
package org.dromara.xzd.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.xzd.domain.vo.XzdBusinessSealVo;
import org.dromara.xzd.domain.bo.XzdBusinessSealBo;
import org.dromara.xzd.service.IXzdBusinessSealService;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.xzd.domain.bo.XzdBusinessSealBo;
import org.dromara.xzd.domain.vo.XzdBusinessSealVo;
import org.dromara.xzd.service.IXzdBusinessSealService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 印章帮助
@ -39,7 +39,7 @@ public class XzdBusinessSealController extends BaseController {
/**
* 查询印章帮助列表
*/
@SaCheckPermission("xzd:businessSeal:list")
// @SaCheckPermission("xzd:businessSeal:list")
@GetMapping("/list")
public TableDataInfo<XzdBusinessSealVo> list(XzdBusinessSealBo bo, PageQuery pageQuery) {
return xzdBusinessSealService.queryPageList(bo, pageQuery);
@ -48,7 +48,7 @@ public class XzdBusinessSealController extends BaseController {
/**
* 导出印章帮助列表
*/
@SaCheckPermission("xzd:businessSeal:export")
// @SaCheckPermission("xzd:businessSeal:export")
@Log(title = "印章帮助", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(XzdBusinessSealBo bo, HttpServletResponse response) {
@ -61,7 +61,7 @@ public class XzdBusinessSealController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("xzd:businessSeal:query")
// @SaCheckPermission("xzd:businessSeal:query")
@GetMapping("/{id}")
public R<XzdBusinessSealVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
@ -71,7 +71,7 @@ public class XzdBusinessSealController extends BaseController {
/**
* 新增印章帮助
*/
@SaCheckPermission("xzd:businessSeal:add")
// @SaCheckPermission("xzd:businessSeal:add")
@Log(title = "印章帮助", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@ -82,7 +82,7 @@ public class XzdBusinessSealController extends BaseController {
/**
* 修改印章帮助
*/
@SaCheckPermission("xzd:businessSeal:edit")
// @SaCheckPermission("xzd:businessSeal:edit")
@Log(title = "印章帮助", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@ -95,7 +95,7 @@ public class XzdBusinessSealController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("xzd:businessSeal:remove")
// @SaCheckPermission("xzd:businessSeal:remove")
@Log(title = "印章帮助", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectManagerApprovalBo.java
View File

@ -1,11 +1,9 @@
package org.dromara.xzd.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.domain.XzdProjectManagerApproval;
@ -58,7 +56,7 @@ public class XzdProjectManagerApprovalBo extends BaseEntity {
/**
* 项目名称
*/
@NotBlank(message = "项目名称不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotBlank(message = "项目名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String projectName;
/**

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java
View File

@ -240,7 +240,7 @@ public class XzdContractDetailsVo implements Serializable {
/**
* 签约组织名称
*/
@Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "signingOrganization")
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "signingOrganization")
private String signingOrganizationName;
/**

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdProjectMapper.xml
View File

@ -28,6 +28,7 @@
approval2.prospective_manager_name as managerExecutionName,
profile.project_address as xmdz,
project.management_organization as managementOrganization,
dept.dept_name as managementOrganizationName,
project.construction_unit as constructionUnit,
profile.country as gj,
profile.province as sheng,
@ -44,9 +45,8 @@
FROM xzd_project as project
LEFT JOIN xzd_project_profile as profile ON project.id = profile.xzd_project_id
# LEFT JOIN sys_user as user ON project.manager_execution = user.user_id
# LEFT JOIN xzd_project_manager_approval as approval3 ON project.filing_manager = approval3.id
LEFT JOIN sys_user as user3 ON project.create_by = user3.user_id
LEFT JOIN sys_dept as dept ON project.management_organization = dept.dept_id
LEFT JOIN xzd_project_type as type ON project.project_type = type.id
LEFT JOIN xzd_project_manager_approval as approval1 ON project.filing_manager = approval1.id
LEFT JOIN xzd_project_manager_approval as approval2 ON project.manager_execution = approval2.id