维修基金审核

linwe

2023-12-21 dfe0fb068a602a2611d9dc81df3138eef558dee5

 src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java

@@ -127,7 +127,7 @@
         applyVO.setApplyStatus(CommonConstant.NUMBER_ONE);
         ProcessDefinition processDefinition = processDefinitionQuery.processDefinitionKey("haveMaintenanceFundApply").singleResult();
         applyVO.setProcessDefinitionId(processDefinition.getId());
         // 经过业委会
         // 有物业和有业委会
         variables = Kv.create()
            .set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName())
            .set("ownersCommitteeUser", TaskUtil.getTaskUser(one.getPrincipalId().toString()))
@@ -136,10 +136,16 @@
            .set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
            .set("ownersCommitteeFlag", ownersCommitteeFlag);
      } else {
         applyVO.setApplyStatus(CommonConstant.NUMBER_TWO);
         if(CommonConstant.NUMBER_TWO.equals(ownersCommitteeFlag) && CommonConstant.NUMBER_ONE.equals(applyVO.getPropertyFlag())){
            // 有物业和无业委会
            ProcessDefinition processDefinition = processDefinitionQuery.processDefinitionKey("haveMaintenanceFundApply").singleResult();
            applyVO.setProcessDefinitionId(processDefinition.getId());
         }else {
            // 无物业和无业委会
         ProcessDefinition processDefinition = processDefinitionQuery.processDefinitionKey("notMaintenanceFundApply").singleResult();
         applyVO.setProcessDefinitionId(processDefinition.getId());
         // 经过街道
         }
         applyVO.setApplyStatus(CommonConstant.NUMBER_TWO);
         variables = Kv.create()
            .set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName())
            .set("streetUser", TaskUtil.getTaskUser(one4.getId().toString()))