统计

src/main/java/com/ghsc/partybuild/controller/PartyTwoController.java

@@ -167,8 +167,8 @@ public class PartyTwoController {
             }
             row.add(item.get("DZZMC"));
             row.add(dateUtils.strFormat(item.get("HONOURTIME").toString()));
-            row.add(item.get("LEVELNAME"));
-            row.add(item.get("HONOURTYPENAME"));
+            row.add(item.get("LevelName"));
+            row.add(item.get("honourTypeName"));
             rows.add(row);
         }
         data.setRows(rows);

src/main/java/com/ghsc/partybuild/service/impl/BigDataServiceImpl.java

@@ -505,11 +505,11 @@ public class BigDataServiceImpl implements BigDataService {
             Integer finalYear = year;
             HashMap<String, Object> dbData = list.stream().filter(e -> e.get("year").toString().equals(finalYear.toString())).findFirst().orElse(null);
             if (dbData != null) {
-                data.put("count1", dbData.get("count1"));
-                data.put("count2", dbData.get("count2"));
+                data.put("count_partyUser", dbData.get("count_partyUser"));
+                data.put("count_workUser", dbData.get("count_workUser"));
             } else {
-                data.put("count1", 0);
-                data.put("count2", 0);
+                data.put("count_partyUser", 0);
+                data.put("count_workUser", 0);
             }
 
             result.add(data);

src/main/resources/mapping/BigDataCQuery.xml

@@ -735,9 +735,9 @@
     </select>
 
     <select id="selectDnpxxxTotalList" resultType="java.util.HashMap">
-        select year(honourtime) as year,
-            sum(case when honourlevel=1 then 1 else 0 end) as count1
-            , sum(case when honourlevel=2 then 1 else 0 end) as count2
+        select year(honourtime) as year
+            , sum(case when HONOURTYPE=3 then 1 else 0 end) as count_partyUser
+            , sum(case when HONOURTYPE=4 then 1 else 0 end) as count_workUser
             from dj_dnpxxx where pxlx=1 and OPERATESTATE <![CDATA[ <> ]]> 'D' group by year(honourtime)
     </select>
     

src/main/resources/static/app/main/bigdata/showDjdsj/dwdt.js

@@ -79,8 +79,8 @@
                     if (result.data != null && result.data.length > 0) {
                         angular.forEach(result.data, function (val) {
                             $scope.pxpy_x_dataList.push(val.year);
-                            $scope.pxpy_y_dataList[0].data.push(val.count2);
-                            $scope.pxpy_y_dataList[1].data.push(val.count1);
+                            $scope.pxpy_y_dataList[0].data.push(val.count_workUser);
+                            $scope.pxpy_y_dataList[1].data.push(val.count_partyUser);
                         });
                     }
                 });

src/main/resources/static/app/main/partyTwoExt/dnpxxx/list.html

@@ -169,8 +169,8 @@
                                             ng-if="it.USERNAME.length>16">...</span></td>
                                     <td>{{it.DZZMC}}</td>
                                     <td class="text-center">{{it.HONOURTIME|date:'yyyy-MM-dd'}}</td>
-                                    <td class="text-center">{{it.LEVELNAME}}</td>
-                                    <td class="text-center">{{it.HONOURTYPENAME}}</td>
+                                    <td class="text-center">{{it.LevelName}}</td>
+                                    <td class="text-center">{{it.honourTypeName}}</td>
                                 </tr>
                                 </tbody>
                             </table>