From ebc4996578cc06cacda5561a45a4dfc2c951d070 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 21 四月 2025 10:18:53 +0800
Subject: [PATCH] art: 设备管理-点检工单/周保工单-设备状态，设备履历变化修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 282 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 257 insertions(+), 25 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
index c17c420..31fa8f9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
@@ -2,31 +2,42 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.flowable.engine.TaskService;
+import org.flowable.task.api.Task;
+import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.constant.WeekMaintenanceStatusEnum;
-import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
+import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
+import org.jeecg.modules.eam.constant.*;
+import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrderDetail;
import org.jeecg.modules.eam.mapper.EamWeekMaintenanceOrderMapper;
import org.jeecg.modules.eam.request.EamWeekMaintenanceQuery;
import org.jeecg.modules.eam.request.EamWeekMaintenanceRequest;
-import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderDetailService;
-import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderService;
+import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
+import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
+import org.jeecg.modules.flowable.service.IFlowTaskService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -38,7 +49,7 @@
/**
* @Description: 鍛ㄤ繚宸ュ崟
* @Author: jeecg-boot
- * @Date: 2025-04-02
+ * @Date: 2025-04-02
* @Version: V1.0
*/
@Service("IEamWeekMaintenanceOrderService")
@@ -50,10 +61,25 @@
@Autowired
private IEamWeekMaintenanceOrderDetailService eamWeekMaintenanceOrderDetailService;
- @Resource
+ @Autowired
private FlowCommonService flowCommonService;
- @Resource
+ @Autowired
private IFlowDefinitionService flowDefinitionService;
+ @Autowired
+ private IFlowMyBusinessService flowMyBusinessService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private IFlowTaskService flowTaskService;
+
+ @Autowired
+ private ISysUserService sysUserService;
+ @Autowired
+ private IEamEquipmentService eamEquipmentService;
+ @Autowired
+ private IEamReportRepairService eamReportRepairService;
+ @Autowired
+ private IEamEquipmentExtendService eamEquipmentExtendService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -67,12 +93,12 @@
order.setRemark(request.getRemark());
//鐘舵�佸垵濮嬪寲
order.setMaintenanceStatus(WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
- order.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
+ order.setCreationMethod(request.getCreationMethod());
//鍒犻櫎鏍囪
order.setDelFlag(CommonConstant.DEL_FLAG_0);
eamWeekMaintenanceOrderMapper.insert(order);
//澶勭悊鏄庣粏鏁版嵁
- if(CollectionUtil.isNotEmpty(request.getTableDetailList())) {
+ if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
request.getTableDetailList().forEach(tableDetail -> {
tableDetail.setId(null);
tableDetail.setOrderId(order.getId());
@@ -80,7 +106,7 @@
eamWeekMaintenanceOrderDetailService.saveBatch(request.getTableDetailList());
}
//鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
- if(StringUtils.isNotBlank(order.getOperator())) {
+ if (StringUtils.isNotBlank(order.getOperator())) {
//鍚姩娴佺▼
flowCommonService.initActBusiness("宸ュ崟鍙�:" + order.getOrderNum() + ";寮�濮嬭繘琛岃澶囧懆淇�",
order.getId(), "IEamWeekMaintenanceOrderService", "week_maintenance_process", null);
@@ -98,13 +124,15 @@
usernames.add(order.getOperator());
variables.put("NextAssignee", usernames);
Result result = flowDefinitionService.startProcessInstanceByKey("week_maintenance_process", variables);
- if(result != null){
+ if (result != null) {
//鏇存柊鍛ㄤ繚鐘舵��
order.setMaintenanceStatus(WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
order.setActualStartTime(new Date());
eamWeekMaintenanceOrderMapper.updateById(order);
return result.isSuccess();
}
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentMaintenanceStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
}
return true;
@@ -165,10 +193,10 @@
@Transactional(rollbackFor = Exception.class)
public boolean editWeekMaintenance(EamWeekMaintenanceRequest request) {
EamWeekMaintenanceOrder entity = eamWeekMaintenanceOrderMapper.selectById(request.getId());
- if(entity == null){
+ if (entity == null) {
throw new JeecgBootException("缂栬緫鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
}
- if(!WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())){
+ if (!WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
throw new JeecgBootException("鍙湁寰呬繚鍏荤姸鎬佺殑鏁版嵁鎵嶅彲缂栬緫锛�");
}
entity.setMaintenanceDate(request.getMaintenanceDate());
@@ -177,30 +205,30 @@
eamWeekMaintenanceOrderMapper.updateById(entity);
//澶勭悊璇︽儏
- if(CollectionUtil.isNotEmpty(request.getTableDetailList())) {
+ if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
List<EamWeekMaintenanceOrderDetail> addList = new ArrayList<>();
List<EamWeekMaintenanceOrderDetail> updateList = new ArrayList<>();
request.getTableDetailList().forEach(tableDetail -> {
tableDetail.setOrderId(entity.getId());
- if(tableDetail.getId() == null){
+ if (tableDetail.getId() == null) {
addList.add(tableDetail);
- }else {
+ } else {
updateList.add(tableDetail);
}
});
- if(CollectionUtil.isNotEmpty(addList)){
+ if (CollectionUtil.isNotEmpty(addList)) {
eamWeekMaintenanceOrderDetailService.saveBatch(addList);
}
- if(CollectionUtil.isNotEmpty(updateList)){
+ if (CollectionUtil.isNotEmpty(updateList)) {
eamWeekMaintenanceOrderDetailService.updateBatchById(updateList);
}
}
- if(CollectionUtil.isNotEmpty(request.getRemoveDetailList())) {
+ if (CollectionUtil.isNotEmpty(request.getRemoveDetailList())) {
List<String> ids = request.getRemoveDetailList().stream().map(EamWeekMaintenanceOrderDetail::getId).collect(Collectors.toList());
eamWeekMaintenanceOrderDetailService.removeBatchByIds(ids);
}
//鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
- if(StringUtils.isNotBlank(entity.getOperator())) {
+ if (StringUtils.isNotBlank(entity.getOperator())) {
//鍚姩娴佺▼
flowCommonService.initActBusiness("宸ュ崟鍙�:" + entity.getOrderNum() + ";寮�濮嬭繘琛岃澶囧懆淇�",
entity.getId(), "IEamWeekMaintenanceOrderService", "week_maintenance_process", null);
@@ -218,13 +246,15 @@
usernames.add(entity.getOperator());
variables.put("NextAssignee", usernames);
Result result = flowDefinitionService.startProcessInstanceByKey("week_maintenance_process", variables);
- if(result != null){
+ if (result != null) {
//鏇存柊鍛ㄤ繚鐘舵��
entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
entity.setActualStartTime(new Date());
eamWeekMaintenanceOrderMapper.updateById(entity);
return result.isSuccess();
}
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
}
return true;
}
@@ -233,10 +263,10 @@
@Transactional(rollbackFor = Exception.class)
public boolean collect(String id) {
EamWeekMaintenanceOrder entity = eamWeekMaintenanceOrderMapper.selectById(id);
- if(entity == null) {
+ if (entity == null) {
throw new JeecgBootException("瑕侀鍙栫殑宸ュ崟涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
}
- if(!WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ if (!WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
throw new JeecgBootException("璇ュ伐鍗曞凡杩涜杩囬鍙栵紒");
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -262,9 +292,211 @@
usernames.add(entity.getOperator());
variables.put("NextAssignee", usernames);
Result result = flowDefinitionService.startProcessInstanceByKey("week_maintenance_process", variables);
- if(result != null){
+ if (result != null) {
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
return result.isSuccess();
}
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.WEEK_MAINTENANCE, businessTable = "eam_week_maintenance_order")
+ public EamWeekMaintenanceOrder approval(EamWeekMaintenanceRequest request) {
+ EamWeekMaintenanceOrder entity = eamWeekMaintenanceOrderMapper.selectById(request.getId());
+ if (entity == null) {
+ throw new JeecgBootException("瀹℃壒鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
+ }
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (user == null || StrUtil.isBlank(user.getId())) {
+ throw new JeecgBootException("鏈幏鍙栧埌鐧诲綍鐢ㄦ埛锛岃閲嶆柊鐧诲綍鍚庡啀璇曪紒");
+ }
+ request.setAssignee(user.getUsername());
+ // 鑾峰彇娴佺▼涓氬姟璁板綍
+ FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(request.getInstanceId());
+ if (flowMyBusiness == null) {
+ throw new JeecgBootException("娴佺▼瀹炰緥涓嶅瓨鍦紝璇峰埛鏂板悗閲嶈瘯锛�");
+ }
+
+ boolean userAuthorized = isUserAuthorized(flowMyBusiness, user);
+ if (!userAuthorized) {
+ throw new JeecgBootException("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔★紝璇峰埛鏂板悗閲嶈瘯锛�");
+ }
+ // 璁ら浠诲姟
+ if (!claimTask(flowMyBusiness.getTaskId(), user)) {
+ throw new JeecgBootException("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰嗭紒");
+ }
+
+ EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
+ }
+
+ WeekMaintenanceStatusEnum status = WeekMaintenanceStatusEnum.getInstance(entity.getMaintenanceStatus());
+ if (status == null) {
+ return null;
+ }
+ //娴佺▼鍙橀噺
+ Map<String, Object> values = new HashMap<>();
+ switch (status) {
+ case UNDER_MAINTENANCE:
+ //鎵ц瀹屾垚
+ List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0003);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰鐝粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ }
+ List<String> userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("dataId", entity.getId());
+ values.put("organization", "鍛ㄤ繚鎵ц缁撴潫");
+ values.put("comment", "鍛ㄤ繚鎵ц缁撴潫");
+ values.put("NextAssignee", userApprovalList);
+ request.setComment("鍛ㄤ繚鎵ц缁撴潫");
+ //璁剧疆entity
+ entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.WAIT_CONFIRM.name());
+ entity.setActualEndTime(new Date());
+ //澶勭悊闄勪欢
+ if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
+ List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ String referenceFile = mapper.writeValueAsString(fileUploadResultList);
+ entity.setImageFiles(referenceFile);
+ } catch (JsonProcessingException e) {
+ log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
+ }
+ }
+ //澶勭悊璇︽儏
+ if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
+ eamWeekMaintenanceOrderDetailService.updateBatchById(request.getTableDetailList());
+ }
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.WAIT_CONFIRM.name());
+ break;
+ case WAIT_CONFIRM:
+ if(StringUtils.isBlank(equipment.getEquipmentManager())) {
+ throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
+ //鐝粍闀跨‘璁�
+ userApprovalList = new ArrayList<>();
+ userApprovalList.add(equipment.getEquipmentManager());
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getConfirmComment());
+ values.put("comment", request.getConfirmComment());
+ values.put("NextAssignee", userApprovalList);
+ values.put("confirmation", request.getConfirmDealType());
+ request.setComment(request.getConfirmComment());
+ //璁剧疆entity
+ entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.WAIT_INITIAL_ACCEPTANCE.name());
+ entity.setConfirmUser(user.getUsername());
+ entity.setConfirmComment(request.getConfirmComment());
+ entity.setConfirmTime(new Date());
+ entity.setConfirmDealType(request.getConfirmDealType());
+ if (CommonConstant.HAS_CANCLE.equals(request.getConfirmDealType())) {
+ //椹冲洖
+ userApprovalList = new ArrayList<>();
+ userApprovalList.add(entity.getOperator());
+ values.put("NextAssignee", userApprovalList);
+ entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
+ }
+ //澶勭悊鎶ヤ慨
+ List<EamWeekMaintenanceOrderDetail> collect = request.getTableDetailList().stream().filter((detail) -> CommonConstant.DEFAULT_1.equals(detail.getReportFlag())).collect(Collectors.toList());
+ if (CollectionUtil.isNotEmpty(collect)) {
+ eamReportRepairService.reportRepairFromMaintenance(equipment.getId(), entity.getOperator(), collect);
+ }
+ break;
+ case WAIT_INITIAL_ACCEPTANCE:
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0005);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰璁捐兘閮ㄧ鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
+ userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getInitialAcceptanceComment());
+ values.put("comment", request.getInitialAcceptanceComment());
+ values.put("NextAssignee", userApprovalList);
+ request.setComment(request.getInitialAcceptanceComment());
+ //璁剧疆entity
+ entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.WAIT_FINAL_ACCEPTANCE.name());
+ entity.setInitialAcceptanceUser(user.getUsername());
+ entity.setInitialAcceptanceComment(request.getInitialAcceptanceComment());
+ entity.setInitialAcceptanceTime(new Date());
+ //澶勭悊闄勪欢
+ if (CollectionUtil.isNotEmpty(request.getInitialAcceptanceFilesResult())) {
+ List<FileUploadResult> fileUploadResultList = request.getInitialAcceptanceFilesResult();
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ String referenceFile = mapper.writeValueAsString(fileUploadResultList);
+ entity.setInitialAcceptanceFiles(referenceFile);
+ } catch (JsonProcessingException e) {
+ log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
+ }
+ }
+ break;
+ case WAIT_FINAL_ACCEPTANCE:
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getInitialAcceptanceComment());
+ values.put("comment", request.getInitialAcceptanceComment());
+ request.setComment(request.getInitialAcceptanceComment());
+ //璁剧疆entity
+ entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.COMPLETE.name());
+ entity.setFinalAcceptanceUser(user.getUsername());
+ entity.setFinalAcceptanceComment(request.getFinalAcceptanceComment());
+ entity.setFinalAcceptanceTime(new Date());
+ //澶勭悊闄勪欢
+ if (CollectionUtil.isNotEmpty(request.getFinalAcceptanceFilesResult())) {
+ List<FileUploadResult> fileUploadResultList = request.getFinalAcceptanceFilesResult();
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ String referenceFile = mapper.writeValueAsString(fileUploadResultList);
+ entity.setFinalAcceptanceFiles(referenceFile);
+ } catch (JsonProcessingException e) {
+ log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
+ }
+ }
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.NORMAL.name());
+ break;
+ }
+ request.setValues(values);
+
+ // 瀹屾垚娴佺▼浠诲姟
+ Result result = flowTaskService.complete(request);
+ if (!result.isSuccess()) {
+ throw new JeecgBootException("瀹℃壒澶辫触锛岃鍒锋柊鏌ョ湅锛�");
+ }
+ //淇濆瓨宸ュ崟
+ eamWeekMaintenanceOrderMapper.updateById(entity);
+ return entity;
+ }
+
+ @Override
+ public List<EamWeekMaintenanceOrder> selectUnCompleteOrder(String expiredDate) {
+ LambdaQueryWrapper<EamWeekMaintenanceOrder> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.lt(EamWeekMaintenanceOrder::getMaintenanceDate, expiredDate);
+ List<String> unCompleteStatus = new ArrayList<>();
+ unCompleteStatus.add(WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
+ unCompleteStatus.add(WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
+ queryWrapper.in(EamWeekMaintenanceOrder::getMaintenanceStatus, unCompleteStatus);
+ queryWrapper.orderByAsc(EamWeekMaintenanceOrder::getMaintenanceDate);
+ return eamWeekMaintenanceOrderMapper.selectList(queryWrapper);
+ }
+
+ private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
+ List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
+ return todoUsers != null && todoUsers.contains(user.getUsername());
+ }
+
+ private boolean claimTask(String taskId, LoginUser user) {
+ Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+ if (task == null) {
+ return false;
+ }
+ if (task.getAssignee() != null && !task.getAssignee().equals(user.getUsername())) {
+ return false;
+ }
+ taskService.claim(taskId, user.getUsername());
return true;
}
@@ -289,7 +521,7 @@
public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
//涓氬姟鏄惁骞查娴佺▼锛屼笟鍔″共棰勶紝娴佺▼骞查锛屾寚瀹氫汉鍛樿繘琛屽鐞�
//鑾峰彇涓嬩竴姝ュ鐞嗕汉
- Object object=values.get("NextAssignee");
+ Object object = values.get("NextAssignee");
return (List<String>) object;
}
}
--
Gitblit v1.9.3