储备管理进度模块增删改查、导入导出功能代码

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/entity/ReserveManagement.java

@@ -1,9 +1,6 @@
 package com.jeeplus.modules.sg.managementcenter.reserveManagement.entity;
 
-import com.jeeplus.common.utils.SpringContextHolder;
-import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.DataEntity;
-import org.apache.commons.lang3.math.NumberUtils;
 
 import java.util.Date;
 

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/ReserveManagementMapper.java

@@ -1,12 +1,9 @@
 package com.jeeplus.modules.sg.managementcenter.reserveManagement.mapper;
 
 import com.jeeplus.core.persistence.BaseMapper;
-import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
-import com.jeeplus.modules.sg.financial.erpcredit.entity.ErpCreditEquipment;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveManagement;
 import org.apache.ibatis.annotations.Param;
-import org.apache.poi.ss.formula.functions.T;
 
 import java.util.List;
 

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/service/ReserveManagementService.java

@@ -4,7 +4,6 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveManagement;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.mapper.ReserveManagementMapper;
-import com.jeeplus.modules.sg.managementcenter.reserveManagement.utils.ReserveManagementUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/utils/ReserveManagementProUtil.java

@@ -8,8 +8,6 @@ import org.apache.poi.ss.usermodel.Row;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 
 public class ReserveManagementProUtil {

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/web/ReserveManagementController.java

@@ -1,32 +1,19 @@
 package com.jeeplus.modules.sg.managementcenter.reserveManagement.web;
 
 import com.jeeplus.common.json.AjaxJson;
-import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.common.utils.excel.ExportExcel;
-import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.sg.audit.information.utils.FreemarkerUtil;
 import com.jeeplus.modules.sg.audit.information.utils.ResponseUtil;
-import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvided;
-import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvidedVersion;
-import com.jeeplus.modules.sg.managementcenter.materialplan.entity.MaterialPlan;
-import com.jeeplus.modules.sg.managementcenter.materialproject.entity.MaterialProject;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
-import com.jeeplus.modules.sg.managementcenter.materialproject.util.MaterialProUtil;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import com.jeeplus.modules.sg.managementcenter.project.util.ProjectImportUtil;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveManagement;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.service.ReserveManagementService;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.utils.ReserveManagementProUtil;
-import com.jeeplus.modules.sg.settActivi.entity.SettActivi;
-import com.jeeplus.modules.sg.settActivi.entity.SettList;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,8 +29,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
-import java.text.ParseException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/reserveManagementView.jsp

@@ -65,6 +65,26 @@
 			<td class="width-35">
 				<form:input path="reserveBatches" htmlEscape="false"    class="form-control"/>
 			</td>
+			<td class="width-15 active"><label class="">供电区域：</label></td>
+			<td class="width-35">
+				<form:input path="blockSupply" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">网格编号：</label></td>
+			<td class="width-35">
+				<form:input path="gridNumber" htmlEscape="false"    class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">单元格编号：</label></td>
+			<td class="width-35">
+				<form:input path="cellNumber" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">电网项目编号：</label></td>
+			<td class="width-35">
+				<form:input path="powerGridProjectId" htmlEscape="false"    class="form-control"/>
+			</td>
 			<td class="width-15 active"><label class="">项目储备编号：</label></td>
 			<td class="width-35">
 				<form:input path="projectReserveId" htmlEscape="false"    class="form-control"/>