update

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

@@ -1,10 +1,12 @@
 package com.ym.mec.collectfee.controller;
 
 
+import com.ym.mec.collectfee.common.page.PageInfo;
 import com.ym.mec.collectfee.common.page.QueryInfo;
 import com.ym.mec.collectfee.common.web.BaseController;
 import com.ym.mec.collectfee.entity.ApplyInfo;
 import com.ym.mec.collectfee.entity.MusicTeamsPageInfo;
+import com.ym.mec.collectfee.entity.School;
 import com.ym.mec.collectfee.entity.StudentsQueryInfo;
 import com.ym.mec.collectfee.service.ApplyInfoService;
 import com.ym.mec.collectfee.service.CourseGroupInfoService;
@@ -63,8 +65,7 @@ public class UserController extends BaseController {
     @PostMapping("/userApply")
     public Object userApply(ApplyInfo applyInfo){
         if(applyInfo != null){
-            applyInfoService.insert(applyInfo);
-            return succeed();
+            return succeed(applyInfoService.insert(applyInfo));
         }
         return failed();
     }
@@ -83,6 +84,17 @@ public class UserController extends BaseController {
     }
 
     /**
+     * 根据学生编号获取乐团注册页面数据
+     * @param stuId
+     * @return
+     */
+    @ApiOperation(value = "根据学生编号获取乐团注册页面数据")
+    @PostMapping("/getUserRegisterViewDetail")
+    public Object getUserRegisterViewDetail(Integer stuId){
+        return succeed(applyInfoService.getUserRegisterViewDetail(stuId));
+    }
+
+    /**
      * 推送用户到mec注册
      * @return
      */

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

@@ -6,6 +6,8 @@ import com.ym.mec.collectfee.entity.ResponseUserInfo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 @Component
 public interface ApplyInfoDao extends BaseDAO<Integer, ApplyInfo> {
 
@@ -16,4 +18,11 @@ public interface ApplyInfoDao extends BaseDAO<Integer, ApplyInfo> {
      * @return
      */
     ApplyInfo findUserByPhone(@Param("phone") String phone, @Param("clazzId") Integer clazzId);
+
+    /**
+     * 根据学生编号获取乐团注册页面数据
+     * @param stuId
+     * @return
+     */
+    Map<String,Object> getUserRegisterVIewDetail(Integer stuId);
 }

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

@@ -3,10 +3,20 @@ package com.ym.mec.collectfee.entity;
 import com.ym.mec.collectfee.common.page.QueryInfo;
 
 public class MusicTeamsPageInfo extends QueryInfo {
+    private Integer branchId;
+
     private String name;
 
     private Integer status;
 
+    public Integer getBranchId() {
+        return branchId;
+    }
+
+    public void setBranchId(Integer branchId) {
+        this.branchId = branchId;
+    }
+
     public String getName() {
         return name;
     }

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

@@ -36,4 +36,11 @@ public interface ApplyInfoService extends BaseService<Integer, ApplyInfo> {
      * @return
      */
     void saveSeminary();
+
+    /**
+     * 根据学生编号获取乐团注册页面数据
+     * @param stuId
+     * @return
+     */
+    Object getUserRegisterViewDetail(Integer stuId);
 }

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

@@ -14,10 +14,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Service
 public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> implements ApplyInfoService {
@@ -63,6 +60,7 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 				xs.ignoreUnknownElements();
 				String body = xs.toXML(applyInfo);
 				body = body.substring(body.indexOf("<user>")+6,body.indexOf("</user>"));
+				//推送mec注册接口
 				body = getBody(body,12301);
 				Date date = new Date();
 				try {
@@ -73,13 +71,12 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 					RequestMecApplyClass applyClass = getApplyClass(applyInfo);
 					body = xs.toXML(applyClass);
 					body = body.substring(body.indexOf("<body>")+6,body.indexOf("</body>"));
-					//推送mec注册接口
-					body = getBody(body,125218);
+					//推送mec用户缴费
+					getBody(body,125218);
 				}catch (Exception e){
 					applyInfo.setPushStatus(2);
 				}
 				applyInfoDao.update(applyInfo);
-
 				return body;
 			}
 		}catch (Exception e){
@@ -187,6 +184,23 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 		}
 	}
 
+	@Override
+	public Object getUserRegisterViewDetail(Integer stuId) {
+		Map<String, Object> vIewDetail = applyInfoDao.getUserRegisterVIewDetail(stuId);
+		String subName = vIewDetail.get("sub_name_").toString();
+		if(subName.contains("圆号") || subName.contains("上低音") ||subName.contains("长号") ||subName.contains("大号")){
+			vIewDetail.put("isCopperPipe",true);
+		}else {
+			vIewDetail.put("isCopperPipe",false);
+		}
+		/*if("圆号，上低音，长号，大号".contains(subName.split("\\.")[1])){
+			vIewDetail.put("isCopperPipe",true);
+		}else {
+			vIewDetail.put("isCopperPipe",false);
+		}*/
+		return vIewDetail;
+	}
+
 	private ResponseUserInfo parseRegisterInfo(String body){
 		body = "<body>" + new String(Base64.getDecoder().decode(body)) + "</body>";
 		ResponseUserInfo userInfo = XStreamUtil.xmlToObject("body", ResponseUserInfo.class, body);

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

@@ -4,7 +4,10 @@ import com.thoughtworks.xstream.XStream;
 import com.ym.mec.collectfee.common.dao.BaseDAO;
 import com.ym.mec.collectfee.common.service.impl.BaseServiceImpl;
 import com.ym.mec.collectfee.dao.OrderDao;
-import com.ym.mec.collectfee.entity.*;
+import com.ym.mec.collectfee.entity.Order;
+import com.ym.mec.collectfee.entity.Orders;
+import com.ym.mec.collectfee.entity.RequestParamBean;
+import com.ym.mec.collectfee.entity.ResponseCourseEntity;
 import com.ym.mec.collectfee.service.CourseGroupInfoService;
 import com.ym.mec.collectfee.service.OrderService;
 import com.ym.mec.collectfee.service.SchoolService;
@@ -13,11 +16,9 @@ import com.ym.mec.collectfee.utils.XStreamUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Base64;
-import java.util.Date;
 import java.util.List;
 
 @Service

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

@@ -72,10 +72,10 @@
 				class_id_ = #{musicTeamId}
 			</if>
 			<if test="name != null and name != ''">
-				name_ = #{name}
+				AND name_ = #{name}
 			</if>
 			<if test="status != null">
-				status_ = #{status}
+				AND status_ = #{status}
 			</if>
 		</where>
 	</sql>
@@ -91,4 +91,7 @@
 			AND class_id_ = #{clazzId}
 		</if>
 	</select>
+	<select id="getUserRegisterVIewDetail" resultType="java.util.Map">
+		SELECT ai.*,cgi.sub_name_,cgi.plan_num_,cgi.fee_amount_,cgi.fee_type_ FROM apply_info ai LEFT JOIN course_group_info cgi ON ai.course_id_ = cgi.id_ WHERE ai.id_ = #{stuId}
+	</select>
 </mapper>

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

@@ -59,7 +59,9 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM course_group_info
 	</select>
+
 	<select id="getCourses" resultMap="CourseGroupInfo">
-		SELECT sub_name_,MAX(id_) id_ FROM course_group_info WHERE class_id_ = #{classId} GROUP BY sub_name_
+		SELECT * FROM course_group_info WHERE sub_id_ IN (SELECT MIN(sub_id_)sub_id_ FROM course_group_info
+		WHERE class_id_ = #{classId} GROUP BY sub_name_)
 	</select>
 </mapper>

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

@@ -62,7 +62,10 @@
 				name_ LIKE '%#{name}%'
 			</if>
 			<if test="status != null">
-				status_ = #{status}
+				AND status_ = #{status}
+			</if>
+			<if test="branchId != null">
+				AND branch_id_ = #{branchId}
 			</if>
 		</where>
 	</sql>