Merge remote-tracking branch 'origin/master'

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java

@@ -336,11 +336,6 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                             DummyInventoryInfoEO sameInfoCJ = infoCJList.stream().filter(e -> e.getSerialNumber().equals(sameSerialNumber)).collect(Collectors.toList()).get(0);
                             sameinfoCJList.add(sameInfoCJ);
                         }
-                       /* for (String sameSerialNumber : sameSerialNumberList) {
-                            //查询数据库里包含共有编号的数据
-                            DummyInventoryInfoEO sameInfoCJ = infoCJList.stream().filter(e -> e.getSerialNumber().equals(sameSerialNumber)).collect(Collectors.toList()).get(0);
-                            sameinfoCJList.add(sameInfoCJ);
-                        }*/
                     }
                 }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java

@@ -1154,10 +1154,19 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			FileUnZip.deleteDir(saveDirectory);
 			throw new JeroBootException(html);
 		} else {
+			StringBuilder serialNumberBuilder = new StringBuilder();
 			if (dataList.size() != 0) {
 				this.saveBatch(dataList);
 
-				//////
+				//更新log
+				for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList){
+					serialNumberBuilder.append(dummyInventoryInfoEO.getSerialNumber()).append(",");
+				}
+				String serialNumber = serialNumberBuilder.substring(0, serialNumberBuilder.length() - 1);
+				LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+				String username = sysUser.getUsername();
+				String contentLog = username+"向清单中添加了标准\""+serialNumber+"\"";
+				updateLog(contentLog, dataList.get(0).getDummyInventoryBaseId());
 			}
 		}
 	}