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

修改学期学年展示

This commit is contained in:
yangjun 2023-07-28 23:03:57 +08:00
parent a5f174eac9
commit 4927809cc5
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZwdtEvaluation.java
View File

@ -234,7 +234,7 @@ public class SyncZwdtEvaluation extends BaseSync {
inQw.in("xspg2","A", "B", "C", "D", "E"); inQw.in("xspg2","A", "B", "C", "D", "E");
inQw.in("xspg3","A", "B", "C", "D", "E"); inQw.in("xspg3","A", "B", "C", "D", "E");
inQw.in("ztpj", "A", "B", "C", "D", "E"); inQw.in("ztpj", "A", "B", "C", "D", "E");
inQw.last("limit 100");
List<Xxhbbkjxtkpj> inDataList = xxhbbkjxtkpjService.list(inQw); List<Xxhbbkjxtkpj> inDataList = xxhbbkjxtkpjService.list(inQw);
List<KcEvaluation> saveMainList = Lists.newArrayList(); List<KcEvaluation> saveMainList = Lists.newArrayList();
@ -314,6 +314,7 @@ public class SyncZwdtEvaluation extends BaseSync {
log.error("错误的课题"); log.error("错误的课题");
//存新表里面 //存新表里面
XxhbbkjxtkpjBadLog bedLog = BeanUtil.toBean(x, XxhbbkjxtkpjBadLog.class); XxhbbkjxtkpjBadLog bedLog = BeanUtil.toBean(x, XxhbbkjxtkpjBadLog.class);
bedLog.setSkrq(DateUtil.format(main.getUpDate(), DatePattern.PURE_DATE_FORMAT));
//bedLog.setTimestamps(DateUtil.format(x.getTimestamps(), DatePattern.NORM_DATETIME_PATTERN)); //bedLog.setTimestamps(DateUtil.format(x.getTimestamps(), DatePattern.NORM_DATETIME_PATTERN));
//outDataList.add(BeanUtil.toBean(x, XxhbbkjxtkpjBadLog.class)); //outDataList.add(BeanUtil.toBean(x, XxhbbkjxtkpjBadLog.class));
saveXxhbbkjxtkpjBadLogList.add(bedLog); saveXxhbbkjxtkpjBadLogList.add(bedLog);

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbbkjxtkpjBadLogController.java
View File

@ -3,6 +3,8 @@ package org.jeecg.modules.kc.grab.imports.controller;
import java.util.Arrays; import java.util.Arrays;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.kc.grab.imports.entity.XxhbbkjxtkpjBadLog; import org.jeecg.modules.kc.grab.imports.entity.XxhbbkjxtkpjBadLog;
@ -52,7 +54,8 @@ public class XxhbbkjxtkpjBadLogController extends JeecgController<XxhbbkjxtkpjBa
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<XxhbbkjxtkpjBadLog> queryWrapper = QueryGenerator.initQueryWrapper(xxhbbkjxtkpjBadLog, req.getParameterMap()); QueryWrapper<XxhbbkjxtkpjBadLog> queryWrapper = QueryGenerator.initQueryWrapper("a",xxhbbkjxtkpjBadLog, req.getParameterMap());
queryWrapper.eq(StringUtils.isNotBlank(xxhbbkjxtkpjBadLog.getXqxn()),"b.title",xxhbbkjxtkpjBadLog.getXqxn());
Page<XxhbbkjxtkpjBadLog> page = new Page<XxhbbkjxtkpjBadLog>(pageNo, pageSize); Page<XxhbbkjxtkpjBadLog> page = new Page<XxhbbkjxtkpjBadLog>(pageNo, pageSize);
IPage<XxhbbkjxtkpjBadLog> pageList = xxhbbkjxtkpjBadLogService.page(page, queryWrapper); IPage<XxhbbkjxtkpjBadLog> pageList = xxhbbkjxtkpjBadLogService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);

12
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/XxhbbkjxtkpjBadLog.java
View File

@ -4,10 +4,8 @@ import java.io.Serializable;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -161,4 +159,10 @@ public class XxhbbkjxtkpjBadLog implements Serializable {
@Excel(name = "课表编号", width = 15) @Excel(name = "课表编号", width = 15)
@ApiModelProperty(value = "课表编号") @ApiModelProperty(value = "课表编号")
private java.lang.String kbbh; private java.lang.String kbbh;
private String skrq;
@TableField(exist = false)
private String xqxn;
} }

6
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbkjxtkpjBadLogMapper.xml
View File

@ -2,4 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.kc.grab.imports.mapper.XxhbbkjxtkpjBadLogMapper"> <mapper namespace="org.jeecg.modules.kc.grab.imports.mapper.XxhbbkjxtkpjBadLogMapper">
<select id="selectPage" resultType="org.jeecg.modules.kc.grab.imports.entity.XxhbbkjxtkpjBadLog">
select a.*,b.title as xqxn from xxhbbkjxtkpj_bad_log a
LEFT JOIN kc_xqxn_history b on a.SKRQ >= b.start_time + '' and a.SKRQ &lt;= b.end_time +''
${ew.customSqlSegment}
</select>
</mapper> </mapper>