From d7b3f32bae38d31d50d5b17abc441f1fb0c40474 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Fri, 22 Nov 2024 17:31:05 +0800 Subject: [PATCH] 1127 --- .../base/entity/PlmProcessControllBase.java | 43 +++++++++++++++++++ .../entity/PlmProcessControllBaseData.java | 10 +++++ .../entity/PlmProcessControllBaseDataIn.java | 12 ++++++ .../controller/RequestManageController.java | 17 ++++++++ .../request/mapper/RequestManageMapper.java | 10 +++++ .../request/service/RequestManageService.java | 7 +++ .../impl/RequestManageServiceImpl.java | 21 +++++++++ .../mapper/request/RequestManageMapper.xml | 21 +++++++++ 8 files changed, 141 insertions(+) create mode 100644 src/main/java/com/spring/modules/base/entity/PlmProcessControllBase.java create mode 100644 src/main/java/com/spring/modules/base/entity/PlmProcessControllBaseData.java create mode 100644 src/main/java/com/spring/modules/base/entity/PlmProcessControllBaseDataIn.java diff --git a/src/main/java/com/spring/modules/base/entity/PlmProcessControllBase.java b/src/main/java/com/spring/modules/base/entity/PlmProcessControllBase.java new file mode 100644 index 00000000..c5da376e --- /dev/null +++ b/src/main/java/com/spring/modules/base/entity/PlmProcessControllBase.java @@ -0,0 +1,43 @@ +package com.spring.modules.base.entity; + +public class PlmProcessControllBase { + /** + * + */ + private Integer roleId; + + /** + * + */ + private String workflowId; + + /** + * + */ + private String remark; + + public Integer getRoleId() { + return roleId; + } + + public void setRoleId(Integer roleId) { + this.roleId = roleId; + } + + public String getWorkflowId() { + return workflowId; + } + + public void setWorkflowId(String workflowId) { + this.workflowId = workflowId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } +} + diff --git a/src/main/java/com/spring/modules/base/entity/PlmProcessControllBaseData.java b/src/main/java/com/spring/modules/base/entity/PlmProcessControllBaseData.java new file mode 100644 index 00000000..591608f6 --- /dev/null +++ b/src/main/java/com/spring/modules/base/entity/PlmProcessControllBaseData.java @@ -0,0 +1,10 @@ +package com.spring.modules.base.entity; + +import lombok.Data; +import org.apache.ibatis.type.Alias; +@Data +@Alias("PlmProcessControllBaseData") +public class PlmProcessControllBaseData extends PlmProcessControllBase{ + private String site; + private String nodeId; +} diff --git a/src/main/java/com/spring/modules/base/entity/PlmProcessControllBaseDataIn.java b/src/main/java/com/spring/modules/base/entity/PlmProcessControllBaseDataIn.java new file mode 100644 index 00000000..d15ff68b --- /dev/null +++ b/src/main/java/com/spring/modules/base/entity/PlmProcessControllBaseDataIn.java @@ -0,0 +1,12 @@ +package com.spring.modules.base.entity; + +import lombok.Data; + +import java.util.List; +@Data +public class PlmProcessControllBaseDataIn { + private String site; + private String nodeId; + private String workflowId; + private List detailData; +} diff --git a/src/main/java/com/spring/modules/request/controller/RequestManageController.java b/src/main/java/com/spring/modules/request/controller/RequestManageController.java index 2693b332..b30f340b 100644 --- a/src/main/java/com/spring/modules/request/controller/RequestManageController.java +++ b/src/main/java/com/spring/modules/request/controller/RequestManageController.java @@ -2,6 +2,8 @@ package com.spring.modules.request.controller; import com.spring.common.utils.PageUtils; import com.spring.common.utils.R; +import com.spring.modules.base.entity.PlmProcessControllBaseData; +import com.spring.modules.base.entity.PlmProcessControllBaseDataIn; import com.spring.modules.request.entity.PlmFieldData; import com.spring.modules.request.entity.TableData; import com.spring.modules.request.service.RequestManageService; @@ -201,4 +203,19 @@ public class RequestManageController { return R.ok(); } + @PostMapping(value="/getProcessControlList") + @ResponseBody + public R getProcessControlList(@RequestBody PlmProcessControllBaseData inData){ + List row1= requestManageService.getProcessControlList(inData); + List row2= requestManageService.getProcessSelect(inData); + return R.ok().put("rows",row1).put("select",row2); + } + + + @PostMapping(value="/saveProcessControlList") + @ResponseBody + public R saveProcessControlList(@RequestBody PlmProcessControllBaseDataIn inData){ + requestManageService.saveProcessControlList(inData); + return R.ok(); + } } diff --git a/src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java b/src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java index f786bad4..e6babd7c 100644 --- a/src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java +++ b/src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java @@ -3,6 +3,8 @@ package com.spring.modules.request.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.modules.base.entity.PlmProcessControllBaseData; +import com.spring.modules.base.entity.PlmProcessControllBaseDataIn; import com.spring.modules.request.entity.PlmFieldData; import com.spring.modules.request.entity.PlmRequestDetailEntity; import com.spring.modules.request.entity.PlmRequestHeaderEntity; @@ -141,4 +143,12 @@ public interface RequestManageMapper extends BaseMapper void editNodeInfo(PlmRequestDetailVo inData); void deleteRequestNodeAuthority(@Param("data") PlmRequestHeaderVo inData); + + List getProcessControlList(PlmProcessControllBaseData inData); + List getProcessSelect(PlmProcessControllBaseData inData); + + void deleteProcessControlList(PlmProcessControllBaseDataIn inData); + + void saveProcessControlList(PlmProcessControllBaseData inData); + } diff --git a/src/main/java/com/spring/modules/request/service/RequestManageService.java b/src/main/java/com/spring/modules/request/service/RequestManageService.java index 1afd23fd..40d1e589 100644 --- a/src/main/java/com/spring/modules/request/service/RequestManageService.java +++ b/src/main/java/com/spring/modules/request/service/RequestManageService.java @@ -1,6 +1,8 @@ package com.spring.modules.request.service; import com.spring.common.utils.PageUtils; +import com.spring.modules.base.entity.PlmProcessControllBaseData; +import com.spring.modules.base.entity.PlmProcessControllBaseDataIn; import com.spring.modules.request.entity.PlmFieldData; import com.spring.modules.request.entity.TableData; import com.spring.modules.request.vo.PlmRequestDetailVo; @@ -90,4 +92,9 @@ public interface RequestManageService { void saveAuthorityList(TableData inData); void editNodeInfo(PlmRequestDetailVo inData); + + List getProcessControlList(PlmProcessControllBaseData inData); + List getProcessSelect(PlmProcessControllBaseData inData); + + void saveProcessControlList(PlmProcessControllBaseDataIn inData); } diff --git a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java index a9e00345..dcd645df 100644 --- a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java +++ b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java @@ -4,6 +4,8 @@ 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.spring.common.utils.PageUtils; +import com.spring.modules.base.entity.PlmProcessControllBaseData; +import com.spring.modules.base.entity.PlmProcessControllBaseDataIn; import com.spring.modules.base.service.TransNoControlService; import com.spring.modules.request.entity.PlmFieldData; import com.spring.modules.request.entity.PlmRequestDetailEntity; @@ -237,4 +239,23 @@ public class RequestManageServiceImpl extends ServiceImpl getProcessControlList(PlmProcessControllBaseData inData){ + return requestManageMapper.getProcessControlList(inData); + } + + @Override + public List getProcessSelect(PlmProcessControllBaseData inData){ + return requestManageMapper.getProcessSelect(inData); + } + + @Override + @Transactional + public void saveProcessControlList(PlmProcessControllBaseDataIn inData){ + requestManageMapper.deleteProcessControlList(inData); + for (int i = 0; i + + + + + + + delete from plm_process_controll_value where site=#{site} and workflow_id=#{workflowId} and node_id=#{nodeId} + + + insert into plm_process_controll_value(site,workflow_id,node_id,role_id) + values (#{site},#{workflowId},#{nodeId},#{roleId}) + +