From be1b426b7d765a546f4a26b60e80aa49a57079b9 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 13 一月 2024 16:25:11 +0800
Subject: [PATCH] 1、优化采购模块数量不能为小数点问题2、新增客服巡查巡楼记录功能模块3、新增页面导出功能4、优化记录查询条件新增时间段查询条件5、其他界面性调整
---
service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowActivitiInnerServiceSMOImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowActivitiInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowActivitiInnerServiceSMOImpl.java
index e31d3ea..80f7499 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowActivitiInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowActivitiInnerServiceSMOImpl.java
@@ -6,17 +6,20 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.PageDto;
-import com.java110.dto.auditMessage.AuditMessageDto;
-import com.java110.dto.oaWorkflowData.OaWorkflowDataDto;
-import com.java110.dto.oaWorkflowXml.OaWorkflowXmlDto;
+import com.java110.dto.audit.AuditMessageDto;
+import com.java110.dto.oaWorkflow.OaWorkflowDataDto;
+import com.java110.dto.oaWorkflow.OaWorkflowXmlDto;
+import com.java110.dto.purchase.PurchaseApplyDto;
import com.java110.dto.user.UserDto;
-import com.java110.dto.workflow.WorkflowDto;
-import com.java110.entity.audit.AuditUser;
+import com.java110.dto.oaWorkflow.WorkflowDto;
+import com.java110.dto.audit.AuditUser;
import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowDataInnerServiceSMO;
+import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
-import com.java110.po.oaWorkflowData.OaWorkflowDataPo;
+import com.java110.po.oaWorkflow.OaWorkflowDataPo;
+import com.java110.po.purchase.PurchaseApplyPo;
import com.java110.utils.exception.SMOException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
@@ -77,6 +80,8 @@
@Autowired
private IOaWorkflowDataInnerServiceSMO oaWorkflowDataInnerServiceSMOImpl;
+ @Autowired
+ private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
/**
* 鍚姩娴佺▼
@@ -134,6 +139,17 @@
if (tmp.getProcessInstanceId().equals(reqJson.getString("processInstanceId"))) {
task = tmp;//鑾峰彇褰撳墠娴佺▼瀹炰緥锛屽綋鍓嶇敵璇蜂汉鐨勫緟鍔炰换鍔�
break;
+ }
+ }
+ if (task == null) {
+ PurchaseApplyDto purchaseApplyDto = new PurchaseApplyDto();
+ purchaseApplyDto.setApplyOrderId(reqJson.getString("id"));
+ List<PurchaseApplyDto> purchaseApplyList = purchaseApplyInnerServiceSMOImpl.queryPurchaseApplys(purchaseApplyDto);
+ if (purchaseApplyList != null && purchaseApplyList.size() == 1) {
+ PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();
+ purchaseApplyPo.setApplyOrderId(reqJson.getString("id"));
+ purchaseApplyPo.setStatusCd("1");
+ purchaseApplyInnerServiceSMOImpl.updatePurchaseApply(purchaseApplyPo);
}
}
Assert.notNull(task, "鏈壘鍒板綋鍓嶇敤鎴蜂换鍔serId = " + reqJson.getString("createUserId"));
@@ -284,8 +300,8 @@
*
* @param user 鐢ㄦ埛淇℃伅{
* processDefinitionKeys:[],
- *
- * }
+ * <p>
+ * }
*/
public List<JSONObject> getDefinitionKeysUserTasks(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
@@ -427,6 +443,7 @@
oaWorkflowDataDto.setBusinessKey(reqJson.getString("id"));
oaWorkflowDataDto.setPage(1);
oaWorkflowDataDto.setRow(1);
+ oaWorkflowDataDto.setHis("N");
List<OaWorkflowDataDto> oaWorkflowDataDtos = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto);
if (oaWorkflowDataDtos == null || oaWorkflowDataDtos.size() < 1) {
@@ -713,6 +730,30 @@
}
+ /**
+ * 鑾峰彇褰撳墠鑺傜偣淇℃伅
+ *
+ * @param reqJson{ taskId:'',
+ * startUserId:''
+ * }
+ * @return
+ */
+ public JSONObject getCurrentNodeTask(@RequestBody JSONObject reqJson) {
+ JSONObject curNode = new JSONObject();
+ TaskService taskService = processEngine.getTaskService();
+ Task task = taskService.createTaskQuery().taskId(reqJson.getString("taskId")).singleResult();
+ if (task == null) {
+ throw new IllegalArgumentException("浠诲姟宸插鐞�");
+ }
+ BpmnModel bpmnModel = repositoryService.getBpmnModel(task.getProcessDefinitionId());
+
+ FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(task.getTaskDefinitionKey());
+ flowNode.getName();
+
+ curNode.put("curTaskName", flowNode.getName());
+ return curNode;
+ }
+
@Override
public List<JSONObject> nextAllNodeTaskList(@RequestBody JSONObject reqJson) {
List<JSONObject> tasks = new ArrayList<>();
--
Gitblit v1.8.0