From bc427c64d8c9066eda7a817c7c7926954e39abb0 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 26 一月 2026 14:55:26 +0800
Subject: [PATCH] 删除操作添加日志记录，系统添加定时删除操作日志
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 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 927c320..3f45655 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,14 +5,19 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.common.constant.BizTypeEnum;
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.fzzy.work.data.WorkStatus;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
@@ -63,13 +68,24 @@
InoutNoticeIn data = new InoutNoticeIn();
data.setId(ContextUtil.generateOrderId("RK"));
data.setName("鍏ュ簱閫氱煡鍗�");
- data.setType("20");
data.setCompanyId(user.getCompanyId());
data.setDeptId(ContextUtil.subDeptId(user));
data.setYear(DateFormatUtils.format(new Date(), "yyyy"));
data.setCreateBy(ContextUtil.getLoginUserName());
data.setCreateTime(new Date());
return data;
+ }
+
+ /**
+ * inoutNoticePR#getNoticeInOne
+ *
+ * @param businessId
+ * @return
+ */
+ @DataProvider
+ public InoutNoticeIn getNoticeInOne(String businessId) {
+ InoutNoticeIn notice = inoutNoticeService.getNoticeInOne(businessId);
+ return notice;
}
/**
@@ -93,7 +109,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);
@@ -103,6 +119,7 @@
* inoutNoticePR#delDataIn
*/
@Expose
+ @Log(title = "閫氱煡鍗曠鐞�", businessType = BusinessType.DELETE,bizType = BizTypeEnum.INOUT)
public String delDataIn(InoutNoticeIn data) {
InoutNoticeIn inoutNoticeIn = new InoutNoticeIn();
BeanUtils.copyProperties(data, inoutNoticeIn);
@@ -153,6 +170,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
@@ -175,7 +205,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);
@@ -185,7 +215,8 @@
* inoutNoticePR#delDataOut
*/
@Expose
- public String delDataOut(InoutNoticeOut data) {
+ @Log(title = "閫氱煡鍗曠鐞�", businessType = BusinessType.DELETE,bizType = BizTypeEnum.INOUT)
+ public String delDataOut(InoutNoticeOut data) {
InoutNoticeOut inoutNoticeOut = new InoutNoticeOut();
BeanUtils.copyProperties(data, inoutNoticeOut);
return inoutNoticeService.delDataOut(inoutNoticeOut);
@@ -236,6 +267,7 @@
NoticeParam noticeParam = new NoticeParam();
noticeParam.setCompanyId(ContextUtil.getCompanyId());
noticeParam.setDeptId(ContextUtil.subDeptId(null));
+ noticeParam.setAuditStatus(WorkStatus.STATUS_50.getCode());
noticeParam.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
String key = (String)param.get("key");
if (StringUtils.isNotEmpty(key)) {
--
Gitblit v1.9.3