Skip to content

Q
qianhe-ydsj
Commit 9945a253 by wangqi
Options

帮扶组的分档结果

parent 784708c6
Showing with 84 additions and 26 deletions
qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsBfzkhpjController.java
...@@ -188,13 +188,7 @@ public class SjGfjsBfzkhpjController extends BaseController ...@@ -188,13 +188,7 @@ public class SjGfjsBfzkhpjController extends BaseController
//查询主表信息 //查询主表信息
SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb=new SjGfjsZsdwkhpjZb(); SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew=new SjGfjsZsdwkhpjZb();
sjGfjsZsdwkhpjZb.setNd(nd);
sjGfjsZsdwkhpjZb.setDeptId(deptId);
sjGfjsZsdwkhpjZb.setZqfw(sjGfjsZsdwkhpj.getZqfw());
SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew =sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb);
if(sjGfjsZsdwkhpjZbnew==null){
sjGfjsZsdwkhpjZbnew=new SjGfjsZsdwkhpjZb();
sjGfjsZsdwkhpjZbnew.setNd(nd); sjGfjsZsdwkhpjZbnew.setNd(nd);
sjGfjsZsdwkhpjZbnew.setDeptId(deptId); sjGfjsZsdwkhpjZbnew.setDeptId(deptId);
sjGfjsZsdwkhpjZbnew.setParentDeptId(dept.getParentId()); sjGfjsZsdwkhpjZbnew.setParentDeptId(dept.getParentId());
...@@ -209,9 +203,7 @@ public class SjGfjsBfzkhpjController extends BaseController ...@@ -209,9 +203,7 @@ public class SjGfjsBfzkhpjController extends BaseController
sjGfjsZsdwkhpjZbnew.setZhdf(totalScore); sjGfjsZsdwkhpjZbnew.setZhdf(totalScore);
sjGfjsZsdwkhpjZbnew.setFdjb(fdjb); sjGfjsZsdwkhpjZbnew.setFdjb(fdjb);
sjGfjsZsdwkhpjZbnew.setYl3(yl3); sjGfjsZsdwkhpjZbnew.setYl3(yl3);
sjGfjsZsdwkhpjZbService.insertSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZbnew); sjGfjsZsdwkhpjZbService.insertSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZbnew);
}
//先保存再查询 //先保存再查询
SjGfjsZdgz sjGfjsZdgz=new SjGfjsZdgz(); SjGfjsZdgz sjGfjsZdgz=new SjGfjsZdgz();
...@@ -242,6 +234,7 @@ public class SjGfjsBfzkhpjController extends BaseController ...@@ -242,6 +234,7 @@ public class SjGfjsBfzkhpjController extends BaseController
zsdwkhpj.setJb("帮扶组"); zsdwkhpj.setJb("帮扶组");
zsdwkhpj.setZbId(sjGfjsZsdwkhpjZbnew.getId()); zsdwkhpj.setZbId(sjGfjsZsdwkhpjZbnew.getId());
zsdwkhpj.setYl1(i+1L); zsdwkhpj.setYl1(i+1L);
zsdwkhpj.setYl3(yl3);
zsdwkhpj.setKhfz("A"); zsdwkhpj.setKhfz("A");
//计算问题 //计算问题
List<String> collect = sjGfjsZsdwwtcjs.stream().filter(item -> item.getPjbzid().equals(zsdwkhpj.getPjbzid())) List<String> collect = sjGfjsZsdwwtcjs.stream().filter(item -> item.getPjbzid().equals(zsdwkhpj.getPjbzid()))
...@@ -532,4 +525,23 @@ public class SjGfjsBfzkhpjController extends BaseController ...@@ -532,4 +525,23 @@ public class SjGfjsBfzkhpjController extends BaseController
} }
return AjaxResult.success("导入成功"); return AjaxResult.success("导入成功");
} }
/**
* 查询直属单位分档考核结果
*/
@GetMapping("/fdjgList_Bfz")
public TableDataInfo fdjgList(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb)
{
sjGfjsZsdwkhpjZb.setZt("1");
sjGfjsZsdwkhpjZb.setJb("帮扶组");
List<SjGfjsZsdwkhpjZb> list = sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZbList_Bfz(sjGfjsZsdwkhpjZb);
return getDataTable(list);
}
@PutMapping("/editBfzpm")
public AjaxResult editBfzpm(@RequestBody SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew)
{
return toAjax(sjGfjsZsdwkhpjZbService.updateSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZbnew));
}
} }
qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsJcdwkhpjController.java
...@@ -202,13 +202,7 @@ public class SjGfjsJcdwkhpjController extends BaseController ...@@ -202,13 +202,7 @@ public class SjGfjsJcdwkhpjController extends BaseController
//查询主表信息 //查询主表信息
SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb=new SjGfjsZsdwkhpjZb(); SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew=new SjGfjsZsdwkhpjZb();
sjGfjsZsdwkhpjZb.setNd(nd);
sjGfjsZsdwkhpjZb.setDeptId(deptId);
sjGfjsZsdwkhpjZb.setZqfw(sjGfjsZsdwkhpj.getZqfw());
SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew =sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb);
if(sjGfjsZsdwkhpjZbnew==null){
sjGfjsZsdwkhpjZbnew=new SjGfjsZsdwkhpjZb();
sjGfjsZsdwkhpjZbnew.setNd(nd); sjGfjsZsdwkhpjZbnew.setNd(nd);
sjGfjsZsdwkhpjZbnew.setDeptId(deptId); sjGfjsZsdwkhpjZbnew.setDeptId(deptId);
sjGfjsZsdwkhpjZbnew.setParentDeptId(dept.getParentId()); sjGfjsZsdwkhpjZbnew.setParentDeptId(dept.getParentId());
...@@ -223,7 +217,6 @@ public class SjGfjsJcdwkhpjController extends BaseController ...@@ -223,7 +217,6 @@ public class SjGfjsJcdwkhpjController extends BaseController
sjGfjsZsdwkhpjZbnew.setFdjb(fdjb); sjGfjsZsdwkhpjZbnew.setFdjb(fdjb);
sjGfjsZsdwkhpjZbnew.setZt("0");//未提交 sjGfjsZsdwkhpjZbnew.setZt("0");//未提交
sjGfjsZsdwkhpjZbService.insertSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZbnew); sjGfjsZsdwkhpjZbService.insertSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZbnew);
}
//先保存再查询 //先保存再查询
SjGfjsZdgz sjGfjsZdgz=new SjGfjsZdgz(); SjGfjsZdgz sjGfjsZdgz=new SjGfjsZdgz();
......
qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsZsdwkhpjController.java
...@@ -188,13 +188,7 @@ public class SjGfjsZsdwkhpjController extends BaseController ...@@ -188,13 +188,7 @@ public class SjGfjsZsdwkhpjController extends BaseController
} }
//查询主表信息 //查询主表信息
SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb=new SjGfjsZsdwkhpjZb(); SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew=new SjGfjsZsdwkhpjZb();
sjGfjsZsdwkhpjZb.setNd(nd);
sjGfjsZsdwkhpjZb.setDeptId(deptId);
sjGfjsZsdwkhpjZb.setZqfw(sjGfjsZsdwkhpj.getZqfw());
SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew =sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb);
if(sjGfjsZsdwkhpjZbnew==null){
sjGfjsZsdwkhpjZbnew=new SjGfjsZsdwkhpjZb();
sjGfjsZsdwkhpjZbnew.setNd(nd); sjGfjsZsdwkhpjZbnew.setNd(nd);
sjGfjsZsdwkhpjZbnew.setDeptId(deptId); sjGfjsZsdwkhpjZbnew.setDeptId(deptId);
sjGfjsZsdwkhpjZbnew.setParentDeptId(dept.getParentId()); sjGfjsZsdwkhpjZbnew.setParentDeptId(dept.getParentId());
...@@ -209,7 +203,6 @@ public class SjGfjsZsdwkhpjController extends BaseController ...@@ -209,7 +203,6 @@ public class SjGfjsZsdwkhpjController extends BaseController
sjGfjsZsdwkhpjZbnew.setZhdf(totalScore); sjGfjsZsdwkhpjZbnew.setZhdf(totalScore);
sjGfjsZsdwkhpjZbnew.setFdjb(fdjb); sjGfjsZsdwkhpjZbnew.setFdjb(fdjb);
sjGfjsZsdwkhpjZbService.insertSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZbnew); sjGfjsZsdwkhpjZbService.insertSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZbnew);
}
//先保存再查询 //先保存再查询
SjGfjsZdgz sjGfjsZdgz=new SjGfjsZdgz(); SjGfjsZdgz sjGfjsZdgz=new SjGfjsZdgz();
......
qianhe-ydsj/src/main/java/com/qianhe/mapper/SjGfjsZsdwkhpjZbMapper.java
...@@ -28,6 +28,8 @@ public interface SjGfjsZsdwkhpjZbMapper ...@@ -28,6 +28,8 @@ public interface SjGfjsZsdwkhpjZbMapper
*/ */
public List<SjGfjsZsdwkhpjZb> selectSjGfjsZsdwkhpjZbList(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb); public List<SjGfjsZsdwkhpjZb> selectSjGfjsZsdwkhpjZbList(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
public List<SjGfjsZsdwkhpjZb> selectSjGfjsZsdwkhpjZbList_Bfz(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
/** /**
* 新增规范建设-直属单位考核评价主 * 新增规范建设-直属单位考核评价主
* *
......
qianhe-ydsj/src/main/java/com/qianhe/service/ISjGfjsZsdwkhpjZbService.java
...@@ -28,6 +28,8 @@ public interface ISjGfjsZsdwkhpjZbService ...@@ -28,6 +28,8 @@ public interface ISjGfjsZsdwkhpjZbService
*/ */
public List<SjGfjsZsdwkhpjZb> selectSjGfjsZsdwkhpjZbList(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb); public List<SjGfjsZsdwkhpjZb> selectSjGfjsZsdwkhpjZbList(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
public List<SjGfjsZsdwkhpjZb> selectSjGfjsZsdwkhpjZbList_Bfz(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb);
/** /**
* 新增指导帮扶-直属单位考核评价主 * 新增指导帮扶-直属单位考核评价主
* *
......
qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjGfjsZsdwkhpjZbServiceImpl.java
...@@ -48,6 +48,12 @@ public class SjGfjsZsdwkhpjZbServiceImpl implements ISjGfjsZsdwkhpjZbService ...@@ -48,6 +48,12 @@ public class SjGfjsZsdwkhpjZbServiceImpl implements ISjGfjsZsdwkhpjZbService
return sjGfjsZsdwkhpjZbMapper.selectSjGfjsZsdwkhpjZbList(sjGfjsZsdwkhpjZb); return sjGfjsZsdwkhpjZbMapper.selectSjGfjsZsdwkhpjZbList(sjGfjsZsdwkhpjZb);
} }
@Override
public List<SjGfjsZsdwkhpjZb> selectSjGfjsZsdwkhpjZbList_Bfz(SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZb)
{
return sjGfjsZsdwkhpjZbMapper.selectSjGfjsZsdwkhpjZbList_Bfz(sjGfjsZsdwkhpjZb);
}
/** /**
* 新增指导帮扶-直属单位考核评价主 * 新增指导帮扶-直属单位考核评价主
* *
......
qianhe-ydsj/src/main/resources/mapper/SjGfjsZsdwkhpjZbMapper.xml
...@@ -149,7 +149,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -149,7 +149,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${params.dataScope} ${params.dataScope}
</where> </where>
order by pm,zhdf desc order by p.order_num, a.pm,a.zhdf desc
</select>
<select id="selectSjGfjsZsdwkhpjZbList_Bfz" parameterType="SjGfjsZsdwkhpjZb" resultMap="SjGfjsZsdwkhpjZbResult">
<include refid="selectSjGfjsZsdwkhpjZbVo"/>
<where>
<if test="deptId != null ">and (a.dept_id = #{deptId} or find_in_set(#{deptId},d.ancestors))</if>
<if test="parentDeptId != null "> and a.parent_dept_id = #{parentDeptId}</if>
<if test="nd != null and nd != ''"> and a.nd = #{nd}</if>
<if test="zqfw != null and zqfw != ''"> and a.zqfw = #{zqfw}</if>
<if test="zqlx != null and zqlx != ''"> and a.zqlx = #{zqlx}</if>
<if test="jb != null and jb != ''"> and a.jb = #{jb}</if>
<if test="deptDfl != null and deptDfl != ''"> and a.dept_dfl = #{deptDfl}</if>
<if test="deptLx != null and deptLx != ''"> and a.dept_lx = #{deptLx}</if>
<if test="deptYwfl != null and deptYwfl != ''"> and a.dept_ywfl = #{deptYwfl}</if>
<if test="djyjzfs != null "> and djyjzfs = #{djyjzfs}</if>
<if test="djyjkfs != null "> and djyjkfs = #{djyjkfs}</if>
<if test="djyjkfbl != null "> and djyjkfbl = #{djyjkfbl}</if>
<if test="djyjdf != null "> and djyjdf = #{djyjdf}</if>
<if test="sztszfs != null "> and sztszfs = #{sztszfs}</if>
<if test="sztskfs != null "> and sztskfs = #{sztskfs}</if>
<if test="sztsfbl != null "> and sztsfbl = #{sztsfbl}</if>
<if test="sztsdf != null "> and sztsdf = #{sztsdf}</if>
<if test="glgfzfs != null "> and glgfzfs = #{glgfzfs}</if>
<if test="glgfkfs != null "> and glgfkfs = #{glgfkfs}</if>
<if test="glgfbl != null "> and glgfbl = #{glgfbl}</if>
<if test="glgfdf != null "> and glgfdf = #{glgfdf}</if>
<if test="ywcxzfs != null "> and ywcxzfs = #{ywcxzfs}</if>
<if test="ywcxkfs != null "> and ywcxkfs = #{ywcxkfs}</if>
<if test="ywcxbl != null "> and ywcxbl = #{ywcxbl}</if>
<if test="ywcxdf != null "> and ywcxdf = #{ywcxdf}</if>
<if test="sffjxs != null "> and sffjxs = #{sffjxs}</if>
<if test="zkf != null "> and zkf = #{zkf}</if>
<if test="zkfbl != null "> and zkfbl = #{zkfbl}</if>
<if test="zdf != null "> and zdf = #{zdf}</if>
<if test="zhdf != null "> and zhdf = #{zhdf}</if>
<if test="yl1 != null and yl1 != ''"> and yl1 = #{yl1}</if>
<if test="yl2 != null and yl2 != ''"> and yl2 = #{yl2}</if>
<if test="yl3 != null and yl3 != ''"> and yl3 = #{yl3}</if>
<if test="yl4 != null and yl4 != ''"> and yl4 = #{yl4}</if>
<if test="yl5 != null and yl5 != ''"> and yl5 = #{yl5}</if>
<if test="pm != null and pm != ''"> and pm = #{pm}</if>
<if test="zt != null and zt != ''"> and a.zt = #{zt}</if>
<if test="fdjb != null and fdjb != ''"> and fdjb = #{fdjb}</if>
<if test="df != null "> and zdf &lt;= #{df}</if>
<if test="kfbl != null "> and zkfbl >= #{kfbl}</if>
<if test="fjx != null and fjx.toString()=='1'.toString() "> and sffjxs >= #{fjx}</if>
<if test="fjx != null and fjx.toString()=='0'.toString() "> and sffjxs = #{fjx}</if>
</where>
order by p.order_num, a.pm,a.zhdf desc
</select> </select>
<select id="selectSjGfjsZsdwkhpjZbById" parameterType="Long" resultMap="SjGfjsZsdwkhpjZbResult"> <select id="selectSjGfjsZsdwkhpjZbById" parameterType="Long" resultMap="SjGfjsZsdwkhpjZbResult">
......
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