修改bug
This commit is contained in:
parent
341655b377
commit
60bae716ca
|
@ -29,6 +29,7 @@ import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao;
|
||||||
import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService;
|
import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService;
|
||||||
import org.jeecg.modules.kc.zyDbtx.entity.ZyDbtx;
|
import org.jeecg.modules.kc.zyDbtx.entity.ZyDbtx;
|
||||||
import org.jeecg.modules.kc.zyDbtx.service.IZyDbtxService;
|
import org.jeecg.modules.kc.zyDbtx.service.IZyDbtxService;
|
||||||
|
import org.jeecg.modules.kc.zyInfo.entity.CyInfoSys;
|
||||||
import org.jeecg.modules.kc.zyInfo.entity.ZyInfo;
|
import org.jeecg.modules.kc.zyInfo.entity.ZyInfo;
|
||||||
import org.jeecg.modules.kc.zyInfo.entity.ZyInfoSys;
|
import org.jeecg.modules.kc.zyInfo.entity.ZyInfoSys;
|
||||||
import org.jeecg.modules.kc.zyInfo.service.IZyInfoService;
|
import org.jeecg.modules.kc.zyInfo.service.IZyInfoService;
|
||||||
|
@ -688,11 +689,7 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
||||||
@RequestMapping(value = "/exportSysXls")
|
@RequestMapping(value = "/exportSysXls")
|
||||||
public ModelAndView exportSysXls(HttpServletRequest request, ZyInfoSys zyInfoSys) {
|
public ModelAndView exportSysXls(HttpServletRequest request, ZyInfoSys zyInfoSys) {
|
||||||
String title = "课程作业";
|
String title = "课程作业";
|
||||||
// Step.1 组装查询条件
|
|
||||||
QueryWrapper<ZyInfoSys> queryWrapper = new QueryWrapper<>();
|
|
||||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
|
||||||
|
|
||||||
//-------------获取当前登陆人是否是管理员角色,如果不是都按照教务秘书处理---------------------------
|
//-------------获取当前登陆人是否是管理员角色,如果不是都按照教务秘书处理---------------------------
|
||||||
List<String> roleList = sysBaseApi.getRolesByUsername(sysUser.getUsername());
|
List<String> roleList = sysBaseApi.getRolesByUsername(sysUser.getUsername());
|
||||||
String adminRole = "1";//0 admin 1教务秘书
|
String adminRole = "1";//0 admin 1教务秘书
|
||||||
|
@ -702,28 +699,22 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
QueryWrapper<ZyInfoSys> queryWrapper = new QueryWrapper<ZyInfoSys>();
|
||||||
if(org.apache.commons.lang.StringUtils.equals("1",adminRole)){
|
if(org.apache.commons.lang.StringUtils.equals("1",adminRole)){
|
||||||
QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapperCon = new QueryWrapper<KcExportConfigTpkwcqkjzglx>();
|
QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapperCon = new QueryWrapper<KcExportConfigTpkwcqkjzglx>();
|
||||||
queryWrapperCon.eq("gh",sysUser.getUsername());
|
queryWrapperCon.eq("gh",sysUser.getUsername());
|
||||||
queryWrapperCon.orderByDesc("create_time");
|
queryWrapperCon.orderByDesc("create_time");
|
||||||
queryWrapperCon.last("limit 1");
|
queryWrapperCon.last("limit 1");
|
||||||
KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx = kcExportConfigTpkwcqkjzglxService.getOne(queryWrapperCon);
|
KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx = kcExportConfigTpkwcqkjzglxService.getOne(queryWrapperCon);
|
||||||
queryWrapper.eq("kkdw",kcExportConfigTpkwcqkjzglx.getDwmc());
|
zyInfoSys.setKkdw(kcExportConfigTpkwcqkjzglx.getDwmc());
|
||||||
}
|
}
|
||||||
|
|
||||||
if(com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(zyInfoSys.getXqxn())){
|
if(com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(zyInfoSys.getXqxn())){
|
||||||
KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
|
KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
|
||||||
queryWrapper.eq("xqxn",kcSysConfig.getFlag1());
|
zyInfoSys.setXqxn(kcSysConfig.getFlag1());
|
||||||
}else{
|
|
||||||
queryWrapper.eq("xqxn",zyInfoSys.getXqxn());
|
|
||||||
}
|
}
|
||||||
queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(zyInfoSys.getKkdw()),"kkdw",zyInfoSys.getKkdw());
|
|
||||||
queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(zyInfoSys.getKcmc()),"kcmc",zyInfoSys.getKcmc());
|
|
||||||
queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(zyInfoSys.getKcbh()),"kcbh",zyInfoSys.getKcbh());
|
|
||||||
queryWrapper.like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(zyInfoSys.getSkjs()),"skjs",zyInfoSys.getSkjs());
|
|
||||||
|
|
||||||
// Step.2 获取导出数据
|
// Step.2 获取导出数据
|
||||||
List<ZyInfoSys> exportList = service.exportSysXls(queryWrapper);
|
List<ZyInfoSys> exportList = service.exportSysXls(zyInfoSys);
|
||||||
|
|
||||||
// Step.3 AutoPoi 导出Excel
|
// Step.3 AutoPoi 导出Excel
|
||||||
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
||||||
|
@ -988,4 +979,125 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ApiOperation(value="统计作业使用情况", notes="统计作业使用情况")
|
||||||
|
@GetMapping(value = "/sysStaticZyList")
|
||||||
|
public Result<IPage<ZyInfoSys>> sysStaticZyList(ZyInfoSys zyInfoSys,
|
||||||
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
|
HttpServletRequest req) {
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
//-------------获取当前登陆人是否是管理员角色,如果不是都按照教务秘书处理---------------------------
|
||||||
|
List<String> roleList = sysBaseApi.getRolesByUsername(sysUser.getUsername());
|
||||||
|
String adminRole = "1";//0 admin 1教务秘书
|
||||||
|
for(String role :roleList){
|
||||||
|
if(org.apache.commons.lang.StringUtils.equals("admin",role)){
|
||||||
|
adminRole = "0";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
QueryWrapper<ZyInfoSys> queryWrapper = new QueryWrapper<ZyInfoSys>();
|
||||||
|
if(org.apache.commons.lang.StringUtils.equals("1",adminRole)){
|
||||||
|
QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapperCon = new QueryWrapper<KcExportConfigTpkwcqkjzglx>();
|
||||||
|
queryWrapperCon.eq("gh",sysUser.getUsername());
|
||||||
|
queryWrapperCon.orderByDesc("create_time");
|
||||||
|
queryWrapperCon.last("limit 1");
|
||||||
|
KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx = kcExportConfigTpkwcqkjzglxService.getOne(queryWrapperCon);
|
||||||
|
zyInfoSys.setKkdw(kcExportConfigTpkwcqkjzglx.getDwmc());
|
||||||
|
}
|
||||||
|
|
||||||
|
if(com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(zyInfoSys.getXqxn())){
|
||||||
|
KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
|
||||||
|
zyInfoSys.setXqxn(kcSysConfig.getFlag1());
|
||||||
|
}
|
||||||
|
|
||||||
|
Page<ZyInfoSys> page = new Page<ZyInfoSys>(pageNo, pageSize);
|
||||||
|
IPage<ZyInfoSys> pageList = zyInfoService.sysStaticZyList(page, zyInfoSys);
|
||||||
|
return Result.OK(pageList);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation(value="统计测验使用情况", notes="统计测验使用情况")
|
||||||
|
@GetMapping(value = "/sysStaticCyList")
|
||||||
|
public Result<IPage<CyInfoSys>> sysStaticCyList(CyInfoSys cyInfoSys,
|
||||||
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
|
HttpServletRequest req) {
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
//-------------获取当前登陆人是否是管理员角色,如果不是都按照教务秘书处理---------------------------
|
||||||
|
List<String> roleList = sysBaseApi.getRolesByUsername(sysUser.getUsername());
|
||||||
|
String adminRole = "1";//0 admin 1教务秘书
|
||||||
|
for(String role :roleList){
|
||||||
|
if(org.apache.commons.lang.StringUtils.equals("admin",role)){
|
||||||
|
adminRole = "0";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
QueryWrapper<ZyInfoSys> queryWrapper = new QueryWrapper<ZyInfoSys>();
|
||||||
|
if(org.apache.commons.lang.StringUtils.equals("1",adminRole)){
|
||||||
|
QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapperCon = new QueryWrapper<KcExportConfigTpkwcqkjzglx>();
|
||||||
|
queryWrapperCon.eq("gh",sysUser.getUsername());
|
||||||
|
queryWrapperCon.orderByDesc("create_time");
|
||||||
|
queryWrapperCon.last("limit 1");
|
||||||
|
KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx = kcExportConfigTpkwcqkjzglxService.getOne(queryWrapperCon);
|
||||||
|
cyInfoSys.setKkdw(kcExportConfigTpkwcqkjzglx.getDwmc());
|
||||||
|
}
|
||||||
|
|
||||||
|
if(com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(cyInfoSys.getXqxn())){
|
||||||
|
KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
|
||||||
|
cyInfoSys.setXqxn(kcSysConfig.getFlag1());
|
||||||
|
}
|
||||||
|
|
||||||
|
Page<CyInfoSys> page = new Page<CyInfoSys>(pageNo, pageSize);
|
||||||
|
IPage<CyInfoSys> pageList = zyInfoService.sysStaticCyList(page, cyInfoSys);
|
||||||
|
return Result.OK(pageList);
|
||||||
|
}
|
||||||
|
|
||||||
|
@RequestMapping(value = "/getStaticCyExportUrl")
|
||||||
|
public ModelAndView getStaticCyExportUrl(HttpServletRequest request, CyInfoSys cyInfoSys) {
|
||||||
|
String title = "课程作业";
|
||||||
|
// Step.1 组装查询条件
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
//-------------获取当前登陆人是否是管理员角色,如果不是都按照教务秘书处理---------------------------
|
||||||
|
List<String> roleList = sysBaseApi.getRolesByUsername(sysUser.getUsername());
|
||||||
|
String adminRole = "1";//0 admin 1教务秘书
|
||||||
|
for(String role :roleList){
|
||||||
|
if(org.apache.commons.lang.StringUtils.equals("admin",role)){
|
||||||
|
adminRole = "0";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
QueryWrapper<ZyInfoSys> queryWrapper = new QueryWrapper<ZyInfoSys>();
|
||||||
|
if(org.apache.commons.lang.StringUtils.equals("1",adminRole)){
|
||||||
|
QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapperCon = new QueryWrapper<KcExportConfigTpkwcqkjzglx>();
|
||||||
|
queryWrapperCon.eq("gh",sysUser.getUsername());
|
||||||
|
queryWrapperCon.orderByDesc("create_time");
|
||||||
|
queryWrapperCon.last("limit 1");
|
||||||
|
KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx = kcExportConfigTpkwcqkjzglxService.getOne(queryWrapperCon);
|
||||||
|
cyInfoSys.setKkdw(kcExportConfigTpkwcqkjzglx.getDwmc());
|
||||||
|
}
|
||||||
|
|
||||||
|
if(com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(cyInfoSys.getXqxn())){
|
||||||
|
KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
|
||||||
|
cyInfoSys.setXqxn(kcSysConfig.getFlag1());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Step.2 获取导出数据
|
||||||
|
List<CyInfoSys> exportList = service.getStaticCyExportUrl(cyInfoSys);
|
||||||
|
|
||||||
|
// Step.3 AutoPoi 导出Excel
|
||||||
|
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
||||||
|
//此处设置的filename无效 ,前端会重更新设置一下
|
||||||
|
mv.addObject(NormalExcelConstants.FILE_NAME, title);
|
||||||
|
mv.addObject(NormalExcelConstants.CLASS, CyInfoSys.class);
|
||||||
|
//update-begin--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置--------------------
|
||||||
|
ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
|
||||||
|
exportParams.setImageBasePath(upLoadPath);
|
||||||
|
//update-end--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置----------------------
|
||||||
|
mv.addObject(NormalExcelConstants.PARAMS,exportParams);
|
||||||
|
mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
|
||||||
|
return mv;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,63 @@
|
||||||
|
package org.jeecg.modules.kc.zyInfo.entity;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.experimental.Accessors;
|
||||||
|
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description: 教学大纲
|
||||||
|
* @Author: jeecg-boot
|
||||||
|
* @Date: 2024-05-11
|
||||||
|
* @Version: V1.0
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
@Accessors(chain = true)
|
||||||
|
@EqualsAndHashCode(callSuper = false)
|
||||||
|
public class CyInfoSys implements Serializable {
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
private String id;
|
||||||
|
|
||||||
|
@Excel(name = "学期学年", width = 15)
|
||||||
|
private String xqxn;
|
||||||
|
@Excel(name = "学院", width = 15)
|
||||||
|
private String kkdw;
|
||||||
|
@Excel(name = "课程名称", width = 15)
|
||||||
|
private String kcmc;
|
||||||
|
@Excel(name = "课程性质", width = 15)
|
||||||
|
private String kcxz;
|
||||||
|
@Excel(name = "选课人数", width = 15)
|
||||||
|
private String xkrs;
|
||||||
|
private String zymc;
|
||||||
|
@Excel(name = "授课教师", width = 15)
|
||||||
|
private String skjs;
|
||||||
|
@Excel(name = "职称", width = 15)
|
||||||
|
private String zc;
|
||||||
|
@Excel(name = "测验名称", width = 15)
|
||||||
|
private String title;
|
||||||
|
@Excel(name = "是否完成", width = 15)
|
||||||
|
private String sfwc;
|
||||||
|
private String sfhp;
|
||||||
|
private String sfcc;
|
||||||
|
private Date startTime;
|
||||||
|
private Date endTime;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
private String kcbh;
|
||||||
|
private String rwbh;
|
||||||
|
private String sksj;
|
||||||
|
private String skdd;
|
||||||
|
private String num;
|
||||||
|
|
||||||
|
private String jgh;
|
||||||
|
private String ywId;
|
||||||
|
|
||||||
|
private String type;
|
||||||
|
private String count;
|
||||||
|
private String rownum;
|
||||||
|
}
|
|
@ -24,25 +24,29 @@ public class ZyInfoSys implements Serializable {
|
||||||
|
|
||||||
@Excel(name = "学期学年", width = 15)
|
@Excel(name = "学期学年", width = 15)
|
||||||
private String xqxn;
|
private String xqxn;
|
||||||
@Excel(name = "开课单位", width = 15)
|
@Excel(name = "学院", width = 15)
|
||||||
private String kkdw;
|
private String kkdw;
|
||||||
@Excel(name = "作业名称", width = 15)
|
|
||||||
private String zymc;
|
|
||||||
@Excel(name = "课程名称", width = 15)
|
@Excel(name = "课程名称", width = 15)
|
||||||
private String kcmc;
|
private String kcmc;
|
||||||
|
@Excel(name = "课程性质", width = 15)
|
||||||
|
private String kcxz;
|
||||||
|
@Excel(name = "选课人数", width = 15)
|
||||||
|
private String xkrs;
|
||||||
|
private String zymc;
|
||||||
@Excel(name = "授课教师", width = 15)
|
@Excel(name = "授课教师", width = 15)
|
||||||
private String skjs;
|
private String skjs;
|
||||||
|
@Excel(name = "职称", width = 15)
|
||||||
|
private String zc;
|
||||||
|
@Excel(name = "作业名称", width = 15)
|
||||||
|
private String title;
|
||||||
@Excel(name = "是否完成", width = 15)
|
@Excel(name = "是否完成", width = 15)
|
||||||
private String sfwc;
|
private String sfwc;
|
||||||
@Excel(name = "是否发布", width = 15)
|
@Excel(name = "是否发布", width = 15)
|
||||||
private String sffb;
|
private String sffb;
|
||||||
@Excel(name = "是否互评", width = 15)
|
@Excel(name = "是否互评", width = 15)
|
||||||
private String sfhp;
|
private String sfhp;
|
||||||
@Excel(name = "是否查重", width = 15)
|
|
||||||
private String sfcc;
|
private String sfcc;
|
||||||
@Excel(name = "开始时间", width = 15)
|
|
||||||
private Date startTime;
|
private Date startTime;
|
||||||
@Excel(name = "结束时间", width = 15)
|
|
||||||
private Date endTime;
|
private Date endTime;
|
||||||
|
|
||||||
|
|
||||||
|
@ -51,7 +55,6 @@ public class ZyInfoSys implements Serializable {
|
||||||
private String rwbh;
|
private String rwbh;
|
||||||
private String sksj;
|
private String sksj;
|
||||||
private String skdd;
|
private String skdd;
|
||||||
private String xkrs;
|
|
||||||
private String num;
|
private String num;
|
||||||
|
|
||||||
private String jgh;
|
private String jgh;
|
||||||
|
|
|
@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
import org.jeecg.modules.kc.zyInfo.entity.CyInfoSys;
|
||||||
import org.jeecg.modules.kc.zyInfo.entity.ZyInfo;
|
import org.jeecg.modules.kc.zyInfo.entity.ZyInfo;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import org.jeecg.modules.kc.zyInfo.entity.ZyInfoSys;
|
import org.jeecg.modules.kc.zyInfo.entity.ZyInfoSys;
|
||||||
|
@ -23,7 +24,7 @@ public interface ZyInfoMapper extends BaseMapper<ZyInfo> {
|
||||||
|
|
||||||
IPage<ZyInfoSys> sysList(Page<ZyInfoSys> page, @Param(Constants.WRAPPER) QueryWrapper<ZyInfoSys> queryWrapper);
|
IPage<ZyInfoSys> sysList(Page<ZyInfoSys> page, @Param(Constants.WRAPPER) QueryWrapper<ZyInfoSys> queryWrapper);
|
||||||
|
|
||||||
List<ZyInfoSys> exportSysXls(@Param(Constants.WRAPPER) QueryWrapper<ZyInfoSys> queryWrapper);
|
List<ZyInfoSys> exportSysXls(@Param("zyInfoSys") ZyInfoSys zyInfoSys);
|
||||||
|
|
||||||
ZyInfo getKechengById(@Param("id") String id);
|
ZyInfo getKechengById(@Param("id") String id);
|
||||||
|
|
||||||
|
@ -38,4 +39,10 @@ public interface ZyInfoMapper extends BaseMapper<ZyInfo> {
|
||||||
List<ZyInfoSys> getZyTopList(@Param("zyInfoSys") ZyInfoSys zyInfoSys);
|
List<ZyInfoSys> getZyTopList(@Param("zyInfoSys") ZyInfoSys zyInfoSys);
|
||||||
|
|
||||||
List<ZyInfoSys> getCyTopList(@Param("zyInfoSys") ZyInfoSys zyInfoSys);
|
List<ZyInfoSys> getCyTopList(@Param("zyInfoSys") ZyInfoSys zyInfoSys);
|
||||||
|
|
||||||
|
IPage<ZyInfoSys> sysStaticZyList(Page<ZyInfoSys> page,@Param("zyInfoSys") ZyInfoSys zyInfoSys);
|
||||||
|
|
||||||
|
IPage<CyInfoSys> sysStaticCyList(Page<CyInfoSys> page, @Param("zyInfoSys") CyInfoSys cyInfoSys);
|
||||||
|
|
||||||
|
List<CyInfoSys> getStaticCyExportUrl( @Param("zyInfoSys") CyInfoSys cyInfoSys);
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,18 +45,28 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="exportSysXls" resultType="org.jeecg.modules.kc.zyInfo.entity.ZyInfoSys">
|
<select id="exportSysXls" resultType="org.jeecg.modules.kc.zyInfo.entity.ZyInfoSys">
|
||||||
SELECT t.kcbh, t.kcmc, t.kkdw, t.kcxz, t.szkc, t.xqxn, t.rwbh, t.skdd, t.xkrs, t.jgh, func_jc (GROUP_CONCAT( t.sksj)) AS sksj, t.skjs,b.num
|
select a.*,b.skjs,b.jgh,b.kcmc,b.kcbh,b.xkrs,b.kkdw,b.kcxz,b.zc,a.xnxq as xqxn,
|
||||||
FROM (
|
IF( a.zy_status = '2', '全部完成', '未全部完成' ) as sfwc,
|
||||||
select xnxq,rwbh,create_by,count(*) as num from zy_info GROUP BY xnxq,rwbh,create_by
|
IF( a.zy_status = '0', '未发布', '已发布' ) as sffb,
|
||||||
) b
|
IF( a.xshpkg = '1', '是', '否' ) as sfhp
|
||||||
inner join (
|
from zy_info a,
|
||||||
SELECT DISTINCT
|
(select skjs,jgh,kcmc,kcbh,xkrs,kkdw,rwbh,kcxz,zc from kc_kechengbiao where xqxn = #{zyInfoSys.xqxn} and flag = '0' GROUP BY skjs,jgh,kcmc,kcbh,xkrs,kkdw, rwbh,kcxz,zc) b
|
||||||
kcbh,kcmc,kkdw,kcxz,szkc,xqxn, rwbh, skdd, xkrs, jgh,concat(WEEK,REPLACE ( hh, '、', '' )) AS sksj,skjs
|
where a.rwbh = b.rwbh and a.create_by = b.jgh and a.xnxq = #{zyInfoSys.xqxn} and a.zy_status in (1,2)
|
||||||
FROM
|
<if test="zyInfoSys.kcmc != null and zyInfoSys.kcmc != ''">
|
||||||
kc_kechengbiao
|
and a.kcmc like concat('%',#{zyInfoSys.kcmc},'%')
|
||||||
${ew.customSqlSegment}
|
</if>
|
||||||
) t on t.jgh = b.create_by and t.rwbh = b.rwbh and t.xqxn = b.xnxq
|
<if test="zyInfoSys.skjs != null and zyInfoSys.skjs != ''">
|
||||||
GROUP BY kcbh,kcmc,kkdw,kcxz,szkc,xqxn,rwbh,skjs,skdd,xkrs,jgh
|
and b.skjs like concat('%',#{zyInfoSys.skjs},'%')
|
||||||
|
</if>
|
||||||
|
<if test="zyInfoSys.kkdw != null and zyInfoSys.kkdw != ''">
|
||||||
|
and b.kkdw = #{zyInfoSys.kkdw}
|
||||||
|
</if>
|
||||||
|
<if test="zyInfoSys.sfwc != null and zyInfoSys.sfwc != ''">
|
||||||
|
and a.zy_status = #{zyInfoSys.sfwc}
|
||||||
|
</if>
|
||||||
|
<if test="zyInfoSys.sfhp != null and zyInfoSys.sfhp != ''">
|
||||||
|
and a.xshpkg = #{zyInfoSys.sfhp}
|
||||||
|
</if>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
@ -178,4 +188,71 @@
|
||||||
select a.create_by,count(*) as count,b.xm as skjs,b.dwmc as kkdw from wjx_wjxx a,xxhbuser b where a.create_by = b.gh and xqxn = #{zyInfoSys.xqxn} and qpublish in (1,2) GROUP BY a.create_by ,b.xm,b.dwmc
|
select a.create_by,count(*) as count,b.xm as skjs,b.dwmc as kkdw from wjx_wjxx a,xxhbuser b where a.create_by = b.gh and xqxn = #{zyInfoSys.xqxn} and qpublish in (1,2) GROUP BY a.create_by ,b.xm,b.dwmc
|
||||||
) t , (SELECT @rownum:=0) AS r ORDER BY count-0 desc limit 10
|
) t , (SELECT @rownum:=0) AS r ORDER BY count-0 desc limit 10
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<select id="sysStaticZyList" resultType="org.jeecg.modules.kc.zyInfo.entity.ZyInfoSys">
|
||||||
|
select a.*,b.skjs,b.jgh,b.kcmc,b.kcbh,b.xkrs,b.kkdw,b.kcxz,b.zc,a.xnxq as xqxn,
|
||||||
|
IF( a.zy_status = '2', '全部完成', '未全部完成' ) as sfwc,
|
||||||
|
IF( a.zy_status = '0', '未发布', '已发布' ) as sffb,
|
||||||
|
IF( a.xshpkg = '1', '是', '否' ) as sfhp
|
||||||
|
from zy_info a,
|
||||||
|
(select skjs,jgh,kcmc,kcbh,xkrs,kkdw,rwbh,kcxz,zc from kc_kechengbiao where xqxn = #{zyInfoSys.xqxn} and flag = '0' GROUP BY skjs,jgh,kcmc,kcbh,xkrs,kkdw, rwbh,kcxz,zc) b
|
||||||
|
where a.rwbh = b.rwbh and a.create_by = b.jgh and a.xnxq = #{zyInfoSys.xqxn} and a.zy_status in (1,2)
|
||||||
|
<if test="zyInfoSys.kcmc != null and zyInfoSys.kcmc != ''">
|
||||||
|
and a.kcmc like concat('%',#{zyInfoSys.kcmc},'%')
|
||||||
|
</if>
|
||||||
|
<if test="zyInfoSys.skjs != null and zyInfoSys.skjs != ''">
|
||||||
|
and b.skjs like concat('%',#{zyInfoSys.skjs},'%')
|
||||||
|
</if>
|
||||||
|
<if test="zyInfoSys.kkdw != null and zyInfoSys.kkdw != ''">
|
||||||
|
and b.kkdw = #{zyInfoSys.kkdw}
|
||||||
|
</if>
|
||||||
|
<if test="zyInfoSys.sfwc != null and zyInfoSys.sfwc != ''">
|
||||||
|
and a.zy_status = #{zyInfoSys.sfwc}
|
||||||
|
</if>
|
||||||
|
<if test="zyInfoSys.sfhp != null and zyInfoSys.sfhp != ''">
|
||||||
|
and a.xshpkg = #{zyInfoSys.sfhp}
|
||||||
|
</if>
|
||||||
|
</select>
|
||||||
|
<select id="sysStaticCyList" resultType="org.jeecg.modules.kc.zyInfo.entity.CyInfoSys">
|
||||||
|
select a.*,b.skjs,b.jgh,b.kcmc,b.kcbh,b.xkrs,b.kkdw,b.kcxz,b.zc,
|
||||||
|
IF( a.qpublish = '2', '全部完成', '未全部完成' ) as sfwc,
|
||||||
|
IF( a.qpublish = '0', '未发布', '已发布' ) as sffb
|
||||||
|
from wjx_wjxx a,
|
||||||
|
(select skjs,jgh,kcmc,kcbh,xkrs,kkdw,rwbh,kcxz,zc from kc_kechengbiao where xqxn = #{zyInfoSys.xqxn} and flag = '0' GROUP BY skjs,jgh,kcmc,kcbh,xkrs,kkdw, rwbh,kcxz,zc) b
|
||||||
|
where a.rwbh = b.rwbh and a.create_by = b.jgh and a.xqxn = #{zyInfoSys.xqxn} and a.qpublish in (1,2)
|
||||||
|
<if test="zyInfoSys.kcmc != null and zyInfoSys.kcmc != ''">
|
||||||
|
and a.kcmc like concat('%',#{zyInfoSys.kcmc},'%')
|
||||||
|
</if>
|
||||||
|
<if test="zyInfoSys.skjs != null and zyInfoSys.skjs != ''">
|
||||||
|
and b.skjs like concat('%',#{zyInfoSys.skjs},'%')
|
||||||
|
</if>
|
||||||
|
<if test="zyInfoSys.kkdw != null and zyInfoSys.kkdw != ''">
|
||||||
|
and b.kkdw = #{zyInfoSys.kkdw}
|
||||||
|
</if>
|
||||||
|
<if test="zyInfoSys.sfwc != null and zyInfoSys.sfwc != ''">
|
||||||
|
and a.qpublish = #{zyInfoSys.sfwc}
|
||||||
|
</if>
|
||||||
|
</select>
|
||||||
|
<select id="getStaticCyExportUrl" resultType="org.jeecg.modules.kc.zyInfo.entity.CyInfoSys">
|
||||||
|
select a.*,b.skjs,b.jgh,b.kcmc,b.kcbh,b.xkrs,b.kkdw,b.kcxz,b.zc,
|
||||||
|
IF( a.qpublish = '2', '全部完成', '未全部完成' ) as sfwc,
|
||||||
|
IF( a.qpublish = '0', '未发布', '已发布' ) as sffb
|
||||||
|
from wjx_wjxx a,
|
||||||
|
(select skjs,jgh,kcmc,kcbh,xkrs,kkdw,rwbh,kcxz,zc from kc_kechengbiao where xqxn = #{zyInfoSys.xqxn} and flag = '0' GROUP BY skjs,jgh,kcmc,kcbh,xkrs,kkdw, rwbh,kcxz,zc) b
|
||||||
|
where a.rwbh = b.rwbh and a.create_by = b.jgh and a.xqxn = #{zyInfoSys.xqxn} and a.qpublish in (1,2)
|
||||||
|
<if test="zyInfoSys.kcmc != null and zyInfoSys.kcmc != ''">
|
||||||
|
and a.kcmc like concat('%',#{zyInfoSys.kcmc},'%')
|
||||||
|
</if>
|
||||||
|
<if test="zyInfoSys.skjs != null and zyInfoSys.skjs != ''">
|
||||||
|
and b.skjs like concat('%',#{zyInfoSys.skjs},'%')
|
||||||
|
</if>
|
||||||
|
<if test="zyInfoSys.kkdw != null and zyInfoSys.kkdw != ''">
|
||||||
|
and b.kkdw = #{zyInfoSys.kkdw}
|
||||||
|
</if>
|
||||||
|
<if test="zyInfoSys.sfwc != null and zyInfoSys.sfwc != ''">
|
||||||
|
and a.qpublish = #{zyInfoSys.sfwc}
|
||||||
|
</if>
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
|
@ -3,6 +3,7 @@ package org.jeecg.modules.kc.zyInfo.service;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import org.jeecg.modules.kc.zyInfo.entity.CyInfoSys;
|
||||||
import org.jeecg.modules.kc.zyInfo.entity.ZyInfo;
|
import org.jeecg.modules.kc.zyInfo.entity.ZyInfo;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import org.jeecg.modules.kc.zyInfo.entity.ZyInfoSys;
|
import org.jeecg.modules.kc.zyInfo.entity.ZyInfoSys;
|
||||||
|
@ -22,7 +23,7 @@ public interface IZyInfoService extends IService<ZyInfo> {
|
||||||
|
|
||||||
IPage<ZyInfoSys> sysList(Page<ZyInfoSys> page, QueryWrapper<ZyInfoSys> queryWrapper);
|
IPage<ZyInfoSys> sysList(Page<ZyInfoSys> page, QueryWrapper<ZyInfoSys> queryWrapper);
|
||||||
|
|
||||||
List<ZyInfoSys> exportSysXls(QueryWrapper<ZyInfoSys> queryWrapper);
|
List<ZyInfoSys> exportSysXls(ZyInfoSys zyInfoSys);
|
||||||
|
|
||||||
ZyInfo getKechengById(String id);
|
ZyInfo getKechengById(String id);
|
||||||
|
|
||||||
|
@ -35,4 +36,10 @@ public interface IZyInfoService extends IService<ZyInfo> {
|
||||||
IPage<ZyInfo> listOther(Page<ZyInfo> page, ZyInfo zyInfo);
|
IPage<ZyInfo> listOther(Page<ZyInfo> page, ZyInfo zyInfo);
|
||||||
|
|
||||||
Map<String,Object> sysStaticNo(ZyInfoSys zyInfoSys);
|
Map<String,Object> sysStaticNo(ZyInfoSys zyInfoSys);
|
||||||
|
|
||||||
|
IPage<ZyInfoSys> sysStaticZyList(Page<ZyInfoSys> page, ZyInfoSys zyInfoSys);
|
||||||
|
|
||||||
|
IPage<CyInfoSys> sysStaticCyList(Page<CyInfoSys> page, CyInfoSys cyInfoSys);
|
||||||
|
|
||||||
|
List<CyInfoSys> getStaticCyExportUrl(CyInfoSys cyInfoSys);
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,7 @@ import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao;
|
||||||
import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService;
|
import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService;
|
||||||
import org.jeecg.modules.kc.zyDbtx.entity.ZyDbtx;
|
import org.jeecg.modules.kc.zyDbtx.entity.ZyDbtx;
|
||||||
import org.jeecg.modules.kc.zyDbtx.service.IZyDbtxService;
|
import org.jeecg.modules.kc.zyDbtx.service.IZyDbtxService;
|
||||||
|
import org.jeecg.modules.kc.zyInfo.entity.CyInfoSys;
|
||||||
import org.jeecg.modules.kc.zyInfo.entity.ZyInfo;
|
import org.jeecg.modules.kc.zyInfo.entity.ZyInfo;
|
||||||
import org.jeecg.modules.kc.zyInfo.entity.ZyInfoSys;
|
import org.jeecg.modules.kc.zyInfo.entity.ZyInfoSys;
|
||||||
import org.jeecg.modules.kc.zyInfo.mapper.ZyInfoMapper;
|
import org.jeecg.modules.kc.zyInfo.mapper.ZyInfoMapper;
|
||||||
|
@ -56,8 +57,8 @@ public class ZyInfoServiceImpl extends ServiceImpl<ZyInfoMapper, ZyInfo> impleme
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ZyInfoSys> exportSysXls(QueryWrapper<ZyInfoSys> queryWrapper) {
|
public List<ZyInfoSys> exportSysXls(ZyInfoSys zyInfoSys) {
|
||||||
return baseMapper.exportSysXls(queryWrapper);
|
return baseMapper.exportSysXls(zyInfoSys);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -223,6 +224,21 @@ public class ZyInfoServiceImpl extends ServiceImpl<ZyInfoMapper, ZyInfo> impleme
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IPage<ZyInfoSys> sysStaticZyList(Page<ZyInfoSys> page, ZyInfoSys zyInfoSys) {
|
||||||
|
return baseMapper.sysStaticZyList(page,zyInfoSys);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IPage<CyInfoSys> sysStaticCyList(Page<CyInfoSys> page, CyInfoSys cyInfoSys) {
|
||||||
|
return baseMapper.sysStaticCyList(page,cyInfoSys);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<CyInfoSys> getStaticCyExportUrl(CyInfoSys cyInfoSys) {
|
||||||
|
return baseMapper.getStaticCyExportUrl(cyInfoSys);
|
||||||
|
}
|
||||||
|
|
||||||
// appId
|
// appId
|
||||||
private static final String appId = "wx031697a8ca09a5ce";//东师
|
private static final String appId = "wx031697a8ca09a5ce";//东师
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue