|
@@ -4,6 +4,7 @@ import java.io.IOException;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.Map;
|
|
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -28,6 +29,7 @@ import platform.common.base.service.DictionaryTypeService;
|
|
|
import platform.common.base.service.TemplateService;
|
|
import platform.common.base.service.TemplateService;
|
|
|
import platform.common.util.ReadExcelUtil;
|
|
import platform.common.util.ReadExcelUtil;
|
|
|
import platform.common.util.holiday.HolidayExcelParser;
|
|
import platform.common.util.holiday.HolidayExcelParser;
|
|
|
|
|
+import platform.common.util.holiday.HolidayExcelTemplateUtil;
|
|
|
import platform.modules.build.entity.BuildInfo;
|
|
import platform.modules.build.entity.BuildInfo;
|
|
|
import platform.modules.build.service.BuildInfoService;
|
|
import platform.modules.build.service.BuildInfoService;
|
|
|
import platform.modules.build.service.CompanyService;
|
|
import platform.modules.build.service.CompanyService;
|
|
@@ -45,6 +47,7 @@ import platform.modules.sys.service.SysConfigService;
|
|
|
import platform.modules.sys.web.ResponseMessage;
|
|
import platform.modules.sys.web.ResponseMessage;
|
|
|
import tk.mybatis.mapper.entity.Example;
|
|
import tk.mybatis.mapper.entity.Example;
|
|
|
|
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
|
|
|
@Controller
|
|
@Controller
|
|
@@ -80,6 +83,9 @@ public class SupermeController extends BaseController {
|
|
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private SysConfigService sysConfigService;
|
|
private SysConfigService sysConfigService;
|
|
|
|
|
+
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private HolidayExcelTemplateUtil holidayExcelTemplateUtil;
|
|
|
|
|
|
|
|
@GetMapping(value = "")
|
|
@GetMapping(value = "")
|
|
|
public String list() {
|
|
public String list() {
|
|
@@ -1047,6 +1053,11 @@ public class SupermeController extends BaseController {
|
|
|
@OperationLog(value = "新增假日信息")
|
|
@OperationLog(value = "新增假日信息")
|
|
|
@GetMapping(value = "/holiday/add")
|
|
@GetMapping(value = "/holiday/add")
|
|
|
public String addHolidayPage(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,ModelMap modelMap) {
|
|
public String addHolidayPage(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,ModelMap modelMap) {
|
|
|
|
|
+
|
|
|
|
|
+ Map<String,String> mapTemplateFileInfo = holidayExcelTemplateUtil.getTemplateFileInfo();
|
|
|
|
|
+ modelMap.put("templateFileUrl",mapTemplateFileInfo.get("templateFileUrl"));
|
|
|
|
|
+ modelMap.put("templateFileName",mapTemplateFileInfo.get("templateFileName"));
|
|
|
|
|
+ modelMap.put("fileUrl", setFileUrl());
|
|
|
return BASE_SUPER_PATH + "holiday/holiday_add";
|
|
return BASE_SUPER_PATH + "holiday/holiday_add";
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1067,6 +1078,11 @@ public class SupermeController extends BaseController {
|
|
|
modelMap.put("configKey", holidayInfo.getConfigKey());
|
|
modelMap.put("configKey", holidayInfo.getConfigKey());
|
|
|
modelMap.put("configValue", holidayInfo.getConfigValue());
|
|
modelMap.put("configValue", holidayInfo.getConfigValue());
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ Map<String,String> mapTemplateFileInfo = holidayExcelTemplateUtil.getTemplateFileInfo();
|
|
|
|
|
+ modelMap.put("templateFileUrl",mapTemplateFileInfo.get("templateFileUrl"));
|
|
|
|
|
+ modelMap.put("templateFileName",mapTemplateFileInfo.get("templateFileName"));
|
|
|
|
|
+
|
|
|
modelMap.put("fileUrl", setFileUrl());
|
|
modelMap.put("fileUrl", setFileUrl());
|
|
|
return BASE_SUPER_PATH + "holiday/holiday_add";
|
|
return BASE_SUPER_PATH + "holiday/holiday_add";
|
|
|
}
|
|
}
|