bug修复

linwe

2023-12-23 55d677758efadb6d42e6d4e595cecc2c50c20d5a

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

@@ -19,6 +19,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.repository.ProcessDefinitionQuery;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
@@ -37,6 +41,7 @@
import org.springblade.modules.property.entity.PropertyCapitalApplyEntity;
import org.springblade.modules.property.mapper.PropertyCapitalApplyMapper;
import org.springblade.modules.property.service.IPropertyCapitalApplyService;
import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springblade.modules.property.vo.PropertyCapitalApplyVO;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Region;
@@ -47,6 +52,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

/**
 * 物业维修资金申请表 服务实现类
@@ -59,54 +66,85 @@

   @Override
   public IPage<PropertyCapitalApplyVO> selectPropertyCapitalApplyPage(IPage<PropertyCapitalApplyVO> page, PropertyCapitalApplyVO propertyCapitalApply) {
      // 判断角色，物业角色只能查询当前小区的

      String userRole = AuthUtil.getUserRole();
      if (userRole.contains("wygly")) {
         IPropertyDistrictUserService bean = SpringUtils.getBean(IPropertyDistrictUserService.class);
         List<String> strings = bean.selectPropertyDistrictByUserId(AuthUtil.getUserId());
         propertyCapitalApply.setDistrictIdList(strings);
      }


      return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply));
   }

   @Autowired
   private IFlowService flowService;
   // private final IFlowService flowService;
   @Autowired
   private RepositoryService repositoryService;

   @Override
   @Transactional(rollbackFor = Exception.class)
   public boolean startProcess(PropertyCapitalApplyVO propertyCapitalApplyVO) {
   public boolean startProcess(PropertyCapitalApplyVO applyVO) {
      String businessTable = FlowUtil.getBusinessTable(ProcessConstant.LEAVE_KEY);
      // if (Func.isEmpty(propertyCapitalApplyVO.getId())) {
      if (Func.isEmpty(applyVO.getId())) {
      // 保存leave
      propertyCapitalApplyVO.setApplyTime(DateUtil.now());
      // save(propertyCapitalApplyVO);
      // 判断是否有业委会
      applyVO.setApplyTime(DateUtil.now());
      save(applyVO);
      // 判断是否有业委会，查询业委会负责人
      IOwnersCommitteeService bean = SpringUtils.getBean(IOwnersCommitteeService.class);
      OwnersCommitteeEntity one = bean.getOne(Wrappers.<OwnersCommitteeEntity>lambdaQuery()
         .eq(OwnersCommitteeEntity::getAreaId, propertyCapitalApplyVO.getDistrictId())
         .eq(OwnersCommitteeEntity::getAreaId, applyVO.getDistrictId())
         .eq(OwnersCommitteeEntity::getDeleteFlag,0)
         .eq(OwnersCommitteeEntity::getStatus,0)
         .last("limit 1"));
      Integer ownersCommitteeFlag = 2;
      Integer ownersCommitteeFlag = CommonConstant.NUMBER_TWO;
      if (one != null && one.getPrincipalId() != null) {
         ownersCommitteeFlag = 1;
         ownersCommitteeFlag = CommonConstant.NUMBER_ONE;
      }
      // 查询街道负责人  通过小区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;
         .eq(DistrictEntity::getId, applyVO.getDistrictId()));
         User one4 = null;
         // 查询街道责人
         try {
            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()));
            one4 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, one3.getId())
               .eq(User::getRoleId,"1729814500990304258")
               .eq(User::getIsDeleted,0)
               .last("limit 1"));
         } catch (Exception e) {
            throw new ServiceException("街道信息不存在");
         }
         // 查询住建局负责人
         User user4 = null;
         try {
            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"));
            user4 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
               .eq(User::getRoleId,"1738072768615333890")
               .eq(User::getIsDeleted,0)
               .last("limit 1"));
         } catch (Exception e) {
            throw new ServiceException("住建局信息不存在");
         }
         Kv variables = null;
      ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery().latestVersion().orderByProcessDefinitionKey().asc();
      // 启动流程
      if (ownersCommitteeFlag.equals(1)) {
         propertyCapitalApplyVO.setProcessDefinitionId("haveMaintenanceFundApply:1:c4117561-9fa6-11ee-8617-dc41a96f50f5");
         // 经过业委会
      if (CommonConstant.NUMBER_ONE.equals(ownersCommitteeFlag) && CommonConstant.NUMBER_ONE.equals(applyVO.getPropertyFlag())) {
         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()))
@@ -115,8 +153,16 @@
            .set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
            .set("ownersCommitteeFlag", ownersCommitteeFlag);
      } else {
         propertyCapitalApplyVO.setProcessDefinitionId("notMaintenanceFundApply:1:289ac20c-9f43-11ee-8186-dc41a96f50f5");
         // 经过街道
         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()))
@@ -124,19 +170,19 @@
            .set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
            .set("ownersCommitteeFlag", ownersCommitteeFlag);
      }
      BladeFlow flow = flowService.startProcessInstanceById(propertyCapitalApplyVO.getProcessDefinitionId(),
         FlowUtil.getBusinessKey(businessTable, String.valueOf(propertyCapitalApplyVO.getId())), variables);
      BladeFlow flow = flowService.startProcessInstanceById(applyVO.getProcessDefinitionId(),
         FlowUtil.getBusinessKey(businessTable, String.valueOf(applyVO.getId())), variables);
      if (Func.isNotEmpty(flow)) {
         log.debug("流程已启动,流程ID:" + flow.getProcessInstanceId());
         // 返回流程id写入leave
         propertyCapitalApplyVO.setProcessInstanceId(flow.getProcessInstanceId());
         updateById(propertyCapitalApplyVO);
         applyVO.setProcessInstanceId(flow.getProcessInstanceId());
         updateById(applyVO);
      } else {
         throw new ServiceException("开启流程失败");
      }
      // } else {
      //    updateById(propertyCapitalApplyVO);
      // }
      } else {
         updateById(applyVO);
      }
      return true;
   }