src/main/java/org/springblade/flow/listener/MyExecutionListener.java
@@ -26,11 +26,13 @@ } else if (delegateExecution.getCurrentActivityId().equals("apply")) { applyEntity.setApplyStatus(4); } else if (delegateExecution.getCurrentActivityId().equals("constructionPass")) { applyEntity.setApplyStatus(5); applyEntity.setApplyStatus(7); } else if (delegateExecution.getCurrentActivityId().equals("applyNotPass")) { applyEntity.setApplyStatus(6); } else if (delegateExecution.getCurrentActivityId().equals("ownersCommitteeFlag0")) { applyEntity.setApplyStatus(2); } else if (delegateExecution.getCurrentActivityId().equals("srConstructionPass")) { applyEntity.setApplyStatus(5); } bean.updateById(applyEntity); } src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -46,10 +46,8 @@ import org.springblade.modules.house.vo.HouseVO; import org.springblade.modules.label.entity.LabelEntity; import org.springblade.modules.label.service.ILabelService; 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; src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
@@ -20,18 +20,14 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Info; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; import org.springframework.format.annotation.DateTimeFormat; /** * 物业维修资金申请表 实体类 @@ -201,7 +197,7 @@ /** * 申请状态 */ @ApiModelProperty("申请状态 0：待审核 1：业委会审核 2：街道审核 3：住建局审核 4：调整申请 5：审核通过 6：审核不通过") @ApiModelProperty("申请状态 0：待审核 1：业委会审核 2：街道审核 3：住建局审核 4：调整申请 5：审核通过 6：审核不通过 7:上饶住建局") private Integer applyStatus; private String taskId; src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
@@ -134,12 +134,25 @@ } 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")); // 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, "信州区" + "住建局").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("住建局信息不存在"); } // 查询上饶市住建局负责人 User user5 = 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, "上饶市" + "住建局").last("limit 1")); user5 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId()) .eq(User::getRoleId, "1738072768615333890") .eq(User::getIsDeleted, 0) .last("limit 1")); @@ -159,6 +172,7 @@ .set("ownersCommitteeUser", TaskUtil.getTaskUser(one.getPrincipalId().toString())) .set("streetUser", TaskUtil.getTaskUser(one4.getId().toString())) .set("constructionUser", TaskUtil.getTaskUser(user4.getId().toString())) .set("srConstructionUser", TaskUtil.getTaskUser(user5.getId().toString())) .set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString())) .set("ownersCommitteeFlag", ownersCommitteeFlag); } else { @@ -176,6 +190,7 @@ .set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName()) .set("streetUser", TaskUtil.getTaskUser(one4.getId().toString())) .set("constructionUser", TaskUtil.getTaskUser(user4.getId().toString())) .set("srConstructionUser", TaskUtil.getTaskUser(user5.getId().toString())) .set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString())) .set("ownersCommitteeFlag", ownersCommitteeFlag); } src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java
@@ -198,7 +198,7 @@ } role.setTenantId(parent.getTenantId()); } role.setParentId(Long.parseLong(AuthUtil.getUser().getRoleId())); // role.setParentId(Long.parseLong(AuthUtil.getUser().getRoleId())); role.setIsDeleted(BladeConstant.DB_NOT_DELETED); return saveOrUpdate(role); } src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -265,7 +265,7 @@ <select id="getStatisticsCount" resultType="org.springblade.modules.task.vo.TaskReportStatistics"> ELECT SELECT count( 1 ) AS total, ifnull( sum( CASE WHEN STATUS = 10 THEN 1 ELSE 0 END ), 0 ) AS handle FROM
