代码提交

liusheng

2023-08-11 c4db46357c08184c36b1b5be20fbcccffc030f63

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java

@@ -484,6 +484,8 @@
                    }
                }
                FlowLevel = FlowLevel + 1;
                //记录一下，下一级的审批，以便于下一级退回后，发起者提交时，能再提到当前审批层级
                serviceFund.setBackflowlevel(FlowLevel);
            } else {
                CheckFlag = 2;
                if (CheckFlag == 2) {
@@ -501,7 +503,7 @@

            serviceFund.setRecordstatus(RecordStatus);
            serviceFund.setFlowlevel(FlowLevel);
            serviceFund.setBackflowlevel(serviceFund.getFlowlevel());
            //  serviceFund.setBackflowlevel(serviceFund.getFlowlevel());

            ServiceFundflow serviceFundflow = new ServiceFundflow();
            SysUser user = loginUser.getUser();

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java

@@ -474,16 +474,25 @@
            List<Integer> postids = postService.selectPostListByUserId(loginUser.getUserId());

            if (!postids.contains(2)) {
                serviceReimbursement.setFlowlevel(1L);
                serviceReimbursement.setBackflowlevel(1L);
                serviceReimbursement.setRecordstatus(2);
                if (serviceReimbursement.getBackflowlevel() != null) {
                    serviceReimbursement.setFlowlevel(serviceReimbursement.getBackflowlevel());
                } else {
                    serviceReimbursement.setBackflowlevel(1L);
                    serviceReimbursement.setFlowlevel(1L);
                }
            } else {
                serviceReimbursement.setRecordstatus(0);
                if (serviceReimbursement.getBackflowlevel() != null) {
                    serviceReimbursement.setFlowlevel(serviceReimbursement.getBackflowlevel());
            } else {
                serviceReimbursement.setFlowlevel(0L);
                serviceReimbursement.setRecordstatus(0);
                serviceReimbursement.setBackflowlevel(0L);
            }

            if (!postids.contains(2)) {
            }

            if (!postids.contains(2) && (serviceReimbursement.getBackflowlevel() == null || serviceReimbursement.getBackflowlevel() == 0)) {
                ServiceFundflow serviceFundflow = new ServiceFundflow();
                serviceFundflow.setFundid(serviceReimbursement.getId());
                serviceFundflow.setCheckuserno(user.getUserName());
@@ -557,12 +566,14 @@
                    }
                }
                FlowLevel = FlowLevel + 1;
                serviceReimbursement.setBackflowlevel(Long.valueOf(FlowLevel));
            } else {
                CheckFlag = 2;

                if (CheckFlag == 2) {
                    //应医院要求如果出现退回，直接退到发起者
                    FlowLevel = 0;
                    RecordStatus = -1;
                } else {
                    //下面是原来的写法，一级一级的往下退，医院现在不要这样搞了，下面这段代码先保留，等医院回心转意，再给放开
                    RecordStatus = (FlowLevel + 1) * 2 - 1;
@@ -589,7 +600,7 @@

            List<Integer> postids = postService.selectPostListByUserId(loginUser.getUserId());
            log.info("postService.selectPostListByUserId : {}", postids.size());
            if (!postids.contains(2)) {
            if (!postids.contains(2) && !postids.contains(6) && (serviceReimbursement.getBackflowlevel() == null || serviceReimbursement.getBackflowlevel() == 0)) {
                if (CheckFlag == 2 && OriginalFlowLevel == 1) {
                    ServiceFundflow serviceFundflowAuto = new ServiceFundflow();
                    serviceFundflowAuto.setFundid(serviceReimbursement.getId());