@@ -64,31 +64,31 @@ public class ExcelExportDTO implements Serializable { | |||||
private String contactPhone; | private String contactPhone; | ||||
@ExcelProperty("上级业务主管单位") | @ExcelProperty("上级业务主管单位") | ||||
private String higherSuperUnit; | |||||
private String higherSuperOrg; | |||||
@ExcelProperty("上级主管单位浙政钉ID") | @ExcelProperty("上级主管单位浙政钉ID") | ||||
private Boolean higherSuperUnitCode; | |||||
private String higherSuperOrgCode; | |||||
@ExcelProperty("本级主管部门") | @ExcelProperty("本级主管部门") | ||||
private Boolean superUnit; | |||||
private String superOrg; | |||||
@ExcelProperty("本级主管部门浙政钉ID") | @ExcelProperty("本级主管部门浙政钉ID") | ||||
private Boolean superUnitCode; | |||||
private String superOrgCode; | |||||
@ExcelProperty("建设单位名称") | @ExcelProperty("建设单位名称") | ||||
private Boolean constructionUnitName; | |||||
private String buildOrgName; | |||||
@ExcelProperty("建设单位浙政钉ID") | @ExcelProperty("建设单位浙政钉ID") | ||||
private Boolean buildUnitZheJiangGovernmentDingId; | |||||
private String buildOrgZheJiangGovDingId; | |||||
@ExcelProperty("建设单位统一信用代码") | @ExcelProperty("建设单位统一信用代码") | ||||
private Boolean buildUnitCode; | |||||
private String buildOrgCode; | |||||
@ExcelProperty("项目类型") | @ExcelProperty("项目类型") | ||||
private Boolean projectType; | |||||
private Integer projectType; | |||||
@ExcelProperty("是否首次新建") | @ExcelProperty("是否首次新建") | ||||
private Boolean isFirst; | |||||
private Integer isFirst; | |||||
@ExcelProperty("关联应用") | @ExcelProperty("关联应用") | ||||
private Boolean includeApplication; | private Boolean includeApplication; | ||||
@@ -26,11 +26,11 @@ public class ProjectDeclareChoiceAction implements Action<ProjectStatusEnum, Pro | |||||
ProjectStatusEnum projectStatusEnum = stateContext.getTarget().getId(); | ProjectStatusEnum projectStatusEnum = stateContext.getTarget().getId(); | ||||
if (projectStatusEnum.equals(ProjectStatusEnum.PENDING_PREQUALIFICATION_CHOICE)){ | if (projectStatusEnum.equals(ProjectStatusEnum.PENDING_PREQUALIFICATION_CHOICE)){ | ||||
Project project = stateContext.getMessage().getHeaders().get(PROJECT_DECLARE, Project.class); | Project project = stateContext.getMessage().getHeaders().get(PROJECT_DECLARE, Project.class); | ||||
log.info("预审申报事件之前,项目的状态为:{}"+project.getProjectStatusSecond()); | |||||
log.info("预审申报事件之前,项目的状态为:{}"+project.getStatus()); | |||||
if (StateMachineUtils.isCityProject(project) && StateMachineUtils.judgeDeclareAmount(project)){ | if (StateMachineUtils.isCityProject(project) && StateMachineUtils.judgeDeclareAmount(project)){ | ||||
project.setProjectStatusSecond(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode()); | |||||
project.setStatus(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode()); | |||||
}else { | }else { | ||||
project.setProjectStatusSecond(ProjectStatusEnum.PRE_APPLYING.getCode()); | |||||
project.setStatus(ProjectStatusEnum.PRE_APPLYING.getCode()); | |||||
} | } | ||||
} | } | ||||
} | } | ||||
@@ -37,14 +37,14 @@ public class StateMachineUtils { | |||||
private StateMachinePersister projectDeclareStateMachinePersister; | private StateMachinePersister projectDeclareStateMachinePersister; | ||||
public void execute(Project project, ProjectStatusChangeEvent event) throws Exception{ | public void execute(Project project, ProjectStatusChangeEvent event) throws Exception{ | ||||
log.info("调用状态机前的项目状态为>>>>>>>>>>{}"+project.getProjectStatusSecond()); | |||||
log.info("调用状态机前的项目状态为>>>>>>>>>>{}"+project.getStatus()); | |||||
//获取TO状态机 | //获取TO状态机 | ||||
StateMachine<ProjectStatusEnum, ProjectStatusChangeEvent> stateMachine = projectDeclareStateMachineBuilder.build(); | StateMachine<ProjectStatusEnum, ProjectStatusChangeEvent> stateMachine = projectDeclareStateMachineBuilder.build(); | ||||
Message message = MessageBuilder.withPayload(event).setHeader(PROJECT_DECLARE, project).build(); | Message message = MessageBuilder.withPayload(event).setHeader(PROJECT_DECLARE, project).build(); | ||||
//初始化状态机 | //初始化状态机 | ||||
projectDeclareStateMachinePersister.restore(stateMachine,project); | projectDeclareStateMachinePersister.restore(stateMachine,project); | ||||
stateMachine.sendEvent(message); | stateMachine.sendEvent(message); | ||||
log.info("调用状态机后的项目状态为>>>>>>>>>>{}"+project.getProjectStatusSecond()); | |||||
log.info("调用状态机后的项目状态为>>>>>>>>>>{}"+project.getStatus()); | |||||
} | } | ||||
/** | /** | ||||
@@ -0,0 +1,21 @@ | |||||
package com.ningdatech.pmapi.projectlib.controller; | |||||
import io.swagger.annotations.Api; | |||||
import org.springframework.web.bind.annotation.RequestMapping; | |||||
import org.springframework.web.bind.annotation.RestController; | |||||
/** | |||||
* <p> | |||||
* AnnualPlanController | |||||
* </p> | |||||
* | |||||
* @author WendyYang | |||||
* @since 14:07 2023/2/11 | |||||
*/ | |||||
@RestController | |||||
@Api(tags = "年度计划库") | |||||
@RequestMapping("/api/v1/annualPlan") | |||||
public class AnnualPlanController { | |||||
} |
@@ -2,8 +2,9 @@ package com.ningdatech.pmapi.projectlib.controller; | |||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | ||||
import com.ningdatech.pmapi.projectlib.model.entity.Project; | import com.ningdatech.pmapi.projectlib.model.entity.Project; | ||||
import com.ningdatech.pmapi.projectlib.model.req.ProjectLibListReq; | |||||
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | |||||
import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | ||||
import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
@@ -32,7 +33,7 @@ public class ProjectLibController { | |||||
@GetMapping("/list") | @GetMapping("/list") | ||||
@ApiOperation("项目库列表") | @ApiOperation("项目库列表") | ||||
public PageVo<ProjectLibListItemVO> projectLibList(ProjectLibListReq req) { | |||||
public PageVo<ProjectLibListItemVO> projectLibList(ProjectListReq req) { | |||||
return projectLibManage.projectLibList(req); | return projectLibManage.projectLibList(req); | ||||
} | } | ||||
@@ -0,0 +1,46 @@ | |||||
package com.ningdatech.pmapi.projectlib.helper; | |||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |||||
import com.ningdatech.pmapi.projectlib.model.entity.Project; | |||||
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | |||||
/** | |||||
* <p> | |||||
* ProjectHelper | |||||
* </p> | |||||
* | |||||
* @author WendyYang | |||||
* @since 14:15 2023/2/11 | |||||
*/ | |||||
public class ProjectHelper { | |||||
/** | |||||
* 通用项目查询 | |||||
* | |||||
* @param req 查询条件 | |||||
* @return / | |||||
**/ | |||||
public static LambdaQueryWrapper<Project> projectQuery(ProjectListReq req) { | |||||
LambdaQueryWrapper<Project> query = new LambdaQueryWrapper<>(); | |||||
query.eq(req.getRegionCode() != null, Project::getAreaCode, req.getRegionCode()); | |||||
query.eq(req.getUserId() != null, Project::getCreateBy, req.getUserId()); | |||||
query.like(req.getProjectName() != null, Project::getProjectName, req.getProjectName()); | |||||
query.eq(req.getProjectType() != null, Project::getProjectType, req.getProjectType()); | |||||
query.eq(req.getProjectYear() != null, Project::getProjectYear, req.getProjectYear()); | |||||
query.eq(req.getStage() != null, Project::getStage, req.getStage()); | |||||
query.eq(req.getStatus() != null, Project::getStatus, req.getStatus()); | |||||
// 申报金额 | |||||
query.ge(req.getDeclareAmountMin() != null, Project::getDeclareAmount, req.getDeclareAmountMin()); | |||||
query.le(req.getDeclareAmountMax() != null, Project::getDeclareAmount, req.getDeclareAmountMax()); | |||||
// 申报时间 | |||||
query.ge(req.getCreateOnMin() != null, Project::getCreateOn, req.getCreateOnMin()); | |||||
query.le(req.getCreateOnMax() != null, Project::getCreateOn, req.getCreateOnMax()); | |||||
// 批复金额 | |||||
query.ge(req.getApproveAmountMin() != null, Project::getApprovalAmount, req.getApproveAmountMin()); | |||||
query.le(req.getApproveAmountMax() != null, Project::getApprovalAmount, req.getApproveAmountMax()); | |||||
query.like(req.getBuildOrg() != null, Project::getBuildOrgName, req.getBuildOrg()); | |||||
return query; | |||||
} | |||||
} |
@@ -0,0 +1,25 @@ | |||||
package com.ningdatech.pmapi.projectlib.manage; | |||||
import com.ningdatech.pmapi.projectlib.service.IProjectService; | |||||
import lombok.AllArgsConstructor; | |||||
import org.springframework.stereotype.Component; | |||||
/** | |||||
* <p> | |||||
* AnnualPlanLibManage | |||||
* </p> | |||||
* | |||||
* @author WendyYang | |||||
* @since 14:09 2023/2/11 | |||||
*/ | |||||
@Component | |||||
@AllArgsConstructor | |||||
public class AnnualPlanLibManage { | |||||
private final IProjectService projectService; | |||||
public void annulPlanLibList() { | |||||
} | |||||
} |
@@ -5,8 +5,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.basic.util.CollUtils; | import com.ningdatech.basic.util.CollUtils; | ||||
import com.ningdatech.pmapi.projectlib.helper.ProjectHelper; | |||||
import com.ningdatech.pmapi.projectlib.model.entity.Project; | import com.ningdatech.pmapi.projectlib.model.entity.Project; | ||||
import com.ningdatech.pmapi.projectlib.model.req.ProjectLibListReq; | |||||
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | |||||
import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | ||||
import com.ningdatech.pmapi.projectlib.service.IProjectService; | import com.ningdatech.pmapi.projectlib.service.IProjectService; | ||||
import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||
@@ -14,9 +15,6 @@ import org.springframework.stereotype.Component; | |||||
import java.util.List; | import java.util.List; | ||||
import static com.ningdatech.pmapi.common.utils.BizUtils.notBlank; | |||||
import static com.ningdatech.pmapi.common.utils.BizUtils.notNull; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
* ProjectLibManage | * ProjectLibManage | ||||
@@ -31,33 +29,8 @@ public class ProjectLibManage { | |||||
private final IProjectService projectService; | private final IProjectService projectService; | ||||
private LambdaQueryWrapper<Project> projectLibQuery(ProjectLibListReq req) { | |||||
LambdaQueryWrapper<Project> query = Wrappers.lambdaQuery(Project.class); | |||||
notBlank(req.getProjectName(), w -> query.like(Project::getProjectName, w)); | |||||
notNull(req.getProjectType(), w -> query.eq(Project::getProjectType, w)); | |||||
notNull(req.getProjectYear(), w -> query.eq(Project::getProjectYear, w)); | |||||
// 申报金额 批复金额 | |||||
notNull(req.getApproveAmountMin(), w -> query.ge(Project::getApprovalAmount, w)); | |||||
notNull(req.getApproveAmountMax(), w -> query.le(Project::getApprovalAmount, w)); | |||||
notNull(req.getDeclareAmountMax(), w -> query.le(Project::getDeclareAmount, w)); | |||||
notNull(req.getDeclareAmountMin(), w -> query.ge(Project::getDeclareAmount, w)); | |||||
// 状态查询 | |||||
notNull(req.getStatus1st(), w -> query.ge(Project::getStage, w)); | |||||
notNull(req.getStatus2nd(), w -> query.ge(Project::getStatus, w)); | |||||
notNull(req.getCreateOnMin(), w -> query.ge(Project::getCreateOn, w)); | |||||
notNull(req.getCreateOnMax(), w -> query.le(Project::getCreateOn, w)); | |||||
notBlank(req.getBuildUnit(), w -> query.like(Project::getBuildUnitName, w)); | |||||
query.orderByDesc(Project::getUpdateOn, Project::getCreateOn); | |||||
// TODO 区域编码处理 | |||||
return query; | |||||
} | |||||
public PageVo<ProjectLibListItemVO> projectLibList(ProjectLibListReq req) { | |||||
LambdaQueryWrapper<Project> query = projectLibQuery(req); | |||||
public PageVo<ProjectLibListItemVO> projectLibList(ProjectListReq req) { | |||||
LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req); | |||||
Page<Project> page = projectService.page(req.page(), query); | Page<Project> page = projectService.page(req.page(), query); | ||||
long total; | long total; | ||||
if ((total = page.getTotal()) == 0) { | if ((total = page.getTotal()) == 0) { | ||||
@@ -69,11 +42,11 @@ public class ProjectLibManage { | |||||
item.setProjectName(w.getProjectName()); | item.setProjectName(w.getProjectName()); | ||||
item.setCreateOn(w.getCreateOn()); | item.setCreateOn(w.getCreateOn()); | ||||
item.setDeclaredAmount(w.getDeclareAmount()); | item.setDeclaredAmount(w.getDeclareAmount()); | ||||
item.setStatus1st(w.getStage()); | |||||
item.setStatus2nd(w.getStatus()); | |||||
item.setStage(w.getStage()); | |||||
item.setStatus(w.getStatus()); | |||||
item.setProjectType(w.getProjectType()); | item.setProjectType(w.getProjectType()); | ||||
item.setProjectYear(w.getProjectYear()); | item.setProjectYear(w.getProjectYear()); | ||||
item.setBuildUnit(w.getBuildUnitName()); | |||||
item.setBuildOrg(w.getBuildOrgName()); | |||||
item.setBizDomain(w.getBizDomain()); | item.setBizDomain(w.getBizDomain()); | ||||
return item; | return item; | ||||
}); | }); | ||||
@@ -1,7 +1,5 @@ | |||||
package com.ningdatech.pmapi.projectlib.model.entity; | package com.ningdatech.pmapi.projectlib.model.entity; | ||||
import cn.hutool.core.io.FileUtil; | |||||
import cn.hutool.core.util.StrUtil; | |||||
import com.baomidou.mybatisplus.annotation.IdType; | import com.baomidou.mybatisplus.annotation.IdType; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; | ||||
import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
@@ -11,15 +9,11 @@ import lombok.Data; | |||||
import java.io.Serializable; | import java.io.Serializable; | ||||
import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
import java.nio.charset.StandardCharsets; | |||||
import java.time.LocalDateTime; | import java.time.LocalDateTime; | ||||
import java.util.List; | |||||
import java.util.regex.Matcher; | |||||
import java.util.regex.Pattern; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
* | |||||
* 项目b | |||||
* </p> | * </p> | ||||
* | * | ||||
* @author WendyYang | * @author WendyYang | ||||
@@ -67,13 +61,13 @@ public class Project implements Serializable { | |||||
private String contactPhone; | private String contactPhone; | ||||
@ApiModelProperty("建设单位名称") | @ApiModelProperty("建设单位名称") | ||||
private String buildUnitName; | |||||
private String buildOrgName; | |||||
@ApiModelProperty("建设单位统一社会信用代码") | @ApiModelProperty("建设单位统一社会信用代码") | ||||
private String buildUnitCode; | |||||
private String buildOrgCode; | |||||
@ApiModelProperty("建设单位浙政钉ID") | @ApiModelProperty("建设单位浙政钉ID") | ||||
private String buildUnitZheJiangGovernmentDingId; | |||||
private String buildOrgZheJiangGovDingId; | |||||
@ApiModelProperty("项目类型 1:建设 2:运维") | @ApiModelProperty("项目类型 1:建设 2:运维") | ||||
private Integer projectType; | private Integer projectType; | ||||
@@ -132,10 +126,10 @@ public class Project implements Serializable { | |||||
private BigDecimal declareHaveAmount; | private BigDecimal declareHaveAmount; | ||||
@ApiModelProperty("资金申报情况-政府投资-本级财政资金(万元)") | @ApiModelProperty("资金申报情况-政府投资-本级财政资金(万元)") | ||||
private BigDecimal declareGovernmentOwnFinanceAmount; | |||||
private BigDecimal declareGovOwnFinanceAmount; | |||||
@ApiModelProperty("资金申报情况-政府投资-上级补助资金(万元)") | @ApiModelProperty("资金申报情况-政府投资-上级补助资金(万元)") | ||||
private BigDecimal declareGovernmentSuperiorFinanceAmount; | |||||
private BigDecimal declareGovSuperiorFinanceAmount; | |||||
@ApiModelProperty("银行贷款(万元)") | @ApiModelProperty("银行贷款(万元)") | ||||
private BigDecimal declareBankLendingAmount; | private BigDecimal declareBankLendingAmount; | ||||
@@ -159,10 +153,10 @@ public class Project implements Serializable { | |||||
private BigDecimal annualPlanHaveAmount; | private BigDecimal annualPlanHaveAmount; | ||||
@ApiModelProperty("年度支付计划-政府投资-本级财政资金(万元)") | @ApiModelProperty("年度支付计划-政府投资-本级财政资金(万元)") | ||||
private BigDecimal annualPlanGovernmentOwnFinanceAmount; | |||||
private BigDecimal annualPlanGovOwnFinanceAmount; | |||||
@ApiModelProperty("年度支付计划-政府投资-上级补助资金(万元)") | @ApiModelProperty("年度支付计划-政府投资-上级补助资金(万元)") | ||||
private BigDecimal annualPlanGovernmentSuperiorFinanceAmount; | |||||
private BigDecimal annualPlanGovSuperiorFinanceAmount; | |||||
@ApiModelProperty("年度支付计划-银行贷款(万元)") | @ApiModelProperty("年度支付计划-银行贷款(万元)") | ||||
private BigDecimal annualPlanBankLendingAmount; | private BigDecimal annualPlanBankLendingAmount; | ||||
@@ -267,16 +261,16 @@ public class Project implements Serializable { | |||||
private BigDecimal approvedTotalInvestmentIncrease; | private BigDecimal approvedTotalInvestmentIncrease; | ||||
@ApiModelProperty("上级主管部门") | @ApiModelProperty("上级主管部门") | ||||
private String higherSuperUnit; | |||||
private String higherSuperOrg; | |||||
@ApiModelProperty("上级主管部门Code") | @ApiModelProperty("上级主管部门Code") | ||||
private String higherSuperUnitCode; | |||||
private String higherSuperOrgCode; | |||||
@ApiModelProperty("主管部门名称") | @ApiModelProperty("主管部门名称") | ||||
private String superUnit; | |||||
private String superOrg; | |||||
@ApiModelProperty("主管部门Code") | @ApiModelProperty("主管部门Code") | ||||
private String superUnitCode; | |||||
private String superOrgCode; | |||||
@ApiModelProperty("前端所需验证字段") | @ApiModelProperty("前端所需验证字段") | ||||
private Integer allApplicationsDone; | private Integer allApplicationsDone; | ||||
@@ -18,9 +18,9 @@ import java.time.LocalDateTime; | |||||
* @since 14:35 2023/2/1 | * @since 14:35 2023/2/1 | ||||
*/ | */ | ||||
@Data | @Data | ||||
@ApiModel("项目库列表查询") | |||||
@ApiModel("项目列表查询") | |||||
@EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
public class ProjectLibListReq extends PagePo { | |||||
public class ProjectListReq extends PagePo { | |||||
@ApiModelProperty("区域编码") | @ApiModelProperty("区域编码") | ||||
private String regionCode; | private String regionCode; | ||||
@@ -29,7 +29,7 @@ public class ProjectLibListReq extends PagePo { | |||||
private String projectName; | private String projectName; | ||||
@ApiModelProperty("申报单位") | @ApiModelProperty("申报单位") | ||||
private String buildUnit; | |||||
private String buildOrg; | |||||
@ApiModelProperty("项目类型") | @ApiModelProperty("项目类型") | ||||
private Integer projectType; | private Integer projectType; | ||||
@@ -37,11 +37,11 @@ public class ProjectLibListReq extends PagePo { | |||||
@ApiModelProperty("预算年度") | @ApiModelProperty("预算年度") | ||||
private Integer projectYear; | private Integer projectYear; | ||||
@ApiModelProperty("项目状态") | |||||
private Integer status1st; | |||||
@ApiModelProperty("项目阶段") | |||||
private Integer stage; | |||||
@ApiModelProperty("项目状态") | @ApiModelProperty("项目状态") | ||||
private Integer status2nd; | |||||
private Integer status; | |||||
@ApiModelProperty("申报金额") | @ApiModelProperty("申报金额") | ||||
private BigDecimal declareAmountMin; | private BigDecimal declareAmountMin; | ||||
@@ -61,4 +61,7 @@ public class ProjectLibListReq extends PagePo { | |||||
@ApiModelProperty("创建时间") | @ApiModelProperty("创建时间") | ||||
private LocalDateTime createOnMax; | private LocalDateTime createOnMax; | ||||
@ApiModelProperty("用户ID") | |||||
private Long userId; | |||||
} | } |
@@ -34,17 +34,17 @@ public class ProjectLibListItemVO { | |||||
@ApiModelProperty("项目类型") | @ApiModelProperty("项目类型") | ||||
private Integer projectType; | private Integer projectType; | ||||
@ApiModelProperty("项目状态") | |||||
private Integer status1st; | |||||
@ApiModelProperty("项目阶段") | |||||
private Integer stage; | |||||
@ApiModelProperty("项目状态") | @ApiModelProperty("项目状态") | ||||
private Integer status2nd; | |||||
private Integer status; | |||||
@ApiModelProperty("申报年度") | @ApiModelProperty("申报年度") | ||||
private Integer projectYear; | private Integer projectYear; | ||||
@ApiModelProperty("申报单位") | @ApiModelProperty("申报单位") | ||||
private String buildUnit; | |||||
private String buildOrg; | |||||
@ApiModelProperty("业务领域") | @ApiModelProperty("业务领域") | ||||
private String bizDomain; | private String bizDomain; | ||||
@@ -153,7 +153,7 @@ public class TodoCenterManage { | |||||
LambdaQueryWrapper<Project> wrapper = Wrappers.lambdaQuery(Project.class); | LambdaQueryWrapper<Project> wrapper = Wrappers.lambdaQuery(Project.class); | ||||
wrapper.like(StrUtil.isNotBlank(param.getProjectName()),Project::getProjectName,param.getProjectName()) | wrapper.like(StrUtil.isNotBlank(param.getProjectName()),Project::getProjectName,param.getProjectName()) | ||||
.like(StrUtil.isNotBlank(param.getBuildUnitName()),Project::getBuildUnitName,param.getBuildUnitName()) | |||||
.like(StrUtil.isNotBlank(param.getBuildUnitName()),Project::getBuildOrgName,param.getBuildUnitName()) | |||||
.eq(Objects.nonNull(param.getProjectYear()),Project::getProjectYear,param.getProjectYear()) | .eq(Objects.nonNull(param.getProjectYear()),Project::getProjectYear,param.getProjectYear()) | ||||
.eq(Objects.nonNull(param.getIsSupplement()),Project::getIsTemporaryAugment,param.getIsSupplement()) | .eq(Objects.nonNull(param.getIsSupplement()),Project::getIsTemporaryAugment,param.getIsSupplement()) | ||||
.ge(Objects.nonNull(param.getProcessLaunchStartTime()),Project::getBeginTime,param.getProcessLaunchStartTime()) | .ge(Objects.nonNull(param.getProcessLaunchStartTime()),Project::getBeginTime,param.getProcessLaunchStartTime()) | ||||
@@ -225,7 +225,7 @@ public class TodoCenterManage { | |||||
Page<Project> page = param.page(); | Page<Project> page = param.page(); | ||||
LambdaQueryWrapper<Project> wrapper = Wrappers.lambdaQuery(Project.class); | LambdaQueryWrapper<Project> wrapper = Wrappers.lambdaQuery(Project.class); | ||||
wrapper.like(StrUtil.isNotBlank(param.getProjectName()),Project::getProjectName,param.getProjectName()) | wrapper.like(StrUtil.isNotBlank(param.getProjectName()),Project::getProjectName,param.getProjectName()) | ||||
.like(StrUtil.isNotBlank(param.getBuildUnitName()),Project::getBuildUnitName,param.getBuildUnitName()) | |||||
.like(StrUtil.isNotBlank(param.getBuildUnitName()),Project::getBuildOrgName,param.getBuildUnitName()) | |||||
.eq(Objects.nonNull(param.getProjectYear()),Project::getProjectYear,param.getProjectYear()) | .eq(Objects.nonNull(param.getProjectYear()),Project::getProjectYear,param.getProjectYear()) | ||||
.eq(Objects.nonNull(param.getIsSupplement()),Project::getIsTemporaryAugment,param.getIsSupplement()) | .eq(Objects.nonNull(param.getIsSupplement()),Project::getIsTemporaryAugment,param.getIsSupplement()) | ||||
.ge(Objects.nonNull(param.getProcessLaunchStartTime()),Project::getBeginTime,param.getProcessLaunchStartTime()) | .ge(Objects.nonNull(param.getProcessLaunchStartTime()),Project::getBeginTime,param.getProcessLaunchStartTime()) | ||||
@@ -365,7 +365,7 @@ public class TodoCenterManage { | |||||
Project declaredProject = projectService.getOne(Wrappers.lambdaQuery(Project.class) | Project declaredProject = projectService.getOne(Wrappers.lambdaQuery(Project.class) | ||||
.eq(Project::getInstCode, task.getProcessInstanceId())); | .eq(Project::getInstCode, task.getProcessInstanceId())); | ||||
// 获取当前流程项目状态 | // 获取当前流程项目状态 | ||||
Integer projectStatusSecond = declaredProject.getProjectStatusSecond(); | |||||
Integer projectStatusSecond = declaredProject.getStatus(); | |||||
// 根据当前状态获取对应的通过事件 | // 根据当前状态获取对应的通过事件 | ||||
ProjectStatusChangeEvent event = stateMachineUtils.getProjectStatusRejectEvent(projectStatusSecond); | ProjectStatusChangeEvent event = stateMachineUtils.getProjectStatusRejectEvent(projectStatusSecond); | ||||
try { | try { | ||||
@@ -476,7 +476,7 @@ public class TodoCenterManage { | |||||
*/ | */ | ||||
private void updatePassProjectStatus(Task task, Long userId, Project declaredProject) { | private void updatePassProjectStatus(Task task, Long userId, Project declaredProject) { | ||||
// 获取当前流程项目状态 | // 获取当前流程项目状态 | ||||
Integer projectStatusSecond = declaredProject.getProjectStatusSecond(); | |||||
Integer projectStatusSecond = declaredProject.getStatus(); | |||||
// 根据当前状态获取对应的通过事件 | // 根据当前状态获取对应的通过事件 | ||||
ProjectStatusChangeEvent event = stateMachineUtils.getProjectStatusPassEvent(projectStatusSecond); | ProjectStatusChangeEvent event = stateMachineUtils.getProjectStatusPassEvent(projectStatusSecond); | ||||
try { | try { | ||||
@@ -687,7 +687,7 @@ public class TodoCenterManage { | |||||
Project declaredProject = projectService.getOne(Wrappers.lambdaQuery(Project.class) | Project declaredProject = projectService.getOne(Wrappers.lambdaQuery(Project.class) | ||||
.eq(Project::getInstCode, task.getProcessInstanceId())); | .eq(Project::getInstCode, task.getProcessInstanceId())); | ||||
// 获取当前流程项目状态 | // 获取当前流程项目状态 | ||||
Integer projectStatusSecond = declaredProject.getProjectStatusSecond(); | |||||
Integer projectStatusSecond = declaredProject.getStatus(); | |||||
// 根据当前状态获取对应的撤回事件 | // 根据当前状态获取对应的撤回事件 | ||||
ProjectStatusChangeEvent event = stateMachineUtils.getProjectStatusWithdrawEvent(projectStatusSecond); | ProjectStatusChangeEvent event = stateMachineUtils.getProjectStatusWithdrawEvent(projectStatusSecond); | ||||
try { | try { | ||||
@@ -943,7 +943,7 @@ public class TodoCenterManage { | |||||
LambdaQueryWrapper<Project> wrapper = Wrappers.lambdaQuery(Project.class); | LambdaQueryWrapper<Project> wrapper = Wrappers.lambdaQuery(Project.class); | ||||
wrapper.like(StrUtil.isNotBlank(param.getProjectName()),Project::getProjectName,param.getProjectName()) | wrapper.like(StrUtil.isNotBlank(param.getProjectName()),Project::getProjectName,param.getProjectName()) | ||||
.like(StrUtil.isNotBlank(param.getBuildUnitName()),Project::getBuildUnitName,param.getBuildUnitName()) | |||||
.like(StrUtil.isNotBlank(param.getBuildUnitName()),Project::getBuildOrgName,param.getBuildUnitName()) | |||||
.eq(Objects.nonNull(param.getProjectYear()),Project::getProjectYear,param.getProjectYear()) | .eq(Objects.nonNull(param.getProjectYear()),Project::getProjectYear,param.getProjectYear()) | ||||
.eq(Objects.nonNull(param.getIsSupplement()),Project::getIsTemporaryAugment,param.getIsSupplement()) | .eq(Objects.nonNull(param.getIsSupplement()),Project::getIsTemporaryAugment,param.getIsSupplement()) | ||||
.ge(Objects.nonNull(param.getProcessLaunchStartTime()),Project::getBeginTime,param.getProcessLaunchStartTime()) | .ge(Objects.nonNull(param.getProcessLaunchStartTime()),Project::getBeginTime,param.getProcessLaunchStartTime()) | ||||
@@ -1063,7 +1063,7 @@ public class TodoCenterManage { | |||||
Set<String> historicProcessInstanceIds = historicProcessInstances.stream().map(h -> h.getId()).collect(Collectors.toSet()); | Set<String> historicProcessInstanceIds = historicProcessInstances.stream().map(h -> h.getId()).collect(Collectors.toSet()); | ||||
LambdaQueryWrapper<Project> wrapper = Wrappers.lambdaQuery(Project.class); | LambdaQueryWrapper<Project> wrapper = Wrappers.lambdaQuery(Project.class); | ||||
wrapper.like(StrUtil.isNotBlank(param.getProjectName()),Project::getProjectName,param.getProjectName()) | wrapper.like(StrUtil.isNotBlank(param.getProjectName()),Project::getProjectName,param.getProjectName()) | ||||
.like(StrUtil.isNotBlank(param.getBuildUnitName()),Project::getBuildUnitName,param.getBuildUnitName()) | |||||
.like(StrUtil.isNotBlank(param.getBuildUnitName()),Project::getBuildOrgName,param.getBuildUnitName()) | |||||
.eq(Objects.nonNull(param.getProjectYear()),Project::getProjectYear,param.getProjectYear()) | .eq(Objects.nonNull(param.getProjectYear()),Project::getProjectYear,param.getProjectYear()) | ||||
.eq(Objects.nonNull(param.getIsSupplement()),Project::getIsTemporaryAugment,param.getIsSupplement()) | .eq(Objects.nonNull(param.getIsSupplement()),Project::getIsTemporaryAugment,param.getIsSupplement()) | ||||
.ge(Objects.nonNull(param.getProcessLaunchStartTime()),Project::getBeginTime,param.getProcessLaunchStartTime()) | .ge(Objects.nonNull(param.getProcessLaunchStartTime()),Project::getBeginTime,param.getProcessLaunchStartTime()) | ||||
@@ -1195,7 +1195,7 @@ public class TodoCenterManage { | |||||
LambdaQueryWrapper<Project> wrapper = Wrappers.lambdaQuery(Project.class); | LambdaQueryWrapper<Project> wrapper = Wrappers.lambdaQuery(Project.class); | ||||
wrapper.like(StrUtil.isNotBlank(param.getProjectName()),Project::getProjectName,param.getProjectName()) | wrapper.like(StrUtil.isNotBlank(param.getProjectName()),Project::getProjectName,param.getProjectName()) | ||||
.like(StrUtil.isNotBlank(param.getBuildUnitName()),Project::getBuildUnitName,param.getBuildUnitName()) | |||||
.like(StrUtil.isNotBlank(param.getBuildUnitName()),Project::getBuildOrgName,param.getBuildUnitName()) | |||||
.eq(Objects.nonNull(param.getProjectYear()),Project::getProjectYear,param.getProjectYear()) | .eq(Objects.nonNull(param.getProjectYear()),Project::getProjectYear,param.getProjectYear()) | ||||
.eq(Objects.nonNull(param.getIsSupplement()),Project::getIsTemporaryAugment,param.getIsSupplement()) | .eq(Objects.nonNull(param.getIsSupplement()),Project::getIsTemporaryAugment,param.getIsSupplement()) | ||||
.ge(Objects.nonNull(param.getProcessLaunchStartTime()),Project::getBeginTime,param.getProcessLaunchStartTime()) | .ge(Objects.nonNull(param.getProcessLaunchStartTime()),Project::getBeginTime,param.getProcessLaunchStartTime()) | ||||