From 12ada3a7e6680d5ab92901410e3cedd9b8077e56 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 16 十二月 2023 17:08:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java
index d3ef954..ce83cb6 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java
@@ -1,28 +1,36 @@
package com.ycl.service.caseHandler.impl;
+import com.alibaba.druid.support.json.JSONUtils;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.gson.JsonObject;
import com.ycl.common.constant.BaseCaseStatus;
import com.ycl.common.constant.StepName;
+import com.ycl.common.dingding.DingCommon;
+import com.ycl.controller.user.UmsAdminController;
import com.ycl.dto.caseHandler.DispatchInfoParam;
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.DispatchInfo;
import com.ycl.entity.caseHandler.DisposeRecord;
import com.ycl.entity.caseHandler.WorkflowConfigStep;
+import com.ycl.entity.user.UmsAdmin;
import com.ycl.exception.ApiException;
import com.ycl.mapper.caseHandler.BaseCaseMapper;
import com.ycl.mapper.caseHandler.DispatchInfoMapper;
import com.ycl.mapper.caseHandler.DisposeRecordMapper;
import com.ycl.mapper.caseHandler.WorkflowConfigStepMapper;
import com.ycl.service.caseHandler.IDispatchHandleService;
+import com.ycl.service.user.UmsAdminService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.Date;
/**
@@ -35,6 +43,7 @@
*/
@Service
@Transactional
+@Slf4j
public class IDispatchHandleServiceImpl extends ServiceImpl<DispatchInfoMapper, DispatchInfo> implements IDispatchHandleService {
@Resource
@@ -43,8 +52,12 @@
DisposeRecordMapper disposeRecordMapper;
@Resource
WorkflowConfigStepMapper workflowConfigStepMapper;
-
+ @Autowired
+ DingCommon dingCommon;
+ @Autowired
+ UmsAdminService umsAdminService;
@Override
+ @Transactional
public DispatchInfo dispatch(DispatchInfoParam dispatchInfoParam) {
//鏂板璋冨害淇℃伅
DispatchInfo dispatchInfo = new DispatchInfo();
@@ -71,6 +84,7 @@
//淇敼璋冨害璁板綍
DisposeRecord disposeRecord = new DisposeRecord();
disposeRecord.setHandlerId(dispatchInfo.getCreateUser());
+ disposeRecord.setResult(dispatchInfo.getDispatchOpinion());
//璋冨害宸茬粨鏉�
disposeRecord.setState(1);
disposeRecord.setEndTime(LocalDateTime.now());
@@ -86,8 +100,9 @@
stepNextRecord.setBaseCaseId(baseCase.getId());
stepNextRecord.setWorkflowConfigStepId(stepNext.getId());
stepNextRecord.setStepName(stepNext.getName());
+ stepNextRecord.setLimitTime(dispatchInfoParam.getDisposeDate());
+ stepNextRecord.setHandlerId(dispatchInfoParam.getLawEnforcer());
stepNextRecord.setHandlerRoleId(stepNext.getRoleId());
- stepNextRecord.setLimitTime(LocalDateTime.parse(dispatchInfoParam.getDisposeDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss")));
//涓婁紶澶勭疆鏈粨鏉�
stepNextRecord.setState(0);
stepNextRecord.setStartTime(LocalDateTime.now());
@@ -95,6 +110,18 @@
stepNextRecord.setCreateTime(LocalDateTime.now());
disposeRecordMapper.insert(stepNextRecord);
+ //鍙戦�侀拤閽夊伐浣滈�氱煡娑堟伅
+ log.info("鍙戦�佷竴鏉″伐浣滈�氱煡");
+ BaseCase baseCaseForCode = baseCaseMapper.selectById(dispatchInfoParam.getBaseCaseId());
+ String baseCaseCode = baseCaseForCode.getCode();
+ String text ="鎮ㄦ湁涓�鏉″伐浣滈�氱煡 \n " +
+ " 閬傛槍浜戞墽娉曪細鏈夊緟澶勭悊鐨勪换鍔� \n " +
+ "路鎮ㄦ湁1鏉″緟澶勭悊浜嬩欢銆備簨浠剁紪鍙�: \n " +
+ baseCaseCode;
+ Long lawEnforcer = dispatchInfoParam.getLawEnforcer();
+ UmsAdmin user = umsAdminService.getById(lawEnforcer);
+ dingCommon.sendDingMsgStr(user.getAccountId()+"",text);
+
return dispatchInfo;
}
--
Gitblit v1.8.0