2022-09-16 修改化学品跳过审核的时候，需要勾选化学品申请的所有信息。

zd-modules/zd-chemical/src/main/java/com/zd/chemical/mapper/ActHxpapplyDetailMapper.java

@@ -62,6 +62,14 @@ public interface ActHxpapplyDetailMapper
     int updateActHxpapplyDetail(ActHxpapplyDetail actHxpapplyDetail);
 
     /**
+     * 修改申购的化学品通过
+     *
+     * @param actHxpapplyDetail 修改申购的化学品通过
+     * @return 结果
+     */
+    int updateActHxpapplyDetailByPass(ActHxpapplyDetail actHxpapplyDetail);
+
+    /**
      * 删除化学品申购详情
      *
      * @param id 化学品申购详情主键

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

@@ -367,7 +367,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
                         ActApplytaskNode actApplytaskNode = new ActApplytaskNode();
                         StringBuffer stringBuffer = new StringBuffer();
                         //这里生成或签的规则。
-                        jumpApplyFun(pre,collect,jumpApply,actApplytaskNode);
+                        jumpApplyFun(pre,collect,jumpApply,actApplytaskNode,actApplytask);
                         Optional.ofNullable(collect).orElseGet(Collections::emptyList)
                                 .stream()
                                 .forEach(c1->{
@@ -402,7 +402,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
                                     actApplytaskNode.setApplytaskId(actApplytask.getId());
                                     actApplytaskNode.setApplyUserIds(f.getAuditUserId()+"");
                                     actApplytaskNode.setNodeOrder(Integer.parseInt(countAdder.sum()+""));
-                                    jumpApplyFun(createUserId,f.getAuditUserId(),jumpApply,actApplytaskNode);
+                                    jumpApplyFun(createUserId,f.getAuditUserId(),jumpApply,actApplytaskNode,actApplytask);
                                     actApplytaskNode.setAuditconfigId(a.getId());
                                     insertNodeSave(actApplytaskNode);
                                 });
@@ -446,11 +446,15 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
     }
 
     // 这里处理一下跳过审核，只有当前审批人是申请人的时候，才做审批通过（或审）
-    private void jumpApplyFun(Predicate<List <ActAudituser>> pre,List <ActAudituser> actAuditusers,Map<String,Long> jumpApply,ActApplytaskNode actApplytaskNode){
+    private void jumpApplyFun(Predicate<List <ActAudituser>> pre,List <ActAudituser> actAuditusers,Map<String,Long> jumpApply,ActApplytaskNode actApplytaskNode,ActApplytask actApplytask){
         if(pre.test(actAuditusers) && jumpApply.get("jumpApply")==1){
             actApplytaskNode.setNodeStatus(1);
             actApplytaskNode.setApplyUserid(SecurityUtils.getUserId());
             actApplytaskNode.setUpdateTime(new Date());
+            //todo 这里如果是当前用户跳过的，需要把事情的化学品全部修改为勾选
+            ActHxpapplyDetail actHxpapplyDetail = new ActHxpapplyDetail();
+            actHxpapplyDetail.setHxpapplyId(actApplytask.getTaskId());
+            actHxpapplyDetailMapper.updateActHxpapplyDetailByPass(actHxpapplyDetail);
             jumpApply.put("jumpApply",1L);
         }else{
             jumpApply.put("jumpApply",2L);
@@ -458,11 +462,15 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
     }
 
     // 这里处理一下跳过审核，只有当前审批人是申请人的时候，才做审批通过(依次审批)
-    private void jumpApplyFun(Long createUserId,Long auditUserId,Map<String,Long> jumpApply,ActApplytaskNode actApplytaskNode){
+    private void jumpApplyFun(Long createUserId,Long auditUserId,Map<String,Long> jumpApply,ActApplytaskNode actApplytaskNode,ActApplytask actApplytask){
         if(createUserId.longValue() == auditUserId.longValue() && jumpApply.get("jumpApply")==1){
             actApplytaskNode.setNodeStatus(1);
             actApplytaskNode.setApplyUserid(SecurityUtils.getUserId());
             actApplytaskNode.setUpdateTime(new Date());
+            //todo 这里如果是当前用户跳过的，需要把事情的化学品全部修改为勾选
+            ActHxpapplyDetail actHxpapplyDetail = new ActHxpapplyDetail();
+            actHxpapplyDetail.setHxpapplyId(actApplytask.getTaskId());
+            actHxpapplyDetailMapper.updateActHxpapplyDetailByPass(actHxpapplyDetail);
             jumpApply.put("jumpApply",1L);
         }else{
             jumpApply.put("jumpApply",2L);

zd-modules/zd-chemical/src/main/resources/mapper/chemical/ActHxpapplyDetailMapper.xml

@@ -118,6 +118,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+
+    <update id="updateActHxpapplyDetailByPass" parameterType="com.zd.chemical.domain.ActHxpapplyDetail">
+        update act_hxpapply_detail
+        set tick_status=1
+        where hxpapply_id = #{hxpapplyId}
+    </update>
+
     <delete id="deleteActHxpapplyDetailById">
         delete from act_hxpapply_detail where id = #{id}
     </delete>