Browse Source

1127

master
ruanqi 2 years ago
parent
commit
d7b3f32bae
  1. 43
      src/main/java/com/spring/modules/base/entity/PlmProcessControllBase.java
  2. 10
      src/main/java/com/spring/modules/base/entity/PlmProcessControllBaseData.java
  3. 12
      src/main/java/com/spring/modules/base/entity/PlmProcessControllBaseDataIn.java
  4. 17
      src/main/java/com/spring/modules/request/controller/RequestManageController.java
  5. 10
      src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java
  6. 7
      src/main/java/com/spring/modules/request/service/RequestManageService.java
  7. 21
      src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
  8. 21
      src/main/resources/mapper/request/RequestManageMapper.xml

43
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;
}
}

10
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;
}

12
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<PlmProcessControllBaseData> detailData;
}

17
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<PlmProcessControllBaseData> row1= requestManageService.getProcessControlList(inData);
List<PlmProcessControllBaseData> 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();
}
}

10
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<PlmRequestHeaderEntity>
void editNodeInfo(PlmRequestDetailVo inData);
void deleteRequestNodeAuthority(@Param("data") PlmRequestHeaderVo inData);
List<PlmProcessControllBaseData> getProcessControlList(PlmProcessControllBaseData inData);
List<PlmProcessControllBaseData> getProcessSelect(PlmProcessControllBaseData inData);
void deleteProcessControlList(PlmProcessControllBaseDataIn inData);
void saveProcessControlList(PlmProcessControllBaseData inData);
}

7
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<PlmProcessControllBaseData> getProcessControlList(PlmProcessControllBaseData inData);
List<PlmProcessControllBaseData> getProcessSelect(PlmProcessControllBaseData inData);
void saveProcessControlList(PlmProcessControllBaseDataIn inData);
}

21
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<RequestManageMapper, P
requestManageMapper.editNodeInfo(inData);
}
@Override
public List<PlmProcessControllBaseData> getProcessControlList(PlmProcessControllBaseData inData){
return requestManageMapper.getProcessControlList(inData);
}
@Override
public List<PlmProcessControllBaseData> getProcessSelect(PlmProcessControllBaseData inData){
return requestManageMapper.getProcessSelect(inData);
}
@Override
@Transactional
public void saveProcessControlList(PlmProcessControllBaseDataIn inData){
requestManageMapper.deleteProcessControlList(inData);
for (int i = 0; i <inData.getDetailData().size() ; i++) {
requestManageMapper.saveProcessControlList(inData.getDetailData().get(i));
}
}
}

21
src/main/resources/mapper/request/RequestManageMapper.xml

@ -333,4 +333,25 @@
update_by = #{updateBy}
where classification_no = #{classificationNo} and node_id = #{nodeId}
</update>
<select id="getProcessControlList" resultType="PlmProcessControllBaseData">
select role_id,workflow_id,remark,#{nodeId} as node_id ,#{site} as site
from plm_process_controll_base where workflow_id=#{workflowId}
</select>
<select id="getProcessSelect" resultType="PlmProcessControllBaseData">
select a.site,a.workflow_id,a.node_id,a.role_id,b.remark
from plm_process_controll_value a left join plm_process_controll_base b on
a.role_id=b.role_id and a.workflow_id=b.workflow_id
where b.remark is not null and a.site=#{site} and a.workflow_id=#{workflowId} and a.node_id=#{nodeId}
</select>
<delete id="deleteProcessControlList">
delete from plm_process_controll_value where site=#{site} and workflow_id=#{workflowId} and node_id=#{nodeId}
</delete>
<insert id="saveProcessControlList">
insert into plm_process_controll_value(site,workflow_id,node_id,role_id)
values (#{site},#{workflowId},#{nodeId},#{roleId})
</insert>
</mapper>
Loading…
Cancel
Save