fix 讲义

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseHandoutsAddBo.java

@@ -39,6 +39,10 @@ public class CourseHandoutsAddBo {
     @ApiModelProperty("修改时间")
     private Long updateTime;
 
+    /** 文件名字 */
+    @ApiModelProperty("文件名字")
+    private String urlName;
+
     /** 绑定类型 */
     @ApiModelProperty("绑定类型")
     private List<CourseHandoutsBusinessAddBo> courseHandoutsBusinessAddBos;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseHandoutsEditBo.java

@@ -45,6 +45,10 @@ public class CourseHandoutsEditBo {
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
+    /** 文件名字 */
+    @ApiModelProperty("文件名字")
+    private String urlName;
+
     /** 绑定类型 */
     @ApiModelProperty("绑定类型")
     private List<CourseHandoutsBusinessAddBo> courseHandoutsBusinessAddBos;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseHandoutsQueryBo.java

@@ -67,6 +67,10 @@ public class CourseHandoutsQueryBo extends BaseEntity {
 	@ApiModelProperty("科目ID")
 	private Long subjectId;
 
+	/** 文件名字 */
+	@ApiModelProperty("文件名字")
+	private String urlName;
+
 
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseHandouts.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.course.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -31,6 +32,7 @@ private static final long serialVersionUID=1L;
     /** 0 未启用 1启用  */
     private Integer status;
     /** 文件地址 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String handoutsUrl;
     /** 编码YW */
     private String encoder;
@@ -40,4 +42,8 @@ private static final long serialVersionUID=1L;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
+
+    /** 文件名字 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String urlName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseHandoutsServiceImpl.java

@@ -9,6 +9,7 @@ import com.zhongzheng.modules.course.domain.CourseEducationTier;
 import com.zhongzheng.modules.course.domain.CourseHandoutsBusiness;
 import com.zhongzheng.modules.course.service.ICourseHandoutsBusinessService;
 import com.zhongzheng.modules.course.vo.CourseHandoutsBusinessVo;
+import org.apache.commons.math3.distribution.AbstractMultivariateRealDistribution;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -22,6 +23,7 @@ import com.zhongzheng.modules.course.domain.CourseHandouts;
 import com.zhongzheng.modules.course.mapper.CourseHandoutsMapper;
 import com.zhongzheng.modules.course.vo.CourseHandoutsVo;
 import com.zhongzheng.modules.course.service.ICourseHandoutsService;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -42,8 +44,16 @@ public class CourseHandoutsServiceImpl extends ServiceImpl<CourseHandoutsMapper,
 
     @Override
     public CourseHandoutsVo queryById(Long handoutsId){
-        CourseHandouts db = this.baseMapper.selectById(handoutsId);
-        return BeanUtil.toBean(db, CourseHandoutsVo.class);
+        CourseHandoutsQueryBo courseHandoutsQueryBo = new CourseHandoutsQueryBo();
+        courseHandoutsQueryBo.setId(handoutsId);
+        List<CourseHandoutsVo> courseHandoutsVos = entity2Vo(baseMapper.queryList(courseHandoutsQueryBo));
+        if (CollectionUtils.isEmpty(courseHandoutsVos)){
+            return null;
+        }
+        CourseHandoutsVo courseHandoutsVo = courseHandoutsVos.get(0);
+        List<CourseHandoutsBusinessVo> courseHandoutsBusinessVos = baseMapper.selectEntity(courseHandoutsVo.getHandoutsId());
+        courseHandoutsVo.setCourseHandoutsBusinessVo(courseHandoutsBusinessVos);
+        return courseHandoutsVo;
     }
 
     @Override
@@ -102,12 +112,14 @@ public class CourseHandoutsServiceImpl extends ServiceImpl<CourseHandoutsMapper,
         LambdaQueryWrapper<CourseHandoutsBusiness> lqw = Wrappers.lambdaQuery();
         lqw.eq(CourseHandoutsBusiness::getHandoutsId,bo.getHandoutsId());
         courseHandoutsBusinessService.remove(lqw);
-        for (CourseHandoutsBusinessAddBo courseHandoutsBusinessAddBo : bo.getCourseHandoutsBusinessAddBos()) {
-            CourseHandoutsBusiness addBusiness = BeanUtil.toBean(courseHandoutsBusinessAddBo, CourseHandoutsBusiness.class);
-            addBusiness.setHandoutsId(bo.getHandoutsId());
-            addBusiness.setCreateTime(DateUtils.getNowTime());
-            addBusiness.setUpdateTime(DateUtils.getNowTime());
-            courseHandoutsBusinessService.save(addBusiness);
+        if (!CollectionUtils.isEmpty(bo.getCourseHandoutsBusinessAddBos())) {
+            for (CourseHandoutsBusinessAddBo courseHandoutsBusinessAddBo : bo.getCourseHandoutsBusinessAddBos()) {
+                CourseHandoutsBusiness addBusiness = BeanUtil.toBean(courseHandoutsBusinessAddBo, CourseHandoutsBusiness.class);
+                addBusiness.setHandoutsId(bo.getHandoutsId());
+                addBusiness.setCreateTime(DateUtils.getNowTime());
+                addBusiness.setUpdateTime(DateUtils.getNowTime());
+                courseHandoutsBusinessService.save(addBusiness);
+            }
         }
         return this.updateById(update);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseHandoutsBusinessVo.java

@@ -56,4 +56,12 @@ public class CourseHandoutsBusinessVo {
 	@Excel(name = "科目名称")
 	@ApiModelProperty("科目名称")
 	private String subjectName;
+	/** 项目名称 */
+	@Excel(name = "项目名称")
+	@ApiModelProperty("项目名称")
+	private String projectName;
+	/** 科目名称 */
+	@Excel(name = "项目id")
+	@ApiModelProperty("项目id")
+	private String projectId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseHandoutsVo.java

@@ -41,6 +41,11 @@ public class CourseHandoutsVo {
 	@ApiModelProperty("编码YW")
 	private String encoder;
 
+	/** 文件名字 */
+	@Excel(name = "文件名字")
+	@ApiModelProperty("文件名字")
+	private String urlName;
+
 	@Excel(name = "编码YW")
 	@ApiModelProperty("编码YW")
 	private List<CourseHandoutsBusinessVo> CourseHandoutsBusinessVo;

zhongzheng-system/src/main/resources/mapper/modules/course/CourseHandoutsMapper.xml

@@ -29,20 +29,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="businessName" column="business_name"/>
         <result property="handoutsId" column="handouts_id"/>
         <result property="subjectName" column="subject_name"/>
+        <result property="projectName" column="project_name"/>
+        <result property="projectId" column="project_id"/>
     </resultMap>
 
 
     <select id="selectEntity" parameterType="Long"  resultMap="CourseHandoutsBusinessVoResult">
         SELECT
-            h.*,
-            b.business_name,
-            e.education_name,
-            s.subject_name
+        h.*,
+        b.business_name,
+        e.education_name,
+        s.subject_name,
+        t.project_name,
+        t.id as project_id
         FROM
-            course_handouts_business h
-                LEFT JOIN course_business b ON h.business_id = b.id
-                LEFT JOIN course_education_type e ON h.education_id = e.id
-                LEFT JOIN course_subject s on s.id = h.subject_id
+        course_handouts_business h
+        LEFT JOIN course_business b ON h.business_id = b.id
+        LEFT JOIN course_education_type e ON h.education_id = e.id
+        LEFT JOIN course_subject s on s.id = h.subject_id
+        LEFT JOIN course_project_type t on t.id = b.project_id
         where 1=1
 
         <if test="handoutsId != null and handoutsId != ''">
@@ -82,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="handoutsName != null and handoutsName != ''">
             AND s.handouts_name like (concat('%', #{handoutsName}, '%'))
         </if>
+        GROUP BY s.handouts_id
     </select>
 
 </mapper>