From fd4f112458cbb1ea0f3f1177b185c6271f864ad3 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 21 三月 2024 16:32:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java | 4 +++-
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java | 2 ++
ycl-server/src/main/java/com/ycl/platform/controller/TExamineScoreController.java | 10 +++++-----
ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml | 2 ++
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java
index 04b1b88..6663ea8 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java
@@ -51,5 +51,7 @@
@TableField("auditing_user")
private Integer auditingUser;
-
+ @ApiModelProperty("鍒涘缓浜�")
+ @TableField("create_by")
+ private String createBy;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java
index ce9cc46..a985b09 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java
@@ -1,5 +1,6 @@
package com.ycl.platform.domain.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.DefaultAuditing;
@@ -57,6 +58,7 @@
private Integer auditingUser;
private String auditingUserName;
+ private String createBy;
public static DefaultAuditingVO getVoByEntity(@NonNull DefaultAuditing entity, DefaultAuditingVO vo) {
if(vo == null) {
vo = new DefaultAuditingVO();
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/TExamineScoreController.java b/ycl-server/src/main/java/com/ycl/platform/controller/TExamineScoreController.java
index 5e33e12..1b5fdb9 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/TExamineScoreController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/TExamineScoreController.java
@@ -44,7 +44,7 @@
/**
* 瀵煎嚭鑰冩牳璁″垎鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('platform:score:export')")
+// @PreAuthorize("@ss.hasPermi('platform:score:export')")
@Log(title = "鑰冩牳璁″垎", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, TExamineScore tExamineScore)
@@ -57,7 +57,7 @@
/**
* 鑾峰彇鑰冩牳璁″垎璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('platform:score:query')")
+// @PreAuthorize("@ss.hasPermi('platform:score:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -67,7 +67,7 @@
/**
* 鏂板鑰冩牳璁″垎
*/
- @PreAuthorize("@ss.hasPermi('platform:score:add')")
+// @PreAuthorize("@ss.hasPermi('platform:score:add')")
@Log(title = "鑰冩牳璁″垎", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TExamineScore tExamineScore)
@@ -78,7 +78,7 @@
/**
* 淇敼鑰冩牳璁″垎
*/
- @PreAuthorize("@ss.hasPermi('platform:score:edit')")
+// @PreAuthorize("@ss.hasPermi('platform:score:edit')")
@Log(title = "鑰冩牳璁″垎", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TExamineScore tExamineScore)
@@ -89,7 +89,7 @@
/**
* 鍒犻櫎鑰冩牳璁″垎
*/
- @PreAuthorize("@ss.hasPermi('platform:score:remove')")
+// @PreAuthorize("@ss.hasPermi('platform:score:remove')")
@Log(title = "鑰冩牳璁″垎", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
index 38e493f..fb8674c 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
@@ -15,6 +15,7 @@
<result column="nick_name" property="auditingUserName" />
<result column="rule_name" property="defaultRuleName" />
<result column="unit_name" property="unitName" />
+ <result column="create_by" property="createBy" />
</resultMap>
<select id="page" resultMap="BaseResultMap">
@@ -29,6 +30,7 @@
tda.auditing_time,
tda.auditing_user,
su.nick_name,
+ tda.create_by,
(SELECT unit_name FROM t_yw_unit WHERE id = tdr.unit_id AND deleted = 0) as unit_name,
(SELECT rule_name FROM t_default_rule WHERE id = tdr.default_rule_id AND deleted = 0) as rule_name
FROM
--
Gitblit v1.8.0