修改bug
This commit is contained in:
parent
f7b644ecae
commit
52361b0606
|
@ -9,7 +9,7 @@
|
||||||
WHERE ev.id = evs.evaluationid
|
WHERE ev.id = evs.evaluationid
|
||||||
AND ev.evaluationver = '3'
|
AND ev.evaluationver = '3'
|
||||||
and ev.source != '2'
|
and ev.source != '2'
|
||||||
and ev.up_date > '2024-02-01'
|
<!-- and ev.up_date > '2024-02-01'-->
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getYbtkbTwoSyncList" resultType="org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat">
|
<select id="getYbtkbTwoSyncList" resultType="org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat">
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
WHERE ev.id = evs.evaluationid
|
WHERE ev.id = evs.evaluationid
|
||||||
AND ev.evaluationver = '3'
|
AND ev.evaluationver = '3'
|
||||||
and ev.source = '2'
|
and ev.source = '2'
|
||||||
and ev.up_date > '2024-02-01'
|
<!-- and ev.up_date > '2024-02-01'-->
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getXstkbSyncList" resultType="org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat">
|
<select id="getXstkbSyncList" resultType="org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat">
|
||||||
|
|
|
@ -170,6 +170,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
||||||
}
|
}
|
||||||
queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')");
|
queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')");
|
||||||
queryWrapper.ne(StringUtils.isNotBlank(kcKetangbiao.getYwskxs()),"skxs",kcKetangbiao.getYwskxs());
|
queryWrapper.ne(StringUtils.isNotBlank(kcKetangbiao.getYwskxs()),"skxs",kcKetangbiao.getYwskxs());
|
||||||
|
queryWrapper.orderByDesc("skrq");
|
||||||
Page<KcKetangbiao> page = new Page<KcKetangbiao>(pageNo, pageSize);
|
Page<KcKetangbiao> page = new Page<KcKetangbiao>(pageNo, pageSize);
|
||||||
|
|
||||||
Set<String> idSet = Sets.newHashSet();
|
Set<String> idSet = Sets.newHashSet();
|
||||||
|
@ -231,7 +232,6 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加
|
* 添加
|
||||||
*
|
*
|
||||||
|
|
|
@ -71,4 +71,5 @@ public interface KcKetangbiaoMapper extends BaseMapper<KcKetangbiao> {
|
||||||
IPage<Map<String, Object>> getKccountList(Page<Map<String, Object>> page, @Param(Constants.ENTITY) KcKetangbiao kcKetangbiao);
|
IPage<Map<String, Object>> getKccountList(Page<Map<String, Object>> page, @Param(Constants.ENTITY) KcKetangbiao kcKetangbiao);
|
||||||
|
|
||||||
List<KcKetangbiaoNum> getKccountExportList(KcKetangbiaoNum kcKetangbiao);
|
List<KcKetangbiaoNum> getKccountExportList(KcKetangbiaoNum kcKetangbiao);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -582,7 +582,7 @@
|
||||||
fen.avgscore as jspjPjf
|
fen.avgscore as jspjPjf
|
||||||
from
|
from
|
||||||
kc_ketangbiao a
|
kc_ketangbiao a
|
||||||
left join zongtipingjiapingjunfen fen on fen.kechengbiaoid = a.kechengbiaoid
|
inner join zongtipingjiapingjunfen fen on fen.kechengbiaoid = a.kechengbiaoid
|
||||||
${ew.customSqlSegment}
|
${ew.customSqlSegment}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
|
@ -73,4 +73,5 @@ public interface IKcKetangbiaoService extends IService<KcKetangbiao> {
|
||||||
IPage<Map<String, Object>> getKccountList(Page<Map<String, Object>> page, KcKetangbiao kcKetangbiao);
|
IPage<Map<String, Object>> getKccountList(Page<Map<String, Object>> page, KcKetangbiao kcKetangbiao);
|
||||||
|
|
||||||
List<KcKetangbiaoNum> getKccountExportList(KcKetangbiaoNum object);
|
List<KcKetangbiaoNum> getKccountExportList(KcKetangbiaoNum object);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -185,4 +185,5 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl<KcKetangbiaoMapper, KcK
|
||||||
public List<KcKetangbiaoNum> getKccountExportList(KcKetangbiaoNum object) {
|
public List<KcKetangbiaoNum> getKccountExportList(KcKetangbiaoNum object) {
|
||||||
return baseMapper.getKccountExportList(object);
|
return baseMapper.getKccountExportList(object);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -79,7 +79,7 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
||||||
@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<ZyInfoStudent> queryWrapper = QueryGenerator.initQueryWrapper(zyInfoStudent, req.getParameterMap());
|
QueryWrapper<ZyInfoStudent> queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfoStudent, req.getParameterMap());
|
||||||
Page<ZyInfoStudent> page = new Page<ZyInfoStudent>(pageNo, pageSize);
|
Page<ZyInfoStudent> page = new Page<ZyInfoStudent>(pageNo, pageSize);
|
||||||
IPage<ZyInfoStudent> pageList = zyInfoStudentService.page(page, queryWrapper);
|
IPage<ZyInfoStudent> pageList = zyInfoStudentService.page(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
|
|
|
@ -91,5 +91,11 @@ public class ZyInfoStudent implements Serializable {
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String cateid;
|
private String cateid;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String wwcc;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String nwcc;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String aigccc;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,4 +5,9 @@
|
||||||
<delete id="deleteMainId">
|
<delete id="deleteMainId">
|
||||||
delete from zy_info_student where main_id = #{mainId}
|
delete from zy_info_student where main_id = #{mainId}
|
||||||
</delete>
|
</delete>
|
||||||
|
<select id="selectPage" resultType="org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent">
|
||||||
|
select a.*,b.wwcc,b.nwcc,b.aigccc from zy_info_student a
|
||||||
|
left join zy_info b on a.main_id = b.id
|
||||||
|
${ew.customSqlSegment}
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
|
@ -123,7 +123,7 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
|
||||||
|
|
||||||
}
|
}
|
||||||
zyJxdgService.save(zyJxdg);
|
zyJxdgService.save(zyJxdg);
|
||||||
return Result.OK("添加成功!");
|
return Result.OK("提交成功!");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -185,7 +185,7 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
|
||||||
}
|
}
|
||||||
update.eq("id",zyJxdg.getId());
|
update.eq("id",zyJxdg.getId());
|
||||||
zyJxdgService.update(update);
|
zyJxdgService.update(update);
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK("提交成功!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -114,7 +114,7 @@ public class CommonController {
|
||||||
savePath = this.uploadLocal(file,bizPath);
|
savePath = this.uploadLocal(file,bizPath);
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
}if(CommonConstant.UPLOAD_TYPE_SFTP.equals(uploadType)) {
|
}else if(CommonConstant.UPLOAD_TYPE_SFTP.equals(uploadType)) {
|
||||||
FileTypeFilter.fileTypeFilter(file);
|
FileTypeFilter.fileTypeFilter(file);
|
||||||
savePath = this.uploadSftp(file,bizPath);
|
savePath = this.uploadSftp(file,bizPath);
|
||||||
}else{
|
}else{
|
||||||
|
|
Loading…
Reference in New Issue