From 419e76f6256868851ed245940297f7f5bfd99e55 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 01 六月 2023 17:54:45 +0800
Subject: [PATCH] 化验页面优化1
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 198 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 149 insertions(+), 49 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index a3e5e3d..a0e1cad 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -572,35 +572,35 @@
return data;
}
- public PageResponse<Page<InoutData>> pageRecordData(InoutParam param) {
+// public PageResponse<Page<InoutData>> pageRecordData(InoutParam param) {
+//
+// log.debug("鍒嗛〉淇℃伅--page={},limit={},cuur={}", param.getPage(),
+// param.getLimit(), param.getCurr());
+//
+// Page<InoutData> result = inoutService.pageRecordData(param);
+//
+// if (null == result.getRecords() || result.getRecords().isEmpty()) {
+// return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
+// "鑾峰彇鍒版暟鎹俊鎭负绌�");
+// }
+//
+// return new PageResponse<>(RespCodeEnum.CODE_0000, result);
+// }
- log.debug("鍒嗛〉淇℃伅--page={},limit={},cuur={}", param.getPage(),
- param.getLimit(), param.getCurr());
-
- Page<InoutData> result = inoutService.pageRecordData(param);
-
- if (null == result.getRecords() || result.getRecords().isEmpty()) {
- return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "鑾峰彇鍒版暟鎹俊鎭负绌�");
- }
-
- return new PageResponse<>(RespCodeEnum.CODE_0000, result);
- }
-
- /**
- * @param param
- * @return
- */
- public PageResponse<Page<InoutData>> pageCheckData(InoutParam param) {
- // 濡傛灉鏄凡鍖栭獙锛屽垯灏嗘祦绋嬬姸鎬佺疆绌猴紝濡傛灉鏄湭鍖栭獙锛屽垯娴佺▼鐘舵�佷笉澶勭悊锛屼粛鏄疌HECK鐘舵��
- if (!"NONE".equals(param.getCheckStatus())) {
- param.setProgress(null);
- }
- // 璁剧疆鍒嗗簱Id
- String deptId = ContextUtil.subDeptId(null);
- param.setDeptId(deptId);
- return pageRecordData(param);
- }
+// /**
+// * @param param
+// * @return
+// */
+// public PageResponse<Page<InoutData>> pageCheckData(InoutParam param) {
+// // 濡傛灉鏄凡鍖栭獙锛屽垯灏嗘祦绋嬬姸鎬佺疆绌猴紝濡傛灉鏄湭鍖栭獙锛屽垯娴佺▼鐘舵�佷笉澶勭悊锛屼粛鏄疌HECK鐘舵��
+// if (!"NONE".equals(param.getCheckStatus())) {
+// param.setProgress(null);
+// }
+// // 璁剧疆鍒嗗簱Id
+// String deptId = ContextUtil.subDeptId(null);
+// param.setDeptId(deptId);
+// return pageRecordData(param);
+// }
public PageResponse<InoutData> inoutComplete(InoutData data) throws Exception {
@@ -642,20 +642,20 @@
return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), null, data);
}
- /**
- * 鎵︽牱鍖栭獙椤甸潰鑾峰彇妫�楠岄」鏉＄洰淇℃伅
- *
- * @param data
- * @return
- */
- public PageResponse<List<CheckItemData>> getCheckItem(InoutData data) {
-
- List<CheckItemData> result = checkStandardManager.listCheckItem(
- data.getCheckId(), data.getCompanyId(), data.getDeptId(),
- data.getFoodVariety());
-
- return new PageResponse<>(RespCodeEnum.CODE_0000, result);
- }
+// /**
+// * 鎵︽牱鍖栭獙椤甸潰鑾峰彇妫�楠岄」鏉＄洰淇℃伅
+// *
+// * @param data
+// * @return
+// */
+// public PageResponse<List<CheckItemData>> getCheckItem(InoutData data) {
+//
+// List<CheckItemData> result = checkStandardManager.listCheckItem(
+// data.getCheckId(), data.getCompanyId(), data.getDeptId(),
+// data.getFoodVariety());
+//
+// return new PageResponse<>(RespCodeEnum.CODE_0000, result);
+// }
/**
* 鍒犻櫎骞跺畬鎴�
@@ -1091,7 +1091,7 @@
}
//鑻ユ煡璇㈡潯浠朵负宸叉墻鏍凤紝鍒欐祦绋嬬疆绌猴紱鑻ユ湭鎵︽牱锛屽垯娴佺▼涓嶅鐞嗭紝浠嶄负鎵︽牱鍖栭獙娴佺▼(CHECK)
- if ("SAMPLE".equals(param.getSampleStatus())) {
+ if (!"NONE".equals(param.getSampleStatus())) {
param.setProgress(null);
}
@@ -1124,12 +1124,14 @@
"褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼");
}
- //鎵︽牱淇℃伅
- curData.setSampleTime(data.getSampleTime());
- curData.setSampleType(data.getSampleType());
- curData.setSampleUser(data.getSampleUser());
-
- String msg = inoutService.updateSampleData(curData);
+ //鎵︽牱鏃堕棿鍜屾墻鏍蜂汉
+ if(StringUtils.isEmpty(data.getSampleUser())){
+ data.setSampleUser(ContextUtil.getLoginUserCName());
+ }
+ if(null == data.getSampleTime()){
+ data.setSampleTime(new Date());
+ }
+ String msg = inoutService.updateSampleData(data);
if (null != msg) {
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
@@ -1143,4 +1145,102 @@
}
}
+ /**
+ * @param param
+ * @return
+ */
+ public PageResponse<Page<InoutCheckData>> pageCheckData(InoutCheckParam param) {
+
+ if (StringUtils.isEmpty(param.getCompanyId())) {
+ param.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (StringUtils.isEmpty(param.getDeptId())) {
+ param.setDeptId(ContextUtil.subDeptId(null));
+ }
+ // 濡傛灉鏄凡鍖栭獙锛屽垯灏嗘祦绋嬬姸鎬佺疆绌猴紝濡傛灉鏄湭鍖栭獙锛屽垯娴佺▼鐘舵�佷笉澶勭悊锛屼粛鏄疌HECK鐘舵��
+ if (!"NONE".equals(param.getCheckStatus())) {
+ param.setProgress(null);
+ }
+
+ Page<InoutCheckData> checkList = inoutService.pageCheckData(param);
+
+
+ if (null == checkList.getRecords() || checkList.getRecords().isEmpty()) {
+ return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
+ "鑾峰彇鍒版暟鎹俊鎭负绌�");
+ }
+ return new PageResponse<>(RespCodeEnum.CODE_0000, checkList);
+ }
+
+ /**
+ * 鑾峰彇鍖栭獙椤逛俊鎭�
+ *
+ * @param param
+ * @return
+ */
+ public PageResponse<List<CheckItemData>> getCheckItemData(InoutCheckParam param) {
+
+ try {
+ List<CheckItemData> result = checkStandardManager.listCheckItem(param.getCheckId(),
+ param.getCompanyId(), param.getFoodVariety());
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000, result);
+ } catch (Exception e) {
+ return new PageResponse<>(
+ RespCodeEnum.CODE_1111.getCode(), "鍚庡彴寮傚父锛�" + e.getMessage(), null);
+ }
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public PageResponse<InoutCheckData> updateCheckData(InoutCheckData data){
+ try {
+
+ // 鑾峰彇涓氬姟鏁版嵁淇℃伅
+ InoutParam param = new InoutParam();
+ param.setCompanyId(data.getCompanyId());
+ param.setId(data.getId());
+ InoutData curData = inoutService.inoutProgressQuery(param);
+ if (null == curData) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "娌℃湁鑾峰彇鍒板叆搴撲笟鍔℃暟鎹俊鎭紝鏇存柊澶辫触", data);
+ }
+ if (InoutConstant.PROGRESS_RECORD.equals(curData.getProgress())) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼");
+ }
+ curData.setCheckStatus(data.getCheckStatus());
+
+ //鏇存柊涓嬩竴娴佺▼鐘舵��
+ if (InoutConstant.PROGRESS_CHECK.equals(curData.getProgress())) {
+ curData = updateInBasicInfo(curData, null);
+ // 鑻ュ寲楠岀粨鏋滀笉鍚堟牸锛屽垽鏂厤缃悗缁祦绋�
+ if (InoutConstant.STATUS_UNPASS.equals(curData.getCheckStatus())) {
+ curData = checkNoPass(curData);
+ }
+ }
+
+ data.setCheckStatus(curData.getCheckStatus());
+ //鍖栭獙浜恒�佸寲楠屾椂闂�
+ if(StringUtils.isEmpty(data.getCheckUser())){
+ data.setCheckUser(ContextUtil.getLoginUserCName());
+ }
+ if(null == data.getCheckTime()){
+ data.setCheckTime(new Date());
+ }
+
+ String msg = inoutService.updateCheckData(data);
+
+ if (null != msg) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
+ }
+ //TODO 鏇存柊鍖栭獙椤逛俊鎭�
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛");
+ } catch (Exception e) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "鍚庡彴寮傚父锛�" + e.getMessage(), null);
+ }
+
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3