Merge remote-tracking branch 'origin/master'

luodangjia

2024-04-28 53d9ce668f7775b959f2d1be6f5caf30f43e5f29

Merge remote-tracking branch 'origin/master'

 common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalTestMyTestTopicDTO.java

@@ -56,6 +56,10 @@
    @ChineseDescription("咨询费用")
    private BigDecimal consultAmount;

    @ApiModelProperty(value = "是否后台创建")
    @ChineseDescription("是否后台创建")
    private Boolean isBack;

    @ApiModelProperty(value = "是否测试")
    @ChineseDescription("是否测试")
    private Boolean testFlag;

 rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java

@@ -121,6 +121,9 @@
        );

        return new SuccessResponseData(list.stream().map(o -> {
            // 是否后台创建
            o.setIsBack(orderMentalTestAll.stream().filter(oo -> oo.getOrderNo().equals(o.getAnswerNo())).findFirst().map(OrderMentalTest::getIsBack).orElse(false));

            // 是否测试
            o.setTestFlag(mentalTestResultAll.stream().filter(oo -> oo.getTopicId().equals(o.getTopicId())).findFirst().isPresent());