Skip to content

P
patzn-cloud-service-hmhj
Commit d57db9b4 by lijingjing
Options

添加报告节点人信息; 

修改状态节点到归档无法跳入问题
parent 5a521427
Showing with 60 additions and 18 deletions
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustReportServiceImpl.java
......@@ -225,32 +225,47 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
}
}
// 若提交至 -> 质量判定,那么需要更改委托状态
if (toFlowStatus == EntrustFlowEnum.QUALITY_JUDGE) {
entrust.setStatus(EntrustStatusEnum.QUALITY_CHECK);
// 若不需要质量判定，直接进入电子档案流程
if (!entrustSampleService.isRequireJudgeGrading(entrust.getId())) {
entrustSampleService.updateJudgeStatus(entrust.getId(), 2);
}
// 更改样品编码显示形式，由三级变为一级
entrustSampleService.updateSampleCodeByEntrustId(entrust.getId(), 1);
}
// 此处只转换报告相关的状态
EntrustSampleStatusEnum sampleStatusEnum = EntrustFlowUtils.getSampleStatus(toFlowStatus);
EntrustReportStatusEnum reportStatusEnum = EntrustFlowUtils.getReportStatus(toFlowStatus);
// 若从批准往后提交,则生成报告
// change : 下一步是签发或者发放时,生成pdf
if (toFlowStatus == EntrustFlowEnum.REPORT_ISSUE || toFlowStatus == EntrustFlowEnum.REPORT_SEND) {
//转化PDF
executor1.execute(() -> changeExcelReportToPdf(ids));
}
EntrustReport entrustReport = new EntrustReport();
entrustReport.setStatus(reportStatusEnum);
entrustReport.setProgress(reportStatusEnum);
if (toFlowStatus == EntrustFlowEnum.REPORT_ALLOW) {
entrustReport.setReportChecker(account.getUserName()).setReportCheckerId(account.getUserId()).setReportCheckTime(new Date());
} else if (toFlowStatus == EntrustFlowEnum.REPORT_ISSUE || toFlowStatus == EntrustFlowEnum.REPORT_SEND) {
entrust.setTestTimeE(new Date());
entrustService.updateById(entrust);
entrustReport.setReportAllower(account.getUserName()).setReportAllowerId(account.getUserId()).setReportAllowTime(new Date());
// 若从批准往后提交,则生成报告
// 转化PDF
executor1.execute(() -> changeExcelReportToPdf(ids));
} else if (toFlowStatus == EntrustFlowEnum.QUALITY_JUDGE || toFlowStatus == EntrustFlowEnum.ARCHIVES) {
// 归档前置条件为已判定
entrust.setStatus(EntrustStatusEnum.QUALITY_CHECK);
// 更改样品编码显示形式，由三级变为一级
entrustSampleService.updateSampleCodeByEntrustId(entrust.getId(), 1);
//
if (fromFlowStatus == EntrustFlowEnum.REPORT_ISSUE) {
entrustReport.setReportIssuer(account.getUserName()).setReportIssuerId(account.getUserId()).setReportIssueTime(new Date());
} else if (fromFlowStatus == EntrustFlowEnum.REPORT_SEND) {
entrustReport.setReportSender(account.getUserName()).setReportSenderId(account.getUserId()).setReportSendTime(new Date());
}
// 若提交至 -> 质量判定,那么需要更改委托状态
if (toFlowStatus == EntrustFlowEnum.QUALITY_JUDGE) {
// 若不需要质量判定，直接进入电子档案流程
if (!entrustSampleService.isRequireJudgeGrading(entrust.getId())) {
entrustSampleService.updateJudgeStatus(entrust.getId(), 2);
}
} else {
// == 若为归档,可以直接设置已归档
entrustSampleService.updateJudgeStatus(entrust.getId(), 2);
}
}
// 更新对应样品的状态
updateReportRelSamples(ids, toFlowStatus);
......@@ -325,6 +340,7 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
EntrustSampleStatusEnum sampleStatusEnum = null;
EntrustReportStatusEnum reportStatusEnum = null;
EntrustReportStatusEnum reportProgress = null;
EntrustReport entrustReport = new EntrustReport();
if (fromFlowStatus == EntrustFlowEnum.REPORT_SEND) {
reportProgress = EntrustReportStatusEnum.BACK_SEND;
......@@ -340,17 +356,27 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
sampleStatusEnum = EntrustSampleStatusEnum.REPORT_MAKE;
reportStatusEnum = EntrustReportStatusEnum.MAKING;
entrust.setTestTimeE(null);
entrustReport.setReportSender(null).setReportSenderId(null).setReportSendTime(null);
entrustReport.setReportIssuer(null).setReportIssuerId(null).setReportIssueTime(null);
entrustReport.setReportAllower(null).setReportAllowerId(null).setReportAllowTime(null);
entrustReport.setReportChecker(null).setReportCheckerId(null).setReportCheckTime(null);
} else if (EntrustFlowEnum.REPORT_CHECK == toFlowStatus) {
sampleStatusEnum = EntrustSampleStatusEnum.REPORT_CHECK;
reportStatusEnum = EntrustReportStatusEnum.CHECK;
entrust.setTestTimeE(null);
entrustReport.setReportSender(null).setReportSenderId(null).setReportSendTime(null);
entrustReport.setReportIssuer(null).setReportIssuerId(null).setReportIssueTime(null);
entrustReport.setReportAllower(null).setReportAllowerId(null).setReportAllowTime(null);
} else if (EntrustFlowEnum.REPORT_ALLOW == toFlowStatus) {
sampleStatusEnum = EntrustSampleStatusEnum.REPORT_ALLOW;
reportStatusEnum = EntrustReportStatusEnum.ALLOW;
entrust.setTestTimeE(null);
entrustReport.setReportSender(null).setReportSenderId(null).setReportSendTime(null);
entrustReport.setReportIssuer(null).setReportIssuerId(null).setReportIssueTime(null);
} else if (EntrustFlowEnum.REPORT_ISSUE == toFlowStatus) {
sampleStatusEnum = EntrustSampleStatusEnum.REPORT_ISSUE;
reportStatusEnum = EntrustReportStatusEnum.ISSUE;
entrustReport.setReportSender(null).setReportSenderId(null).setReportSendTime(null);
}
EntrustSampleStatusEnum finalSampleStatusEnum = sampleStatusEnum;
......@@ -375,7 +401,6 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
executor1.execute(() -> deleteReportPdf(ids));
}
EntrustReport entrustReport = new EntrustReport();
entrustReport.setStatus(reportStatusEnum);
entrustReport.setProgress(reportProgress);
......
src/test/java/resources/db_sql/hmhj/v148/20210728新增报告表字段.sql 0 → 100644
ALTER TABLE "public"."entrust_report"
ADD COLUMN "report_allower" varchar(64) COLLATE "pg_catalog"."default",
ADD COLUMN "report_allower_id" int8,
ADD COLUMN "report_allow_time" timestamp(6),
ADD COLUMN "report_sender" varchar(64) COLLATE "pg_catalog"."default",
ADD COLUMN "report_sender_id" int8,
ADD COLUMN "report_send_time" timestamp(6);
COMMENT ON COLUMN "public"."entrust_report"."report_allower" IS '批准人';
COMMENT ON COLUMN "public"."entrust_report"."report_allower_id" IS '批准人Id';
COMMENT ON COLUMN "public"."entrust_report"."report_allow_time" IS '批准时间';
COMMENT ON COLUMN "public"."entrust_report"."report_sender" IS '发放人';
COMMENT ON COLUMN "public"."entrust_report"."report_sender_id" IS '发放人Id';
COMMENT ON COLUMN "public"."entrust_report"."report_send_time" IS '发放时间';
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment