From adb33007bf87f63a893f90196a6087f9cafe34c7 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 03 一月 2025 11:40:04 +0800
Subject: [PATCH] 考勤查询条件bug 修复
---
service-common/src/main/java/com/java110/common/cmd/itemRelease/DeleteItemReleaseTypeCmd.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/itemRelease/DeleteItemReleaseTypeCmd.java b/service-common/src/main/java/com/java110/common/cmd/itemRelease/DeleteItemReleaseTypeCmd.java
index e260ac5..e9b2d75 100644
--- a/service-common/src/main/java/com/java110/common/cmd/itemRelease/DeleteItemReleaseTypeCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/itemRelease/DeleteItemReleaseTypeCmd.java
@@ -21,9 +21,15 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.doc.annotation.*;
+import com.java110.dto.itemRelease.ItemReleaseTypeDto;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.oaWorkflow.WorkflowModelDto;
import com.java110.intf.common.IItemReleaseTypeV1InnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
import com.java110.po.itemRelease.ItemReleaseTypePo;
+import com.java110.po.oaWorkflow.OaWorkflowPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -31,6 +37,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
@Java110CmdDoc(title = "鍒犻櫎鐗╁搧鏀捐绫诲瀷",
description = "鍒犻櫎鐗╁搧鏀捐绫诲瀷锛岀墿鍝佹斁琛岀被鍨� 姣斿澶у瀷鐗╁搧 灏忓瀷鐗╁搧绛�",
httpMethod = "post",
@@ -73,6 +82,9 @@
@Autowired
private IItemReleaseTypeV1InnerServiceSMO itemReleaseTypeV1InnerServiceSMOImpl;
+ @Autowired
+ private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "typeId", "typeId涓嶈兘涓虹┖");
@@ -84,6 +96,13 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+ ItemReleaseTypeDto itemReleaseTypeDto = new ItemReleaseTypeDto();
+ itemReleaseTypeDto.setTypeId(reqJson.getString("typeId"));
+ itemReleaseTypeDto.setCommunityId(reqJson.getString("communityId"));
+ List<ItemReleaseTypeDto> itemReleaseTypeDtos = itemReleaseTypeV1InnerServiceSMOImpl.queryItemReleaseTypes(itemReleaseTypeDto);
+
+ Assert.listOnlyOne(itemReleaseTypeDtos,"绫诲瀷涓嶅瓨鍦�");
+
ItemReleaseTypePo itemReleaseTypePo = BeanConvertUtil.covertBean(reqJson, ItemReleaseTypePo.class);
int flag = itemReleaseTypeV1InnerServiceSMOImpl.deleteItemReleaseType(itemReleaseTypePo);
@@ -91,6 +110,17 @@
throw new CmdException("鍒犻櫎鏁版嵁澶辫触");
}
+ //todo 鍒犻櫎娣诲姞鐨勬祦绋�
+
+ OaWorkflowPo oaWorkflowPo = new OaWorkflowPo();
+ oaWorkflowPo.setFlowId(itemReleaseTypeDtos.get(0).getFlowId());
+ oaWorkflowPo.setFlowType(OaWorkflowDto.FLOW_TYPE_ITEM_RELEASE);
+ flag = oaWorkflowInnerServiceSMOImpl.deleteOaWorkflow(oaWorkflowPo);
+ if (flag < 1) {
+ throw new CmdException("淇濆瓨鏁版嵁澶辫触");
+ }
+
+
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
}
--
Gitblit v1.8.0