绩效考核 还没做完

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/controller/ItdmRunFlowPathStepController.java

@@ -9,9 +9,14 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import lombok.Getter;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.flowpath.dto.ItdmRejectDQRunFlowPath;
+import org.jeecg.modules.flowpath.dto.ItdmRejectZDRunFlowPath;
+import org.jeecg.modules.flowpath.dto.ItdmSaveRunFlowPath;
 import org.jeecg.modules.flowpath.entity.ItdmRunFlowPathStep;
 import org.jeecg.modules.flowpath.service.IItdmRunFlowPathStepService;
 
@@ -20,6 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.flowpath.vo.ItdmBuohuiRunFlowPathStepVO;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -72,20 +78,7 @@ public class ItdmRunFlowPathStepController extends JeecgController<ItdmRunFlowPa
 		return Result.OK(pageList);
 	}
 	
-	/**
-	 *   添加
-	 *
-	 * @param itdmRunFlowPathStep
-	 * @return
-	 */
-	@AutoLog(value = "运行流程步骤表-添加")
-	@ApiOperation(value="运行流程步骤表-添加", notes="运行流程步骤表-添加")
-	//@RequiresPermissions("org.jeecg.modules:itdm_run_flow_path_step:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody ItdmRunFlowPathStep itdmRunFlowPathStep) {
-		itdmRunFlowPathStepService.save(itdmRunFlowPathStep);
-		return Result.OK("添加成功！");
-	}
+
 	
 	/**
 	 *  编辑
@@ -93,85 +86,76 @@ public class ItdmRunFlowPathStepController extends JeecgController<ItdmRunFlowPa
 	 * @param itdmRunFlowPathStep
 	 * @return
 	 */
-	@AutoLog(value = "运行流程步骤表-编辑")
-	@ApiOperation(value="运行流程步骤表-编辑", notes="运行流程步骤表-编辑")
+	@AutoLog(value = "运行流程步骤表-保存")
+	@ApiOperation(value="运行流程步骤表-保存", notes="运行流程步骤表-保存")
 	//@RequiresPermissions("org.jeecg.modules:itdm_run_flow_path_step:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody ItdmRunFlowPathStep itdmRunFlowPathStep) {
-		itdmRunFlowPathStepService.updateById(itdmRunFlowPathStep);
+	@PostMapping(value = "/save")
+	public Result<String> saveData(@RequestBody ItdmSaveRunFlowPath itdmRunFlowPathStep) {
+		itdmRunFlowPathStepService.saveData(itdmRunFlowPathStep);
 		return Result.OK("编辑成功!");
 	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "运行流程步骤表-通过id删除")
-	@ApiOperation(value="运行流程步骤表-通过id删除", notes="运行流程步骤表-通过id删除")
-	//@RequiresPermissions("org.jeecg.modules:itdm_run_flow_path_step:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		itdmRunFlowPathStepService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "运行流程步骤表-批量删除")
-	@ApiOperation(value="运行流程步骤表-批量删除", notes="运行流程步骤表-批量删除")
-	//@RequiresPermissions("org.jeecg.modules:itdm_run_flow_path_step:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.itdmRunFlowPathStepService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "运行流程步骤表-通过id查询")
-	@ApiOperation(value="运行流程步骤表-通过id查询", notes="运行流程步骤表-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<ItdmRunFlowPathStep> queryById(@RequestParam(name="id",required=true) String id) {
-		ItdmRunFlowPathStep itdmRunFlowPathStep = itdmRunFlowPathStepService.getById(id);
-		if(itdmRunFlowPathStep==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(itdmRunFlowPathStep);
-	}
 
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param itdmRunFlowPathStep
-    */
-    //@RequiresPermissions("org.jeecg.modules:itdm_run_flow_path_step:exportXls")
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, ItdmRunFlowPathStep itdmRunFlowPathStep) {
-        return super.exportXls(request, itdmRunFlowPathStep, ItdmRunFlowPathStep.class, "运行流程步骤表");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    //@RequiresPermissions("itdm_run_flow_path_step:importExcel")
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, ItdmRunFlowPathStep.class);
-    }
-
-}
+
+	 /**
+	  *  编辑
+	  *
+	  * @param itdmRunFlowPathStep
+	  * @return
+	  */
+	 @AutoLog(value = "运行流程步骤表-通过")
+	 @ApiOperation(value="运行流程步骤表-通过", notes="运行流程步骤表-通过")
+	 //@RequiresPermissions("org.jeecg.modules:itdm_run_flow_path_step:edit")
+	 @PostMapping(value = "/pass")
+	 public Result<String> pass(@RequestBody ItdmSaveRunFlowPath itdmRunFlowPathStep) {
+		 itdmRunFlowPathStepService.pass(itdmRunFlowPathStep);
+		 return Result.OK("编辑成功!");
+	 }
+
+
+
+	 /**
+	  *  编辑
+	  *
+	  * @param itdmRunFlowPathStep
+	  * @return
+	  */
+	 @AutoLog(value = "运行流程步骤表-驳回到上一节点")
+	 @ApiOperation(value="运行流程步骤表-驳回到上一节点", notes="运行流程步骤表-驳回到上一节点")
+	 //@RequiresPermissions("org.jeecg.modules:itdm_run_flow_path_step:edit")
+	 @PostMapping(value = "/rejectDQ")
+	 public Result<String> RejectDQ(@RequestBody ItdmRejectDQRunFlowPath itdmRunFlowPathStep) {
+		 itdmRunFlowPathStepService.rejectDQ(itdmRunFlowPathStep);
+		 return Result.OK("编辑成功!");
+	 }
+
+
+
+
+	 @AutoLog(value = "运行流程步骤表-当前流程当前执行中之前的节点")
+	 @ApiOperation(value="运行流程步骤表-当前流程当前执行中之前的节点", notes="运行流程步骤表-当前流程当前执行中之前的节点")
+	 @GetMapping("yrunList")
+	 public  Result<List<ItdmBuohuiRunFlowPathStepVO>> yrunList(String runFlowPath) {
+
+		 return Result.OK( itdmRunFlowPathStepService.yrunList(runFlowPath));
+	 }
+
+
+
+	 /**
+	  *  编辑
+	  *
+	  * @param itdmRunFlowPathStep
+	  * @return
+	  */
+	 @AutoLog(value = "运行流程步骤表-驳回到指定节点")
+	 @ApiOperation(value="运行流程步骤表-驳回到指定节点", notes="运行流程步骤表-驳回到指定节点")
+	 //@RequiresPermissions("org.jeecg.modules:itdm_run_flow_path_step:edit")
+	 @PostMapping(value = "/rejectzd")
+	 public Result<String> rejectzd(@RequestBody ItdmRejectZDRunFlowPath itdmRunFlowPathStep) {
+		 itdmRunFlowPathStepService.rejectzd(itdmRunFlowPathStep);
+		 return Result.OK("编辑成功!");
+	 }
+
+
+
+ }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/convert/FlowPathConvert.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.flowpath.convert;
 
 import org.jeecg.modules.flowpath.entity.ItdmFlowPathStep;
 import org.jeecg.modules.flowpath.entity.ItdmRunFlowPathStep;
+import org.jeecg.modules.flowpath.vo.ItdmBuohuiRunFlowPathStepVO;
 import org.jeecg.modules.flowpath.vo.ItdmRunFlowPathStepVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
@@ -30,4 +31,7 @@ public interface FlowPathConvert {
 
 
     ItdmRunFlowPathStepVO to(ItdmRunFlowPathStep step, Boolean isUpdate);
+
+
+    ItdmBuohuiRunFlowPathStepVO to(ItdmRunFlowPathStep step);
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/dto/ItdmRejectDQRunFlowPath.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.flowpath.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ItdmRejectDQRunFlowPath {
+    @ApiModelProperty(value = "运行流程id")
+    private String runFlowPath;
+
+    @ApiModelProperty(value = "原因")
+
+    private String yuanyin;
+
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/dto/ItdmRejectZDRunFlowPath.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.flowpath.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ItdmRejectZDRunFlowPath {
+    @ApiModelProperty(value = "运行流程id")
+    private String runFlowPath;
+
+
+    @ApiModelProperty(value = "运行流程步骤id")
+    private String runFlowPathSept;
+
+    @ApiModelProperty(value = "原因")
+
+    private String yuanyin;
+
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/dto/ItdmSaveRunFlowPath.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.flowpath.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ItdmSaveRunFlowPath {
+    @ApiModelProperty(value = "主键id")
+    private String id;
+
+
+
+
+    @ApiModelProperty(value = "保存数据")
+    private java.lang.String saveData;
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/entity/ItdmRunFlowPathLog.java

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 运行流程步骤日志
  * @Author: jeecg-boot
- * @Date:   2023-07-20
+ * @Date:   2023-07-21
  * @Version: V1.0
  */
 @Data
@@ -39,7 +39,15 @@ public class ItdmRunFlowPathLog implements Serializable {
 	/**流程id*/
 	@Excel(name = "流程id", width = 15)
     @ApiModelProperty(value = "流程id")
-    private String flowPath;
+    private String runFlowPath;
+	/**当前步骤id*/
+	@Excel(name = "当前步骤id", width = 15)
+    @ApiModelProperty(value = "当前步骤id")
+    private String runFlowPathSetp;
+	/**当前步骤名称*/
+	@Excel(name = "当前步骤名称", width = 15)
+    @ApiModelProperty(value = "当前步骤名称")
+    private String runFlowPathSetpName;
 	/**描述*/
 	@Excel(name = "描述", width = 15)
     @ApiModelProperty(value = "描述")
@@ -48,15 +56,23 @@ public class ItdmRunFlowPathLog implements Serializable {
 	@Excel(name = "顺序", width = 15)
     @ApiModelProperty(value = "顺序")
     private String sort;
-	/**当前步骤id*/
-	@Excel(name = "当前步骤id", width = 15)
-    @ApiModelProperty(value = "当前步骤id")
-    private String dqStep;
 	/**执行人*/
 	@Excel(name = "执行人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
 	@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
     @ApiModelProperty(value = "执行人")
     private String fqUser;
+	/**下一个节点*/
+	@Excel(name = "下一个节点", width = 15)
+    @ApiModelProperty(value = "下一个节点")
+    private String xiaRunFlowPathSetp;
+	/**下一个节点名称*/
+	@Excel(name = "下一个节点名称", width = 15)
+    @ApiModelProperty(value = "下一个节点名称")
+    private String xiaRunFlowPathSetpName;
+	/**类型*/
+	@Excel(name = "类型", width = 15)
+    @ApiModelProperty(value = "类型")
+    private String type;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/service/IItdmRunFlowPathStepService.java

@@ -1,7 +1,14 @@
 package org.jeecg.modules.flowpath.service;
 
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.flowpath.dto.ItdmRejectDQRunFlowPath;
+import org.jeecg.modules.flowpath.dto.ItdmRejectZDRunFlowPath;
+import org.jeecg.modules.flowpath.dto.ItdmSaveRunFlowPath;
 import org.jeecg.modules.flowpath.entity.ItdmRunFlowPathStep;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.flowpath.vo.ItdmBuohuiRunFlowPathStepVO;
+
+import java.util.List;
 
 /**
  * @Description: 运行流程步骤表
@@ -11,4 +18,15 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IItdmRunFlowPathStepService extends IService<ItdmRunFlowPathStep> {
 
+
+    void saveData(ItdmSaveRunFlowPath saveRunFlowPath);
+
+
+    void pass(ItdmSaveRunFlowPath saveRunFlowPath);
+
+    void rejectDQ(ItdmRejectDQRunFlowPath itdmRejectDQRunFlowPath);
+
+    void rejectzd(ItdmRejectZDRunFlowPath zdRunFlowPath);
+
+    public List<ItdmBuohuiRunFlowPathStepVO> yrunList(String runFlowPath);
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/service/impl/ItdmFZRunFlowPathLogService.java

@@ -0,0 +1,60 @@
+package org.jeecg.modules.flowpath.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.flowpath.entity.ItdmRunFlowPath;
+import org.jeecg.modules.flowpath.entity.ItdmRunFlowPathLog;
+import org.jeecg.modules.flowpath.entity.ItdmRunFlowPathStep;
+import org.jeecg.modules.flowpath.mapper.ItdmRunFlowPathLogMapper;
+import org.jeecg.modules.flowpath.mapper.ItdmRunFlowPathMapper;
+import org.jeecg.modules.flowpath.mapper.ItdmRunFlowPathStepMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description: 运行流程步骤表
+ * @Author: jeecg-boot
+ * @Date:   2023-07-20
+ * @Version: V1.0
+ */
+@Service
+public class ItdmFZRunFlowPathLogService {
+
+    @Autowired
+    @SuppressWarnings("all")
+    private ItdmRunFlowPathLogMapper logMapper;
+    @Autowired
+    @SuppressWarnings("all")
+    private ItdmRunFlowPathStepMapper stepMapper;
+
+    public void insert(String runFlowPath, String dqRunflowpathSept, String nextstep, String type,String miaoshu) {
+
+        List<ItdmRunFlowPathLog> list = logMapper.selectList(Wrappers.lambdaQuery(ItdmRunFlowPathLog.class)
+                .eq(ItdmRunFlowPathLog::getRunFlowPath, runFlowPath));
+
+        int sort = CollectionUtils.isEmpty(list) ? 1 : list.stream().mapToInt(i -> Integer.parseInt(i.getSort())).max().orElse(1) + 1;
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        ItdmRunFlowPathLog itdmRunFlowPathLog = new ItdmRunFlowPathLog();
+
+
+        ItdmRunFlowPathStep dqSept = stepMapper.selectById(dqRunflowpathSept);
+        ItdmRunFlowPathStep nextSept = stepMapper.selectById(nextstep);
+
+        itdmRunFlowPathLog.setRunFlowPath(runFlowPath);
+        itdmRunFlowPathLog.setRunFlowPathSetp(dqRunflowpathSept);
+        itdmRunFlowPathLog.setRunFlowPathSetpName(dqSept.getName());
+        itdmRunFlowPathLog.setMiaoshu(miaoshu);
+        itdmRunFlowPathLog.setSort(sort + "");
+        itdmRunFlowPathLog.setFqUser(user.getUsername());
+        itdmRunFlowPathLog.setXiaRunFlowPathSetp(nextstep);
+        itdmRunFlowPathLog.setXiaRunFlowPathSetpName(nextSept.getName());
+        itdmRunFlowPathLog.setType(type);
+
+        logMapper.insert(itdmRunFlowPathLog);
+    }
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/service/impl/ItdmRunFlowPathStepServiceImpl.java

@@ -1,11 +1,28 @@
 package org.jeecg.modules.flowpath.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.flowpath.convert.FlowPathConvert;
+import org.jeecg.modules.flowpath.dto.ItdmRejectDQRunFlowPath;
+import org.jeecg.modules.flowpath.dto.ItdmRejectZDRunFlowPath;
+import org.jeecg.modules.flowpath.dto.ItdmSaveRunFlowPath;
+import org.jeecg.modules.flowpath.entity.ItdmRunFlowPath;
+import org.jeecg.modules.flowpath.entity.ItdmRunFlowPathLog;
 import org.jeecg.modules.flowpath.entity.ItdmRunFlowPathStep;
+import org.jeecg.modules.flowpath.mapper.ItdmRunFlowPathLogMapper;
+import org.jeecg.modules.flowpath.mapper.ItdmRunFlowPathMapper;
 import org.jeecg.modules.flowpath.mapper.ItdmRunFlowPathStepMapper;
 import org.jeecg.modules.flowpath.service.IItdmRunFlowPathStepService;
+import org.jeecg.modules.flowpath.vo.ItdmBuohuiRunFlowPathStepVO;
+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 java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 运行流程步骤表
@@ -16,4 +33,104 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ItdmRunFlowPathStepServiceImpl extends ServiceImpl<ItdmRunFlowPathStepMapper, ItdmRunFlowPathStep> implements IItdmRunFlowPathStepService {
 
+
+    @Autowired
+    @SuppressWarnings("all")
+    private ItdmRunFlowPathMapper itdmRunFlowPathMapper;
+
+    @Autowired
+    @SuppressWarnings("all")
+    private ItdmRunFlowPathLogMapper logMapper;
+
+
+    private ItdmFZRunFlowPathLogService logService;
+
+    @Override
+    public void saveData(ItdmSaveRunFlowPath saveRunFlowPath) {
+
+        ItdmRunFlowPathStep itdmRunFlowPathStep = new ItdmRunFlowPathStep();
+        itdmRunFlowPathStep.setId(saveRunFlowPath.getId());
+        itdmRunFlowPathStep.setSaveData(saveRunFlowPath.getSaveData());
+
+        this.baseMapper.updateById(itdmRunFlowPathStep);
+
+    }
+
+    @Override
+    @Transactional
+    public void pass(ItdmSaveRunFlowPath saveRunFlowPath) {
+
+        ItdmRunFlowPathStep select = this.baseMapper.selectById(saveRunFlowPath.getId());
+        select.setSaveData(saveRunFlowPath.getSaveData());
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        select.setFqUser(user.getUsername());
+        this.baseMapper.updateById(select);
+        ItdmRunFlowPathStep nextstep = this.baseMapper.selectOne(Wrappers.lambdaQuery(ItdmRunFlowPathStep.class)
+                .eq(ItdmRunFlowPathStep::getRunFlowPath, select.getRunFlowPath())
+                .eq(ItdmRunFlowPathStep::getSort, Integer.parseInt(select.getSort()) + 1)
+
+        );
+        ItdmRunFlowPath itdmRunFlowPath = new ItdmRunFlowPath();
+        itdmRunFlowPath.setId(select.getRunFlowPath());
+        itdmRunFlowPath.setDqSetp(nextstep.getFlowPathSetp());
+        itdmRunFlowPathMapper.updateById(itdmRunFlowPath);
+
+        logService.insert(select.getRunFlowPath(), select.getId(), nextstep.getId(), "通过", "");
+
+    }
+
+
+    @Override
+    public void rejectDQ(ItdmRejectDQRunFlowPath itdmRejectDQRunFlowPath) {
+        ItdmRunFlowPath itdmRunFlowPath = this.itdmRunFlowPathMapper.selectById(itdmRejectDQRunFlowPath.getRunFlowPath());
+        ItdmRunFlowPathStep select = this.baseMapper.selectOne(Wrappers.lambdaQuery(ItdmRunFlowPathStep.class)
+                .eq(ItdmRunFlowPathStep::getRunFlowPath, itdmRunFlowPath.getId())
+                .eq(ItdmRunFlowPathStep::getFlowPathSetp, itdmRunFlowPath.getDqSetp())
+
+        );
+
+
+        ItdmRunFlowPathStep prvestep = this.baseMapper.selectOne(Wrappers.lambdaQuery(ItdmRunFlowPathStep.class)
+                .eq(ItdmRunFlowPathStep::getRunFlowPath, select.getRunFlowPath())
+                .eq(ItdmRunFlowPathStep::getSort, Integer.parseInt(select.getSort()) -1)
+
+        );
+
+        itdmRunFlowPath.setDqSetp(prvestep.getFlowPathSetp());
+
+
+        itdmRunFlowPathMapper.updateById(itdmRunFlowPath);
+        logService.insert(select.getRunFlowPath(), select.getId(), prvestep.getId(), "驳回上一节点", itdmRejectDQRunFlowPath.getYuanyin());
+
+    }
+
+
+    @Override
+    public List<ItdmBuohuiRunFlowPathStepVO> yrunList(String runFlowPath) {
+        ItdmRunFlowPath itdmRunFlowPath = this.itdmRunFlowPathMapper.selectById(runFlowPath);
+        ItdmRunFlowPathStep select = this.baseMapper.selectOne(Wrappers.lambdaQuery(ItdmRunFlowPathStep.class)
+                .eq(ItdmRunFlowPathStep::getRunFlowPath, itdmRunFlowPath.getId())
+                .eq(ItdmRunFlowPathStep::getFlowPathSetp, itdmRunFlowPath.getDqSetp())
+
+        );
+        List<ItdmRunFlowPathStep> prvestep = this.baseMapper.selectList(Wrappers.lambdaQuery(ItdmRunFlowPathStep.class)
+                .eq(ItdmRunFlowPathStep::getRunFlowPath, select.getRunFlowPath())
+                .lt(ItdmRunFlowPathStep::getSort, Integer.parseInt(select.getSort()))
+
+        );
+
+        return prvestep.stream().map(FlowPathConvert.INSTANCE::to).collect(Collectors.toList());
+    }
+
+
+    @Override
+    public void rejectzd(ItdmRejectZDRunFlowPath zdRunFlowPath) {
+        ItdmRunFlowPath itdmRunFlowPath = this.itdmRunFlowPathMapper.selectById(zdRunFlowPath.getRunFlowPath());
+        ItdmRunFlowPathStep prvestep = this.baseMapper.selectById(zdRunFlowPath.getRunFlowPathSept());
+        itdmRunFlowPath.setDqSetp(prvestep.getFlowPathSetp());
+        itdmRunFlowPathMapper.updateById(itdmRunFlowPath);
+        logService.insert(prvestep.getRunFlowPath(), itdmRunFlowPath.getDqSetp(), prvestep.getId(), "驳回指定节点", zdRunFlowPath.getYuanyin());
+
+
+    }
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/vo/ItdmBuohuiRunFlowPathStepVO.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.flowpath.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ItdmBuohuiRunFlowPathStepVO {
+
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    private String name;
+
+}