Browse Source

申报省局 重新rebug

master
PoffyZhang 1 year ago
parent
commit
6a71b83602
2 changed files with 1 additions and 3 deletions
  1. +1
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java
  2. +0
    -2
      pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java

+ 1
- 1
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java View File

@@ -75,7 +75,7 @@ public class DefaultDeclaredProjectManage {
.throwMessage(String.format("申报失败! 申报总金额【%s】 不等于其它申报金额 【%s】",declareAmount,totalAmount)); .throwMessage(String.format("申报失败! 申报总金额【%s】 不等于其它申报金额 【%s】",declareAmount,totalAmount));


//判断 年度计划金额 如果开着的话 //判断 年度计划金额 如果开着的话
if(projectInfo.getIsAnnualPlanAmount()){
if(Objects.nonNull(projectInfo.getAnnualPlanAmount())){
BigDecimal annualPlanAmount = projectInfo.getAnnualPlanAmount(); BigDecimal annualPlanAmount = projectInfo.getAnnualPlanAmount();


VUtils.isTrue(annualPlanAmount.compareTo(BigDecimal.ZERO) <= 0) VUtils.isTrue(annualPlanAmount.compareTo(BigDecimal.ZERO) <= 0)


+ 0
- 2
pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java View File

@@ -2,11 +2,9 @@ package com.ningdatech.pmapi.sys.controller;


import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.model.PageVo;
import com.ningdatech.pmapi.projectdeclared.manage.DefaultDeclaredProjectManage; import com.ningdatech.pmapi.projectdeclared.manage.DefaultDeclaredProjectManage;
import com.ningdatech.pmapi.user.util.LoginUserUtil;
import com.wflow.bean.dto.WflowModelHistorysDto; import com.wflow.bean.dto.WflowModelHistorysDto;
import com.wflow.bean.vo.WflowModelVo; import com.wflow.bean.vo.WflowModelVo;
import com.wflow.service.ModelGroupService; import com.wflow.service.ModelGroupService;
import com.wflow.workflow.bean.dto.OrgInfoDTO;
import com.wflow.workflow.service.ProcessModelService; import com.wflow.workflow.service.ProcessModelService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;


Loading…
Cancel
Save