修改bug

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TOrganServiceImpl.java

@@ -64,7 +64,7 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
         boolean flag =false;
 
         if (excelList.size()<1){
-            throw new Exception("文件没有正确数据!");
+            throw new Exception("文件没有数据!");
         }
         List<TOrgan> list1 = list();
         HashMap<String, TOrgan> map1 = new HashMap<>();
@@ -74,7 +74,7 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
 
         List<Map<String, Object>> mapList = organMapper.selectArea();
         mapList.stream().forEach(m->area.put(m.get("name").toString(),m.get("id").toString()));
-        try {
+
         for (int i = 0; i < excelList.size(); i++) {
             Map<String, String> map = null;
             map = (Map<String, String>) excelList.get(i);
@@ -92,6 +92,7 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
                     throw new Exception("机构名称不能重复!");
                 }
             }
+            try {
             String parent = map.get("上级机构");
             if (map1.get(parent)==null){
                 organ.setParentId("0");
@@ -113,10 +114,11 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
 
                 flag = save(organ);
 //            list.add(organ);
-        }
             } catch (Exception e) {
                 throw new Exception("文件数据错误!");
             }
+        }
+
 //        flag = saveBatch(list);
         return flag;
     }

src/main/resources/mapper/TBoardStatisticMapper.xml

@@ -83,6 +83,17 @@
             GROUP BY s.play_date
             ORDER BY s.play_date
         </if>
+        <if test="trend.playDate != null and trend.playDate.length() == 8">
+            SELECT sum(s.play_number) play_number,s.play_date
+            from t_board_statistic s
+            left join t_organ o on o.id = s.organ_id
+            where s.play_date = ${trend.playDate}
+            <if test="trend.organCode != null">
+                and o.code LIKE concat(#{trend.organCode}, '%')
+            </if>
+            GROUP BY s.play_date
+            ORDER BY s.play_date
+        </if>
     </select>
 
     <!-- 地区展板播放统计 -->
@@ -228,6 +239,18 @@
             </where>
             group by i.organ_id
         </if>
+        <if test="frequencyDate != null and frequencyDate.length() == 8">
+            SELECT o.name organName,count(i.organ_id) frequencyCnt
+            from t_interaction i
+            left join t_organ o on i.organ_id = o.id
+            <where>
+                DATE_FORMAT(i.create_time,'%Y%m%d') = ${frequencyDate}
+                <if test="orgCode != null">
+                    and o.code LIKE concat(#{orgCode}, '%')
+                </if>
+            </where>
+            group by i.organ_id
+        </if>
 
     </select>