Merge remote-tracking branch 'origin/master'

fuliqi

2024-11-27 50127793cca753b3a16d572ab521ff389d7104e0

Merge remote-tracking branch 'origin/master'

 business/src/main/java/com/ycl/controller/IndexController.java

@@ -1,8 +1,11 @@
package com.ycl.controller;

import com.ycl.common.core.controller.BaseController;
import com.ycl.common.core.domain.R;
import com.ycl.common.core.page.TableDataInfo;
import com.ycl.domain.entity.AuditHistory;
import com.ycl.domain.vo.*;
import com.ycl.service.AuditHistoryService;
import com.ycl.service.ProjectInfoService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,11 +20,15 @@
@RequiredArgsConstructor
@RestController
@RequestMapping("/")
public class IndexController {
public class IndexController extends BaseController {


    @Autowired
    private ProjectInfoService projectInfoService;


    @Autowired
    private AuditHistoryService auditHistoryService;

    /**
     * 项目数量统计
@@ -49,7 +56,18 @@
     */
    @GetMapping("/audit-message")
    public TableDataInfo<Object> auditMessage(PageQuery pageQuery) {
        return null;
        AuditHistory auditHistory = new AuditHistory();
        auditHistory.setTaskId("001");
        auditHistory.setTaskDefinitionKey("key");
        auditHistory.setViewer("张三");
        auditHistory.setCommitDept("部门1");
        auditHistory.setAuditType("01");
        auditHistory.setIsRead("0");
        auditHistory.setBusinessKey("12");
        auditHistory.setBusinessTable("t_plan");
        auditHistory.setContent("消息回复");
//        auditHistoryService.save(auditHistory);
        return getDataTable(auditHistoryService.list());
    }

    /**

 business/src/main/java/com/ycl/domain/entity/AuditHistory.java

New file
@@ -0,0 +1,25 @@
package com.ycl.domain.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.system.domain.base.AbsEntity;
import lombok.Data;

@Data
@TableName("t_audit_history")
public class AuditHistory extends AbsEntity {
    private String taskId;
    private String taskDefinitionKey;
    private String viewer;
    private String commitDept;
    /**
     * 1:提交，2:审核，3:驳回，4:转交
     */
    private String auditType;
    /**
     * 是否阅读(0:未读，1:已读)
     */
    private String isRead;
    private String businessKey;
    private String businessTable;
    private String content;
}

 business/src/main/java/com/ycl/mapper/AuditHistoryMapper.java

New file
@@ -0,0 +1,16 @@
package com.ycl.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.domain.entity.AuditHistory;
import com.ycl.domain.entity.File;
import org.apache.ibatis.annotations.Mapper;

/**
 * 审核记录 Mapper 接口
 *
 */
@Mapper
public interface AuditHistoryMapper extends BaseMapper<AuditHistory> {


}

 business/src/main/java/com/ycl/service/AuditHistoryService.java

New file
@@ -0,0 +1,12 @@
package com.ycl.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.domain.entity.AuditHistory;

/**
 * 审核记录 服务类
 */
public interface AuditHistoryService extends IService<AuditHistory> {


}

 business/src/main/java/com/ycl/service/impl/AuditHistoryServiceImpl.java

New file
@@ -0,0 +1,22 @@
package com.ycl.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.base.Result;
import com.ycl.domain.entity.AuditHistory;
import com.ycl.mapper.AuditHistoryMapper;
import com.ycl.service.AuditHistoryService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;

import java.util.List;

/**
 * 审核记录 服务实现类
 *
 */
@Service
@RequiredArgsConstructor
public class AuditHistoryServiceImpl extends ServiceImpl<AuditHistoryMapper, AuditHistory> implements AuditHistoryService {

}

 business/src/main/resources/mapper/AuditHistoryMapper.xml

New file
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.mapper.AuditHistoryMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.domain.entity.AuditHistory">
        <result column="task_id" property="taskId" />
        <result column="task_definition_key" property="taskDefinitionKey" />
        <result column="viewer" property="viewer" />
        <result column="commit_dept" property="commitDept" />
        <result column="audit_type" property="auditType" />
        <result column="is_read" property="isRead" />
        <result column="business_key" property="businessKey" />
        <result column="business_table" property="businessTable" />
        <result column="content" property="content" />
    </resultMap>



</mapper>