fix 模考详细信息

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/impl/MockApplyServiceImpl.java

@@ -7,14 +7,22 @@ import cn.hutool.json.JSONUtil;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.bank.domain.Exam;
+import com.zhongzheng.modules.bank.service.IExamService;
+import com.zhongzheng.modules.course.domain.CourseHandouts;
 import com.zhongzheng.modules.course.domain.Major;
+import com.zhongzheng.modules.course.service.ICourseHandoutsService;
 import com.zhongzheng.modules.course.service.IMajorService;
+import com.zhongzheng.modules.goods.domain.Goods;
+import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.mock.bo.*;
 import com.zhongzheng.modules.mock.domain.*;
 import com.zhongzheng.modules.mock.service.*;
+import com.zhongzheng.modules.mock.vo.*;
 import com.zhongzheng.modules.user.domain.UserMockSubscribe;
 import com.zhongzheng.modules.user.service.IUserMockSubscribeService;
 import com.zhongzheng.modules.user.service.IUserSubscribeService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -22,7 +30,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 import com.zhongzheng.modules.mock.mapper.MockApplyMapper;
-import com.zhongzheng.modules.mock.vo.MockApplyVo;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.ParseException;
@@ -42,6 +49,15 @@ import java.util.stream.Collectors;
 @Service
 public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply> implements IMockApplyService {
 
+    @Autowired
+    private IExamService iExamService;
+
+    @Autowired
+    private ICourseHandoutsService iCourseHandoutsService;
+
+    @Autowired
+    private IGoodsService iGoodsService;
+
     @Autowired
     private IMajorService iMajorService;
 
@@ -279,6 +295,79 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
 
     @Override
     public MockApplyVo queryByApplyId(Long applyId) {
-        return null;
+        LambdaQueryWrapper<MockApply> lqw1 = new LambdaQueryWrapper<>();
+        lqw1.eq(MockApply::getApplyId, applyId);
+        MockApply mockApply = this.getOne(lqw1);
+        MockApplyVo mockApplyVo = new MockApplyVo();
+        BeanUtils.copyProperties(mockApply, mockApplyVo);
+
+        if (BeanUtil.isNotEmpty(mockApply)) {
+            LambdaQueryWrapper<MockMajor> lqw2 = new LambdaQueryWrapper<>();
+            lqw2.eq(Validator.isNotEmpty(mockApply.getApplyId()), MockMajor::getApplyId, mockApply.getApplyId());
+            List<MockMajor> mockMajorList = iMockMajorService.list(lqw2);
+            List<MockMajorVo> mockMajorVoList = new ArrayList<>();
+            if (BeanUtil.isNotEmpty(mockMajorList)) {
+                mockMajorList.stream().forEach(mockMajor -> {
+                    LambdaQueryWrapper<MockMajorSubject> lqw3 = new LambdaQueryWrapper<>();
+                    lqw3.eq(Validator.isNotEmpty(mockMajor.getMockMajorId()), MockMajorSubject::getMockMajorId, mockMajor.getMockMajorId());
+                    List<MockMajorSubject> mockMajorSubjectList = iMockMajorSubjectService.list(lqw3);
+                    List<MockMajorSubjectVo> mockMajorSubjectVoList = new ArrayList<>();
+                    if (BeanUtil.isNotEmpty(mockMajorSubjectList)) {
+                        mockMajorSubjectList.stream().forEach(mockMajorSubject -> {
+                            LambdaQueryWrapper<Exam> lqw4 = new LambdaQueryWrapper<>();
+                            lqw4.eq(Validator.isNotEmpty(mockMajorSubject.getExamId()), Exam::getExamId, mockMajorSubject.getExamId());
+                            Exam exam = iExamService.getOne(lqw4);
+                            LambdaQueryWrapper<CourseHandouts> lqw5 = new LambdaQueryWrapper<>();
+                            lqw5.eq(Validator.isNotEmpty(mockMajorSubject.getHandoutsId()), CourseHandouts::getHandoutsId, mockMajorSubject.getHandoutsId());
+                            CourseHandouts courseHandouts = iCourseHandoutsService.getOne(lqw5);
+
+                            LambdaQueryWrapper<MockMajorSubjectTime> lqw6 = new LambdaQueryWrapper<>();
+                            lqw6.eq(Validator.isNotEmpty(mockMajorSubject.getMockMajorSubjectId()), MockMajorSubjectTime::getMockMajorSubjectId, mockMajorSubject.getMockMajorSubjectId());
+                            List<MockMajorSubjectTime> mockMajorSubjectTimeList = iMockMajorSubjectTimeService.list(lqw6);
+                            List<MockMajorSubjectTimeVo> mockMajorSubjectTimeVoList = new ArrayList<>();
+                            if (BeanUtil.isNotEmpty(mockMajorSubjectTimeList)) {
+                                mockMajorSubjectTimeList.stream().forEach(mockMajorSubjectTime -> {
+                                    MockMajorSubjectTimeVo mockMajorSubjectTimeVo = new MockMajorSubjectTimeVo();
+                                    BeanUtils.copyProperties(mockMajorSubjectTime, mockMajorSubjectTimeVo);
+                                    mockMajorSubjectTimeVoList.add(mockMajorSubjectTimeVo);
+                                });
+                            }
+
+                            LambdaQueryWrapper<MockMajorSubjectGoods> lqw7 = new LambdaQueryWrapper<>();
+                            lqw7.eq(Validator.isNotEmpty(mockMajorSubject.getMockMajorSubjectId()), MockMajorSubjectGoods::getMockMajorSubjectId, mockMajorSubject.getMockMajorSubjectId());
+                            List<MockMajorSubjectGoods> mockMajorSubjectGoodsList = iMockMajorSubjectGoodsService.list(lqw7);
+                            List<MockMajorSubjectGoodsVo> mockMajorSubjectGoodsVoList = new ArrayList<>();
+                            if (BeanUtil.isNotEmpty(mockMajorSubjectGoodsList)) {
+                                mockMajorSubjectGoodsList.stream().forEach(mockMajorSubjectGoods -> {
+                                    LambdaQueryWrapper<Goods> lqw8 = new LambdaQueryWrapper<>();
+                                    lqw8.eq(Validator.isNotEmpty(mockMajorSubjectGoods.getGoodsId()), Goods::getGoodsId, mockMajorSubjectGoods.getGoodsId());
+                                    Goods goods = iGoodsService.getOne(lqw8);
+                                    MockMajorSubjectGoodsVo mockMajorSubjectGoodsVo = new MockMajorSubjectGoodsVo();
+                                    BeanUtils.copyProperties(mockMajorSubjectGoods, mockMajorSubjectGoodsVo);
+                                    mockMajorSubjectGoodsVo.setGoodsCode(goods.getCode());
+                                    mockMajorSubjectGoodsVo.setGoodsName(goods.getGoodsName());
+                                    mockMajorSubjectGoodsVo.setPrice(goods.getStandPrice());
+                                    mockMajorSubjectGoodsVoList.add(mockMajorSubjectGoodsVo);
+                                });
+                            }
+
+                            MockMajorSubjectVo mockMajorSubjectVo = new MockMajorSubjectVo();
+                            BeanUtils.copyProperties(mockMajorSubject, mockMajorSubjectVo);
+                            mockMajorSubjectVo.setMockMajorSubjectTimeList(mockMajorSubjectTimeVoList);
+                            mockMajorSubjectVo.setMockMajorSubjectGoodsList(mockMajorSubjectGoodsVoList);
+                            mockMajorSubjectVo.setExamName(exam.getExamName());
+                            mockMajorSubjectVo.setHandoutsName(courseHandouts.getHandoutsName());
+                            mockMajorSubjectVoList.add(mockMajorSubjectVo);
+                        });
+                    }
+                    MockMajorVo mockMajorVo = new MockMajorVo();
+                    BeanUtils.copyProperties(mockMajor, mockMajorVo);
+                    mockMajorVo.setMockMajorSubjectList(mockMajorSubjectVoList);
+                    mockMajorVoList.add(mockMajorVo);
+                });
+                mockApplyVo.setMockMajorList(mockMajorVoList);
+            }
+        }
+        return mockApplyVo;
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/vo/MockApplyVo.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.mock.vo;
 
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhongzheng.modules.mock.domain.MockMajor;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -147,4 +148,10 @@ public class MockApplyVo {
 	@Excel(name = "开考限制时间")
 	@ApiModelProperty("开考限制时间")
 	private String timeLimit;
+
+	/** 模考绑定专业集合 */
+	@Excel(name = "模考绑定专业集合")
+	@ApiModelProperty("模考绑定专业集合")
+	private List<MockMajorVo> mockMajorList;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/vo/MockMajorSubjectGoodsVo.java

@@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -32,4 +34,16 @@ public class MockMajorSubjectGoodsVo {
 	@Excel(name = "商品ID")
 	@ApiModelProperty("商品ID")
 	private Long goodsId;
+	/** 商品名称 */
+	@Excel(name = "商品名称")
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+	/** 商品编码 */
+	@Excel(name = "商品编码")
+	@ApiModelProperty("商品编码")
+	private String goodsCode;
+	/** 商品价格 */
+	@Excel(name = "商品价格")
+	@ApiModelProperty("商品价格")
+	private BigDecimal price;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/vo/MockMajorSubjectVo.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -40,8 +40,26 @@ public class MockMajorSubjectVo {
 	@Excel(name = "试卷ID")
 	@ApiModelProperty("试卷ID")
 	private Long examId;
+	/** 试卷名称 */
+	@Excel(name = "试卷名称")
+	@ApiModelProperty("试卷名称")
+	private String examName;
 	/** 讲解ID */
 	@Excel(name = "讲解ID")
 	@ApiModelProperty("讲解ID")
 	private Long handoutsId;
+	/** 讲解名称 */
+	@Excel(name = "讲解名称")
+	@ApiModelProperty("讲解名称")
+	private String handoutsName;
+
+	/** 模考专业科目绑定时间集合 */
+	@Excel(name = "模考专业科目绑定时间集合")
+	@ApiModelProperty("模考专业科目绑定时间集合")
+	private List<MockMajorSubjectTimeVo> mockMajorSubjectTimeList;
+
+	/** 模考专业科目绑定商品集合 */
+	@Excel(name = "模考专业科目绑定商品集合")
+	@ApiModelProperty("模考专业科目绑定商品集合")
+	private List<MockMajorSubjectGoodsVo> mockMajorSubjectGoodsList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/vo/MockMajorVo.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -32,4 +32,9 @@ public class MockMajorVo {
 	@Excel(name = "专业ID")
 	@ApiModelProperty("专业ID")
 	private Long majorId;
+
+	/** 模考专业绑定科目集合 */
+	@Excel(name = "模考专业绑定科目集合")
+	@ApiModelProperty("模考专业绑定科目集合")
+	private List<MockMajorSubjectVo> mockMajorSubjectList;
 }