From 8cce5b3f94ef66a48fcaf31f7b94678b96f3b1a5 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 19 三月 2024 14:30:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java | 4 ++++
ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml | 4 +++-
ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java | 6 ++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckResultForm.java | 3 +++
ycl-server/src/main/java/com/ycl/platform/service/CheckResultService.java | 8 ++++++++
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java | 12 ++++++++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java | 3 +++
7 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java
index 8c265eb..a453458 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java
@@ -48,5 +48,9 @@
@TableField("check_time")
private LocalDateTime checkTime;
+ @ApiModelProperty("鏄惁鍙戝竷")
+ @TableField("publish")
+ private Integer publish;
+
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckResultForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckResultForm.java
index a95fae8..adc6ffb 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckResultForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckResultForm.java
@@ -51,6 +51,9 @@
@ApiModelProperty("鑰冩牳鏃堕棿")
private LocalDateTime checkTime;
+ @ApiModelProperty("鏄惁鍙戝竷")
+ private Integer publish;
+
public static CheckResult getEntityByForm(@NonNull CheckResultForm form, CheckResult entity) {
if(entity == null) {
entity = new CheckResult();
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java
index 8193294..448e871 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java
@@ -50,6 +50,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime checkTime;
+ /** 鏄惁鍙戝竷 */
+ private Integer publish;
+
public static CheckResultVO getVoByEntity(@NonNull CheckResult entity, CheckResultVO vo) {
if(vo == null) {
vo = new CheckResultVO();
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java
index 3c8fa6d..0ca4a47 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java
@@ -50,6 +50,12 @@
return checkResultService.removeById(id);
}
+ @PutMapping("/publish/{id}")
+ @ApiOperation(value = "ID鍙戝竷", notes = "ID鍙戝竷")
+ public Result publishById(@PathVariable("id") String id) {
+ return checkResultService.publishById(id);
+ }
+
@DeleteMapping("/batch")
@ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/CheckResultService.java b/ycl-server/src/main/java/com/ycl/platform/service/CheckResultService.java
index b605bd8..d89025d 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/CheckResultService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/CheckResultService.java
@@ -70,4 +70,12 @@
* @return
*/
Result manualScore(ManualScoreForm form);
+
+ /**
+ * id鍙戝竷
+ * @param id
+ * @return
+ */
+ Result publishById(String id);
+
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java
index 7bd7801..b8cf58c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java
@@ -1,5 +1,6 @@
package com.ycl.platform.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ycl.exception.ServiceException;
import com.ycl.platform.domain.entity.CheckResult;
import com.ycl.platform.domain.form.ManualScoreForm;
@@ -151,4 +152,15 @@
baseMapper.updateById(checkResult);
return Result.ok();
}
+
+ @Override
+ public Result publishById(String id) {
+ CheckResult checkResult = new CheckResult();
+ checkResult.setId(Integer.valueOf(id));
+ checkResult.setPublish(1);
+ if(baseMapper.updateById(checkResult) > 0) {
+ return Result.ok("鍙戝竷鎴愬姛");
+ }
+ return Result.error("鍙戝竷澶辫触");
+ }
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml
index 1d4ff80..11aedde 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml
@@ -15,6 +15,7 @@
<result column="check_time" property="checkTime" />
<result column="frequency" property="frequency" />
<result column="examine_range" property="examineRange" />
+ <result column="publish" property="publish" />
</resultMap>
<select id="page" resultMap="BaseResultMap">
@@ -27,7 +28,8 @@
tcr.check_time,
tcr.check_score,
tcr.system_score,
- tcr.manual_score
+ tcr.manual_score,
+ tcr.publish
FROM
t_check_result tcr
INNER JOIN t_check_publish tcp ON tcr.check_publish_id = tcp.id
--
Gitblit v1.8.0