Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/information/service/InformationService.java

@@ -54,6 +54,8 @@ public class InformationService extends CrudService<InformationMapper, Informati
 		String find = informationMapper.findOverTime("overTime");
 		int overTime = Integer.parseInt(find);
 		Calendar cal = Calendar.getInstance();
+		String extendedStatus = entity.getExtendedStatus();
+		String extendedTime = entity.getExtendedTime();
 		long between_days = 0;
 		for (Information in : list) {
 			//判断审定日期是否为空

src/main/java/com/jeeplus/modules/sg/information/web/InformationController.java

@@ -14,8 +14,8 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+/*import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;*/
 import com.google.common.collect.Lists;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
@@ -34,15 +34,15 @@ import com.jeeplus.modules.sg.record.entity.Record;
 import com.jeeplus.modules.sg.record.service.RecordService;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
-import io.swagger.models.auth.In;
-import net.sf.ehcache.util.concurrent.ConcurrentHashMap;
+/*import io.swagger.models.auth.In;
+import net.sf.ehcache.util.concurrent.ConcurrentHashMap;*/
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.session.Session;
-import org.h2.util.New;
+/*import org.apache.shiro.session.Session;
+import org.h2.util.New;*/
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.method.P;
+//import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -56,9 +56,9 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ImportExcel;
-import sun.tools.jconsole.JConsole;
+//import sun.tools.jconsole.JConsole;
 
-import static org.quartz.jobs.FileScanJob.FILE_NAME;
+//import static org.quartz.jobs.FileScanJob.FILE_NAME;
 
 /**
  * 项目管理列表Controller
@@ -426,7 +426,7 @@ public class InformationController extends BaseController {
 
 
 
-	public static Map<String, ExportExcel> excelParamCache = new ConcurrentHashMap<>();
+//	public static Map<String, ExportExcel> excelParamCache = new ConcurrentHashMap<>();
 	@ResponseBody
 	@RequiresPermissions("modules:sg:information:information:export")
 	@RequestMapping(value = "exportMaterial")

src/main/java/com/jeeplus/modules/sg/material/web/MaterialController.java

@@ -11,11 +11,11 @@ import javax.servlet.http.HttpServletResponse;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
-import com.jeeplus.modules.sg.information.entity.Information;
+//import com.jeeplus.modules.sg.information.entity.Information;
 import com.jeeplus.modules.sg.material.entity.Material;
 import com.jeeplus.modules.sg.material.service.MaterialService;
-import org.apache.shiro.authz.annotation.Logical;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+//import org.apache.shiro.authz.annotation.Logical;
+//import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

src/main/java/com/jeeplus/modules/sg/record/web/RecordController.java

@@ -6,10 +6,10 @@ package com.jeeplus.modules.sg.record.web;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
-import com.jeeplus.modules.sg.information.entity.Information;
+//import com.jeeplus.modules.sg.information.entity.Information;
 import com.jeeplus.modules.sg.information.service.InformationService;
-import com.jeeplus.modules.sg.material.entity.Material;
-import com.jeeplus.modules.sg.material.service.MaterialService;
+//import com.jeeplus.modules.sg.material.entity.Material;
+//import com.jeeplus.modules.sg.material.service.MaterialService;
 import com.jeeplus.modules.sg.record.entity.Record;
 import com.jeeplus.modules.sg.record.service.RecordService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;