diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java index 3294f24a9..442f6666a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java @@ -156,7 +156,6 @@ public class OtaBaCxJbxxController extends JeroController queryByOtaId(@RequestParam(name = "otaId") String otaId, @RequestParam(name = "otaIdT") String otaIdT) { OtaBaCxJbxx otaBaCxJbxx = otaBaCxJbxxService.queryByOtaId(otaId, otaIdT); - otaBaCxJbxx = otaBaCxJbxxService.queryByOtaId(otaId, otaIdT); return Result.OK(otaBaCxJbxx); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java index 7b598f04e..27a1979ed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java @@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.ota.entity.OtaBaCxJbxx; import com.jero.modules.ota.entity.OtaBaSjSjmbcl; import com.jero.modules.ota.service.IOtaBaSjSjmbclService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -144,6 +145,18 @@ public class OtaBaSjSjmbclController extends JeroController queryByOtaId(@RequestParam(name = "otaId") String otaId, + @RequestParam(name = "otaIdT") String otaIdT) { + OtaBaSjSjmbcl otaBaSjSjmbcl = otaBaSjSjmbclService.queryByOtaId(otaId, otaIdT); + return Result.OK(otaBaSjSjmbcl); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java index 72eebbbed..80dd6e4dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java @@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.ota.entity.OtaBaSjSjmbcl; import com.jero.modules.ota.entity.OtaBaSjSjmbcx; import com.jero.modules.ota.service.IOtaBaSjSjmbcxService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -81,8 +82,8 @@ public class OtaBaSjSjmbcxController extends JeroController add(@Validated @RequestBody OtaBaSjSjmbcx otaBaSjSjmbcx) { - otaBaSjSjmbcxService.add(otaBaSjSjmbcx); - return Result.OK("添加成功！"); + OtaBaSjSjmbcx cx = otaBaSjSjmbcxService.add(otaBaSjSjmbcx); + return Result.OK(cx); } /** @@ -144,6 +145,18 @@ public class OtaBaSjSjmbcxController extends JeroController queryByOtaId(@RequestParam(name = "otaId") String otaId, + @RequestParam(name = "otaIdT") String otaIdT) { + OtaBaSjSjmbcx otaBaSjSjmbcx = otaBaSjSjmbcxService.queryByOtaId(otaId, otaIdT); + return Result.OK(otaBaSjSjmbcx); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java index 04b83dce4..1f173e37c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java @@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.ota.entity.OtaBaCxAqcs; import com.jero.modules.ota.entity.OtaBaSjSjyxpg; import com.jero.modules.ota.service.IOtaBaSjSjyxpgService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -144,6 +145,24 @@ public class OtaBaSjSjyxpgController extends JeroController queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId, + @RequestParam(name = "otaIdT", required = true) String otaIdT) { + OtaBaSjSjyxpg otaBaSjSjyxpg = otaBaSjSjyxpgService.queryByOtaId(otaId, otaIdT); + if (otaBaSjSjyxpg == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaSjSjyxpg); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjTxjlController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjTxjlController.java deleted file mode 100644 index 787caa402..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjTxjlController.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.jero.modules.ota.controller; - -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.ota.entity.OtaBaSjTxjl; -import com.jero.modules.ota.service.IOtaBaSjTxjlService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; - - - /** - * @Description: 车型升级-填写记录表 - * @Author: jero-boot - * @Date: 2023-03-25 - * @Version: V1.0 - */ -@Api(tags="车型升级-填写记录表") -@RestController -@RequestMapping("/ota/otaBaSjTxjl") -@Slf4j -public class OtaBaSjTxjlController extends JeroController { - @Autowired - private IOtaBaSjTxjlService otaBaSjTxjlService; - - /** - * 分页列表查询 - * - * @param otaBaSjTxjl - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "车型升级-填写记录表-分页列表查询") - @ApiOperation(value="车型升级-填写记录表-分页列表查询", notes="车型升级-填写记录表-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaSjTxjl otaBaSjTxjl, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjTxjl, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = otaBaSjTxjlService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "车型升级-填写记录表-列表查询") - @ApiOperation(value="车型升级-填写记录表-列表查询", notes="车型升级-填写记录表-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { - List list = otaBaSjTxjlService.queryList(); - return Result.OK(list); - } - - /** - * 添加 - * - * @param otaBaSjTxjl - * @return - */ - @AutoLog(value = "车型升级-填写记录表-添加") - @ApiOperation(value="车型升级-填写记录表-添加", notes="车型升级-填写记录表-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OtaBaSjTxjl otaBaSjTxjl) { - otaBaSjTxjlService.add(otaBaSjTxjl); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param otaBaSjTxjl - * @return - */ - @AutoLog(value = "车型升级-填写记录表-编辑") - @ApiOperation(value="车型升级-填写记录表-编辑", notes="车型升级-填写记录表-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaSjTxjl otaBaSjTxjl) { - otaBaSjTxjlService.editById(otaBaSjTxjl); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "车型升级-填写记录表-通过id删除") - @ApiOperation(value="车型升级-填写记录表-通过id删除", notes="车型升级-填写记录表-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - otaBaSjTxjlService.deleteById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "车型升级-填写记录表-批量删除") - @ApiOperation(value="车型升级-填写记录表-批量删除", notes="车型升级-填写记录表-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.otaBaSjTxjlService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "车型升级-填写记录表-通过id查询") - @ApiOperation(value="车型升级-填写记录表-通过id查询", notes="车型升级-填写记录表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - OtaBaSjTxjl otaBaSjTxjl = otaBaSjTxjlService.queryById(id); - if(otaBaSjTxjl==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaSjTxjl); - } - - /** - * 导出excel - * - * @param request - * @param otaBaSjTxjl - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, OtaBaSjTxjl otaBaSjTxjl) { - return super.exportXls(request, otaBaSjTxjl, OtaBaSjTxjl.class, "车型升级-填写记录表"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, OtaBaSjTxjl.class); - } - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java index e30344cd0..bf9b04d3a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java @@ -99,17 +99,17 @@ public class OtaBaSjGgnrfs implements Serializable { /**告知用户升级成功或失败*/ @Excel(name = "告知用户升级成功或失败", width = 15) @ApiModelProperty(value = "告知用户升级成功或失败") - private java.lang.String sjsfcg; + private java.lang.Integer sjsfcg; /**告知实施的变更*/ @Excel(name = "告知实施的变更", width = 15) @ApiModelProperty(value = "告知实施的变更") - private java.lang.String gzbg; + private java.lang.Integer gzbg; /**告知了对用户手册的全部更新内容*/ @Excel(name = "告知了对用户手册的全部更新内容", width = 15) @ApiModelProperty(value = "告知了对用户手册的全部更新内容") - private java.lang.String gzscnr; + private java.lang.Integer gzscnr; /**告知用户方式（可多选）*/ @Excel(name = "告知用户方式（可多选）", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java index c2bb79658..e249c7865 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java @@ -115,4 +115,11 @@ public class OtaBaSjList implements Serializable { @ApiModelProperty(value = "备注") private java.lang.String bz; + public void updateData(OtaBaSjSjmbcx otaBaSjSjmbcx) { + this.cpdjbh = otaBaSjSjmbcx.getBabh(); + this.ggpc = otaBaSjSjmbcx.getBapc(); + this.cpsb = otaBaSjSjmbcx.getCpsb(); + this.cpmc = otaBaSjSjmbcx.getCpmc(); + this.cpxh = otaBaSjSjmbcx.getCpxh(); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjmbcl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjmbcl.java index e543fae9d..cb5186be4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjmbcl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjmbcl.java @@ -90,4 +90,9 @@ public class OtaBaSjSjmbcl implements Serializable { @ApiModelProperty(value = "VIN码清单") private java.lang.String vinList; + /**csv附件*/ + @Excel(name = "csv附件", width = 15) + @ApiModelProperty(value = "csv附件") + private java.lang.String csv; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java index 6c0e4d141..ba3534c99 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java @@ -69,62 +69,66 @@ public class OtaBaSjSjyxpg implements Serializable { /**升级目的*/ @Excel(name = "升级目的", width = 15) @ApiModelProperty(value = "升级目的") + @Dict(dicCode = "uipgrade_purpose") private java.lang.String sjmd; /**是否变更对应车型的《公告》技术参数*/ @Excel(name = "是否变更对应车型的《公告》技术参数", width = 15) @ApiModelProperty(value = "是否变更对应车型的《公告》技术参数") - private java.lang.String sfbgcs; + private java.lang.Integer sfbgcs; /**是否涉及性能变化*/ @Excel(name = "是否涉及性能变化", width = 15) @ApiModelProperty(value = "是否涉及性能变化") - private java.lang.String sjxnbh; + private java.lang.Integer sjxnbh; /**是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等*/ @Excel(name = "是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等", width = 15) @ApiModelProperty(value = "是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等") - private java.lang.String fhgd; + private java.lang.Integer fhgd; /**是否涉及汽车自动驾驶功能相关升级*/ @Excel(name = "是否涉及汽车自动驾驶功能相关升级", width = 15) @ApiModelProperty(value = "是否涉及汽车自动驾驶功能相关升级") - private java.lang.String zdjsxg; + private java.lang.Integer zdjsxg; /**兼容性评估相关*/ @Excel(name = "兼容性评估相关", width = 15) @ApiModelProperty(value = "兼容性评估相关") - private java.lang.String jrxxg; + private java.lang.Integer jrxxg; /**如何执行升级*/ @Excel(name = "如何执行升级", width = 15) @ApiModelProperty(value = "如何执行升级") - private java.lang.String zxsj; + @Dict(dicCode = "conditions_upgrades") + private java.lang.Integer zxsj; /**升级失败或中断后，车辆采取的安全机制*/ @Excel(name = "升级失败或中断后，车辆采取的安全机制", width = 15) @ApiModelProperty(value = "升级失败或中断后，车辆采取的安全机制") + @Dict(dicCode = "upgrade_failed") private java.lang.String aqjz; /**升级活动是否影响车辆安全*/ @Excel(name = "升级活动是否影响车辆安全", width = 15) @ApiModelProperty(value = "升级活动是否影响车辆安全") - private java.lang.String sfyxaq; + private java.lang.Integer sfyxaq; /**升级活动是否提供用户确认选项*/ @Excel(name = "升级活动是否提供用户确认选项", width = 15) @ApiModelProperty(value = "升级活动是否提供用户确认选项") - private java.lang.String yhqr; + private java.lang.Integer yhqr; /**升级包测试*/ @Excel(name = "升级包测试", width = 15) @ApiModelProperty(value = "升级包测试") + @Dict(dicCode = "package_test") private java.lang.String sjbcs; /**是杏已验证确认在线升级活动的安全性和可靠性*/ @Excel(name = "是杏已验证确认在线升级活动的安全性和可靠性", width = 15) @ApiModelProperty(value = "是杏已验证确认在线升级活动的安全性和可靠性") - private java.lang.String aqkkx; + private java.lang.Integer aqkkx; /**提供变更或扩展后的《公告》批次及证明材料*/ @Excel(name = "提供变更或扩展后的《公告》批次及证明材料", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjTxjl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjTxjl.java deleted file mode 100644 index 95e5a0b0f..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjTxjl.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.jero.modules.ota.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - - -/** - * @Description: 车型升级-填写记录表 - * @Author: jero-boot - * @Date: 2023-03-25 - * @Version: V1.0 - */ -@Data -@TableName("ota_ba_sj_txjl") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="ota_ba_sj_txjl对象", description="车型升级-填写记录表") -public class OtaBaSjTxjl implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private String id; - - /**创建人*/ - @ApiModelProperty(value = "创建人") - private String createBy; - - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") - private java.util.Date createTime; - - /**更新人*/ - @ApiModelProperty(value = "更新人") - private String updateBy; - - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新日期") - private java.util.Date updateTime; - - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private String sysOrgCode; - - /**ota_id*/ - @Excel(name = "ota_id", width = 15) - @ApiModelProperty(value = "ota_id") - private String otaId; - - /**模块*/ - @Excel(name = "模块", width = 15) - @ApiModelProperty(value = "模块") - private String module; - - /**填写内容*/ - @Excel(name = "填写内容", width = 15) - @ApiModelProperty(value = "填写内容") - private String content; - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaModuleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaModuleEnum.java index 61810a623..b581d6e6b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaModuleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaModuleEnum.java @@ -8,7 +8,15 @@ public enum OtaModuleEnum { CX_KSJDXTMCYCS("可升级的系统名称与参数", "1","1"), CX_KZXSJDJSFZGNMCYCS("可在线升级的驾驶辅助功能名称与参数", "1","1"), CX_JSFZXTJCBACS("驾驶辅助系统基础备案参数", "1","1"), - CX_QT("其他", "1","1"); + CX_QT("其他", "1","1"), + + SJ_SJMBCX("升级目标车型", "1","1"), + SJ_SJMBCL("本次升级的目标车辆", "1","1"), + SJ_SJYXPG("升级影响评估", "1","1"), + SJ_SJXTMCBH("本次升级的系统名称与参数变化", "1","1"), + SJ_SJJSMCBH("本次升级的驾驶辅助功能名称与参数变化", "1","1"), + SJ_YHGZNRFS("用户告知内容及方式", "1","1"), + SJ_QT("其他升级任务信息", "1","1"); String name; String nameEN; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index 85663f0cc..530dbbd81 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -156,17 +156,17 @@ public enum OtaTitleEnum { SCRQKS("scrqks", "生产日期开始", "0"), SCRQJS("scrqjs", "生产日期结束", "0"), VIN_LIST("vinList", "VIN码清单", "0"), - SJMD("sjmd", "升级目的", "0"), + SJMD("sjmd", "升级目的", "uipgrade_purpose"), SFBGCS("sfbgcs", "是否变更对应车型的《公告》技术参数", "0"), JSXNBH("jsxnbh", "是否涉及性能变化", "0"), FHGD("fhgd", "是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等", "0"), ZDJSXG("zdjsxg", "是否涉及汽车自动驾驶功能相关升级", "0"), JRXXG("jrxxg", "兼容性评估相关", "0"), - ZXSJ("zxsj", "如何执行升级", "0"), - AQJZ("aqjz", "升级失败或中断后，车辆采取的安全机制", "0"), + ZXSJ("zxsj", "如何执行升级", "conditions_upgrades"), + AQJZ("aqjz", "升级失败或中断后，车辆采取的安全机制", "upgrade_failed"), SFYXAQ("sfyxaq", "升级活动是否影响车辆安全", "0"), YHQR("yhqr", "升级活动是否提供用户确认选项", "0"), - SJBCS("sjbcs", "升级包测试", "0"), + SJBCS("sjbcs", "升级包测试", "package_test"), AQKKX("aqkkx", "是杏已验证确认在线升级活动的安全性和可靠性", "0"), BGFJ("bgfj", "提供变更或扩展后的《公告》批次及证明材料", "0"), CLFJ("clfj", "提供证明材料", "0"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java deleted file mode 100644 index 2b7389246..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.modules.ota.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.ota.entity.OtaBaSjTxjl; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 车型升级-填写记录表 - * @Author: jero-boot - * @Date: 2023-03-25 - * @Version: V1.0 - */ -public interface OtaBaSjTxjlMapper extends BaseMapper { - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjTxjlMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjTxjlMapper.xml deleted file mode 100644 index d242861d6..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjTxjlMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java index 45a0e5e8e..73e7e44da 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java @@ -58,4 +58,6 @@ public interface IOtaBaSjSjmbclService extends IService { * @return */ List queryList(); + + OtaBaSjSjmbcl queryByOtaId(String otaId, String otaIdT); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java index 27e4d944d..99c6198ba 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java @@ -18,7 +18,7 @@ public interface IOtaBaSjSjmbcxService extends IService { * @param otaBaSjSjmbcx * @return */ - void add(OtaBaSjSjmbcx otaBaSjSjmbcx); + OtaBaSjSjmbcx add(OtaBaSjSjmbcx otaBaSjSjmbcx); /** * 更新 @@ -58,4 +58,6 @@ public interface IOtaBaSjSjmbcxService extends IService { * @return */ List queryList(); + + OtaBaSjSjmbcx queryByOtaId(String otaId, String otaIdT); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java index 84960ab7c..af9b71545 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java @@ -58,4 +58,6 @@ public interface IOtaBaSjSjyxpgService extends IService { * @return */ List queryList(); + + OtaBaSjSjyxpg queryByOtaId(String otaId, String otaIdT); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjTxjlService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjTxjlService.java deleted file mode 100644 index a06ff9d39..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjTxjlService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.jero.modules.ota.service; - -import com.jero.modules.ota.entity.OtaBaSjTxjl; -import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - -/** - * @Description: 车型升级-填写记录表 - * @Author: jero-boot - * @Date: 2023-03-25 - * @Version: V1.0 - */ -public interface IOtaBaSjTxjlService extends IService { - - /** - * 保存 - * - * @param otaBaSjTxjl - * @return - */ - void add(OtaBaSjTxjl otaBaSjTxjl); - - /** - * 更新 - * - * @param otaBaSjTxjl - * @return - */ - void editById(OtaBaSjTxjl otaBaSjTxjl); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - OtaBaSjTxjl queryById(String id); - - /** - * 列表查询 - * - * @return - */ - List queryList(); -} 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 63696717d..a15d769fb 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 @@ -163,6 +163,9 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxAqcs::getOtaId, otaId); return this.getOne(queryWrapper, false); 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 34087c8b7..50470134a 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 @@ -64,7 +64,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaCxJbxx.getOtaId(), OtaModuleEnum.CX_CXJBXX, OtaBaCxJbxxOld, otaBaCxJbxx, sysDictService); + List reList = cu.comparisonRecord(otaBaCxJbxx.getOtaId(), OtaModuleEnum.CX_CXJBXX, otaBaCxJbxxOld, otaBaCxJbxx, sysDictService); otaBaCxTxjlService.saveBatch(reList); return otaBaCxJbxx; } @@ -156,6 +156,9 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxJbxx::getOtaId, otaId); return this.getOne(queryWrapper, false); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java index 5547b5e92..7b1643198 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java @@ -131,7 +131,11 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxJsfzbacs::getOtaId, otaId); return this.getOne(queryWrapper, false); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index 9c3d2722e..2e08de9a6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -195,6 +195,9 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl getByOtaId(String otaId) { + if(org.apache.commons.lang3.StringUtils.isEmpty(otaId)){ + return null; + } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxKsjjsmccs::getOtaId, otaId); return this.list(queryWrapper); 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 843ec4da0..fc1be2573 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 @@ -193,6 +193,9 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl getByOtaId(String otaId) { + if(org.apache.commons.lang3.StringUtils.isEmpty(otaId)){ + return null; + } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxKsjxtmccs::getOtaId, otaId); return this.list(queryWrapper); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java index bf26c78ac..73cbf9e59 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java @@ -127,6 +127,9 @@ public class OtaBaCxQtServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxQt::getOtaId, otaId); return this.getOne(queryWrapper, false); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java index 87f119395..c45ce3849 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java @@ -1,89 +1,141 @@ package com.jero.modules.ota.service.impl; -import com.jero.modules.ota.entity.OtaBaSjSjmbcl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.ota.entity.*; +import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaSjSjmbclMapper; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; +import com.jero.modules.ota.service.IOtaBaSjListService; +import com.jero.modules.ota.service.IOtaBaSjLsjlService; import com.jero.modules.ota.service.IOtaBaSjSjmbclService; +import com.jero.modules.ota.utils.ComparisonUtil; +import com.jero.modules.system.service.ISysDictService; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.util.List; import java.util.Date; +import java.util.UUID; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 升级备案-升级目标车辆 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Service public class OtaBaSjSjmbclServiceImpl extends ServiceImpl implements IOtaBaSjSjmbclService { - /** - * 保存 - * - * @param otaBaSjSjmbcl - * @return - */ - @Override + + @Autowired + private ISysDictService sysDictService; + + @Autowired + private IOtaBaCxTxjlService otaBaCxTxjlService; + + /** + * 保存 + * + * @param otaBaSjSjmbcl + * @return + */ + @Override public void add(OtaBaSjSjmbcl otaBaSjSjmbcl) { Date now = new Date(); - otaBaSjSjmbcl.setCreateTime(now); - otaBaSjSjmbcl.setUpdateTime(now); - save(otaBaSjSjmbcl); + if (null != otaBaSjSjmbcl) { + OtaBaSjSjmbcl otaBaSjSjmbclOld = this.getByOtaId(otaBaSjSjmbcl.getOtaId()); + if (null != otaBaSjSjmbclOld) { + otaBaSjSjmbcl.setId(otaBaSjSjmbclOld.getId()); + } else { + otaBaSjSjmbcl.setCreateTime(now); + } + otaBaSjSjmbcl.setUpdateTime(now); + saveOrUpdate(otaBaSjSjmbcl); + ComparisonUtil cu = new ComparisonUtil(); + if (ObjectUtils.isEmpty(otaBaSjSjmbclOld)) { + otaBaSjSjmbclOld = new OtaBaSjSjmbcl(); + } + List reList = cu.comparisonRecord(otaBaSjSjmbcl.getOtaId(), OtaModuleEnum.CX_AQCS, otaBaSjSjmbclOld, otaBaSjSjmbcl, sysDictService); + otaBaCxTxjlService.saveBatch(reList); + } } - /** - * 更新 - * - * @param otaBaSjSjmbcl - * @return - */ - @Override + /** + * 更新 + * + * @param otaBaSjSjmbcl + * @return + */ + @Override public void editById(OtaBaSjSjmbcl otaBaSjSjmbcl) { - Date now = new Date(); + Date now = new Date(); otaBaSjSjmbcl.setUpdateTime(now); - saveOrUpdate(otaBaSjSjmbcl); + saveOrUpdate(otaBaSjSjmbcl); } - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override public void deleteById(String id) { removeById(id); } - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override public void deleteByIds(List ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaSjSjmbcl queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + @Override + public OtaBaSjSjmbcl queryByOtaId(String otaId, String otaIdT) { + //判断是否保存过，否则查询模版数据回显 + OtaBaSjSjmbcl res = getByOtaId(otaId); + if (ObjectUtils.isEmpty(res)) { + res = getByOtaId(otaIdT); + } + return res; + } + + private OtaBaSjSjmbcl getByOtaId(String otaId) { + if(StringUtils.isEmpty(otaId)){ + return null; + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaSjSjmbcl::getOtaId, otaId); + return this.getOne(queryWrapper, false); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java index a6f8597a2..7d2ad60d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java @@ -1,89 +1,149 @@ package com.jero.modules.ota.service.impl; -import com.jero.modules.ota.entity.OtaBaSjSjmbcx; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.ota.entity.*; +import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaSjSjmbcxMapper; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; +import com.jero.modules.ota.service.IOtaBaSjListService; import com.jero.modules.ota.service.IOtaBaSjSjmbcxService; +import com.jero.modules.ota.utils.ComparisonUtil; +import com.jero.modules.system.service.ISysDictService; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.util.List; import java.util.Date; +import java.util.UUID; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 升级备案-升级目标车型 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Service public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl implements IOtaBaSjSjmbcxService { - /** - * 保存 - * - * @param otaBaSjSjmbcx - * @return - */ - @Override - public void add(OtaBaSjSjmbcx otaBaSjSjmbcx) { + @Autowired + private IOtaBaSjListService otaBaSjListService; + + @Autowired + private ISysDictService sysDictService; + + @Autowired + private IOtaBaCxTxjlService otaBaCxTxjlService; + + /** + * 保存 + * + * @param otaBaSjSjmbcx + * @return + */ + @Override + public OtaBaSjSjmbcx add(OtaBaSjSjmbcx otaBaSjSjmbcx) { + //对比填写记录用的 + OtaBaSjSjmbcx otaBaSjSjmbcxOld = new OtaBaSjSjmbcx(); Date now = new Date(); - otaBaSjSjmbcx.setCreateTime(now); + OtaBaSjList otaBaSjList; + if (StringUtils.isEmpty(otaBaSjSjmbcx.getOtaId())) { + //在保存的时候设置一个id 并返回前端 下次保存的时候判断是否为更新 + otaBaSjList = new OtaBaSjList(); + otaBaSjList.setId(UUID.randomUUID().toString().replace("-", "")); + otaBaSjList.updateData(otaBaSjSjmbcx); + otaBaSjListService.add(otaBaSjList); + otaBaSjSjmbcx.setOtaId(otaBaSjList.getId()); + otaBaSjSjmbcx.setCreateTime(now); + } else { + otaBaSjSjmbcxOld = this.getByOtaId(otaBaSjSjmbcx.getOtaId()); + otaBaSjList = otaBaSjListService.queryById(otaBaSjSjmbcx.getOtaId()); + otaBaSjList.updateData(otaBaSjSjmbcx); + otaBaSjListService.editById(otaBaSjList); + } otaBaSjSjmbcx.setUpdateTime(now); - save(otaBaSjSjmbcx); + saveOrUpdate(otaBaSjSjmbcx); + ComparisonUtil cu = new ComparisonUtil(); + List reList = cu.comparisonRecord(otaBaSjSjmbcx.getOtaId(), OtaModuleEnum.SJ_SJMBCX, otaBaSjSjmbcxOld, otaBaSjSjmbcx, sysDictService); + otaBaCxTxjlService.saveBatch(reList); + return otaBaSjSjmbcx; } - /** - * 更新 - * - * @param otaBaSjSjmbcx - * @return - */ - @Override + /** + * 更新 + * + * @param otaBaSjSjmbcx + * @return + */ + @Override public void editById(OtaBaSjSjmbcx otaBaSjSjmbcx) { - Date now = new Date(); + Date now = new Date(); otaBaSjSjmbcx.setUpdateTime(now); - saveOrUpdate(otaBaSjSjmbcx); + saveOrUpdate(otaBaSjSjmbcx); } - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override public void deleteById(String id) { removeById(id); } - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override public void deleteByIds(List ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaSjSjmbcx queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + @Override + public OtaBaSjSjmbcx queryByOtaId(String otaId, String otaIdT) { + //判断是否保存过，否则查询模版数据回显 + OtaBaSjSjmbcx res = getByOtaId(otaId); + if (ObjectUtils.isEmpty(res)) { + res = getByOtaId(otaIdT); + } + return res; + } + + private OtaBaSjSjmbcx getByOtaId(String otaId) { + if(org.apache.commons.lang3.StringUtils.isEmpty(otaId)){ + return null; + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaSjSjmbcx::getOtaId, otaId); + return this.getOne(queryWrapper, false); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java index 173368c86..a71537d20 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java @@ -1,89 +1,138 @@ package com.jero.modules.ota.service.impl; -import com.jero.modules.ota.entity.OtaBaSjSjyxpg; +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.ota.entity.*; +import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaSjSjyxpgMapper; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.service.IOtaBaSjSjyxpgService; +import com.jero.modules.ota.utils.ComparisonUtil; +import com.jero.modules.system.service.ISysDictService; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.util.List; import java.util.Date; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 升级备案-升级影响评估 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Service public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl implements IOtaBaSjSjyxpgService { - /** - * 保存 - * - * @param otaBaSjSjyxpg - * @return - */ - @Override + + @Autowired + private ISysDictService sysDictService; + + @Autowired + private IOtaBaCxTxjlService otaBaCxTxjlService; + + /** + * 保存 + * + * @param otaBaSjSjyxpg + * @return + */ + @Override public void add(OtaBaSjSjyxpg otaBaSjSjyxpg) { Date now = new Date(); - otaBaSjSjyxpg.setCreateTime(now); - otaBaSjSjyxpg.setUpdateTime(now); - save(otaBaSjSjyxpg); + if (null != otaBaSjSjyxpg) { + OtaBaSjSjyxpg otaBaSjSjyxpgOld = this.getByOtaId(otaBaSjSjyxpg.getOtaId()); + if (null != otaBaSjSjyxpgOld) { + otaBaSjSjyxpg.setId(otaBaSjSjyxpgOld.getId()); + } else { + otaBaSjSjyxpg.setCreateTime(now); + } + otaBaSjSjyxpg.setUpdateTime(now); + saveOrUpdate(otaBaSjSjyxpg); + ComparisonUtil cu = new ComparisonUtil(); + if (ObjectUtils.isEmpty(otaBaSjSjyxpgOld)) { + otaBaSjSjyxpgOld = new OtaBaSjSjyxpg(); + } + List reList = cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), OtaModuleEnum.SJ_SJYXPG, otaBaSjSjyxpgOld, otaBaSjSjyxpg, sysDictService); + otaBaCxTxjlService.saveBatch(reList); + } } - /** - * 更新 - * - * @param otaBaSjSjyxpg - * @return - */ - @Override + /** + * 更新 + * + * @param otaBaSjSjyxpg + * @return + */ + @Override public void editById(OtaBaSjSjyxpg otaBaSjSjyxpg) { - Date now = new Date(); + Date now = new Date(); otaBaSjSjyxpg.setUpdateTime(now); - saveOrUpdate(otaBaSjSjyxpg); + saveOrUpdate(otaBaSjSjyxpg); } - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override public void deleteById(String id) { removeById(id); } - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override public void deleteByIds(List ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaSjSjyxpg queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + @Override + public OtaBaSjSjyxpg queryByOtaId(String otaId, String otaIdT) { + OtaBaSjSjyxpg res = getByOtaId(otaId); + if (ObjectUtils.isEmpty(res)) { + res = getByOtaId(otaIdT); + } + return res; + } + + private OtaBaSjSjyxpg getByOtaId(String otaId) { + if(org.apache.commons.lang3.StringUtils.isEmpty(otaId)){ + return null; + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaSjSjyxpg::getOtaId, otaId); + return this.getOne(queryWrapper, false); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjTxjlServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjTxjlServiceImpl.java deleted file mode 100644 index 9dff31734..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjTxjlServiceImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.jero.modules.ota.service.impl; - -import com.jero.modules.ota.entity.OtaBaSjTxjl; -import com.jero.modules.ota.mapper.OtaBaSjTxjlMapper; -import com.jero.modules.ota.service.IOtaBaSjTxjlService; -import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 车型升级-填写记录表 - * @Author: jero-boot - * @Date: 2023-03-25 - * @Version: V1.0 - */ -@Service -public class OtaBaSjTxjlServiceImpl extends ServiceImpl implements IOtaBaSjTxjlService { - - /** - * 保存 - * - * @param otaBaSjTxjl - * @return - */ - @Override - public void add(OtaBaSjTxjl otaBaSjTxjl) { - Date now = new Date(); - otaBaSjTxjl.setCreateTime(now); - otaBaSjTxjl.setUpdateTime(now); - save(otaBaSjTxjl); - } - - /** - * 更新 - * - * @param otaBaSjTxjl - * @return - */ - @Override - public void editById(OtaBaSjTxjl otaBaSjTxjl) { - Date now = new Date(); - otaBaSjTxjl.setUpdateTime(now); - saveOrUpdate(otaBaSjTxjl); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public OtaBaSjTxjl queryById(String id) { - return getById(id); - } - - /** - * 列表查询 - * - * @return - */ - @Override - public List queryList() { - return list(); - } -} diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 70c72fe15..a112514e2 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -894,6 +894,7 @@ module.exports = { designComplianceReview: 'Design Compliance Confirmation', preHomeConfirmation: 'Pre-Homo Confirmation', verificationComplianceReview: 'Validation Compliance Confirmation', + verificationComplianceExamine:'Verification compliance examine', Deployment: 'Deploy', pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation', pleaseConfirmedByPrehomo: 'Please complete the data confirmed by Pre-Homo', @@ -1727,4 +1728,7 @@ module.exports = { notetwo:'\n1. Provide the modified or expanded batch of "Announcement" and supporting materials;\n2. Verification materials shall be submitted to ensure that products meet the relevant requirements of national laws and regulations, technologies, standards and technical specifications;\n', notethree:'Provide supporting materials', verifyComplianceConfirmReturnReason:'Verify compliance Confirm return reason', + theDeliverablesCannotReferencedPleaseReselect:'The deliverables of this project cannot be referenced, please reselect', + regulationListModuleMaintenance:'Regulation list module maintenance', + regulationListModule:'Regulation list module', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index f00638ad6..4fde5dc19 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -910,6 +910,7 @@ module.exports = { designComplianceReview: '设计符合性确认', preHomeConfirmation: 'Pre-Homo确认', verificationComplianceReview: '验证符合性确认', + verificationComplianceExamine:'验证符合性审查', pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据', pleaseConfirmedByPrehomo: '请补全 Pre-Homo确认的数据', pleaseConformityVerification: '请补全验证符合性确认的数据', @@ -1829,4 +1830,7 @@ module.exports = { notetwo:'\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n', notethree:'\n提供证明材料\n', verifyComplianceConfirmReturnReason:'验证符合性确认退回原因', + theDeliverablesCannotReferencedPleaseReselect:'不能引用本项目的交付物，请重新选择', + regulationListModuleMaintenance:'法规清单模块维护', + regulationListModule:'法规清单模块', } \ No newline at end of file diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 7d87e51ab..f1749be35 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -1106,7 +1106,7 @@ } .selectWid { - min-width: 150px; + /*min-width: 150px;*/ width: 100%; } diff --git a/jero-web/src/components/CollectionTypeDisabled/index.vue b/jero-web/src/components/CollectionTypeDisabled/index.vue index 5e34d66c8..8369d66cd 100644 --- a/jero-web/src/components/CollectionTypeDisabled/index.vue +++ b/jero-web/src/components/CollectionTypeDisabled/index.vue @@ -980,7 +980,7 @@ } .selectWid { - min-width: 150px; + /*min-width: 150px;*/ width: 100%; } diff --git a/jero-web/src/components/SelectedBy/index.vue b/jero-web/src/components/SelectedBy/index.vue index 35711e606..13c9683ae 100644 --- a/jero-web/src/components/SelectedBy/index.vue +++ b/jero-web/src/components/SelectedBy/index.vue @@ -67,7 +67,8 @@ departId: '', defaultExpandedKeys: [], submitLoading: false, - visibleTree: false + visibleTree: false, + userName: [] } }, mounted() { @@ -110,7 +111,7 @@ } if (this.userIds && this.userIds.length > 0) { this.submitLoading = true - this.$emit('SelectedByForm', this.userIds.join(',')) + this.$emit('SelectedByForm', this.userIds.join(','),this.userName.join(',')) } else { this.$message.warning(this.$t('selectLeastOne')) } @@ -142,7 +143,7 @@ postAction('sys/user/queryDepartUserTreeList', { departId: this.departId, json: gData, - flag:'1' + flag: '1' }).then((res) => { this.confirmLoading = false if (res.success) { @@ -155,8 +156,14 @@ } }) }, - checkChange(e) { + checkChange(e, name) { + this.userName = [] this.userIds = e + if (name.checkedNodes && name.checkedNodes.length > 0) { + name.checkedNodes.forEach(res => { + this.userName.push(res.data.props.dataRef.title) + }) + } } } } diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 5ac5ad696..9fe25a81e 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -8,7 +8,7 @@ rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 330px)'}" + :scroll="this.dataSource.length > 1 ? {x: '100%',y:'calc(100vh - 330px)'} : {x: '100%'}" :data-source="dataSource" :loading="loading" @change="tableOnChange" diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index f56d53f73..457ab1346 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -133,7 +133,7 @@ // } // } // } - this.$message.destroy() + // this.$message.destroy() }, remove() { this.fileTypeSatus = true @@ -153,7 +153,7 @@ }) if (status === 'error') { this.$emit('uploadSuccess', this.fileList) - this.$message.destroy() + // this.$message.destroy() this.$message.error(`${info.file.name}` + this.$t('FileUploadFailed')) } else if (status === 'removed') { this.myfileList = info.fileList @@ -167,7 +167,7 @@ }) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { - this.$message.destroy() + // this.$message.destroy() this.$message.success(`${info.file.name}` + this.$t('DeletedSuccessfully')) } } else if (status === 'done') { @@ -184,7 +184,7 @@ } }) this.$emit('uploadSuccess', this.fileList) - this.$message.destroy() + // this.$message.destroy() this.$message.error(this.$t('UploadMost')) return } @@ -197,7 +197,7 @@ }) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { - this.$message.destroy() + // this.$message.destroy() if (file.response.success) { this.$message.success(`${info.file.name}` + this.$t('FileUploadedSuccessfully')) } diff --git a/jero-web/src/components/uploadFileChange/file.vue b/jero-web/src/components/uploadFileChange/file.vue index f12def90c..97384c92d 100644 --- a/jero-web/src/components/uploadFileChange/file.vue +++ b/jero-web/src/components/uploadFileChange/file.vue @@ -109,7 +109,7 @@ // this.fileTypeSatus = false; // } // } - this.$message.destroy() + // this.$message.destroy() }, remove() { this.fileTypeSatus = true @@ -133,7 +133,7 @@ }) if (status === 'error') { this.$emit('uploadSuccess', this.fileList) - this.$message.destroy() + // this.$message.destroy() this.$message.error(`${info.file.name}` + this.$t('FileUploadFailed')) } else if (status === 'removed') { this.myfileList = info.fileList @@ -147,7 +147,7 @@ }) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { - this.$message.destroy() + // this.$message.destroy() this.$message.success(`${info.file.name}` + this.$t('DeletedSuccessfully')) } } else if (status === 'done') { @@ -164,7 +164,7 @@ } }) this.$emit('uploadSuccess', this.fileList) - this.$message.destroy() + // this.$message.destroy() this.$message.error(this.$t('UploadMost')) return } @@ -177,7 +177,7 @@ }) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { - this.$message.destroy() + // this.$message.destroy() if (file.response.success) { this.$message.success(`${info.file.name}` + this.$t('FileUploadedSuccessfully')) } diff --git a/jero-web/src/components/uploadFileChangeDown/file.vue b/jero-web/src/components/uploadFileChangeDown/file.vue index a8f328bc0..6c4fb3600 100644 --- a/jero-web/src/components/uploadFileChangeDown/file.vue +++ b/jero-web/src/components/uploadFileChangeDown/file.vue @@ -135,7 +135,7 @@ import { mapGetters } from 'vuex' // this.fileTypeSatus = false; // } // } - this.$message.destroy() + // this.$message.destroy() }, remove() { this.fileTypeSatus = true @@ -159,7 +159,7 @@ import { mapGetters } from 'vuex' }) if (status === 'error') { this.$emit('uploadSuccess', this.fileList) - this.$message.destroy() + // this.$message.destroy() this.$message.error(`${info.file.name}` + this.$t('FileUploadFailed')) } else if (status === 'removed') { this.myfileList = info.fileList @@ -173,7 +173,7 @@ import { mapGetters } from 'vuex' }) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { - this.$message.destroy() + // this.$message.destroy() this.$message.success(`${info.file.name}` + this.$t('DeletedSuccessfully')) } } else if (status === 'done') { @@ -190,7 +190,7 @@ import { mapGetters } from 'vuex' } }) this.$emit('uploadSuccess', this.fileList) - this.$message.destroy() + // this.$message.destroy() this.$message.error(this.$t('UploadMost')) return } @@ -203,7 +203,7 @@ import { mapGetters } from 'vuex' }) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { - this.$message.destroy() + // this.$message.destroy() if (file.response.success) { this.$message.success(`${info.file.name}` + this.$t('FileUploadedSuccessfully')) } diff --git a/jero-web/src/components/uploadFileOta/file.vue b/jero-web/src/components/uploadFileOta/file.vue index d61721059..eee02201e 100644 --- a/jero-web/src/components/uploadFileOta/file.vue +++ b/jero-web/src/components/uploadFileOta/file.vue @@ -132,7 +132,7 @@ // this.fileTypeSatus = false; // } // } - this.$message.destroy() + // this.$message.destroy() }, remove() { this.fileTypeSatus = true @@ -152,7 +152,7 @@ }) if (status === 'error') { this.$emit('uploadSuccess', this.fileList) - this.$message.destroy() + // this.$message.destroy() this.$message.error(`${info.file.name}` + this.$t('FileUploadFailed')) } else if (status === 'removed') { this.myfileList = info.fileList @@ -166,7 +166,7 @@ }) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { - this.$message.destroy() + // this.$message.destroy() this.$message.success(`${info.file.name}` + this.$t('DeletedSuccessfully')) } } else if (status === 'done') { @@ -183,7 +183,7 @@ } }) this.$emit('uploadSuccess', this.fileList) - this.$message.destroy() + // this.$message.destroy() this.$message.error(this.$t('UploadMost')) return } @@ -196,7 +196,7 @@ }) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { - this.$message.destroy() + // this.$message.destroy() if (file.response.success) { this.$message.success(`${info.file.name}` + this.$t('FileUploadedSuccessfully')) } diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 624da74c4..c3715d10a 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -6,7 +6,7 @@ - {{isTrue ? $t('maintainVirtualList'):$t('virtualListDetails')}} + {{isTrue ? $t('regulationListModuleMaintenance'):$t('regulationListModuleMaintenance')}}
@@ -23,8 +23,8 @@
- - {{$t('VirtualListName')}} + + {{$t('regulationListModule')}} {{$route.query.name}} diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue index 0993686b4..d02319143 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue @@ -20,6 +20,7 @@
@@ -77,7 +78,7 @@ export default { visible: false, confirmLoading: false, formInline: { - bazt:'', + bazt:undefined, batjsj:'', bz:'', }, @@ -196,6 +197,12 @@ export default { } }) }, + selectchange(value){ + this.$nextTick(() => { + this.formInline = { ...this.formInline } + this.$refs.ruleForm.validateField('bazt') + }) + }, handleCancel() { this.formInline = { bazt:undefined, diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue index 43e14fb72..fc745c5b1 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue @@ -13,13 +13,13 @@ - +
{{$t('implementedupgrade')}}
- + {{$t('yes')}} @@ -27,16 +27,13 @@ {{$t('not')}} - - - - - - - +
+ + 编辑 + @@ -61,6 +58,7 @@
{{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' || formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') @@ -76,7 +74,7 @@ {{$t('vehicleshavenotcompletedonlineupgrade')}} + type="minus-circle" :disabled="disabled"/>
@@ -87,6 +85,7 @@
@@ -102,6 +101,7 @@ @@ -119,6 +119,7 @@ {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' || formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') @@ -140,6 +141,7 @@
@@ -182,7 +184,6 @@ import { mapGetters } from 'vuex' export default { name:"addModel", - props: ['url'], components:{ uploadFile }, @@ -190,6 +191,7 @@ export default { return { visible: false, disabled: false, + showButton:false, formInline: {}, confirmLoading: false, acceptcode:'', @@ -223,6 +225,10 @@ export default { } ], }, + url:{ + addModel:'' + }, + record:{} } }, mounted() { @@ -230,14 +236,19 @@ export default { }, methods: { ...mapGetters(['userInfo']), - addModel() { + addModel(record,flag) { + if(flag=='1'){ + this.disabled=true + this.showButton=true + } + this.record=record this.visible = true this.formInline = {} this.formInline.dataList = [{}] this.$nextTick(() => { this.formInline = { ...this.formInline } this.$refs.ruleForm.clearValidate() - this.$refs.codeNumber.number() + // this.$refs.codeNumber.number() }) }, handleCancel() { @@ -255,17 +266,18 @@ export default { this.formInline.authDummyInventoryBaseId = this.$route.query.id let query = JSON.parse(JSON.stringify(this.formInline)) this.confirmLoading = true - postAction(this.url.addModel, query).then((res) => { - if (res.success) { - this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) + // postAction(this.url.addModel, query).then((res) => { + // if (res.success) { + // this.confirmLoading = false + // this.$message.success(this.$t('OperationSuccessful')) + + // } else { + // this.$message.warning(res.message) + // this.confirmLoading = false + // } + // }) this.visible = false - this.$emit('addModelList') - } else { - this.$message.warning(res.message) - this.confirmLoading = false - } - }) + this.$emit('addModelList',this.record) } }) }, @@ -334,6 +346,9 @@ export default { this.formInline[this.uploadName] = attIdList.join(',') this.formInline = { ...this.formInline } }, + isEdit(){ + this.disabled=false + } } } diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 9e0b371ed..4f004085a 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -141,8 +141,11 @@ @click="detailclick(record)">{{$t('See')}} {{$t('maintenance')}} + {{$t('endUpgrade')}} + @click="endUpgrade(record , '0')" v-if="!record.onShow">{{$t('endUpgrade')}} + {{$t('upgradecompletion')}} {{$t('export')}} - + @@ -306,7 +309,7 @@ export default { } ], userInfoQuery: {}, - administrators: false + administrators: false, } }, mounted() { @@ -440,8 +443,8 @@ export default { downloadFile(this.url.exportData, text + '.xls', query, this.Deselect) }, // 结束升级 - endUpgrade(){ - this.$refs.upgradecompletionRef.addModel() + endUpgrade(record,flag){ + this.$refs.upgradecompletionRef.addModel(record,flag) }, // 查看 detailclick(){ @@ -464,6 +467,10 @@ export default { handleModule(){ downloadFile('params/paramsInfo/exportTemplate', this.$t('parameterTemplateExportName') + '.xlsx', {}) }, + addModelList(record){ + record.onShow=true + this.$forceUpdate() + } } } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 64ac09ad3..874f7835b 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -23,25 +23,25 @@ style="margin-bottom: 20px" > - + - + - + - + - + - + - + @@ -99,7 +99,6 @@ export default { align: 'left', dataIndex: 'functionname', ellipsis: true, - width: 170, scopedSlots: { customRender: 'functionname' }, }, { @@ -140,7 +139,7 @@ export default { align: 'left', dataIndex: 'functionalchangedescription', ellipsis: true, - width: 170, + width: 230, scopedSlots: { customRender: 'functionalchangedescription' }, }, { @@ -148,7 +147,7 @@ export default { align: 'left', dataIndex: 'variationofapplicableconditions', ellipsis: true, - width: 170, + width: 230, scopedSlots: { customRender: 'variationofapplicableconditions' }, }, { @@ -156,7 +155,7 @@ export default { align: 'left', dataIndex: 'upgradetheelectroniccontrollerinvolved', ellipsis: true, - width: 170, + width: 230, scopedSlots: { customRender: 'upgradetheelectroniccontrollerinvolved' }, }, { @@ -225,9 +224,11 @@ export default { }) }, save(){ - postAction('/ota/otaBaSjSjfzbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource,fj:this.fileList}).then(res=>{ - console.log(res); - this.$message.success(this.$t('SavedSuccessfully')) + postAction('/ota/otaBaSjSjfzbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{ + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } }) }, uploadSuccess(data) { diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue index bd736b171..e6ed49fe3 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue @@ -12,7 +12,9 @@ + v-model.trim="queryParam.rwmc" + :title='queryParam.rwmc' + :max-length="500"> @@ -108,8 +110,10 @@ export default { } this.queryParam.otaId = otaId postAction('/ota/otaBaSjQtsjxx/add' ,this.queryParam).then(res=>{ - this.$message.success(this.$t('SavedSuccessfully')) - console.log(res); + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } }) }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 64cd0d4a7..8f4b044d5 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -22,6 +22,7 @@ @@ -54,7 +55,8 @@ + :rows="4" + :max-length="500"/> @@ -164,7 +166,10 @@ export default { obj.vinList = this.formInline.vinList postAction('/ota/otaBaSjSjmbcl/add',obj).then(res=>{ + if(res.code==200){ this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } }) }, next(){ diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 4715ff8ba..3a72352db 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -23,42 +23,42 @@ style="margin-bottom: 20px" > - + - + - + - + - + - + - + - + - + - + - + - + @@ -290,8 +290,10 @@ export default { }, save(){ postAction('/ota/otaBaSjSjxtbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{ - console.log(res); + if(res.code==200){ this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } }) }, last(){ diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 482073698..fb6045b3d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -63,7 +63,12 @@ - {{$t('uploadattachment')}} + + {{ (form.bgfj === 'null' || form.bgfj === '' || + form.bgfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles') + }} + {{$t('notetwo')}} {{$t('format')}} @@ -135,7 +140,12 @@
- {{$t('uploadattachment')}} + + {{ (form.clfj === 'null' || form.clfj === '' || + form.clfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles') + }} + {{$t('notethree')}} {{$t('format')}}
@@ -388,8 +398,10 @@ this.$forceUpdate() } this.form.otaId=otaId postAction('/ota/otaBaSjSjyxpg/add',this.form).then(res=>{ - this.$message.success(this.$t('SavedSuccessfully')) - console.log(res); + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } }) }, last(){ diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index bee003e7b..ab30dab77 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -41,7 +41,7 @@
- +
@@ -52,7 +52,7 @@
- +
@@ -77,7 +77,7 @@ {{$t('producttrademark')}} - + @@ -88,7 +88,7 @@ {{$t('productname')}} - + @@ -99,7 +99,7 @@ {{$t('productModel')}} - + @@ -198,6 +198,7 @@ import ImportFile from '@/components/ImportFileData/index' getAction('/ota/otaBaSjSjmbcx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ if(res.code == 200){ this.form=res.result ==null?{}:res.result + } }) }, @@ -207,8 +208,11 @@ import ImportFile from '@/components/ImportFileData/index' otaId='' } postAction('/ota/otaBaSjSjmbcx/add',{otaId:otaId,...this.form}).then(res=>{ - this.$message.success(this.$t('SavedSuccessfully')) + if(res.code==200){ localStorage.setItem('otaId', res.result.otaId) + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } }) }, next(){ diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 6edfa5d44..3295454ca 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -22,6 +22,8 @@ @@ -35,6 +37,8 @@ @@ -48,6 +52,8 @@ @@ -61,6 +67,8 @@ @@ -74,6 +82,8 @@ @@ -87,6 +97,8 @@ @@ -252,8 +264,10 @@ export default { } this.formInline.otaId = otaId postAction('/ota/otaBaSjGgnrfs/add' ,this.formInline).then(res=>{ - this.$message.success(this.$t('SavedSuccessfully')) - console.log(res); + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } }) }, diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 8d130bb6f..e8a778c32 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -35,10 +35,11 @@ @@ -53,8 +54,9 @@ @@ -88,8 +90,9 @@ @@ -102,10 +105,11 @@ @@ -118,10 +122,11 @@ @@ -135,10 +140,11 @@ @@ -320,7 +326,8 @@ import { message } from 'ant-design-vue' this.form.cpmc=res.result.cpmc this.form.cpxh=res.result.cpxh this.form.txzd=res.result.txzd - this.form.cdotasj=res.result.cdotasj + this.form.txzd=res.result.txzd + this.form.id=res.result.id if(this.$route.query.type == 1 && res.result.cxmb == null){ this.form.cxmb = this.form.ggpc+'-'+ this.form.cpmc+'-'+this.form.cpxh }else { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 0ac3c4c48..4149a596b 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -14,7 +14,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 140px)'}" + :scroll="this.dataSource.length > 1 ? {x: '100%',y:'calc(100vh - 140px)'} : {x: '100%'}" rowKey="id" bordered :data-source="dataSource" @@ -59,26 +59,26 @@ - + - + - + - + - + - + - + @@ -366,7 +366,7 @@ import ImportFile from '@/components/ImportFileData/index' this.$message.success(this.$t('SavedSuccessfully')) this.getData() } - + }) }, last(){ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index f4c4133b4..2a74c0dcf 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -218,7 +218,7 @@
{{$t('fillincontent')}} - +
@@ -234,7 +234,7 @@ style="margin-bottom: 20px" > - + @@ -244,22 +244,22 @@ - + - + - + - + - + - + @@ -902,7 +902,7 @@ export default { // item=Number(item) // } // }) - this.query=res.result.bj + this.query=res.result.bj==null?{}:res.result.bj } }) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 1619acb2d..7d63c299b 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -207,7 +207,7 @@ import ImportFile from '@/components/ImportFileData/index' this.dataSource[2].info= res.result.sjsbcs this.dataSource[3].info= res.result.xxaqjz if(res.result.zmclList){ - console.log(this.dataSource[0].certifyingmaterials = this.$t('viewFile')) + this.dataSource[0].certifyingmaterials = this.$t('viewFile') } this.fileList.uploadName = res.result.zmclList this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index e8986b7e6..3e17a247a 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -229,7 +229,7 @@ export default { this.dataSource[8].relevantverification=Number(res.result.sjgg) this.dataSource[9].relevantverification=Number(res.result.sjzt) if(res.result.zmclList){ - console.log(this.dataSource[0].certifyingmaterials = this.$t('viewFile')) + this.dataSource[0].certifyingmaterials = this.$t('viewFile') } this.fileList.uploadName = res.result.zmclList this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 23b599f46..2ea022b96 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -43,37 +43,37 @@ - + - + - + - + - + - + - + - + - + - + - + diff --git a/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue b/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue index 59c7a4b5c..1179cf11d 100644 --- a/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue +++ b/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue @@ -10,14 +10,14 @@ :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;"> - +
{{$t('directoryName')}}
- + {{$t('batch')}}
- + {{$t('testReportLocation')}} - + {{$t('explain')}} - + { + this.$refs.ruleForm.clearValidate() + }) }, edit(val) { this.visible = true this.$nextTick(() => { this.formInline = val + this.$refs.ruleForm.clearValidate() }) }, handleCancel() { this.visible = false }, handleSubmit() { - if (!this.formInline.directoryName && !this.formInline.lot && !this.formInline.directoryFile && - !this.formInline.experimentFile && !this.formInline.detectionReportLocation && !this.formInline.explainInfo) { - this.$message.warning(this.$t('dataCannotEmpty')) - } else { - let Action - let url = '' - if (this.formInline.id) { - url = this.url.edit - Action = putAction - } else { - url = this.url.add - Action = postAction - } - let query = { - projectLibraryId: this.$route.query.id, - ...this.formInline - } - this.confirmLoading = true - Action(url, query).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false - this.confirmLoading = false - this.$emit('certificationDirectoryList') - } else { - this.confirmLoading = false - this.$message.warning(res.message) - } - }) - } + this.$refs.ruleForm.validate(valid => { + if (valid){ + if (!this.formInline.directoryName && !this.formInline.lot && !this.formInline.directoryFile && + !this.formInline.experimentFile && !this.formInline.detectionReportLocation && !this.formInline.explainInfo) { + this.$message.warning(this.$t('dataCannotEmpty')) + } else { + let Action + let url = '' + if (this.formInline.id) { + url = this.url.edit + Action = putAction + } else { + url = this.url.add + Action = postAction + } + let query = { + projectLibraryId: this.$route.query.id, + ...this.formInline + } + this.confirmLoading = true + Action(url, query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.confirmLoading = false + this.$emit('certificationDirectoryList') + } else { + this.confirmLoading = false + this.$message.warning(res.message) + } + }) + } + } + }) }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue index 4098e6e3b..4a299abd8 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue @@ -96,16 +96,18 @@ pageNo: 1, pageSize: 10, total: 0, - ids: '' + ids: '', + detailedWarningList: [] } }, mounted() { }, methods: { - transferModel(ids) { + transferModel(ids, detailedWarningList) { this.visible = true this.queryParam = {} + this.detailedWarningList = detailedWarningList this.selectedRowKeys = [] this.ids = ids.join(',') this.replacePage() @@ -154,10 +156,20 @@ handleCancel() { this.visible = false }, + failedMessageOne(data) { + let detailedWarningList = data + this.$warning({ + content: ( < div > { detailedWarningList } < /div>) + }) + }, handleSubmit() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - this.confirmLoading = true let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) + if (selectedRowKeys.join(',') == this.$route.query.id) { + this.$message.warning(this.$t('theDeliverablesCannotReferencedPleaseReselect')) + return + } + this.confirmLoading = true postAction('/project/projectCertificationInventoryEO/citeDeliverable', { projectCertificationInventoryIds: this.ids, projectLibraryId: this.$route.query.id, @@ -173,6 +185,9 @@ this.visible = false this.selectedRowKeys = [] this.$emit('referenceDeliverablesListForm') + if (this.detailedWarningList && this.detailedWarningList.length > 0) { + this.failedMessageOne(this.detailedWarningList) + } } else { if (res.result) { this.$message.warning(res.result) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 4eac491a2..48626c18f 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -78,7 +78,8 @@ -
+
{{ $t('preservation') }}
@@ -687,7 +688,7 @@ title: this.$t('DeliverablesResult'), align: 'left', dataIndex: 'deliveryResult', - width: 180, + width: 210, ellipsis: true, scopedSlots: { customRender: 'DeliverablesResult' } }, @@ -1406,17 +1407,45 @@ referenceDeliverablesClick() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { let isTrue - for (let i = 0; i < this.selectedRowKeysList.length; i++) { - if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') { - isTrue = true - } else { - isTrue = false - this.$message.warning(this.$t('youCanOnlySelectStatusClearSubmit')) - return + let ids = [] + let notConditions = [] + let notConditionsOne = [] + let data = '' + let dataOne = '' + let detailedWarningList= [] + if (this.roleSwitchingCode == 20) { + for (let i = 0; i < this.selectedRowKeysList.length; i++) { + if (this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) { + if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') { + ids.push(this.selectedRowKeysList[i].id) + } else { + notConditions.push(this.selectedRowKeysList[i].inspectionItem) + } + } else { + notConditionsOne.push(this.selectedRowKeysList[i].inspectionItem) + } + } + } else { + for (let i = 0; i < this.selectedRowKeysList.length; i++) { + if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') { + ids.push(this.selectedRowKeysList[i].id) + } else { + notConditions.push(this.selectedRowKeysList[i].inspectionItem) + } } } - if (isTrue) { - this.$refs.referenceDeliverablesListRef.transferModel(JSON.parse(JSON.stringify(this.selectedRowKeys))) + if (notConditions && notConditions.length > 0) { + data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusSubmittedCanBeSelected') + detailedWarningList.push(
{data}
) + } + if (notConditionsOne && notConditionsOne.length > 0){ + dataOne = this.$t('inspectionItems') + '"' + notConditionsOne.join('、')+'"'+this.$t('operationWithoutPermission') + detailedWarningList.push(
{dataOne}
) + } + if (ids && ids.length > 0) { + this.$refs.referenceDeliverablesListRef.transferModel(ids,detailedWarningList) + } else { + this.failedMessageOne(detailedWarningList) } } else { this.$message.warning(this.$t('selectLeastOne')) @@ -1738,7 +1767,12 @@ content: ( < div > { detailedWarningList } < /div>) }) }, - + failedMessageOne(data) { + let detailedWarningList = data + this.$warning({ + content: ( < div > { detailedWarningList } < /div>) + }) + }, submitTask(value, prompt, ids, notConditions, data) { let _this = this this.$confirm({ diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index a4fdce5b5..ed8dc8238 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -40,6 +40,11 @@ {{approvalResult[text]}} + + + {{result.operatorResultName}} + + 0) { + if (this.queryProject.flowType == 4) { + this.regulatoryCertificationTaskPlanList = this.verifyList + } else { + this.regulatoryCertificationTaskPlanList = this.designList + } let taskData = this.dataSource[this.dataSource.length - 1] - if (this.queryProject.TaskKey == 'fqlc'){ + if (this.queryProject.TaskKey == 'fqlc') { this.regulatoryCertificationTaskPlanList.forEach(val => { if (val.name == this.$t('initiatingProcess')) { val.status = '2' @@ -194,13 +240,15 @@ val.status = '1' } else if (val.name == this.$t('designComplianceReview')) { val.status = '2' + } else if (val.name == this.$t('verificationComplianceReview')) { + val.status = '2' } else { val.status = '3' } }) } if (this.queryProject.TaskKey == 'fggcssh') { - if (taskData.operatorResult == 'Adopt'){ + if (taskData.operatorResult == 'Adopt') { this.regulatoryCertificationTaskPlanList.forEach(val => { if (val.name == this.$t('initiatingProcess')) { val.status = '1' @@ -210,11 +258,15 @@ val.status = '1' } else if (val.name == this.$t('designComplianceReviewAdmin')) { val.status = '1' + } else if (val.name == this.$t('verificationComplianceReview')) { + val.status = '1' + } else if (val.name == this.$t('verificationComplianceExamine')) { + val.status = '1' } else { val.status = '1' } }) - }else{ + } else { this.regulatoryCertificationTaskPlanList.forEach(val => { if (val.name == this.$t('initiatingProcess')) { val.status = '1' @@ -222,8 +274,12 @@ val.status = '1' } else if (val.name == this.$t('designComplianceReview')) { val.status = '1' + } else if (val.name == this.$t('verificationComplianceReview')) { + val.status = '1' } else if (val.name == this.$t('designComplianceReviewAdmin')) { val.status = '2' + } else if (val.name == this.$t('verificationComplianceExamine')) { + val.status = '2' } else { val.status = '3' } @@ -248,6 +304,7 @@ \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index 82e7dcb05..8b31bb419 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -49,6 +49,9 @@ {{$t('turnToDo')}} + + {{this.formInline.dezrrSubmitUserName}} + @@ -184,16 +187,21 @@ } else { this.$refs.SelectedByRef.visible = false this.formInline.secondChargePersonUserId = '' + this.formInline.dezrrSubmitUserName = '' + this.formInline.dezrrSubmitUserId = '' } }, //转办接口 - SelectedByForm(userIds) { + SelectedByForm(userIds, name) { if (this.query.TaskKey == 'zrrtjjfw') { this.formInline.dezrrSubmitUserId = userIds } else { this.formInline.secondChargePersonUserId = userIds } + this.formInline.dezrrSubmitUserName = name + this.formInline = { ...this.formInline } this.$refs.SelectedByRef.visible = false + this.$refs.SelectedByRef.submitLoading = false }, submitNoRule(callBack) { callBack(this.formInline) diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 5b4fc7b9e..bf4f2b8dc 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -310,14 +310,14 @@ title: this.$t('configurationItem'), align: 'left', dataIndex: 'configItem', - width: 150, + width: 200, ellipsis: true }, { title: 'WVTA ID', align: 'left', dataIndex: 'wvtaId', - width: 150, + width: 200, ellipsis: true }, { @@ -338,14 +338,14 @@ title: this.$t('typeOfDeliverables'), align: 'left', dataIndex: 'deliverableTypeName', - width: 200, + width: 330, ellipsis: true }, { title: this.$t('operation'), align: 'left', fixed: 'right', - width: 200, + width: 250, scopedSlots: { customRender: 'operation' } } ], @@ -544,7 +544,7 @@