WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改OTA参数

Browse Source
This commit is contained in:
gaosong
2023-11-12 14:59:29 +08:00
parent f06b3950d3
commit 5e86057c05
6 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java
+16
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+5 -1
View File
@@ -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
+16 -1
View File
@@ -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));