admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

人员车辆材料修改

Browse Source
This commit is contained in:
pengjie 2024-05-10 18:21:59 +08:00
parent 13240e72c5
commit 733fbf7cb6
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java
View File

@ -183,6 +183,10 @@ public class CarInfoController {
carInfo.setProjectSn(map.get("projectSn").toString()); carInfo.setProjectSn(map.get("projectSn").toString());
carInfo.setIsBlack(MapUtils.getInteger(map, "isBlack")); carInfo.setIsBlack(MapUtils.getInteger(map, "isBlack"));
carInfo.setUserIds(userIds); carInfo.setUserIds(userIds);
Object outsideDriverIdCard = map.get("outsideDriverIdCard");
if (outsideDriverIdCard != null) {
carInfo.setOutsideDriverIdCard(outsideDriverIdCard.toString());
}
carInfoService.addCarInfo(carInfo); carInfoService.addCarInfo(carInfo);
return Result.ok(); return Result.ok();
} }

2
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
View File

@ -177,7 +177,7 @@ public class XzMaterialController {
Integer type = Integer.parseInt(obj.get("type").toString()); Integer type = Integer.parseInt(obj.get("type").toString());
XzMaterial xzMaterial = new XzMaterial(); XzMaterial xzMaterial = new XzMaterial();
xzMaterial.setType(type); xzMaterial.setType(type);
String [] param = {"name", "model", "specifications", "unit", "num", "remark"}; String [] param = {"name", "model", "specifications", "unit", "num", "remark", "imageUrl"};
List<XzMaterialDetail> list = new ArrayList<>(); List<XzMaterialDetail> list = new ArrayList<>();
XzMaterial exist = xzMaterialService.getOne(Wrappers.<XzMaterial>lambdaQuery() XzMaterial exist = xzMaterialService.getOne(Wrappers.<XzMaterial>lambdaQuery()
.eq(XzMaterial::getType, type) .eq(XzMaterial::getType, type)

6
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java
View File

@ -260,12 +260,12 @@ public class XzWorkerInfoAuditRecordController {
WorkerInfoAuditRecord infoAuditRecord = workerInfoAuditRecordService.getById(workerId); WorkerInfoAuditRecord infoAuditRecord = workerInfoAuditRecordService.getById(workerId);
List<WorkerContract> contractList = new ArrayList<>(); List<WorkerContract> contractList = new ArrayList<>();
WorkerContract workerContract = new WorkerContract(); 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); contractList.add(workerContract);
infoAuditRecord.setContractInfo(JSON.toJSONString(contractList)); infoAuditRecord.setContractInfo(JSON.toJSONString(contractList));
List<WorkerInsurance> insuranceList = new ArrayList<>(); List<WorkerInsurance> insuranceList = new ArrayList<>();
WorkerInsurance workerInsurance = new WorkerInsurance(); 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); insuranceList.add(workerInsurance);
infoAuditRecord.setInsuranceInfo(JSON.toJSONString(insuranceList)); infoAuditRecord.setInsuranceInfo(JSON.toJSONString(insuranceList));
@ -279,7 +279,7 @@ public class XzWorkerInfoAuditRecordController {
if (p == 0) { if (p == 0) {
workerCertificate.setCertificateType(Integer.parseInt(jsonObject.getJSONArray(s).get(0).toString())); workerCertificate.setCertificateType(Integer.parseInt(jsonObject.getJSONArray(s).get(0).toString()));
} else { } 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 ++; p ++;
} }

6
src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterialDetail.java
View File

@ -73,6 +73,12 @@ public class XzMaterialDetail implements Serializable {
@Excel(name = "备注", width = 15) @Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remark; private String remark;
/**
* 相关文件证明
*/
@Excel(name = "相关文件证明", width = 15)
@ApiModelProperty(value = "相关文件证明")
private String imageUrl;
/** /**
* 项目sn * 项目sn
*/ */