处理连表查询时的省市区校验

leromro-common/src/main/java/com/leromro/common/constant/CommonConstants.java

@@ -15,6 +15,8 @@ public class CommonConstants {
     public static final String CHECK_PROVINCE = "province_code";
     //校验省市
     public static final String CHECK_PROVINCE_CITY= "province_code,city_code";
-    //校验省市区
+    //校验省市区（和志愿者表的联查）
+    public static final String CHECK_VOLUNTEER_PROVINCE_CITY_DISTRICT = "lvi.province_code,lvi.city_code,lvi.district_code";
+    //校验省市区（无联查）
     public static final String CHECK_PROVINCE_CITY_DISTRICT = "province_code,city_code,district_code";
 }

leromro-core/src/main/java/com/leromro/core/domain/MainOrders.java

@@ -70,6 +70,11 @@ public class MainOrders extends BaseEntity
     @ApiModelProperty("服务大类别")
     private Long serviceCategory;
 
+    /** 服务大类别 */
+    @Excel(name = "单次服务数量")
+    @ApiModelProperty("单次服务数量")
+    private Long singleQuantity;
+
     /** 总次数 */
     @Excel(name = "总次数")
     @ApiModelProperty("总次数")

leromro-core/src/main/java/com/leromro/core/domain/SecondOrder.java

@@ -106,6 +106,11 @@ public class SecondOrder extends BaseEntity
     @ApiModelProperty("结束时间")
     private LocalTime workEndTime;
 
+    /** 服务大类别 */
+    @Excel(name = "单次服务数量")
+    @ApiModelProperty("单次服务数量")
+    private Long singleQuantity;
+
     /** 服务第几次 */
     @Excel(name = "服务第几次")
     @ApiModelProperty("服务第几次")

leromro-core/src/main/java/com/leromro/core/service/impl/VolunteerInfoServiceImpl.java

@@ -146,7 +146,7 @@ public class VolunteerInfoServiceImpl extends ServiceImpl<VolunteerInfoMapper, V
     @Override
     public List<VolunteerInfoVO> selectVolunteerInfoList(VolunteerInfo volunteerInfo) {
         //查询出志愿者信息
-        List<VolunteerInfoVO> infos = volunteerInfoMapper.selectVolunteerInfoSimple(new ListPermission(SecondOrder.class, CommonConstants.CHECK_PROVINCE_CITY_DISTRICT),volunteerInfo);
+        List<VolunteerInfoVO> infos = volunteerInfoMapper.selectVolunteerInfoSimple(new ListPermission(SecondOrder.class, CommonConstants.CHECK_VOLUNTEER_PROVINCE_CITY_DISTRICT),volunteerInfo);
         //查询出所有服务名称
         Map<Long, String> idMapTierName = businessManagementService.list().stream().collect(Collectors.toMap(BusinessManagement::getBusinessManagementId, BusinessManagement::getBusinessTierName));
         if (ObjectUtil.isNotEmpty(infos)){