修改 用地统计图表颜色改为指定颜色 表格添加不动产简易流程的统计

src/main/java/platform/modules/government/service/LandStatisticsService.java

@@ -44,7 +44,7 @@ public class LandStatisticsService {
         //创建待处理具体
         Integer pendingCompany = 0, pendingStreet = 0;
         //创建处理中具体
-        Integer processingLocalAudit = 0, processingDistribute = 0, processingComplianceAudit = 0, processingUnitedAudit = 0, processingGovernmentAudit = 0, processingHGXSCTG = 0;
+        Integer processingLocalAudit = 0, processingDistribute = 0, processingEasyProcess = 0, processingComplianceAudit = 0, processingUnitedAudit = 0, processingGovernmentAudit = 0, processingHGXSCTG = 0;
         //创建已处理具体
         Integer processedPassed = 0, processedReject = 0, processedNotPass = 0;
 
@@ -70,6 +70,9 @@ public class LandStatisticsService {
             } else if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.PENDING_DISTRIBUTE)) {
                 //处于待分发
                 processingDistribute++;
+            } else if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.JYLCHQ)) {
+                //处于简易流程
+                processingEasyProcess++;
             } else if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.COMPLIANCE_AUDIT)) {
                 //处于合规性审查
                 processingComplianceAudit++;
@@ -119,6 +122,10 @@ public class LandStatisticsService {
         temp.put("value", processingDistribute);
         processing.add(temp);
         temp = new HashMap<>();
+        temp.put("name", "简易流程办理中");
+        temp.put("value", processingEasyProcess);
+        processing.add(temp);
+        temp = new HashMap<>();
         temp.put("name", "合规性审查");
         temp.put("value", processingComplianceAudit);
         processing.add(temp);
@@ -493,7 +500,8 @@ public class LandStatisticsService {
 
             //初始化统计值
             int rentApplyAmountNum = 0, rentPassAmountNum = 0, useChangeApplyAmountNum = 0, useChangePassAmountNum = 0, immovablesChangeApplyAmountNum = 0, immovablesChangePassAmountNum = 0,
-                    equityStructureChangeApplyAmountNum = 0, equityStructureChangePassAmountNum = 0, summaryProcedureApplyAmountNum = 0, summaryProcedurePassAmountNum = 0, totalApplyAmountNum = 0, totalPassAmountNum = 0;
+                    equityStructureChangeApplyAmountNum = 0, equityStructureChangePassAmountNum = 0, equityStructureChangeSummaryProcedureApplyAmountNum = 0, equityStructureChangeSummaryProcedurePassAmountNum = 0,
+                    immovablesChangeSummaryProcedureApplyAmountNum = 0, immovablesChangeSummaryProcedurePassAmountNum = 0, totalApplyAmountNum = 0, totalPassAmountNum = 0;
             for (int i = 0; i < mounthCount; i++) {
 
                 map = new HashMap<>();
@@ -504,7 +512,8 @@ public class LandStatisticsService {
 
                 //初始化统计值
                 int rentApplyNum = 0, rentPassNum = 0, useChangeApplyNum = 0, useChangePassNum = 0, immovablesChangeApplyNum = 0, immovablesChangePassNum = 0,
-                        equityStructureChangeApplyNum = 0, equityStructureChangePassNum = 0, summaryProcedureApplyNum = 0, summaryProcedurePassNum = 0, totalApplyNum = 0, totalPassNum = 0;
+                        equityStructureChangeApplyNum = 0, equityStructureChangePassNum = 0, equityStructureChangeSummaryProcedureApplyNum = 0, equityStructureChangeSummaryProcedurePassNum = 0,
+                        immovablesChangeSummaryProcedureApplyNum = 0, immovablesChangeSummaryProcedurePassNum = 0, totalApplyNum = 0, totalPassNum = 0;
 
                 for (StockLandStatistic stockLand : stockLandList) {
                     DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
@@ -537,12 +546,20 @@ public class LandStatisticsService {
                             //存量工业用地不动产权权属转移登记
                             totalApplyNum++;
                             immovablesChangeApplyNum++;
+                            //是否简易流程
+                            if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.JYLCHQ)) {
+                                immovablesChangeSummaryProcedureApplyNum++;
+                            }
                             if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.PASSED)
                                     || Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.NOTPASSED)
                                     || Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.APPROVED)) {
                                 //通过
                                 totalPassNum++;
                                 immovablesChangePassNum++;
+                                //是否简易流程
+                                if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.EASY_PROCESS_APPROVED)) {
+                                    immovablesChangeSummaryProcedurePassNum++;
+                                }
                             }
                         } else if (Objects.equals(stockLand.getApply_type(), Constant.LandApplyType.EQUITY_STRUCTURE_CHANGE)) {
                             //存量工业用地项目公司股权（结构）变更登记
@@ -550,7 +567,7 @@ public class LandStatisticsService {
                             equityStructureChangeApplyNum++;
                             //是否简易流程
                             if (StringUtils.isNotEmpty(stockLand.getSummary_procedure())) {
-                                summaryProcedureApplyNum++;
+                                equityStructureChangeSummaryProcedureApplyNum++;
                             }
                             if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.PASSED)
                                     || Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.NOTPASSED)
@@ -560,7 +577,7 @@ public class LandStatisticsService {
                                 equityStructureChangePassNum++;
                                 //是否简易流程
                                 if (StringUtils.isNotEmpty(stockLand.getSummary_procedure())) {
-                                    summaryProcedurePassNum++;
+                                    equityStructureChangeSummaryProcedurePassNum++;
                                 }
                             }
                         }
@@ -579,8 +596,11 @@ public class LandStatisticsService {
                 equityStructureChangeApplyAmountNum += equityStructureChangeApplyNum;
                 equityStructureChangePassAmountNum += equityStructureChangePassNum;
 
-                summaryProcedureApplyAmountNum += summaryProcedureApplyNum;
-                summaryProcedurePassAmountNum += summaryProcedurePassNum;
+                equityStructureChangeSummaryProcedureApplyAmountNum += equityStructureChangeSummaryProcedureApplyNum;
+                equityStructureChangeSummaryProcedurePassAmountNum += equityStructureChangeSummaryProcedurePassNum;
+
+                immovablesChangeSummaryProcedureApplyAmountNum += immovablesChangeSummaryProcedureApplyNum;
+                immovablesChangeSummaryProcedurePassAmountNum += immovablesChangeSummaryProcedurePassNum;
 
                 totalApplyAmountNum += totalApplyNum;
                 totalPassAmountNum += totalPassNum;
@@ -593,15 +613,18 @@ public class LandStatisticsService {
                 map.put("useChangePassNum", useChangePassNum);
                 map.put("useChangePassRate", useChangeApplyNum == 0 ? 0 : useChangePassNum * 100 / useChangeApplyNum);
 
-                map.put("immovablesChangeApplyNum", immovablesChangeApplyNum);
-                map.put("immovablesChangePassNum", immovablesChangePassNum);
-                map.put("immovablesChangePassRate", immovablesChangeApplyNum == 0 ? 0 : immovablesChangePassNum * 100 / immovablesChangeApplyNum);
+                map.put("immovablesChangeApplyNum", immovablesChangeApplyNum + "(" + immovablesChangeSummaryProcedureApplyNum + ")");
+                map.put("immovablesChangePassNum", immovablesChangePassNum + "(" + immovablesChangeSummaryProcedurePassNum + ")");
+                map.put("immovablesChangePassRate",
+                        (immovablesChangeApplyNum == 0 ? 0 : immovablesChangePassNum * 100 / immovablesChangeApplyNum)
+                                + "%(" + (immovablesChangeSummaryProcedureApplyNum == 0 ? 0 : immovablesChangeSummaryProcedurePassNum * 100 / immovablesChangeSummaryProcedureApplyNum) + "%)"
+                );
 
-                map.put("equityStructureChangeApplyNum", equityStructureChangeApplyNum + "(" + summaryProcedureApplyNum + ")");
-                map.put("equityStructureChangePassNum", equityStructureChangePassNum + "(" + summaryProcedurePassNum + ")");
+                map.put("equityStructureChangeApplyNum", equityStructureChangeApplyNum + "(" + equityStructureChangeSummaryProcedureApplyNum + ")");
+                map.put("equityStructureChangePassNum", equityStructureChangePassNum + "(" + equityStructureChangeSummaryProcedurePassNum + ")");
                 map.put("equityStructureChangePassRate",
                         (equityStructureChangeApplyNum == 0 ? 0 : equityStructureChangePassNum * 100 / equityStructureChangeApplyNum)
-                                + "%(" + (summaryProcedureApplyNum == 0 ? 0 : summaryProcedurePassNum * 100 / summaryProcedureApplyNum) + "%)"
+                                + "%(" + (equityStructureChangeSummaryProcedureApplyNum == 0 ? 0 : equityStructureChangeSummaryProcedurePassNum * 100 / equityStructureChangeSummaryProcedureApplyNum) + "%)"
                 );
 
                 map.put("totalApplyNum", totalApplyNum);
@@ -620,15 +643,18 @@ public class LandStatisticsService {
             map.put("useChangePassNum", useChangePassAmountNum);
             map.put("useChangePassRate", useChangeApplyAmountNum == 0 ? 0 : useChangePassAmountNum * 100 / useChangeApplyAmountNum);
 
-            map.put("immovablesChangeApplyNum", immovablesChangeApplyAmountNum);
-            map.put("immovablesChangePassNum", immovablesChangePassAmountNum);
-            map.put("immovablesChangePassRate", immovablesChangeApplyAmountNum == 0 ? 0 : immovablesChangePassAmountNum * 100 / immovablesChangeApplyAmountNum);
+            map.put("immovablesChangeApplyNum", immovablesChangeApplyAmountNum+ "(" + immovablesChangeSummaryProcedureApplyAmountNum + ")");
+            map.put("immovablesChangePassNum", immovablesChangePassAmountNum+ "(" + immovablesChangeSummaryProcedurePassAmountNum + ")");
+            map.put("immovablesChangePassRate",
+                    (immovablesChangeApplyAmountNum == 0 ? 0 : immovablesChangePassAmountNum * 100 / immovablesChangeApplyAmountNum)
+                            + "%(" + (immovablesChangeSummaryProcedureApplyAmountNum == 0 ? 0 : immovablesChangeSummaryProcedurePassAmountNum * 100 / immovablesChangeSummaryProcedureApplyAmountNum) + "%)"
+            );
 
-            map.put("equityStructureChangeApplyNum", equityStructureChangeApplyAmountNum + "(" + summaryProcedureApplyAmountNum + ")");
-            map.put("equityStructureChangePassNum", equityStructureChangePassAmountNum + "(" + summaryProcedurePassAmountNum + ")");
+            map.put("equityStructureChangeApplyNum", equityStructureChangeApplyAmountNum + "(" + equityStructureChangeSummaryProcedureApplyAmountNum + ")");
+            map.put("equityStructureChangePassNum", equityStructureChangePassAmountNum + "(" + equityStructureChangeSummaryProcedurePassAmountNum + ")");
             map.put("equityStructureChangePassRate",
                     (equityStructureChangeApplyAmountNum == 0 ? 0 : equityStructureChangePassAmountNum * 100 / equityStructureChangeApplyAmountNum)
-                            + "%(" + (summaryProcedureApplyAmountNum == 0 ? 0 : summaryProcedurePassAmountNum * 100 / summaryProcedureApplyAmountNum) + "%)"
+                            + "%(" + (equityStructureChangeSummaryProcedureApplyAmountNum == 0 ? 0 : equityStructureChangeSummaryProcedurePassAmountNum * 100 / equityStructureChangeSummaryProcedureApplyAmountNum) + "%)"
             );
 
             map.put("totalApplyNum", totalApplyAmountNum);
@@ -660,9 +686,13 @@ public class LandStatisticsService {
         int[] useChangeApplyNum = new int[streetList.size() + 1], useChangeRejectNum = new int[streetList.size() + 1], useChangePassNum = new int[streetList.size() + 1], useChangeNotPassNum = new int[streetList.size() + 1], useChangePassRate = new int[streetList.size() + 1];
         int[] immovablesChangeApplyNum = new int[streetList.size() + 1], immovablesChangeRejectNum = new int[streetList.size() + 1], immovablesChangePassNum = new int[streetList.size() + 1], immovablesChangeNotPassNum = new int[streetList.size() + 1], immovablesChangePassRate = new int[streetList.size() + 1];
         int[] equityStructureChangeApplyNum = new int[streetList.size() + 1], equityStructureChangeRejectNum = new int[streetList.size() + 1], equityStructureChangePassNum = new int[streetList.size() + 1], equityStructureChangeNotPassNum = new int[streetList.size() + 1], equityStructureChangePassRate = new int[streetList.size() + 1];
-        int[] summaryProcedureApplyNum = new int[streetList.size() + 1], summaryProcedurePassNum = new int[streetList.size() + 1], summaryProcedureNotPassNum = new int[streetList.size() + 1], summaryProcedureRejectNum = new int[streetList.size() + 1], summaryProcedurePassRate = new int[streetList.size() + 1];
+
+        int[]  immovablesChangeSummaryProcedureApplyNum = new int[streetList.size() + 1],  immovablesChangeSummaryProcedurePassNum = new int[streetList.size() + 1],  immovablesChangeSummaryProcedureNotPassNum = new int[streetList.size() + 1],  immovablesChangeSummaryProcedureRejectNum = new int[streetList.size() + 1],  immovablesChangeSummaryProcedurePassRate = new int[streetList.size() + 1];
+        int[] equityStructureChangeSummaryProcedureApplyNum = new int[streetList.size() + 1], equityStructureChangeSummaryProcedurePassNum = new int[streetList.size() + 1], equityStructureChangeSummaryProcedureNotPassNum = new int[streetList.size() + 1], equityStructureChangeSummaryProcedureRejectNum = new int[streetList.size() + 1], equityStructureChangeSummaryProcedurePassRate = new int[streetList.size() + 1];
+
         int[] applyNum = new int[streetList.size() + 1], rejectNum = new int[streetList.size() + 1], passNum = new int[streetList.size() + 1], notPassNum = new int[streetList.size() + 1], passRate = new int[streetList.size() + 1];
 
+        String[]  immovablesChangeApplyNumStr = new String[streetList.size() + 1],  immovablesChangeRejectNumStr = new String[streetList.size() + 1],  immovablesChangePassNumStr = new String[streetList.size() + 1],  immovablesChangeNotPassNumStr = new String[streetList.size() + 1],  immovablesChangePassRateStr = new String[streetList.size() + 1];
         String[] equityStructureChangeApplyNumStr = new String[streetList.size() + 1], equityStructureChangeRejectNumStr = new String[streetList.size() + 1], equityStructureChangePassNumStr = new String[streetList.size() + 1], equityStructureChangeNotPassNumStr = new String[streetList.size() + 1], equityStructureChangePassRateStr = new String[streetList.size() + 1];
 
         //存量用地信息
@@ -742,6 +772,11 @@ public class LandStatisticsService {
                         immovablesChangeApplyNum[i]++;
                         applyNum[streetList.size()]++;
                         immovablesChangeApplyNum[streetList.size()]++;
+                        //是否简易流程
+                        if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.JYLCHQ)) {
+                            immovablesChangeSummaryProcedureApplyNum[i]++;
+                            immovablesChangeSummaryProcedureApplyNum[streetList.size()]++;
+                        }
                         if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.PASSED)
                                 || Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.NOTPASSED)
                                 || Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.APPROVED)) {
@@ -750,18 +785,33 @@ public class LandStatisticsService {
                             immovablesChangePassNum[i]++;
                             passNum[streetList.size()]++;
                             immovablesChangePassNum[streetList.size()]++;
+                            //是否简易流程
+                            if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.EASY_PROCESS_APPROVED)) {
+                                immovablesChangeSummaryProcedurePassNum[i]++;
+                                immovablesChangeSummaryProcedurePassNum[streetList.size()]++;
+                            }
                         } else if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.NOTAPPROVED)) {
                             //不通过
                             notPassNum[i]++;
                             immovablesChangeNotPassNum[i]++;
                             notPassNum[streetList.size()]++;
                             immovablesChangeNotPassNum[streetList.size()]++;
+                            //是否简易流程
+                            if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.EASY_PROCESS_DENY)) {
+                                immovablesChangeSummaryProcedureNotPassNum[i]++;
+                                immovablesChangeSummaryProcedureNotPassNum[streetList.size()]++;
+                            }
                         } else if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.REJECT)) {
                             //退回
                             rejectNum[i]++;
                             immovablesChangeRejectNum[i]++;
                             rejectNum[streetList.size()]++;
                             immovablesChangeRejectNum[streetList.size()]++;
+                            //是否简易流程
+                            if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.EASY_PROCESS_DENY)) {
+                                immovablesChangeSummaryProcedureRejectNum[i]++;
+                                immovablesChangeSummaryProcedureRejectNum[streetList.size()]++;
+                            }
                         }
                     }
                 }
@@ -776,8 +826,8 @@ public class LandStatisticsService {
                         equityStructureChangeApplyNum[streetList.size()]++;
                         //是否简易流程
                         if (StringUtils.isNotEmpty(stockLand.getSummary_procedure())) {
-                            summaryProcedureApplyNum[i]++;
-                            summaryProcedureApplyNum[streetList.size()]++;
+                            equityStructureChangeSummaryProcedureApplyNum[i]++;
+                            equityStructureChangeSummaryProcedureApplyNum[streetList.size()]++;
                         }
                         if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.PASSED)
                                 || Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.NOTPASSED)
@@ -789,8 +839,8 @@ public class LandStatisticsService {
                             equityStructureChangePassNum[streetList.size()]++;
                             //是否简易流程
                             if (StringUtils.isNotEmpty(stockLand.getSummary_procedure())) {
-                                summaryProcedurePassNum[i]++;
-                                summaryProcedurePassNum[streetList.size()]++;
+                                equityStructureChangeSummaryProcedurePassNum[i]++;
+                                equityStructureChangeSummaryProcedurePassNum[streetList.size()]++;
                             }
                         } else if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.NOTAPPROVED)) {
                             //不通过
@@ -800,8 +850,8 @@ public class LandStatisticsService {
                             equityStructureChangeNotPassNum[streetList.size()]++;
                             //是否简易流程
                             if (StringUtils.isNotEmpty(stockLand.getSummary_procedure())) {
-                                summaryProcedureNotPassNum[i]++;
-                                summaryProcedureNotPassNum[streetList.size()]++;
+                                equityStructureChangeSummaryProcedureNotPassNum[i]++;
+                                equityStructureChangeSummaryProcedureNotPassNum[streetList.size()]++;
                             }
                         } else if (Objects.equals(stockLand.getApprove_status(), Constant.LandApproveStatus.REJECT)) {
                             //退回
@@ -811,8 +861,8 @@ public class LandStatisticsService {
                             equityStructureChangeRejectNum[streetList.size()]++;
                             //是否简易流程
                             if (StringUtils.isNotEmpty(stockLand.getSummary_procedure())) {
-                                summaryProcedureRejectNum[i]++;
-                                summaryProcedureRejectNum[streetList.size()]++;
+                                equityStructureChangeSummaryProcedureRejectNum[i]++;
+                                equityStructureChangeSummaryProcedureRejectNum[streetList.size()]++;
                             }
                         }
                     }
@@ -838,7 +888,7 @@ public class LandStatisticsService {
 
         Map immovablesChangeApplyNumMap = new HashMap();
         immovablesChangeApplyNumMap.put("name", "存量工业用地不动产权权属转移登记");
-        immovablesChangeApplyNumMap.put("streetNum", immovablesChangeApplyNum);
+        immovablesChangeApplyNumMap.put("streetNum", immovablesChangeApplyNumStr);
 
         Map equityStructureChangeApplyNumMap = new HashMap();
         equityStructureChangeApplyNumMap.put("name", "存量工业用地项目公司股权（结构）变更登记");
@@ -866,7 +916,7 @@ public class LandStatisticsService {
 
         Map immovablesChangeRejectNumMap = new HashMap();
         immovablesChangeRejectNumMap.put("name", "存量工业用地不动产权权属转移登记");
-        immovablesChangeRejectNumMap.put("streetNum", immovablesChangeRejectNum);
+        immovablesChangeRejectNumMap.put("streetNum", immovablesChangeRejectNumStr);
 
         Map equityStructureChangeRejectNumMap = new HashMap();
         equityStructureChangeRejectNumMap.put("name", "存量工业用地项目公司股权（结构）变更登记");
@@ -894,7 +944,7 @@ public class LandStatisticsService {
 
         Map immovablesChangePassNumMap = new HashMap();
         immovablesChangePassNumMap.put("name", "存量工业用地不动产权权属转移登记");
-        immovablesChangePassNumMap.put("streetNum", immovablesChangePassNum);
+        immovablesChangePassNumMap.put("streetNum", immovablesChangePassNumStr);
 
         Map equityStructureChangePassNumMap = new HashMap();
         equityStructureChangePassNumMap.put("name", "存量工业用地项目公司股权（结构）变更登记");
@@ -922,7 +972,7 @@ public class LandStatisticsService {
 
         Map immovablesChangeNotPassNumMap = new HashMap();
         immovablesChangeNotPassNumMap.put("name", "存量工业用地不动产权权属转移登记");
-        immovablesChangeNotPassNumMap.put("streetNum", immovablesChangeNotPassNum);
+        immovablesChangeNotPassNumMap.put("streetNum", immovablesChangeNotPassNumStr);
 
         Map equityStructureChangeNotPassNumMap = new HashMap();
         equityStructureChangeNotPassNumMap.put("name", "存量工业用地项目公司股权（结构）变更登记");
@@ -945,14 +995,23 @@ public class LandStatisticsService {
             useChangePassRate[i] = useChangeApplyNum[i] == 0 ? 0 : useChangePassNum[i] * 100 / useChangeApplyNum[i];
             immovablesChangePassRate[i] = immovablesChangeApplyNum[i] == 0 ? 0 : immovablesChangePassNum[i] * 100 / immovablesChangeApplyNum[i];
             equityStructureChangePassRate[i] = equityStructureChangeApplyNum[i] == 0 ? 0 : equityStructureChangePassNum[i] * 100 / equityStructureChangeApplyNum[i];
-            summaryProcedurePassRate[i] = summaryProcedureApplyNum[i] == 0 ? 0 : summaryProcedurePassNum[i] * 100 / summaryProcedureApplyNum[i];
+
+            immovablesChangeSummaryProcedurePassRate[i] = immovablesChangeSummaryProcedureApplyNum[i] == 0 ? 0 :  immovablesChangeSummaryProcedurePassNum[i] * 100 /  immovablesChangeSummaryProcedureApplyNum[i];
+            equityStructureChangeSummaryProcedurePassRate[i] = equityStructureChangeSummaryProcedureApplyNum[i] == 0 ? 0 : equityStructureChangeSummaryProcedurePassNum[i] * 100 / equityStructureChangeSummaryProcedureApplyNum[i];
+
             passRate[i] = applyNum[i] == 0 ? 0 : passNum[i] * 100 / applyNum[i];
 
-            equityStructureChangeApplyNumStr[i] = equityStructureChangeApplyNum[i] + "(" + summaryProcedureApplyNum[i] + ")";
-            equityStructureChangePassNumStr[i] = equityStructureChangePassNum[i] + "(" + summaryProcedurePassNum[i] + ")";
-            equityStructureChangeNotPassNumStr[i] = equityStructureChangeNotPassNum[i] + "(" + summaryProcedureNotPassNum[i] + ")";
-            equityStructureChangeRejectNumStr[i] = equityStructureChangeRejectNum[i] + "(" + summaryProcedureRejectNum[i] + ")";
-            equityStructureChangePassRateStr[i] = equityStructureChangePassRate[i] + "%(" + summaryProcedurePassRate[i] + "%)";
+            equityStructureChangeApplyNumStr[i] = equityStructureChangeApplyNum[i] + "(" + equityStructureChangeSummaryProcedureApplyNum[i] + ")";
+            equityStructureChangePassNumStr[i] = equityStructureChangePassNum[i] + "(" + equityStructureChangeSummaryProcedurePassNum[i] + ")";
+            equityStructureChangeNotPassNumStr[i] = equityStructureChangeNotPassNum[i] + "(" + equityStructureChangeSummaryProcedureNotPassNum[i] + ")";
+            equityStructureChangeRejectNumStr[i] = equityStructureChangeRejectNum[i] + "(" + equityStructureChangeSummaryProcedureRejectNum[i] + ")";
+            equityStructureChangePassRateStr[i] = equityStructureChangePassRate[i] + "%(" + equityStructureChangeSummaryProcedurePassRate[i] + "%)";
+
+             immovablesChangeApplyNumStr[i] =  immovablesChangeApplyNum[i] + "(" +  immovablesChangeSummaryProcedureApplyNum[i] + ")";
+             immovablesChangePassNumStr[i] =  immovablesChangePassNum[i] + "(" +  immovablesChangeSummaryProcedurePassNum[i] + ")";
+             immovablesChangeNotPassNumStr[i] =  immovablesChangeNotPassNum[i] + "(" +  immovablesChangeSummaryProcedureNotPassNum[i] + ")";
+             immovablesChangeRejectNumStr[i] =  immovablesChangeRejectNum[i] + "(" +  immovablesChangeSummaryProcedureRejectNum[i] + ")";
+             immovablesChangePassRateStr[i] =  immovablesChangePassRate[i] + "%(" +  immovablesChangeSummaryProcedurePassRate[i] + "%)";
         }
 
         Map rentPassRateNumMap = new HashMap();
@@ -965,7 +1024,7 @@ public class LandStatisticsService {
 
         Map immovablesChangePassRateNumMap = new HashMap();
         immovablesChangePassRateNumMap.put("name", "存量工业用地不动产权权属转移登记");
-        immovablesChangePassRateNumMap.put("streetNum", immovablesChangePassRate);
+        immovablesChangePassRateNumMap.put("streetNum", immovablesChangePassRateStr);
 
         Map equityStructureChangePassRateNumMap = new HashMap();
         equityStructureChangePassRateNumMap.put("name", "存量工业用地项目公司股权（结构）变更登记");

src/main/java/platform/modules/government/web/LandStatisticController.java

@@ -321,7 +321,8 @@ public class LandStatisticController extends BaseController {
                 String name1 = (String) map1.get("name");
                 List<String> dataList1 = new ArrayList<>();
                 dataList1.add(name1);
-                if (Objects.equals("存量工业用地项目公司股权（结构）变更登记", name1)) {
+                if (Objects.equals("存量工业用地项目公司股权（结构）变更登记", name1)
+                        ||Objects.equals("存量工业用地不动产权权属转移登记", name1)) {
                     String[] num1 = (String[]) map1.get("streetNum");
                     for (String i : num1) {
                         dataList1.add(i);

src/main/resources/templates/admin/government/land_statistic/plate.html

@@ -25,7 +25,7 @@
 
         .chartContent .chartLi {
             float: left;
-            height: 200px;
+            height: 300px;
             box-sizing: border-box;
         }
 
@@ -173,7 +173,7 @@
             *zoom: 1; /*ie6清除浮动的方式 *号只有IE6-IE7执行，其他浏览器不执行*/
         }
 
-        .chartContent{
+        .chartContent {
             border-bottom: 1px solid #ded7d5;
         }
     </style>
@@ -200,9 +200,6 @@
     <!--    <span class="plate_tab_item">综合保税区</span>-->
     <!--    <span class="plate_tab_item">度假区(含镇湖)</span>-->
     <!--    <span class="plate_tab_item">区外</span>-->
-</div>
-<div class="chartContent">
-
 </div>
 <div class="chartContent">
     <div class="title">当前审核状态统计</div>
@@ -406,6 +403,7 @@
 
         // 指定图表的配置项和数据
         var option = {
+            color: ['#61A5E8', '#EECB5F'],
             title: {
                 text: title,
                 textStyle: {
@@ -471,6 +469,7 @@
 
         // 指定图表的配置项和数据
         option = {
+            color: ['#61A5E8'],
             title: {
                 text: title,
                 textStyle: {
@@ -478,7 +477,6 @@
                     fontWeight: 'bold'
                 }
             },
-            color: ['#3398DB'],
             tooltip: {
                 trigger: 'axis',
                 axisPointer: {            // 坐标轴指示器，坐标轴触发有效
@@ -534,6 +532,7 @@
 
         // 指定图表的配置项和数据
         var option = {
+            color: ['#7ECF51', '#B9646E', '#E3935D'],
             title: {
                 text: title,
                 textStyle: {
@@ -600,6 +599,7 @@
 
         // 指定图表的配置项和数据
         option = {
+            color: ['#61A5E8', '#7ECF51', '#B9464E', '#E3935D'],
             // title: {
             //     text: '折线图堆叠'
             // },
@@ -641,7 +641,7 @@
 
         // 指定图表的配置项和数据
         option = {
-            color: ['#003366', '#006699', '#4cabce', '#e5323e'],
+            color: ['#61A5E8', '#E3935D', '#7ECF51', '#B9464E'],
             tooltip: {
                 trigger: 'axis',
                 axisPointer: {

src/main/resources/templates/admin/government/land_statistic/region.html

@@ -24,7 +24,7 @@
 
         .chartContent .chartLi {
             float: left;
-            height: 200px;
+            height: 300px;
             box-sizing: border-box;
         }
 
@@ -182,7 +182,7 @@
             *zoom: 1; /*ie6清除浮动的方式 *号只有IE6-IE7执行，其他浏览器不执行*/
         }
 
-        .chartContent{
+        .chartContent {
             border-bottom: 1px solid #ded7d5;
         }
     </style>
@@ -285,7 +285,7 @@
                 <td th:text="*{useChangePassRate + '%'}"></td>
                 <td th:text="*{immovablesChangeApplyNum}"></td>
                 <td th:text="*{immovablesChangePassNum}"></td>
-                <td th:text="*{immovablesChangePassRate + '%'}"></td>
+                <td th:text="*{immovablesChangePassRate}"></td>
                 <td th:text="*{equityStructureChangeApplyNum}"></td>
                 <td th:text="*{equityStructureChangePassNum}"></td>
                 <td th:text="*{equityStructureChangePassRate}"></td>
@@ -465,6 +465,7 @@
 
         // 指定图表的配置项和数据
         var option = {
+            color: ['#61A5E8', '#EECB5F'],
             title: {
                 text: title,
                 textStyle: {
@@ -530,6 +531,7 @@
 
         // 指定图表的配置项和数据
         option = {
+            color: ['#61A5E8'],
             title: {
                 text: title,
                 textStyle: {
@@ -537,7 +539,6 @@
                     fontWeight: 'bold'
                 }
             },
-            color: ['#3398DB'],
             tooltip: {
                 trigger: 'axis',
                 axisPointer: {            // 坐标轴指示器，坐标轴触发有效
@@ -593,6 +594,7 @@
 
         // 指定图表的配置项和数据
         var option = {
+            color: ['#7ECF51', '#B9646E', '#E3935D'],
             title: {
                 text: title,
                 textStyle: {
@@ -688,7 +690,7 @@
             //     currentIndex: 11,
             //     data: getMonth()
             // },
-            color: ['#003366', '#006699', '#4cabce', '#e5323e'],
+            color: ['#61A5E8', '#E3935D', '#7ECF51', '#B9464E'],
             tooltip: {
                 trigger: 'axis',
                 axisPointer: {
@@ -744,7 +746,7 @@
 
         // 指定图表的配置项和数据
         option = {
-            color: ['#006699', '#4cabce', '#e5323e'],
+            color: ['#7ECF51', '#B9464E', '#E3935D'],
             tooltip: {
                 trigger: 'axis',
                 axisPointer: {            // 坐标轴指示器，坐标轴触发有效
@@ -790,6 +792,14 @@
         $('#monthly_approve_statistic').load(url);
     }
 
+    //板块统计表
+    function getPlateStatistic() {
+        var start_time = $('#plate_start_time').val();
+        var end_time = $('#plate_end_time').val();
+        // 装载局部刷新返回的页面
+        $('#plate_approve_statistic').load(pagePath + "/land_statistic/approve/statistic/plate?start_time=" + start_time + "&end_time=" + end_time);
+    }
+
     //导出月度统计
     function exportMonthlyStatistic() {
         var start_time = $('#monthly_start_time').val();
@@ -804,14 +814,6 @@
         window.open(pagePath + "/land_statistic/approve/statistic/plate/export?start_time=" + start_time + "&end_time=" + end_time);
     }
 
-    //板块统计表
-    function getPlateStatistic() {
-        var start_time = $('#plate_start_time').val();
-        var end_time = $('#plate_end_time').val();
-        // 装载局部刷新返回的页面
-        $('#plate_approve_statistic').load(pagePath + "/land_statistic/approve/statistic/plate?start_time=" + start_time + "&end_time=" + end_time);
-    }
-
     $(document).on("click", ".liHead", function () {
         // console.log("点击了", $(this).next().is(":hidden"))
         if (!$(this).next().is(":hidden")) {