Merge remote-tracking branch 'origin/master'

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

@@ -69,15 +69,6 @@ public class ItdmRunFlowPathController extends JeecgController<ItdmRunFlowPath,
     private SysBaseApiImpl sysBaseApi;
 
 
-    /**
-     * 分页列表查询
-     *
-     * @param itdmRunFlowPath
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
     //@AutoLog(value = "运行流程表-分页列表查询")
     @ApiOperation(value = "运行流程表-分页列表查询", notes = "运行流程表-分页列表查询")
     @GetMapping(value = "/list")
@@ -88,6 +79,30 @@ public class ItdmRunFlowPathController extends JeecgController<ItdmRunFlowPath,
         QueryWrapper<ItdmRunFlowPath> queryWrapper = QueryGenerator.initQueryWrapper(itdmRunFlowPath, req.getParameterMap());
         Page<ItdmRunFlowPath> page = new Page<ItdmRunFlowPath>(pageNo, pageSize);
         IPage<ItdmRunFlowPath> pageList = itdmRunFlowPathService.page(page, queryWrapper);
+        pageList.setRecords(pageList.getRecords().stream().peek(i -> {
+
+            ItdmRunFlowPathStep select = itdmRunFlowPathStepService.getBaseMapper().selectOne(Wrappers.lambdaQuery(ItdmRunFlowPathStep.class)
+                    .eq(ItdmRunFlowPathStep::getRunFlowPath, i.getId())
+                    .eq(ItdmRunFlowPathStep::getFlowPathSetp, i.getDqSetp())
+
+            );
+
+            LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            List<String> strings = StringUtils.isNotBlank(select.getUserIds()) ?
+                    Arrays.stream(select.getUserIds().split(",")).collect(Collectors.toList()) :
+                    new ArrayList<>();
+            List<String> roleIds = sysBaseApi.getRoleIdsByUsername(user.getUsername());
+
+            i.setIsokview(strings.contains(user.getUsername()) || roleIds.contains(select.getRoleId()));
+
+
+            boolean x = iItdmFlowPathStepService.getBaseMapper().exists(Wrappers.lambdaQuery(ItdmFlowPathStep.class)
+                    .eq(ItdmFlowPathStep::getId, i.getDqSetp())
+                    .eq(ItdmFlowPathStep::getSort, "1")
+
+            );
+            i.setIsbohuiview(!x && (strings.contains(user.getUsername()) || roleIds.contains(select.getRoleId())));
+        }).collect(Collectors.toList()));
         return Result.OK(pageList);
     }
 

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

@@ -40,6 +40,7 @@ public interface FlowPathConvert {
     @Mapping(target = "dangqian", source = "dangqian")
     @Mapping(target = "itdmWeituoInfo", source = "itdmWeituoInfo")
     @Mapping(target = "sort", source = "step.sort")
+    @Mapping(target = "shenheTime", source = "step.updateTime")
 
     ItdmRunFlowPathStepVO to(ItdmRunFlowPathStep step, Boolean isUpdate, Boolean dangqian, ItdmWeituoInfo itdmWeituoInfo);
 

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

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -88,4 +86,10 @@ public class ItdmRunFlowPath implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private Date updateTime;
+
+
+    @TableField(exist = false)
+    private Boolean isokview;
+    @TableField(exist = false)
+    private Boolean isbohuiview;
 }

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

@@ -43,6 +43,8 @@ public class ItdmRunFlowPathStep implements Serializable {
 
     @Excel(name = "运行流程id", width = 15)
     @ApiModelProperty(value = "运行流程id")
+    @Dict(dictTable ="itdm_run_flow_path", dicCode = "id",dicText = "name")
+
     private java.lang.String runFlowPath;
 	/**流程步骤id*/
 	@Excel(name = "流程步骤id", width = 15)

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

@@ -35,6 +35,10 @@ public class ItdmRunFlowPathStepVO {
     @ApiModelProperty(value = "表单数据")
     private String saveData;
 
+    @ApiModelProperty(value = "表单数据")
+
+    private Date shenheTime;
+
     @ApiModelProperty(value = "顺序")
 
     private String sort;