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

修改bug

Browse Source
This commit is contained in:
lcj
2025-11-20 18:29:41 +08:00
parent a6c92e8ba9
commit e37d118d0c
5 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xinnengyuan/ruoyi-common/ruoyi-common-doc/pom.xml
View File

@ -44,7 +44,7 @@
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
<version>4.5.0</version>
<version>4.4.0</version>
</dependency>
</dependencies>

9
xinnengyuan/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java
View File

@ -110,15 +110,6 @@ public class SpringDocConfig {
}
PlusPaths newPaths = new PlusPaths();
oldPaths.forEach((k, v) -> newPaths.addPathItem(finalContextPath + k, v));
newPaths.forEach((s, pathItem) -> {
// 为所有接口添加鉴权
pathItem.readOperations().forEach(operation -> {
operation.addSecurityItem(new SecurityRequirement()
.addList(HttpHeaders.AUTHORIZATION)
.addList("Clientid")
);
});
});
openApi.setPaths(newPaths);
};
}

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryCreateReq.java
View File

@ -49,19 +49,16 @@ public class PgsProgressCategoryCreateReq implements Serializable {
/**
* 计量单位
*/
@NotBlank(message = "计量单位不能为空")
private String unit;
/**
* 综合单价(业主)
*/
@NotNull(message = "综合单价(业主)不能为空")
private BigDecimal ownerPrice;
/**
* 综合单价(分包)
*/
@NotNull(message = "综合单价(分包)不能为空")
private BigDecimal constructionPrice;
/**

21
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/WgzQuestionSaveController.java
View File

@ -1,27 +1,18 @@
package org.dromara.safety.controller;
import java.util.Arrays;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
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.safety.domain.WgzQuestionSave;
import org.dromara.safety.domain.bo.WgzQuestionSaveBo;
import org.dromara.safety.domain.bo.WgzQuestionSavePdfBo;
import org.dromara.safety.domain.vo.WgzQuestionSavePdfVo;
import org.dromara.safety.domain.vo.WgzQuestionSaveVo;
import org.dromara.safety.service.IWgzQuestionSavePdfService;
import org.dromara.safety.service.IWgzQuestionSaveService;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 用户试卷存储Controller
*
@ -34,8 +25,6 @@ import org.springframework.validation.annotation.Validated;
@RequestMapping("/safety/wgzQuestionSave")
public class WgzQuestionSaveController extends BaseController {
private final IWgzQuestionSaveService iWgzQuestionSaveService;
private final IWgzQuestionSavePdfService iwgzQuestionSavePdfService;
/**
@ -44,7 +33,7 @@ public class WgzQuestionSaveController extends BaseController {
@SaCheckPermission("safety:wgzQuestionSave:listPdf")
@GetMapping("/listPdf")
public TableDataInfo<WgzQuestionSavePdfVo> list(@Validated WgzQuestionSavePdfBo bo, PageQuery pageQuery) {
return iwgzQuestionSavePdfService.queryPageList(bo,pageQuery);
return iwgzQuestionSavePdfService.queryPageList(bo, pageQuery);
}
// /**

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelServiceImpl.java
View File

@ -388,13 +388,14 @@ public class HseViolationLevelServiceImpl extends ServiceImpl<HseViolationLevelM
lqw.like(StringUtils.isNotBlank(violationLevel), HseViolationLevel::getViolationLevel, violationLevel);
lqw.eq(StringUtils.isNotBlank(riskType), HseViolationLevel::getRiskType, riskType);
if (StringUtils.isNotBlank(violationType)) {
lqw.likeRight(HseViolationLevel::getViolationType, violationType + ",")
lqw.and(wrapper ->
wrapper.likeRight(HseViolationLevel::getViolationType, violationType + ",")
.or()
.likeLeft(HseViolationLevel::getViolationType, "," + violationType)
.or()
.like(HseViolationLevel::getViolationType, "," + violationType + ",")
.or()
.eq(HseViolationLevel::getViolationType, violationType);
.eq(HseViolationLevel::getViolationType, violationType));
}
return lqw;
}