家长姓名不再取sys_user表real_name_

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java

@@ -14,6 +14,7 @@ import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.util.http.HttpUtil;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -317,7 +318,6 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		if(true){
 			return transferProduceContract(userId, musicGroupId);
 		}
-
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -136,7 +136,7 @@ public class StudentManageServiceImpl implements StudentManageService {
             dataList = studentManageDao.findStudentsByOrganId(params);
         }
         if (dataList == null) {
-            dataList = new ArrayList<StudentManageListDto>();
+            dataList = new ArrayList<>();
         }
         pageInfo.setRows(dataList);
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -331,7 +331,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         }
         sysUser.setPhone(studentRegistration.getParentsPhone());
         sysUser.setOrganId(studentRegistration.getOrganId());
-        sysUser.setRealName(studentRegistration.getParentsName());
+//        sysUser.setRealName(studentRegistration.getParentsName());
 
         sysUser.setUsername(studentRegistration.getName());
         sysUser.setGender(studentRegistration.getGender());
@@ -691,11 +691,11 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 //新增user
                 sysUser = new SysUser();
                 sysUser.setPhone(studentRegistration.getParentsPhone());
-                sysUser.setRealName(studentRegistration.getParentsName());
+//                sysUser.setRealName(studentRegistration.getParentsName());
                 sysUser.setUsername(studentRegistration.getName());
                 sysUser.setGender(studentRegistration.getGender());
                 sysUser.setUserType("STUDENT");
-                sysUser.setIdCardNo(studentRegistration.getIdCardNo());
+//                sysUser.setIdCardNo(studentRegistration.getIdCardNo());
                 sysUser.setOrganId(musicGroup.getOrganId());
                 sysUser.setBirthdate(studentRegistration.getBirthdate());
                 teacherDao.addSysUser(sysUser);
@@ -723,7 +723,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                     sysUser.setUserType(sysUser.getUserType() + ",STUDENT");
                 }
                 sysUser.setPhone(studentRegistration.getParentsPhone());
-                sysUser.setRealName(studentRegistration.getParentsName());
+//                sysUser.setRealName(studentRegistration.getParentsName());
                 sysUser.setUsername(studentRegistration.getName());
                 sysUser.setGender(studentRegistration.getGender());
                 sysUser.setOrganId(musicGroup.getOrganId());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherServiceImpl.java

@@ -687,10 +687,10 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 
 		Date date = new Date();
 
-		user.setRealName(realName);
-		user.setIdCardNo(idcardNo);
-		user.setUpdateTime(date);
-		sysUserFeignService.updateSysUser(user);
+//		user.setRealName(realName);
+//		user.setIdCardNo(idcardNo);
+//		user.setUpdateTime(date);
+//		sysUserFeignService.updateSysUser(user);
 
 		teacher.setIdcardBackImg(idcardBackImg);
 		teacher.setIdcardFrontImg(idcardFrontImg);

mec-biz/src/main/resources/config/mybatis/MusicGroupPaymentCalenderDetailMapper.xml

@@ -466,7 +466,7 @@
 			edu.real_name_ edu_teacher_name_,
 			MAX( sub.name_ ) subject_name_,
 			su.gender_ gender_,
-			su.real_name_ parent_name_,
+			sut.name_ parent_name_,
 			su.phone_ phone_
 		FROM
 			music_group_payment_calender_detail mgpcd
@@ -475,6 +475,7 @@
 			LEFT JOIN student_registration sr ON sr.music_group_id_ = mgpc.music_group_id_
 			AND mgpcd.user_id_ = sr.user_id_
 			LEFT JOIN sys_user su ON mgpcd.user_id_ = su.id_
+			LEFT JOIN sys_user_tsign sut ON sut.user_id_ = su.id_
 			LEFT JOIN sys_user edu ON edu.id_ = mg.educational_teacher_id_
 			LEFT JOIN organization organ ON organ.id_ = mg.organ_id_
 			LEFT JOIN `subject` sub ON sr.actual_subject_id_ = sub.id_

mec-biz/src/main/resources/config/mybatis/StudentManageDao.xml

@@ -157,18 +157,19 @@
     </update>
 
     <select id="findStudentsByOrganId" resultMap="studentManageListDto">
-        SELECT o.`name_` organ_name_,o.grade_type_,s.`user_id_` ,su.`username_` ,su.`phone_` parents_phone_,su.`real_name_` ,su.`gender_` , su.organ_id_,
+        SELECT o.`name_` organ_name_,o.grade_type_,s.`user_id_` ,su.`username_` ,su.`phone_` parents_phone_,
+        sut.name_ real_name_,su.`gender_` , su.organ_id_,
 		tu.`real_name_` teacher_name_,CASE s.service_tag_ WHEN 2 THEN 0 ELSE s.service_tag_ END service_tag_ ,s.`operating_tag_` ,
         s.care_package_, s.come_on_package_, suca.`course_balance_` ,suca.balance_,
 		sub.`name_` music_group_subject_ ,su.birthdate_,s.subject_id_list_,s.teacher_id_,s.current_grade_num_,s.current_class_,
-        case when su.password_ is null then false else true end isActive_,s.is_new_user_,case when sut.user_id_ is null then 0 else 1 end is_signed_contract_,
+        CASE WHEN su.password_ IS NULL THEN FALSE ELSE TRUE END isActive_,s.is_new_user_,CASE WHEN sut.user_id_ IS NULL THEN 0 ELSE 1 END is_signed_contract_,
         s.cooperation_organ_id_,co.name_ cooperation_organ_name_
-		FROM `student` s LEFT JOIN `sys_user` su on s.`user_id_` = su.`id_`
-		LEFT JOIN `organization` o on o.`id_` = su.`organ_id_`
-		LEFT JOIN `sys_user` tu on tu.`id_` = s.`teacher_id_` 
-		LEFT JOIN `sys_user_cash_account` suca on suca.`user_id_` = s.`user_id_`
-		LEFT JOIN `subject` sub on sub.id_ = s.`subject_id_list_`
-		left join sys_user_tsign sut on sut.user_id_ = s.user_id_
+		FROM `student` s LEFT JOIN `sys_user` su ON s.`user_id_` = su.`id_`
+		LEFT JOIN `organization` o ON o.`id_` = su.`organ_id_`
+		LEFT JOIN `sys_user` tu ON tu.`id_` = s.`teacher_id_`
+		LEFT JOIN `sys_user_cash_account` suca ON suca.`user_id_` = s.`user_id_`
+		LEFT JOIN `subject` sub ON sub.id_ = s.`subject_id_list_`
+		LEFT JOIN sys_user_tsign sut ON sut.user_id_ = s.user_id_
         LEFT JOIN cooperation_organ co ON s.cooperation_organ_id_=co.id_
         <include refid="findStudentsByOrganIdSql"/>
         ORDER BY su.create_time_ DESC

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -408,11 +408,13 @@
     </update>
 
     <select id="queryStudentInfo" resultMap="StudentInfo">
-        SELECT u.*,sr.name_,sr.current_class_,sr.current_grade_,sr.actual_subject_id_,sr.parents_name_,s.name_ subject_name_
-        FROM sys_user u left join
-        student_registration sr on u.id_ = sr.user_id_ left join subject s on sr.actual_subject_id_ = s.id_
-        where u.id_ = #{userId}
-        order by sr.create_time_ desc limit 1
+        SELECT sut.name_ real_name_,sut.card_no_ id_card_no_,u.*,sr.name_,sr.current_class_,sr.current_grade_,sr.actual_subject_id_,sr.parents_name_,s.name_ subject_name_
+        FROM sys_user u
+        LEFT JOIN student_registration sr ON u.id_ = sr.user_id_
+        LEFT JOIN subject s ON sr.actual_subject_id_ = s.id_
+        LEFT JOIN sys_user_tsign sut ON sut.user_id_ = u.id_
+        WHERE u.id_ = #{userId}
+        ORDER BY sr.create_time_ DESC limit 1
     </select>
 
     <select id="queryByUserIdAndMusicGroupId" resultMap="StudentRegistration">
@@ -483,6 +485,7 @@
         SELECT sr.*,cg.name_ class_group_name_,su.gender_ gender_,su.username_ FROM student_registration sr
         LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
         LEFT JOIN sys_user su on sr.user_id_ = su.id_
+        LEFT JOIN sys_user_tsign sut ON sut.user_id_ = su.id_
         WHERE sr.music_group_id_ = #{musicGroupId}
         <if test="actualSubjectId != null">
             AND FIND_IN_SET(sr.actual_subject_id_,#{actualSubjectId})
@@ -610,9 +613,11 @@
         GROUP BY sr.music_group_id_
     </select>
     <select id="queryUserByPhone" resultMap="StudentRegistration">
-        SELECT su.id_,su.real_name_ parents_name_,su.phone_,sr.current_grade_,sr.current_grade_num_,
+        SELECT su.id_,CASE WHEN sut.name_ IS NULL THEN su.real_name_ ELSE sut.name_ END parents_name_,
+        su.phone_,sr.current_grade_,sr.current_grade_num_,
         sr.current_class_,su.username_ name_,su.birthdate_,su.gender_
         FROM sys_user su
+        LEFT JOIN sys_user_tsign sut ON sut.user_id_ = su.id_
         LEFT JOIN student_registration sr ON sr.user_id_ = su.id_
         WHERE su.phone_ = #{mobile} ORDER BY sr.id_ DESC
         LIMIT 1

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupRegisterController.java

@@ -2,11 +2,8 @@ package com.ym.mec.student.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.CourseScheduleDao;
-import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
 import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.entity.MusicGroup;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
@@ -16,21 +13,14 @@ import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
 import com.ym.mec.biz.service.StudentRegistrationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
 import com.ym.mec.util.date.DateUtil;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
-
-import java.io.IOException;
 import java.util.Date;
-import java.util.List;
 
 @RequestMapping("register")
 @Api(tags = "乐团注册")
@@ -46,10 +36,6 @@ public class MusicGroupRegisterController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
     @Autowired
-    private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
-    @Autowired
-    private CourseScheduleDao courseScheduleDao;
-    @Autowired
     private StudentRegistrationDao studentRegistrationDao;
 
 

mec-util/src/main/java/com/ym/mec/util/http/HttpUtil.java

@@ -47,7 +47,7 @@ public class HttpUtil {
 			JSONArray jsonArray = new JSONArray();
 			JSONObject jsonObject = new JSONObject();
 			jsonObject.put("LongUrl",url);
-			jsonObject.put("TermOfValidity","long-term");
+			jsonObject.put("TermOfValidity","1-year");
 			jsonArray.add(jsonObject);
 			Map<String,String> HeadMap = new HashMap<>();
 			HeadMap.put("Dwz-Token","0a9d3b34eae990d4355653d2ba6c8974");

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupPaymentCalenderDetailController.java

@@ -2,22 +2,17 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dto.MusicArrearageStudentDto;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.page.ArrearageStudentsQueryInfo;
 import com.ym.mec.biz.service.EmployeeService;
 import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Set;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,7 +21,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAddStudentDto;
 import com.ym.mec.biz.dal.page.MusicCalenderDetailQueryInfo;
 import com.ym.mec.biz.service.MusicGroupPaymentCalenderDetailService;
@@ -122,17 +116,17 @@ public class MusicGroupPaymentCalenderDetailController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-            Employee employee = employeeService.get(sysUser.getId());
-            if (StringUtils.isBlank(queryInfo.getOrganIds())) {
-                queryInfo.setOrganIds(employee.getOrganIdList());
-            }else if(StringUtils.isEmpty(employee.getOrganIdList())){
-                return failed("用户所在分部异常");
-            }else {
-                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.containsAll(Arrays.asList(queryInfo.getOrganIds().split(",")))){
-                    return failed("非法请求");
-                }
+        Employee employee = employeeService.get(sysUser.getId());
+        if (StringUtils.isBlank(queryInfo.getOrganIds())) {
+            queryInfo.setOrganIds(employee.getOrganIdList());
+        }else if(StringUtils.isEmpty(employee.getOrganIdList())){
+            return failed("用户所在分部异常");
+        }else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if(!list.containsAll(Arrays.asList(queryInfo.getOrganIds().split(",")))){
+                return failed("非法请求");
             }
+        }
         return succeed(musicGroupPaymentCalenderDetailService.queryArrearageStudents(queryInfo));
     }