diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java index ec41727b9..01b4585de 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java @@ -156,11 +156,11 @@ public class OtaBaCxKsjjsmccsController extends JeroController queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId, @RequestParam(name = "otaIdT", required = true) String otaIdT) { - List otaBaCxKsjjsmccsList = otaBaCxKsjjsmccsService.queryByOtaId(otaId, otaIdT); - if (otaBaCxKsjjsmccsList == null) { + JSONObject json = otaBaCxKsjjsmccsService.queryByOtaId(otaId, otaIdT); + if (json == null) { return Result.error("未找到对应数据"); } - return Result.OK(otaBaCxKsjjsmccsList); + return Result.OK(json); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java index 30f92d7b7..777960fc7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java @@ -156,11 +156,11 @@ public class OtaBaCxKsjxtmccsController extends JeroController queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId, @RequestParam(name = "otaIdT", required = true) String otaIdT) { - List otaBaCxKsjxtmccsList = otaBaCxKsjxtmccsService.queryByOtaId(otaId, otaIdT); - if (otaBaCxKsjxtmccsList == null) { + JSONObject json = otaBaCxKsjxtmccsService.queryByOtaId(otaId, otaIdT); + if (json == null) { return Result.error("未找到对应数据"); } - return Result.OK(otaBaCxKsjxtmccsList); + return Result.OK(json); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/AttachmentEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/AttachmentEO.java new file mode 100644 index 000000000..e95fbd626 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/AttachmentEO.java @@ -0,0 +1,39 @@ +package com.jero.modules.ota.entity; + +public class AttachmentEO { + private String id; + private String fileName; + + public AttachmentEO() { + } + + public AttachmentEO(String id, String fileName) { + this.id = id; + this.fileName = fileName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + @Override + public String toString() { + return "{" + + "id='" + id + '\'' + + ", fileName='" + fileName + '\'' + + '}'; + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxAqcs.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxAqcs.java index 9faed40bc..60608f241 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxAqcs.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxAqcs.java @@ -3,7 +3,10 @@ package com.jero.modules.ota.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; +import java.util.List; + import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -91,4 +94,7 @@ public class OtaBaCxAqcs implements Serializable { @ApiModelProperty(value = "证明材料") private java.lang.String zmcl; + @TableField(exist = false) + private List zmclList; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxList.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxList.java index 33f78145a..f95073ec7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxList.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxList.java @@ -116,7 +116,17 @@ public class OtaBaCxList implements Serializable { @ApiModelProperty(value = "备注") private java.lang.String bz; - public void upadteData(OtaBaCxJbxx otaBaCxJbxx){ + /**在线升级系统附件*/ + @Excel(name = "在线升级系统附件", width = 15) + @ApiModelProperty(value = "在线升级系统附件") + private java.lang.String zxsjxtfj; + + /**在线升级驾驶附件*/ + @Excel(name = "在线升级驾驶附件", width = 15) + @ApiModelProperty(value = "在线升级驾驶附件") + private java.lang.String zxsjjsfj; + + public void updateData(OtaBaCxJbxx otaBaCxJbxx){ this.cpdjbh = otaBaCxJbxx.getDjbh(); this.ggpc = otaBaCxJbxx.getGgpc(); this.cpsb = otaBaCxJbxx.getCpsb(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java index 43b7419fc..6cc9a8581 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxZxsjyq.java @@ -3,7 +3,10 @@ package com.jero.modules.ota.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; +import java.util.List; + import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -121,4 +124,7 @@ public class OtaBaCxZxsjyq implements Serializable { @ApiModelProperty(value = "证明材料") private java.lang.String zmcl; + @TableField(exist = false) + private List zmclList; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaCxListMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaCxListMapper.xml index 2bdbf0773..eff730373 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaCxListMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaCxListMapper.xml @@ -18,5 +18,7 @@ + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java index cc60c8c9f..a716b4495 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java @@ -60,5 +60,5 @@ public interface IOtaBaCxKsjjsmccsService extends IService { */ List queryList(); - List queryByOtaId(String otaId, String otaIdT); + JSONObject queryByOtaId(String otaId, String otaIdT); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java index 54e9178be..a33518354 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java @@ -60,5 +60,5 @@ public interface IOtaBaCxKsjxtmccsService extends IService { */ List queryList(); - List queryByOtaId(String otaId, String otaIdT); + JSONObject queryByOtaId(String otaId, String otaIdT); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java index 4e094f309..a5363462a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java @@ -58,14 +58,11 @@ public interface IOtaBaCxListService extends IService { /** * 列表查询 - * - * @return */ List queryList(); /** * 备案维护 - * */ void batchRecord(String ids, String bazt, String batjsj, String bz, String cut); @@ -74,4 +71,5 @@ public interface IOtaBaCxListService extends IService { void importData(MultipartFile file, String cut); void exportData(String otaId, HttpServletResponse response, HttpServletRequest request); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index c5ab78650..e2312f09b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -1,11 +1,14 @@ package com.jero.modules.ota.service.impl; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.ota.entity.AttachmentEO; import com.jero.modules.ota.entity.OtaBaCxAqcs; import com.jero.modules.ota.entity.OtaBaCxJbxx; import com.jero.modules.ota.mapper.OtaBaCxAqcsMapper; import com.jero.modules.ota.service.IOtaBaCxAqcsService; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.List; @@ -39,6 +42,13 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl 0) { + JSONArray obj = new JSONArray(); + for (AttachmentEO aeo : otaBaCxAqcs.getZmclList()) { + obj.add(aeo); + } + otaBaCxAqcs.setZmcl(obj.toString()); + } saveOrUpdate(otaBaCxAqcs); } } @@ -105,6 +115,10 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl aeoList = JSONArray.parseArray(res.getZmcl(), AttachmentEO.class); + res.setZmclList(aeoList); + } return res; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index 3135280a4..e438757ac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -40,13 +40,13 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl implements IOtaBaCxKsjjsmccsService { + @Autowired + private IOtaBaCxListService otaBaCxListService; + /** * 保存 * @@ -59,6 +63,14 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl queryByOtaId(String otaId, String otaIdT) { + public JSONObject queryByOtaId(String otaId, String otaIdT) { List res = this.getByOtaId(otaId); if (ObjectUtil.isEmpty(res)) { res = getByOtaId(otaIdT); } - return res; + JSONObject json = new JSONObject(); + json.put("list", res); + OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); + if (ObjectUtils.isNotEmpty(otaBaCxList) && ObjectUtils.isNotEmpty(otaBaCxList.getZxsjjsfj())) { + json.put("fj", otaBaCxList.getZxsjjsfj()); + } + return json; } private List getByOtaId(String otaId) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index bb6b520e8..99d7d88b5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -7,9 +7,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.ota.entity.OtaBaCxJbxx; import com.jero.modules.ota.entity.OtaBaCxKsjjsmccs; import com.jero.modules.ota.entity.OtaBaCxKsjxtmccs; +import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.mapper.OtaBaCxKsjxtmccsMapper; import com.jero.modules.ota.service.IOtaBaCxKsjxtmccsService; +import com.jero.modules.ota.service.IOtaBaCxListService; import com.jero.modules.system.util.StringUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.lang.reflect.Field; @@ -26,6 +30,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl implements IOtaBaCxKsjxtmccsService { + @Autowired + private IOtaBaCxListService otaBaCxListService; + /** * 保存 * @@ -58,7 +65,17 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl queryByOtaId(String otaId, String otaIdT) { + public JSONObject queryByOtaId(String otaId, String otaIdT) { List res = getByOtaId(otaId); if (ObjectUtil.isEmpty(res)) { res = getByOtaId(otaIdT); } - return res; + JSONObject json = new JSONObject(); + json.put("list", res); + OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); + if (ObjectUtils.isNotEmpty(otaBaCxList) && ObjectUtils.isNotEmpty(otaBaCxList.getZxsjxtfj())) { + json.put("fj", otaBaCxList.getZxsjxtfj()); + } + return json; } private List getByOtaId(String otaId) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java index 99d60484c..09fcc3796 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java @@ -1,11 +1,15 @@ package com.jero.modules.ota.service.impl; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.ota.entity.AttachmentEO; import com.jero.modules.ota.entity.OtaBaCxJbxx; import com.jero.modules.ota.entity.OtaBaCxZxsjyq; import com.jero.modules.ota.mapper.OtaBaCxZxsjyqMapper; import com.jero.modules.ota.service.IOtaBaCxZxsjyqService; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.List; @@ -40,6 +44,13 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl 0) { + JSONArray obj = new JSONArray(); + for (AttachmentEO aeo : otaBaCxZxsjyq.getZmclList()) { + obj.add(aeo); + } + otaBaCxZxsjyq.setZmcl(obj.toString()); + } saveOrUpdate(otaBaCxZxsjyq); } @@ -106,6 +117,10 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl aeoList = JSONArray.parseArray(res.getZmcl(), AttachmentEO.class); + res.setZmclList(aeoList); + } return res; }