Merge remote-tracking branch 'origin/cc_20240603_wantarea_bigregion' into cc_20240603_wantarea_bigregion

This commit is contained in:
苏竹红
2024-06-04 22:13:52 +08:00

View File

@@ -313,7 +313,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
// csqmc
newStoreRequest.setCsqmc(BusinessDistrictEnum.getByCode(sysStoreAppRequest.getStoreDetail().getSubBusinessType()).getDesc());
//ddxm 督导
newStoreRequest.setDdxm(userMap.get(sysStoreAppRequest.getSupervisorDetail().getSupervisorId()).getJobnumber());
newStoreRequest.setDdxm(sysStoreAppRequest.getSupervisorDetail().getSupervisorId());
// dpzlht
newStoreRequest.setDpzlht(objects);
// end_time
@@ -404,7 +404,6 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
// zmrjkllzs1
newStoreRequest.setZmrjkllzs1(PassengerFlowEnum.getByCode(sysStoreAppRequest.getStoreDetail().getAverageDailyRs()).getType());
// zppsyfy
newStoreRequest.setZppsyfy(0.05);
newStoreRequest.setZppsyfy(Double.valueOf(sysStoreAppRequest.getStoreDetail().getUsageRate()));
// zq
newStoreRequest.setZq(pointInfoDO.getDistrict());