fix 计费单商品

zhongzheng-common/src/main/java/com/zhongzheng/common/core/controller/BaseController.java

@@ -73,6 +73,8 @@ public class BaseController
         rspData.setMsg("查询成功");
         rspData.setRows(list);
         rspData.setTotal(new PageInfo(list).getTotal());
+        System.out.println(rspData.getTotal());
+        System.out.println("HAHA");
         return rspData;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseMapper.java

@@ -20,7 +20,7 @@ public interface CourseMapper extends BaseMapper<Course> {
 
     CourseVo selectDetailById(Long id);
 
-    List<CourseVo> selectList(CourseQueryBo bo);
+    List<CourseVo> selectCourseList(CourseQueryBo bo);
 
 
 

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

@@ -71,7 +71,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
 
     @Override
     public List<CourseVo> selectList(CourseQueryBo bo) {
-        return courseMapper.selectList(bo);
+        return courseMapper.selectCourseList(bo);
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsAddBo.java

@@ -68,4 +68,7 @@ public class OrderGoodsAddBo {
     /** 所在公司 */
     @ApiModelProperty("所在公司")
     private String company;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsEditBo.java

@@ -83,5 +83,7 @@ public class OrderGoodsEditBo {
     /** 所在公司 */
     @ApiModelProperty("所在公司")
     private String company;
-
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsQueryBo.java

@@ -83,4 +83,7 @@ public class OrderGoodsQueryBo extends BaseEntity {
 	/** 所在公司 */
 	@ApiModelProperty("所在公司")
 	private String company;
+	/** 备注 */
+	@ApiModelProperty("备注")
+	private String remark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderGoods.java

@@ -66,4 +66,6 @@ private static final long serialVersionUID=1L;
     private String address;
     /** 所在公司 */
     private String company;
+    /** 备注 */
+    private String remark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderGoodsVo.java

@@ -102,4 +102,8 @@ public class OrderGoodsVo {
 	@Excel(name = "订单创建时间")
 	@ApiModelProperty("订单创建时间")
 	private Long createTime;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
 }

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

@@ -73,7 +73,7 @@
         <result property="goodsId" column="goods_id"/>
     </resultMap>
 
-    <select id="selectList" parameterType="com.zhongzheng.modules.course.bo.CourseQueryBo" resultMap="CourseResultVo">
+    <select id="selectCourseList" parameterType="com.zhongzheng.modules.course.bo.CourseQueryBo" resultMap="CourseResultVo">
         SELECT
         c.*,
         cet.education_name,
@@ -124,44 +124,15 @@
         </if>
     </select>
 
-    <select id="selectList_COUNT" resultType="Long">
+    <select id="selectCourseList_COUNT" resultType="Long">
         SELECT
             c.course_id
         FROM
             course c
         WHERE
-        1 = 1
-        <if test="status != null and status.size()!=0 ">
-            AND c.status in
-            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
+        c.status = 1
+
 
-        <if test="educationTypeId != null and educationTypeId != ''">
-            AND c.education_type_id = #{educationTypeId}
-        </if>
-        <if test="subjectId != null and subjectId != ''">
-            AND c.subject_id = #{subjectId}
-        </if>
-        <if test="businessId != null and businessId != ''">
-            AND c.business_id = #{businessId}
-        </if>
-        <if test="prefixName != null and prefixName != ''">
-            AND c.prefix_name like concat('%', #{prefixName}, '%')
-        </if>
-        <if test="courseName != null and courseName != ''">
-            AND c.course_name like concat('%', #{courseName}, '%')
-        </if>
-        <if test="publishStatus != null and publishStatus != ''">
-            AND c.publish_status = #{publishStatus}
-        </if>
-        <if test="schoolId != null and schoolId != ''">
-            AND c.school_id = #{schoolId}
-        </if>
-        <if test="majorId != null and majorId != ''">
-            AND c.major_id = #{majorId}
-        </if>
     </select>
 
     <select id="selectDetailById" parameterType="Long"  resultMap="CourseResultVo">

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="school" column="school"/>
         <result property="address" column="address"/>
         <result property="company" column="company"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderGoodsVo" id="OrderGoodsResultVo">
@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="address" column="address"/>
         <result property="company" column="company"/>
         <result property="createTime" column="create_time"/>
+        <result property="remark" column="remark"/>
 
         <result property="code" column="code"/>
         <result property="goodsName" column="goods_name"/>