方案 优先级 创建时间添加

src/main/java/com/ydtech/modules/scheme/entity/po/PtlScheme.java

@@ -3,13 +3,10 @@ package com.ydtech.modules.scheme.entity.po;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ydtech.modules.protocols.entity.po.PtlAgreementUndwrtRulesDictLabal;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-import java.util.List;
+import java.time.LocalDateTime;
 
 /**
  * 方案规则属性
@@ -54,9 +51,13 @@ public class PtlScheme {
     @TableField("carnature")
     private String carnature;
 
+    @ApiModelProperty(value = "优先级")
+    @TableField("priority_level")
+    private String priorityLevel;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(value = "create_time")
-    private String createTime;
+    private LocalDateTime createTime;
 
 
     @ApiModelProperty(value = "创建人")

src/main/java/com/ydtech/modules/scheme/entity/vo/SchemeResultVo.java

@@ -22,6 +22,10 @@ public class SchemeResultVo {
 
     private String description;
 
+    private String priorityLevel;
+
+    private String createTime;
+
     private JSONArray risks;
 
     private JSONArray kinds;

src/main/java/com/ydtech/modules/scheme/entity/vo/SchemeSaveVo.java

@@ -49,6 +49,9 @@ public class SchemeSaveVo {
         @ApiModelProperty(value = "描述")
         private String description;
 
+        @ApiModelProperty(value = "优先级")
+        private String priorityLevel;
+
         @ApiModelProperty(value = "商业险种")
         @JsonProperty("kinds")
         private List<SchemeKindInfoVo> kinds;

src/main/java/com/ydtech/modules/scheme/service/impl/PtlSchemeServiceImpl.java

@@ -23,10 +23,12 @@ import com.ydtech.modules.scheme.service.*;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.apache.ibatis.annotations.Param;
+import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -100,9 +102,11 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                 scheme.setProductName(schemeSaveVo.getProductName());
                 scheme.setDescription(item.getDescription());
                 scheme.setSchemeName(item.getSchemeName());
+                scheme.setPriorityLevel(item.getPriorityLevel());
                 scheme.setVehicleType(schemeSaveVo.getVehicleType());
                 scheme.setEnergyType(schemeSaveVo.getEnergyType());
                 scheme.setCarnature(schemeSaveVo.getCarnature());
+                scheme.setCreateTime(LocalDateTime.now());
                 this.save(scheme);
 
 
@@ -362,6 +366,9 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         queryWrapper.eq(PtlScheme::getVehicleType, vehicleType);
         queryWrapper.eq(PtlScheme::getEnergyType, energyType);
         queryWrapper.eq(PtlScheme::getCarnature, carnature);
+        // 排序条件，按照优先级级别升序排序，创建时间降序排序
+        queryWrapper.orderByAsc(PtlScheme::getPriorityLevel)
+                .orderByDesc(PtlScheme::getCreateTime);
         List<PtlScheme> ptlSchemes = baseMapper.selectList(queryWrapper);
         schemeSaveVo.setCompanyId(companyId);
         schemeSaveVo.setProductId(ptlSchemes.get(0).getProductId());
@@ -374,6 +381,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
             productVo.setId(scheme.getId());
             productVo.setSchemeName(scheme.getSchemeName());
             productVo.setDescription(scheme.getDescription());
+            productVo.setPriorityLevel(scheme.getPriorityLevel());
             List<SchemeKindInfoVo> kinds = new ArrayList<>();
             //遍历全部options
             List<InsBusinessInsurance> businessInsurance = insBusinessInsuranceService.getBusinessInsurance();

src/main/resources/mapper/modules/scheme/PtlSchemeMapper.xml

@@ -10,6 +10,8 @@
         <result property="productName" column="product_name" />
         <result property="schemeName" column="scheme_name" />
         <result property="description" column="description" />
+        <result property="priorityLevel" column="priority_level" />
+<!--        <result property="createTime" column="create_time" />-->
         <result property="kinds" column="kinds" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
         <collection property="drivingIntentions" ofType="com.ydtech.modules.scheme.entity.po.PtlSchemeInsuranceDrivingIntention">
             <id property="id" column="id" />