zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

访客功能修复

Browse Source
This commit is contained in:
zjf committed 2025-09-24 16:06:35 +08:00
1 parent 1ccd6a50cd
commit 67875df86d
3 files changed
+30 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java
+28 -10
View File
@@ -444,7 +444,7 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
public Object receiveYY(VisitorsReceiveAppDTO visitorsReceiveAppDTO) {
Long id = visitorsReceiveAppDTO.getId();
String checkStatus = visitorsReceiveAppDTO.getCheckStatus();
VisitorsAppDTO visitorsAppDTO = visitorsReceiveAppDTO.getVisitorsAppDTO();
Long currentVisitorUserId = getCurrentVisitorUserId();
//邀约者的数据信息
VisitorsEntity yyVisitors = baseMapper.selectById(id);
@@ -469,6 +469,7 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
dataVisitors.setVisitorUserId(currentVisitorUserId);
dataVisitors.setDeptId(yyVisitors.getDeptId());
dataVisitors.setDeptName(yyVisitors.getDeptName());
dataVisitors.setUserName(yyVisitors.getUserName());
dataVisitors.setUserId(currentVisitorUserId);
dataVisitors.setCheckStatus(TaskCheckStatusEnum.RESULT.getCode());
dataVisitors.setType(VisitorTypeEnum.FKSQ.getType());
@@ -478,11 +479,16 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
dataVisitors.setYyId(visitorsReceiveAppDTO.getId());
dataVisitors.setIsDrive(yyVisitors.getIsDrive());
dataVisitors.setIsOtherPeople(yyVisitors.getIsOtherPeople());
dataVisitors.setName(visitorUserEntity.getRealName());
dataVisitors.setMobile(visitorUserEntity.getPhone());
dataVisitors.setVStartDate(yyVisitors.getVStartDate());
dataVisitors.setVEndDate(yyVisitors.getVEndDate());
dataVisitors.setReasonValue(visitorsAppDTO.getReasonValue());
dataVisitors.setCompanyName(visitorsAppDTO.getCompanyName());
String isDrive = yyVisitors.getIsDrive();
String isOtherPeople = yyVisitors.getIsOtherPeople();
baseMapper.insert(dataVisitors);
VisitorsAppDTO visitorsAppDTO = visitorsReceiveAppDTO.getVisitorsAppDTO();
if (isDrive.equals("1")){
//保存车辆信息
List<VisitorsCarAppDTO> visitorsCarAppDTOList = visitorsAppDTO.getCarList();
@@ -492,31 +498,43 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
i.setVisitorsId(dataVisitors.getId());
});
visitorsCarMapper.insert(visitorsCarEntities);
//邀约者邀约的数据也要插入，方便邀约人看到实际信息
// 为邀约者创建新的车辆信息集合
List<VisitorsCarEntity> yyVisitorsCarEntities = BeanUtils.toBean(visitorsCarAppDTOList, VisitorsCarEntity.class);
yyVisitorsCarEntities.forEach(i -> {
i.setVisitorsId(yyVisitors.getId());
});
visitorsCarMapper.insert(yyVisitorsCarEntities);
}
}
if (isOtherPeople.equals("1")){
List<VisitorsPeopleAppDTO> 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<VisitorsPeopleEntity> 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<VisitorsPeopleEntity> 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();
}
pjcloud-supermarket/pjcloud-supermarket-biz/fix_inventory_total_amount.sql
+1 -1
View File
@@ -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. 验证修复结果
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java
+1
View File
@@ -564,6 +564,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
smErpInventoryRecordsItemEntity.setUnitPrice
(smErpUnitEntity.getPromotionPrice()==null || smErpUnitEntity.getPromotionPrice()==0
?smErpUnitEntity.getRetailPrice():smErpUnitEntity.getPromotionPrice());
// smErpInventoryRecordsItemEntity.setTotalAmount(smErpInventoryRecordsItemEntity.getQuantity() * smErpInventoryRecordsItemEntity.getUnitPrice());
smErpInventoryRecordsItemEntityList.add(smErpInventoryRecordsItemEntity);
}
smErpStockService.updateStock(updateStockDTOS);