维修基金审核

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 {
            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);
            ProcessDefinition processDefinition = processDefinitionQuery.processDefinitionKey("notMaintenanceFundApply").singleResult();
            applyVO.setProcessDefinitionId(processDefinition.getId());
            // 经过街道
            variables = Kv.create()
                .set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName())
                .set("streetUser", TaskUtil.getTaskUser(one4.getId().toString()))

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -37,10 +37,10 @@
            and tenant_id = #{user.tenantId}
        </if>
        <if test="user.account!=null and user.account != ''">
            and account = #{user.account}
            and account like concat('%', #{user.account},'%')
        </if>
        <if test="user.realName!=null and user.realName != ''">
            and real_name = #{user.realName}
            and real_name like concat('%',#{user.realName},'%')
        </if>
        <if test="user.userType!=null and user.userType != ''">
            and user_type = #{user.userType}