驾意险最小份数添加 代课录单用户id添加

src/main/java/com/ydtech/modules/order/entity/InsDrivingIntentionInsurance.java

@@ -99,6 +99,10 @@ public class InsDrivingIntentionInsurance implements Serializable {
     @TableField(exist = false)
     private Integer quantity;
 
+    //驾意险最小份数
+    @TableField(exist = false)
+    private Integer minQuantity;
+
     @TableField(exist = false)
     private List<InsDrivingIntentionInsurance> insDrivingIntentionInsurances;
 

src/main/java/com/ydtech/modules/scheme/controller/PtlSchemeController.java

@@ -215,12 +215,18 @@ public class PtlSchemeController extends BaseController {
     @ApiOperation(value = "规则过滤保险公司")
     @PostMapping("/ruleFilterCompany")
     public HttpResult ruleFilterCompany(@Validated @RequestBody RuleFilterVo ruleFilterVo){
+        String userId = getUserId();
+        if(!Objects.isNull(ruleFilterVo.getUserId()) && !ruleFilterVo.getUserId().equals("")){
+            userId = ruleFilterVo.getUserId();
+        }
+
         //如果没有传入险种 则显示用户所有的保险公司
         if(Objects.isNull(ruleFilterVo.getProductId()))
         {
-            return HttpResult.ok(taxSourceService.getAllAgreement(getDeptId(), getUserId()));
+            return HttpResult.ok(taxSourceService.getAllAgreement(getDeptId(), userId));
         }
-        return HttpResult.ok(ptlSchemeRulesService.ruleFilterCompany(getUserId(),ruleFilterVo));
+
+        return HttpResult.ok(ptlSchemeRulesService.ruleFilterCompany(userId,ruleFilterVo));
     }
     //endregion
 

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

@@ -19,4 +19,6 @@ public class PtlOptionalSchemeInsuranceDrivingIntention {
 
     private String title;
 
+    private Integer minQuantity;
+
 }

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

@@ -93,6 +93,8 @@ public class OptionalSchemeSaveVo {
             private String projectName;
 
             private String title;
+
+            private Integer minQuantity;
         }
     }
 
@@ -162,6 +164,7 @@ public class OptionalSchemeSaveVo {
                 intention.setDrivingIntentionId(isOptions.getId());
                 intention.setSeatNum(item.getSeatNum());
                 intention.setTitle(isOptions.getTitle());
+                intention.setMinQuantity(isOptions.getMinQuantity());
                 intentions.add(intention);
             });
 

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

@@ -26,4 +26,7 @@ public class RuleFilterVo {
     @ApiModelProperty(value = "被保人信息")
     private CustomerInfoVo insureInfo;
 
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
 }

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

@@ -183,6 +183,7 @@ public class PtlOptionalSchemeServiceImpl extends ServiceImpl<PtlOptionalSchemeM
                 isOption.setProjectName(x.getAlias());
                 isOption.setTitle(x.getTitle());
                 isOption.setId(x.getDrivingIntentionId());
+                isOption.setMinQuantity(x.getMinQuantity());
                 isOptions.add(isOption);
             }
             insruance.setSeatNum(seatNum);

src/main/resources/mapper/modules/order/InsDrivingIntentionInsuranceMapper.xml

@@ -35,6 +35,7 @@
         <result property="projectCode" column="project_code" jdbcType="VARCHAR"/>
         <result property="riskCode" column="risk_code" jdbcType="VARCHAR"/>
         <result property="seatNum" column="seat_num" jdbcType="INTEGER"/>
+        <result property="minQuantity" column="min_quantity" jdbcType="INTEGER"/>
         <result property="sumAmount" column="sum_amount" jdbcType="DECIMAL"/>
         <result property="sumPremium" column="sum_premium" jdbcType="DECIMAL"/>
         <result property="apiType" column="api_type" jdbcType="INTEGER"/>