From ba9c6723249f0a843d35eb21b43a00be4b7de3ab Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 29 五月 2025 13:48:50 +0800
Subject: [PATCH] 备件请购
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSparePartRequisitionMapper.xml | 15 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamSparePartRequisitionMapper.java | 8 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamSparePartRequisitionService.java | 21 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java | 49 +++++++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java | 7 +
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java | 12 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartRequisition.java | 12 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSparePartRequisitionServiceImpl.java | 224 +++++++++++++++++++++++++++++++++++++
8 files changed, 343 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java
index 7d973b6..e29add6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java
@@ -1,6 +1,8 @@
package org.jeecg.modules.eam.controller;
import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -12,7 +14,10 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.entity.EamSparePartRequisition;
+import org.jeecg.modules.eam.request.EamEquipmentLeanOutRequest;
+import org.jeecg.modules.eam.request.EamSparePartRequisitionRequest;
import org.jeecg.modules.eam.service.IEamSparePartRequisitionService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -164,9 +169,47 @@
@ApiOperation(value = "澶囦欢璇疯喘鍗�-鎻愪氦璇疯喘鍗�", notes = "澶囦欢璇疯喘鍗�-鎻愪氦璇疯喘鍗�")
@PostMapping(value = "/submitSpareRequisition")
public Result<?> submitSpareRequisition(@RequestBody EamSparePartRequisition eamSparePartRequisition) {
- eamSparePartRequisition.setRequisitionStatus(BusinessCodeConst.SPARE_REQUISITION_STATUS_2);
- eamSparePartRequisitionService.updateById(eamSparePartRequisition);
- return Result.OK("鎻愪氦鎴愬姛锛�");
+// eamSparePartRequisition.setRequisitionStatus(BusinessCodeConst.SPARE_REQUISITION_STATUS_2);
+// eamSparePartRequisitionService.updateById(eamSparePartRequisition);
+ boolean b = eamSparePartRequisitionService.submitSpareRequisition(eamSparePartRequisition);
+ if (!b) {
+ return Result.error("鎻愪氦澶辫触锛�");
+ }
+ return Result.OK("鎻愪氦鎴愬姛!");
+ }
+
+ @GetMapping(value = "/getSparePartRequisitionList")
+ public Result<?> getSparePartRequisitionList(EamSparePartRequisition eamSparePartRequisition,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<EamSparePartRequisition> queryWrapper = QueryGenerator.initQueryWrapper(eamSparePartRequisition, req.getParameterMap());
+ Page<EamSparePartRequisition> page = new Page<EamSparePartRequisition>(pageNo, pageSize);
+ IPage<EamSparePartRequisition> pageList = eamSparePartRequisitionService.page(page, queryWrapper);
+ List<EamSparePartRequisition> records = pageList.getRecords();
+ for (EamSparePartRequisition record : records) {
+ String id = record.getId();
+ List<Map<String, Object>> sparePartRequisitionDetailList = eamSparePartRequisitionService.getSparePartRequisitionDetailList(id);
+ record.setSparePartRequisitionDetailList(sparePartRequisitionDetailList);
+ }
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 瀹℃牳
+ */
+ @AutoLog(value = "澶囦欢璇疯喘-瀹℃壒娴�")
+ @ApiOperation(value = "澶囦欢璇疯喘-瀹℃壒娴�", notes = "澶囦欢璇疯喘-瀹℃壒娴�")
+ @RequestMapping(value = "/approval", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> approval(@RequestBody EamSparePartRequisitionRequest request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ EamSparePartRequisition entity = eamSparePartRequisitionService.approval(request);
+ if (entity == null) {
+ return Result.error("鎿嶄綔澶辫触锛�");
+ }
+ return Result.OK("鎿嶄綔鎴愬姛!");
}
/**
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartRequisition.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartRequisition.java
index 6596afd..5852d66 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartRequisition.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartRequisition.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -12,6 +13,9 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @Description: 澶囦欢璇疯喘鍗�
@@ -70,4 +74,12 @@
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ /**
+ * 澶囦欢璇疯喘鏄庣粏鍗�
+ */
+ @TableField(exist = false)
+ private List<Map<String, Object>> sparePartRequisitionDetailList;
+
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamSparePartRequisitionMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamSparePartRequisitionMapper.java
index 2b9e174..a5ed3c2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamSparePartRequisitionMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamSparePartRequisitionMapper.java
@@ -1,7 +1,14 @@
package org.jeecg.modules.eam.mapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamSparePartRequisition;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.eam.entity.EamSparePartRequisitionDetail;
+
+import java.util.List;
+import java.util.Map;
/**
* @Description: 澶囦欢璇疯喘鍗�
@@ -11,4 +18,5 @@
*/
public interface EamSparePartRequisitionMapper extends BaseMapper<EamSparePartRequisition> {
+ List<Map<String, Object>> getSparePartRequisitionDetailList(@Param(Constants.WRAPPER) Wrapper<EamSparePartRequisitionDetail> queryWrapper);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSparePartRequisitionMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSparePartRequisitionMapper.xml
index 569012e..908524c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSparePartRequisitionMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSparePartRequisitionMapper.xml
@@ -2,4 +2,19 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamSparePartRequisitionMapper">
+ <select id="getSparePartRequisitionDetailList" resultType="Map">
+ SELECT
+ t2.id,
+ t2.part_code AS partCode,
+ t2.part_name as partName,
+ t2.part_model as partModel,
+ t2.part_specification as partSpecification,
+ t3.item_text as partCategory,
+ t1.requisition_num as quantity
+ FROM
+ eam_spare_part_requisition_detail t1
+ LEFT JOIN eam_spare_parts t2 ON t1.part_id = t2.id
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'spare_part_category' ) t3 ON t3.item_value = t2.part_category
+ ${ew.customSqlSegment}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamSparePartRequisitionService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamSparePartRequisitionService.java
index dd4a9e6..1b6871f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamSparePartRequisitionService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamSparePartRequisitionService.java
@@ -1,7 +1,13 @@
package org.jeecg.modules.eam.service;
+import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.entity.EamSparePartRequisition;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.eam.request.EamEquipmentLeanOutRequest;
+import org.jeecg.modules.eam.request.EamSparePartRequisitionRequest;
+
+import java.util.List;
+import java.util.Map;
/**
* @Description: 澶囦欢璇疯喘鍗�
@@ -11,4 +17,19 @@
*/
public interface IEamSparePartRequisitionService extends IService<EamSparePartRequisition> {
+ /**
+ * 澶囦欢璇疯喘鍗曟彁浜�
+ * @param eamSparePartRequisition
+ * @return
+ */
+ boolean submitSpareRequisition(EamSparePartRequisition eamSparePartRequisition);
+
+ List<Map<String, Object>> getSparePartRequisitionDetailList(String sparePartRequisitionId);
+
+ /**
+ * 瀹℃壒娴佺▼鎺у埗
+ * @param request
+ * @return
+ */
+ EamSparePartRequisition approval(EamSparePartRequisitionRequest request);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSparePartRequisitionServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSparePartRequisitionServiceImpl.java
index 984e3a2..fcb97d7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSparePartRequisitionServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSparePartRequisitionServiceImpl.java
@@ -1,11 +1,44 @@
package org.jeecg.modules.eam.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.Result;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.eam.constant.AssetStatusEnum;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
+import org.jeecg.modules.eam.entity.EamEquipment;
+import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.entity.EamSparePartRequisition;
+import org.jeecg.modules.eam.entity.EamSparePartRequisitionDetail;
import org.jeecg.modules.eam.mapper.EamSparePartRequisitionMapper;
+import org.jeecg.modules.eam.request.EamSparePartRequisitionRequest;
import org.jeecg.modules.eam.service.IEamSparePartRequisitionService;
+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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.*;
/**
* @Description: 澶囦欢璇疯喘鍗�
@@ -13,7 +46,194 @@
* @Date: 2025-03-19
* @Version: V1.0
*/
-@Service
-public class EamSparePartRequisitionServiceImpl extends ServiceImpl<EamSparePartRequisitionMapper, EamSparePartRequisition> implements IEamSparePartRequisitionService {
+@Service("IEamSparePartRequisitionService")
+public class EamSparePartRequisitionServiceImpl extends ServiceImpl<EamSparePartRequisitionMapper, EamSparePartRequisition> implements IEamSparePartRequisitionService, FlowCallBackServiceI {
+ @Autowired
+ private ISysUserService sysUserService;
+
+ @Autowired
+ private IFlowDefinitionService flowDefinitionService;
+
+ @Autowired
+ private FlowCommonService flowCommonService;
+
+ @Resource
+ private EamSparePartRequisitionMapper sparePartRequisitionMapper;
+
+ @Autowired
+ private IFlowMyBusinessService flowMyBusinessService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private IFlowTaskService flowTaskService;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean submitSpareRequisition(EamSparePartRequisition eamSparePartRequisition) {
+ EamSparePartRequisition entity = super.getById(eamSparePartRequisition.getId());
+ if (entity == null) {
+ throw new JeecgBootException("瑕佹彁浜ょ殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ //鎵ц瀹屾垚
+ List<UserSelector> userSelectors = sysUserService.selectOperatorList(BusinessCodeConst.PCR0007);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("澶囦欢绠＄悊鍛樻湭璁剧疆浜哄憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶鎻愪氦澶囦欢璇疯喘鍗曪紒");
+ }
+ UpdateWrapper<EamSparePartRequisition> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("requisition_status", BusinessCodeConst.SPARE_REQUISITION_STATUS_2);
+ updateWrapper.eq("id", eamSparePartRequisition.getId());
+// boolean success = super.update(updateWrapper);
+ //鍚姩瀹℃壒娴佺▼
+ flowCommonService.initActBusiness("澶囦欢璇疯喘鍗曞彿:" + entity.getRequisitionCode() + ";鐢宠浜�: " + entity.getReportUser() + ";鍙戣捣澶囦欢璇疯喘鐢宠",
+ entity.getId(),
+ "IEamSparePartRequisitionService",
+ "spare_part_apply",
+ null);
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("dataId", entity.getId());
+ variables.put("organization", "澶囦欢璇疯喘娴佺▼鍚姩");
+ variables.put("comment", "澶囦欢璇疯喘娴佺▼鍚姩");
+ variables.put("proofreading", true);
+ List<String> usernames = new ArrayList<>();
+ for (UserSelector userSelector : userSelectors) {
+ usernames.add(userSelector.getUsername());
+ }
+ variables.put("NextAssignee", usernames);
+ Result result = flowDefinitionService.startProcessInstanceByKey("spare_part_apply", variables);
+ if (result != null) {
+ super.update(updateWrapper);
+ return result.isSuccess();
+ }
+ return false;
+ }
+
+ @Override
+ public List<Map<String, Object>> getSparePartRequisitionDetailList(String sparePartRequisitionId) {
+ QueryWrapper<EamSparePartRequisitionDetail> queryWrapper = Wrappers.query();
+ if (sparePartRequisitionId != null && sparePartRequisitionId != "") {
+ queryWrapper.eq("t1.spare_requisition_id", sparePartRequisitionId);
+ }
+ return this.baseMapper.getSparePartRequisitionDetailList(queryWrapper);
+
+
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public EamSparePartRequisition approval(EamSparePartRequisitionRequest request) {
+ EamSparePartRequisition entity = sparePartRequisitionMapper.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.setApprovalUser(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("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰嗭紒");
+ }
+ //娴佺▼鍙橀噺
+ Map<String, Object> values = new HashMap<>();
+ switch (BusinessCodeConst.SPARE_REQUISITION_STATUS_2) {
+ // 瀹℃壒
+ case BusinessCodeConst.SPARE_REQUISITION_STATUS_2:
+ //鎵ц瀹屾垚
+ values.put("dataId", entity.getId());
+ values.put("organization", "澶囦欢璇疯喘瀹℃壒");
+ values.put("comment", request.getComment());
+ values.put("status", request.getStatus());
+ request.setComment(request.getComment());
+ entity.setApprovalUser(user.getUsername());// 瀹℃牳浜�
+ entity.setApprovalTime(new Date());// 瀹℃牳鏃堕棿
+ entity.setRemark(request.getApprovalOpinion());// 瀹℃牳鎰忚
+ // 楠岃瘉閫氳繃杩樻槸椹冲洖
+ if (request.getStatus().equals("1")) {
+ //璁剧疆entity
+ entity.setRequisitionStatus(BusinessCodeConst.SPARE_REQUISITION_STATUS_3);
+ List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getReportUser()));
+ values.put("NextAssignee", userApprovalList);
+ } else {
+ //璁剧疆entity
+ entity.setRequisitionStatus(BusinessCodeConst.SPARE_REQUISITION_STATUS_4);
+ }
+ break;
+ }
+ request.setValues(values);
+
+ // 瀹屾垚娴佺▼浠诲姟
+ Result result = flowTaskService.complete(request);
+ if (!result.isSuccess()) {
+ throw new JeecgBootException("瀹℃壒澶辫触锛岃鍒锋柊鏌ョ湅锛�");
+ }
+ //淇濆瓨宸ュ崟
+ sparePartRequisitionMapper.updateById(entity);
+ return entity;
+ }
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁鎷ユ湁姝ゆ潈闄�
+ *
+ * @param flowMyBusiness
+ * @param user
+ * @return
+ */
+ 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;
+ }
+
+ @Override
+ public void afterFlowHandle(FlowMyBusiness business) {
+ business.getTaskNameId();//鎺ヤ笅鏉ュ鎵圭殑鑺傜偣
+ business.getValues();//鍓嶇浼犺繘鏉ョ殑鍙傛暟
+ business.getActStatus();
+ }
+
+ @Override
+ public Object getBusinessDataById(String dataId) {
+ return this.getById(dataId);
+ }
+
+ @Override
+ public Map<String, Object> flowValuesOfTask(String taskNameId, Map<String, Object> values) {
+ return null;
+ }
+
+ @Override
+ public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
+ //涓氬姟鏄惁骞查娴佺▼锛屼笟鍔″共棰勶紝娴佺▼骞查锛屾寚瀹氫汉鍛樿繘琛屽鐞�
+ //鑾峰彇涓嬩竴姝ュ鐞嗕汉
+ Object object = values.get("NextAssignee");
+ return (List<String>) object;
+ }
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
index 3604d3f..48fad04 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
@@ -332,6 +332,13 @@
List<UserSelector> selectOperatorList(String equipmentCode, String productionId, String positionCode);
/**
+ * 閫夋嫨鐢ㄦ埛
+ * @param positionCode 宀椾綅缂栧彿
+ * @return
+ */
+ List<UserSelector> selectOperatorList( String positionCode);
+
+ /**
* 鏍规嵁鐢ㄦ埛鍚嶆壒閲忚幏鍙栫湡瀹炲鍚嶆槧灏�
* @param userNames 鐢ㄦ埛鍚嶅垪琛�
* @return 鐢ㄦ埛鍚�->鐪熷疄濮撳悕鐨勬槧灏勶紙涓嶅瓨鍦ㄦ椂鍊间负null锛�
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
index 2518957..37f72de 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -764,6 +764,18 @@
return collect;
}
+ @Override
+ public List<UserSelector> selectOperatorList(String positionCode) {
+ LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(SysUser::getPost, positionCode);
+ queryWrapper.eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0);
+ queryWrapper.eq(SysUser::getStatus, CommonConstant.DEL_FLAG_1);
+ queryWrapper.orderByDesc(SysUser::getId);
+ List<SysUser> sysUsers = userMapper.selectList(queryWrapper);
+ List<UserSelector> collect = sysUsers.stream().map(user -> new UserSelector(user.getId(), user.getUsername(), user.getRealname())).collect(Collectors.toList());
+ return collect;
+ }
+
/**
* 鏍规嵁鐢ㄦ埛鍚嶆壒閲忚幏鍙栫湡瀹炲鍚嶆槧灏�
* @param userNames 鐢ㄦ埛鍚嶅垪琛�
--
Gitblit v1.9.3