添加首页统计报表

enterprise-manager-ui/admin/src/views/company/drawershow.vue

@@ -75,7 +75,7 @@
                   <el-table-column label="标签名称" prop="labelId">
                     <template slot-scope="scope">
 
-                      <el-select  v-model="scope.row.labelId" placeholder="请选择标签名称"  >
+                      <el-select  v-model="scope.row.labelId+''" placeholder="请选择标签名称"  >
                         <el-option
                             v-for="($label, $value) in dict.labels"
                             :key="$value"
@@ -204,6 +204,7 @@
                 open: false,
                 direction:"rtl",
                 toString:[
+                    "labelId"
                 ],
                 toDate:[
                     "establishDate",

enterprise-manager/src/main/java/com/mortals/xhx/module/company/service/impl/CompanyServiceImpl.java

@@ -137,7 +137,7 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
         if (!ObjectUtils.isEmpty(entity.getCompanyPatentsList())) {
             Long[] companyPantentIds = companyPatentService.find(new CompanyPatentQuery().companyId(entity.getId())).stream().map(CompanyPatentEntity::getId).toArray(Long[]::new);
             companyPatentService.remove(companyPantentIds, context);
-            entity.getCompanyLabelsList().stream().peek(item -> {
+            entity.getCompanyPatentsList().stream().peek(item -> {
                 item.setCompanyId(entity.getId());
                 item.setCreateUserId(this.getContextUserId(context));
                 item.setCreateTime(new Date());