|
|
@ -658,33 +658,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres |
|
|
|
vo.setImage(image); |
|
|
|
vo.setUserSid(vo.getCreateBySid()); |
|
|
|
return rb.success().setData(vo); |
|
|
|
|
|
|
|
/* String type1 = "04"; //保单照片
|
|
|
|
String type2 = "05"; //现场照片
|
|
|
|
List<String> policyImage = new ArrayList<>(); |
|
|
|
List<String> image = new ArrayList<>(); |
|
|
|
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); |
|
|
|
AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData(); |
|
|
|
SysStaffinfoVo data1 = sysUserFeign.getSysUserByMobile(data.getStaffSid()).getData(); |
|
|
|
AppScmVehicleGressionInfoVo vo = baseMapper.getCarTransferInfo(sid, useOrgSid); |
|
|
|
List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(sid); |
|
|
|
vo.setScmVehicleGressionVehs(scmVehicleGressionVehVos); |
|
|
|
vo.setApplicantName(data1.getName()); |
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
String format = simpleDateFormat.format(new Date()); |
|
|
|
vo.setApplicantDate(format); |
|
|
|
vo.setUserSid(userSid); |
|
|
|
List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(sid, type1); |
|
|
|
for (ScmFile scmFile : scmFiles1) { |
|
|
|
policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath()); |
|
|
|
} |
|
|
|
vo.setPolicyImage(policyImage); |
|
|
|
List<ScmFile> scmFiles2 = scmFileService.selectByLinkSid(sid, type2); |
|
|
|
for (ScmFile scmFile : scmFiles2) { |
|
|
|
policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath()); |
|
|
|
} |
|
|
|
vo.setImage(image); |
|
|
|
return vo;*/ |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
@ -890,10 +863,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres |
|
|
|
//用户的组织全路径
|
|
|
|
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); |
|
|
|
//用户的部门全路径sid
|
|
|
|
bv.setOrgSidPath(orgSidPath); |
|
|
|
dto.setOrgPath(orgSidPath); |
|
|
|
} else { |
|
|
|
bv.setOrgSidPath(orgPath); |
|
|
|
dto.setOrgPath(orgPath); |
|
|
|
} |
|
|
|
|
|
|
@ -969,7 +940,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres |
|
|
|
baseVehicleTempstateDto.setBusSid(businessSid); |
|
|
|
baseVehicleTempstateFeign.save(baseVehicleTempstateDto); |
|
|
|
} |
|
|
|
|
|
|
|
scmVehicleGression = fetchBySid(businessSid); |
|
|
|
bv.setOrgSidPath(scmVehicleGression.getOrgSidPath()); |
|
|
|
//流程中的参数赋值、若有网关,则赋值网关中判断的字段。
|
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
//业务sid
|
|
|
|