linwe
2023-12-21 7b91c99980e9db0c880bf3905a7cfd54ffca44cc
维修基金审核
5 files modified
1 files added
191 ■■■■■ changed files
src/main/java/org/springblade/flow/listener/MyExecutionListener.java 32 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/service/IHouseService.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java 8 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java 31 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/property/service/IPropertyCapitalApplyService.java 11 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java 107 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/flow/listener/MyExecutionListener.java
New file
@@ -0,0 +1,32 @@
package org.springblade.flow.listener;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.flowable.engine.delegate.DelegateExecution;
import org.flowable.engine.delegate.ExecutionListener;
import org.springblade.common.utils.SpringUtils;
import org.springblade.modules.property.entity.PropertyCapitalApplyEntity;
import org.springblade.modules.property.service.IPropertyCapitalApplyService;
public class MyExecutionListener implements ExecutionListener {
    @Override
    public void notify(DelegateExecution delegateExecution) {
        System.out.println("***************************DelegateExecution");
        IPropertyCapitalApplyService bean = SpringUtils.getBean(IPropertyCapitalApplyService.class);
        PropertyCapitalApplyEntity applyEntity = bean.getOne(Wrappers.<PropertyCapitalApplyEntity>lambdaQuery().eq(PropertyCapitalApplyEntity::getProcessInstanceId, delegateExecution.getProcessInstanceId()));
        if (delegateExecution.getCurrentActivityId().equals("ownersCommittee1")) {
            applyEntity.setApplyStatus(1);
        } else if (delegateExecution.getCurrentActivityId().equals("ownersCommitteePass")) {
            applyEntity.setApplyStatus(2);
        } else if (delegateExecution.getCurrentActivityId().equals("streePass")) {
            applyEntity.setApplyStatus(3);
        } else if (delegateExecution.getCurrentActivityId().equals("apply")) {
            applyEntity.setApplyStatus(4);
        } else if (delegateExecution.getCurrentActivityId().equals("constructionPass")) {
            applyEntity.setApplyStatus(5);
        } else if (delegateExecution.getCurrentActivityId().equals("applyNotPass")) {
            applyEntity.setApplyStatus(6);
        }
        bean.updateById(applyEntity);
    }
}
src/main/java/org/springblade/modules/house/service/IHouseService.java
@@ -77,5 +77,5 @@
     */
    void importHouseAndHold(List<HouseAndHoldExcel> data, Boolean isCovered);
    Map<String, Object> getHouseStatistics(String code, String roleType,String aoiCode,String buildingCode,String uniCode);
    Map<String, Object> getHouseStatistics(String code, String roleType,String aoiCode,String buildingCode,String unitCode);
}
src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java
@@ -88,8 +88,8 @@
    @PostMapping("/save")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入propertyCapitalApply")
    public R save(@Valid @RequestBody PropertyCapitalApplyEntity propertyCapitalApply) {
        return R.status(propertyCapitalApplyService.save(propertyCapitalApply));
    public R save(@Valid @RequestBody PropertyCapitalApplyVO propertyCapitalApplyVO) {
        return R.status(propertyCapitalApplyService.startProcess(propertyCapitalApplyVO));
    }
    /**
@@ -108,8 +108,8 @@
    @PostMapping("/submit")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入propertyCapitalApply")
    public R submit(@Valid @RequestBody PropertyCapitalApplyEntity propertyCapitalApply) {
        return R.status(propertyCapitalApplyService.saveOrUpdate(propertyCapitalApply));
    public R submit(@Valid @RequestBody PropertyCapitalApplyVO propertyCapitalApplyVO) {
        return R.status(propertyCapitalApplyService.startProcess(propertyCapitalApplyVO));
    }
    /**
src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
@@ -173,4 +173,35 @@
    @ApiModelProperty("是否已删除 0:否  1:是")
    private Integer isDeleted;
    /**
     * 流程定义id
     */
    @ApiModelProperty("流程定义id")
    private String processDefinitionId;
    /**
     * 流程实例id
     */
    @ApiModelProperty("流程实例id")
    private String processInstanceId;
    /**
     * 流程定义ke
     */
    @ApiModelProperty("流程定义ke")
    private String processDefinitionKey;
    /**
     * 流程申请时间
     */
    @ApiModelProperty("流程申请时间")
    private Date applyTime;
    /**
     * 申请状态
     */
    @ApiModelProperty("申请状态 0:待审核 1:业委会审核 2:街道审核 3:住建局审核 4:调整申请 5:审核通过 6:审核不通过")
    private Integer applyStatus;
}
src/main/java/org/springblade/modules/property/service/IPropertyCapitalApplyService.java
@@ -16,11 +16,10 @@
 */
package org.springblade.modules.property.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.property.entity.PropertyCapitalApplyEntity;
import org.springblade.modules.property.vo.PropertyCapitalApplyVO;
import org.springblade.core.mp.base.BaseService;
import com.baomidou.mybatisplus.core.metadata.IPage;
/**
 * 物业维修资金申请表 服务类
@@ -40,4 +39,12 @@
    IPage<PropertyCapitalApplyVO> selectPropertyCapitalApplyPage(IPage<PropertyCapitalApplyVO> page, PropertyCapitalApplyVO propertyCapitalApply);
    /**
     * 开启流程
     *
     * @param propertyCapitalApplyVO
     * @return boolean
     */
    boolean startProcess(PropertyCapitalApplyVO propertyCapitalApplyVO);
}
src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
@@ -16,14 +16,37 @@
 */
package org.springblade.modules.property.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.flow.business.service.IFlowService;
import org.springblade.flow.core.constant.ProcessConstant;
import org.springblade.flow.core.entity.BladeFlow;
import org.springblade.flow.core.utils.FlowUtil;
import org.springblade.flow.core.utils.TaskUtil;
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeEntity;
import org.springblade.modules.ownersCommittee.service.IOwnersCommitteeService;
import org.springblade.modules.property.entity.PropertyCapitalApplyEntity;
import org.springblade.modules.property.vo.PropertyCapitalApplyVO;
import org.springblade.modules.property.mapper.PropertyCapitalApplyMapper;
import org.springblade.modules.property.service.IPropertyCapitalApplyService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.property.vo.PropertyCapitalApplyVO;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
/**
 * 物业维修资金申请表 服务实现类
@@ -39,5 +62,83 @@
        return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply));
    }
    @Autowired
    private IFlowService flowService;
    // private final IFlowService flowService;
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean startProcess(PropertyCapitalApplyVO propertyCapitalApplyVO) {
        String businessTable = FlowUtil.getBusinessTable(ProcessConstant.LEAVE_KEY);
        // if (Func.isEmpty(propertyCapitalApplyVO.getId())) {
        // 保存leave
        propertyCapitalApplyVO.setApplyTime(DateUtil.now());
        // save(propertyCapitalApplyVO);
        // 判断是否有业委会
        IOwnersCommitteeService bean = SpringUtils.getBean(IOwnersCommitteeService.class);
        OwnersCommitteeEntity one = bean.getOne(Wrappers.<OwnersCommitteeEntity>lambdaQuery()
            .eq(OwnersCommitteeEntity::getAreaId, propertyCapitalApplyVO.getDistrictId())
            .last("limit 1"));
        Integer ownersCommitteeFlag = 2;
        if (one != null && one.getPrincipalId() != null) {
            ownersCommitteeFlag = 1;
        }
        // 查询街道负责人  通过小区id 查询街道编码
        // 通过街道编码查询街道名称,
        // 通过街道名称查询 人的部门是街道名称的
        IUserService user = SpringUtils.getBean(IUserService.class);
        IDistrictService district = SpringUtils.getBean(IDistrictService.class);
        IRegionService region = SpringUtils.getBean(IRegionService.class);
        IDeptService dept = SpringUtils.getBean(IDeptService.class);
        DistrictEntity one1 = district.getOne(Wrappers.<DistrictEntity>lambdaQuery()
            .eq(DistrictEntity::getId, propertyCapitalApplyVO.getDistrictId()));
        Region one2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 9)));
        Dept one3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, one2.getName()));
        User one4 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, one3.getId()).last("limit 1"));
        // 查询住建局负责人
        Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
        Dept dept3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, region2.getName() + "住建局").last("limit 1"));
        User user4 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId()).last("limit 1"));
        Kv variables = null;
        // 启动流程
        if (ownersCommitteeFlag.equals(1)) {
            propertyCapitalApplyVO.setProcessDefinitionId("haveMaintenanceFundApply:1:c4117561-9fa6-11ee-8617-dc41a96f50f5");
            // 经过业委会
            variables = Kv.create()
                .set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName())
                .set("ownersCommitteeUser", TaskUtil.getTaskUser(one.getPrincipalId().toString()))
                .set("streetUser", TaskUtil.getTaskUser(one4.getId().toString()))
                .set("constructionUser", TaskUtil.getTaskUser(user4.getId().toString()))
                .set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
                .set("ownersCommitteeFlag", ownersCommitteeFlag);
        } else {
            propertyCapitalApplyVO.setProcessDefinitionId("notMaintenanceFundApply:1:289ac20c-9f43-11ee-8186-dc41a96f50f5");
            // 经过街道
            variables = Kv.create()
                .set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName())
                .set("streetUser", TaskUtil.getTaskUser(one4.getId().toString()))
                .set("constructionUser", TaskUtil.getTaskUser(user4.getId().toString()))
                .set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
                .set("ownersCommitteeFlag", ownersCommitteeFlag);
        }
        BladeFlow flow = flowService.startProcessInstanceById(propertyCapitalApplyVO.getProcessDefinitionId(),
            FlowUtil.getBusinessKey(businessTable, String.valueOf(propertyCapitalApplyVO.getId())), variables);
        if (Func.isNotEmpty(flow)) {
            log.debug("流程已启动,流程ID:" + flow.getProcessInstanceId());
            // 返回流程id写入leave
            propertyCapitalApplyVO.setProcessInstanceId(flow.getProcessInstanceId());
            updateById(propertyCapitalApplyVO);
        } else {
            throw new ServiceException("开启流程失败");
        }
        // } else {
        //     updateById(propertyCapitalApplyVO);
        // }
        return true;
    }
}