企业自主大屏

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BscEnterpriseStreetTownController.java

@@ -42,7 +42,7 @@ public class BscEnterpriseStreetTownController {
 
     @GetMapping("streetCompany")
     public ApiResult<Void> streetCompany() {
-        bscEnterpriseStreetTownService.enterpriseStreetTownData("梅陇镇");
+        bscEnterpriseStreetTownService.enterpriseStreetTownTask();
         return ApiResult.success();
     }
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BscEnterpriseStreetTownServiceImpl.java

@@ -643,6 +643,11 @@ public class BscEnterpriseStreetTownServiceImpl extends AbstractCrudService<BscE
 
     @Override
     public Object streetCompany(String streetTown) {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
+        long timeStamp = OnlineMethod.getLastPeroid(2, new Date());
+        String scoreDate = format.format(timeStamp);
+        List<String> companyIdList = baseCompanyService.companyIdList(streetTown);
+
         QueryWrapper<BaseCompany> query = Wrappers.query();
         query.select("street_town as streetTown", "company_type as companyType", "count(id) as count")
                 .eq("enable", 0)
@@ -657,6 +662,12 @@ public class BscEnterpriseStreetTownServiceImpl extends AbstractCrudService<BscE
                 .groupBy("street_town");
         List<Map<String, Object>> list2 = baseCompanyService.listMaps(query1);
 
+        QueryWrapper<DemBuildScoreRecord> query2 = Wrappers.query();
+        query2.select("avg(build_score) as streetTownScore")
+                .in("company_id", companyIdList)
+                .eq("score_date", scoreDate);
+        List<Map<String, Object>> list3 = demBuildScoreRecordService.listMaps(query2);
+
         List<Map<String, Object>> stressList = new ArrayList<>();
         List<Map<String, Object>> generalList = new ArrayList<>();
         List<Map<String, Object>> otherList = new ArrayList<>();
@@ -683,6 +694,11 @@ public class BscEnterpriseStreetTownServiceImpl extends AbstractCrudService<BscE
             map1.put("stress", 0);
             map1.put("general", 0);
             map1.put("other", 0);
+            map1.put("streetTownScore", 0);
+            if (CollectionUtils.isNotEmpty(list3)){
+                map1.put("streetTownScore", list3.get(0).get("streetTownScore"));
+            }
+
             for (int j = 0; j < stressList.size(); j++) {
                 if (list2.get(i).get("streetTown").equals(stressList.get(j).get("streetTown"))) {
                     map1.put("stress", stressList.get(j).get("count"));