新增切换账号功能,修改评价表导出错误的问题
This commit is contained in:
parent
2e59c4b011
commit
750b4a70c1
|
@ -29,7 +29,7 @@ public class testController extends JeecgController<TBks, ITBksService> {
|
||||||
@ApiOperation(value="T_BKS-抓取-通过id查询", notes="T_BKS-抓取-通过id查询")
|
@ApiOperation(value="T_BKS-抓取-通过id查询", notes="T_BKS-抓取-通过id查询")
|
||||||
@GetMapping(value = "/testPDF")
|
@GetMapping(value = "/testPDF")
|
||||||
public Result<?> runAvyApiByIds(String ids,String type){
|
public Result<?> runAvyApiByIds(String ids,String type){
|
||||||
PDFUtil.office2PDF("D:\\opt\\upFiles\\temp\\新版VPN使用说明2_1728432595957.docx","D:\\opt\\upFiles\\temp\\111b.pdf");
|
PDFUtil.office2PDF("D:\\opt\\upFiles\\temp\\A学校教师教学体验调研报告2023年1_1720062188727.doc","D:\\opt\\upFiles\\temp\\111b.pdf");
|
||||||
return Result.OK();
|
return Result.OK();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -520,7 +520,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
|
||||||
kcEvaluationQueryWrapper.eq("xqxn",object.getXqxn());
|
kcEvaluationQueryWrapper.eq("xqxn",object.getXqxn());
|
||||||
kcEvaluationQueryWrapper.eq(StringUtils.isNotBlank(object.getDwmc()),"dwmc",object.getDwmc());
|
kcEvaluationQueryWrapper.eq(StringUtils.isNotBlank(object.getDwmc()),"dwmc",object.getDwmc());
|
||||||
kcEvaluationQueryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0))");
|
kcEvaluationQueryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0))");
|
||||||
kcEvaluationQueryWrapper.groupBy("a.gh");
|
kcEvaluationQueryWrapper.groupBy("a.gh,a.tklx");
|
||||||
|
|
||||||
// where xqxn = #{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0))
|
// where xqxn = #{xqxn} and (zt = '在职' or (zt= '退休' and ytkcs-0 >0))
|
||||||
// <if test="code != null">
|
// <if test="code != null">
|
||||||
|
|
|
@ -86,6 +86,8 @@ public class KcEvaluationsStat implements Serializable {
|
||||||
@Excel(name = "听课身份", width = 15)
|
@Excel(name = "听课身份", width = 15)
|
||||||
@ApiModelProperty(value = "听课身份")
|
@ApiModelProperty(value = "听课身份")
|
||||||
private java.lang.String col13;
|
private java.lang.String col13;
|
||||||
|
@Excel(name = "任教专业", width = 15)
|
||||||
|
private java.lang.String col56;
|
||||||
/**听课评价结果(5分制)*/
|
/**听课评价结果(5分制)*/
|
||||||
@Excel(name = "听课评价结果(5分制)", width = 15)
|
@Excel(name = "听课评价结果(5分制)", width = 15)
|
||||||
@ApiModelProperty(value = "听课评价结果(5分制)")
|
@ApiModelProperty(value = "听课评价结果(5分制)")
|
||||||
|
@ -254,7 +256,6 @@ public class KcEvaluationsStat implements Serializable {
|
||||||
@Excel(name = "10.其它建议", width = 15)
|
@Excel(name = "10.其它建议", width = 15)
|
||||||
@ApiModelProperty(value = "10.其它建议")
|
@ApiModelProperty(value = "10.其它建议")
|
||||||
private java.lang.String col55;
|
private java.lang.String col55;
|
||||||
private java.lang.String col56;
|
|
||||||
private java.lang.String col57;
|
private java.lang.String col57;
|
||||||
private java.lang.String col58;
|
private java.lang.String col58;
|
||||||
private java.lang.String col59;
|
private java.lang.String col59;
|
||||||
|
|
|
@ -566,6 +566,7 @@
|
||||||
|
|
||||||
<select id="findTkcsTj" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation">
|
<select id="findTkcsTj" resultType="org.jeecg.modules.kc.qa.entity.KcEvaluation">
|
||||||
SELECT
|
SELECT
|
||||||
|
distinct
|
||||||
a.gh upuserid,
|
a.gh upuserid,
|
||||||
count( c.upuserid ) AS pkNum,
|
count( c.upuserid ) AS pkNum,
|
||||||
xqxn as xnxq
|
xqxn as xnxq
|
||||||
|
|
|
@ -150,6 +150,33 @@ public class LoginController {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation("登录接口")
|
||||||
|
@RequestMapping(value = "/qhlogin", method = RequestMethod.POST)
|
||||||
|
public Result<JSONObject> qhlogin(@RequestBody SysLoginModel sysLoginModel, HttpServletRequest request){
|
||||||
|
Result<JSONObject> result = new Result<JSONObject>();
|
||||||
|
String username = sysLoginModel.getUsername();
|
||||||
|
|
||||||
|
// step.2 校验用户是否存在且有效
|
||||||
|
LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
queryWrapper.eq(SysUser::getUsername,username);
|
||||||
|
SysUser sysUser = sysUserService.getOne(queryWrapper);
|
||||||
|
result = sysUserService.checkUserIsEffective(sysUser);
|
||||||
|
if(!result.isSuccess()) {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// step.4 登录成功获取用户信息
|
||||||
|
userInfo(sysUser, result);
|
||||||
|
|
||||||
|
// step.5 登录成功删除验证码
|
||||||
|
redisUtil.del(CommonConstant.LOGIN_FAIL + username);
|
||||||
|
|
||||||
|
// step.6 记录用户登录日志
|
||||||
|
LoginUser loginUser = new LoginUser();
|
||||||
|
BeanUtils.copyProperties(sysUser, loginUser);
|
||||||
|
baseCommonService.addLog("切换成功,用户名: " + username + ",登录成功!", CommonConstant.LOG_TYPE_1, null,loginUser);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 【vue3专用】获取用户信息
|
* 【vue3专用】获取用户信息
|
||||||
|
|
Loading…
Reference in New Issue