2023年6月20日 修复评课 足迹
This commit is contained in:
parent
afe964bc25
commit
873e0e3179
|
@ -65,6 +65,7 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
|
|||
|
||||
@Value("${jeecg.path.upload}")
|
||||
private String upLoadPath;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
|
@ -395,5 +396,29 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
|
|||
return mv;
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param kcEvaluation
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "调查问卷-回答主表-分页列表查询")
|
||||
@ApiOperation(value="调查问卷-回答主表-分页列表查询", notes="调查问卷-回答主表-分页列表查询")
|
||||
@GetMapping(value = "/queryPkZuJiList")
|
||||
public Result<IPage<KcEvaluation>> queryPkZuJiList(KcEvaluation kcEvaluation,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<KcEvaluation> queryWrapper = QueryGenerator.initQueryWrapper("a",kcEvaluation, req.getParameterMap());
|
||||
queryWrapper.eq("eq.genre",0);
|
||||
// queryWrapper.eq("a.upuserid",);
|
||||
queryWrapper.orderByDesc("a.up_timestamp");
|
||||
Page<KcEvaluation> page = new Page<KcEvaluation>(pageNo, pageSize);
|
||||
IPage<KcEvaluation> pageList = kcEvaluationService.queryPkZuJiPage(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -328,7 +328,19 @@ public class KcEvaluation implements Serializable {
|
|||
@TableField(exist = false)
|
||||
private String xqxn;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String evaluationid;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String ketangbiaoid;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String score;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String tkrq;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String shijian;
|
||||
|
||||
}
|
||||
|
|
|
@ -37,4 +37,6 @@ public interface KcEvaluationMapper extends BaseMapper<KcEvaluation> {
|
|||
List<KcEvaluationVo> selectPageAndKcmc(Page<KcEvaluationVo> page, @Param(Constants.WRAPPER) QueryWrapper<KcEvaluationVo> queryWrapper);
|
||||
|
||||
List<KcEvaluationVo2> selectPageAndKcmc2(Page<KcEvaluationVo2> page, @Param(Constants.WRAPPER) QueryWrapper<KcEvaluationVo2> queryWrapper);
|
||||
|
||||
List<KcEvaluation> queryPkZuJiPage(Page<KcEvaluation> page, @Param(Constants.WRAPPER) QueryWrapper<KcEvaluation> queryWrapper);
|
||||
}
|
||||
|
|
|
@ -441,5 +441,27 @@
|
|||
left join zongtipingjiapingjunfen fen on fen.kechengbiaoid = kt.kechengbiaoid
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
<select id="queryPkZuJiPage" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation">
|
||||
SELECT
|
||||
a.upuserid,
|
||||
ifnull(DATE_FORMAT( a.up_timestamp, '%Y-%m-%d' ),'') tkrq,
|
||||
DATE_FORMAT( a.up_timestamp, '%H:%i:%s' ) AS shijian,
|
||||
a.id AS evaluationid,
|
||||
a.evaluationver,
|
||||
evs.ketangbiaoid,
|
||||
ea.score,
|
||||
a.source,
|
||||
a.minkcid,
|
||||
kt.kcmc,
|
||||
kt.skjs,
|
||||
kt.kkdw
|
||||
FROM
|
||||
kc_evaluation a
|
||||
join kc_evaluations evs on a.id = evs.evaluationid
|
||||
join kc_evaluationque eq on eq.evaluationver = a.evaluationver and evs.queid = eq.id
|
||||
join kc_evaluationans ea on ea.id = evs.ansid and ea.queid = eq.id
|
||||
left join kc_ketangbiao kt on kt.id = a.minkcid
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
|
@ -38,4 +38,6 @@ public interface IKcEvaluationService extends IService<KcEvaluation> {
|
|||
IPage<KcEvaluationVo> selectPageAndKcmc(Page<KcEvaluationVo> page, QueryWrapper<KcEvaluationVo> queryWrapper);
|
||||
|
||||
IPage<KcEvaluationVo2> selectPageAndKcmc2(Page<KcEvaluationVo2> page, QueryWrapper<KcEvaluationVo2> queryWrapper);
|
||||
|
||||
IPage<KcEvaluation> queryPkZuJiPage(Page<KcEvaluation> page, QueryWrapper<KcEvaluation> queryWrapper);
|
||||
}
|
||||
|
|
|
@ -123,4 +123,9 @@ public class KcEvaluationServiceImpl extends ServiceImpl<KcEvaluationMapper, KcE
|
|||
return page.setRecords(baseMapper.selectPageAndKcmc2(page,queryWrapper));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IPage<KcEvaluation> queryPkZuJiPage(Page<KcEvaluation> page, QueryWrapper<KcEvaluation> queryWrapper) {
|
||||
return page.setRecords(baseMapper.queryPkZuJiPage(page,queryWrapper));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue