Commit d9e6602e authored by zhengjiawei's avatar zhengjiawei

bug

parent 332eb8b2
...@@ -232,10 +232,11 @@ public class EquipmentController extends BaseController { ...@@ -232,10 +232,11 @@ public class EquipmentController extends BaseController {
@ApiParam(value = "装备现场图", required = false) @RequestParam(value = "img1", required = false) MultipartFile img1, @ApiParam(value = "装备现场图", required = false) @RequestParam(value = "img1", required = false) MultipartFile img1,
@RequestParam(value = "img2", required = false) MultipartFile img2, @RequestParam(value = "img2", required = false) MultipartFile img2,
@RequestParam(value = "img3", required = false) MultipartFile img3, @RequestParam(value = "img3", required = false) MultipartFile img3,
@RequestParam(value = "img4", required = false) MultipartFile img4, Equipment equipment) { @RequestParam(value = "img4", required = false) MultipartFile img4,
@RequestParam(value = "equipmentPic", required = false) MultipartFile equipmentPic, Equipment equipment) {
ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
String compCode=getOrgCode(reginParams); String compCode=getOrgCode(reginParams);
ImgParam[] imgs = new ImgParam[4]; ImgParam[] imgs = new ImgParam[5];
ImgParam imgParam1 = new ImgParam(); ImgParam imgParam1 = new ImgParam();
imgParam1.setFile(img1); imgParam1.setFile(img1);
imgParam1.setType(1); imgParam1.setType(1);
...@@ -248,10 +249,15 @@ public class EquipmentController extends BaseController { ...@@ -248,10 +249,15 @@ public class EquipmentController extends BaseController {
ImgParam imgParam4 = new ImgParam(); ImgParam imgParam4 = new ImgParam();
imgParam4.setFile(img4); imgParam4.setFile(img4);
imgParam4.setType(4); imgParam4.setType(4);
ImgParam eqImg = new ImgParam();
eqImg.setFile(equipmentPic);
eqImg.setType(5);
imgs[0] = imgParam1; imgs[0] = imgParam1;
imgs[1] = imgParam2; imgs[1] = imgParam2;
imgs[2] = imgParam3; imgs[2] = imgParam3;
imgs[3] = imgParam4; imgs[3] = imgParam4;
imgs[4] = eqImg;
equipment.setOrgCode(compCode); equipment.setOrgCode(compCode);
equipment.setCreateBy(getUserId()); equipment.setCreateBy(getUserId());
iEquipService.saveEquipmentAndImg(imgs, equipment); iEquipService.saveEquipmentAndImg(imgs, equipment);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment