zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zgty:5a03ed1cab566744bf154c1c266d4561cfae479b
Branches Tags
zgty:test zgty:lims_dev
..
compare: zgty:969fb2edf784489d966d04b18f393f0726ef0f31
Branches Tags
zgty:test zgty:lims_dev

3 Commits
5a03ed1cab ... 969fb2edf7

Author SHA1 Message Date
wxr
969fb2edf7 公式计算bug修复 2026-01-29 19:05:28 +08:00
wxr
e6d08d975f Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-01-29 19:05:01 +08:00
wxr
3cd25f68ef 复检时分析的任务节点修改 2026-01-29 19:01:42 +08:00
2 changed files with 4 additions and 3 deletions
Expand all files Collapse all files

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleResultReportingServiceImpl.java
View File

@@ -444,7 +444,7 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
businessAssayTaskDataDO.setAssayType(assayType); businessAssayTaskDataDO.setAssayType(assayType);
businessAssayTaskDataDO.setTaskType("复测"); businessAssayTaskDataDO.setTaskType("复测");
businessAssayTaskDataDO.setConfigSampleFlowId(businessSubSampleDO.getConfigSampleFlowId()); businessAssayTaskDataDO.setConfigSampleFlowId(businessSubSampleDO.getConfigSampleFlowId());
businessAssayTaskDataDO.setSampleFlowNodeKey(businessSubSampleDO.getSampleFlowNodeKey()); businessAssayTaskDataDO.setSampleFlowNodeKey(QmsCommonConstant.FLOW_NODE_ANALYSIS);
businessAssayTaskDataDO.setSampleFlowNodeTime(LocalDateTime.now()); businessAssayTaskDataDO.setSampleFlowNodeTime(LocalDateTime.now());
businessAssayTaskDataDO.setAssayDepartmentId(configAssayMethodDO.getAssayDepartmentId()); businessAssayTaskDataDO.setAssayDepartmentId(configAssayMethodDO.getAssayDepartmentId());
businessAssayTaskDataDO.setAssayDepartmentName(configAssayMethodDO.getAssayDepartmentName()); businessAssayTaskDataDO.setAssayDepartmentName(configAssayMethodDO.getAssayDepartmentName());

5
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/qlexpress/cmp/AllowanceCalculatorComponent.java
View File

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Component;
import com.alibaba.qlexpress4.Express4Runner; import com.alibaba.qlexpress4.Express4Runner;
import com.alibaba.qlexpress4.QLOptions; import com.alibaba.qlexpress4.QLOptions;
import com.alibaba.qlexpress4.QLResult;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -87,8 +88,8 @@ public class AllowanceCalculatorComponent {
try { try {
// Object result = expressRunner.execute(formula, context, null, true, false); // Object result = expressRunner.execute(formula, context, null, true, false);
Object result = express4Runner.execute(formula, context, QLOptions.builder().precise(true).build()); QLResult execute = express4Runner.execute(formula, context, QLOptions.builder().precise(true).build());
Object result = execute.getResult();
if (result == null) { if (result == null) {
throw new RuntimeException("Express 公式返回结果为 null"); throw new RuntimeException("Express 公式返回结果为 null");
} }