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

# Conflicts:
#	src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

src/main/java/com/ydtech/modules/order/controller/ExternalOrderController.java

@@ -154,4 +154,15 @@ public class ExternalOrderController {
 
         return HttpResult.ok("操作成功");
     }
+
+
+    /**
+     * 驳回分页列表
+     */
+    @PostMapping("/getAllRejectOrders")
+    @ApiOperation("驳回分页列表")
+    public HttpResult<Object> getAllRejectOrders(@RequestBody RejectPageQueryVo rejectPageQueryVo){
+        Page page = buildPageRequest(rejectPageQueryVo.getPageDto());
+        return HttpResult.ok(insAreaCompanyService.getAllRejectOrders(page, rejectPageQueryVo));
+    }
 }

src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -31,7 +31,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -175,10 +174,12 @@ public class InsOrdersController extends BaseController {
                 .list();
 
         List<String> insAreaCompanyIdList = insAreaCompanies.stream().map(InsAreaCompany::getId).collect(Collectors.toList());
-        if (!insAreaCompanyIdList.isEmpty()) {
+        List<InsAreaCompanyHistoryVo> collect = new ArrayList<>();
+        if(!insAreaCompanyIdList.isEmpty()) {
             List<InsFeeOrderNew> list = insFeeOrderNewService.lambdaQuery().in(InsFeeOrderNew::getInsOrderNo, insAreaCompanyIdList).list();
             Map<String, InsFeeOrderNew> insFeeOrderNewMap = list.stream().collect(Collectors.toMap(InsFeeOrderNew::getInsOrderNo, x -> x));
-            List<InsAreaCompanyHistoryVo> collect = insAreaCompanies.stream().map(a -> {
+
+            collect = insAreaCompanies.stream().map(a -> {
                 InsAreaCompanyHistoryVo insAreaCompanyHistoryVo = new InsAreaCompanyHistoryVo();
                 BeanUtils.copyProperties(a, insAreaCompanyHistoryVo);
                 insAreaCompanyHistoryVo.setLicenseno(insOrders.getLicenseno());
@@ -202,10 +203,8 @@ public class InsOrdersController extends BaseController {
                 insAreaCompanyHistoryVo.setRatingInformation();
                 return insAreaCompanyHistoryVo;
             }).collect(Collectors.toList());
-
-            return HttpResult.ok("success", collect);
         }
-        return HttpResult.ok("", Collections.emptyList());
+        return HttpResult.ok("success", collect);
     }
 
     @PostMapping("/getByCompanyId")
@@ -520,15 +519,15 @@ public class InsOrdersController extends BaseController {
 
     @PostMapping("/queryLicenseInOrder")
     @ApiOperation(value = "查询订单中的车牌")
-    public HttpResult<List<String>> queryLicenseInOrder(@RequestBody QueryLicenseInOrderVo queryLicenseInOrderVo) {
-        List<String> licenseList = insOrdersService.queryLicenseInOrder(queryLicenseInOrderVo);
+    public HttpResult<List<String>> queryLicenseInOrder(@RequestBody QueryLicenseInOrderVo queryLicenseInOrderVo){
+        List<String> licenseList =  insOrdersService.queryLicenseInOrder(queryLicenseInOrderVo);
         return HttpResult.ok(licenseList);
     }
 
     @PostMapping("/queryInsuredInOrder")
     @ApiOperation(value = "查询订单中的被保人")
-    public HttpResult<List<String>> queryInsuredInOrder(@RequestBody QueryLicenseInOrderVo queryInsuredInOrderVo) {
-        List<String> insured = insOrdersService.queryInsuredInOrder(queryInsuredInOrderVo);
+    public HttpResult<List<String>> queryInsuredInOrder(@RequestBody QueryLicenseInOrderVo queryInsuredInOrderVo){
+        List<String> insured =  insOrdersService.queryInsuredInOrder(queryInsuredInOrderVo);
         return HttpResult.ok(insured);
     }
 

src/main/java/com/ydtech/modules/order/dao/InsAreaCompanyMapper.java

@@ -338,6 +338,13 @@ public interface InsAreaCompanyMapper extends BaseMapper<InsAreaCompany> {
      * @date: 2024/9/28
      **/
     HashMap<String, Object> costCenterTotal(@Param("taskStatisticsVo") TaskStatisticsVo taskStatisticsVo);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/30 8:55
+     *  @Description:  查询所有的驳回订单信息
+     */
+    Page<InsAreaCompany> getAllRejectOrders(@Param("") Page page, @Param("vo") RejectPageQueryVo rejectPageQueryVo);
 }
 
 

src/main/java/com/ydtech/modules/order/service/InsAreaCompanyService.java

@@ -251,5 +251,11 @@ public interface InsAreaCompanyService extends IService<InsAreaCompany> {
      * @return
      */
     Map<String, String> getSubOrderCountDTO(List<String> orderNo);
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/30 8:54
+     *  @Description: 财务查询所有的驳回订单数据
+     */
+    Page<InsAreaCompany> getAllRejectOrders(Page page, RejectPageQueryVo rejectPageQueryVo);
 }

src/main/java/com/ydtech/modules/order/service/impl/InsAreaCompanyServiceImpl.java

@@ -1051,6 +1051,16 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         List<SubOrderCountDTO> subOrderCountDTO = baseMapper.getSubOrderCountDTO(orderNo);
         return subOrderCountDTO.stream().collect(Collectors.toMap(x -> x.getOrderNo() + x.getOrderStatus(), SubOrderCountDTO::getCount));
     }
+     /**
+      *  @version
+      *  @author: hxl
+      *  @Date: 2024/9/30 8:54
+      *  @Description:  查询驳回的订单信息
+      */
+    @Override
+    public Page<InsAreaCompany> getAllRejectOrders(Page page, RejectPageQueryVo rejectPageQueryVo) {
+        return baseMapper.getAllRejectOrders(page,rejectPageQueryVo);
+    }
 
 }
 

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

@@ -2571,4 +2571,41 @@
         group by orderno, orderstatus
     </select>
 
+    <select id="getAllRejectOrders" resultType="com.ydtech.modules.order.entity.InsAreaCompany">
+        select
+        iac.id,
+        iac.orderno,
+        iac.agreement_id,
+        iac.jqpremium,
+        iac.sypremium,
+        iac.jypremium,
+        iac.taxamount,
+        iac.sumpremium,
+        io.licenseno,
+        ifa.audittime,
+        ifa.audituser as auditname,
+        ifa.rejectinfo,
+        "1" as orderExternalStatus
+        FROM
+        ins_fee_audit ifa
+        LEFT JOIN
+        ins_area_company iac on iac.id = ifa.ins_order_no
+        LEFT JOIN
+        ins_orders io on iac.orderno = io.orderno
+        left join
+        sys_user su  on su.id= ifa.audituser
+        WHERE
+        ifa.auditstatus = 2  and  IFNULL(iac.del_flag,'') != '0'
+        <if test="vo.id  != null  and  vo.id!=''">
+            and  iac.id = #{vo.id}
+        </if>
+        <if test="vo.licenseno  != null  and  vo.licenseno!='' ">
+            and io.licenseno like  CONCAT('%', #{vo.licenseno}, '%')
+        </if>
+        <if test="vo.auditname  != null  and  vo.auditname!='' ">
+            and  su.name like  CONCAT('%', #{vo.auditname}, '%')
+        </if>
+        order by  io.createtime
+    </select>
+
 </mapper>