周报月报修改

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/WeekMonthReportBuilder.java

@@ -152,17 +152,16 @@ public class WeekMonthReportBuilder {
         boolean isWeek = MaterialReportType.WEEK.getCode().equals(context.getReportType());
         boolean hasMainStore = StringUtils.isNotBlank(context.getMainStoreId());
         List<String> rightMenuCodeList = context.getRightMenuCodeList();
-        if (rightMenuCodeList.size() > 1) {
         String key = (hasMainStore ? "CLERK" : "AREA") + (isWeek ? "_WEEK" : "_MONTH");
+        if (rightMenuCodeList.size() > 1) {
             return DrawImageUtils.templateMap.get(key);
         }
         else if (rightMenuCodeList.contains(EnterpriseServiceEnum.APPOINTMENT.getRightMenuCode())) {
-            String key = "POTENTIAL_" + (hasMainStore ? "CLERK" : "AREA") + (isWeek ? "_WEEK" : "_MONTH");
+            key = "POTENTIAL_" + key;
             return DrawImageUtils.templateMap.get(key);
         }
-
         else if (rightMenuCodeList.contains(EnterpriseServiceEnum.CONTENT.getRightMenuCode())) {
-            String key = "CONTENT_" + (hasMainStore ? "CLERK" : "AREA") + (isWeek ? "_WEEK" : "_MONTH");
+            key = "CONTENT_" + key;
             return DrawImageUtils.templateMap.get(key);
         }
         return null;