1

src/main/java/com/ym/mec/collectfee/controller/OrderController.java

@@ -34,8 +34,8 @@ public class OrderController extends BaseController {
     @PostMapping("/checkOrderList")
 //  @ApiOperation(value = "根据学生编号，获取订单列表")
 //  @ApiImplicitParams({ @ApiImplicitParam(name = "classId", value = "乐团编号", required = true, dataType = "Integer")})
-	  public Object checkOrders(Integer classId,Integer type){
-	      return succeed(orderService.getOrderByClassId(classId,type));
+	  public Object checkOrders(Integer classId,Integer type, String voicyPart){
+	      return succeed(orderService.getOrderByClassId(classId,type,voicyPart));
 	  }
 
     /**

src/main/java/com/ym/mec/collectfee/dao/OrderDao.java

@@ -14,7 +14,7 @@ public interface OrderDao extends BaseDAO<Integer, Order> {
 
     List<Order> getOrderByUserId(Integer userId);
      
-    List<Order> getOrderByClassId(@Param("classId") Integer classId,@Param("type") Integer type);
+    List<Order> getOrderByClassId(@Param("classId") Integer classId,@Param("type") Integer type, @Param("voicyPart")String voicyPart);
 
     List<Order> getOrderByBatch(String batchNum);
 

src/main/java/com/ym/mec/collectfee/entity/ApplyInfo.java

@@ -95,6 +95,8 @@ public class ApplyInfo {
 	private java.util.Date createTime;
 
 	private Integer courseId;
+	
+	private String remark;
 
 	public Integer getCourseId() {
 		return courseId;
@@ -288,6 +290,14 @@ public class ApplyInfo {
 		return this.createTime;
 	}
 
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
 	@Override
 	public String toString() {
 		return "ApplyInfo{" +

src/main/java/com/ym/mec/collectfee/service/OrderService.java

@@ -28,7 +28,7 @@ public interface OrderService extends BaseService<Integer, Order> {
      * @param userId
      * @return
      */
-    List<Order> getOrderByClassId(Integer classId, Integer type);
+    List<Order> getOrderByClassId(Integer classId, Integer type, String voicyPart);
 
 
     /**

src/main/java/com/ym/mec/collectfee/service/impl/OrderServiceImpl.java

@@ -182,8 +182,8 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
     }
 
     @Override
-    public List<Order> getOrderByClassId(Integer classId, Integer type) {
-        return orderDao.getOrderByClassId(classId, type);
+    public List<Order> getOrderByClassId(Integer classId, Integer type,String voicyPart) {
+        return orderDao.getOrderByClassId(classId, type,voicyPart);
     }
 
     public static void main(String[] args) {

src/main/resources/config/mybatis/ApplyInfoMapper.xml

@@ -28,6 +28,7 @@
 		<result column="push_status_" property="pushStatus" />
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
+		<result column="remark" property="remark" />
 	</resultMap>
 
 	<resultMap type="com.ym.mec.collectfee.entity.ApplyInfoPage" id="ApplyInfoPage">
@@ -54,6 +55,7 @@
 		<result column="sub_name_" property="subName" />
 		<result column="amount_" property="amount" />
 		<result column="create_time_" property="createTime" />
+		<result column="remark" property="remark" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -68,8 +70,8 @@
 
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.collectfee.entity.ApplyInfo" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO apply_info (course_id_,class_id_,user_id_,branch_id_,name_,sex_,birthday_,city_,school_id_,grade_,g_class_,sub_id_,is_adjust_,patriarch_phone_,patriarch_name_,patriarch_unit_,update_time_,create_time_) VALUES
-		(#{courseId},#{classId},#{userId},#{branchId},#{name},#{sex},#{birthday},#{city},#{schoolId},#{grade},#{gClass},#{subId},#{isAdjust},#{patriarchPhone},#{patriarchName},#{patriarchUnit},#{updateTime},#{createTime})
+		INSERT INTO apply_info (course_id_,class_id_,user_id_,branch_id_,name_,sex_,birthday_,city_,school_id_,grade_,g_class_,sub_id_,is_adjust_,patriarch_phone_,patriarch_name_,patriarch_unit_,update_time_,create_time_,remark) VALUES
+		(#{courseId},#{classId},#{userId},#{branchId},#{name},#{sex},#{birthday},#{city},#{schoolId},#{grade},#{gClass},#{subId},#{isAdjust},#{patriarchPhone},#{patriarchName},#{patriarchUnit},#{updateTime},#{createTime},#{remark})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -127,6 +129,9 @@
 			<if test="grade != null">
 				grade_ = #{grade}
 			</if>
+			<if test="remark != null">
+				remark = #{remark}
+			</if>
 		</set>
 		WHERE id_ = #{id}
 	</update>
@@ -176,7 +181,7 @@
 
 	<select id="getUserRegisterVIewDetail" resultType="java.util.Map">
 		SELECT ai.sub_id_,ai.is_adjust_,ai.status_,ai.sex_,ai.name_,ai.patriarch_phone_,ai.sub_id_,
-		ai.grade_,ai.school_,ai.id_,ai.g_class_,ai.city_,ai.patriarch_name_,ai.patriarch_unit_,ai.course_id_,
+		ai.grade_,ai.school_,ai.id_,ai.g_class_,ai.city_,ai.patriarch_name_,ai.patriarch_unit_,ai.course_id_,ai.remark,
 		cgi.sub_name_,cgi.plan_num_,cgi.fee_amount_,cgi.fee_type_,s.status_ push_status_
 		FROM apply_info ai LEFT JOIN course_group_info cgi ON ai.course_id_ = cgi.id_
 		 LEFT JOIN school s ON ai.class_id_ = s.id_ WHERE ai.id_ = #{stuId}

src/main/resources/config/mybatis/OrderMapper.xml

@@ -155,6 +155,9 @@
         <if test="type != null">
             and type = #{type}
         </if>
+        <if test="voicyPart != null">
+            and voicy_part like '%${voicyPart}%'
+        </if>
     </select>
 
     <select id="getOrderByBatch" resultMap="Order">