Merge remote-tracking branch 'origin/master'

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpStockController.java

@@ -166,6 +166,15 @@ public class HxpStockController extends BaseController {
     }
 
 
+    @GetMapping("/listOutByUser")
+    @ApiOperation(value = "学生查询库存管理列表(出库记录)")
+    public TableDataInfo<HxpStockJoinVO> listOutByUser(HxpStockSearch hxpStockSearch) {
+        startPage();
+        hxpStockSearch.setLoginUserId(SecurityUtils.getUserId());
+        List<HxpStockOutVO> list = hxpStockService.selectHxpStockListOut(hxpStockSearch);
+        return getDataTable(list);
+    }
+
     /**
      * 导出化学品信息列表(出库记录)
      */

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/ActHxpapplyServiceImpl.java

@@ -308,6 +308,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
         //这里做一个跳过审核的map，暂时这么写吧，没有想到更好的办法了，啊啊啊啊，头疼（1表示第一次申请人就是审批人的需要跳过,2表示需要结束跳过）
         Map<String,Long> jumpApply = new HashMap<>();
         jumpApply.put("jumpApply",1L);
+        Predicate<List <ActAudituser>> pre = x->Optional.ofNullable(x).orElseGet(Collections::emptyList).stream().filter(y->y.getAuditUserId()==createUserId).count()>0;
         Optional.ofNullable(actAuditconfigList).orElseGet(Collections::emptyList)
                 .stream()
                 .map(a->{
@@ -321,13 +322,15 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
                         ActApplytaskNode actApplytaskNode = new ActApplytaskNode();
                         StringBuffer stringBuffer = new StringBuffer();
                         //这里生成或签的规则。
+                        jumpApplyFun(pre,collect,jumpApply,actApplytaskNode);
                         Optional.ofNullable(collect).orElseGet(Collections::emptyList)
                                 .stream()
                                 .forEach(c1->{
                                     stringBuffer.append(",");
                                     stringBuffer.append(c1.getAuditUserId());
-                                    jumpApplyFun(createUserId,c1.getAuditUserId(),jumpApply,actApplytaskNode);
+
                                 });
+
                         if(stringBuffer.length()>0){
                             actApplytaskNode.setNodeName("流程节点："+countAdder.sum());
                             actApplytaskNode.setApplytaskId(actApplytask.getId());
@@ -387,7 +390,18 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
         actApplytaskMapper.updateActApplytask(actApplytask);
     }
 
-    //todo 这里处理一下跳过审核，只有当前审批人是申请人的时候，才做审批通过
+    //todo 这里处理一下跳过审核，只有当前审批人是申请人的时候，才做审批通过（或审）
+    private void jumpApplyFun(Predicate<List <ActAudituser>> pre,List <ActAudituser> actAuditusers,Map<String,Long> jumpApply,ActApplytaskNode actApplytaskNode){
+        if(pre.test(actAuditusers) && jumpApply.get("jumpApply")==1){
+            actApplytaskNode.setNodeStatus(1);
+            actApplytaskNode.setApplyUserid(SecurityUtils.getUserId());
+            jumpApply.put("jumpApply",1L);
+        }else{
+            jumpApply.put("jumpApply",2L);
+        }
+    }
+
+    //todo 这里处理一下跳过审核，只有当前审批人是申请人的时候，才做审批通过(依次审批)
     private void jumpApplyFun(Long createUserId,Long auditUserId,Map<String,Long> jumpApply,ActApplytaskNode actApplytaskNode){
         if(createUserId == auditUserId && jumpApply.get("jumpApply")==1){
             actApplytaskNode.setNodeStatus(1);