diff --git a/pom.xml b/pom.xml index 86f44bc..a3d6090 100644 --- a/pom.xml +++ b/pom.xml @@ -179,6 +179,13 @@ ${dlp.version} + + + digital.laboratory.platform + dlp-common-aop + 2022.10.11-snapshots + + diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustApproveRecordController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustApproveRecordController.java new file mode 100644 index 0000000..0076280 --- /dev/null +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustApproveRecordController.java @@ -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> page(@RequestBody BaseQuery query) { + IPage page = entrustApproveRecordService.voPage(query); + return R.ok(page); + } +} diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java index 763cf22..fd2e30b 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java @@ -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; diff --git a/src/main/java/digital/laboratory/platform/entrustment/convert/EntrustApproveRecordConvert.java b/src/main/java/digital/laboratory/platform/entrustment/convert/EntrustApproveRecordConvert.java new file mode 100644 index 0000000..9d61297 --- /dev/null +++ b/src/main/java/digital/laboratory/platform/entrustment/convert/EntrustApproveRecordConvert.java @@ -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; + } + +} diff --git a/src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java b/src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java index 3abce6c..0458b14 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java +++ b/src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java @@ -21,6 +21,9 @@ public class ApprovedUpdateEntrustDTO { @NotBlank(message = "关联的委托id不能为空!") private String entrustId; + @ApiModelProperty(value = "案件名称") + private String caseName; + @ApiModelProperty(value = "案件简要") private String caseBrief; diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustApproveRecord.java b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustApproveRecord.java new file mode 100644 index 0000000..92a8f7a --- /dev/null +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustApproveRecord.java @@ -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; + +} diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java b/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java index 47b230a..fed17ef 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java @@ -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; } diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java index 28a7e6f..2323b09 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java @@ -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() { diff --git a/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustStatisticType.java b/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustStatisticType.java new file mode 100644 index 0000000..67645c4 --- /dev/null +++ b/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustStatisticType.java @@ -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); + } + +} diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustApproveRecordMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustApproveRecordMapper.java new file mode 100644 index 0000000..d9558fb --- /dev/null +++ b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustApproveRecordMapper.java @@ -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 { + + IPage voPage(Page page, @Param(Constants.WRAPPER) Wrapper qw); + +} + + + + diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustApproveRecordService.java b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustApproveRecordService.java new file mode 100644 index 0000000..653fb06 --- /dev/null +++ b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustApproveRecordService.java @@ -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 { + + /** + * 分页查询-委托审核记录 + * @param query + * @return + */ + IPage voPage(BaseQuery query); + + /** + * 保存审核不通过记录 + * @param entrust + * @param pi + */ + void saveRecord(Entrustment entrust, UpdateInfo pi); +} diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentService.java b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentService.java index 4f9df23..cf6ef2e 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentService.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentService.java @@ -82,12 +82,14 @@ public interface EntrustmentService extends IService { //生成鉴定事项确认书 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); /** * 构建鉴定要求 diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java index bd4e915..7a6bae4 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java @@ -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 voPage(EntrustAlterApplyQuery query) { DLPUser user = SecurityUtils.getUser(); if (!user.isStaff()) { @@ -83,6 +82,7 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpllambdaUpdate().eq(CaseEvent::getId, entrustment.getCaseId()).set(CaseEvent::getCaseBrief, dto.getCaseBrief())); + caseEventService.update(Wrappers.lambdaUpdate().eq(CaseEvent::getId, entrustment.getCaseId()) + .set(CaseEvent::getCaseBrief, dto.getCaseBrief()) + .set(CaseEvent::getCaseName, dto.getCaseName()) + ); // 添加更新记录 |
代表换行 LocalDateTime opDate = null; // 操作的时间，这里也用来标识是否有更新 if (!oldCaseInfo.getCaseBrief().equals(dto.getCaseBrief())) { @@ -424,11 +427,11 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl + implements EntrustApproveRecordService{ + + /** + * 分页查询-委托审核记录 + * @param query + * @return + */ + @Override + @DlpResultProc + public IPage voPage(BaseQuery query) { + QueryWrapper 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 appendQueryCriteria(BaseQuery query) { + QueryWrapper 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; + } +} + + + + diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java index 7903d68..a1f3467 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java @@ -146,6 +146,9 @@ public class EntrustmentServiceImpl extends ServiceImpl taskAvailableUserList_Approve() { - R> r = remoteUserService.innerGetUsersByPermission(CommonConstants.ORG_TREE_ROOT_ID, Arrays.asList(new String[]{"EntrustmentApprove"})); + R> r = remoteUserService.innerGetUsersByPermission(CommonConstants.ORG_TREE_ROOT_ID, Collections.singletonList("EntrustmentApprove")); return r.getData(); } @Override public List taskAvailableUserList_Confirm(String clientOrgId) { - R> r = remoteUserService.innerGetUsersByPermission(clientOrgId, Arrays.asList(new String[]{"EntrustmentConfirm"})); + R> r = remoteUserService.innerGetUsersByPermission(clientOrgId, Collections.singletonList("EntrustmentConfirm")); return r.getData(); } @@ -934,7 +937,7 @@ public class EntrustmentServiceImpl extends ServiceImpl dm = BeanMap.create(ev); //ClassUtils.objectToMap(ev); Map dm = ClassUtils.objectToMap(ev); if (ev.getEntrustmentTime() == null) { - ev.setEntrustmentTime(LocalDate.now()); + ev.setEntrustmentTime(LocalDateTime.now()); UpdateWrapper updateWrapper = new UpdateWrapper(); updateWrapper.eq("id", ev.getId()); // 查询条件是 id 相等 @@ -2654,7 +2659,7 @@ public class EntrustmentServiceImpl extends ServiceImpl dm = ClassUtils.objectToMap(ev); if (ev.getEntrustmentTime() == null) { - ev.setEntrustmentTime(LocalDate.now()); + ev.setEntrustmentTime(LocalDateTime.now()); UpdateWrapper updateWrapper = new UpdateWrapper(); updateWrapper.eq("id", ev.getId()); // 查询条件是 id 相等 @@ -3491,7 +3496,7 @@ public class EntrustmentServiceImpl extends ServiceImpl - 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 diff --git a/src/main/resources/mapper/EntrustApproveRecordMapper.xml b/src/main/resources/mapper/EntrustApproveRecordMapper.xml new file mode 100644 index 0000000..3f37a7c --- /dev/null +++ b/src/main/resources/mapper/EntrustApproveRecordMapper.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + 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 + + + + SELECT + , + 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 + + + + diff --git a/src/main/resources/mapper/EntrustmentMapper.xml b/src/main/resources/mapper/EntrustmentMapper.xml index 26fc1ec..712f54f 100644 --- a/src/main/resources/mapper/EntrustmentMapper.xml +++ b/src/main/resources/mapper/EntrustmentMapper.xml @@ -121,8 +121,7 @@ - - +