Merge remote-tracking branch 'origin/master'

boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/impl/VaccineInfoServiceImpl.java

@@ -14,6 +14,8 @@ import com.boman.web.core.mapper.VaccineInfoMapper;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+
 /**
  * 疫苗信息Service业务层处理
  *
@@ -27,9 +29,9 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
     private static final String EDIT = "edit";
     private static final String DELETE = "delete";
 
-    @Autowired
+    @Resource
     private VaccineInfoMapper vaccineInfoMapper;
-    @Autowired
+    @Resource
     private VaccineInfoOperationMapper vaccineInfoOperationMapper;
 
     /**
@@ -64,6 +66,7 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
     @Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
     public int insertVaccineInfo(VaccineInfoOperation vaccineInfoOperation) {
         // 疫苗信息
+        genNowIn(vaccineInfoOperation);
         vaccineInfoOperation.setCreateTime(DateUtils.getNowDate());
         int info = vaccineInfoMapper.insertVaccineInfo(vaccineInfoOperation);
 
@@ -86,6 +89,7 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
     @Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
     public int updateVaccineInfo(VaccineInfoOperation vaccineInfo) {
         vaccineInfo.setUpdateTime(DateUtils.getNowDate());
+        genNowIn(vaccineInfo);
         int info = vaccineInfoMapper.updateVaccineInfo(vaccineInfo);
 
         // 疫苗信息新增操作记录