Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300

This commit is contained in:
wangli 2025-01-15 16:44:47 +08:00
commit 3c51d382b4
18 changed files with 515 additions and 0 deletions

View File

@ -0,0 +1,15 @@
package cn.axzo.visa.api.changerecord;
import org.springframework.cloud.openfeign.FeignClient;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录
*/
@FeignClient(name = "nanopart", url = "${axzo.service.nanopart:http://nanopart:8080}")
public interface ChangeRecordApi {
}

View File

@ -0,0 +1,15 @@
package cn.axzo.visa.api.changerecord;
import org.springframework.cloud.openfeign.FeignClient;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录操作日志
*/
@FeignClient(name = "nanopart", url = "${axzo.service.nanopart:http://nanopart:8080}")
public interface ChangeRecordLogApi {
}

View File

@ -0,0 +1,15 @@
package cn.axzo.visa.api.changerecord;
import org.springframework.cloud.openfeign.FeignClient;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录内容关系表
*/
@FeignClient(name = "nanopart", url = "${axzo.service.nanopart:http://nanopart:8080}")
public interface ChangeRecordRelationApi {
}

View File

@ -0,0 +1,23 @@
package cn.axzo.visa.server.controller;
import cn.axzo.visa.api.changerecord.ChangeRecordApi;
import cn.axzo.visa.server.service.ChangeRecordService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录
*/
@Slf4j
@RestController
@RequiredArgsConstructor
public class ChangeRecordController implements ChangeRecordApi {
@Autowired
private ChangeRecordService changeRecordService;
}

View File

@ -0,0 +1,24 @@
package cn.axzo.visa.server.controller;
import cn.axzo.visa.api.changerecord.ChangeRecordLogApi;
import cn.axzo.visa.server.service.ChangeRecordLogService;
import cn.axzo.visa.server.service.ChangeRecordService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录操作日志
*/
@Slf4j
@RestController
@RequiredArgsConstructor
public class ChangeRecordLogController implements ChangeRecordLogApi {
@Autowired
private ChangeRecordLogService changeRecordLogService;
}

View File

@ -0,0 +1,23 @@
package cn.axzo.visa.server.controller;
import cn.axzo.visa.api.changerecord.ChangeRecordRelationApi;
import cn.axzo.visa.server.service.ChangeRecordRelationService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录内容关系表ø
*/
@Slf4j
@RestController
@RequiredArgsConstructor
public class ChangeRecordRelationController implements ChangeRecordRelationApi {
@Autowired
private ChangeRecordRelationService changeRecordRelationService;
}

View File

@ -0,0 +1,126 @@
package cn.axzo.visa.server.domain;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录
*/
@EqualsAndHashCode(callSuper = true)
@Data
@Accessors(chain = true)
@NoArgsConstructor
@AllArgsConstructor
@TableName(value = "visa_change_record", autoResultMap = true)
public class ChangeRecord extends BaseEntity<ChangeRecord> {
/**
* 单据号
*/
@TableField(value = "no")
private String no;
/**
* 主题
*/
@TableField(value = "topic")
private String topic;
/**
* 工程
*/
@TableField(value = "relation_project")
private Long relationProject;
/**
* 区域集合
*/
@TableField(value = "relation_area",typeHandler = FastjsonTypeHandler.class)
private JSONObject relationArea;
/**
* 专业集合
*/
@TableField(value = "relation_professional", typeHandler = FastjsonTypeHandler.class)
private JSONObject relationProfessional;
/**
* 有符号的变更金额
*/
@TableField(value = "amount_change")
private Integer amountChange;
/**
* 发生原因
*/
@TableField(value = "reason")
private String reason;
/**
* 单据类型
*/
@TableField(value = "type")
private String type;
/**
* 状态
*/
@TableField(value = "status")
private String status;
/**
* 最终审批ID
*/
@TableField(value = "approval_id")
private String approvalId;
/**
* 最终审批状态
*/
@TableField(value = "approval_status")
private String approvalStatus;
/**
* 最终审批时间
*/
@TableField(value = "approval_complete_time")
private Date approvalCompleteTime;
/**
* IM群组ID
*/
@TableField(value = "im_group_id")
private String imGroupId;
/**
* 额外信息
*/
@TableField(value = "extra", typeHandler = FastjsonTypeHandler.class)
private JSONObject extra;
/**
* 创建人id
*/
@TableField(value = "create_by")
private Long createBy;
/**
* 修改人id
*/
@TableField(value = "updateBy")
private Long updateBy;
}

View File

@ -0,0 +1,62 @@
package cn.axzo.visa.server.domain;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录操作日志
*/
@EqualsAndHashCode(callSuper = true)
@Data
@Accessors(chain = true)
@NoArgsConstructor
@AllArgsConstructor
@TableName(value = "visa_change_record_log", autoResultMap = true)
public class ChangeRecordLog extends BaseEntity<ChangeRecordLog> {
/**
* 变更签证记录id
*/
@TableField(value = "visa_id")
private Long visaId;
/**
* 操作名称
*/
@TableField(value = "name")
private String name;
/**
* 操作标题
*/
@TableField(value = "title")
private String title;
/**
* 操作内容
*/
@TableField(value = "content")
private String content;
/**
* 创建人id
*/
@TableField(value = "create_by")
private Long createBy;
/**
* 修改人id
*/
@TableField(value = "updateBy")
private Long updateBy;
}

View File

@ -0,0 +1,74 @@
package cn.axzo.visa.server.domain;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录内容关系表
*/
@EqualsAndHashCode(callSuper = true)
@Data
@Accessors(chain = true)
@NoArgsConstructor
@AllArgsConstructor
@TableName(value = "visa_change_record_relation", autoResultMap = true)
public class ChangeRecordRelation extends BaseEntity<ChangeRecordRelation> {
/**
* 变更签证记录id
*/
@TableField(value = "visa_id")
private Long visaId;
/**
* 关联的内容名称发生内容及说明相关单位及人员单据附件审批记录
*/
@TableField(value = "var_name")
private String varName;
/**
* 扩展内容名称
*/
@TableField(value = "var_ext")
private String varExt;
/**
* 值类型
*/
@TableField(value = "var_type")
private String varType;
/**
* 内容值
*/
@TableField(value = "content")
private String content;
/**
* 内容描述
*/
@TableField(value = "description")
private String description;
/**
* 创建人id
*/
@TableField(value = "create_by")
private Long createBy;
/**
* 修改人id
*/
@TableField(value = "updateBy")
private Long updateBy;
}

View File

@ -0,0 +1,15 @@
package cn.axzo.visa.server.mapper;
import cn.axzo.visa.server.domain.ChangeRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录
*/
@Mapper
public interface ChangeRecordDao extends BaseMapper<ChangeRecord> {
}

View File

@ -0,0 +1,15 @@
package cn.axzo.visa.server.mapper;
import cn.axzo.visa.server.domain.ChangeRecordLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录操作日志
*/
@Mapper
public interface ChangeRecordLogDao extends BaseMapper<ChangeRecordLog> {
}

View File

@ -0,0 +1,15 @@
package cn.axzo.visa.server.mapper;
import cn.axzo.visa.server.domain.ChangeRecordRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录内容关系表
*/
@Mapper
public interface ChangeRecordRelationDao extends BaseMapper<ChangeRecordRelation> {
}

View File

@ -0,0 +1,9 @@
package cn.axzo.visa.server.service;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录操作日志
*/
public interface ChangeRecordLogService {
}

View File

@ -0,0 +1,9 @@
package cn.axzo.visa.server.service;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录内容关系表
*/
public interface ChangeRecordRelationService {
}

View File

@ -0,0 +1,9 @@
package cn.axzo.visa.server.service;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录
*/
public interface ChangeRecordService {
}

View File

@ -0,0 +1,22 @@
package cn.axzo.visa.server.service.impl;
import cn.axzo.visa.server.domain.ChangeRecordLog;
import cn.axzo.visa.server.mapper.ChangeRecordLogDao;
import cn.axzo.visa.server.service.ChangeRecordLogService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class ChangeRecordLogServiceImpl extends ServiceImpl<ChangeRecordLogDao, ChangeRecordLog> implements ChangeRecordLogService {
}

View File

@ -0,0 +1,22 @@
package cn.axzo.visa.server.service.impl;
import cn.axzo.visa.server.domain.ChangeRecordRelation;
import cn.axzo.visa.server.mapper.ChangeRecordRelationDao;
import cn.axzo.visa.server.service.ChangeRecordRelationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录内容关系表
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRelationDao, ChangeRecordRelation> implements ChangeRecordRelationService {
}

View File

@ -0,0 +1,22 @@
package cn.axzo.visa.server.service.impl;
import cn.axzo.visa.server.domain.ChangeRecord;
import cn.axzo.visa.server.mapper.ChangeRecordDao;
import cn.axzo.visa.server.service.ChangeRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* @author xudawei
* @date 2025/01/15
* @desc 变更签证记录
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, ChangeRecord> implements ChangeRecordService {
}