diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java index fc88592f9..5117e407c 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java @@ -444,7 +444,7 @@ public class VisitorsServiceImpl extends ServiceImpl visitorsCarAppDTOList = visitorsAppDTO.getCarList(); @@ -492,31 +498,43 @@ public class VisitorsServiceImpl extends ServiceImpl yyVisitorsCarEntities = BeanUtils.toBean(visitorsCarAppDTOList, VisitorsCarEntity.class); + yyVisitorsCarEntities.forEach(i -> { + i.setVisitorsId(yyVisitors.getId()); + }); + visitorsCarMapper.insert(yyVisitorsCarEntities); } + } if (isOtherPeople.equals("1")){ List visitorsPeopleAppDTOList =visitorsAppDTO.getOtherPeople(); -// if (!CollectionUtils.isEmpty(visitorsPeopleAppDTOList)){ -// visitorsPeopleAppDTOList.forEach(i->{ -// VisitorInfo itemVisitorInfo = new VisitorInfo(); -// itemVisitorInfo.setVisitorName(i.getName()); -// itemVisitorInfo.setPhoneNo(i.getMobile()); -// itemVisitorInfo.setvis -// }); -// } if (!CollectionUtils.isEmpty(visitorsPeopleAppDTOList)){ List visitorsPeopleEntities = BeanUtils.toBean(visitorsPeopleAppDTOList, VisitorsPeopleEntity.class); for (int i = 0; i < visitorsPeopleEntities.size(); i++){ + //被邀约者插入随行人员信息 VisitorsPeopleEntity visitorsPeopleEntity = visitorsPeopleEntities.get(i); visitorsPeopleEntity.setVisitorsId(dataVisitors.getId()); + //邀约者邀约的数据也要插入,方便邀约人看到实际信息 } visitorsPeopleMapper.insert(visitorsPeopleEntities); + // 创建新的对象集合:为邀约者插入随行人员信息 + List yyVisitorsPeopleEntities = BeanUtils.toBean(visitorsPeopleAppDTOList, VisitorsPeopleEntity.class); + yyVisitorsPeopleEntities.forEach(i -> { + i.setVisitorsId(yyVisitors.getId()); + }); + visitorsPeopleMapper.insert(yyVisitorsPeopleEntities); + } } visitorsEntity.setCheckStatus(TaskCheckStatusEnum.RESULT.getCode()); + visitorsEntity.setName(visitorsAppDTO.getName()); + visitorsEntity.setCompanyName(visitorsAppDTO.getCompanyName()); + visitorsEntity.setReasonValue(visitorsAppDTO.getReasonValue()); baseMapper.updateById(visitorsEntity); return dataVisitors.getId(); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/fix_inventory_total_amount.sql b/pjcloud-supermarket/pjcloud-supermarket-biz/fix_inventory_total_amount.sql index f22ad7143..1224d7ff7 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/fix_inventory_total_amount.sql +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/fix_inventory_total_amount.sql @@ -57,7 +57,7 @@ WHERE r.total_amount != ( SELECT COALESCE(SUM(i.total_amount), 0) FROM sm_erp_inventory_records_item i WHERE i.inventory_id = r.id -); +) and r.inventory_type!='5'; -- ============================================ -- 5. 验证修复结果 diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java index 023ec5c64..0680075e3 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java @@ -564,6 +564,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl