Merge branch 'develop_dl_3.7.0.8' of http://39.98.45.134:8090/moa/amos-boot-biz…

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -357,9 +357,7 @@ public class ExcelServiceImpl {
 				String signTimeBIGGER =par.containsKey("signTimeBIGGER")?par.get("signTimeBIGGER").toString():null;
 				String signTimeLESS =par.containsKey("signTimeLESS")?par.get("signTimeLESS").toString():null;
 				ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-				String companyId = reginParams.getPersonIdentity().getCompanyId();
-				OrgUsr orgUsr = orgUsrMapper.queryBySequenceNbr(companyId);
-				dto.setBizOrgCode(orgUsr.getBizOrgCode());
+				dto.setBizOrgCode(reginParams.getPersonIdentity().getCompanyBizOrgCode());
 				dto.setDate(date);
 				dto.setBizOrgName(bizOrgName);
 				dto.setName(name);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -168,7 +168,10 @@ public class CheckServiceImpl implements ICheckService {
         Check check = checkDao.findById(imgList.get(0).getCheckId()).get();
         check.setShotNumber(check.getShotNumber() + imgList.size());
         checkDao.save(check);
-        checkShotDao.saveAll(imgList);
+        for (CheckShot cs: imgList
+             ) {
+            checkShotDao.saveAndFlush(cs);
+        }
         //  巡检站端与中心级数据同步
         TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
             @Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/RouteServiceImpl.java

@@ -286,7 +286,10 @@ public class RouteServiceImpl  extends ServiceImpl<RouteMapper, Route> implement
                     });
                 });
                 if(!items.isEmpty()) {
-                    iRoutePointItemDao.saveAll(items);
+                    for (RoutePointItem routePointItem: items
+                         ) {
+                        iRoutePointItemDao.saveAndFlush(routePointItem);
+                    }
                 }
             }
         }