From 306e2714266cef35638514f05cf4f643857608d9 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 26 七月 2023 19:06:34 +0800
Subject: [PATCH] 药剂管理
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java
index 0fab172..bfa3aaa 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java
@@ -21,6 +21,7 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -40,6 +41,7 @@
private InteStatusLogService inteStatusLogService;
@Autowired
private RedisUtil redisUtil;
+
@Override
public String getInterfaceId() {
return ApiShConst.API_SH_1404;
@@ -56,7 +58,7 @@
String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1404);
Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
+ if (null == startTime) {
startTime = DateUtils.addDays(param.getEndTime(), -30);
}
redisUtil.set(key, param.getEndTime());
@@ -79,29 +81,29 @@
dto = new Dto1404();
dto.setXzzybm(data.getDepotId().substring(0, 25) + data.getId());
dto.setCfdm(data.getDepotId().substring(0, 25));
- dto.setXzkssj(DateFormatUtils.format(data.getStart()==null?(new Date()):data.getStart(),"yyyy-MM-dd"));
- dto.setXzjssj(DateFormatUtils.format(data.getEnd()==null?(new Date()):data.getEnd(),"yyyy-MM-dd"));
- dto.setHcjcdh(StringUtils.isEmpty(data.getPestBatchId())?"0":data.getPestBatchId());
- dto.setDjcxz(data.getNum()==null?"0":data.getNum() + "");
- dto.setCgxzfs(StringUtils.isEmpty(data.getMode())?"0":data.getMode());
- dto.setHlxzfs(StringUtils.isEmpty(data.getRecirMode())?"0":data.getRecirMode());
- dto.setYjmc(StringUtils.isEmpty(data.getDrugName())?"0":data.getDrugName());
- dto.setNd(data.getConcentration()==null?"0":data.getConcentration() + "");
- dto.setLddwyyl(data.getGrainDose()==null?"0":data.getGrainDose()+"");
- dto.setKjdwyyl(data.getSpaceDose()==null?"0":data.getSpaceDose()+"");
- dto.setZyyl(data.getDose()==null?"0":data.getDose()+"");
- dto.setSqrq(DateFormatUtils.format(data.getVentilateTime()==null?(new Date()):data.getVentilateTime(),"yyyy-MM-dd"));
- dto.setSqff(StringUtils.isEmpty(data.getVentilateMethod())?"0":data.getVentilateMethod());
- dto.setSqjsslhqnd(data.getAfterPh3()==null?"0.0":data.getAfterPh3() + "");
- dto.setXzxgpj(StringUtils.isEmpty(data.getEvaluate())?"0":data.getEvaluate());
- dto.setCzsjff(StringUtils.isEmpty(data.getCzsjff())?"0":data.getCzsjff());
- dto.setCzclcs(StringUtils.isEmpty(data.getCzclcs())?"0":data.getCzclcs());
- dto.setXzzyry(StringUtils.isEmpty(data.getUser())?"0":data.getUser());
+ dto.setXzkssj(DateFormatUtils.format(data.getStart() == null ? (new Date()) : data.getStart(), "yyyy-MM-dd"));
+ dto.setXzjssj(DateFormatUtils.format(data.getEnd() == null ? (new Date()) : data.getEnd(), "yyyy-MM-dd"));
+ dto.setHcjcdh(StringUtils.isEmpty(data.getPestBatchId()) ? "0" : data.getPestBatchId());
+ dto.setDjcxz(data.getNum() == null ? "0" : data.getNum() + "");
+ dto.setCgxzfs(StringUtils.isEmpty(data.getMode()) ? "0" : data.getMode());
+ dto.setHlxzfs(StringUtils.isEmpty(data.getRecirMode()) ? "0" : data.getRecirMode());
+ dto.setYjmc(StringUtils.isEmpty(data.getDrugName()) ? "0" : data.getDrugName());
+ dto.setNd(data.getConcentration() == null ? "0" : data.getConcentration() + "");
+ dto.setLddwyyl(data.getGrainDose() == null ? "0" : data.getGrainDose() + "");
+ dto.setKjdwyyl(data.getSpaceDose() == null ? "0" : data.getSpaceDose() + "");
+ dto.setZyyl(data.getDose() == null ? "0" : data.getDose() + "");
+ dto.setSqrq(DateFormatUtils.format(data.getVentilateTime() == null ? (new Date()) : data.getVentilateTime(), "yyyy-MM-dd"));
+ dto.setSqff(StringUtils.isEmpty(data.getVentilateMethod()) ? "0" : data.getVentilateMethod());
+ dto.setSqjsslhqnd(data.getAfterPh3() == null ? "0.0" : data.getAfterPh3() + "");
+ dto.setXzxgpj(StringUtils.isEmpty(data.getEvaluate()) ? "0" : data.getEvaluate());
+ dto.setCzsjff(StringUtils.isEmpty(data.getCzsjff()) ? "0" : data.getCzsjff());
+ dto.setCzclcs(StringUtils.isEmpty(data.getCzclcs()) ? "0" : data.getCzclcs());
+// dto.setXzzyry(StringUtils.isEmpty(data.getUser())?"0":data.getUser());
dto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
//鏌ヨ鏃ュ織鐘舵�佽〃锛岃缃搷浣滄爣蹇�
log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1404 + "_" + data.getId());
- if(null == log){
+ if (null == log) {
addLog = new InteStatusLog();
addLog.setBizId(ApiShConst.API_SH_1404 + "_" + data.getId());
addLog.setCompanyId(companyId);
@@ -111,7 +113,7 @@
addLog.setStatus(ApiShConst.API_SH_STATUS_SUCCESS);
inteStatusLogService.addInteStatusLog(addLog);
- }else {
+ } else {
dto.setCzbz(ApiShConst.API_SH_U);
}
list.add(dto);
--
Gitblit v1.9.3