From 3ec32f42a55750d9c40521953e50194879d8f3e9 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 10:13:42 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E5=BD=B1=E5=93=8D=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradeimpactassessment.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 482073698..93721ad58 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')}}
From 13cf2379377a8e94c02f5f68fe022a26b0fbe7d0 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 10:16:02 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8-?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgradeactivity/components/maintenance.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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, From 188b3f2026c25732a8332c8ebb19c6ce6d38e60d Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 10:24:28 +0800 Subject: [PATCH 03/22] bug 67183 --- .../vehicleinformation/components/basicInformation.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 8d130bb6f..ea2a96807 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -89,7 +89,7 @@ :max-length="500" :disabled="disabled" class="box-input" - :placeholder="$t('PleaseSelect')" + :placeholder="$t('pleaseEnter')" v-model="form.ggpc"> @@ -105,7 +105,7 @@ :max-length="500" :disabled="disabled" class="box-input" - :placeholder="$t('PleaseSelect')" + :placeholder="$t('pleaseEnter')" v-model="form.cpsb"> @@ -121,7 +121,7 @@ :max-length="500" :disabled="disabled" class="box-input" - :placeholder="$t('PleaseSelect')" + :placeholder="$t('pleaseEnter')" v-model="form.cpmc"> @@ -138,7 +138,7 @@ :max-length="500" :disabled="disabled" class="box-input" - :placeholder="$t('PleaseSelect')" + :placeholder="$t('pleaseEnter')" v-model="form.cpxh"> From 155ddde11f7146c7f8bf0b30e446bc7e5de25170 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 10:30:01 +0800 Subject: [PATCH 04/22] bug 67198 --- .../vehicleinformation/components/safetyPrecautions.vue | 2 +- .../vehicleinformation/components/upgradeRequirements.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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) From ea2d7aa166a061b772a33f192c4a97e5c9ac7546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 28 Mar 2023 10:33:14 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E7=BB=B4=E6=8A=A4=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationListMaintenance.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 @@ \ No newline at end of file From bc62a79e3e4552468f1c009786bd4b709c98184b Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 11:58:19 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/auxiliaryupgradehavechanged.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 95dddff3b..dac7607bd 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -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' }, }, { From bbd076b7aa6d8d8abbbaae3c001b2eb0608d2f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 28 Mar 2023 12:37:48 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OtaBaSjSjyxpgController.java | 19 ++ .../ota/controller/OtaBaSjTxjlController.java | 170 ------------------ .../modules/ota/entity/OtaBaSjSjyxpg.java | 4 + .../jero/modules/ota/entity/OtaBaSjTxjl.java | 79 -------- .../jero/modules/ota/enums/OtaTitleEnum.java | 8 +- .../modules/ota/mapper/OtaBaSjTxjlMapper.java | 4 - .../ota/mapper/xml/OtaBaSjTxjlMapper.xml | 15 -- .../ota/service/IOtaBaSjSjyxpgService.java | 2 + .../ota/service/IOtaBaSjTxjlService.java | 61 ------- .../impl/OtaBaSjSjyxpgServiceImpl.java | 140 ++++++++++----- .../service/impl/OtaBaSjTxjlServiceImpl.java | 89 --------- 11 files changed, 122 insertions(+), 469 deletions(-) delete mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjTxjlController.java delete mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjTxjl.java delete mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjTxjlMapper.xml delete mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjTxjlService.java delete mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjTxjlServiceImpl.java 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/OtaBaSjSjyxpg.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java index 6c0e4d141..a21dd644d 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,6 +69,7 @@ public class OtaBaSjSjyxpg implements Serializable { /**升级目的*/ @Excel(name = "升级目的", width = 15) @ApiModelProperty(value = "升级目的") + @Dict(dicCode = "uipgrade_purpose") private java.lang.String sjmd; /**是否变更对应车型的《公告》技术参数*/ @@ -99,11 +100,13 @@ public class OtaBaSjSjyxpg implements Serializable { /**如何执行升级*/ @Excel(name = "如何执行升级", width = 15) @ApiModelProperty(value = "如何执行升级") + @Dict(dicCode = "conditions_upgrades") private java.lang.String zxsj; /**升级失败或中断后，车辆采取的安全机制*/ @Excel(name = "升级失败或中断后，车辆采取的安全机制", width = 15) @ApiModelProperty(value = "升级失败或中断后，车辆采取的安全机制") + @Dict(dicCode = "upgrade_failed") private java.lang.String aqjz; /**升级活动是否影响车辆安全*/ @@ -119,6 +122,7 @@ public class OtaBaSjSjyxpg implements Serializable { /**升级包测试*/ @Excel(name = "升级包测试", width = 15) @ApiModelProperty(value = "升级包测试") + @Dict(dicCode = "package_test") private java.lang.String sjbcs; /**是杏已验证确认在线升级活动的安全性和可靠性*/ 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/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 index 2b7389246..a38e0268e 100644 --- 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 @@ -1,9 +1,5 @@ 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; /** 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/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/OtaBaSjSjyxpgServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java index 173368c86..06ac57f12 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,135 @@ 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) { + 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(); - } -} From 984b535469230d63a05ca5ff5890a5046f2e890b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 28 Mar 2023 12:39:25 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/mapper/OtaBaSjTxjlMapper.java | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java 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 a38e0268e..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.jero.modules.ota.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 车型升级-填写记录表 - * @Author: jero-boot - * @Date: 2023-03-25 - * @Version: V1.0 - */ -public interface OtaBaSjTxjlMapper extends BaseMapper { - -} From 6bad9e99fbc9d4f16e1172a1020474f1d8f2aeaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 28 Mar 2023 13:48:20 +0800 Subject: [PATCH 17/22] =?UTF-8?q?OTA=E8=BD=A6=E5=9E=8B-=E6=B7=BB=E5=8A=A0-?= =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E8=87=AA=E5=8A=A8=E5=8C=96=E7=BA=A7=E5=88=AB?= =?UTF-8?q?-=E4=B8=8B=E6=8B=89=E9=80=89=E5=AE=8C=E6=95=B4=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 2 +- .../vehicleinformation/components/beupgradedonline.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index a5ee70c8c..7afccfac2 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" @@ -366,7 +366,7 @@ import ImportFile from '@/components/ImportFileData/index' this.$message.success(this.$t('SavedSuccessfully')) this.getData() } - + }) }, last(){ From 05b89d70ad51a812b2a375fa52194001ba556325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 13:56:59 +0800 Subject: [PATCH 18/22] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1-=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E7=A1=AE=E8=AE=A4=E7=9A=84=E6=B5=81=E7=A8=8B=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/circulationHistory.vue | 41 ++++++++++++++++++- 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 68eb6e659..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', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 80aea7039..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: '请补全验证符合性确认的数据', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index 181c85c0a..ed8dc8238 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -94,7 +94,29 @@ 'To be tracked': 'trackedClass', 'NA': 'NAClass' }, - regulatoryCertificationTaskPlanList: [ + verifyList: [ + { + status: '1', + name: this.$t('initiatingProcess') + }, + { + status: '1', + name: this.$t('Taskresponsibilityrecognition') + }, + { + status: '1', + name: this.$t('verificationComplianceReview') + }, + { + status: '2', + name: this.$t('verificationComplianceExamine') + }, + { + status: '3', + name: this.$t('missionAccomplished') + } + ], + designList: [ { status: '1', name: this.$t('initiatingProcess') @@ -116,6 +138,7 @@ name: this.$t('missionAccomplished') } ], + regulatoryCertificationTaskPlanList: [], columns: [ { title: this.$t('Operator'), @@ -168,6 +191,7 @@ } }, mounted() { + console.log(this.queryProject) this.getList() }, methods: { @@ -180,6 +204,11 @@ if (res.success) { this.dataSource = res.result || [] if (this.dataSource.length > 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') { this.regulatoryCertificationTaskPlanList.forEach(val => { @@ -211,6 +240,8 @@ 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' } @@ -227,6 +258,10 @@ 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' } @@ -239,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' } From 1182d29f76252a26523803c65e1e6c060a8f030c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 13:58:14 +0800 Subject: [PATCH 19/22] bug 67372 --- .../auxiliaryupgradehavechanged.vue | 14 +++++------ .../informationaboutotherupgradetasks.vue | 1 + .../thetargetvehicleofthisupgrade.vue | 1 + .../components/upgradehavechanged.vue | 24 +++++++++---------- .../components/upgradetargetmodel.vue | 10 ++++---- .../components/usernotification.vue | 6 +++++ .../components/basicInformation.vue | 6 +++++ .../components/beupgradedonline.vue | 14 +++++------ .../components/recordparameters.vue | 14 +++++------ .../components/upgradedonline.vue | 22 ++++++++--------- 10 files changed, 63 insertions(+), 49 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index dac7607bd..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" > - + - + - + - + - + - + - + diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue index b538c61fc..e6ed49fe3 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue @@ -13,6 +13,7 @@ diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 0519e66a3..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 @@ diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 8199c7a35..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" > - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index fb73175b7..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')}} - + diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index d0274ca19..3295454ca 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -23,6 +23,7 @@ @@ -37,6 +38,7 @@ @@ -51,6 +53,7 @@ @@ -65,6 +68,7 @@ @@ -79,6 +83,7 @@ @@ -93,6 +98,7 @@ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index c70335a05..e8a778c32 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -39,6 +39,7 @@ :disabled="disabled" class="box-input" :placeholder="$t('pleaseEnter')" + :title='form.qymc' v-model="form.qymc"> @@ -55,6 +56,7 @@ @@ -88,6 +90,7 @@ @@ -104,6 +107,7 @@ @@ -120,6 +124,7 @@ @@ -137,6 +142,7 @@ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index a5ee70c8c..f9ccf35fd 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -59,26 +59,26 @@ - + - + - + - + - + - + - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 4e307f165..62eddff5e 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')}} - +
@@ -244,22 +244,22 @@ - + - + - + - + - + - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 42f9581cf..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 @@ - + - + - + - + - + - + - + - + - + - + - + From 42a278d4aa643a98754a189f08de8f0a7b3034af Mon Sep 17 00:00:00 2001 From: yuekuo Date: Tue, 28 Mar 2023 14:35:37 +0800 Subject: [PATCH 20/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=80=89=E9=A1=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/recordparameters.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 4e307f165..c07c1a6f0 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -902,7 +902,7 @@ export default { // item=Number(item) // } // }) - this.query=res.result.bj + this.query=res.result.bj==null?{}:res.result.bj } }) From 67493ed84ce2251613aa57a4ea2b327b05236b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 28 Mar 2023 15:07:17 +0800 Subject: [PATCH 21/22] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/entity/OtaBaSjGgnrfs.java | 6 +++--- .../jero/modules/ota/entity/OtaBaSjSjyxpg.java | 18 +++++++++--------- .../service/impl/OtaBaCxAqcsServiceImpl.java | 3 +++ .../service/impl/OtaBaCxJbxxServiceImpl.java | 3 +++ .../impl/OtaBaCxJsfzbacsServiceImpl.java | 3 +++ .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 3 +++ .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 3 +++ .../ota/service/impl/OtaBaCxQtServiceImpl.java | 3 +++ .../service/impl/OtaBaSjSjmbclServiceImpl.java | 3 +++ .../service/impl/OtaBaSjSjmbcxServiceImpl.java | 3 +++ .../service/impl/OtaBaSjSjyxpgServiceImpl.java | 3 +++ 11 files changed, 39 insertions(+), 12 deletions(-) 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/OtaBaSjSjyxpg.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java index a21dd644d..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 @@ -75,33 +75,33 @@ public class OtaBaSjSjyxpg implements Serializable { /**是否变更对应车型的《公告》技术参数*/ @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 = "如何执行升级") @Dict(dicCode = "conditions_upgrades") - private java.lang.String zxsj; + private java.lang.Integer zxsj; /**升级失败或中断后，车辆采取的安全机制*/ @Excel(name = "升级失败或中断后，车辆采取的安全机制", width = 15) @@ -112,12 +112,12 @@ public class OtaBaSjSjyxpg implements Serializable { /**升级活动是否影响车辆安全*/ @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) @@ -128,7 +128,7 @@ public class OtaBaSjSjyxpg implements Serializable { /**是杏已验证确认在线升级活动的安全性和可靠性*/ @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/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 1dd502db9..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 @@ -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 706170a73..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 @@ -236,6 +236,9 @@ 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 d74075955..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 @@ -131,6 +131,9 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl 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 36d90192f..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 @@ -139,6 +139,9 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl 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 06ac57f12..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 @@ -128,6 +128,9 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaSjSjyxpg::getOtaId, otaId); return this.getOne(queryWrapper, false); From e2e1f35c8f172c50d6ac48be6a1046da957c8b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 15:09:31 +0800 Subject: [PATCH 22/22] =?UTF-8?q?=E5=9C=A8=E8=BD=AC=E5=8A=9E=E6=97=81?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=89=80=E9=80=89=E4=BA=BA=E5=91=98=20?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95--=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E7=9B=AE=E5=BD=95-=E6=B7=BB=E5=8A=A0=EF=BC=8C=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/SelectedBy/index.vue | 15 ++- .../components/certificationDirectoryAdd.vue | 108 ++++++++++++------ .../reviewedByThePersonInCharge.vue | 10 +- 3 files changed, 93 insertions(+), 40 deletions(-) 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/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/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)