|
|
@ -9,8 +9,11 @@ import java.io.UnsupportedEncodingException; |
|
|
|
import java.net.URLDecoder; |
|
|
|
import java.net.URLDecoder; |
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import org.apache.shiro.SecurityUtils; |
|
|
|
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.common.system.vo.LoginUser; |
|
|
|
import org.jeecg.common.util.oConvertUtils; |
|
|
|
import org.jeecg.common.util.oConvertUtils; |
|
|
|
import org.jeecg.modules.demo.anncomgrotop.entity.AnnComGroTop; |
|
|
|
import org.jeecg.modules.demo.anncomgrotop.entity.AnnComGroTop; |
|
|
|
import org.jeecg.modules.demo.anncomgrotop.service.IAnnComGroTopService; |
|
|
|
import org.jeecg.modules.demo.anncomgrotop.service.IAnnComGroTopService; |
|
|
@ -155,11 +158,13 @@ public class ExpScoreController extends JeecgController<ExpScore, IExpScoreServi |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); |
|
|
|
QueryWrapper<ExpScore> queryWrapper = QueryGenerator.initQueryWrapper(expScore, req.getParameterMap()); |
|
|
|
QueryWrapper<ExpScore> queryWrapper = QueryGenerator.initQueryWrapper(expScore, req.getParameterMap()); |
|
|
|
queryWrapper.eq("annid",annComGroTop.getAnnid()); |
|
|
|
queryWrapper.eq("annid",annComGroTop.getAnnid()); |
|
|
|
queryWrapper.eq("annal_comp",annualCompPointService.getById(annComGroTop.getAnnComP()).getAnnualCompId()); |
|
|
|
queryWrapper.eq("annal_comp",annualCompPointService.getById(annComGroTop.getAnnComP()).getAnnualCompId()); |
|
|
|
queryWrapper.eq("ann_com_p",annComGroTop.getAnnComP()); |
|
|
|
queryWrapper.eq("ann_com_p",annComGroTop.getAnnComP()); |
|
|
|
queryWrapper.eq("topid",annComGroTop.getTopid()); |
|
|
|
queryWrapper.eq("topid",annComGroTop.getTopid()); |
|
|
|
|
|
|
|
queryWrapper.eq("userid",sysUser.getId()); |
|
|
|
Page<ExpScore> page = new Page<ExpScore>(pageNo, pageSize); |
|
|
|
Page<ExpScore> page = new Page<ExpScore>(pageNo, pageSize); |
|
|
|
IPage<ExpScore> pageList = expScoreService.page(page, queryWrapper); |
|
|
|
IPage<ExpScore> pageList = expScoreService.page(page, queryWrapper); |
|
|
|
for (int k = 0 ; k < pageList.getRecords().size();k++){ |
|
|
|
for (int k = 0 ; k < pageList.getRecords().size();k++){ |
|
|
|