Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/converter/ApplicationConverter.java

@@ -57,6 +57,7 @@ public class ApplicationConverter {
                 .otherFile(projectInfo.getPreliminaryPlanFile())
                 .projectRemark(projectInfo.getProjectRemarks())
                 .includeApplication(projectInfo.getIncludeApplication())
+                .isEffective(1)
                 .projectApplyFile(projectInfo.getProjectApplicationForm())
                 .researchReport(projectInfo.getPreliminaryPlanFile())
                 .applicationInfo(convertApplications(applications))

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java

@@ -75,7 +75,7 @@ public class DefaultDeclaredProjectManage {
                     .throwMessage(String.format("申报失败! 申报总金额【%s】 不等于其它申报金额 【%s】",declareAmount,totalAmount));
 
             //判断 年度计划金额 如果开着的话
-            if(projectInfo.getIsAnnualPlanAmount()){
+            if(Objects.nonNull(projectInfo.getAnnualPlanAmount())){
                 BigDecimal annualPlanAmount = projectInfo.getAnnualPlanAmount();
 
                 VUtils.isTrue(annualPlanAmount.compareTo(BigDecimal.ZERO) <= 0)

pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CheckProvincialReviewResultTask.java

@@ -39,7 +39,7 @@ public class CheckProvincialReviewResultTask {
     private final IProjectService projectService;
     private final StateMachineUtils stateMachineUtils;
 
-    @Scheduled(cron = "0 */5 * * * ?")
+    @Scheduled(cron = "0 */2 * * * ?")
     public void statusFlow() throws UnknownHostException {
         //测试暂时用自己电脑HOST
         if (TaskContant.Host.HOST_207.equals(InetAddress.getLocalHost().getHostName())) {

pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java

@@ -2,11 +2,9 @@ package com.ningdatech.pmapi.sys.controller;
 
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.pmapi.projectdeclared.manage.DefaultDeclaredProjectManage;
-import com.ningdatech.pmapi.user.util.LoginUserUtil;
 import com.wflow.bean.dto.WflowModelHistorysDto;
 import com.wflow.bean.vo.WflowModelVo;
 import com.wflow.service.ModelGroupService;
-import com.wflow.workflow.bean.dto.OrgInfoDTO;
 import com.wflow.workflow.service.ProcessModelService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;