fix 模考数据回显

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockApplyAddBo.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.mock.bo;
 
+import com.zhongzheng.modules.mock.domain.MockMajor;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -60,5 +61,5 @@ public class MockApplyAddBo {
 
     /** 关联专业列表 */
     @ApiModelProperty("关联专业列表")
-    private List<MockMajorAddBo> mockMajorAddBoList;
+    private List<MockMajor> mockMajorList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockApplyEditBo.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.mock.bo;
 
+import com.zhongzheng.modules.mock.domain.MockMajor;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -73,6 +74,6 @@ public class MockApplyEditBo {
 
     /** 关联专业列表 */
     @ApiModelProperty("关联专业列表")
-    private List<MockMajorEditBo> mockMajorEditBoList;
+    private List<MockMajor> mockMajorList;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockMajorAddBo.java

@@ -30,7 +30,4 @@ public class MockMajorAddBo {
     @ApiModelProperty("修改时间")
     private Long updateTime;
 
-    /** 关联科目列表 */
-    @ApiModelProperty("关联科目列表")
-    private List<MockMajorSubjectAddBo> mockMajorSubjectAddBoList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockMajorEditBo.java

@@ -34,7 +34,4 @@ public class MockMajorEditBo {
     @ApiModelProperty("修改时间")
     private Long updateTime;
 
-    /** 关联科目列表 */
-    @ApiModelProperty("关联科目列表")
-    private List<MockMajorSubjectEditBo> mockMajorSubjectEditBoList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockMajorSubjectAddBo.java

@@ -36,11 +36,4 @@ public class MockMajorSubjectAddBo {
     @ApiModelProperty("更新时间")
     private Long updateTime;
 
-    /** 关联商品列表 */
-    @ApiModelProperty("关联商品列表")
-    private List<MockMajorSubjectGoodsAddBo> mockMajorSubjectGoodsAddBoList;
-
-    /** 关联时间列表 */
-    @ApiModelProperty("关联时间列表")
-    private List<MockMajorSubjectTimeAddBo> mockMajorSubjectTimeAddBoList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockMajorSubjectEditBo.java

@@ -42,12 +42,4 @@ public class MockMajorSubjectEditBo {
     @ApiModelProperty("更新时间")
     private Long updateTime;
 
-    /** 关联商品列表 */
-    @ApiModelProperty("关联商品列表")
-    private List<MockMajorSubjectGoodsEditBo> mockMajorSubjectGoodsEditBoList;
-
-    /** 关联时间列表 */
-    @ApiModelProperty("关联时间列表")
-    private List<MockMajorSubjectTimeEditBo> mockMajorSubjectTimeEditBoList;
-
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/domain/MockMajor.java

@@ -1,12 +1,16 @@
 package com.zhongzheng.modules.mock.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.zhongzheng.modules.mock.bo.MockMajorSubjectAddBo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.zhongzheng.common.annotation.Excel;
 
 /**
@@ -36,4 +40,8 @@ private static final long serialVersionUID=1L;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
+
+    /** 关联科目列表 */
+    @ApiModelProperty("关联科目列表")
+    private List<MockMajorSubject> mockMajorSubjectList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/domain/MockMajorSubject.java

@@ -1,12 +1,17 @@
 package com.zhongzheng.modules.mock.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.zhongzheng.modules.mock.bo.MockMajorSubjectGoodsAddBo;
+import com.zhongzheng.modules.mock.bo.MockMajorSubjectTimeAddBo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.zhongzheng.common.annotation.Excel;
 
 /**
@@ -40,4 +45,12 @@ private static final long serialVersionUID=1L;
     /** 更新时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
+
+    /** 关联商品列表 */
+    @ApiModelProperty("关联商品列表")
+    private List<MockMajorSubjectGoods> mockMajorSubjectGoodsList;
+
+    /** 关联时间列表 */
+    @ApiModelProperty("关联时间列表")
+    private List<MockMajorSubjectTime> mockMajorSubjectTimeList;
 }

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

@@ -128,10 +128,10 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         this.save(add);
-        if (BeanUtil.isEmpty(bo.getMockMajorAddBoList())) {
+        if (BeanUtil.isEmpty(bo.getMockMajorList())) {
             throw new CustomException("专业不能为空");
         }
-        bo.getMockMajorAddBoList().stream().forEach(mockMajorAddBo -> {
+        bo.getMockMajorList().stream().forEach(mockMajorAddBo -> {
             MockMajorAddBo bo1 = new MockMajorAddBo();
             bo1.setApplyId(add.getApplyId());
             bo1.setMajorId(mockMajorAddBo.getMajorId());
@@ -139,10 +139,10 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
             mockMajorAdd.setCreateTime(DateUtils.getNowTime());
             mockMajorAdd.setUpdateTime(DateUtils.getNowTime());
             iMockMajorService.save(mockMajorAdd);
-            if (BeanUtil.isEmpty(mockMajorAddBo.getMockMajorSubjectAddBoList())) {
+            if (BeanUtil.isEmpty(mockMajorAddBo.getMockMajorSubjectList())) {
                 throw new CustomException("科目不能为空");
             }
-            mockMajorAddBo.getMockMajorSubjectAddBoList().stream().forEach(mockMajorSubjectAddBo -> {
+            mockMajorAddBo.getMockMajorSubjectList().stream().forEach(mockMajorSubjectAddBo -> {
                 MockMajorSubjectAddBo bo2 = new MockMajorSubjectAddBo();
                 bo2.setMockMajorId(mockMajorAdd.getMockMajorId());
                 bo2.setExamId(mockMajorSubjectAddBo.getExamId());
@@ -153,8 +153,8 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
                 mockMajorSubjectAdd.setUpdateTime(DateUtils.getNowTime());
                 iMockMajorSubjectService.save(mockMajorSubjectAdd);
 
-                if (BeanUtil.isNotEmpty(mockMajorSubjectAddBo.getMockMajorSubjectGoodsAddBoList())) {
-                    mockMajorSubjectAddBo.getMockMajorSubjectGoodsAddBoList().stream().forEach(mockMajorSubjectGoodsAddBo -> {
+                if (BeanUtil.isNotEmpty(mockMajorSubjectAddBo.getMockMajorSubjectGoodsList())) {
+                    mockMajorSubjectAddBo.getMockMajorSubjectGoodsList().stream().forEach(mockMajorSubjectGoodsAddBo -> {
                         MockMajorSubjectGoodsAddBo bo3 = new MockMajorSubjectGoodsAddBo();
                         bo3.setMockMajorSubjectId(mockMajorSubjectAdd.getMockMajorSubjectId());
                         bo3.setGoodsId(mockMajorSubjectGoodsAddBo.getGoodsId());
@@ -164,8 +164,8 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
                         iMockMajorSubjectGoodsService.save(mockMajorSubjectGoods);
                     });
                 }
-                if (BeanUtil.isNotEmpty(mockMajorSubjectAddBo.getMockMajorSubjectTimeAddBoList())) {
-                    mockMajorSubjectAddBo.getMockMajorSubjectTimeAddBoList().stream().forEach(mockMajorSubjectTimeAddBo -> {
+                if (BeanUtil.isNotEmpty(mockMajorSubjectAddBo.getMockMajorSubjectTimeList())) {
+                    mockMajorSubjectAddBo.getMockMajorSubjectTimeList().stream().forEach(mockMajorSubjectTimeAddBo -> {
                         MockMajorSubjectTimeAddBo bo4 = new MockMajorSubjectTimeAddBo();
                         bo4.setMockMajorSubjectId(mockMajorSubjectAdd.getMockMajorSubjectId());
                         try {
@@ -194,25 +194,26 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         this.updateById(update);
-        if (BeanUtil.isNotEmpty(bo.getMockMajorEditBoList())) {
-            bo.getMockMajorEditBoList().stream().forEach(mockMajorEditBo -> {
+        if (BeanUtil.isNotEmpty(bo.getMockMajorList())) {
+            bo.getMockMajorList().stream().forEach(mockMajorEditBo -> {
+
                 MockMajor mockMajor = BeanUtil.toBean(mockMajorEditBo, MockMajor.class);
                 mockMajor.setUpdateTime(DateUtils.getNowTime());
                 iMockMajorService.updateById(mockMajor);
-                if (BeanUtil.isNotEmpty(mockMajorEditBo.getMockMajorSubjectEditBoList())) {
-                    mockMajorEditBo.getMockMajorSubjectEditBoList().stream().forEach(mockMajorSubjectEditBo -> {
+                if (BeanUtil.isNotEmpty(mockMajorEditBo.getMockMajorSubjectList())) {
+                    mockMajorEditBo.getMockMajorSubjectList().stream().forEach(mockMajorSubjectEditBo -> {
                         MockMajorSubject mockMajorSubject = BeanUtil.toBean(mockMajorSubjectEditBo, MockMajorSubject.class);
                         mockMajorSubject.setUpdateTime(DateUtils.getNowTime());
                         iMockMajorSubjectService.updateById(mockMajorSubject);
-                        if (BeanUtil.isNotEmpty(mockMajorSubjectEditBo.getMockMajorSubjectTimeEditBoList())) {
-                            mockMajorSubjectEditBo.getMockMajorSubjectTimeEditBoList().stream().forEach(mockMajorSubjectTimeEditBo -> {
+                        if (BeanUtil.isNotEmpty(mockMajorSubjectEditBo.getMockMajorSubjectTimeList())) {
+                            mockMajorSubjectEditBo.getMockMajorSubjectTimeList().stream().forEach(mockMajorSubjectTimeEditBo -> {
                                 MockMajorSubjectTime mockMajorSubjectTime = BeanUtil.toBean(mockMajorSubjectTimeEditBo, MockMajorSubjectTime.class);
                                 mockMajorSubjectTime.setUpdateTime(DateUtils.getNowTime());
                                 iMockMajorSubjectTimeService.updateById(mockMajorSubjectTime);
                             });
                         }
-                        if (BeanUtil.isNotEmpty(mockMajorSubjectEditBo.getMockMajorSubjectGoodsEditBoList())) {
-                            mockMajorSubjectEditBo.getMockMajorSubjectGoodsEditBoList().stream().forEach(mockMajorSubjectGoodsEditBo -> {
+                        if (BeanUtil.isNotEmpty(mockMajorSubjectEditBo.getMockMajorSubjectGoodsList())) {
+                            mockMajorSubjectEditBo.getMockMajorSubjectGoodsList().stream().forEach(mockMajorSubjectGoodsEditBo -> {
                                 MockMajorSubjectGoods mockMajorSubjectGoods = BeanUtil.toBean(mockMajorSubjectGoodsEditBo, MockMajorSubjectGoods.class);
                                 mockMajorSubjectGoods.setUpdateTime(DateUtils.getNowTime());
                                 iMockMajorSubjectGoodsService.updateById(mockMajorSubjectGoods);