Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/information/utils/ImportInformation.java

@@ -87,15 +87,21 @@ public  class ImportInformation {
                     isBackNo = 1;
                 }
                 if (materials.size() >= 1000 && flag == 1) {
+                    //更新物料信息
                     materialService.saveMater(materials);
+                    //根据插入的物料信息查询项目定义号，sum（判断是否完成领退料(0完成-1为完成)） 并按照项目定义号分组
                     List<Material> information = materialService.findInformation(materials);
                     materials.clear();
+                    //循环查询出的信息
                     for (Material maInfor : information) {
                         Information upInfor = new Information();
+                        //根据项目定义号，查询获得项目信息
                         Information needInfor = materialService.findNeedInfor(maInfor);
                         if (needInfor != null) {
                             upInfor.setProjectId(needInfor.getProjectId());
+                            //查询出的信息中是否完成领退料，每条物料0为完成，1为未完成，根据项目定义号分组后sum如果为0则改项目定义号下的所有物料都完成领退料
                             if (maInfor.getIsBackNo() == 0) {
+                                //获取项目表中的第一次完成领退料，第一次完成领退料时间，第二次完成领退料
                                 if (needInfor.getFirstFinish() == "" || needInfor.getFirstFinish() == null || ("否").equals(needInfor.getFirstFinish())) {
                                     upInfor.setFirstFinish("是");
                                     upInfor.setFirstFinishDate(new Date());
@@ -396,7 +402,9 @@ public  class ImportInformation {
         return hashMap;
     }
 
-    //导入原因类型
+    /**
+     * 导入原因类型
+     * */
     public static Map<String,Object> btnInReason(ImportExcel ei,int lastDataRowNum) {
         HashMap<String,Object> hashMap = new HashMap<String,Object>();
         //用于记录导入原因类型时，没有原因类型的情况
@@ -566,6 +574,9 @@ public  class ImportInformation {
         return hashMap;
     }
 
+    /**
+     * 导入送审
+     * */
     public static Map<String,Integer> importInTrial(ImportExcel ei,int lastDataRowNum) {
         HashMap<String,Integer> hashMap = new HashMap<String,Integer>();
         List<append> appendList = new ArrayList<>();

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

@@ -181,12 +181,15 @@ public class InformationController extends BaseController {
     public AjaxJson importFile(MultipartFile btnCom, MultipartFile btnInformation, HttpServletResponse response, HttpServletRequest request) {
         AjaxJson j = new AjaxJson();
         try {
+            //导入综合信息Excel数据
             ImportExcel importExcel = new ImportExcel(btnInformation, 1, 0);
             int excelLastDataRowNum = importExcel.getLastDataRowNum();
-            Map<String, Integer> importCom = ImportInformation.importCom(importExcel, excelLastDataRowNum);
+            ImportInformation.importCom(importExcel, excelLastDataRowNum);
+            //导入欠供物资Excel数据
             ImportExcel ei = new ImportExcel(btnCom, 1, 0);
             int lastDataRowNum = ei.getLastDataRowNum();
-            Map<String, Object> information = ImportInformation.importmation(ei, lastDataRowNum);
+            ImportInformation.importmation(ei, lastDataRowNum);
+            //插入导入记录数据，导入人及导入时间
             Record record = new Record();
             recordService.save(record);
             j.setMsg("成功");