Commit 83c7763b by yangliang

修改海南考核统计功能

parent 50deb474
...@@ -94,7 +94,7 @@ public class TbXwRycjController { ...@@ -94,7 +94,7 @@ public class TbXwRycjController {
@RequestMapping("/queryRyxxList") @RequestMapping("/queryRyxxList")
@ResponseBody @ResponseBody
public EasyUIPage queryRyxxPage(@ModelAttribute AutoTbStRy ryxx, public EasyUIPage queryRyxxPage(@ModelAttribute AutoTbStRy ryxx,String type,
EasyUIPage easyUIPage, Integer rows, HttpServletRequest request){ EasyUIPage easyUIPage, Integer rows, HttpServletRequest request){
easyUIPage.setPagePara(rows); easyUIPage.setPagePara(rows);
User user = (User)request.getSession().getAttribute("User"); User user = (User)request.getSession().getAttribute("User");
...@@ -104,6 +104,24 @@ public class TbXwRycjController { ...@@ -104,6 +104,24 @@ public class TbXwRycjController {
if(ryxx.getLrdwdm()==null||"".equals(ryxx.getLrdwdm())){ if(ryxx.getLrdwdm()==null||"".equals(ryxx.getLrdwdm())){
ryxx.setLrdwdm(user.getUnitcode()); ryxx.setLrdwdm(user.getUnitcode());
} }
if(ryxx.getXxdjdwGajgjgdm()==null||"".equals(ryxx.getXxdjdwGajgjgdm())){
String grade = user.getGrade();
String ucode = user.getUnitcode();
if("S".equals(grade)){
ryxx.setXxdjdwGajgjgdm(ucode.substring(0,2)+"0000000000");
}else if("D".equals(grade)){
ryxx.setXxdjdwGajgjgdm(ucode.substring(0,4)+"00000000");
}else if("X".equals(grade)){
ryxx.setXxdjdwGajgjgdm(ucode.substring(0,6)+"000000");
}else if("K".equals(grade)){
ryxx.setXxdjdwGajgjgdm(ucode.substring(0,8)+"0000");
}else{
ryxx.setXxdjdwGajgjgdm(ucode.substring(0,10)+"00");
}
}
if("CX".equals(type)){
ryxx.setXxdjdwGajgjgdm(null);
}
easyUIPage=rycjService.queryRyxxPage(easyUIPage,ryxx); easyUIPage=rycjService.queryRyxxPage(easyUIPage,ryxx);
return easyUIPage; return easyUIPage;
} }
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
</resultMap> </resultMap>
<sql id="queryWhere"> <sql id="queryWhere">
<if test="entity.rybh != null and entity.rybh != ''"> AND RYBH = #{entity.rybh , jdbcType=VARCHAR } </if> <if test="entity.rybh != null and entity.rybh != ''"> AND RYBH like '%'||#{entity.rybh , jdbcType=VARCHAR }||'%' </if>
<if test="entity.asjbh != null and entity.asjbh != ''"> AND ASJBH = #{entity.asjbh , jdbcType=VARCHAR } </if> <if test="entity.asjbh != null and entity.asjbh != ''"> AND ASJBH = #{entity.asjbh , jdbcType=VARCHAR } </if>
<if test="entity.xm != null and entity.xm != ''"> AND XM = #{entity.xm , jdbcType=VARCHAR } </if> <if test="entity.xm != null and entity.xm != ''"> AND XM = #{entity.xm , jdbcType=VARCHAR } </if>
<if test="entity.cym != null and entity.cym != ''"> AND CYM = #{entity.cym , jdbcType=VARCHAR } </if> <if test="entity.cym != null and entity.cym != ''"> AND CYM = #{entity.cym , jdbcType=VARCHAR } </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment