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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java
This commit is contained in:
杨海航
2025-03-18 14:53:25 +08:00
parent 3ef0c6fe03 8183a5eb20
commit 20d3e00fdd
63 changed files with 307 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/digital/laboratory/platform/entrustment/config/EntrustStateMachineConfig.java Normal file
View File

@@ -0,0 +1,38 @@
package digital.laboratory.platform.entrustment.config;
import digital.laboratory.platform.entrustment.enums.EntrustEvent;
import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.statemachine.config.EnumStateMachineConfigurerAdapter;
import org.springframework.statemachine.config.builders.StateMachineStateConfigurer;
/**
* @author ChenJiangBao
* @version 1.0
* @description: 委托状态机配置类
* @date 2025/3/14 11:47
*/
@Configuration
public class EntrustStateMachineConfig extends EnumStateMachineConfigurerAdapter<EntrustStatusConstants, EntrustEvent> {
@Value("${dlp.entrustment.isApprovalRequired}")
private boolean isApprovalRequired; // 动态标志判断是否需要审批
@Override
public void configure(StateMachineStateConfigurer<EntrustStatusConstants, EntrustEvent> states) throws Exception {
states.withStates()
.initial(EntrustStatusConstants.ENTRUST_STATUS_CREATED)
.state(EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM)
.state(EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK)
.state(EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM)
.state(EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER)
.state(EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT)
.state(EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED)
.state(EntrustStatusConstants.ENTRUST_STATUS_TEST_FINISH)
.state(EntrustStatusConstants.ENTRUST_STATUS_COMPLETED)
.state(EntrustStatusConstants.ENTRUST_STATUS_TERMINATED)
.state(EntrustStatusConstants.ENTRUST_STATUS_ABORTED)
.end(EntrustStatusConstants.ENTRUST_STATUS_COMPLETED);
}
}

2
src/main/java/digital/laboratory/platform/entrustment/config/MyDatasources.java
View File

@@ -5,8 +5,6 @@ import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.transaction.PlatformTransactionManager;
import javax.sql.DataSource;

1
src/main/java/digital/laboratory/platform/entrustment/config/properties/ApiPathProperties.java
View File

@@ -1,6 +1,5 @@
package digital.laboratory.platform.entrustment.config.properties;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

5
src/main/java/digital/laboratory/platform/entrustment/controller/AcceptController.java
View File

@@ -7,7 +7,10 @@ import digital.laboratory.platform.entrustment.service.AcceptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PutMapping;
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;

11
src/main/java/digital/laboratory/platform/entrustment/controller/CaseEvidenceController.java
View File

@@ -2,10 +2,8 @@ package digital.laboratory.platform.entrustment.controller;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.file.FileNameUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.amazonaws.services.s3.model.AmazonS3Exception;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -23,10 +21,10 @@ import digital.laboratory.platform.entrustment.entity.CaseEvidence;
import digital.laboratory.platform.entrustment.service.CaseEventService;
import digital.laboratory.platform.entrustment.service.CaseEvidenceService;
import digital.laboratory.platform.entrustment.vo.CaseEventVO;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.oauth2.provider.OAuth2Authentication;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -39,7 +37,10 @@ import java.io.InputStream;
import java.math.BigDecimal;
import java.security.Principal;
import java.time.LocalDateTime;
import java.util.*;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@@ -381,7 +382,7 @@ public class CaseEvidenceController {
break;
}
CaseEvidence ce = new CaseEvidence();
ce.setId(IdWorker.get32UUID().toUpperCase());
ce.setCaseId(cj.getId());
ce.setEvidenceNo(caseEvidenceService.getNewEvidenceCode(cj.getCaseNo()));

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

@@ -18,7 +18,9 @@ import org.springframework.web.bind.annotation.*;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.*;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.StringWriter;
@RestController
@RequiredArgsConstructor

1
src/main/java/digital/laboratory/platform/entrustment/controller/EntrustAlterApplyController.java
View File

@@ -11,7 +11,6 @@ import digital.laboratory.platform.entrustment.service.EntrustAlterApplyService;
import digital.laboratory.platform.entrustment.vo.EntrustAlterApplyVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

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

@@ -21,7 +21,7 @@ import digital.laboratory.platform.common.security.util.SecurityUtils;
import digital.laboratory.platform.entrustment.dto.EntrustmentDTO;
import digital.laboratory.platform.entrustment.entity.CaseEvent;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants;
import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants;
import digital.laboratory.platform.entrustment.service.CaseEventService;
import digital.laboratory.platform.entrustment.service.EntrustMaterialCheckoutResultService;
import digital.laboratory.platform.entrustment.service.EntrustmentService;
@@ -260,7 +260,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus())
.eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus())
.orderByDesc("e.create_time")
);
} else {
@@ -277,7 +277,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus())
.eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus())
.orderByDesc("e.create_time")
);
}
@@ -318,7 +318,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus())
.eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus())
);
} else {
//-- 当前用户是普通用户, 不是鉴定中心员工
@@ -334,7 +334,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus())
.eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus())
);
}
@@ -375,8 +375,8 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
//.ne("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus())
.gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus())
//.ne("e.status", EntrustmentStatusConstants.ENTRUST_STATUS_CREATED.getStatus())
.gt("e.status", EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus())
.orderByDesc("e.submit_time")
);
} else {
@@ -393,7 +393,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.ne("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus())
.ne("e.status", EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus())
.orderByDesc("e.submit_time")
);
}
@@ -441,13 +441,13 @@ public class EntrustmentController {
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.eq(dataSources != null, "e.data_sources", dataSources)
.and((wrapper) -> wrapper
.eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus())
.eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus())
.or()
.like((includeOtherOne == null || !includeOtherOne), "e.check_candidate_user", dlpUser.getId())
.eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus())
.eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus())
)
// .like((includeOtherOne == null || !includeOtherOne), "e.check_candidate_user", dlpUser.getId())
// .in("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus(), EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus())
// .in("e.status", EntrustmentStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus(), EntrustmentStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus())
.orderByDesc("e.submit_time")
);
@@ -492,10 +492,10 @@ public class EntrustmentController {
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.and((wrapper) -> wrapper
.eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus())
.eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus())
.or()
.like((includeOtherOne == null || !includeOtherOne), "e.check_candidate_user", dlpUser.getId())
.eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus())
.eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus())
)
);
@@ -538,7 +538,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()) // 状态为审核之后
.gt("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus()) // 状态为审核之后
.orderByDesc("e.check_time")
);
@@ -585,7 +585,7 @@ public class EntrustmentController {
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.eq(dataSources != null, "e.data_sources", dataSources)
.in("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE_CLAIM.getStatus(), EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus())
.in("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE_CLAIM.getStatus(), EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus())
.orderByDesc("e.check_time")
);
@@ -630,7 +630,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.in("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE_CLAIM.getStatus(), EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus())
.in("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE_CLAIM.getStatus(), EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus())
);
}
@@ -671,7 +671,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus()) // 状态为审核之后
.gt("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus()) // 状态为审核之后
.orderByDesc("e.approve_time")
);
@@ -717,7 +717,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus())
.eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus())
.orderByDesc("e.approve_time")
);
} else {
@@ -734,7 +734,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus())
.eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus())
.orderByDesc("e.approve_time")
);
}
@@ -779,7 +779,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus())
.eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus())
);
} else {
//-- 当前用户是普通用户, 不是鉴定中心员工
@@ -795,7 +795,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus())
.eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus())
);
}
@@ -837,7 +837,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus())
.gt("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus())
.orderByDesc("e.deliver_confirm_time")
);
} else {
@@ -854,7 +854,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus())
.gt("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus())
.orderByDesc("e.deliver_confirm_time")
);
}
@@ -899,7 +899,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus())
.eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus())
.orderByDesc("e.deliver_confirm_time")
);
} else {
@@ -917,7 +917,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus())
.eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus())
.orderByDesc("e.deliver_confirm_time")
);
}
@@ -961,7 +961,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus())
.eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus())
);
} else {
//-- 当前用户是普通用户, 不是鉴定中心员工
@@ -978,7 +978,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus())
.eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus())
);
}
}
@@ -1018,7 +1018,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus())
.gt("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus())
.orderByDesc("e.deliver_time")
);
} else {
@@ -1035,7 +1035,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus())
.gt("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus())
.orderByDesc("e.deliver_time")
);
}
@@ -1081,7 +1081,7 @@ public class EntrustmentController {
// 先查是不是委托编号
IPage<EntrustmentVO> thePage = entrustmentService.getEntrustmentVOPage(page, Wrappers.<Entrustment>query()
.eq("e.entrustment_no", theKeyword)
.in("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus() /*, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()*/)
.in("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus() /*, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()*/)
);
if (thePage.getRecords().size() > 0) {
// 查到数据了, 直接返回
@@ -1091,7 +1091,7 @@ public class EntrustmentController {
IPage<EntrustmentVO> thePage = null;
thePage = entrustmentService.getEntrustmentVOPage(page, Wrappers.<Entrustment>query()
.in("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus() /*, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()*/)
.in("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus() /*, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()*/)
.ge(StrUtil.isNotBlank(fromDate), "e.create_time", fromDate)
.le(StrUtil.isNotBlank(toDate), "e.create_time", toDate)
.eq(dataSources != null, "e.data_sources", dataSources)
@@ -1145,7 +1145,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.in("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus() /*, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()*/)
.in("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus() /*, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()*/)
);
return count;
@@ -1188,7 +1188,7 @@ public class EntrustmentController {
// 先查是不是委托编号
IPage<EntrustmentVO> thePage = entrustmentService.getEntrustmentVOPage(page, Wrappers.<Entrustment>query()
.eq("e.entrustment_no", theKeyword)
.in("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus() /*, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()*/)
.in("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus() /*, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()*/)
.orderByDesc("e.accept_time")
);
if (thePage.getRecords().size() > 0) {
@@ -1199,7 +1199,7 @@ public class EntrustmentController {
IPage<EntrustmentVO> thePage = null;
thePage = entrustmentService.getEntrustmentVOPage(page, Wrappers.<Entrustment>query()
.gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) // 状态为审核之后
.gt("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus()) // 状态为审核之后
.ge(StrUtil.isNotBlank(fromDate), "e.create_time", fromDate)
.le(StrUtil.isNotBlank(toDate), "e.create_time", toDate)
.eq(dataSources != null, "e.data_sources", dataSources)
@@ -1225,7 +1225,7 @@ public class EntrustmentController {
.eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId)
.like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo)
.like(StrUtil.isNotBlank(caseName), "c.case_name", caseName)
.gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) // 状态为审核之后
.gt("e.status", EntrustmentStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus()) // 状态为审核之后
.orderByDesc("e.accept_time")
);
*/
@@ -1641,7 +1641,7 @@ public class EntrustmentController {
.eq(entrustment.getReturnOrNot() != null, "e.return_or_not", entrustment.getReturnOrNot())
.in(statuses != null && statuses.size() > 0, "e.status", statuses)
//.ne(((isSubmitted != null) && isSubmitted), "e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus())
//.ne(((isSubmitted != null) && isSubmitted), "e.status", EntrustmentStatusConstants.ENTRUST_STATUS_CREATED.getStatus())
.orderByDesc("e.create_time")
);
return R.ok(r);
@@ -1670,7 +1670,7 @@ public class EntrustmentController {
.eq(entrustment.getStatus() != null, "e.status", entrustment.getStatus())
.eq(entrustment.getReturnOrNot() != null, "e.return_or_not", entrustment.getReturnOrNot())
.in(statuses != null && statuses.size() > 0, "e.status", statuses)
//.ne(((isSubmitted != null) && isSubmitted), "e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus())
//.ne(((isSubmitted != null) && isSubmitted), "e.status", EntrustmentStatusConstants.ENTRUST_STATUS_CREATED.getStatus())
.orderByDesc("e.create_time")
);
return R.ok(r);

8
src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentIdentificationMaterialController.java
View File

@@ -26,7 +26,7 @@ import digital.laboratory.platform.entrustment.entity.CaseEvent;
import digital.laboratory.platform.entrustment.entity.CaseEvidence;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial;
import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants;
import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants;
import digital.laboratory.platform.entrustment.handler.AppStartupRunner;
import digital.laboratory.platform.entrustment.service.CaseEventService;
import digital.laboratory.platform.entrustment.service.CaseEvidenceService;
@@ -396,7 +396,7 @@ public class EntrustmentIdentificationMaterialController {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
Entrustment entrustment = entrustmentService.getById(entrustmentIdentificationMaterialService.getById(id).getEntrustmentId());
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus() && !dlpUser.isStaff()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus() && !dlpUser.isStaff()) {
throw new RuntimeException(String.format("当前委托状态不允许删除检材！"));
}
EntrustmentIdentificationMaterial entrustmentIdentificationMaterial = entrustmentIdentificationMaterialService.deleteById(id);
@@ -718,7 +718,7 @@ public class EntrustmentIdentificationMaterialController {
Thread.sleep(10);
//if (im.getAcceptPassed() == null || im.getAcceptPassed() != 1) {
//只要委托没有受理就可以上传检材的照片
if (entrustObj.getStatus() >= (EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus())) {
if (entrustObj.getStatus() >= (EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus())) {
String image = jsonParam.getString("image");
// System.out.println(String.format("image=%s", image));
if (StringUtils.isNotEmpty(image)) {
@@ -784,7 +784,7 @@ public class EntrustmentIdentificationMaterialController {
Entrustment entrustObj = entrustmentService.getById(entrustId);
//if (im.getAcceptPassed() == null || im.getAcceptPassed() != 1) {
//只要委托没有受理就可以删除检材的照片
if (entrustObj.getStatus() >= (EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus())) {
if (entrustObj.getStatus() >= (EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus())) {
ossFile.fileDelete(OSSDirectoryConstants.ACCEPT_DIRECTORY + "/" + im.getEntrustmentId() + "/" + identificationMaterialId + "/" + fileName);
Map<String, String> ResultData = new HashMap<>();
ResultData.put("fileName", fileName);

5
src/main/java/digital/laboratory/platform/entrustment/controller/IdentificationController.java
View File

@@ -7,11 +7,9 @@ import digital.laboratory.platform.common.core.util.R;
import digital.laboratory.platform.common.log.annotation.SysLog;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.entity.Identification;
import digital.laboratory.platform.entrustment.service.CaseEventService;
import digital.laboratory.platform.entrustment.service.EntrustmentService;
import digital.laboratory.platform.entrustment.service.IdentificationService;
import digital.laboratory.platform.entrustment.vo.IdentificationVO;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -34,8 +32,7 @@ import java.util.List;
public class IdentificationController {
private final IdentificationService identificationService;
@Resource
private CaseEventService caseEventService;
@Resource
private EntrustmentService entrustmentService;

5
src/main/java/digital/laboratory/platform/entrustment/controller/SampleBoxController.java
View File

@@ -8,7 +8,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import digital.laboratory.platform.common.core.util.R;
import digital.laboratory.platform.common.log.annotation.SysLog;
import digital.laboratory.platform.entrustment.entity.*;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial;
import digital.laboratory.platform.entrustment.mapper.EntrustmentMapper;
import digital.laboratory.platform.entrustment.service.EntrustmentIdentificationMaterialService;
import digital.laboratory.platform.entrustment.service.SampleBoxService;
@@ -16,9 +17,9 @@ import digital.laboratory.platform.entrustment.service.SampleService;
import digital.laboratory.platform.entrustment.vo.SampleBoxLiteVO;
import digital.laboratory.platform.entrustment.vo.SampleBoxVO;
import digital.laboratory.platform.sewage.entity.SewageJob;
import digital.laboratory.platform.sewage.feign.RemoteSewageJobService;
import digital.laboratory.platform.sys.entity.entrustment.Sample;
import digital.laboratory.platform.sys.entity.entrustment.SampleBox;
import digital.laboratory.platform.sewage.feign.RemoteSewageJobService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

2
src/main/java/digital/laboratory/platform/entrustment/controller/SampleBoxInLogController.java
View File

@@ -7,10 +7,10 @@ import digital.laboratory.platform.common.core.util.R;
import digital.laboratory.platform.common.log.annotation.SysLog;
import digital.laboratory.platform.entrustment.entity.SampleBoxInLog;
import digital.laboratory.platform.entrustment.service.SampleBoxInLogService;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

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

@@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import digital.laboratory.platform.common.core.util.R;
import digital.laboratory.platform.common.log.annotation.SysLog;
import digital.laboratory.platform.sys.entity.entrustment.Sample;
import digital.laboratory.platform.entrustment.service.SampleService;
import org.springframework.security.access.prepost.PreAuthorize;
import digital.laboratory.platform.sys.entity.entrustment.Sample;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

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

@@ -2,10 +2,10 @@ package digital.laboratory.platform.entrustment.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
import digital.laboratory.platform.common.core.util.R;
import digital.laboratory.platform.othersys.dto.EntrustQueryParams;
import digital.laboratory.platform.entrustment.entity.EntrustOfThirdSys;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.service.*;
import digital.laboratory.platform.entrustment.service.SynchronizeDataService;
import digital.laboratory.platform.othersys.dto.EntrustQueryParams;
import digital.laboratory.platform.sys.feign.RemoteDictionaryService;
import io.swagger.annotations.Api;
import lombok.RequiredArgsConstructor;

1
src/main/java/digital/laboratory/platform/entrustment/controller/TakerController.java
View File

@@ -9,7 +9,6 @@ import digital.laboratory.platform.common.log.annotation.SysLog;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.entrustment.entity.Taker;
import digital.laboratory.platform.entrustment.service.TakerService;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;

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

@@ -1,10 +1,8 @@
package digital.laboratory.platform.entrustment.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import digital.laboratory.platform.sys.entity.DrugLite;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import javax.validation.constraints.NotBlank;

4
src/main/java/digital/laboratory/platform/entrustment/dto/CheckoutResultExcelDTO.java
View File

@@ -1,13 +1,9 @@
package digital.laboratory.platform.entrustment.dto;
import digital.laboratory.platform.sys.entity.DrugLite;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
@Data
@ApiModel(value = "CheckoutResultExcelDTO", description = "存储要导出的检出结果excel数据DTO对象")
public class CheckoutResultExcelDTO {

2
src/main/java/digital/laboratory/platform/entrustment/dto/PrintDTO.java
View File

@@ -2,8 +2,6 @@ package digital.laboratory.platform.entrustment.dto;
import lombok.Data;
import java.util.List;
@Data
public class PrintDTO {

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

@@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableName;
import digital.laboratory.platform.common.mybatis.base.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDate;
/**
* 案件、事件

7
src/main/java/digital/laboratory/platform/entrustment/entity/CaseEvidence.java
View File

@@ -9,13 +9,12 @@ import digital.laboratory.platform.common.mybatis.base.BaseEntity;
import digital.laboratory.platform.sys.entity.entrustment.IMAdditionalProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 与案件相关的物证信息
@@ -97,7 +96,7 @@ public class CaseEvidence extends BaseEntity {
private String fundName;
/**
* 物证情况之承载物数量, 例如 5 颗, 3包,
* 物证情况之承载物数量, 例如 5 颗, 3包,
*/
@ApiModelProperty(value="物证情况之承载物数量, 例如 5 颗, 3包, ")
private Integer fundQuantity;

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

@@ -5,11 +5,10 @@ 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;
import java.time.LocalDateTime;
/**
* 委托审核记录
* @TableName b_entrust_approve_record

1
src/main/java/digital/laboratory/platform/entrustment/entity/EntrustMaterialOfThirdSys.java
View File

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* @ClassName EntrustMaterialOfThirdSys

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

@@ -15,7 +15,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;

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

@@ -2,23 +2,21 @@ package digital.laboratory.platform.entrustment.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
//import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import digital.laboratory.platform.common.mybatis.base.BaseEntity;
import digital.laboratory.platform.entrustment.json.DynamicBigDecimalSerializer;
import digital.laboratory.platform.sys.entity.DrugLite;
import digital.laboratory.platform.common.mybatis.base.BaseEntity;
import digital.laboratory.platform.sys.entity.entrustment.IMAdditionalProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang.StringUtils;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang.StringUtils;
/**
* 检材信息

2
src/main/java/digital/laboratory/platform/entrustment/entity/Identification.java
View File

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
import digital.laboratory.platform.common.mybatis.base.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
src/main/java/digital/laboratory/platform/entrustment/entity/SampleBoxInLog.java
View File

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
import digital.laboratory.platform.common.mybatis.base.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
src/main/java/digital/laboratory/platform/entrustment/entity/Taker.java
View File

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
import digital.laboratory.platform.common.mybatis.base.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.EqualsAndHashCode;

43
src/main/java/digital/laboratory/platform/entrustment/enums/EntrustBiologyType.java
View File

@@ -1,43 +0,0 @@
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;
}
}

20
src/main/java/digital/laboratory/platform/entrustment/enums/EntrustEvent.java Normal file
View File

@@ -0,0 +1,20 @@
package digital.laboratory.platform.entrustment.enums;
/**
* @author ChenJiangBao
* @version 1.0
* @description: 委托事件枚举
* @date 2025/3/14 16:11
*/
public enum EntrustEvent {
SUBMIT, // 提交委托事件
CLAIM_CHECK, // 认领审核
APPROVE, // 审批
CLAIM_APPROVE, // 审核通过后审批
CONFIRM, // 送检确认
DELIVER, // 送检
ACCEPT, // 受理
TEST_FINISH, // 检验完成
TERMINATE, // 终止
ABORT; // 中止
}

46
src/main/java/digital/laboratory/platform/entrustment/enums/EntrustmentStatusConstants.java → src/main/java/digital/laboratory/platform/entrustment/enums/EntrustStatusConstants.java
View File

@@ -18,34 +18,34 @@ import lombok.RequiredArgsConstructor;
@Getter
@RequiredArgsConstructor
public enum EntrustmentStatusConstants {
public enum EntrustStatusConstants {
ENTRUSTMENT_STATUS_CREATED(0, "待提交"), // 已创建待提交
ENTRUST_STATUS_CREATED(0, "待提交"), // 已创建待提交
// ENTRUSTMENT_STATUS_CHECK_REJECTED(-1, "审核被驳回"), // 审核被驳回
// ENTRUSTMENT_STATUS_APPROVE_REJECTED(-2, "审批被驳回"), // 审批被驳回
ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM(1, "待审核"), // 已提交, 待审核人员认领审核任务
ENTRUSTMENT_STATUS_WAITING_CHECK(2, "审核中"), // 审核任务已认领, 审核中
ENTRUSTMENT_STATUS_WAITING_APPROVE_CLAIM(3, "待审批"), // 审核通过, 待审批人员认领审批任务
ENTRUSTMENT_STATUS_WAITING_APPROVE(4, "审批中"), // 审批任务已认领, 待审批
ENTRUSTMENT_STATUS_WAITING_CONFIRM(5, "待送检确认"), // 审批通过, 待送检确认
ENTRUSTMENT_STATUS_WAITING_DELIVER(6, "送检确认通过, 待送检"),
ENTRUSTMENT_STATUS_WAITING_ACCEPT(7, "待受理"),
ENTRUST_STATUS_WAITING_CHECK_CLAIM(1, "待审核"), // 已提交, 待审核人员认领审核任务
ENTRUST_STATUS_WAITING_CHECK(2, "审核中"), // 审核任务已认领, 审核中
ENTRUST_STATUS_WAITING_APPROVE_CLAIM(3, "待审批"), // 审核通过, 待审批人员认领审批任务
ENTRUST_STATUS_WAITING_APPROVE(4, "审批中"), // 审批任务已认领, 待审批
ENTRUST_STATUS_WAITING_CONFIRM(5, "待送检确认"), // 审批通过, 待送检确认
ENTRUST_STATUS_WAITING_DELIVER(6, "送检确认通过, 待送检"),
ENTRUST_STATUS_WAITING_ACCEPT(7, "待受理"),
//ENTRUSTMENT_STATUS_ACCEPTING(8, "正在受理中"), // 受理过程比较花时间
ENTRUSTMENT_STATUS_ACCEPTED(9, "已受理, 进入检验环节"),
ENTRUST_STATUS_ACCEPTED(9, "已受理, 进入检验环节"),
ENTRUSTMENT_STATUS_TEST_FINISH(10, "检验完毕"),
ENTRUST_STATUS_TEST_FINISH(10, "检验完毕"),
ENTRUSTMENT_STATUS_COMPLETED(99, "委托已完成"), // 已受理, 已完成鉴定, 结束
ENTRUSTMENT_STATUS_TERMINATED(98, "委托已终止"), // 已受理, 无法完成鉴定, 结束
ENTRUSTMENT_STATUS_ABORTED(97, "已中止"); // 在受理之前被中止
ENTRUST_STATUS_COMPLETED(99, "委托已完成"), // 已受理, 已完成鉴定, 结束
ENTRUST_STATUS_TERMINATED(98, "委托已终止"), // 已受理, 无法完成鉴定, 结束
ENTRUST_STATUS_ABORTED(97, "已中止"); // 在受理之前被中止
// 以下状态信息需要确认
// String ENTRUSTMENT_STATUS_IDENTIFYING = "检验中";
// String ENTRUSTMENT_STATUS_IDENTIFIED = "已检验";
// String ENTRUSTMENT_STATUS_ANALYSED = "已分析";
// String ENTRUSTMENT_STATUS_WAITING_MARK_REPORT = "等制作文书";
// String ENTRUSTMENT_STATUS_COMPLETED = "已完成";
// String ENTRUST_STATUS_COMPLETED = "已完成";
// String ENTRUSTMENT_STATUS_WAITING_REPLENISH_SAMPLES = "待补充样本";
/**
@@ -62,7 +62,7 @@ public enum EntrustmentStatusConstants {
if (theStatus == null) {
theStatus = 0;
}
for (EntrustmentStatusConstants st : EntrustmentStatusConstants.values()) {
for (EntrustStatusConstants st : EntrustStatusConstants.values()) {
if (st.getStatus() == theStatus) {
return st.description;
}
@@ -76,22 +76,22 @@ public enum EntrustmentStatusConstants {
}
if (StrUtil.equalsIgnoreCase(taskDefinitionKey, "entrustmentCreate")) {
return ENTRUSTMENT_STATUS_CREATED.getStatus();
return ENTRUST_STATUS_CREATED.getStatus();
}
else if (StrUtil.equalsIgnoreCase(taskDefinitionKey, "entrustmentCheck")) {
return ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus();
return ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus();
}
else if (StrUtil.equalsIgnoreCase(taskDefinitionKey, "entrustmentApprove")) {
return ENTRUSTMENT_STATUS_WAITING_APPROVE_CLAIM.getStatus();
return ENTRUST_STATUS_WAITING_APPROVE_CLAIM.getStatus();
}
else if (StrUtil.equalsIgnoreCase(taskDefinitionKey, "deliverConfirm")) {
return ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus();
return ENTRUST_STATUS_WAITING_CONFIRM.getStatus();
}
else if (StrUtil.equalsIgnoreCase(taskDefinitionKey, "entrustmentWaitforDeliver")) {
return ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus();
return ENTRUST_STATUS_WAITING_DELIVER.getStatus();
}
else if (StrUtil.equalsIgnoreCase(taskDefinitionKey, "entrustmentAccept")) {
return ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus();
return ENTRUST_STATUS_WAITING_ACCEPT.getStatus();
}
else {
return -1;
@@ -115,7 +115,7 @@ public enum EntrustmentStatusConstants {
if (theStatus == null) {
return false;
}
if (theStatus.equals(ENTRUSTMENT_STATUS_ACCEPTED.getStatus()) || theStatus.equals(ENTRUSTMENT_STATUS_TEST_FINISH.getStatus()) || theStatus.equals(ENTRUSTMENT_STATUS_COMPLETED.getStatus())) {
if (theStatus.equals(ENTRUST_STATUS_ACCEPTED.getStatus()) || theStatus.equals(ENTRUST_STATUS_TEST_FINISH.getStatus()) || theStatus.equals(ENTRUST_STATUS_COMPLETED.getStatus())) {
return true;
}
return false;

7
src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustAlterApplyMapper.java
View File

@@ -1,17 +1,12 @@
package digital.laboratory.platform.entrustment.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import digital.laboratory.platform.entrustment.entity.EntrustAlterApply;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.query.EntrustAlterApplyQuery;
import digital.laboratory.platform.entrustment.vo.EntrustAlterApplyVO;
import digital.laboratory.platform.entrustment.vo.EntrustmentVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

3
src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustApproveRecordMapper.java
View File

@@ -1,12 +1,11 @@
package digital.laboratory.platform.entrustment.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
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;

3
src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustMaterialCheckoutResultMapper.java
View File

@@ -1,14 +1,11 @@
package digital.laboratory.platform.entrustment.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import digital.laboratory.platform.entrustment.entity.EntrustMaterialCheckoutResult;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO;
import digital.laboratory.platform.entrustment.vo.EntrustmentVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

1
src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustmentIdentificationMaterialMapper.java
View File

@@ -3,7 +3,6 @@ package digital.laboratory.platform.entrustment.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial;
import digital.laboratory.platform.entrustment.vo.EntrustmentIdentificationMaterialVO;
import org.apache.ibatis.annotations.Mapper;

1
src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustmentMapper.java
View File

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.vo.CaseEventVO;
import digital.laboratory.platform.entrustment.vo.EntrustmentVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

1
src/main/java/digital/laboratory/platform/entrustment/mapper/TakerMapper.java
View File

@@ -3,7 +3,6 @@ package digital.laboratory.platform.entrustment.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import digital.laboratory.platform.entrustment.entity.Taker;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 采集员 Mapper 接口

36
src/main/java/digital/laboratory/platform/entrustment/misc/ProcessFlowMapper.java
View File

@@ -1,6 +1,6 @@
package digital.laboratory.platform.entrustment.misc;
import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants;
import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants;
/**
@@ -9,30 +9,30 @@ import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants;
public class ProcessFlowMapper {
public static int getNextStatus(int currentStatus, int opCode) {
int processFlowMapper[][] = {
{EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus()},
{EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus()},
{EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()},
{EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus()},
{EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE_CLAIM.getStatus()},
{EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus(), -1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()},
{EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE_CLAIM.getStatus()},
{EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus(), -1, EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()},
{EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE_CLAIM.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus()},
{EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus()},
{EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus(), -1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()},
{EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus(), -2, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()},
{EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE_CLAIM.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus()},
{EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus()},
{EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus(), -1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus()},
{EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus(), -2, EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()},
{EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus()},
{EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus(), -1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()},
{EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus()},
{EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus(), -1, EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()},
{EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()},
{EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus(), -1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ABORTED.getStatus()},
{EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus()},
{EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus(), -1, EntrustStatusConstants.ENTRUST_STATUS_ABORTED.getStatus()},
// {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()},
// {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()},
// {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus(), -1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()},
// {EntrustmentStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()},
// {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus(), 1, EntrustmentStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()},
// {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus(), -1, EntrustmentStatusConstants.ENTRUST_STATUS_CREATED.getStatus()},
{EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()},
{EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus(), -1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()},
{EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()},
{EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus(), -1, EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()},
};
for (int i = 0; i < processFlowMapper.length; i++) {

2
src/main/java/digital/laboratory/platform/entrustment/query/EntrustMaterialCheckoutResultQuery.java
View File

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* 委托中检材检出结果消息 查询对象（分页查询、列表查询）
*

3
src/main/java/digital/laboratory/platform/entrustment/service/CaseEventService.java
View File

@@ -5,11 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.entrustment.entity.CaseEvent;
import digital.laboratory.platform.othersys.vo.EntrustDataVo;
import digital.laboratory.platform.entrustment.vo.CaseEventVO;
import digital.laboratory.platform.othersys.vo.EntrustDataVo;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
import java.util.Map;

1
src/main/java/digital/laboratory/platform/entrustment/service/CommonFeignService.java
View File

@@ -4,7 +4,6 @@ import com.deepoove.poi.XWPFTemplate;
import digital.laboratory.platform.sys.entity.Area;
import digital.laboratory.platform.sys.entity.SysOrg;
import digital.laboratory.platform.sys.entity.SysUser;
import digital.laboratory.platform.sys.vo.UserVO;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;

2
src/main/java/digital/laboratory/platform/entrustment/service/EntrustAlterApplyService.java
View File

@@ -1,11 +1,11 @@
package digital.laboratory.platform.entrustment.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.entrustment.dto.ApprovedUpdateEntrustDTO;
import digital.laboratory.platform.entrustment.dto.EntrustAlterApplyApproveDTO;
import digital.laboratory.platform.entrustment.dto.EntrustAlterApplyDTO;
import digital.laboratory.platform.entrustment.entity.EntrustAlterApply;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.entrustment.query.EntrustAlterApplyQuery;
import digital.laboratory.platform.entrustment.vo.EntrustAlterApplyVO;

2
src/main/java/digital/laboratory/platform/entrustment/service/EntrustApproveRecordService.java
View File

@@ -1,8 +1,8 @@
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.EntrustApproveRecord;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.query.BaseQuery;
import digital.laboratory.platform.entrustment.vo.EntrustApproveRecordVO;

1
src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentIdentificationMaterialService.java
View File

@@ -2,7 +2,6 @@ package digital.laboratory.platform.entrustment.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.common.core.util.R;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.entrustment.dto.PrintDTO;
import digital.laboratory.platform.entrustment.entity.CaseEvidence;

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

@@ -14,8 +14,8 @@ import digital.laboratory.platform.entrustment.vo.EntrustmentVO;
import digital.laboratory.platform.entrustment.vo.MaterialListForBookVo;
import digital.laboratory.platform.sys.entity.Deliverer;
import digital.laboratory.platform.sys.entity.SysUser;
import digital.laboratory.platform.sys.vo.entrustment.MarkersVO;
import digital.laboratory.platform.sys.entity.entrustment.Sample;
import digital.laboratory.platform.sys.vo.entrustment.MarkersVO;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

4
src/main/java/digital/laboratory/platform/entrustment/service/IdentificationService.java
View File

@@ -1,11 +1,7 @@
package digital.laboratory.platform.entrustment.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.entity.Identification;
import digital.laboratory.platform.entrustment.vo.EntrustmentVO;
import digital.laboratory.platform.entrustment.vo.IdentificationVO;
import java.util.List;

2
src/main/java/digital/laboratory/platform/entrustment/service/SampleBoxService.java
View File

@@ -1,9 +1,9 @@
package digital.laboratory.platform.entrustment.service;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.sys.entity.entrustment.SampleBox;
import digital.laboratory.platform.entrustment.vo.SampleBoxLiteVO;
import digital.laboratory.platform.entrustment.vo.SampleBoxVO;
import digital.laboratory.platform.sys.entity.entrustment.SampleBox;
import java.util.List;

2
src/main/java/digital/laboratory/platform/entrustment/service/SynchronizeDataService.java
View File

@@ -2,9 +2,9 @@ package digital.laboratory.platform.entrustment.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.fasterxml.jackson.core.JsonProcessingException;
import digital.laboratory.platform.othersys.dto.EntrustQueryParams;
import digital.laboratory.platform.entrustment.entity.EntrustOfThirdSys;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.othersys.dto.EntrustQueryParams;
import digital.laboratory.platform.othersys.vo.SynConnInfoVo;
/**

4
src/main/java/digital/laboratory/platform/entrustment/service/impl/AcceptServiceImpl.java
View File

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import digital.laboratory.platform.common.core.exception.ValidateCodeException;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial;
import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants;
import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants;
import digital.laboratory.platform.entrustment.service.AcceptService;
import digital.laboratory.platform.entrustment.service.EntrustmentIdentificationMaterialService;
import digital.laboratory.platform.entrustment.service.EntrustmentService;
@@ -45,7 +45,7 @@ public class AcceptServiceImpl implements AcceptService {
if (entrustment == null) {
throw new ValidateCodeException("检材对应的委托信息不存在！");
}
if (entrustment.getStatus().compareTo(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()) >= 0) {
if (entrustment.getStatus().compareTo(EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()) >= 0) {
throw new ValidateCodeException("该检材对应的委托信息已经受理完成，不能修改！");
}
// 获取要修改的检材受理编号

9
src/main/java/digital/laboratory/platform/entrustment/service/impl/CaseEventServiceImpl.java
View File

@@ -1,6 +1,5 @@
package digital.laboratory.platform.entrustment.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,12 +16,12 @@ import digital.laboratory.platform.entrustment.entity.CaseEvidence;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial;
import digital.laboratory.platform.entrustment.mapper.CaseEventMapper;
import digital.laboratory.platform.othersys.vo.EntrustDataVo;
import digital.laboratory.platform.entrustment.service.CaseEventService;
import digital.laboratory.platform.entrustment.service.CaseEvidenceService;
import digital.laboratory.platform.entrustment.service.EntrustmentIdentificationMaterialService;
import digital.laboratory.platform.entrustment.service.EntrustmentService;
import digital.laboratory.platform.entrustment.vo.CaseEventVO;
import digital.laboratory.platform.othersys.vo.EntrustDataVo;
import digital.laboratory.platform.sys.entity.SysOrg;
import digital.laboratory.platform.sys.feign.RemoteOrgService;
import lombok.RequiredArgsConstructor;
@@ -31,10 +30,10 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**

2
src/main/java/digital/laboratory/platform/entrustment/service/impl/CaseEvidenceServiceImpl.java
View File

@@ -9,10 +9,10 @@ import digital.laboratory.platform.common.core.util.R;
import digital.laboratory.platform.entrustment.entity.CaseEvent;
import digital.laboratory.platform.entrustment.entity.CaseEvidence;
import digital.laboratory.platform.entrustment.mapper.CaseEvidenceMapper;
import digital.laboratory.platform.entrustment.service.CaseEvidenceService;
import digital.laboratory.platform.othersys.utils.ConvertUtils;
import digital.laboratory.platform.othersys.vo.EntrustDataVo;
import digital.laboratory.platform.othersys.vo.MaterialVo;
import digital.laboratory.platform.entrustment.service.CaseEvidenceService;
import digital.laboratory.platform.sys.feign.RemoteDictionaryService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

5
src/main/java/digital/laboratory/platform/entrustment/service/impl/CommonFeignServiceImpl.java
View File

@@ -25,7 +25,10 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream;
import java.util.*;
import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**

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

@@ -25,7 +25,10 @@ import digital.laboratory.platform.entrustment.enums.AnalysisOptionEnums;
import digital.laboratory.platform.entrustment.enums.EntrustAlterApplyStatus;
import digital.laboratory.platform.entrustment.mapper.EntrustAlterApplyMapper;
import digital.laboratory.platform.entrustment.query.EntrustAlterApplyQuery;
import digital.laboratory.platform.entrustment.service.*;
import digital.laboratory.platform.entrustment.service.CaseEventService;
import digital.laboratory.platform.entrustment.service.EntrustAlterApplyService;
import digital.laboratory.platform.entrustment.service.EntrustmentIdentificationMaterialService;
import digital.laboratory.platform.entrustment.service.EntrustmentService;
import digital.laboratory.platform.entrustment.vo.EntrustAlterApplyVO;
import digital.laboratory.platform.sys.entity.DrugLite;
import org.springframework.stereotype.Service;

2
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustApproveRecordServiceImpl.java
View File

@@ -8,9 +8,9 @@ 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.mapper.EntrustApproveRecordMapper;
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;

13
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java
View File

@@ -19,7 +19,7 @@ import digital.laboratory.platform.entrustment.dto.ResultExcelDTO;
import digital.laboratory.platform.entrustment.entity.EntrustMaterialCheckoutResult;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial;
import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants;
import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants;
import digital.laboratory.platform.entrustment.mapper.EntrustMaterialCheckoutResultMapper;
import digital.laboratory.platform.entrustment.mapper.EntrustmentIdentificationMaterialMapper;
import digital.laboratory.platform.entrustment.query.EntrustMaterialCheckoutResultQuery;
@@ -32,7 +32,10 @@ import digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultV
import digital.laboratory.platform.entrustment.vo.EntrustmentIdentificationMaterialVO;
import digital.laboratory.platform.sys.entity.Area;
import digital.laboratory.platform.sys.entity.DrugLite;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -123,7 +126,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
if (entrustment == null) {
throw new CheckedException("委托信息不存在！");
}
if (!entrustment.getStatus().equals(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus())) {
if (!entrustment.getStatus().equals(EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus())) {
throw new CheckedException("该委托信息并未被机构受理！");
}
List<String> ids = dto.getIds();
@@ -651,7 +654,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
// 2. 查询委托数据
List<Entrustment> entrusts = entrustmentService.list(qw
.eq(Entrustment::getEntrustmentType, entrustType)
.ge(Entrustment::getStatus, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()));
.ge(Entrustment::getStatus, EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()));
if (entrusts.isEmpty()) {
return Collections.emptyMap();
@@ -951,7 +954,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
// 查询符合条件的 Entrustment 记录
List<Entrustment> entrusts = entrustmentService.list(wrapper
.eq(Entrustment::getEntrustmentType, entrustType)
.eq(Entrustment::getStatus, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus())
.eq(Entrustment::getStatus, EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus())
);
// 按照 oldIdentificationResult 进行分组

24
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
View File

@@ -25,8 +25,7 @@ import digital.laboratory.platform.common.security.util.SecurityUtils;
import digital.laboratory.platform.entrustment.dto.PrintDTO;
import digital.laboratory.platform.entrustment.entity.*;
import digital.laboratory.platform.entrustment.enums.AnalysisOptionEnums;
import digital.laboratory.platform.entrustment.enums.EntrustBiologyType;
import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants;
import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants;
import digital.laboratory.platform.entrustment.handler.AppStartupRunner;
import digital.laboratory.platform.entrustment.mapper.EntrustmentIdentificationMaterialMapper;
import digital.laboratory.platform.entrustment.mapper.EntrustmentMapper;
@@ -39,6 +38,7 @@ import digital.laboratory.platform.sys.entity.DrugLite;
import digital.laboratory.platform.sys.entity.SysUser;
import digital.laboratory.platform.sys.entity.entrustment.Sample;
import digital.laboratory.platform.sys.entity.entrustment.SampleBox;
import digital.laboratory.platform.sys.enums.entrust.EntrustBiologyType;
import digital.laboratory.platform.sys.feign.RemoteEquipmentService;
import digital.laboratory.platform.sys.feign.RemoteSampleService;
import digital.laboratory.platform.sys.feign.RemoteUserService;
@@ -240,7 +240,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
.eq("sample1_no", sampleNo));
if (sourceMaterial != null) {
Entrustment entrustment = entrustmentService.getById(sourceMaterial.getEntrustmentId());
if (entrustment.getStatus() >= EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()) {
if (entrustment.getStatus() >= EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()) {
Sample sample = new Sample();
sample.setIdentificationMaterialId(sourceMaterial.getId());
sample.setBoxId(boxId);
@@ -256,7 +256,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
.eq("sample2_no", sampleNo));
if (sourceMaterial != null) {
Entrustment entrustment = entrustmentService.getById(sourceMaterial.getEntrustmentId());
if (entrustment.getStatus() >= EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()) {
if (entrustment.getStatus() >= EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()) {
Sample sample = new Sample();
sample.setIdentificationMaterialId(sourceMaterial.getId());
sample.setBoxId(boxId);
@@ -327,7 +327,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
//判断是否受理了，如果受理完成之后再加入包装袋，则需在操作检材流转系统，更新boxID
if (materials != null && materials.size() > 0) {
if (entrustment.getStatus() >= EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()) {
if (entrustment.getStatus() >= EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()) {
for (EntrustmentIdentificationMaterial material : materials) {
Sample sample = new Sample();
sample.setIdentificationMaterialId(material.getId());
@@ -518,11 +518,11 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
}
// 对已经审核过的委托进行处理
if (entrustment.getStatus().compareTo(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus()) >= 0) {
if (entrustment.getStatus().compareTo(EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus()) >= 0) {
return null;
}
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus()) {
throw new RuntimeException("委托不在待审核状态");
}
@@ -571,7 +571,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", im.getEntrustmentId()));
}
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus()) {
throw new RuntimeException("委托不在待审批状态");
}
@@ -646,7 +646,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", im.getEntrustmentId()));
}
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus()) {
throw new RuntimeException("委托不在正在受理状态");
}
if (identificationMaterial.getSample1RepeatWeigh() != null) {
@@ -721,7 +721,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", im.getEntrustmentId()));
}
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus()) {
throw new RuntimeException("委托不在正在受理状态");
}
@@ -940,7 +940,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
synchronizeMaterialVoService.updateById(entrustMaterialOfThirdSys);
}
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus() && !dlpUser.isStaff()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus() && !dlpUser.isStaff()) {
throw new RuntimeException(String.format("当前委托不在可以修改的状态"));
}
@@ -1200,7 +1200,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
public List<EntrustmentIdentificationMaterial> createNewIm(List<EntrustmentIdentificationMaterial> identificationMaterialList, DLPUser dlpUser) {
Entrustment entrustment = entrustmentService.getById(identificationMaterialList.get(0).getEntrustmentId());
if (!dlpUser.isStaff() && entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) {
if (!dlpUser.isStaff() && entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) {
throw new RuntimeException(String.format("你已提交过该委托，无法再添加检材信息!"));
}
// 记录当前委托的检材数量

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

@@ -39,7 +39,7 @@ import digital.laboratory.platform.entrustment.dto.EntrustmentDTO;
import digital.laboratory.platform.entrustment.entity.*;
import digital.laboratory.platform.entrustment.enums.AnalysisOptionEnums;
import digital.laboratory.platform.entrustment.enums.EntrustAlterApplyStatus;
import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants;
import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants;
import digital.laboratory.platform.entrustment.event.PushDataToLabsCareEvent;
import digital.laboratory.platform.entrustment.handler.AppStartupRunner;
import digital.laboratory.platform.entrustment.mapper.EntrustmentMapper;
@@ -332,11 +332,11 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
for (EntrustmentVO evo : r.getRecords()) {
int status = evo.getStatus();
String statusDesc = EntrustmentStatusConstants.getStatusDescription(status);
String statusDesc = EntrustStatusConstants.getStatusDescription(status);
evo.setStatusDescription(statusDesc);
int prevStatus = evo.getPreviousStatus();
String prevStatusDesc = EntrustmentStatusConstants.getStatusDescription(prevStatus);
String prevStatusDesc = EntrustStatusConstants.getStatusDescription(prevStatus);
evo.setPreviousStatusDescription(prevStatusDesc);
}
return r;
@@ -347,8 +347,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
List<EntrustmentVO> r = baseMapper.getEntrustmentVOList(qw);
for (EntrustmentVO evo : r) {
evo.setStatusDescription(EntrustmentStatusConstants.getStatusDescription(evo.getStatus()));
evo.setPreviousStatusDescription(EntrustmentStatusConstants.getStatusDescription(evo.getPreviousStatus()));
evo.setStatusDescription(EntrustStatusConstants.getStatusDescription(evo.getStatus()));
evo.setPreviousStatusDescription(EntrustStatusConstants.getStatusDescription(evo.getPreviousStatus()));
}
return r;
}
@@ -357,8 +357,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
public EntrustmentVO getEntrustmentVOById(String id) {
EntrustmentVO evo = baseMapper.getEntrustmentVOById(id);
evo.setHappenTime(LocalDateTimeUtil.format(caseEventService.getById(evo.getCaseId()).getHappenTime(), "yyyy年MM月dd日"));
evo.setStatusDescription(EntrustmentStatusConstants.getStatusDescription(evo.getStatus()));
evo.setPreviousStatusDescription(EntrustmentStatusConstants.getStatusDescription(evo.getPreviousStatus()));
evo.setStatusDescription(EntrustStatusConstants.getStatusDescription(evo.getStatus()));
evo.setPreviousStatusDescription(EntrustStatusConstants.getStatusDescription(evo.getPreviousStatus()));
return evo;
}
@@ -415,7 +415,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
public Boolean generateIdentifyItemsBook(String entrustId) {
Entrustment entrustment = this.getOne(Wrappers.<Entrustment>query().eq("id", entrustId));
// 标记该委托是否已经受理
int isAccepted = entrustment.getStatus().compareTo(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus());
int isAccepted = entrustment.getStatus().compareTo(EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus());
List<EntrustmentIdentificationMaterial> materialList = entrustmentIdentificationMaterialService.list(Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery()
.eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustId)
.orderByAsc(isAccepted != -1, EntrustmentIdentificationMaterial::getAcceptNo)
@@ -946,7 +946,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
break;
}
try {
if (!ossFile.objectExist(retBookName) || entrustment.getStatus() <= EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) {
if (!ossFile.objectExist(retBookName) || entrustment.getStatus() <= EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus()) {
//不存在就生成一个
if ((whatBook.equals("identItemBook") || whatBook.equals("identfyBook")) && this.generateIdentifyItemsBook(entrustId)) {
return retBookName;
@@ -973,7 +973,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
public boolean testsFinish(String entrustId) {
Entrustment entrustment = this.baseMapper.selectOne(Wrappers.<Entrustment>query()
.eq("id", entrustId));
entrustment.setStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_TEST_FINISH.getStatus());
entrustment.setStatus(EntrustStatusConstants.ENTRUST_STATUS_TEST_FINISH.getStatus());
return this.updateById(entrustment);
}
@@ -1157,7 +1157,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", entrust.getId()));
}
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) {
throw new RuntimeException("委托已经提交, 不能再进行修改");
}
@@ -1275,7 +1275,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
throw new CheckedException(String.format("没有找到 id 为 %s 的委托", entrust.getId()));
}
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) {
throw new CheckedException("委托已经提交, 无须再次提交");
}
@@ -1307,7 +1307,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
entrustment.setSubmitter(dlpUser.getId());
entrustment.setSubmitTime(LocalDateTime.now());
entrustment.setPreviousStatus(entrustment.getStatus()); // 可能是从其他环节转过来的, 一旦提交, 保存上一个状态
//entrustment.setStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus());
//entrustment.setStatus(EntrustmentStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus());
entrustment.setStatus(ProcessFlowMapper.getNextStatus(entrustment.getStatus(), 1));
List<UpdateInfo> pis = entrustment.getProcessInfo();
if (pis == null) {
@@ -1376,7 +1376,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", entrust.getId()));
}
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus()) {
// 已经有人认领这个审核任务了
throw new RuntimeException(String.format("委托不在待审核状态, 审核任务认领人: %s", entrustment.getCheckClaimUser()));
}
@@ -1404,7 +1404,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
entrustment.setCheckClaimUser(dlpUser.getId());
entrustment.setCheckClaimTime(LocalDateTime.now());
entrustment.setPreviousStatus(entrustment.getStatus()); // 可能是从其他环节转过来的, 一旦提交, 保存上一个状态
entrustment.setStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus());
entrustment.setStatus(EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus());
//-------------------
// 更新数据库表数据
@@ -1457,7 +1457,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
// throw new RuntimeException(String.format("委托的审核任务是由其他人认领的。认领用户是: %s", entrustment.getCheckClaimUser()));
// }
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus()) {
throw new RuntimeException("委托不在待审核状态");
}
@@ -1504,7 +1504,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
currentAcceptNo = yearStr + "-" + (StrUtil.isBlank(maxEntrustAcceptNo) ? "1" : (Integer.parseInt(maxEntrustAcceptNo) + 1));
}
if (newStatus == EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) {
if (newStatus == EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) {
EntrustmentIdentificationMaterial im = new EntrustmentIdentificationMaterial();
im.setCheckPassed(0);
im.setApprovePassed(0);
@@ -1625,7 +1625,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", entrust.getId()));
}
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE_CLAIM.getStatus()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE_CLAIM.getStatus()) {
// 已经有人认领这个审批任务了
throw new RuntimeException(String.format("委托不在待审批状态, 审批任务认领人: %s", entrustment.getApproveClaimUser()));
}
@@ -1652,7 +1652,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
entrustment.setApproveClaimUser(dlpUser.getId());
entrustment.setApproveClaimTime(LocalDateTime.now());
entrustment.setPreviousStatus(entrustment.getStatus()); // 可能是从其他环节转过来的, 一旦提交, 保存上一个状态
entrustment.setStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus());
entrustment.setStatus(EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus());
//-------------------
// 更新数据库表数据
@@ -1702,7 +1702,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
// throw new RuntimeException(String.format("委托的审批任务是由其他人认领的。认领用户是: %s", entrustment.getCheckClaimUser()));
// }
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus()) {
throw new RuntimeException("委托不在待审批状态");
}
@@ -1725,13 +1725,13 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
int newStatus; // 新的状态(环节)
{
newStatus = ProcessFlowMapper.getNextStatus(entrustment.getStatus(), opCode);
if (newStatus == EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) {
if (newStatus == EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) {
EntrustmentIdentificationMaterial im = new EntrustmentIdentificationMaterial();
im.setCheckPassed(0);
im.setApprovePassed(0);
im.setAcceptPassed(0);
entrustmentIdentificationMaterialService.setEntrustmentIdentificationMaterialStatusByEntrustment(im, entrustment.getId());
} else if (newStatus == EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()) {
} else if (newStatus == EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus()) {
EntrustmentIdentificationMaterial im = new EntrustmentIdentificationMaterial();
im.setCheckPassed(0);
im.setApprovePassed(0);
@@ -1809,7 +1809,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", entrust.getId()));
}
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus()) {
return null;
}
@@ -1825,7 +1825,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
int newStatus = -1; // 新的状态(环节)
{
newStatus = ProcessFlowMapper.getNextStatus(entrustment.getStatus(), opCode);
if (newStatus == EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) {
if (newStatus == EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) {
EntrustmentIdentificationMaterial im = new EntrustmentIdentificationMaterial();
im.setCheckPassed(0);
im.setApprovePassed(0);
@@ -1875,7 +1875,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", entrust.getId()));
}
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus()) {
throw new RuntimeException("委托不在待送检状态");
}
@@ -1961,7 +1961,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", entrust.getId()));
}
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus()) {
throw new RuntimeException("委托不在待送检状态");
}
@@ -2033,7 +2033,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
String pdfFilePath = OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + ev.getId() + "/" + entrustmentLetterFileName + ".docx";
try {
//这里加一下判断条件，由于贵阳市局这里的情况是审核的时候就需要查看委托书，所以为了保证每一次提交过来的委托都是最新的，所以在受理通过以前应该每次查看都是重新生成
if (!ossFile.objectExist(pdfFilePath) || ev.getStatus() <= EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) {
if (!ossFile.objectExist(pdfFilePath) || ev.getStatus() <= EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus()) {
GenerateEntrustmentLetterPDF(ev);
return pdfFilePath;
}
@@ -2060,7 +2060,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", id));
}
if (ev.getStatus() < EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) {
if (ev.getStatus() < EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) {
throw new RuntimeException("委托状态必须在委托创建之后才能打印鉴定委托书");
}
@@ -2226,8 +2226,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
//特殊审批委托
public void specialApprove(Entrustment entrustment) {
//将审批状态直接提升为待受理状态
entrustment.setStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus());
entrustment.setPreviousStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus());
entrustment.setStatus(EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus());
entrustment.setPreviousStatus(EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus());
this.updateById(entrustment);
}
@@ -2252,7 +2252,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
// throw new RuntimeException(String.format("委托的受理任务是由其他人认领的。认领受理的用户是: %s", entrustment.getAcceptClaimUser()));
// }
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus()) {
throw new RuntimeException("委托不在正在受理状态");
}
@@ -2309,7 +2309,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
// throw new RuntimeException(String.format("委托的受理任务是由其他人认领的。认领的用户是: %s", entrustment.getAcceptClaimUser()));
// }
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus()) {
throw new RuntimeException("委托不在正在受理状态");
}
if (opCode < 0) {
@@ -2387,7 +2387,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
}
}
if (newStatus == EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) {
if (newStatus == EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) {
EntrustmentIdentificationMaterial im = new EntrustmentIdentificationMaterial();
im.setCheckPassed(0);
im.setApprovePassed(0);
@@ -2565,7 +2565,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
// 正在受理和已受理这2个状态下可以打印
//这里再次修改一下，以前是待受理和已受理两个状态才能生成，由于贵阳市局这里的情况是需要在审核的时候查看确认书，所以如果状态是在委托提交以前我们才不允许生成
if (ev.getStatus() < EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus()) {
if (ev.getStatus() < EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus()) {
throw new RuntimeException("委托不在可以生成确认书的状态");
}
@@ -2588,7 +2588,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
//如果文件不存在，则生成，否则直接从OSS中获取
//if (!ossFile.objectExist(pdfFilePath)) {
//这里加一个判断，由于贵阳市局的确认书需要在审核的时候就能打印出来，为了保证每一次生成的确认书都是委托单位提交过来的最新版，所以我们在审核通过之前，每一次生成委托书都应该重新生成，审核成功以后就不用再重新生成了
if (!ossFile.objectExist(downFile) || ev.getStatus() <= EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) {
if (!ossFile.objectExist(downFile) || ev.getStatus() <= EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus()) {
if (this.generateIdentifyItemsBook(ev.getId())) {
ossFile.fileGet(downFile, httpServletResponse.getOutputStream());
@@ -2724,8 +2724,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
if (cj == null) {
throw new RuntimeException(String.format("不存在 caseId 为 % 的案件", entrustment.getCaseId()));
}
entrustment.setStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()); // 初始状态为待提交
entrustment.setPreviousStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()); // 老的状态也为待提交
entrustment.setStatus(EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()); // 初始状态为待提交
entrustment.setPreviousStatus(EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()); // 老的状态也为待提交
List<UpdateInfo> pis = entrustment.getProcessInfo();
if (pis == null) {
pis = new ArrayList<>();
@@ -2758,8 +2758,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
return R.failed("这个委托的委托单位不是你的所属单位, 你无权删除!");
}
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus() ||
entrustment.getPreviousStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) {
if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus() ||
entrustment.getPreviousStatus() != EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) {
return R.failed("这个委托已被提交过, 不能删除!");
}
@@ -2913,25 +2913,25 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", entrustmentId));
}
if (entrustment.getStatus() == EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) {
if (entrustment.getStatus() == EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) {
// 在创建人手中: 已创建, 等待提交
// return R.ok(this.taskAvailableUserList_Check());
return R.ok(commonFeignService.remoteGetUsersByPermission(CommonConstants.ORG_TREE_ROOT_ID, CollUtil.newArrayList("EntrustmentCheck")));
} else if (entrustment.getStatus() == EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()) {
} else if (entrustment.getStatus() == EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus()) {
// 在审核员手中: 已提交, 待审核
// return R.ok(this.taskAvailableUserList_Approve());
return R.ok(commonFeignService.remoteGetUsersByPermission(CommonConstants.ORG_TREE_ROOT_ID, CollUtil.newArrayList("EntrustmentApprove")));
} else if (entrustment.getStatus() == EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus()) {
} else if (entrustment.getStatus() == EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus()) {
// 在审批员手中: 已审核, 待审批
// return R.ok(this.taskAvailableUserList_Confirm(entrustment.getClientOrgId()));
return R.ok(commonFeignService.remoteGetUsersByPermission(entrustment.getClientOrgId(), CollUtil.newArrayList("EntrustmentConfirm")));
} else if (entrustment.getStatus() == EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus()) {
} else if (entrustment.getStatus() == EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus()) {
// 在确认者手中: 已审批, 待确认
List<SysUser> users = new ArrayList<>();
SysUser submitter = remoteUserService.innerGetById(entrustment.getSubmitter()).getData();
users.add(submitter);
return R.ok(users);
} else if (entrustment.getStatus() == EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus()) {
} else if (entrustment.getStatus() == EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus()) {
// 在送检提交员(创建者)手中: 已确认, 待送检
// return R.ok(this.taskAvailableUserList_Accept());
return R.ok(commonFeignService.remoteGetUsersByPermission(CommonConstants.ORG_TREE_ROOT_ID, CollUtil.newArrayList("EntrustmentAccept")));
@@ -3029,8 +3029,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
caseEventService.save(caseEvent);
entrustmentDTO.setStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()); // 初始状态为待提交
entrustmentDTO.setPreviousStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()); // 老的状态也为待提交
entrustmentDTO.setStatus(EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()); // 初始状态为待提交
entrustmentDTO.setPreviousStatus(EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()); // 老的状态也为待提交
List<UpdateInfo> pis = entrustmentDTO.getProcessInfo();
if (pis == null) {
pis = new ArrayList<>();
@@ -3079,15 +3079,15 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
// 根据状态进行分组
Map<Integer, List<Entrustment>> entrustGroupByStatusMap = entrustList.stream().collect(Collectors.groupingBy(Entrustment::getStatus));
markersVOS.add(new MarkersVO("案件委托", entrustGroupByStatusMap.getOrDefault(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus(), Collections.EMPTY_LIST).size(), "待提交"));
markersVOS.add(new MarkersVO("案件委托", entrustGroupByStatusMap.getOrDefault(EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus(), Collections.EMPTY_LIST).size(), "待提交"));
int deliverCount = entrustGroupByStatusMap.getOrDefault(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus(), Collections.EMPTY_LIST).size()
+ entrustGroupByStatusMap.getOrDefault(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus(), Collections.EMPTY_LIST).size();
int deliverCount = entrustGroupByStatusMap.getOrDefault(EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus(), Collections.EMPTY_LIST).size()
+ entrustGroupByStatusMap.getOrDefault(EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus(), Collections.EMPTY_LIST).size();
markersVOS.add(new MarkersVO("案件委托", deliverCount, "待送检"));
markersVOS.add(new MarkersVO("案件委托", entrustList.stream().filter(entrust -> entrust.getReturnOrNot() != null &&entrust.getReturnOrNot().equals(-1)).collect(Collectors.toList()).size(), "已退回"));
markersVOS.add(new MarkersVO("案件委托", entrustGroupByStatusMap.getOrDefault(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_COMPLETED.getStatus(), Collections.EMPTY_LIST).size(), "已完成"));
markersVOS.add(new MarkersVO("案件委托", entrustGroupByStatusMap.getOrDefault(EntrustStatusConstants.ENTRUST_STATUS_COMPLETED.getStatus(), Collections.EMPTY_LIST).size(), "已完成"));
Integer entrustAlterApplyCount = (int) entrustAlterApplyService.count(Wrappers.<EntrustAlterApply>lambdaQuery()
.eq(EntrustAlterApply::getStatus, EntrustAlterApplyStatus.APPLY_SUCCESS.getStatus())
@@ -3273,29 +3273,29 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT,
entrustListMap.getOrDefault(
StrUtil.join("_", EntrustMarkConstants.LOCAL_SYSTEM, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()),
StrUtil.join("_", EntrustMarkConstants.LOCAL_SYSTEM, EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus()),
Collections.EMPTY_LIST
).size(),
String.format("待受理（%s）", EntrustMarkConstants.PUBLIC_SECURITY_BUREAU)));
markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT,
entrustListMap.getOrDefault(
StrUtil.join("_", EntrustMarkConstants.THIRD_PARTY_SYSTEM, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()),
StrUtil.join("_", EntrustMarkConstants.THIRD_PARTY_SYSTEM, EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus()),
Collections.EMPTY_LIST
).size(),
"待受理 (大数据平台)"));
List<Entrustment> entrustListMapOrDefault = entrustListMap.getOrDefault(
StrUtil.join("_", EntrustMarkConstants.LOCAL_SYSTEM, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()), Collections.EMPTY_LIST
StrUtil.join("_", EntrustMarkConstants.LOCAL_SYSTEM, EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()), Collections.EMPTY_LIST
);
// o.getAcceptTime().isAfter(LocalDateTime.of(LocalDate.now().withDayOfYear(1), LocalTime.MIN)) 筛选出当年的数据
markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT,
entrustListMapOrDefault.stream().filter(o ->
o.getAcceptTime().isAfter(LocalDateTime.of(LocalDate.now().withDayOfYear(1), LocalTime.MIN))
&& EntrustmentStatusConstants.geAcceptedStatus(o.getStatus())
&& EntrustStatusConstants.geAcceptedStatus(o.getStatus())
).collect(Collectors.toList()).size(),
String.format("已受理 (%s)", EntrustMarkConstants.PUBLIC_SECURITY_BUREAU)));
markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT,
entrustListMap.getOrDefault(
StrUtil.join("_", EntrustMarkConstants.THIRD_PARTY_SYSTEM, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()), Collections.EMPTY_LIST
StrUtil.join("_", EntrustMarkConstants.THIRD_PARTY_SYSTEM, EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()), Collections.EMPTY_LIST
).size(),
"已受理 (大数据平台)"));
markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT,
@@ -3303,7 +3303,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
.stream()
.filter(o ->
o.getAcceptTime().isAfter(LocalDateTime.of(LocalDate.now().withDayOfYear(1), LocalTime.MIN))
&& EntrustmentStatusConstants.geAcceptedStatus(o.getStatus())
&& EntrustStatusConstants.geAcceptedStatus(o.getStatus())
)
.collect(Collectors.toList())
.size(),
@@ -3349,7 +3349,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
public List<EntrustmentIdentificationMaterial> getAllSampleForPrint() {
List<EntrustmentIdentificationMaterial> entrustmentIdentificationMaterials = new ArrayList<>();
List<Entrustment> entrustmentList = this.list(Wrappers.<Entrustment>lambdaQuery()
.ge(Entrustment::getStatus, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED)
.ge(Entrustment::getStatus, EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED)
.orderByAsc(Entrustment::getAcceptNo));
for (Entrustment entrustment : entrustmentList) {

1
src/main/java/digital/laboratory/platform/entrustment/service/impl/IdentificationServiceImpl.java
View File

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import digital.laboratory.platform.common.core.constant.CommonConstants;
import digital.laboratory.platform.entrustment.entity.Identification;
import digital.laboratory.platform.entrustment.handler.AppStartupRunner;
import digital.laboratory.platform.entrustment.mapper.EntrustmentMapper;
import digital.laboratory.platform.entrustment.mapper.IdentificationMapper;
import digital.laboratory.platform.entrustment.service.IdentificationService;
import digital.laboratory.platform.entrustment.vo.IdentificationVO;

4
src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleBoxServiceImpl.java
View File

@@ -9,7 +9,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import digital.laboratory.platform.common.core.constant.CommonConstants;
import digital.laboratory.platform.common.core.util.R;
import digital.laboratory.platform.common.feign.RemoteTemplate2htmlService;
import digital.laboratory.platform.entrustment.entity.*;
import digital.laboratory.platform.entrustment.entity.CaseEvent;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial;
import digital.laboratory.platform.entrustment.handler.AppStartupRunner;
import digital.laboratory.platform.entrustment.mapper.SampleBoxMapper;
import digital.laboratory.platform.entrustment.service.*;

7
src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleServiceImpl.java
View File

@@ -5,13 +5,12 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import digital.laboratory.platform.common.core.constant.CommonConstants;
import digital.laboratory.platform.sewage.entity.SewageJobIdentificationMaterial;
import digital.laboratory.platform.sys.entity.DrugLite;
import digital.laboratory.platform.entrustment.entity.*;
import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial;
import digital.laboratory.platform.entrustment.handler.AppStartupRunner;
import digital.laboratory.platform.entrustment.mapper.SampleBoxMapper;
import digital.laboratory.platform.entrustment.mapper.SampleMapper;
import digital.laboratory.platform.entrustment.service.SampleService;
import digital.laboratory.platform.sewage.entity.SewageJobIdentificationMaterial;
import digital.laboratory.platform.sys.entity.DrugLite;
import digital.laboratory.platform.sys.entity.entrustment.IMAdditionalProperty;
import digital.laboratory.platform.sys.entity.entrustment.Sample;
import lombok.RequiredArgsConstructor;

37
src/main/java/digital/laboratory/platform/entrustment/service/impl/SynchronizeDataServiceImpl.java
View File

@@ -12,13 +12,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.core.JsonProcessingException;
import digital.laboratory.platform.common.core.constant.CommonConstants;
import digital.laboratory.platform.common.core.util.R;
import digital.laboratory.platform.othersys.dto.EntrustQueryParams;
import digital.laboratory.platform.entrustment.entity.*;
import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants;
import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants;
import digital.laboratory.platform.entrustment.mapper.EntrustDataVoMapper;
import digital.laboratory.platform.entrustment.service.*;
import digital.laboratory.platform.othersys.dto.DataAuditBaseDto;
import digital.laboratory.platform.othersys.dto.EntrustDataDto;
import digital.laboratory.platform.othersys.dto.EntrustQueryParams;
import digital.laboratory.platform.othersys.utils.ConvertUtils;
import digital.laboratory.platform.othersys.utils.HttpsUtils;
import digital.laboratory.platform.othersys.vo.*;
@@ -37,7 +37,10 @@ import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -293,9 +296,9 @@ public class SynchronizeDataServiceImpl extends ServiceImpl<EntrustDataVoMapper,
if (entrustStatus.equals("toAccept")) {
EntrustOfThirdSys entrustOfThirdSys = this.getById(entrustDataVo.getId());
Entrustment entrustment = entrustmentService.getById(entrustOfThirdSys.getEntrustMainId());
if (entrustment != null && !(entrustment.getStatus().equals(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()))) {
if (entrustment != null && !(entrustment.getStatus().equals(EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus()))) {
//如果禁毒大数据平台的状态是待受理，而智慧实验室不是，那么我们将状态也改为待受理
entrustment.setStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus());
entrustment.setStatus(EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus());
entrustmentService.updateById(entrustment);
log.info("将数据更新至待受理状态了 {} ", entrustment.getId());
}
@@ -397,12 +400,12 @@ public class SynchronizeDataServiceImpl extends ServiceImpl<EntrustDataVoMapper,
System.out.println("这个委托已经被通不过了，不需要再同步:" + entrustDataVo.getId());
EntrustOfThirdSys thirdSys = this.getById(entrustDataVo.getId());
Entrustment entrustment = entrustmentService.getById(thirdSys.getEntrustMainId());
if (entrustment != null && !entrustment.getStatus().equals(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus())) {
if (entrustment != null && !entrustment.getStatus().equals(EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus())) {
entrustmentIdentificationMaterialService.remove(Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery().eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustment.getId()));
entrustmentService.removeById(entrustment);
synchronizeMaterialVoService.remove(Wrappers.<EntrustMaterialOfThirdSys>lambdaQuery().eq(EntrustMaterialOfThirdSys::getEntrustId, thirdSys.getId()));
this.removeById(thirdSys);
// entrustment.setStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus());
// entrustment.setStatus(EntrustmentStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus());
// entrustment.setAcceptNo(entrustDataVo.getSerialNumber());
// List<EntrustmentIdentificationMaterial> entrustmentIdentificationMaterialList = entrustmentIdentificationMaterialService.list(Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery().eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustment.getId()));
// List<MaterialVo> materialList = entrustDataVo.getMaterialList();
@@ -525,8 +528,8 @@ public class SynchronizeDataServiceImpl extends ServiceImpl<EntrustDataVoMapper,
entrustment.setDeliverer2Cert(ConvertUtils.getCardTypeName(delivererVo2.getCardType()));//证件名称
entrustment.setDeliverer2Id(delivererVo2.getCertificatesCode());//证件编号
//设置委托状态
entrustment.setStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus());//设置为待审核
entrustment.setPreviousStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus());//
entrustment.setStatus(EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus());//设置为待审核
entrustment.setPreviousStatus(EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus());//
entrustment.setIdentificationDomain("毒品检验");
//补充受理信息
entrustment.setAcceptNo(entrustDataVo.getSerialNumber());//我们自己的受理编号，
@@ -1116,8 +1119,8 @@ public class SynchronizeDataServiceImpl extends ServiceImpl<EntrustDataVoMapper,
entrustment.setOldIdentificationResult(entrustDataVo.getOriginalIdentification());
//设置委托状态
//这里应根据情况，如果是省级审核 如果是受理审核， 如果是已受理
//entrustment.setStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus());//设置为待审核
//entrustment.setPreviousStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus());//
//entrustment.setStatus(EntrustmentStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus());//设置为待审核
//entrustment.setPreviousStatus(EntrustmentStatusConstants.ENTRUST_STATUS_CREATED.getStatus());//
entrustment.setStatus(setEntrustStatusValue.get(0));//设置为待审核
entrustment.setPreviousStatus(setEntrustStatusValue.get(1));//
@@ -1148,16 +1151,16 @@ public class SynchronizeDataServiceImpl extends ServiceImpl<EntrustDataVoMapper,
List<Integer> statusList = new ArrayList<>();
switch (statusStr) {
case "provinceAuditing":
statusList.add(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus());//1
statusList.add(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus());//0
statusList.add(EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus());//1
statusList.add(EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus());//0
break;
case "acceptAuditing":
statusList.add(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE_CLAIM.getStatus());//3
statusList.add(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus());//2
statusList.add(EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE_CLAIM.getStatus());//3
statusList.add(EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus());//2
break;
case "toAccept":
statusList.add(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus());//7
statusList.add(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus());//6
statusList.add(EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus());//7
statusList.add(EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus());//6
break;
}
return statusList;

6
src/main/java/digital/laboratory/platform/entrustment/vo/EntrustMaterialCheckoutResultVO.java
View File

@@ -1,15 +1,9 @@
package digital.laboratory.platform.entrustment.vo;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import digital.laboratory.platform.sys.entity.DrugLite;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* 委托检材--检出定性定量结果信息
* @TableName b_entrust_material_checkout_result

2
src/main/java/digital/laboratory/platform/entrustment/vo/MaterialListForBookVo.java
View File

@@ -2,8 +2,6 @@ package digital.laboratory.platform.entrustment.vo;
import lombok.Data;
import java.math.BigDecimal;
/**
* @ClassName MaterialListForBookVo
* @Description 文书中的检材列表VO