Merge pull request 'dev-ui' (#1) from dev-ui into dev

Reviewed-on: #1
This commit was merged in pull request #1.
This commit is contained in:
wkc
2026-04-22 01:50:37 +00:00
48 changed files with 2788 additions and 117 deletions

View File

@@ -0,0 +1,69 @@
package com.ruoyi.ccdi.project.controller;
import com.ruoyi.ccdi.project.domain.dto.CcdiEvidenceQueryDTO;
import com.ruoyi.ccdi.project.domain.dto.CcdiEvidenceSaveDTO;
import com.ruoyi.ccdi.project.domain.vo.CcdiEvidenceVO;
import com.ruoyi.ccdi.project.service.ICcdiEvidenceService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.SecurityUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 项目证据Controller
*
* @author ruoyi
*/
@RestController
@RequestMapping("/ccdi/evidence")
@Tag(name = "项目证据")
public class CcdiEvidenceController extends BaseController {
@Resource
private ICcdiEvidenceService evidenceService;
/**
* 保存证据
*/
@PostMapping
@Operation(summary = "保存证据")
@PreAuthorize("@ss.hasPermi('ccdi:project:query')")
public AjaxResult saveEvidence(@Validated @RequestBody CcdiEvidenceSaveDTO dto) {
CcdiEvidenceVO vo = evidenceService.saveEvidence(dto, SecurityUtils.getUsername());
return AjaxResult.success("证据入库成功", vo);
}
/**
* 查询项目证据列表
*/
@GetMapping("/list")
@Operation(summary = "查询项目证据列表")
@PreAuthorize("@ss.hasPermi('ccdi:project:query')")
public AjaxResult listEvidence(CcdiEvidenceQueryDTO queryDTO) {
List<CcdiEvidenceVO> list = evidenceService.listEvidence(queryDTO);
return AjaxResult.success(list);
}
/**
* 查询证据详情
*/
@GetMapping("/{evidenceId}")
@Operation(summary = "查询证据详情")
@PreAuthorize("@ss.hasPermi('ccdi:project:query')")
public AjaxResult getEvidence(@PathVariable Long evidenceId) {
CcdiEvidenceVO vo = evidenceService.getEvidence(evidenceId);
return AjaxResult.success(vo);
}
}

View File

@@ -0,0 +1,21 @@
package com.ruoyi.ccdi.project.domain.dto;
import lombok.Data;
/**
* 项目证据查询入参
*
* @author ruoyi
*/
@Data
public class CcdiEvidenceQueryDTO {
/** 项目ID */
private Long projectId;
/** 证据类型FLOW/MODEL/ASSET */
private String evidenceType;
/** 关键词:姓名、标题、摘要、证据编号 */
private String keyword;
}

View File

@@ -0,0 +1,54 @@
package com.ruoyi.ccdi.project.domain.dto;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
/**
* 保存项目证据入参
*
* @author ruoyi
*/
@Data
public class CcdiEvidenceSaveDTO {
/** 项目ID */
@NotNull(message = "项目ID不能为空")
private Long projectId;
/** 证据类型FLOW/MODEL/ASSET */
@NotBlank(message = "证据类型不能为空")
private String evidenceType;
/** 关联人员姓名 */
@NotBlank(message = "关联人员不能为空")
private String relatedPersonName;
/** 关联人员标识 */
private String relatedPersonId;
/** 证据标题 */
@NotBlank(message = "证据标题不能为空")
private String evidenceTitle;
/** 证据摘要 */
@NotBlank(message = "证据摘要不能为空")
private String evidenceSummary;
/** 来源类型 */
@NotBlank(message = "来源类型不能为空")
private String sourceType;
/** 来源记录ID */
private String sourceRecordId;
/** 来源页面名称 */
private String sourcePage;
/** 证据快照JSON */
private String snapshotJson;
/** 确认理由/备注 */
@NotBlank(message = "确认理由/备注不能为空")
private String confirmReason;
}

View File

@@ -0,0 +1,84 @@
package com.ruoyi.ccdi.project.domain.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 项目证据对象 ccdi_evidence
*
* @author ruoyi
*/
@Data
@TableName("ccdi_evidence")
public class CcdiEvidence implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/** 证据ID */
@TableId(type = IdType.AUTO)
private Long evidenceId;
/** 项目ID */
private Long projectId;
/** 证据类型FLOW/MODEL/ASSET */
private String evidenceType;
/** 关联人员姓名 */
private String relatedPersonName;
/** 关联人员标识,优先存身份证号或员工号 */
private String relatedPersonId;
/** 证据标题 */
private String evidenceTitle;
/** 证据摘要 */
private String evidenceSummary;
/** 来源类型BANK_STATEMENT/MODEL_DETAIL/ASSET_DETAIL */
private String sourceType;
/** 来源记录ID */
private String sourceRecordId;
/** 来源页面名称 */
private String sourcePage;
/** 证据快照JSON */
private String snapshotJson;
/** 确认理由/备注 */
private String confirmReason;
/** 确认人 */
private String confirmBy;
/** 确认时间 */
private Date confirmTime;
/** 创建者 */
@TableField(fill = FieldFill.INSERT)
private String createBy;
/** 创建时间 */
@TableField(fill = FieldFill.INSERT)
private Date createTime;
/** 更新者 */
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 更新时间 */
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
}

View File

@@ -0,0 +1,56 @@
package com.ruoyi.ccdi.project.domain.vo;
import lombok.Data;
import java.util.Date;
/**
* 项目证据返回对象
*
* @author ruoyi
*/
@Data
public class CcdiEvidenceVO {
/** 证据ID */
private Long evidenceId;
/** 项目ID */
private Long projectId;
/** 证据类型FLOW/MODEL/ASSET */
private String evidenceType;
/** 关联人员姓名 */
private String relatedPersonName;
/** 关联人员标识 */
private String relatedPersonId;
/** 证据标题 */
private String evidenceTitle;
/** 证据摘要 */
private String evidenceSummary;
/** 来源类型 */
private String sourceType;
/** 来源记录ID */
private String sourceRecordId;
/** 来源页面名称 */
private String sourcePage;
/** 证据快照JSON */
private String snapshotJson;
/** 确认理由/备注 */
private String confirmReason;
/** 确认人 */
private String confirmBy;
/** 确认时间 */
private Date confirmTime;
}

View File

@@ -10,6 +10,8 @@ import lombok.Data;
@Data
public class CcdiProjectPersonAnalysisObjectRecordVO {
private String modelCode;
private String title;
private String subtitle;

View File

@@ -0,0 +1,12 @@
package com.ruoyi.ccdi.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.ccdi.project.domain.entity.CcdiEvidence;
/**
* 项目证据Mapper接口
*
* @author ruoyi
*/
public interface CcdiEvidenceMapper extends BaseMapper<CcdiEvidence> {
}

View File

@@ -0,0 +1,40 @@
package com.ruoyi.ccdi.project.service;
import com.ruoyi.ccdi.project.domain.dto.CcdiEvidenceQueryDTO;
import com.ruoyi.ccdi.project.domain.dto.CcdiEvidenceSaveDTO;
import com.ruoyi.ccdi.project.domain.vo.CcdiEvidenceVO;
import java.util.List;
/**
* 项目证据Service接口
*
* @author ruoyi
*/
public interface ICcdiEvidenceService {
/**
* 保存证据
*
* @param dto 保存入参
* @param operator 操作人
* @return 证据
*/
CcdiEvidenceVO saveEvidence(CcdiEvidenceSaveDTO dto, String operator);
/**
* 查询项目证据列表
*
* @param queryDTO 查询入参
* @return 证据列表
*/
List<CcdiEvidenceVO> listEvidence(CcdiEvidenceQueryDTO queryDTO);
/**
* 查询证据详情
*
* @param evidenceId 证据ID
* @return 证据
*/
CcdiEvidenceVO getEvidence(Long evidenceId);
}

View File

@@ -0,0 +1,84 @@
package com.ruoyi.ccdi.project.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.ccdi.project.domain.dto.CcdiEvidenceQueryDTO;
import com.ruoyi.ccdi.project.domain.dto.CcdiEvidenceSaveDTO;
import com.ruoyi.ccdi.project.domain.entity.CcdiEvidence;
import com.ruoyi.ccdi.project.domain.vo.CcdiEvidenceVO;
import com.ruoyi.ccdi.project.mapper.CcdiEvidenceMapper;
import com.ruoyi.ccdi.project.service.ICcdiEvidenceService;
import com.ruoyi.common.exception.ServiceException;
import jakarta.annotation.Resource;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.util.Date;
import java.util.List;
/**
* 项目证据Service实现类
*
* @author ruoyi
*/
@Service
public class CcdiEvidenceServiceImpl implements ICcdiEvidenceService {
@Resource
private CcdiEvidenceMapper evidenceMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public CcdiEvidenceVO saveEvidence(CcdiEvidenceSaveDTO dto, String operator) {
CcdiEvidence evidence = new CcdiEvidence();
BeanUtils.copyProperties(dto, evidence);
evidence.setConfirmBy(operator);
evidence.setConfirmTime(new Date());
evidenceMapper.insert(evidence);
return toVO(evidence);
}
@Override
public List<CcdiEvidenceVO> listEvidence(CcdiEvidenceQueryDTO queryDTO) {
if (queryDTO.getProjectId() == null) {
throw new ServiceException("项目ID不能为空");
}
LambdaQueryWrapper<CcdiEvidence> wrapper = new LambdaQueryWrapper<CcdiEvidence>()
.eq(CcdiEvidence::getProjectId, queryDTO.getProjectId())
.orderByDesc(CcdiEvidence::getConfirmTime)
.orderByDesc(CcdiEvidence::getEvidenceId);
if (StringUtils.hasText(queryDTO.getEvidenceType())) {
wrapper.eq(CcdiEvidence::getEvidenceType, queryDTO.getEvidenceType());
}
if (StringUtils.hasText(queryDTO.getKeyword())) {
String keyword = queryDTO.getKeyword().trim();
wrapper.and(item -> item
.like(CcdiEvidence::getRelatedPersonName, keyword)
.or()
.like(CcdiEvidence::getRelatedPersonId, keyword)
.or()
.like(CcdiEvidence::getEvidenceTitle, keyword)
.or()
.like(CcdiEvidence::getEvidenceSummary, keyword)
);
}
return evidenceMapper.selectList(wrapper).stream().map(this::toVO).toList();
}
@Override
public CcdiEvidenceVO getEvidence(Long evidenceId) {
CcdiEvidence evidence = evidenceMapper.selectById(evidenceId);
if (evidence == null) {
throw new ServiceException("证据不存在");
}
return toVO(evidence);
}
private CcdiEvidenceVO toVO(CcdiEvidence evidence) {
CcdiEvidenceVO vo = new CcdiEvidenceVO();
BeanUtils.copyProperties(evidence, vo);
return vo;
}
}

View File

@@ -836,6 +836,7 @@
<select id="selectPersonAnalysisObjectRows" resultType="com.ruoyi.ccdi.project.domain.vo.CcdiProjectPersonAnalysisObjectRecordVO">
select
max(tr.model_code) as modelCode,
coalesce(max(staff.name), max(relation.relation_name), max(tr.object_key), max(tr.object_type)) as title,
max(case
when tr.object_type = 'STAFF_ID_CARD' then '员工对象'