From 164a53adaed58ad0519bc214b08c0bfb287723f4 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 21 一月 2026 14:40:45 +0800
Subject: [PATCH] 数据导入提交2
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java | 88 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 85 insertions(+), 3 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
index 2091463..c7fa01f 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
@@ -5,12 +5,16 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.data.BaseResp;
+import com.fzzy.igds.data.NoticeDto;
import com.fzzy.igds.data.NoticeParam;
import com.fzzy.igds.service.InoutNoticeService;
import com.fzzy.igds.domain.InoutNoticeIn;
import com.fzzy.igds.domain.InoutNoticeOut;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
@@ -36,7 +40,9 @@
*/
@DataProvider
public Map<String, Object> getYearQuery(Map<String, Object> param) {
- Map<String, Object> result = new HashMap<String, Object>();
+
+ if(null == param) param = new HashMap<>();
+ Map<String, Object> result = new HashMap<>();
//鑾峰彇鍙傛暟涓垎搴撶紪鐮�
String deptId = (String)param.get("deptId");
@@ -67,6 +73,18 @@
}
/**
+ * inoutNoticePR#getNoticeInOne
+ *
+ * @param businessId
+ * @return
+ */
+ @DataProvider
+ public InoutNoticeIn getNoticeInOne(String businessId) {
+ InoutNoticeIn notice = inoutNoticeService.getNoticeInOne(businessId);
+ return notice;
+ }
+
+ /**
* inoutNoticePR#pageQueryIn 鑾峰彇鍏ュ簱閫氱煡鍗�
*
* @param param
@@ -87,7 +105,7 @@
* inoutNoticePR#saveIn 鏇存柊鍏ュ簱閫氱煡鍗�
*/
@DataResolver
- public String saveIn(InoutNoticeIn data) {
+ public BaseResp saveIn(InoutNoticeIn data) {
InoutNoticeIn inoutNoticeIn = new InoutNoticeIn();
BeanUtils.copyProperties(data, inoutNoticeIn);
return inoutNoticeService.saveOrUpdateIn(inoutNoticeIn);
@@ -147,6 +165,19 @@
}
/**
+ * inoutNoticePR#getNoticeOutOne
+ *
+ * @param businessId
+ * @return
+ */
+ @DataProvider
+ public InoutNoticeOut getNoticeOutOne(String businessId) {
+ InoutNoticeOut notice = inoutNoticeService.getNoticeOutOne(businessId);
+ return notice;
+ }
+
+
+ /**
* inoutNoticePR#pageQueryOut 鑾峰彇鍑哄簱閫氱煡鍗�
* @param page
* @param param
@@ -169,7 +200,7 @@
* @return
*/
@DataResolver
- public String saveOut(InoutNoticeOut data) {
+ public BaseResp saveOut(InoutNoticeOut data) {
InoutNoticeOut inoutNoticeOut = new InoutNoticeOut();
BeanUtils.copyProperties(data, inoutNoticeOut);
return inoutNoticeService.saveOrUpdateOut(inoutNoticeOut);
@@ -208,4 +239,55 @@
return "fail";
}
+
+ /**
+ * inoutNoticePR#queryNoticeByKey 鏍规嵁鍙傛暟鏌ヨ鍑哄叆搴撻�氱煡鍗曪紝鐢ㄤ簬鎵嬪姩琛ュ崟鏃讹紝閫夋嫨閫氱煡鍗�
+ *
+ * @param
+ * @return
+ */
+ @DataProvider
+ public List<NoticeDto> queryNoticeByKey(Map<String, Object> param) {
+ if (param == null) {
+ return null;
+ }
+ String type = (String)param.get("type");
+ if (StringUtils.isEmpty(type)) {
+ return null;
+ }
+ List<NoticeDto> list = new ArrayList<>();
+ NoticeDto dto;
+
+ NoticeParam noticeParam = new NoticeParam();
+ noticeParam.setCompanyId(ContextUtil.getCompanyId());
+ noticeParam.setDeptId(ContextUtil.subDeptId(null));
+ noticeParam.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
+ String key = (String)param.get("key");
+ if (StringUtils.isNotEmpty(key)) {
+ noticeParam.setKey(key);
+ }
+
+ if (Constant.TYPE_IN.equals(type)) {
+ List<InoutNoticeIn> listIn = inoutNoticeService.getNoticeIn(noticeParam);
+ if (null != listIn && listIn.size() > 0) {
+ for (InoutNoticeIn inoutNoticeIn : listIn) {
+ dto = new NoticeDto();
+ BeanUtils.copyProperties(inoutNoticeIn, dto);
+ list.add(dto);
+ }
+ }
+ }
+ if (Constant.TYPE_OUT.equals(type)) {
+ List<InoutNoticeOut> listOut = inoutNoticeService.getNoticeOut(noticeParam);
+ if (null != listOut && listOut.size() > 0) {
+ for (InoutNoticeOut inoutNoticeOut : listOut) {
+ dto = new NoticeDto();
+ BeanUtils.copyProperties(inoutNoticeOut, dto);
+ list.add(dto);
+ }
+ }
+ }
+ return list;
+ }
+
}
--
Gitblit v1.9.3