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

Merge remote-tracking branch 'origin/dev_20230808_OTA' into dev_20230808_OTA

Browse Source
This commit is contained in:
高嵩
2023-08-24 09:41:43 +08:00
parent b401518b83 ed1935db21
commit 87af7ca010
5 changed files with 40 additions and 16 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/controller/OtaManageApplyEOController.java
+2 -2
View File
@@ -147,8 +147,8 @@ public class OtaManageApplyEOController extends JeroController<OtaManageApplyEO,
@AutoLog(value = "下拉数据-全部和分车型（不含年款）")
@ApiOperation(value="下拉数据-全部和分车型（不含年款）", notes="下拉数据-全部和分车型（不含年款）")
@GetMapping(value = "/getCarList")
public Result<?> getCarList() {
List<String> result = otaManageApplyEOService.getCarList();
public Result<?> getCarList(String cut) {
List<String> result = otaManageApplyEOService.getCarList(cut);
return Result.OK(result);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java
+4 -3
View File
@@ -89,6 +89,9 @@ public class OtaManageApplyEO implements Serializable {
@ApiModelProperty(value = "备注")
private java.lang.String remark;
@ApiModelProperty(value = "适用车型")
private java.lang.String appliedVehicleProject;
//--------------------------------------------------------
@@ -96,9 +99,7 @@ public class OtaManageApplyEO implements Serializable {
@ApiModelProperty(value = "软件版本")
private java.lang.String plannedBpLaunchBatch;
@TableField(exist = false)
@ApiModelProperty(value = "适用车型")
private java.lang.String appliedVehicleProject;
@TableField(exist = false)
@ApiModelProperty(value = "市场")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
+3
View File
@@ -80,6 +80,9 @@
and (omr.impact_cn_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%')
and omr.impact_eu_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%'))
</if>
<if test="otaManageApplyEO.appliedVehicleProject != null and otaManageApplyEO.appliedVehicleProject != ''">
and omr.applied_vehicle_project LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.appliedVehicleProject}),'%'
</if>
</where>
order by omr.id desc
</select>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java
+1 -1
View File
@@ -88,7 +88,7 @@ public interface IOtaManageApplyEOService extends IService<OtaManageApplyEO> {
下拉数据-全部和分车型（不含年款）
* @return
*/
List<String> getCarList();
List<String> getCarList(String cut);
/**
*
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+30 -10
View File
@@ -6,9 +6,12 @@ import com.jero.common.constant.enums.CutEnum;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.DateUtils;
import com.jero.common.util.oConvertUtils;
import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO;
import com.jero.modules.dummy.enums.OrderEnum;
import com.jero.modules.ota.entity.*;
import com.jero.modules.ota.entity.OtaManageApplyEO;
import com.jero.modules.ota.entity.OtaManageHistory;
import com.jero.modules.ota.entity.OtaManagePermission;
import com.jero.modules.ota.entity.OtaManageReceive;
import com.jero.modules.ota.entity.OtaManageReceiveNsdpEO;
import com.jero.modules.ota.enums.OtaCarEnum;
import com.jero.modules.ota.enums.OtaHomoImpactEnum;
import com.jero.modules.ota.enums.OtaStatusEnum;
@@ -16,13 +19,13 @@ import com.jero.modules.ota.mapper.OtaManageApplyEOMapper;
import com.jero.modules.ota.service.IOtaManageApplyEOService;
import com.jero.modules.ota.service.IOtaManageHistoryService;
import com.jero.modules.ota.service.IOtaManagePermissionService;
import com.jero.modules.ota.service.IOtaManageReceiveService;
import com.jero.modules.ota.vo.AllCarExportCnVO;
import com.jero.modules.ota.vo.AllCarExportEnVO;
import com.jero.modules.ota.vo.OneCarExportCnVO;
import com.jero.modules.ota.vo.OneCarExportEnVO;
import com.jero.modules.ota.vo.OtaExportCnVO;
import com.jero.modules.ota.vo.OtaExportEnVO;
import com.jero.modules.ota.service.IOtaManageReceiveService;
import com.jero.modules.ota.vo.VersionVO;
import com.jero.modules.project.entity.ProjectLibraryBase;
import com.jero.modules.project.entity.ProjectTaskPlanning;
@@ -54,7 +57,20 @@ import javax.servlet.http.HttpServletRequest;
import java.text.Collator;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.UUID;
import java.util.stream.Collectors;
/**
@@ -746,10 +762,14 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
* @return
*/
@Override
public List<String> getCarList() {
public List<String> getCarList(String cut) {
List<OtaManageApplyEO> otaManageApplyEOS = this.getBaseMapper().getOtaCarList();
List<String> result = new LinkedList<>();
result.add("全部");
if(CutEnum.CN.getValue().equals(cut)){
result.add("全部");
}else{
result.add("All");
}
if (!otaManageApplyEOS.isEmpty()) {
//适用车型 appliedVehicleProject
@@ -757,15 +777,15 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
.filter(e -> StringUtils.isNotBlank(e.getAppliedVehicleProject()))
.map(OtaManageApplyEO::getAppliedVehicleProject).distinct().collect(Collectors.toList());
//过滤掉特殊的适用车型
// List<String> otaNameList = OtaCarEnum.getOtaNameList();
List<String> otaNameList = OtaCarEnum.getOtaNameList();
Set<String> carSet = new HashSet<>();//适用车型
Set<String> marketSet = new HashSet<>();//市场
for (String appliedVehicleProject : appliedVehicleProjectList) {
for (String s : appliedVehicleProject.split(",")) {
String[] split = s.split(" ");
if (split.length == 2) {
result.add(s);
if(!otaNameList.contains(s)){
result.add(s);
}
} else if (split.length == 3) {
result.add(split[0] + " " + split[2]);
}