diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java index 51176b859..fe8063bfa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java @@ -183,6 +183,10 @@ public class CarInfoController { carInfo.setProjectSn(map.get("projectSn").toString()); carInfo.setIsBlack(MapUtils.getInteger(map, "isBlack")); carInfo.setUserIds(userIds); + Object outsideDriverIdCard = map.get("outsideDriverIdCard"); + if (outsideDriverIdCard != null) { + carInfo.setOutsideDriverIdCard(outsideDriverIdCard.toString()); + } carInfoService.addCarInfo(carInfo); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java index 4a271befe..759ca5456 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java @@ -177,7 +177,7 @@ public class XzMaterialController { Integer type = Integer.parseInt(obj.get("type").toString()); XzMaterial xzMaterial = new XzMaterial(); xzMaterial.setType(type); - String [] param = {"name", "model", "specifications", "unit", "num", "remark"}; + String [] param = {"name", "model", "specifications", "unit", "num", "remark", "imageUrl"}; List list = new ArrayList<>(); XzMaterial exist = xzMaterialService.getOne(Wrappers.lambdaQuery() .eq(XzMaterial::getType, type) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java index e1e9b5d98..f2fc885a7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java @@ -260,12 +260,12 @@ public class XzWorkerInfoAuditRecordController { WorkerInfoAuditRecord infoAuditRecord = workerInfoAuditRecordService.getById(workerId); List contractList = new ArrayList<>(); WorkerContract workerContract = new WorkerContract(); - workerContract.setImageUrl(object.getJSONArray("contract").getJSONObject(0).getString("url")); + workerContract.setImageUrl(object.getJSONArray("contract").getJSONObject(0).getString("name") + "*" + object.getJSONArray("contract").getJSONObject(0).getString("url")); contractList.add(workerContract); infoAuditRecord.setContractInfo(JSON.toJSONString(contractList)); List insuranceList = new ArrayList<>(); WorkerInsurance workerInsurance = new WorkerInsurance(); - workerInsurance.setPhotoUrl(object.getJSONArray("insurance").getJSONObject(0).getString("url")); + workerInsurance.setPhotoUrl(object.getJSONArray("insurance").getJSONObject(0).getString("name") + "*" + object.getJSONArray("insurance").getJSONObject(0).getString("url")); insuranceList.add(workerInsurance); infoAuditRecord.setInsuranceInfo(JSON.toJSONString(insuranceList)); @@ -279,7 +279,7 @@ public class XzWorkerInfoAuditRecordController { if (p == 0) { workerCertificate.setCertificateType(Integer.parseInt(jsonObject.getJSONArray(s).get(0).toString())); } else { - workerCertificate.setPhotoUrl(jsonObject.getJSONArray(s).getJSONObject(0).getString("url")); + workerCertificate.setPhotoUrl(jsonObject.getJSONArray(s).getJSONObject(0).getString("name") + "*" + jsonObject.getJSONArray(s).getJSONObject(0).getString("url")); } p ++; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterialDetail.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterialDetail.java index 252c78911..f3cb323b7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterialDetail.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterialDetail.java @@ -73,6 +73,12 @@ public class XzMaterialDetail implements Serializable { @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") private String remark; + /** + * 相关文件证明 + */ + @Excel(name = "相关文件证明", width = 15) + @ApiModelProperty(value = "相关文件证明") + private String imageUrl; /** * 项目sn */