From 5a8389338e7ae54049e2ff7b01e431a568910610 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 01 十一月 2023 14:19:26 +0800
Subject: [PATCH] 药剂Id生成--三位顺序号
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1202.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1202.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1202.java
index 2802703..55365e3 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1202.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1202.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.bstek.bdf2.core.model.DefaultDept;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.CheckItem;
import com.ld.igds.models.InteStatusLog;
@@ -23,7 +22,10 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 璐ㄦ鏁版嵁鏄庣粏淇℃伅鎺ュ彛
@@ -54,15 +56,18 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1202);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ璐ㄦ鏁版嵁
- List<MQuality> dataList = hApiShServiceImpl.listQuality(companyId, param.getDepotId(), startTime, param.getEndTime());
+ List<MQuality> dataList = hApiShServiceImpl.listQuality(companyId, param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
@@ -99,7 +104,10 @@
dto.setZjbgdnm(data.getCheckId() + data.getCompanyId() + data.getStandardId());
dto.setZjbgmxnm(data.getCheckId() + data.getCompanyId() + data.getStandardId());
dto.setJyxmnm(data.getStandardId());
- // dto.setJybz(data.getStandardValue()); TODO
+ if(data.getUpperLimit() == null){
+ data.setUpperLimit(0.0);
+ }
+ dto.setJybz(data.getUpperLimit() + " ~ " + data.getUpperLimit());
dto.setJyjl(StringUtils.isEmpty(data.getRemarks())?"0":data.getRemarks());
dto.setBz(StringUtils.isEmpty(data.getRemarks())?"0":data.getRemarks());
--
Gitblit v1.9.3