From 2db191d2c36c490f27a9e985005ef8cf4df261ee Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期一, 15 七月 2024 10:17:26 +0800
Subject: [PATCH] solve some bug
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 440 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 352 insertions(+), 88 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
index 1e56963..6bc3abd 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
@@ -1,141 +1,405 @@
package com.dy.pmsStation.workOrder;
import com.alibaba.excel.util.StringUtils;
-import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pmsGlobal.daoBa.BaUserMapper;
+import com.dy.pmsGlobal.daoPlt.PltProductMapper;
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
+import com.dy.pmsGlobal.daoPr.PrProductionNodeMapper;
+import com.dy.pmsGlobal.daoSta.StaAssemblyWorkHistoryMapper;
import com.dy.pmsGlobal.daoSta.StaAssemblyWorkLastMapper;
import com.dy.pmsGlobal.pojoBa.BaUser;
+import com.dy.pmsGlobal.pojoPlt.PltProduct;
import com.dy.pmsGlobal.pojoPlt.PltStation;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
+import com.dy.pmsGlobal.pojoPr.PrProductionNode;
+import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
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 java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
@Slf4j
@Service
public class WorkOrderSv {
+ private static final int STATUS_NORMAL = 1;
+ private static final int STATUS_WORK_LAST_LOGOUT = 2;
+ private static final int STATUS_REPAIR = 3;
+ private static final int STATUS_WASTE = 4;
+
+ private static final String USER_PREFIX = "101";
+ private static final String STATION_PREFIX = "103";
+
private PrAssemblyPlanMapper assemblyDao;
private BaUserMapper baUserDao;
private PltStationMapper pltStationDao;
private StaAssemblyWorkLastMapper assemblyWorkLastDao;
+ private StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao;
+ private PrProductionNodeMapper nodeDao;
+ private PltProductMapper productDao;
@Autowired
public void setAssemblyDao(PrAssemblyPlanMapper assemblyDao) {
this.assemblyDao = assemblyDao;
}
+
@Autowired
- private void setBaUserDao(BaUserMapper baUserDao){
+ private void setBaUserDao(BaUserMapper baUserDao) {
this.baUserDao = baUserDao;
}
+
@Autowired
- private void setPltStationDao(PltStationMapper pltStationDao){
+ private void setPltStationDao(PltStationMapper pltStationDao) {
this.pltStationDao = pltStationDao;
}
+
@Autowired
- private void setStaAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao){
+ private void setStaAssemblyWorkHistoryDao(StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao) {
+ this.assemblyWorkHistoryDao = assemblyWorkHistoryDao;
+ }
+
+ @Autowired
+ private void setStaAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao) {
this.assemblyWorkLastDao = assemblyWorkLastDao;
}
- public String checkUser(Long id){
- Long userId = id;
- String message = "USER";
- //宸ョ珯103
- if(userId != null && userId.toString().startsWith("103")){
- message = checkStation(id);
- return message;
- }
- if(userId == null){
- message = "FALSE^鍛樺伐缂栫爜涓嶈兘涓虹┖";
- return message;
- }
- //鐢ㄦ埛101
- if(userId.toString().startsWith("101")){
- userId = Long.parseLong(userId.toString().substring(3));
- }
- BaUser userInfo = baUserDao.selectByPrimaryKey(userId);
- if(userInfo == null){
- message = "FALSE^鍛樺伐缂栫爜涓嶅湪绯荤粺涓�,璇峰厛缁存姢鍛樺伐淇℃伅";
- }
- message += "^"+ userId;
- return message;
+ @Autowired
+ public void setNodeDao(PrProductionNodeMapper nodeDao) {
+ this.nodeDao = nodeDao;
}
- public String checkStation(Long id){
- Long stationId = id;
- String message = "STATION";
- //鐢ㄦ埛101
- if(stationId != null && stationId.toString().startsWith("101")){
- message = checkUser(id);
- return message;
+ @Autowired
+ public void setPltProductDao(PltProductMapper productDao) {
+ this.productDao = productDao;
+ }
+
+
+ public BaUser getUserInfo(String id) {
+ Long userId = null;
+ if (StringUtils.isBlank(id)) {
+ throw new RuntimeException("鍛樺伐缂栫爜涓嶈兘涓虹┖");
}
- if(stationId == null){
- message = "FALSE^宸ョ珯缂栫爜涓嶈兘涓虹┖";
- return message;
+ //鐢ㄦ埛101
+ if (id.startsWith(USER_PREFIX)) {
+ userId = Long.parseLong(id.toString().substring(3));
+ } else {
+ userId = Long.parseLong(id.toString());
+ }
+ BaUser userInfo = baUserDao.selectByPrimaryKey(userId);
+ if (userInfo == null) {
+ throw new RuntimeException("鍛樺伐缂栫爜:" + userId + "涓嶅湪绯荤粺涓�,璇峰厛缁存姢鍛樺伐淇℃伅");
+ } else if (userInfo.getDisabled()) {
+ throw new RuntimeException("鍛樺伐(" + userInfo.getName() + ")缂栫爜:" + userId + "鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤鍛樺伐");
+ }
+ return userInfo;
+ }
+
+ public PltStation getStationInfo(String id) {
+ //浠呮鏌ュ伐绔欎俊鎭互鍙婂伐绔欏崰鐢ㄦ儏鍐�
+ Long stationId = null;
+ if (StringUtils.isBlank(id)) {
+ throw new RuntimeException("宸ョ珯缂栫爜涓嶈兘涓虹┖");
}
//宸ョ珯103
- if(stationId.toString().startsWith("103")){
- stationId = Long.parseLong(stationId.toString().substring(3));
+ if (id.startsWith(STATION_PREFIX)) {
+ stationId = Long.parseLong(id.toString().substring(3));
+ } else {
+ stationId = Long.parseLong(id.toString());
}
- PltStation record = new PltStation();
- record.setId(stationId);
- List<PltStation> stationInfo = pltStationDao.selectStationList(record);
- if(stationInfo.size() == 0){
- message = "FALSE^宸ョ珯缂栫爜涓嶅湪绯荤粺涓�,璇峰厛缁存姢宸ョ珯淇℃伅";
- return message;
+ PltStation stationInfo = pltStationDao.selectByPrimaryKey(stationId);
+ if (stationInfo == null) {
+ throw new RuntimeException("宸ョ珯缂栫爜:" + stationId + "涓嶅湪绯荤粺涓�,璇峰厛缁存姢宸ョ珯淇℃伅");
+ } else if (stationInfo.getDisabled()) {
+ throw new RuntimeException("宸ョ珯(" + stationInfo.getName() + ")缂栫爜:" + stationId + "鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤宸ョ珯");
}
- //妫�鏌ュ伐绔�
- message += "^"+ stationId;
- return message;
+ return stationInfo;
}
- public String checkStationIsUsed(StaAssemblyWorkLast last){
- String message = "OK";
- Long userId = null;
- Long stationId = null;
- String userMsg = checkUser(last.getUserId());
- String stationMsg = checkStation(last.getStationId());
- if(userMsg.startsWith("FALSE") || stationMsg.startsWith("FALSE")){
- if(userMsg.startsWith("FALSE") && stationMsg.startsWith("FALSE")){
- message = userMsg +","+ stationMsg.split("^")[1];
- }else if(userMsg.startsWith("FALSE")){
- message = userMsg;
- }else if(stationMsg.startsWith("FALSE")){
- message = stationMsg;
- }
- return message;
- }else{//鏍规嵁缁撴灉 鎵惧埌瀵瑰簲鐨処D鍊�
- if(userMsg.startsWith("USER")){
- userId = Long.parseLong(userMsg.split("^")[1]);
- }else if(userMsg.startsWith("STATION")){
- stationId = Long.parseLong(userMsg.split("^")[1]);
- }
- if(stationMsg.startsWith("USER")){
- userId = Long.parseLong(stationMsg.split("^")[1]);
- }else if(stationMsg.startsWith("STATION")){
- stationId = Long.parseLong(stationMsg.split("^")[1]);
- }
+
+ public StaAssemblyWorkLast checkUserAndStationUsed(QueryVo vo) {
+ StaAssemblyWorkLast result = new StaAssemblyWorkLast();
+ PltStation stationInfo = null;
+ BaUser userInfo = null;
+ if (StringUtils.isBlank(vo.getStationId()) || StringUtils.isBlank(vo.getUserId())) {
+ throw new RuntimeException("宸ョ珯缂栫爜鎴栧憳宸ョ紪鐮佸潎涓嶈兘涓虹┖,璇锋鏌�");
}
- if(userId == null || stationId == null){
- message = "FALSE^鍛樺伐缂栫爜:"+ last.getUserId() + "鎴栧伐绔欑紪鐮�:" + last.getStationId() + "涓嶆纭�,璇锋鏌�";
- return message;
+ //宸ョ珯103
+ if (vo.getStationId().startsWith(USER_PREFIX)) {
+ userInfo = getUserInfo(vo.getStationId());
+ } else {
+ stationInfo = getStationInfo(vo.getStationId());
}
- //妫�鏌ヨ〃涓槸涓嶆槸宸茬粡瀛樺湪
+ if (vo.getUserId().startsWith(STATION_PREFIX)) {
+ stationInfo = getStationInfo(vo.getUserId());
+ } else {
+ userInfo = getUserInfo(vo.getUserId());
+ }
+ if (userInfo == null && stationInfo == null) {
+ throw new RuntimeException("鍛樺伐缂栫爜:" + vo.getUserId() + "鍜屽伐绔欑紪鐮�:" + vo.getStationId() + "涓嶆纭�,璇锋鏌�");
+ } else if (userInfo == null) {
+ throw new RuntimeException("鍛樺伐缂栫爜:" + vo.getUserId() + "涓嶆纭�,璇锋鏌�");
+ } else if (stationInfo == null) {
+ throw new RuntimeException("宸ョ珯缂栫爜:" + vo.getStationId() + "涓嶆纭�,璇锋鏌�");
+ }
+ //妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
StaAssemblyWorkLast param = new StaAssemblyWorkLast();
- param.setUserId(userId);
- param.setStationId(stationId);
- param.setStatus(1);
- List<StaAssemblyWorkLast> userStationList = assemblyWorkLastDao.selectList(param);
- if(userStationList.size() > 0){
- message = "FALSE^鍛樺伐缂栫爜:"+ userStationList.get(0).getUserId() + "宸茬粡缁戝畾璇ュ伐绔欑紪鐮�:" + userStationList.get(0).getStationId() + ".璇峰厛璁╁叾瑙ｇ粦";
- }//message = "OK^鍛樺伐缂栫爜:"+ userId+ "宸茬粡缁戝畾璇ュ伐绔欑紪鐮�:" + stationId + ".楠岃瘉閫氳繃";
- return message;
+ param.setStationId(stationInfo.getId());
+ param.setStatus(STATUS_NORMAL);
+ List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
+ long userId = userInfo.getId();
+ if (workLasts.size() > 0) {
+ List<StaAssemblyWorkLast> userStationList = workLasts.stream().filter(item -> userId == item.getUserId()).collect(Collectors.toList());
+ if (userStationList.size() == 0) {
+ throw new RuntimeException("鍛樺伐(" + workLasts.get(0).getUserName() + ")缂栫爜:" + workLasts.get(0).getUserId() + "宸茬粡缁戝畾璇ュ伐绔�(" + workLasts.get(0).getStationName() + ")缂栫爜:" + workLasts.get(0).getStationId() + ".璇峰厛璁╁叾瑙ｇ粦");
+ } else {
+ BeanUtils.copyProperties(userStationList.get(0), result);
+ }
+ } else {
+ result.setUserId(userInfo.getId());
+ result.setUserName(userInfo.getName());
+ result.setStationId(stationInfo.getId());
+ result.setStationName(stationInfo.getName());
+ result.setLineId(stationInfo.getLineId());
+ }
+ return result;
}
- public List<PrAssemblyPlan> selectList(PrAssemblyPlan params){
- List<PrAssemblyPlan> planList = assemblyDao.selectList(params);
+
+ public StaAssemblyWorkLast getWorkLast(String workId) {
+ if(StringUtils.isBlank(workId)){
+ throw new RuntimeException("鐧诲綍ID涓虹┖,璇疯仈绯荤鐞嗗憳鏌ョ湅骞惰В鍐抽棶棰�.");
+ }
+ StaAssemblyWorkLast result = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
+ if (result == null) {
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
+ //return null;
+ }
+ BaUser userInfo = getUserInfo(result.getUserId().toString());
+ PltStation stationInfo = getStationInfo(result.getStationId().toString());
+ //鏍￠獙planId processId nodeId
+ PrAssemblyPlan assyPlan = assemblyDao.selectByPrimaryKey(result.getPlanId());
+ boolean hasNodeId = assyPlan.getProcess().getNodes().stream()
+ .anyMatch(node -> node.id.equals(result.getNodeId()));
+ if (userInfo == null || stationInfo == null || assyPlan == null || (!hasNodeId)) {
+ //鐩存帴鍒犻櫎璁板綍
+ logout(result.getId().toString());
+ result.setId(null);
+ result.setStatus(STATUS_WORK_LAST_LOGOUT);
+ if(userInfo == null){
+ result.setUserId(null);
+ result.setUserName("");
+ }
+ if(stationInfo == null){
+ result.setStationId(null);
+ result.setStationName("");
+ }
+ if(assyPlan == null){
+ result.setPlanId(null);
+ result.setPlanName("");
+ }
+ if(!hasNodeId){
+ result.setNodeId(null);
+ result.setNodeName("");
+ }
+ return result;
+ }else {
+ result.setPlanName(assyPlan.getName());
+ result.setProcessName(assyPlan.getProcessName());
+ result.setNodeName(assyPlan.getProcess().getNodes().get(0).getContent());
+ //鎵惧埌瀵瑰簲鐨勪骇鍝佷俊鎭�
+ PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
+ if (product != null) {
+ result.setProId(product.getId());
+ result.setProName(product.getName());
+ String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
+ result.setDevicePrefix(devicePrefix);
+ }
+ }
+ result.setStationId(stationInfo.getId());
+ result.setStationName(stationInfo.getName());
+ result.setLineId(stationInfo.getLineId());
+ result.setLineName(stationInfo.getLineName());
+ return result;
+ }
+
+ public StaAssemblyWorkLast checkStationUsed(String stationId) {
+ StaAssemblyWorkLast result = new StaAssemblyWorkLast();
+ PltStation stationInfo = null;
+ if (StringUtils.isBlank(stationId)) {
+ throw new RuntimeException("宸ョ珯缂栫爜涓嶈兘涓虹┖,璇锋鏌�");
+ }
+ stationInfo = getStationInfo(stationId);
+ //妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
+ StaAssemblyWorkLast param = new StaAssemblyWorkLast();
+ param.setStationId(stationInfo.getId());
+ param.setStatus(STATUS_NORMAL);
+ List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
+ if (workLasts.size() > 0) {
+ result = getWorkLast(workLasts.get(0).getId().toString());
+ }
+ result.setStationId(stationInfo.getId());
+ result.setStationName(stationInfo.getName());
+ result.setLineId(stationInfo.getLineId());
+ result.setLineName(stationInfo.getLineName());
+ return result;
+ }
+
+ @Transactional
+ public StaAssemblyWorkLast save(QueryVo vo) {
+ //鍏坈heck
+ StaAssemblyWorkLast checkResult = checkUserAndStationUsed(vo);
+ //鏍￠獙planId processId nodeId
+ PrAssemblyPlan assyPlan = assemblyDao.selectByPrimaryKey(vo.getPlanId());
+ if (assyPlan == null) {
+ throw new RuntimeException("缁勮浠诲姟宸茬粡鍦ㄧ郴缁熶腑鍒犻櫎璇锋鏌�,鍒锋柊骞堕噸鏂伴�夋嫨浠诲姟");
+ }
+ boolean hasNodeId = assyPlan.getProcess().getNodes().stream()
+ .anyMatch(node -> node.id.equals(vo.getNodeId()));
+ if (!hasNodeId) {
+ throw new RuntimeException("鑺傜偣淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇烽噸鏂伴�夋嫨鑺傜偣淇℃伅");
+ }
+
+ //鏁版嵁閫愪釜灏佽杩斿洖
+ vo.setLineId(checkResult.getLineId());
+ StaAssemblyWorkLast staLast = new StaAssemblyWorkLast();
+ BeanUtils.copyProperties(vo, staLast);
+ staLast.setUserId(checkResult.getUserId());
+ staLast.setStationId(checkResult.getStationId());
+ int count = 0;
+ if (checkResult.getId() == null) {
+ BeanUtils.copyProperties(vo, staLast);//vo鎷疯礉鍒皊taLast
+ staLast.setUserId(checkResult.getUserId());
+ staLast.setStationId(checkResult.getStationId());
+ staLast.setStatus(STATUS_NORMAL);
+ staLast.setStartTime(new Date());
+ count = assemblyWorkLastDao.insertSelective(staLast);
+ } else {
+ //淇濆瓨涓�鏉istory?
+ BeanUtils.copyProperties(checkResult, staLast);
+ staLast.setPlanId(assyPlan.getId());
+ staLast.setProcessId(assyPlan.getProcess().getId());
+ staLast.setNodeId(vo.getNodeId());
+ staLast.setStatus(STATUS_NORMAL);
+ staLast.setStartTime(new Date());
+ count = assemblyWorkLastDao.updateByPrimaryKeySelective(staLast);
+ }
+ if (count <= 0) {
+ throw new RuntimeException("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ }
+ StaAssemblyWorkLast result = assemblyWorkLastDao.selectByPrimaryKey(staLast.getId());
+ List<PrProductionNode> nodeInfo = assyPlan.getProcess().getNodes().stream()
+ .filter(node -> node.id.equals(vo.getNodeId())).collect(Collectors.toList());
+ result.setPlanName(assyPlan.getName());
+ result.setProcessName(assyPlan.getProcessName());
+ result.setNodeName(assyPlan.getProcess().getNodes().get(0).getContent());
+ //鎵惧埌瀵瑰簲鐨勪骇鍝佷俊鎭�
+ PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
+ if (product == null) {
+ throw new RuntimeException("浜у搧淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇风櫥褰曠鐞嗙郴缁熸煡鐪嬩换鍔″叧鑱斾骇鍝両D涓�:" + assyPlan.getProId());
+ }
+ result.setProId(product.getId());
+ result.setProName(product.getName());
+ String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
+ result.setDevicePrefix(devicePrefix);
+ return result;
+ }
+
+ @Transactional
+ public int logout(String id) {
+ //鎵惧埌鐧诲綍璁板綍
+ StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(id));
+ if (workLast == null) {
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
+ }
+ //鏇存柊鐧诲綍璁板綍
+ workLast.setStatus(STATUS_WORK_LAST_LOGOUT);
+ workLast.setEndTime(new Date());
+ // 淇濆瓨history
+ StaAssemblyWorkHistory history = new StaAssemblyWorkHistory();
+ BeanUtils.copyProperties(workLast, history);
+ //history.setId(null);
+ int count = assemblyWorkHistoryDao.insertSelective(history);
+ //鍒犻櫎last
+ assemblyWorkLastDao.deleteByPrimaryKey(Long.parseLong(id));
+ return count;
+ }
+
+ public List<PrAssemblyPlan> selectAssyPlanList(PrAssemblyPlan params) {
+ List<PrAssemblyPlan> planList = assemblyDao.selectAssyPlanSimplify(params);
+ /* planList.stream().forEach(process -> {
+ process.getProcess().getNodes().forEach(node -> {
+ if(node.instruction != null){
+ addUrl(node.instruction);
+ }
+ });
+ });*/
return planList;
}
-}
+
+ public int addAssistant(String workId, String assistant) {
+ //鎵惧埌workId
+ StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
+ if (workLast == null) {
+ throw new RuntimeException("绯荤粺涓病鏈夊綋鍓嶇櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
+ }
+ BaUser userInfo = getUserInfo(assistant);
+ //褰撳墠鐧诲綍浜轰笉鑳芥槸杈呭姪浜哄憳
+ if (workLast.getUserId() == userInfo.getId()) {
+ throw new RuntimeException(userInfo.getName() + "鏄綋鍓嶇櫥褰曚汉鍛�,涓嶅繀娣诲姞涓鸿緟鍔╀汉鍛�.");
+ }
+ String userId = userInfo.getId().toString();
+ if (StringUtils.isBlank(workLast.getAssistants())) {
+ workLast.setAssistants(userId);
+ } else {
+ //宸茬粡娣诲姞鐨勮緟鍔╀汉鍛� 涓嶅繀閲嶅娣诲姞
+ String assistants = workLast.getAssistants();
+ String[] assistantArr = assistants.split(",");
+ for (String item : assistantArr) {
+ if (userId.equals(item)) {
+ throw new RuntimeException(userInfo.getName() + "宸茬粡娣诲姞涓鸿緟鍔╀汉鍛�,涓嶅繀閲嶅娣诲姞.");
+ }
+ }
+ workLast.setAssistants(assistants + "," + userId);
+ }
+ int count = assemblyWorkLastDao.updateByPrimaryKey(workLast);
+ return count;
+ }
+
+ public int removeAssistant(String workId, String assistant) {
+ //鎵惧埌workId
+ StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
+ if (workLast == null) {
+ throw new RuntimeException("绯荤粺涓病鏈夊綋鍓嶇櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
+ }
+ if ((!StringUtils.isBlank(assistant)) && assistant.startsWith(USER_PREFIX)) {
+ assistant = assistant.substring(3);
+ }
+ if (!StringUtils.isBlank(workLast.getAssistants())) {
+ StringBuilder sb = new StringBuilder();
+ String[] assistantArr = workLast.getAssistants().split(",");
+ for (String item : assistantArr) {
+ if ((!StringUtils.isBlank(assistant)) && (!assistant.equals(item))) {
+ sb.append(item).append(",");
+ }
+ }
+ String assistantStr = sb.length() > 0 ? sb.deleteCharAt(sb.length() - 1).toString() : "";
+ workLast.setAssistants(assistantStr);
+ }
+ int count = assemblyWorkLastDao.updateByPrimaryKey(workLast);
+ return count;
+ }
+
+ public List<BaUser> getAssistantList(String workId) {
+ //鎵惧埌workId
+ StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
+ if (workLast == null) {
+ throw new RuntimeException("绯荤粺涓病鏈夊綋鍓嶇櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
+ }
+ List<BaUser> assistantList = baUserDao.selectByAssistants(workLast.getAssistants());
+ return assistantList;
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0