修改OTA参数

jero-boot/db/蔚来标准sql/dev_third_record.sql

@@ -1343,7 +1343,7 @@ ALTER TABLE `problem_management`
 ADD COLUMN `project_type` varchar(255) NULL COMMENT '相关项目类型' AFTER `problem_priority`;
 
 
--- 市场法规清单历史表 2023-10-30 未同步数据库
+-- 市场法规清单历史表 2023-10-30 已同步生产环境
 CREATE TABLE `dummy_inventory_info_history`  (
   `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -1391,6 +1391,22 @@ CREATE TABLE `dummy_inventory_info_history`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
+--  OTA升级活动是否提供用户确认 2023-11-11 已同步数据库
+INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1665537106720296962', 'OTA-升级影响评估-升级确认', 'O_T_A_-_sheng1_ji2_ying3_xiang3_ping2_gu1_-_sheng1_ji2_que4_ren4', NULL, '0', 'admin', '2023-06-05 09:52:45', 'song.gao2.o', '2023-08-31 09:57:28', NULL, NULL, '1', '0', '1', '4');
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`, `stat_node`) VALUES ('1665537773488803842', '1665537106720296962', '车辆信息娱乐系统', 'd546d06291b14f248a9d551bbc308317', NULL, '1', '1', 'admin', '2023-06-05 09:55:24', NULL, NULL, '1', NULL, NULL, '0', 'Vehicle infotainment system', NULL);
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`, `stat_node`) VALUES ('1665537835442868226', '1665537106720296962', '车辆仪表盘', '4b0e60e866a442e7a1198787ac0c432c', NULL, '2', '1', 'admin', '2023-06-05 09:55:39', NULL, NULL, '1', NULL, NULL, '0', 'Vehicle dashboard', NULL);
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`, `stat_node`) VALUES ('1665537903860355073', '1665537106720296962', '移动应用程序', '225b9b71bc594c42847ad209af7266ab', NULL, '3', '1', 'admin', '2023-06-05 09:55:55', NULL, NULL, '1', NULL, NULL, '0', 'Mobile application', NULL);
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`, `stat_node`) VALUES ('1665537980683227138', '1665537106720296962', '电子邮件', 'bebb284fe5814eb48a9d39ff369f8447', NULL, '4', '1', 'admin', '2023-06-05 09:56:13', NULL, NULL, '1', NULL, NULL, '0', 'E-mail', NULL);
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`, `stat_node`) VALUES ('1665538039910993922', '1665537106720296962', '合同协议', '2502a124b6c44dd391afff9759ec4e25', NULL, '5', '1', 'admin', '2023-06-05 09:56:28', NULL, NULL, '1', NULL, NULL, '0', 'Contract agreement', NULL);
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`, `stat_node`) VALUES ('1665538110215917569', '1665537106720296962', '短信', 'ce0225b4ecd146e4a8d88068fb05aa78', NULL, '6', '1', 'admin', '2023-06-05 09:56:44', NULL, NULL, '1', NULL, NULL, '0', 'Short message', NULL);
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`, `stat_node`) VALUES ('1665538157657690114', '1665537106720296962', '其他', '344a3320beba45afb3718c59b7a7144a', NULL, '7', '1', 'admin', '2023-06-05 09:56:56', NULL, NULL, '1', NULL, NULL, '0', 'others', NULL);
+
+ALTER TABLE `ota_ba_sj_sjyxpg`
+    ADD COLUMN `yhqr_xlk`  varchar(50) NULL COMMENT '升级活动是否提供用户确认选项-下拉框' AFTER `yhqr`,
+ADD COLUMN `yhqr_qt`  varchar(1000) NULL COMMENT '升级活动是否提供用户确认选项-其他文本' AFTER `yhqr_xlk`;
+ADD COLUMN `yhqr_no`  varchar(1000) NULL COMMENT '升级活动是否提供用户确认选项-否文本' AFTER `yhqr_qt`;
+
+
 
 
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java

@@ -126,6 +126,22 @@ public class OtaBaSjSjyxpg implements Serializable {
     @ApiModelProperty(value = "升级活动是否提供用户确认选项")
     private java.lang.Integer yhqr;
 
+    /**升级活动是否提供用户确认选项-下拉框*/
+    @Excel(name = "升级活动是否提供用户确认选项-下拉框", width = 15)
+    @ApiModelProperty(value = "升级活动是否提供用户确认选项-下拉框")
+    @Dict(dicCode = "_sheng1_ji2_ying3_xiang3_ping2_gu1_-_sheng1_ji2_que4_ren4")
+    private java.lang.String yhqrXlk;
+
+    /**升级活动是否提供用户确认选项-其他文本*/
+    @Excel(name = "升级活动是否提供用户确认选项-其他文本", width = 15)
+    @ApiModelProperty(value = "升级活动是否提供用户确认选项-其他文本")
+    private java.lang.String yhqrQt;
+
+    /**升级活动是否提供用户确认选项-否文本*/
+    @Excel(name = "升级活动是否提供用户确认选项-否文本", width = 15)
+    @ApiModelProperty(value = "升级活动是否提供用户确认选项-否文本")
+    private java.lang.String yhqrNo;
+
 	/**升级包测试*/
 	@Excel(name = "升级包测试", width = 15)
     @ApiModelProperty(value = "升级包测试")

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java

@@ -179,7 +179,7 @@ public class OtaBaCxListServiceImpl extends ServiceImpl<OtaBaCxListMapper, OtaBa
                         otaBaCxList.setSpzq(String.valueOf(daysDifference));
                     }
                     otaBaCxList.setBz(bz);
-                    this.deleteById(otaBaCxList.getId());
+//                    this.deleteById(otaBaCxList.getId());
                     this.saveOrUpdate(otaBaCxList);
                     //添加历史记录数据
                     OtaBaCxLsjl lsjl = new OtaBaCxLsjl();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java

@@ -182,7 +182,7 @@ public class OtaBaSjListServiceImpl extends ServiceImpl<OtaBaSjListMapper, OtaBa
                         otaBaSjList.setSpzq(String.valueOf(daysDifference));
                     }
                     otaBaSjList.setBz(bz);
-                    this.deleteById(otaBaSjList.getId());
+//                    this.deleteById(otaBaSjList.getId());
                     this.saveOrUpdate(otaBaSjList);
                     //添加历史记录数据
                     OtaBaSjLsjl lsjl = new OtaBaSjLsjl();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java

@@ -86,7 +86,11 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, O
             otaBaSjSjmbcx.setCreateTime(now);
         } else {
             otaBaSjSjmbcxOld = this.getByOtaId(otaBaSjSjmbcx.getOtaId());
-            otaBaSjSjmbcx.setId(otaBaSjSjmbcxOld.getId());
+            if(ObjectUtils.isEmpty(otaBaSjSjmbcxOld)){
+                otaBaSjSjmbcx.setId(UUID.randomUUID().toString().replace("-", ""));
+            }else{
+                otaBaSjSjmbcx.setId(otaBaSjSjmbcxOld.getId());
+            }
             otaBaSjList = otaBaSjListService.queryById(otaBaSjSjmbcx.getOtaId());
             otaBaSjList.updateData(otaBaSjSjmbcx);
             otaBaSjListService.editById(otaBaSjList);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java

@@ -350,7 +350,22 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl<OtaBaSjSjyxpgMapper, O
             cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(pg.getSfyxaq()));
             row = s.getRow(9);
             cell = row.getCell(1);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(pg.getYhqr()));
+            //选是有下拉框，下拉框选其他有文本；选否有文本
+            Integer yhqr = pg.getYhqr();
+            if (null == yhqr) {
+                yhqr = 2;
+            }
+            String yhqrStr = ImportFileUtil.getCellValueYesOrNoInt(pg.getYhqr());
+            if (1 == yhqr) {
+                String yhqrXlk = ComparisonUtil.queryDictTextByKey("_sheng1_ji2_ying3_xiang3_ping2_gu1_-_sheng1_ji2_que4_ren4", pg.getYhqrXlk(), sysDictService);
+                yhqrStr += " - " + yhqrXlk;
+                if ("其他".equals(yhqrXlk)) {
+                    yhqrStr += " - " + pg.getYhqrQt();
+                }
+            } else if (2 == yhqr) {
+                yhqrStr += " - " + pg.getYhqrNo();
+            }
+            cell.setCellValue(yhqrStr);
             row = s.getRow(10);
             cell = row.getCell(1);
             cell.setCellValue(ComparisonUtil.queryDictTextByKey("package_test", pg.getSjbcs(), sysDictService));