update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CooperationOrgan.java

@@ -83,7 +83,7 @@ public class CooperationOrgan extends BaseEntity {
 	private java.util.Date updateTime;
 
 	@ApiModelProperty(value = "是否全职资源",required = false)
-	private Integer fullJobResource;
+	private Integer fullJobResource = 1;
 	
 	private List<CooperationOrganLinkman> cooperationOrganLinkmanList = new ArrayList<CooperationOrganLinkman>();
 

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

@@ -159,11 +159,8 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             user.setCreateTime(date);
             user.setUpdateTime(date);
             // 注册账户信息
-            HttpResponseResult<Integer> result = sysUserFeignService.addUser(user);
-
-            userId = result.getData();
-            user.setId(userId);
-            
+            teacherDao.addSysUser(user);
+            userId = user.getId();
             sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
         }
         
@@ -176,7 +173,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         student.setSchoolName(studentPreRegistration.getSchool());
         student.setCurrentGradeNum(studentPreRegistration.getCurrentGradeNum());
         student.setCurrentClass(studentPreRegistration.getCurrentClass());
-        student.setTenantId(studentPreRegistration.getTeacherRecommandSubjectId());
         student.setOrganId(studentPreRegistration.getOrganId());
         student.setParentName(studentPreRegistration.getParentName());
         student.setRemake(studentPreRegistration.getRemake());

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

@@ -1029,15 +1029,13 @@
         WHERE cg.group_type_ = 'VIP' AND FIND_IN_SET(vg.id_,#{musicGroupIds})
     </select>
     <select id="queryStudentMusicGroupCourses" resultMap="CourseListDto">
-        SELECT mg.id_ music_id_,mg.name_ music_group_name_,mgsf.payment_status_,
+        SELECT mg.id_ music_id_,mg.name_ music_group_name_,
         SUM(cg.current_class_times_) current_class_times_,
         SUM(cg.total_class_times_) total_class_times_,mg.school_id_ teacher_school_id_
         FROM music_group mg
         LEFT JOIN class_group cg ON cg.music_group_id_ = mg.id_
-        LEFT JOIN music_group_student_fee_ mgsf ON mgsf.music_group_id_ = mg.id_
         LEFT JOIN class_group_student_mapper cgsm ON cgsm.class_group_id_ = cg.id_
-        WHERE FIND_IN_SET(mg.id_,#{musicGroupIds}) AND cg.group_type_ = 'MUSIC' AND mgsf.user_id_ =
-        #{userId} AND cgsm.user_id_ = #{userId}
+        WHERE FIND_IN_SET(mg.id_,#{musicGroupIds}) AND cg.group_type_ = 'MUSIC' AND mgsf.user_id_ = #{userId} AND cgsm.user_id_ = #{userId}
         GROUP BY mg.id_,mgsf.payment_status_
     </select>
 

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

@@ -79,7 +79,7 @@
     SELECT * FROM sys_config
   </select>
   <select id="queryALl" resultMap="com.ym.mec.biz.dal.dao.SysConfigDao.SysConfig">
-    SELECT sc.id_,sc.param_name_,sc.group_,CASE WHEN stc.id_ IS NULL THEN sc.paran_value_ ELSE stc.param_value_ END paran_value_,stc.create_on_
+    SELECT sc.id_,sc.param_name_,sc.group_,CASE WHEN stc.id_ IS NULL THEN sc.paran_value_ ELSE stc.param_value_ END paran_value_,stc.create_time_ create_on_
     FROM sys_config sc
     LEFT JOIN sys_tenant_config stc ON sc.id_ = stc.sys_config_id_ AND stc.tenant_id_ = #{tenantId}
     <where>

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

@@ -28,8 +28,6 @@ public class CooperationOrganController extends BaseController {
     private CooperationOrganService cooperationOrganService;
     @Autowired
     private OrganizationService organizationService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "新增合作单位(教学点)")
     @PostMapping("/add")