龚焕茏
2024-03-21 fd4f112458cbb1ea0f3f1177b185c6271f864ad3
Merge remote-tracking branch 'origin/master'
4个文件已修改
18 ■■■■■ 已修改文件
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/TExamineScoreController.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
}
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();
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)
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