111

src/main/java/com/jeeplus/modules/sg/financial/settlement/util/ExcelWriter.java

@@ -257,6 +257,11 @@ public class ExcelWriter {
         return style;
     }
 
+    /**
+     * 设置导出表格样式
+     * @param wb
+     * @return
+     */
     private static Map<String, CellStyle> createStyles(Workbook wb) {
         Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
 

src/main/java/com/jeeplus/modules/sg/financial/settlement/web/DataMaintenanceController.java

@@ -99,8 +99,8 @@ public class DataMaintenanceController extends BaseController {
 	@ResponseBody
 	@RequiresPermissions("sg:settlement:import")
 	@RequestMapping(value = "importsel")
-	public Map<String, Object> importSelect(@RequestParam("file")MultipartFile file, MaintainData maintainData, HttpServletResponse response, HttpServletRequest request, HttpSession session) throws IOException, InvalidFormatException {
-//		try {
+	public Map<String, Object> importSelect(@RequestParam("file")MultipartFile file, MaintainData maintainData, HttpServletResponse response, HttpServletRequest request, HttpSession session){
+		try {
 			ImportExcel importExcel = new ImportExcel(file, 1, 0);
 			int lastRow = importExcel.getLastDataRowNum();
 			StringBuilder stringBuilder = new StringBuilder();
@@ -113,16 +113,16 @@ public class DataMaintenanceController extends BaseController {
 			}
 			String st = stringBuilder.toString();
 			String sts = st.substring(0,st.length()-1);
+			//把id作为key，把查询条件存入session
 			String id = UserUtils.getUser().getId();
 			session.setAttribute(id,st);
 			String[] strs = st.split(" ");
 			maintainData.setProjectIds(strs);
 			Page<MaintainData> page = dataMaintenanceService.findPage(new Page<MaintainData>(request, response), maintainData);
 			return getBootstrapData(page);
-//			return "redirect:/a/sg/settlement/data";
-//		}catch (Exception e){
-//			return  null;
-//		}
+		}catch (Exception e){
+			return  null;
+		}
 	}
 	/**
 	 * 查看，增加，编辑表单页面
@@ -253,7 +253,9 @@ public class DataMaintenanceController extends BaseController {
 		return j;
     }
 
-
+	/**
+	 *excel文件数据读取
+	 */
 	private List<MaintainData> getData(ImportExcel importExcel) throws ParseException {
 		int lastRow = importExcel.getLastDataRowNum();
 		List<MaintainData> list = new ArrayList<>();
@@ -288,6 +290,9 @@ public class DataMaintenanceController extends BaseController {
 		return list;
 	}
 
+	/**
+	 *获取excel double类型的值
+	 */
 	private double getDouble(ImportExcel importExcel,Row row,int col){
 		double d = 0.00;
         Object o = importExcel.getCellValue(row,col);
@@ -297,7 +302,9 @@ public class DataMaintenanceController extends BaseController {
       return d;
 	}
 
-
+	/**
+	 *获取excel date类型的值
+	 */
 	private Date getDate(ImportExcel importExcel,Row row,int col) throws ParseException {
 		Date d = null;
 		Object o = importExcel.getCellValue(row,col);

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/service/MaterialInfoService.java

@@ -73,12 +73,17 @@ public class MaterialInfoService extends CrudService<MaterialInfoMapper, Materia
 		super.delete(materialInfo);
 	}
 
+	/**
+	 *根据项目名称删除物料信息
+	 */
 	@Transactional(readOnly = false)
 	public void deleteByPro(String projectName) {
 		materialInfoMapper.deleteByPro(projectName);
 	}
 
-
+	/**
+	 *物料信息合并保存
+	 */
     @Transactional(readOnly = false)
 	public void export(MultipartFile file,String batch,String itemBatch) throws IOException, InvalidFormatException {
 		ImportExcel mo = new ImportExcel(file,1,"模块表");
@@ -106,7 +111,9 @@ public class MaterialInfoService extends CrudService<MaterialInfoMapper, Materia
         materialProjectService.save(materialProject);
 	}
 
-
+	/**
+	 *根据项目名称获取物料信息
+	 */
 	public List<MaterialInfo> findByBatch(List<MaterialProject> list){
 		List<MaterialInfo> list1 = materialInfoMapper.findByList(list);
 		 List<MaterialInfo> list2 = getNewData(list1); //合并数据

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/service/MaterialVersionService.java

@@ -51,6 +51,9 @@ public class MaterialVersionService extends CrudService<MaterialVersionMapper, M
 		super.save(materialVersion);
 	}
 
+	/**
+	 *物料保存
+	 */
 	@Transactional(readOnly = false)
 	public void saveList(List<MaterialStandard> list,String batch) {
 		MaterialVersion materialVersion = new MaterialVersion();
@@ -63,13 +66,19 @@ public class MaterialVersionService extends CrudService<MaterialVersionMapper, M
         save(materialVersion);
 		materialVersionMapper.insertList(list);
 	}
-	
+
+	/**
+	 *删除物料信息
+	 */
 	@Transactional(readOnly = false)
 	public void delete(MaterialVersion materialVersion) {
 		super.delete(materialVersion);
 		deleteByPro(materialVersion.getBatch());
 	}
 
+	/**
+	 * 更加批次号删除物料信息
+	 */
 	@Transactional(readOnly = false)
 	public void deleteByPro(String batch) {
 		materialVersionMapper.deleteByBatch(batch);

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/web/MaterialInfoController.java

@@ -116,40 +116,17 @@ public class MaterialInfoController extends BaseController {
 		j.setMsg("删除成功");
 		return j;
 	}
-	
-	/**
-	 * 导出excel文件
-	 */
-	@ResponseBody
-	@RequiresPermissions("managementcenter:materialinfo:export")
-    @RequestMapping(value = "export")
-    public AjaxJson exportFile(MaterialInfo materialInfo, HttpServletRequest request, HttpServletResponse response) {
-		AjaxJson j = new AjaxJson();
-		try {
-//            String fileName = DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
-//            Page<MaintainData> page = dataMaintenanceService.findPage(new Page<MaintainData>(request, response, -1), maintainData);
-//    		new ExportExcel(null, MaintainData.class).setDataList(page.getList()).write(response, fileName).dispose();
-//			dataMaintenanceService.export(maintainData,response);
-    		j.setSuccess(true);
-    		j.setMsg("导出成功！");
-    		return j;
-		} catch (Exception e) {
-			j.setSuccess(false);
-			j.setMsg("导出失败！失败信息："+e.getMessage());
-		}
-			return j;
-    }
+
 
 	/**
 	 * 导入Excel数据
-
 	 */
 	@ResponseBody
 	@RequiresPermissions("managementcenter:materialinfo:import")
     @RequestMapping(value = "import")
    	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
-		String batch = request.getParameter("batch");
-		String itemBatch = request.getParameter("itemBatch");
+		String batch = request.getParameter("batch");   //物料批次
+		String itemBatch = request.getParameter("itemBatch");  //项目批次
 		AjaxJson j = new AjaxJson();
 		try {
 			materialInfoService.export(file,batch,itemBatch);
@@ -169,8 +146,8 @@ public class MaterialInfoController extends BaseController {
     @RequiresPermissions("managementcenter:materialinfo:import")
     @RequestMapping(value = "imports")
     public AjaxJson importFile(@RequestParam("file")MultipartFile[] file, HttpServletResponse response, HttpServletRequest request) {
-        String batch = request.getParameter("batch");
-        String itemBatch = request.getParameter("itemBatch");
+        String batch = request.getParameter("batch");   //物料批次
+        String itemBatch = request.getParameter("itemBatch");   //项目批次
         AjaxJson j = new AjaxJson();
         try {
             for(int i=0;i<file.length;i++) {
@@ -213,11 +190,6 @@ public class MaterialInfoController extends BaseController {
 
 	/**
 	 * 项目验证
-	 * @param file
-	 * @param batch
-	 * @return
-	 * @throws IOException
-	 * @throws InvalidFormatException
 	 */
 
 	@ResponseBody

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/web/MaterialVersionController.java

@@ -108,15 +108,23 @@ public class MaterialVersionController extends BaseController {
 		return j;
 	}
 
+	/**
+	 * 导入页面跳转
+	 * @param model
+	 * @return
+	 */
 	@RequestMapping(value = "importExcel")
 	public String importExcel(Model model) {
 		return "modules/sg/managementcenter/materialversion/importexcel";
 	}
 
+	/**
+	 *导入
+	 */
 	@ResponseBody
 	@RequiresPermissions("managementcenter:materialversion:import")
 	@RequestMapping(value = "import")
-	public AjaxJson importFile(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException, IllegalAccessException, InstantiationException {
+	public AjaxJson importFile(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request){
 		String batch = request.getParameter("batch");
 		AjaxJson j = new AjaxJson();
 		try {
@@ -134,9 +142,12 @@ public class MaterialVersionController extends BaseController {
 		return j;
 	}
 
+	/**
+	 * 导入验证，如果批次号存在，则返回，不存在，则直接读入
+	 */
 	@ResponseBody
 	@RequestMapping(value = "importValidation")
-	public AjaxJson importValidation(@RequestParam("file")MultipartFile file,String batch) throws IOException, InvalidFormatException, IllegalAccessException, InstantiationException {
+	public AjaxJson importValidation(@RequestParam("file")MultipartFile file,String batch) {
 		AjaxJson j = new AjaxJson();
 		try {
 			MaterialVersion materialVersion = new MaterialVersion();