Dlp-Gyjd/dlp-entrustment
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250123 更新

Browse Source
This commit is contained in:
陈江保
2025-01-24 09:11:49 +08:00
parent 27610f21c9
commit ea6e8e2913
20 changed files with 490 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@@ -179,6 +179,13 @@
<version>${dlp.version}</version>
</dependency>
<!--加入aop 注解模块-->
<dependency>
<groupId>digital.laboratory.platform</groupId>
<artifactId>dlp-common-aop</artifactId>
<version>2022.10.11-snapshots</version>
</dependency>
</dependencies>

38
src/main/java/digital/laboratory/platform/entrustment/controller/EntrustApproveRecordController.java Normal file
View File

@@ -0,0 +1,38 @@
package digital.laboratory.platform.entrustment.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import digital.laboratory.platform.common.core.util.R;
import digital.laboratory.platform.entrustment.query.BaseQuery;
import digital.laboratory.platform.entrustment.service.EntrustApproveRecordService;
import digital.laboratory.platform.entrustment.vo.EntrustApproveRecordVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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 javax.annotation.Resource;
/**
* 委托审核记录
*
* @author chenjiangbao
* @describe 委托审核记录
*/
@RestController
@RequestMapping("/papp/entrustApproveRecord")
@Api(tags = "018-委托审核记录")
public class EntrustApproveRecordController {
@Resource
private EntrustApproveRecordService entrustApproveRecordService;
@ApiOperation("分页查询-委托审核记录")
@PostMapping("/page")
public R<IPage<EntrustApproveRecordVO>> page(@RequestBody BaseQuery query) {
IPage<EntrustApproveRecordVO> page = entrustApproveRecordService.voPage(query);
return R.ok(page);
}
}

4
src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java
View File

@@ -2107,8 +2107,8 @@ public class EntrustmentController {
* @return
*/
@GetMapping("/getBookNameByEntrustId")
public R getBookNameByEntrustId(String entrustId, String whatBook) {
String fileOssPath = entrustmentService.getBookNameByEntrustId(entrustId, whatBook);
public R getBookNameByEntrustId(String entrustId, String whatBook, String docType) {
String fileOssPath = entrustmentService.getBookNameByEntrustId(entrustId, whatBook, docType);
Assert.notBlank(fileOssPath, "获取文书失败，请检查参数");
String docId = IdWorker.get32UUID();
String dataInfo = docId + "#" + fileOssPath;

23
src/main/java/digital/laboratory/platform/entrustment/convert/EntrustApproveRecordConvert.java Normal file
View File

@@ -0,0 +1,23 @@
package digital.laboratory.platform.entrustment.convert;
import digital.laboratory.platform.entrustment.entity.EntrustApproveRecord;
import digital.laboratory.platform.entrustment.vo.EntrustApproveRecordVO;
/**
* 委托审核记录 实体 vo dto等对象转换
*/
public class EntrustApproveRecordConvert {
public static EntrustApproveRecordVO entityToVO(EntrustApproveRecord entity) {
EntrustApproveRecordVO entrustApproveRecordVO = new EntrustApproveRecordVO();
entrustApproveRecordVO.setId(entity.getId());
entrustApproveRecordVO.setEntrustId(entity.getEntrustId());
entrustApproveRecordVO.setApproveType(entity.getApproveType());
entrustApproveRecordVO.setComments(entity.getComments());
entrustApproveRecordVO.setUserId(entity.getUserId());
entrustApproveRecordVO.setOrgId(entity.getOrgId());
entrustApproveRecordVO.setApproveTime(entity.getApproveTime());
return entrustApproveRecordVO;
}
}

3
src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java
View File

@@ -21,6 +21,9 @@ public class ApprovedUpdateEntrustDTO {
@NotBlank(message = "关联的委托id不能为空!")
private String entrustId;
@ApiModelProperty(value = "案件名称")
private String caseName;
@ApiModelProperty(value = "案件简要")
private String caseBrief;

59
src/main/java/digital/laboratory/platform/entrustment/entity/EntrustApproveRecord.java Normal file
View File

@@ -0,0 +1,59 @@
package digital.laboratory.platform.entrustment.entity;
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 digital.laboratory.platform.common.mybatis.base.BaseEntity;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
import lombok.Data;
/**
* 委托审核记录
* @TableName b_entrust_approve_record
*/
@Data
@TableName(value ="b_entrust_approve_record")
public class EntrustApproveRecord extends BaseEntity {
/**
* 主键标识
*/
@TableId(value = "ID", type = IdType.ASSIGN_ID)
private String id;
/**
* 审核关联的委托id
*/
private String entrustId;
/**
* 审核类型， 目前 0 代表 审核不通过
*/
private Integer approveType;
/**
* 意见
*/
private String comments;
/**
* 用户id
*/
private String userId;
/**
* 机构id
*/
private String orgId;
/**
* 审核时间
*/
private LocalDateTime approveTime;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}

13
src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java
View File

@@ -53,7 +53,7 @@ public class Entrustment extends BaseEntity {
private String entrustmentNo;
/**
* 委托类型: 0=正常司法鉴定委托, 1=案前委托
* 委托类型: 0=常规毒品, 1=生物样本
*/
@ApiModelProperty(value="委托类型: 0=常规毒品, 1=生物样本")
private Integer entrustmentType;
@@ -80,8 +80,8 @@ public class Entrustment extends BaseEntity {
* 委托日期, 鉴定委托书打印日期
*/
@ApiModelProperty(value="委托日期, 鉴定委托书打印日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate entrustmentTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime entrustmentTime;
/**
* 委托提交者, 后期可能会转给其他人user_id
@@ -746,7 +746,12 @@ public class Entrustment extends BaseEntity {
@ApiModelProperty(value="是否退回（0：未退回，-1：已退回）")
private Integer returnOrNot;
/**
* 20250121 新增的一个委托类型，选择生物样本类型后需要区分是 0 委托、1 初筛、 2 两社人员、 3 其他人员， 常规毒品 0 委托 1 初筛，其他的不需要区分
* 存字符串，不用code表达
*/
@ApiModelProperty("新增的一个委托类型，选择生物样本类型后需要区分是 0 委托、1 初筛、 2 两社人员、 3 其他人员， 常规毒品 0 委托 1 初筛，其他的不需要区分")
private String type;
}

5
src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java
View File

@@ -551,6 +551,11 @@ public class EntrustmentIdentificationMaterial extends BaseEntity {
@ApiModelProperty(value = "检材备注--贵阳新增需求")
private String remark;
@ApiModelProperty(value = "检材年龄，用于后续统计各年龄阶段的数据--贵阳新增需求")
private Integer materialAge;
@ApiModelProperty(value = "生物检材类型， 目前区分毛发和尿液--贵阳新增需求")
private String biologyType;
/*****************************************************************************************/
public String getOrderNo1() {

33
src/main/java/digital/laboratory/platform/entrustment/enums/EntrustStatisticType.java Normal file
View File

@@ -0,0 +1,33 @@
package digital.laboratory.platform.entrustment.enums;
import lombok.Getter;
@Getter
public enum EntrustStatisticType {
ENTRUST(0, "委托"),
SCREEN(1, "初筛"),
SOCIETY(2, "两社人员"),
OTHER(3, "其他人员")
;
private final Integer code;
private final String desc;
EntrustStatisticType(Integer code, String desc) {
this.code = code;
this.desc = desc;
}
// 根据名称判断是否存在对应枚举
public static EntrustStatisticType isExist(String desc) {
for (EntrustStatisticType entrustStatisticType : values()) {
if (entrustStatisticType.getDesc().equals(desc)) {
return entrustStatisticType;
}
}
throw new IllegalArgumentException("No enum constant with desc: " + desc);
}
}

29
src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustApproveRecordMapper.java Normal file
View File

@@ -0,0 +1,29 @@
package digital.laboratory.platform.entrustment.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import digital.laboratory.platform.entrustment.entity.EntrustAlterApply;
import digital.laboratory.platform.entrustment.entity.EntrustApproveRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import digital.laboratory.platform.entrustment.vo.EntrustApproveRecordVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* @author ChenJiangBao
* @description 针对表【b_entrust_approve_record(委托审核记录)】的数据库操作Mapper
* @createDate 2025-01-23 09:26:25
* @Entity digital.laboratory.platform.entrustment.entity.EntrustApproveRecord
*/
@Mapper
public interface EntrustApproveRecordMapper extends BaseMapper<EntrustApproveRecord> {
IPage<EntrustApproveRecordVO> voPage(Page<EntrustApproveRecord> page, @Param(Constants.WRAPPER) Wrapper<EntrustApproveRecord> qw);
}

31
src/main/java/digital/laboratory/platform/entrustment/service/EntrustApproveRecordService.java Normal file
View File

@@ -0,0 +1,31 @@
package digital.laboratory.platform.entrustment.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import digital.laboratory.platform.entrustment.entity.EntrustApproveRecord;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.query.BaseQuery;
import digital.laboratory.platform.entrustment.vo.EntrustApproveRecordVO;
import digital.laboratory.platform.sewage.entity.UpdateInfo;
/**
* @author ChenJiangBao
* @description 针对表【b_entrust_approve_record(委托审核记录)】的数据库操作Service
* @createDate 2025-01-23 09:26:25
*/
public interface EntrustApproveRecordService extends IService<EntrustApproveRecord> {
/**
* 分页查询-委托审核记录
* @param query
* @return
*/
IPage<EntrustApproveRecordVO> voPage(BaseQuery query);
/**
* 保存审核不通过记录
* @param entrust
* @param pi
*/
void saveRecord(Entrustment entrust, UpdateInfo pi);
}

6
src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentService.java
View File

@@ -82,12 +82,14 @@ public interface EntrustmentService extends IService<Entrustment> {
//生成鉴定事项确认书
Boolean generateIdentifyItemsBook(String entrustId);
/**
*获取文书名称
* 获取文书名称
*
* @param entrustId
* @param whatBook entrust-委托书 identItemBook-鉴定事项确认书 identfyBook-鉴定书
* @param docType
* @return
*/
String getBookNameByEntrustId(String entrustId,String whatBook);
String getBookNameByEntrustId(String entrustId, String whatBook, String docType);
/**
* 构建鉴定要求

21
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java
View File

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import digital.laboratory.platform.common.aop.annotation.DlpResultProc;
import digital.laboratory.platform.common.core.constant.OSSDirectoryConstants;
import digital.laboratory.platform.common.core.exception.ValidateCodeException;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
@@ -52,9 +53,6 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
@Resource
private OssFile ossFile;
@Resource
private CommonFeignService commonFeignService;
@Resource
private CaseEventService caseEventService;
@@ -66,6 +64,7 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
@Override
@DlpResultProc
public IPage<EntrustAlterApplyVO> voPage(EntrustAlterApplyQuery query) {
DLPUser user = SecurityUtils.getUser();
if (!user.isStaff()) {
@@ -83,6 +82,7 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
* @return
*/
@Override
@DlpResultProc
public EntrustAlterApplyVO save(EntrustAlterApplyDTO dto) {
// 对当前委托进行校验，如果有关联该委托的申请信息，判断状态如果不是已完成则提示先完成当前申请
if (isApplying(dto.getEntrustId())) {
@@ -208,7 +208,10 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
// 提取委托id
String entrustId = entrustment.getId();
CaseEvent oldCaseInfo = caseEventService.getById(entrustment.getCaseId());
caseEventService.update(Wrappers.<CaseEvent>lambdaUpdate().eq(CaseEvent::getId, entrustment.getCaseId()).set(CaseEvent::getCaseBrief, dto.getCaseBrief()));
caseEventService.update(Wrappers.<CaseEvent>lambdaUpdate().eq(CaseEvent::getId, entrustment.getCaseId())
.set(CaseEvent::getCaseBrief, dto.getCaseBrief())
.set(CaseEvent::getCaseName, dto.getCaseName())
);
// 添加更新记录 | <br> 代表换行
LocalDateTime opDate = null; // 操作的时间，这里也用来标识是否有更新
if (!oldCaseInfo.getCaseBrief().equals(dto.getCaseBrief())) {
@@ -424,11 +427,11 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
*/
private void fillVOInfo(EntrustAlterApplyVO e) {
e.setStatusName(EntrustAlterApplyStatus.fromStatus(e.getStatus()).getDesc());
e.setApplicantName(commonFeignService.remoteGetUserById(e.getApplicant()).getName());
if (StrUtil.isNotBlank(e.getReviewer())) {
e.setReviewerName(commonFeignService.remoteGetUserById(e.getReviewer()).getName());
}
e.setApplyOrgName(commonFeignService.remoteGetSysOrg(e.getApplyOrgId()).getName());
// e.setApplicantName(commonFeignService.remoteGetUserById(e.getApplicant()).getName());
// if (StrUtil.isNotBlank(e.getReviewer())) {
// e.setReviewerName(commonFeignService.remoteGetUserById(e.getReviewer()).getName());
// }
// e.setApplyOrgName(commonFeignService.remoteGetSysOrg(e.getApplyOrgId()).getName());
}
}

70
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustApproveRecordServiceImpl.java Normal file
View File

@@ -0,0 +1,70 @@
package digital.laboratory.platform.entrustment.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import digital.laboratory.platform.common.aop.annotation.DlpResultProc;
import digital.laboratory.platform.entrustment.entity.EntrustApproveRecord;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.query.BaseQuery;
import digital.laboratory.platform.entrustment.service.EntrustApproveRecordService;
import digital.laboratory.platform.entrustment.mapper.EntrustApproveRecordMapper;
import digital.laboratory.platform.entrustment.vo.EntrustApproveRecordVO;
import digital.laboratory.platform.sewage.entity.UpdateInfo;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
/**
* @author ChenJiangBao
* @description 针对表【b_entrust_approve_record(委托审核记录)】的数据库操作Service实现
* @createDate 2025-01-23 09:26:25
*/
@Service
public class EntrustApproveRecordServiceImpl extends ServiceImpl<EntrustApproveRecordMapper, EntrustApproveRecord>
implements EntrustApproveRecordService{
/**
* 分页查询-委托审核记录
* @param query
* @return
*/
@Override
@DlpResultProc
public IPage<EntrustApproveRecordVO> voPage(BaseQuery query) {
QueryWrapper<EntrustApproveRecord> queryWrapper = appendQueryCriteria(query);
return baseMapper.voPage(new Page<>(query.getCurrent(), query.getSize()), queryWrapper);
}
/**
* 保存审核不通过记录
* @param entrust
* @param pi
*/
@Override
public void saveRecord(Entrustment entrust, UpdateInfo pi) {
EntrustApproveRecord entrustApproveRecord = new EntrustApproveRecord();
entrustApproveRecord.setApproveTime(LocalDateTime.now());
entrustApproveRecord.setApproveType(0);
entrustApproveRecord.setEntrustId(entrust.getId());
entrustApproveRecord.setComments(pi.getComments());
entrustApproveRecord.setUserId(pi.getUserId());
entrustApproveRecord.setOrgId(pi.getOrgId());
this.save(entrustApproveRecord);
}
private QueryWrapper<EntrustApproveRecord> appendQueryCriteria(BaseQuery query) {
QueryWrapper<EntrustApproveRecord> queryWrapper = new QueryWrapper<>();
queryWrapper.like(StrUtil.isNotBlank(query.getKeywords()), "c.case_name", query.getKeywords());
queryWrapper.ge(query.getStartDate() != null, "ear.approve_time", query.getStartDate());
queryWrapper.le(query.getEndDate() != null, "ear.approve_time", query.getEndDate());
queryWrapper.orderByDesc("ear.approve_time");
return queryWrapper;
}
}

23
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
View File

@@ -146,6 +146,9 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
@Resource
private RemoteFeatureAnalysis remoteFeatureAnalysis;
@Resource
private EntrustApproveRecordService entrustApproveRecordService;
// /**
// * 审核人员由委托创建者选择。如果 true, 前台在委托提交审核前, 弹出界面让委托人选择审核者; 如果 false, 由系统自动选择审核者。
@@ -373,13 +376,13 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
@Override
public List<SysUser> taskAvailableUserList_Approve() {
R<List<SysUser>> r = remoteUserService.innerGetUsersByPermission(CommonConstants.ORG_TREE_ROOT_ID, Arrays.asList(new String[]{"EntrustmentApprove"}));
R<List<SysUser>> r = remoteUserService.innerGetUsersByPermission(CommonConstants.ORG_TREE_ROOT_ID, Collections.singletonList("EntrustmentApprove"));
return r.getData();
}
@Override
public List<SysUser> taskAvailableUserList_Confirm(String clientOrgId) {
R<List<SysUser>> r = remoteUserService.innerGetUsersByPermission(clientOrgId, Arrays.asList(new String[]{"EntrustmentConfirm"}));
R<List<SysUser>> r = remoteUserService.innerGetUsersByPermission(clientOrgId, Collections.singletonList("EntrustmentConfirm"));
return r.getData();
}
@@ -934,7 +937,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
}
executeCount++;
}
;
sbMaterialName.delete(sbMaterialName.length() - 1, sbMaterialName.length());
String req1 = "对" + sbMaterialName.toString() + "中是否含有";
String req2 = sbDrugDes.toString();
@@ -968,16 +971,17 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
*
* @param entrustId
* @param whatBook entrust-委托书 identItemBook-鉴定事项确认书 identfyBook-鉴定书
* @param docType 该参数只有用于委托书上
* @return
*/
@Override
public String getBookNameByEntrustId(String entrustId, String whatBook) {
public String getBookNameByEntrustId(String entrustId, String whatBook, String docType) {
//先判断需要的文书是否在OSS上存在，如果存在，直接返回地址，如果不存在，则需要生成
String retBookName = "";
Entrustment entrustment = this.getById(entrustId);
switch (whatBook) {
case "entrust":
retBookName = OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + entrustId + "/" + "鉴定委托书-" + entrustment.getEntrustmentNo() + ".pdf";
retBookName = OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + entrustId + "/" + "鉴定委托书-" + entrustment.getEntrustmentNo() + ("docx".equals(docType) ? ".docx" : ".pdf");
break;
case "identItemBook":
retBookName = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustment.getId() + "/" + "鉴定事项确认书-" + entrustment.getEntrustmentNo() + ".docx";
@@ -1607,7 +1611,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
dlpUser.getOrgName(),
"审核不通过",
opCode, entrustment.getStatus(), false, entrust.getCheckComments());
entrustApproveRecordService.saveRecord(entrust, pi);
pis.add(pi);
}
// entrustment.setProcessInfo(pis);
@@ -2052,6 +2056,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
updateWrapper.set("deliver_time", entrustment.getDeliverTime());
updateWrapper.set("entrustment_time", LocalDateTime.now());
updateWrapper.set("deliver_submitter", entrustment.getDeliverSubmitter());
updateWrapper.set("status", entrustment.getStatus());
@@ -2137,7 +2142,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
//Map<String, Object> dm = BeanMap.create(ev); //ClassUtils.objectToMap(ev);
Map<String, Object> dm = ClassUtils.objectToMap(ev);
if (ev.getEntrustmentTime() == null) {
ev.setEntrustmentTime(LocalDate.now());
ev.setEntrustmentTime(LocalDateTime.now());
UpdateWrapper<Entrustment> updateWrapper = new UpdateWrapper<Entrustment>();
updateWrapper.eq("id", ev.getId()); // 查询条件是 id 相等
@@ -2654,7 +2659,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
Map<String, Object> dm = ClassUtils.objectToMap(ev);
if (ev.getEntrustmentTime() == null) {
ev.setEntrustmentTime(LocalDate.now());
ev.setEntrustmentTime(LocalDateTime.now());
UpdateWrapper<Entrustment> updateWrapper = new UpdateWrapper<Entrustment>();
updateWrapper.eq("id", ev.getId()); // 查询条件是 id 相等
@@ -3491,7 +3496,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
@Override
public boolean alertTimeFiledInfoByEntrustDate(Entrustment entrustment) {
Entrustment entrust = super.getById(entrustment.getId());
LocalDate entrustTime = entrust.getEntrustmentTime();
LocalDateTime entrustTime = entrust.getEntrustmentTime();
if (entrustTime == null) {
throw new ValidateCodeException("该委托信息中的委托时间为空！");
}

17
src/main/java/digital/laboratory/platform/entrustment/vo/EntrustAlterApplyVO.java
View File

@@ -1,10 +1,9 @@
package digital.laboratory.platform.entrustment.vo;
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 digital.laboratory.platform.common.mybatis.base.BaseEntity;
import digital.laboratory.platform.common.aop.annotation.DlpFeign;
import digital.laboratory.platform.sys.feign.RemoteOrgService;
import digital.laboratory.platform.sys.feign.RemoteUserService;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -52,6 +51,7 @@ public class EntrustAlterApplyVO {
* 申请人名称
*/
@ApiModelProperty(value = "申请人名称")
@DlpFeign(feignClient = RemoteUserService.class, methodName = "innerGetById", params = {"applicant"}, resultField = "name")
private String applicantName;
/**
@@ -76,10 +76,11 @@ public class EntrustAlterApplyVO {
* 申请单位名称
*/
@ApiModelProperty(value = "申请单位名称")
@DlpFeign(feignClient = RemoteOrgService.class, methodName = "getById", params = {"applyOrgId"}, resultField = "name")
private String applyOrgName;
/**
* 审核人id
* 审核人id
*/
@ApiModelProperty(value = "审核人id ")
private String reviewer;
@@ -88,6 +89,7 @@ public class EntrustAlterApplyVO {
* 审核人名字
*/
@ApiModelProperty(value = "审核人名字 ")
@DlpFeign(feignClient = RemoteUserService.class, methodName = "innerGetById", params = {"reviewer"}, resultField = "name")
private String reviewerName;
/**
@@ -114,6 +116,9 @@ public class EntrustAlterApplyVO {
@ApiModelProperty(value = "更新操作记录，记录着更改前的信息和更改后的信息")
private String updateRecord;
@ApiModelProperty(value="委托类型: 0=常规毒品, 1=生物样本")
private Integer entrustmentType;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
@@ -160,4 +165,4 @@ public class EntrustAlterApplyVO {
sb.append("]");
return sb.toString();
}
}
}

83
src/main/java/digital/laboratory/platform/entrustment/vo/EntrustApproveRecordVO.java Normal file
View File

@@ -0,0 +1,83 @@
package digital.laboratory.platform.entrustment.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import digital.laboratory.platform.common.aop.annotation.DlpFeign;
import digital.laboratory.platform.sys.feign.RemoteOrgService;
import digital.laboratory.platform.sys.feign.RemoteUserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 委托审核记录
* @TableName b_entrust_approve_record
*/
@Data
@TableName(value ="b_entrust_approve_record")
public class EntrustApproveRecordVO {
/**
* 主键标识
*/
@ApiModelProperty("主键标识")
private String id;
/**
* 审核关联的委托id
*/
@ApiModelProperty("审核关联的委托id")
private String entrustId;
@ApiModelProperty(value="委托类型: 0=常规毒品, 1=生物样本")
private Integer entrustmentType;
@ApiModelProperty("委托单位名称")
private String clientOrgName;
@ApiModelProperty("案件名称")
private String caseName;
/**
* 审核类型， 目前 0 代表 审核不通过
*/
@ApiModelProperty("审核类型， 目前 0 代表 审核不通过")
private Integer approveType;
/**
* 意见
*/
@ApiModelProperty("审核意见")
private String comments;
/**
* 用户id
*/
@ApiModelProperty("审核用户id")
private String userId;
@ApiModelProperty("审核用户姓名")
@DlpFeign(feignClient = RemoteUserService.class, methodName = "innerGetById", params = {"userId"}, resultField = "name")
private String userName;
/**
* 机构id
*/
@ApiModelProperty("审核机构id")
private String orgId;
@ApiModelProperty("审核机构名称")
@DlpFeign(feignClient = RemoteOrgService.class, methodName = "getById", params = {"orgId"}, resultField = "name")
private String orgName;
/**
* 审核时间
*/
@ApiModelProperty("审核时间")
private LocalDateTime approveTime;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}

7
src/main/resources/mapper/EntrustAlterApplyMapper.xml
View File

@@ -31,7 +31,12 @@
<!-- 连接委托表查询委托案件名称-->
<sql id="getVOSQL">
SELECT eaa.*, ce.case_name, ce.id as case_id FROM
SELECT
eaa.*,
ce.case_name,
ce.id as case_id,
e.entrustment_type
FROM
b_entrust_alter_apply eaa
LEFT JOIN b_entrustment e ON eaa.entrust_id = e.id
LEFT JOIN b_case_event ce ON ce.id = e.case_id

50
src/main/resources/mapper/EntrustApproveRecordMapper.xml Normal file
View File

@@ -0,0 +1,50 @@
<?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="digital.laboratory.platform.entrustment.mapper.EntrustApproveRecordMapper">
<resultMap id="BaseResultMap" type="digital.laboratory.platform.entrustment.entity.EntrustApproveRecord">
<id property="id" column="id" jdbcType="VARCHAR"/>
<result property="entrustId" column="entrust_id" jdbcType="VARCHAR"/>
<result property="approveType" column="approve_type" jdbcType="TINYINT"/>
<result property="comments" column="comments" jdbcType="VARCHAR"/>
<result property="userId" column="user_id" jdbcType="VARCHAR"/>
<result property="orgId" column="org_id" jdbcType="VARCHAR"/>
<result property="approveTime" column="approve_time" jdbcType="TIMESTAMP"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="createBy" column="create_by" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
ear.id,
ear.entrust_id,
ear.approve_type,
ear.comments,
ear.user_id,
ear.org_id,
ear.approve_time,
ear.create_time,
ear.create_by,
ear.update_time,
ear.update_by
</sql>
<sql id="EntrustApproveRecordVOSQL">
SELECT
<include refid="Base_Column_List"></include>,
c.case_name,
e.client_org_name,
e.entrustment_type
FROM b_entrust_approve_record ear
LEFT JOIN b_entrustment e ON e.id = ear.entrust_id
LEFT JOIN b_case_event c on e.case_id = c.id
</sql>
<select id="voPage" resultType="digital.laboratory.platform.entrustment.vo.EntrustApproveRecordVO">
<include refid="EntrustApproveRecordVOSQL"></include>
${ew.customSqlSegment}
</select>
</mapper>

3
src/main/resources/mapper/EntrustmentMapper.xml
View File

@@ -121,8 +121,7 @@
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="returnOrNot" column="return_or_not"/>
<result property="type" column="type"/>
</resultMap>
<resultMap id="entrustmentVO" type="digital.laboratory.platform.entrustment.vo.EntrustmentVO" extends="entrustmentMap">