杨海航
9 months ago
commit
20c8fe60ba
@ -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); |
||||
} |
||||
} |
||||
@ -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; |
||||
} |
||||
|
||||
} |
||||
@ -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; |
||||
|
||||
} |
||||
@ -0,0 +1,43 @@ |
||||
package digital.laboratory.platform.entrustment.enums; |
||||
|
||||
import cn.hutool.core.collection.CollUtil; |
||||
import lombok.Getter; |
||||
|
||||
import java.util.List; |
||||
|
||||
@Getter |
||||
public enum EntrustBiologyType { |
||||
|
||||
HAIR(0, "毛发", CollUtil.newArrayList("黑色头发", "毛发")), |
||||
URINE(1, "尿液", CollUtil.newArrayList("黄色尿液")), |
||||
OTHER(2, "其他", CollUtil.newArrayList()), |
||||
; |
||||
|
||||
private final Integer code; |
||||
|
||||
private final String desc; |
||||
|
||||
private final List<String> alias; |
||||
|
||||
EntrustBiologyType(Integer code, String desc, List<String> alias) { |
||||
this.code = code; |
||||
this.desc = desc; |
||||
this.alias = alias; |
||||
} |
||||
|
||||
// 根据名称或别名判断是否存在对应枚举
|
||||
public static EntrustBiologyType isExist(String desc) { |
||||
for (EntrustBiologyType entrustStatisticType : values()) { |
||||
// 先匹配描述字段
|
||||
if (entrustStatisticType.getDesc().equals(desc)) { |
||||
return entrustStatisticType; |
||||
} |
||||
// 然后匹配别名
|
||||
if (entrustStatisticType.getAlias().contains(desc)) { |
||||
return entrustStatisticType; |
||||
} |
||||
} |
||||
return OTHER; |
||||
} |
||||
|
||||
} |
||||
@ -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); |
||||
} |
||||
|
||||
} |
||||
@ -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); |
||||
|
||||
} |
||||
|
||||
|
||||
|
||||
|
||||
@ -0,0 +1,22 @@ |
||||
package digital.laboratory.platform.entrustment.query; |
||||
|
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 委托中检材检出结果消息 查询对象（分页查询、列表查询） |
||||
* |
||||
* @author Chen |
||||
* @since 1.0.0 2025-02-18 |
||||
*/ |
||||
@Data |
||||
@ApiModel(description = "委托中检材检出结果消息 查询对象（分页查询、列表查询）") |
||||
public class EntrustMaterialCheckoutResultQuery extends BaseQuery { |
||||
|
||||
@ApiModelProperty("委托id") |
||||
private String entrustId; |
||||
|
||||
} |
||||
@ -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); |
||||
} |
||||
@ -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; |
||||
} |
||||
} |
||||
|
||||
|
||||
|
||||
|
||||
@ -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; |
||||
|
||||
} |
||||
@ -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> |
||||
Loading…
Reference in new issue