|
@ -336,7 +336,16 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa |
|
|
String guidedPrice = baseVehmodelVo.getGuidedPrice(); |
|
|
String guidedPrice = baseVehmodelVo.getGuidedPrice(); |
|
|
String manufactorSettlementPrice = baseVehmodelVo.getManufactorSettlementPrice(); |
|
|
String manufactorSettlementPrice = baseVehmodelVo.getManufactorSettlementPrice(); |
|
|
vo.setGuidedPrice(guidedPrice + "/" + manufactorSettlementPrice); |
|
|
vo.setGuidedPrice(guidedPrice + "/" + manufactorSettlementPrice); |
|
|
|
|
|
String updateDate = DateUtil.formatDate(baseVehmodelVo.getModifyTime()); |
|
|
|
|
|
String nowDate = DateUtil.formatDate(new Date()); |
|
|
vo.setNewUpdateDate(DateUtil.formatDate(baseVehmodelVo.getModifyTime())); |
|
|
vo.setNewUpdateDate(DateUtil.formatDate(baseVehmodelVo.getModifyTime())); |
|
|
|
|
|
String[] updateDates = updateDate.split("-"); |
|
|
|
|
|
String[] nowDates = nowDate.split("-"); |
|
|
|
|
|
if (updateDates[0].equals(nowDates[0]) && updateDates[1].equals(nowDates[1])){ |
|
|
|
|
|
vo.setIsNow(true); |
|
|
|
|
|
}else { |
|
|
|
|
|
vo.setIsNow(false); |
|
|
|
|
|
} |
|
|
List<ScmApplyInboundVehicleVo> list = scmApplyInboundVehicleService.selectListByAppSid(sid); |
|
|
List<ScmApplyInboundVehicleVo> list = scmApplyInboundVehicleService.selectListByAppSid(sid); |
|
|
List<ScmFileVo> scmFileVos = scmFileService.fetchByMainSid(sid); |
|
|
List<ScmFileVo> scmFileVos = scmFileService.fetchByMainSid(sid); |
|
|
for (ScmFileVo scmFileVo : scmFileVos) { |
|
|
for (ScmFileVo scmFileVo : scmFileVos) { |
|
|