From fdc18099b0df30e87923271bf8945de0ab2aa13b Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 26 六月 2024 15:43:10 +0800
Subject: [PATCH] assistant CRUD
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java | 8 ++
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java | 2
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoBa/BaUserMapper.java | 2
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java | 48 ++++++++++++
pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml | 17 ++++
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 126 ++++++++++++++++++++++++++-----
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml | 2
7 files changed, 182 insertions(+), 23 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoBa/BaUserMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoBa/BaUserMapper.java
index 9de3067..efda1a5 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoBa/BaUserMapper.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoBa/BaUserMapper.java
@@ -49,4 +49,6 @@
*/
int deleteLogicById(Long id);
+ List<BaUser> selectByAssistants(String assistants) ;
+
}
\ No newline at end of file
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
index c430029..95678f7 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
@@ -5,12 +5,17 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
+import com.dy.pmsGlobal.pojoBa.BaUser;
+import com.dy.pmsGlobal.pojoPr.PrProductionNode;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.*;
import java.util.Date;
+import java.util.List;
/**
* 鐢熶骇绾跨敓浜т换鍔¤棰嗚〃
@@ -106,5 +111,8 @@
*/
public String assistants;
+ @TableField(exist = false)
+ public List<BaUser> assistantsList;
+
}
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
index d87f8ca..15c4e52 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
@@ -55,6 +55,23 @@
select name from ba_user where id=#{id}
</select>
+ <select id="selectByAssistants" resultMap="BaseResultMap">
+ SELECT
+ *
+ FROM
+ ba_user
+ WHERE
+ id IN (
+ SELECT
+ SUBSTRING_INDEX( SUBSTRING_INDEX( #{assistants,jdbcType=VARCHAR}, ',', help_topic_id + 1 ), ',',- 1 ) AS num
+ FROM
+ mysql.help_topic
+ WHERE
+ help_topic_id <![CDATA[ < ]]> LENGTH( #{assistants,jdbcType=VARCHAR} )- LENGTH(
+ REPLACE ( #{assistants,jdbcType=VARCHAR}, ',', '' ))+ 1
+ )
+ </select>
+
<select id="selectCount" resultType="java.lang.Long">
select
count(*)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
index 44d81c0..1e9f4cf 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
@@ -29,6 +29,8 @@
select="com.dy.pmsGlobal.daoPr.PrProductionNodeMapper.selectNameByNodeId" fetchType="eager" />
<association property="lineName" column="line_id" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoPlt.PltProductionLineMapper.selectNameByLineId" fetchType="eager" />
+ <collection property="assistantsList" ofType="com.dy.pmsGlobal.pojoBa.BaUser"
+ select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectByAssistants" fetchType="eager" column="assistants" />
</resultMap>
<sql id="Base_Column_List">
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
index d5abea5..5a6471c 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
@@ -17,7 +17,7 @@
@Builder
public class QueryVo {
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long id;
+ public Long workId;
/**
* 鐢ㄦ埛瀹炰綋缂栧彿
*/
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
index 5cd430b..96d7076 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
@@ -105,6 +105,54 @@
return BaseResponseUtils.buildSuccess(true);
}
}
+ /**
+ * 娣诲姞鍗曚釜杈呭姪浜哄憳
+ * @param
+ * @return
+ */
+ @PostMapping(path="addAssistant")
+ public BaseResponse<Boolean> addAssistant(String workId ,String assistant){
+ int count = sv.addAssistant(workId,assistant);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
+ }
+ /**
+ * 鍒犻櫎鍗曚釜杈呭姪浜哄憳
+ * @param
+ * @return
+ */
+ @PostMapping(path="removeAssistant")
+ public BaseResponse<Boolean> removeAssistant(String workId ,String assistant){
+ int count = sv.removeAssistant(workId,assistant);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
+ }
+ /**
+ * 鏌ヨ杈呭姪浜哄憳淇℃伅琛�
+ * @param
+ * @return
+ */
+ @PostMapping(path="updateAssistant")
+ public BaseResponse<List<BaUser>> getAssistantList(String workId){
+ List<BaUser> result = sv.getAssistantList(workId);
+ return BaseResponseUtils.buildSuccess(result);
+ }
+ /**
+ * 淇濆瓨鐧诲綍淇℃伅
+ * @param
+ * @return
+ */
+ @PostMapping(path="updateAssistant")
+ public BaseResponse<List<BaUser>> updateAssistant(@RequestBody QueryVo vo){
+ List<BaUser> result = sv.updateAssistant(vo);
+ return BaseResponseUtils.buildSuccess(result);
+ }
@GetMapping(path = "test")
public BaseResponse test() {
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 cc7d0e4..7f9c863 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
@@ -133,30 +133,30 @@
return result;
}
- public StaAssemblyWorkLast checkUserAndStationUsed(QueryVo last){
+ public StaAssemblyWorkLast checkUserAndStationUsed(QueryVo vo){
StaAssemblyWorkLast result = new StaAssemblyWorkLast();
PltStation stationInfo = null;
BaUser userInfo = null;
- if(StringUtils.isBlank(last.getStationId()) || StringUtils.isBlank(last.getUserId())){
+ if(StringUtils.isBlank(vo.getStationId()) || StringUtils.isBlank(vo.getUserId())){
throw new RuntimeException("宸ョ珯缂栫爜鎴栧憳宸ョ紪鐮佸潎涓嶈兘涓虹┖,璇锋鏌�");
}
//宸ョ珯103
- if(last.getStationId().startsWith("101")){
- userInfo = getUserInfo(last.getStationId());
+ if(vo.getStationId().startsWith("101")){
+ userInfo = getUserInfo(vo.getStationId());
}else{
- stationInfo = getStationInfo(last.getStationId());
+ stationInfo = getStationInfo(vo.getStationId());
}
- if(last.getUserId().startsWith("103")){
- stationInfo = getStationInfo(last.getUserId());
+ if(vo.getUserId().startsWith("103")){
+ stationInfo = getStationInfo(vo.getUserId());
}else{
- userInfo = getUserInfo(last.getUserId());
+ userInfo = getUserInfo(vo.getUserId());
}
if(userInfo == null && stationInfo == null){
- throw new RuntimeException("鍛樺伐缂栫爜:"+ last.getUserId() + "鍜屽伐绔欑紪鐮�:" + last.getStationId() + "涓嶆纭�,璇锋鏌�");
+ throw new RuntimeException("鍛樺伐缂栫爜:"+ vo.getUserId() + "鍜屽伐绔欑紪鐮�:" + vo.getStationId() + "涓嶆纭�,璇锋鏌�");
}else if(userInfo == null){
- throw new RuntimeException("鍛樺伐缂栫爜:"+ last.getUserId() + "涓嶆纭�,璇锋鏌�");
+ throw new RuntimeException("鍛樺伐缂栫爜:"+ vo.getUserId() + "涓嶆纭�,璇锋鏌�");
}else if(stationInfo == null){
- throw new RuntimeException("宸ョ珯缂栫爜:" + last.getStationId() + "涓嶆纭�,璇锋鏌�");
+ throw new RuntimeException("宸ョ珯缂栫爜:" + vo.getStationId() + "涓嶆纭�,璇锋鏌�");
}
//妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
StaAssemblyWorkLast param = new StaAssemblyWorkLast();
@@ -181,29 +181,29 @@
return result;
}
@Transactional
- public StaAssemblyWorkLast save(QueryVo last) {
+ public StaAssemblyWorkLast save(QueryVo vo) {
//鍏坈heck
- StaAssemblyWorkLast checkResult = checkUserAndStationUsed(last);
+ StaAssemblyWorkLast checkResult = checkUserAndStationUsed(vo);
//鏍￠獙planId processId nodeId
PrAssemblyPlan params = new PrAssemblyPlan();
params.setStatus(1);
- params.setId(last.getPlanId());
- params.setProcessId(last.getProcessId());
+ params.setId(vo.getPlanId());
+ params.setProcessId(vo.getProcessId());
List<PrAssemblyPlan> planList = selectAssyPlanList(params);
boolean hasNodeId= planList.stream()
.flatMap(process -> process.nodes.stream())
- .anyMatch(node -> node.id.equals(last.getNodeId()));
+ .anyMatch(node -> node.id.equals(vo.getNodeId()));
if(!hasNodeId){
throw new RuntimeException("鑺傜偣淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇烽噸鏂伴�夋嫨鑺傜偣淇℃伅");
}
- last.setLineId(checkResult.getLineId());
+ vo.setLineId(checkResult.getLineId());
StaAssemblyWorkLast staLast = new StaAssemblyWorkLast();
- BeanUtils.copyProperties(last,staLast);
+ BeanUtils.copyProperties(vo,staLast);
staLast.setUserId(checkResult.getUserId());
staLast.setStationId(checkResult.getStationId());
int count = 0;
if(checkResult.getId() == null){
- BeanUtils.copyProperties(last,staLast);
+ BeanUtils.copyProperties(vo,staLast);
staLast.setUserId(checkResult.getUserId());
staLast.setStationId(checkResult.getStationId());
staLast.setStatus(1);
@@ -212,9 +212,9 @@
}else{
//淇濆瓨涓�鏉istory?
BeanUtils.copyProperties(checkResult,staLast);
- staLast.setPlanId(last.getPlanId());
- staLast.setProcessId(last.getProcessId());
- staLast.setNodeId(last.getNodeId());
+ staLast.setPlanId(vo.getPlanId());
+ staLast.setProcessId(vo.getProcessId());
+ staLast.setNodeId(vo.getNodeId());
staLast.setStatus(1);
staLast.setStartTime(new Date());
count = assemblyWorkLastDao.updateByPrimaryKeySelective(staLast);
@@ -268,4 +268,86 @@
ins.orgName = file.orgName;
ins.extName = file.extName;
}
+ //workId assistants 浼犵殑鏄崟涓殑userId 蹇呬紶鍙傛暟
+ public List<BaUser> updateAssistant(QueryVo vo) {
+ //鎵惧埌workId
+ StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(vo.getWorkId());
+ if(workLast == null){
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
+ }
+ //濡傛灉assistants 鏈�101 鍒欏垹鎺�
+ StringBuilder sb = new StringBuilder();
+ String[] assistantArr = vo.getAssistants().split(",");
+ for (String item : assistantArr) {
+ if(item.startsWith("101")){
+ sb.append(item.substring(3)).append(",");
+ }else{
+ sb.append(item).append(",");
+ }
+ }
+ String assistantStr = assistantArr.length > 0 ? sb.deleteCharAt(sb.length() - 1).toString() : "";
+ List<BaUser> userInfo = baUserDao.selectByAssistants(vo.getAssistants());
+ return userInfo;
+ }
+
+ 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("101")){
+ 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