yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2023-07-20 22:49:18 +08:00
parent ae90f8cc9b
commit 4af5d4578a
7 changed files with 68 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java
View File

@ -226,7 +226,7 @@ public class KcZzThpjbController extends JeecgController<KcZzThpjb, IKcZzThpjbSe
for(int i=0;i<list.size();i++){
KcZzThpjb KcZzThpjbPar = list.get(i);
QueryWrapper<KcZzThpjb> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("kcbh",KcZzThpjbPar.getKcbh());
// queryWrapper.eq("kcbh",KcZzThpjbPar.getKcbh());
queryWrapper.eq("kcmc",KcZzThpjbPar.getKcmc());
queryWrapper.eq("skjs",KcZzThpjbPar.getSkjs());
queryWrapper.eq("skdd",KcZzThpjbPar.getSkdd());
@ -240,7 +240,7 @@ public class KcZzThpjbController extends JeecgController<KcZzThpjb, IKcZzThpjbSe
errorRest += "已经导入（重复数据）："+KcZzThpjbPar.getKcbh()+"-"+KcZzThpjbPar.getKcmc()+"-"+KcZzThpjbPar.getSkjs()+"-"+KcZzThpjbPar.getSkdd()+"-"+"<br/>";
}else{
QueryWrapper<KcKetangbiao> kcKetangbiaoQueryWrapper = new QueryWrapper<>();
kcKetangbiaoQueryWrapper.eq("kcbh",KcZzThpjbPar.getKcbh());
// kcKetangbiaoQueryWrapper.eq("kcbh",KcZzThpjbPar.getKcbh());
kcKetangbiaoQueryWrapper.eq("kcmc",KcZzThpjbPar.getKcmc());
kcKetangbiaoQueryWrapper.eq("skjs",KcZzThpjbPar.getSkjs());
kcKetangbiaoQueryWrapper.eq("skdd",KcZzThpjbPar.getSkdd());

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java
View File

@ -209,7 +209,7 @@ public class KcZzXstkbController extends JeecgController<KcZzXstkb, IKcZzXstkbSe
for(int i=0;i<list.size();i++){
KcZzXstkb KcZzXstkbPar = list.get(i);
QueryWrapper<KcZzXstkb> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("kcbh",KcZzXstkbPar.getKcbh());
// queryWrapper.eq("kcbh",KcZzXstkbPar.getKcbh());
queryWrapper.eq("kcmc",KcZzXstkbPar.getKcmc());
queryWrapper.eq("skjs",KcZzXstkbPar.getSkjs());
queryWrapper.eq("skdd",KcZzXstkbPar.getSkdd());
@ -223,7 +223,7 @@ public class KcZzXstkbController extends JeecgController<KcZzXstkb, IKcZzXstkbSe
errorRest += "已经导入（重复数据）："+KcZzXstkbPar.getKcbh()+"-"+KcZzXstkbPar.getKcmc()+"-"+KcZzXstkbPar.getSkjs()+"-"+KcZzXstkbPar.getSkdd()+"-"+KcZzXstkbPar.getTkjsgh()+"-"+KcZzXstkbPar.getTkjsxm()+"<br/>";
}else{
QueryWrapper<KcKetangbiao> kcKetangbiaoQueryWrapper = new QueryWrapper<>();
kcKetangbiaoQueryWrapper.eq("kcbh",KcZzXstkbPar.getKcbh());
// kcKetangbiaoQueryWrapper.eq("kcbh",KcZzXstkbPar.getKcbh());
kcKetangbiaoQueryWrapper.eq("kcmc",KcZzXstkbPar.getKcmc());
kcKetangbiaoQueryWrapper.eq("skdd",KcZzXstkbPar.getSkdd());
kcKetangbiaoQueryWrapper.like("skrq", DateUtil.format(KcZzXstkbPar.getSksj(),"yyyy-MM-dd"));

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java
View File

@ -227,7 +227,7 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
for(int i=0;i<list.size();i++){
KcZzYbtkb KcZzYbtkbPar = list.get(i);
QueryWrapper<KcZzYbtkb> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("kcbh",KcZzYbtkbPar.getKcbh());
// queryWrapper.eq("kcbh",KcZzYbtkbPar.getKcbh());
queryWrapper.eq("kcmc",KcZzYbtkbPar.getKcmc());
queryWrapper.eq("skjs",KcZzYbtkbPar.getSkjs());
queryWrapper.eq("skdd",KcZzYbtkbPar.getSkdd());
@ -241,7 +241,7 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
errorRest += "已经导入（重复数据）："+KcZzYbtkbPar.getKcmc()+"-"+KcZzYbtkbPar.getSkjs()+"-"+KcZzYbtkbPar.getSkdd()+"-"+KcZzYbtkbPar.getTkjsbh()+"-"+KcZzYbtkbPar.getTkjsxm()+"<br/>";
}else{
QueryWrapper<KcKetangbiao> kcKetangbiaoQueryWrapper = new QueryWrapper<>();
kcKetangbiaoQueryWrapper.eq("kcbh",KcZzYbtkbPar.getKcbh());
// kcKetangbiaoQueryWrapper.eq("kcbh",KcZzYbtkbPar.getKcbh());
kcKetangbiaoQueryWrapper.eq("kcmc",KcZzYbtkbPar.getKcmc());
kcKetangbiaoQueryWrapper.eq("skdd",KcZzYbtkbPar.getSkdd());
kcKetangbiaoQueryWrapper.eq("skrq",DateUtil.format(KcZzYbtkbPar.getSkrq(),"yyyy-MM-dd"));

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java
View File

@ -93,9 +93,10 @@ public class KcKechengbiaoController extends JeecgController<KcKechengbiao, IKcK
HttpServletRequest req) {
QueryWrapper<KcKechengbiao> queryWrapper = QueryGenerator.initQueryWrapper("a",kcKechengbiao, req.getParameterMap());
if(StringUtils.isNotBlank(kcKechengbiao.getSearchInput())){
queryWrapper.apply(String.format("(kcmc like CONCAT('%',%s,'%') or skjs like CONCAT('%',%s,'%'))",kcKechengbiao.getSearchInput()));
queryWrapper.like("kcmc",kcKechengbiao.getSearchInput());
// queryWrapper.apply("(kcmc like CONCAT('%','"+kcKechengbiao.getSearchInput()+"','%') or skjs like CONCAT('%','"+kcKechengbiao.getSearchInput()+"','%'))");
}
queryWrapper.apply(StringUtils.isNotBlank(kcKechengbiao.getYwcol())," length(kcbh)<25");
// queryWrapper.apply(StringUtils.isNotBlank(kcKechengbiao.getYwcol())," length(kcbh)<25");
Page<KcKechengbiao> page = new Page<KcKechengbiao>(pageNo, pageSize);
IPage<KcKechengbiao> pageList = kcKechengbiaoService.listGroupBy(page, queryWrapper);
return Result.OK(pageList);

24
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java
View File

@ -341,12 +341,18 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
*/
@ApiOperation(value="课堂管理-子表-已开课堂总数详情", notes="课堂管理-子表-已开课堂总数详情")
@GetMapping(value = "/ykktzsList")
public Result<?> ykktzsList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) {
public Result<?> ykktzsList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
String skrq,String kkdw,String hh,String kcxz,String ywTime,String ywmc) {
//查询第三句-已开课堂总数
QueryWrapper qw3 = new QueryWrapper();
qw3.select("*");
qw3.ge("skrq",getBxqStartTime());//<=
qw3.le("skrq",skrq);//>=
qw3.eq(StringUtils.isNotBlank(kkdw),"kkdw",kkdw);
qw3.eq(StringUtils.isNotBlank(hh),"hh",hh);
qw3.eq(StringUtils.isNotBlank(kcxz),"kcxz",kcxz);
qw3.eq(StringUtils.isNotBlank(ywTime),"skrq",ywTime);
qw3.apply(StringUtils.isNotBlank(ywmc),"(skjs like '%"+ywmc+"%' or kcmc like '%"+ywmc+"%') ");
Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
IPage<Map<String, Object>> kcKetangbiao3List = kcKetangbiaoService.pageMaps(page,qw3);
return Result.OK(kcKetangbiao3List);
@ -360,11 +366,17 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
*/
@ApiOperation(value="课堂管理-子表-已开课堂听课课堂详情", notes="课堂管理-子表-已开课堂听课课堂详情")
@GetMapping(value = "/ykkttkktList")
public Result<?> ykkttkktList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) {
public Result<?> ykkttkktList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
String skrq,String kkdw,String hh,String kcxz,String ywTime,String ywmc) {
//查询第三句-已开课堂听课课堂
KcKetangbiao kcKetangbiao = new KcKetangbiao();
kcKetangbiao.setStartTime(getBxqStartTime());
kcKetangbiao.setEndTime(skrq);
kcKetangbiao.setKkdw(kkdw);
kcKetangbiao.setHh(hh);
kcKetangbiao.setKcxz(kcxz);
kcKetangbiao.setYwmc(ywmc);
kcKetangbiao.setYwTime(ywTime);
Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
IPage<Map<String, Object>> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkktList(page,kcKetangbiao);
return Result.OK(listTjIndex);
@ -378,11 +390,17 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
*/
@ApiOperation(value="课堂管理-子表-已开课堂听课课堂详情", notes="课堂管理-子表-已开课堂听课课堂详情")
@GetMapping(value = "/ykkttkrcList")
public Result<?> ykkttkrcList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) {
public Result<?> ykkttkrcList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
String skrq,String kkdw,String hh,String kcxz,String ywTime,String ywmc) {
//查询第三句-已开课堂听课课堂
KcKetangbiao kcKetangbiao = new KcKetangbiao();
kcKetangbiao.setStartTime(getBxqStartTime());
kcKetangbiao.setEndTime(skrq);
kcKetangbiao.setKkdw(kkdw);
kcKetangbiao.setHh(hh);
kcKetangbiao.setKcxz(kcxz);
kcKetangbiao.setYwmc(ywmc);
kcKetangbiao.setYwTime(ywTime);
Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
IPage<Map<String, Object>> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkrcList(page,kcKetangbiao);
return Result.OK(listTjIndex);

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java
View File

@ -256,6 +256,8 @@ public class KcKetangbiao implements Serializable {
@TableField(exist = false)
private java.lang.String ywmc;
@TableField(exist = false)
private java.lang.String ywTime;
@TableField(exist = false)
private java.lang.String ywskxs;
@TableField(exist = false)
private java.lang.String sfyy;
@ -283,5 +285,7 @@ public class KcKetangbiao implements Serializable {
private String sfyzhjs;
@TableField(exist = false)
private String jzwh;
@TableField(exist = false)
private String szkc;
}

35
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml
View File

@ -35,13 +35,14 @@
<select id="getKclblist" parameterType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao" resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao">
select ktb.*,if(yy.id is null,0,1) as sfyy,yy.isdeleted, case when js.jsbh is NULL then 0 else 1 end sfyzhjs,
if(jc.hhjs is null,'00:00:00',concat(substr(jc.hhjs,1,2),':',substr(jc.hhjs,3,4),':00')) as jssj
if(jc.hhjs is null,'00:00:00',concat(substr(jc.hhjs,1,2),':',substr(jc.hhjs,3,4),':00')) as jssj,kcb.szkc
from kc_ketangbiao ktb
left join (select * from kc_yuyue where userid = #{kcKetangbiao.userid}) yy on ktb.id = yy.ketangbiaoid
LEFT JOIN (SELECT DISTINCT jsbh, jsmc from kc_zhihuijiaoshi where sfyx=0) js on ktb.jsbh = js.jsbh
left join xxhbjsjbxx jsjbxx on jsjbxx.jsh = js.jsbh
left join xxhbjxljbxx jxljbxx on jsjbxx.jxlh = jxljbxx.jzwh
left join kc_jieci jc on ktb.hh = jc.jieci
left join kc_kechengbiao kcb on kcb.kcmc = ktb.kcmc and kcb.kcxz = ktb.kcxz and kcb.skjs = ktb.skjs and kcb.skdd=ktb.skdd and kcb.kkdw = ktb.kkdw and kcb.kcbh = ktb.kcbh and kcb.id = ktb.kechengbiaoid
<where>
and ktb.is_delete = 0
<if test="kcKetangbiao.ywmc!=null and kcKetangbiao.ywmc!=''">
@ -151,6 +152,24 @@
<if test="et.endTime != '' and et.endTime != null">
AND skrq &lt;= #{et.endTime}
</if>
<if test="et.kkdw != '' and et.kkdw != null">
AND k.kkdw = #{et.kkdw}
</if>
<if test="et.hh != '' and et.hh != null">
AND k.hh = #{et.hh}
</if>
<if test="et.kcxz != '' and et.kcxz != null">
AND k.kcxz = #{et.kcxz}
</if>
<if test="et.ywTime != '' and et.ywTime != null">
AND k.skrq = #{et.ywTime}
</if>
<if test="et.ywmc != '' and et.ywmc != null">
AND (k.skjs like concat('%',#{et.ywmc},'%') or k.kcmc like concat('%',#{et.ywmc},'%'))
</if>
</select>
<select id="getIndexYkktstjYkkttkrcList" resultType="java.util.Map">
@ -163,6 +182,20 @@
</if>
<if test="et.endTime != '' and et.endTime != null">
AND skrq &lt;= #{et.endTime}
</if><if test="et.kkdw != '' and et.kkdw != null">
AND k.kkdw = #{et.kkdw}
</if>
<if test="et.hh != '' and et.hh != null">
AND k.hh = #{et.hh}
</if>
<if test="et.kcxz != '' and et.kcxz != null">
AND k.kcxz = #{et.kcxz}
</if>
<if test="et.ywTime != '' and et.ywTime != null">
AND k.skrq = #{et.ywTime}
</if>
<if test="et.ywmc != '' and et.ywmc != null">
AND (k.skjs like concat('%',#{et.ywmc},'%') or k.kcmc like concat('%',#{et.ywmc},'%'))
</if>
</select>