预算看板代码功能

src/main/java/com/jeeplus/modules/sg/budgetSpectaculars/service/ProjectPostEvaluationService.java

@@ -45,7 +45,7 @@ public class ProjectPostEvaluationService extends CrudService<ProjectPostEvaluat
                     info.setPlanStartWorkingTimeAccuracyFlag(2);
                 }else if(differenceValue > 30){
                     info.setPlanStartWorkingTimeAccuracy(differenceValue.toString());
-                    info.setPlanStartWorkingTimeAccuracyFlag(4);
+                    info.setPlanStartWorkingTimeAccuracyFlag(3);
                 }if(differenceValue<0){
                     info.setPlanStartWorkingTimeAccuracy("逻辑错误");
                     info.setPlanStartWorkingTimeAccuracyFlag(4);
@@ -61,7 +61,7 @@ public class ProjectPostEvaluationService extends CrudService<ProjectPostEvaluat
                     info.setCalculateAuditDateTimelyFlag(0);
                 }else if (30 < differenceValue) {
                     info.setCalculateAuditDateTimely(differenceValue.toString());
-                    info.setCalculateAuditDateTimelyFlag(4);
+                    info.setCalculateAuditDateTimelyFlag(3);
                 }else if(differenceValue<0){
                     info.setCalculateAuditDateTimely("逻辑错误");
                     info.setCalculateAuditDateTimelyFlag(4);
@@ -77,7 +77,7 @@ public class ProjectPostEvaluationService extends CrudService<ProjectPostEvaluat
                     info.setCalculateExamineDateTimelyFlag(0);
                 }else if (30 < differenceValue) {
                     info.setCalculateExamineDateTimely(differenceValue.toString());
-                    info.setCalculateExamineDateTimelyFlag(4);
+                    info.setCalculateExamineDateTimelyFlag(3);
                 }else if(differenceValue<0){
                     info.setCalculateExamineDateTimely("逻辑错误");
                     info.setCalculateExamineDateTimelyFlag(4);
@@ -94,7 +94,7 @@ public class ProjectPostEvaluationService extends CrudService<ProjectPostEvaluat
                     info.setConstructionFeeRecordedTimelyFlag(0);
                 }else if (6 < differenceValue) {
                     info.setConstructionFeeRecordedTimely(differenceValue.toString());
-                    info.setConstructionFeeRecordedTimelyFlag(4);
+                    info.setConstructionFeeRecordedTimelyFlag(3);
                 }else if(differenceValue<0){
                     info.setConstructionFeeRecordedTimely("逻辑错误");
                     info.setConstructionFeeRecordedTimelyFlag(4);
@@ -119,7 +119,7 @@ public class ProjectPostEvaluationService extends CrudService<ProjectPostEvaluat
                     info.setCompletionSettlementDateTimelyFlag(0);
                 }else if (5 < differenceValue) {
                     info.setCompletionSettlementDateTimely(differenceValue.toString());
-                    info.setCompletionSettlementDateTimelyFlag(4);
+                    info.setCompletionSettlementDateTimelyFlag(3);
                 }else if(differenceValue<0){
                     info.setCompletionSettlementDateTimely("逻辑错误");
                     info.setCompletionSettlementDateTimelyFlag(4);
@@ -136,7 +136,7 @@ public class ProjectPostEvaluationService extends CrudService<ProjectPostEvaluat
                     info.setFinalAuditDateTimelyFlag(0);
                 }else if (5 < differenceValue) {
                     info.setFinalAuditDateTimely(differenceValue.toString());
-                    info.setFinalAuditDateTimelyFlag(4);
+                    info.setFinalAuditDateTimelyFlag(3);
                 }else if(differenceValue<0){
                     info.setFinalAuditDateTimely("逻辑错误");
                     info.setFinalAuditDateTimelyFlag(4);
@@ -153,7 +153,7 @@ public class ProjectPostEvaluationService extends CrudService<ProjectPostEvaluat
                     info.setFinalAccountsAuditReportTimelyFlag(0);
                 }else if (15 < differenceValue) {
                     info.setFinalAccountsAuditReportTimely(differenceValue.toString());
-                    info.setFinalAccountsAuditReportTimelyFlag(4);
+                    info.setFinalAccountsAuditReportTimelyFlag(3);
                 }else if(differenceValue<0){
                     info.setFinalAccountsAuditReportTimely("逻辑错误");
                     info.setFinalAccountsAuditReportTimelyFlag(4);

src/main/java/com/jeeplus/modules/sg/budgetSpectaculars/service/ProjectWarnExamineService.java

@@ -97,15 +97,7 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
             //处理计划开工日期准确性   |计划开工日期- 首次领料日期| 两个日期均有为绿灯 0-15天（含15天）灰色 15-30天（含30天）黄灯 30天以上红灯（字体颜色）
             Integer absoluteDifferenceValue = dateDifferenceValue(info.getPlanStartUpDate(), info.getFirstAcquisitionTime());
             if(StringUtils.isNotBlank(info.getPlanStartUpDate()) && StringUtils.isNotBlank(info.getFirstAcquisitionTime())){
-                absoluteDifferenceValue = absoluteValue(absoluteDifferenceValue);
-                info.setPlanStartWorkingTimeAccuracy(absoluteDifferenceValue.toString());
-                if (0 <= absoluteDifferenceValue &&  absoluteDifferenceValue<= 15) {
-                    info.setPlanStartWorkingTimeAccuracyFlag(0);
-                }else if (15 < absoluteDifferenceValue &&  absoluteDifferenceValue<= 30) {
-                    info.setPlanStartWorkingTimeAccuracyFlag(2);
-                }else if (30 < absoluteDifferenceValue) {
-                    info.setPlanStartWorkingTimeAccuracyFlag(3);
-                }
+
             }else{
                 if(null == absoluteDifferenceValue){
                     info.setPlanStartWorkingTimeAccuracy("");
@@ -127,17 +119,7 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
             //处理 结算送审日期及时性  结算送审日期-实际竣工日期 两个日期均有为绿灯 0-15天（含15天）灰色 15-30天（含30天）黄灯 30天以上红灯 小于0天，显示“逻辑错误”
             Integer differenceValue = dateDifferenceValue(info.getCalculationForReviewTime(), info.getPracticalcompletionDate());
             if(StringUtils.isNotBlank(info.getCalculationForReviewTime()) && StringUtils.isNotBlank(info.getPracticalcompletionDate())){
-                info.setCalculateAuditDateTimely(differenceValue.toString());
-                if (0 <= differenceValue &&  differenceValue<= 15) {
-                    info.setCalculateAuditDateTimelyFlag(0);
-                }else if (15 < differenceValue &&  differenceValue<= 30) {
-                    info.setCalculateAuditDateTimelyFlag(2);
-                }else if (30 < differenceValue) {
-                    info.setCalculateAuditDateTimelyFlag(3);
-                } else if (differenceValue < 0) {
-                    info.setCalculateAuditDateTimely("逻辑错误");
-                    info.setCalculateAuditDateTimelyFlag(4);
-                }
+
             }else{
                 if(null == differenceValue){
                     info.setCalculateAuditDateTimely("");
@@ -161,17 +143,7 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
             //处理 结算审定日期及时性  结算审定日期-结算送审日期 两个日期均有为绿灯 0-15天（含15天）灰色 15-30天（含30天）黄灯 30天以上红灯 小于0天，显示“逻辑错误”
             differenceValue = dateDifferenceValue(info.getCalculationExamineTime(), info.getCalculationForReviewTime());
             if(StringUtils.isNotBlank(info.getCalculationExamineTime()) && StringUtils.isNotBlank(info.getCalculationForReviewTime())){
-                info.setCalculateExamineDateTimely(differenceValue.toString());
-                if (0 <= differenceValue &&  differenceValue<= 15) {
-                    info.setCalculateExamineDateTimelyFlag(0);
-                }else if (15 < differenceValue &&  differenceValue<= 30) {
-                    info.setCalculateExamineDateTimelyFlag(2);
-                }else if (30 < differenceValue) {
-                    info.setCalculateExamineDateTimelyFlag(3);
-                } else if (differenceValue < 0) {
-                    info.setCalculateExamineDateTimely("逻辑错误");
-                    info.setCalculateExamineDateTimelyFlag(4);
-                }
+
             }else{
                 if(null == differenceValue){
                     info.setCalculateExamineDateTimely("");
@@ -195,17 +167,7 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
             //处理 施工费入账日期及时性  施工费入账日期-结算审定日期 两个日期均有为绿灯 0-3天（含3天）灰色 3-6天（含6天）黄灯 6天以上红灯 小于0天，显示“逻辑错误”
             differenceValue = dateDifferenceValue(info.getFirstConstructionFeeRecordedTime(), info.getCalculationExamineTime());
             if(StringUtils.isNotBlank(info.getFirstConstructionFeeRecordedTime()) && StringUtils.isNotBlank(info.getCalculationExamineTime())){
-                info.setConstructionFeeRecordedTimely(differenceValue.toString());
-                if (0 <= differenceValue &&  differenceValue<= 3) {
-                    info.setConstructionFeeRecordedTimelyFlag(0);
-                }else if (3 < differenceValue &&  differenceValue<= 6) {
-                    info.setConstructionFeeRecordedTimelyFlag(2);
-                }else if (6 < differenceValue) {
-                    info.setConstructionFeeRecordedTimelyFlag(3);
-                } else if (differenceValue < 0) {
-                    info.setConstructionFeeRecordedTimely("逻辑错误");
-                    info.setConstructionFeeRecordedTimelyFlag(4);
-                }
+
             }else{
                 if(null == differenceValue){
                     info.setConstructionFeeRecordedTimely("");
@@ -237,17 +199,7 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
             //处理 提报竣工决算日期及时性  提报竣工决算日期-施工费入账日期 两个日期均有为绿灯 0-2天（含2天）灰色 3-4天（含4天）黄灯 5天以上红灯 小于0天，显示“逻辑错误”
             differenceValue = dateDifferenceValue(info.getCompletedActualBudgetTime(), info.getFirstConstructionFeeRecordedTime());
             if(StringUtils.isNotBlank(info.getCompletedActualBudgetTime()) && StringUtils.isNotBlank(info.getFirstConstructionFeeRecordedTime())){
-                info.setCompletionSettlementDateTimely(differenceValue.toString());
-                if (0 <= differenceValue &&  differenceValue<= 2) {
-                    info.setCompletionSettlementDateTimelyFlag(0);
-                }else if (2 < differenceValue &&  differenceValue<= 4) {
-                    info.setCompletionSettlementDateTimelyFlag(2);
-                }else if (4 < differenceValue) {
-                    info.setCompletionSettlementDateTimelyFlag(3);
-                } else if (differenceValue < 0) {
-                    info.setCompletionSettlementDateTimely("逻辑错误");
-                    info.setCompletionSettlementDateTimelyFlag(4);
-                }
+
             }else{
                 if(null == differenceValue){
                     info.setCompletionSettlementDateTimely("");
@@ -271,17 +223,7 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
             //处理 决算送审日期及时性  决算送审日期-提报竣工决算日期 两个日期均有为绿灯 0-3天（含3天）灰色 4-5天（含5天）黄灯 5天以上红灯 小于0天，显示“逻辑错误”
             differenceValue = dateDifferenceValue(info.getActualBudgetSubmittalsTime(), info.getCompletedActualBudgetTime());
             if(StringUtils.isNotBlank(info.getActualBudgetSubmittalsTime()) && StringUtils.isNotBlank(info.getCompletedActualBudgetTime())){
-                info.setFinalAuditDateTimely(differenceValue.toString());
-                if (0 <= differenceValue &&  differenceValue<= 3) {
-                    info.setFinalAuditDateTimelyFlag(0);
-                }else if (3 < differenceValue &&  differenceValue<= 5) {
-                    info.setFinalAuditDateTimelyFlag(2);
-                }else if (5 < differenceValue) {
-                    info.setFinalAuditDateTimelyFlag(3);
-                } else if (differenceValue < 0) {
-                    info.setFinalAuditDateTimely("逻辑错误");
-                    info.setFinalAuditDateTimelyFlag(4);
-                }
+
             }else{
                 if(null == differenceValue){
                     info.setFinalAuditDateTimely("");
@@ -305,17 +247,7 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
             //处理 出具决算审计报告及时性  决算审计报告出具日期-决算送审日期 两个日期均有为绿灯 0-7天（含7天）灰色 8-15天（含15天）黄灯 15天以上 小于0天，显示“逻辑错误”
             differenceValue = dateDifferenceValue(info.getActualBudgetSubmittalsTime(), info.getCompletedActualBudgetTime());
             if(StringUtils.isNotBlank(info.getActualBudgetSubmittalsTime()) && StringUtils.isNotBlank(info.getCompletedActualBudgetTime())){
-                info.setFinalAccountsAuditReportTimely(differenceValue.toString());
-                if (0 <= differenceValue &&  differenceValue<= 7) {
-                    info.setFinalAccountsAuditReportTimelyFlag(0);
-                }else if (7 < differenceValue &&  differenceValue<= 15) {
-                    info.setFinalAccountsAuditReportTimelyFlag(2);
-                }else if (15 < differenceValue) {
-                    info.setFinalAccountsAuditReportTimelyFlag(3);
-                } else if (differenceValue < 0) {
-                    info.setFinalAccountsAuditReportTimely("逻辑错误");
-                    info.setFinalAccountsAuditReportTimelyFlag(4);
-                }
+
             }else{
                 if(null == differenceValue){
                     info.setFinalAccountsAuditReportTimely("");
@@ -351,6 +283,10 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
         for (ProjectWarnExamineInfo info: projectCourseControlList) {
             //计划开工日期准确性
             if(null != info.getPlanStartWorkingTimeAccuracyFlag()){
+                System.out.println(info.getPlanStartWorkingTimeAccuracyFlag());
+                if(3 == info.getPlanStartWorkingTimeAccuracyFlag()){
+                    System.out.println("");
+                }
                 switch (info.getPlanStartWorkingTimeAccuracyFlag()){
                     case 0:
                         if(null == warnExamineInfo.getPlanStartUpGreenCount()){
@@ -373,6 +309,13 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
                             warnExamineInfo.setPlanStartUpRedCount(warnExamineInfo.getPlanStartUpRedCount() + 1);
                         }
                         break;
+                    case 4:
+                        if(null == warnExamineInfo.getPlanStartUpErrorCount()){
+                            warnExamineInfo.setPlanStartUpErrorCount(1);
+                        }else{
+                            warnExamineInfo.setPlanStartUpErrorCount(warnExamineInfo.getPlanStartUpErrorCount() + 1);
+                        }
+                        break;
                 }
             }
 
@@ -632,9 +575,9 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
         warnExamineInfo.setPlanStartUpRedCount(courseInfo.getPlanStartUpRedCount() + evaluationInfo.getPlanStartUpRedCount());
         //送审结算日期及时性
         warnExamineInfo.setCalculationForReviewGreenCount(courseInfo.getCalculationForReviewGreenCount() + evaluationInfo.getCalculationForReviewGreenCount());
-        warnExamineInfo.setCalculationForReviewYellowCount(courseInfo.getCalculationForReviewYellowCount() + evaluationInfo.getCalculationForReviewGreenCount());
-        warnExamineInfo.setCalculationForReviewRedCount(courseInfo.getCalculationForReviewRedCount() + evaluationInfo.getCalculationForReviewGreenCount());
-        warnExamineInfo.setCalculationForReviewErrorCount(courseInfo.getCalculationForReviewErrorCount() + evaluationInfo.getCalculationForReviewGreenCount());
+        warnExamineInfo.setCalculationForReviewYellowCount(courseInfo.getCalculationForReviewYellowCount() + evaluationInfo.getCalculationForReviewYellowCount());
+        warnExamineInfo.setCalculationForReviewRedCount(courseInfo.getCalculationForReviewRedCount() + evaluationInfo.getCalculationForReviewRedCount());
+        warnExamineInfo.setCalculationForReviewErrorCount(courseInfo.getCalculationForReviewErrorCount() + evaluationInfo.getCalculationForReviewErrorCount());
         //结算审定日期及时性
         warnExamineInfo.setCalculationExamineGreenCount(courseInfo.getCalculationExamineGreenCount() + evaluationInfo.getCalculationExamineGreenCount());
         warnExamineInfo.setCalculationExamineYellowCount(courseInfo.getCalculationExamineYellowCount() + evaluationInfo.getCalculationExamineYellowCount());
@@ -689,7 +632,7 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
                     info.setPlanStartWorkingTimeAccuracyFlag(2);
                 }else if(differenceValue > 30){
                     info.setPlanStartWorkingTimeAccuracy(differenceValue.toString());
-                    info.setPlanStartWorkingTimeAccuracyFlag(4);
+                    info.setPlanStartWorkingTimeAccuracyFlag(3);
                 }if(differenceValue<0){
                     info.setPlanStartWorkingTimeAccuracy("逻辑错误");
                     info.setPlanStartWorkingTimeAccuracyFlag(4);
@@ -706,7 +649,7 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
                     info.setCalculateAuditDateTimelyFlag(0);
                 }else if (30 < differenceValue) {
                     info.setCalculateAuditDateTimely(differenceValue.toString());
-                    info.setCalculateAuditDateTimelyFlag(4);
+                    info.setCalculateAuditDateTimelyFlag(3);
                 }else if(differenceValue<0){
                     info.setCalculateAuditDateTimely("逻辑错误");
                     info.setCalculateAuditDateTimelyFlag(4);
@@ -723,7 +666,7 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
                     info.setCalculateExamineDateTimelyFlag(0);
                 }else if (30 < differenceValue) {
                     info.setCalculateExamineDateTimely(differenceValue.toString());
-                    info.setCalculateExamineDateTimelyFlag(4);
+                    info.setCalculateExamineDateTimelyFlag(3);
                 }else if(differenceValue<0){
                     info.setCalculateExamineDateTimely("逻辑错误");
                     info.setCalculateExamineDateTimelyFlag(4);
@@ -741,7 +684,7 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
                     info.setConstructionFeeRecordedTimelyFlag(0);
                 }else if (6 < differenceValue) {
                     info.setConstructionFeeRecordedTimely(differenceValue.toString());
-                    info.setConstructionFeeRecordedTimelyFlag(4);
+                    info.setConstructionFeeRecordedTimelyFlag(3);
                 }else if(differenceValue<0){
                     info.setConstructionFeeRecordedTimely("逻辑错误");
                     info.setConstructionFeeRecordedTimelyFlag(4);
@@ -767,7 +710,7 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
                     info.setCompletionSettlementDateTimelyFlag(0);
                 }else if (5 < differenceValue) {
                     info.setCompletionSettlementDateTimely(differenceValue.toString());
-                    info.setCompletionSettlementDateTimelyFlag(4);
+                    info.setCompletionSettlementDateTimelyFlag(3);
                 }else if(differenceValue<0){
                     info.setCompletionSettlementDateTimely("逻辑错误");
                     info.setCompletionSettlementDateTimelyFlag(4);
@@ -785,7 +728,7 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
                     info.setFinalAuditDateTimelyFlag(0);
                 }else if (5 < differenceValue) {
                     info.setFinalAuditDateTimely(differenceValue.toString());
-                    info.setFinalAuditDateTimelyFlag(4);
+                    info.setFinalAuditDateTimelyFlag(3);
                 }else if(differenceValue<0){
                     info.setFinalAuditDateTimely("逻辑错误");
                     info.setFinalAuditDateTimelyFlag(4);
@@ -803,7 +746,7 @@ public class ProjectWarnExamineService extends CrudService<ProjectWarnExamineMap
                     info.setFinalAccountsAuditReportTimelyFlag(0);
                 }else if (15 < differenceValue) {
                     info.setFinalAccountsAuditReportTimely(differenceValue.toString());
-                    info.setFinalAccountsAuditReportTimelyFlag(4);
+                    info.setFinalAccountsAuditReportTimelyFlag(3);
                 }else if(differenceValue<0){
                     info.setFinalAccountsAuditReportTimely("逻辑错误");
                     info.setFinalAccountsAuditReportTimelyFlag(4);

src/main/webapp/webpage/modules/sg/project/projectWarnExamine/projectWarnExamineList.js

@@ -129,7 +129,7 @@ $(document).ready(function() {
                       title: '核对甲供材是否一致',
                        align: 'center',
                        width: 200,
-                      colspan:4
+                      colspan:2
 		    }
 			,{
                       title: '提报竣工决算日期及时性',
@@ -214,7 +214,7 @@ $(document).ready(function() {
                 field: 'constructionFeeRecordedErrorCount',
                 formatter:paramsMatterTable,
                 title: '逻辑错误'
-            },{
+            }/*,{
                 field: 'whichMaterialStoresReturnedRedCount',
                 formatter:paramsMatterTable,
                 title: '红'
@@ -222,14 +222,14 @@ $(document).ready(function() {
                 field: 'whichMaterialStoresReturnedYellowCount',
                 formatter:paramsMatterTable,
                 title: '黄'
-            },{
+            }*/,{
                 field: 'whichMaterialStoresReturnedGreenCount',
                 formatter:paramsMatterTable,
-                title: '绿'
+                title: '是'
             },{
                 field: 'whichMaterialStoresReturnedErrorCount',
                 formatter:paramsMatterTable,
-                title: '逻辑错误'
+                title: '否'
             },{
                 field: 'completedActualBudgetRedCount',
                 formatter:paramsMatterTable,