Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
J
jgjy
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
jgjy
Commits
1dc38437
提交
1dc38437
authored
7月 26, 2019
作者:
zhouzhigang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
02946a07
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
39 行增加
和
48 行删除
+39
-48
FgClassManagementController.java
...ntroller/classmanagement/FgClassManagementController.java
+5
-1
FgStudentController.java
...chool/sysuser/controller/student/FgStudentController.java
+4
-2
FgBasicTeachingPlanMapper.java
...r/mapper/basicteachingplan/FgBasicTeachingPlanMapper.java
+1
-1
FgClassManagementService.java
...ser/service/classmanagement/FgClassManagementService.java
+1
-9
FgClassManagementServiceImpl.java
...service/classmanagement/FgClassManagementServiceImpl.java
+1
-13
ExportService.java
...com/zrqx/school/sysuser/service/export/ExportService.java
+12
-0
ExportServiceImpl.java
...zrqx/school/sysuser/service/export/ExportServiceImpl.java
+13
-0
FgStudentService.java
...zrqx/school/sysuser/service/student/FgStudentService.java
+1
-8
FgStudentServiceImpl.java
.../school/sysuser/service/student/FgStudentServiceImpl.java
+1
-14
没有找到文件。
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/classmanagement/FgClassManagementController.java
浏览文件 @
1dc38437
...
...
@@ -35,6 +35,8 @@ import com.zrqx.core.vo.schoolsysuser.fg.student.ImportStudentVo;
import
com.zrqx.core.vo.schoolsysuser.fg.student.StudentVo
;
import
com.zrqx.school.sysuser.client.FgMemberClient
;
import
com.zrqx.school.sysuser.service.classmanagement.FgClassManagementService
;
import
com.zrqx.school.sysuser.service.export.ExportService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
...
...
@@ -47,6 +49,8 @@ public class FgClassManagementController {
private
FgClassManagementService
fgClassManagementService
;
@Autowired
private
FgRedisManage
redis
;
@Autowired
private
ExportService
exportService
;
@ApiOperation
(
value
=
"班级列表"
,
notes
=
"分页查询"
)
@GetMapping
(
value
=
MemberRequestPath
.
PAGE
)
...
...
@@ -114,7 +118,7 @@ public class FgClassManagementController {
@ApiOperation
(
value
=
"导出学生错误信息"
)
@GetMapping
(
value
=
MemberRequestPath
.
ERROR
)
public
String
exportRole
(
Integer
id
,
HttpServletRequest
request
,
HttpServletResponse
response
)
throws
Exception
{
List
<?>
list
=
fgClassManagemen
tService
.
exportErrInfo
(
id
);
List
<?>
list
=
expor
tService
.
exportErrInfo
(
id
);
ExcelUtil
.
getInstance
().
exportExcel
(
list
,
ClassmanagementErrVo
.
class
,
"班级错误信息.xls"
,
response
,
request
);
return
null
;
}
...
...
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/student/FgStudentController.java
浏览文件 @
1dc38437
...
...
@@ -29,6 +29,7 @@ import com.zrqx.core.util.page.PageParam;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.core.vo.schoolsysuser.fg.student.ExcelStudentVo
;
import
com.zrqx.core.vo.schoolsysuser.fg.student.StudentVo
;
import
com.zrqx.school.sysuser.service.export.ExportService
;
import
com.zrqx.school.sysuser.service.student.FgStudentService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
...
...
@@ -40,7 +41,8 @@ public class FgStudentController {
@Autowired
private
FgStudentService
fgStudentService
;
@Autowired
private
ExportService
exportService
;
@ApiOperation
(
value
=
"学生列表"
,
notes
=
"分页查询"
)
@GetMapping
(
value
=
MemberRequestPath
.
PAGE
)
...
...
@@ -99,7 +101,7 @@ public class FgStudentController {
@ApiOperation
(
value
=
"导出学生错误信息"
)
@GetMapping
(
value
=
MemberRequestPath
.
ERROR
)
public
String
exportRole
(
Integer
id
,
HttpServletRequest
request
,
HttpServletResponse
response
)
throws
Exception
{
List
<?>
list
=
fgStuden
tService
.
exportErrInfo
(
id
);
List
<?>
list
=
expor
tService
.
exportErrInfo
(
id
);
ExcelUtil
.
getInstance
().
exportExcel
(
list
,
StudentVo
.
class
,
"学生错误信息.xls"
,
response
,
request
);
return
null
;
}
...
...
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/basicteachingplan/FgBasicTeachingPlanMapper.java
浏览文件 @
1dc38437
...
...
@@ -64,7 +64,7 @@ public interface FgBasicTeachingPlanMapper extends BaseMapper<BasicTeachingPlan>
@Select
(
" <script> "
+
" select pb.*,p.basicPlanId from me_public_basic_relation pb LEFT JOIN me_public_lessons p ON pb.lessonId = p.id "
+
" select pb.*,p.basicPlanId
,t.majotId
from me_public_basic_relation pb LEFT JOIN me_public_lessons p ON pb.lessonId = p.id "
+
" LEFT JOIN me_basic_teaching_plan t on p.basicPlanId = t.id "
+
" WHERE 1=1 and p.lessonType = 0 "
+
" <if test = ' query.relationId != null '> "
...
...
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/classmanagement/FgClassManagementService.java
浏览文件 @
1dc38437
...
...
@@ -101,14 +101,6 @@ public interface FgClassManagementService extends BaseService<ClassManagement,In
*/
String
isExistStuLevel
(
ClassManagement
form
);
/**
* 导出班级错误信息
* @param id
* @return
* @throws ClassNotFoundException
* @author zzg
* @date: 2019年7月25日 下午6:58:53
*/
List
<?>
exportErrInfo
(
Integer
id
)
throws
ClassNotFoundException
;
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/classmanagement/FgClassManagementServiceImpl.java
浏览文件 @
1dc38437
...
...
@@ -255,19 +255,7 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
@Override
public
List
<?>
exportErrInfo
(
Integer
id
)
throws
ClassNotFoundException
{
List
<
ClassmanagementErrVo
>
list
=
new
ArrayList
<
ClassmanagementErrVo
>();
Export
entity
=
exportMapper
.
selectByPrimaryKey
(
id
);
// 解析
Class
<?>
clazz
=
Class
.
forName
(
entity
.
getClazz
());
List
<?>
parselist
=
JSON
.
parseArray
(
entity
.
getValue
(),
clazz
);
for
(
int
i
=
0
;
i
<
parselist
.
size
();
i
++){
ClassmanagementErrVo
vo
=
BeanUtils
.
copy
(
parselist
.
get
(
i
),
ClassmanagementErrVo
.
class
);
list
.
add
(
vo
);
}
return
list
;
}
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/export/ExportService.java
浏览文件 @
1dc38437
package
com
.
zrqx
.
school
.
sysuser
.
service
.
export
;
import
java.util.List
;
import
com.zrqx.core.model.school.export.Export
;
import
com.zrqx.core.service.BaseService
;
public
interface
ExportService
extends
BaseService
<
Export
,
Integer
>{
/**
* 导出excel错误信息
* @param id
* @return
* @throws ClassNotFoundException
* @author zzg
* @date: 2019年7月26日 上午11:24:11
*/
List
<?>
exportErrInfo
(
Integer
id
)
throws
ClassNotFoundException
;
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/export/ExportServiceImpl.java
浏览文件 @
1dc38437
package
com
.
zrqx
.
school
.
sysuser
.
service
.
export
;
import
java.util.List
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
com.alibaba.fastjson.JSON
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.model.school.export.Export
;
import
com.zrqx.core.service.BaseServiceImpl
;
...
...
@@ -16,5 +19,15 @@ public class ExportServiceImpl extends BaseServiceImpl<Export,Integer> implement
public
BaseMapper
<
Export
>
getMapper
()
{
return
exportMapper
;
}
@Override
public
List
<?>
exportErrInfo
(
Integer
id
)
throws
ClassNotFoundException
{
Export
entity
=
exportMapper
.
selectByPrimaryKey
(
id
);
// 解析
Class
<?>
clazz
=
Class
.
forName
(
entity
.
getClazz
());
List
<?>
parselist
=
JSON
.
parseArray
(
entity
.
getValue
(),
clazz
);
return
parselist
;
}
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/student/FgStudentService.java
浏览文件 @
1dc38437
...
...
@@ -112,13 +112,6 @@ public interface FgStudentService extends BaseService<Student,Integer>{
*/
String
isExistNumber
(
Student
form
);
/**
* 导出错误信息
* @param id
* @return
* @author zzg
* @date: 2019年7月24日 上午10:52:22
*/
List
<?>
exportErrInfo
(
Integer
id
)
throws
ClassNotFoundException
;
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/student/FgStudentServiceImpl.java
浏览文件 @
1dc38437
...
...
@@ -256,20 +256,7 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
return
entity
;
}
@Override
public
List
<?>
exportErrInfo
(
Integer
id
)
throws
ClassNotFoundException
{
List
<
StudentVo
>
list
=
new
ArrayList
<
StudentVo
>();
Export
entity
=
exportMapper
.
selectByPrimaryKey
(
id
);
// 解析
Class
<?>
clazz
=
Class
.
forName
(
entity
.
getClazz
());
List
<?>
parselist
=
JSON
.
parseArray
(
entity
.
getValue
(),
clazz
);
for
(
int
i
=
0
;
i
<
parselist
.
size
();
i
++){
StudentVo
vo
=
BeanUtils
.
copy
(
parselist
.
get
(
i
),
StudentVo
.
class
);
list
.
add
(
vo
);
}
return
list
;
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论