Skip to content

Q
qianhe-ydsj
Commit 96324235 by wangjian
Options

2025-09-17 wj 整体修改2

parent 220a2bba
Showing with 15 additions and 5 deletions
qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsBfzkhpjController.java
...@@ -122,6 +122,7 @@ public class SjGfjsBfzkhpjController extends BaseController ...@@ -122,6 +122,7 @@ public class SjGfjsBfzkhpjController extends BaseController
sjGfjsZsdwkhpjZb.setDeptId(deptId); sjGfjsZsdwkhpjZb.setDeptId(deptId);
sjGfjsZsdwkhpjZb.setZqfw(sjGfjsZsdwkhpj.getZqfw()); sjGfjsZsdwkhpjZb.setZqfw(sjGfjsZsdwkhpj.getZqfw());
sjGfjsZsdwkhpjZb.setJb("帮扶组"); sjGfjsZsdwkhpjZb.setJb("帮扶组");
sjGfjsZsdwkhpjZb.setYl3(yl3);// 帮扶组的id
SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew =sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb); SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew =sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb);
if(sjGfjsZsdwkhpjZbnew==null){ if(sjGfjsZsdwkhpjZbnew==null){
sjGfjsZsdwkhpjZbnew=new SjGfjsZsdwkhpjZb(); sjGfjsZsdwkhpjZbnew=new SjGfjsZsdwkhpjZb();
...@@ -135,16 +136,21 @@ public class SjGfjsBfzkhpjController extends BaseController ...@@ -135,16 +136,21 @@ public class SjGfjsBfzkhpjController extends BaseController
sjGfjsZsdwkhpjZbnew.setDeptLx(dept.getDeptLx()); sjGfjsZsdwkhpjZbnew.setDeptLx(dept.getDeptLx());
sjGfjsZsdwkhpjZbnew.setDeptYwfl(dept.getDeptYwfl()); sjGfjsZsdwkhpjZbnew.setDeptYwfl(dept.getDeptYwfl());
sjGfjsZsdwkhpjZbnew.setZt("0");//未提交 sjGfjsZsdwkhpjZbnew.setZt("0");//未提交
sjGfjsZsdwkhpjZbnew.setYl3(yl3);// 帮扶组的id
sjGfjsZsdwkhpjZbnew.setFdjb("A");// 分档级别 默认 A
sjGfjsZsdwkhpjZbService.insertSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZbnew); sjGfjsZsdwkhpjZbService.insertSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZbnew);
} }
//排名需要对帮扶的直属单位、基层单位均录入排名 //排名需要对帮扶的直属单位、基层单位均录入排名
SjGfjsZsdwkhpjZb zs_zb_qry = new SjGfjsZsdwkhpjZb(); SjGfjsZsdwkhpjZb zs_zb_qry = new SjGfjsZsdwkhpjZb();
zs_zb_qry.setDeptId(sjGfjsZsdwkhpjZbnew.getParentDeptId()); zs_zb_qry.setParentDeptId(sjGfjsZsdwkhpjZbnew.getParentDeptId());
zs_zb_qry.setNd(sjGfjsZsdwkhpjZbnew.getNd()); zs_zb_qry.setNd(sjGfjsZsdwkhpjZbnew.getNd());
zs_zb_qry.setZqfw(sjGfjsZsdwkhpjZbnew.getZqfw()); zs_zb_qry.setZqfw(sjGfjsZsdwkhpjZbnew.getZqfw());
zs_zb_qry.setJb(sjGfjsZsdwkhpjZbnew.getJb()); zs_zb_qry.setJb(sjGfjsZsdwkhpjZbnew.getJb());
List<SjGfjsZsdwkhpjZb> zs_zbs = sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZbList_Bfz(zs_zb_qry); zs_zb_qry.setYl3(yl3);// 帮扶组的id
if(zs_zbs == null || zs_zbs.size() <= 0){//基层单位对应的直属单位 没有主表数据 就插入一个 List<SjGfjsZsdwkhpjZb> zs_zbs_ses = sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZbList_Bfz(zs_zb_qry);
//只要deptid是空的 是直属单位的
List<SjGfjsZsdwkhpjZb> zs_zbs = zs_zbs_ses.stream().filter(e->e.getDeptId()==null).collect(Collectors.toList());
if(zs_zbs.size() <= 0){//基层单位对应的直属单位 没有主表数据 就插入一个
SysDept deptZs = sysDeptMapper.selectDeptById(sjGfjsZsdwkhpjZbnew.getParentDeptId()); SysDept deptZs = sysDeptMapper.selectDeptById(sjGfjsZsdwkhpjZbnew.getParentDeptId());
SjGfjsZsdwkhpjZb zs_zb=new SjGfjsZsdwkhpjZb(); SjGfjsZsdwkhpjZb zs_zb=new SjGfjsZsdwkhpjZb();
...@@ -156,7 +162,9 @@ public class SjGfjsBfzkhpjController extends BaseController ...@@ -156,7 +162,9 @@ public class SjGfjsBfzkhpjController extends BaseController
zs_zb.setDeptDfl(deptZs.getDeptDfl()); zs_zb.setDeptDfl(deptZs.getDeptDfl());
zs_zb.setDeptLx(deptZs.getDeptLx()); zs_zb.setDeptLx(deptZs.getDeptLx());
zs_zb.setDeptYwfl(deptZs.getDeptYwfl()); zs_zb.setDeptYwfl(deptZs.getDeptYwfl());
zs_zb.setZt("0");//未提交 zs_zb.setZt("1");//未提交
zs_zb.setYl3(yl3);// 帮扶组的id
zs_zb.setFdjb("A");// 分档级别 默认 A
sjGfjsZsdwkhpjZbService.insertSjGfjsZsdwkhpjZb(zs_zb); sjGfjsZsdwkhpjZbService.insertSjGfjsZsdwkhpjZb(zs_zb);
} }
...@@ -173,6 +181,7 @@ public class SjGfjsBfzkhpjController extends BaseController ...@@ -173,6 +181,7 @@ public class SjGfjsBfzkhpjController extends BaseController
sjGfjsZsdwwtcj.setStartRq(startRq); sjGfjsZsdwwtcj.setStartRq(startRq);
sjGfjsZsdwwtcj.setEndRq(endRq); sjGfjsZsdwwtcj.setEndRq(endRq);
sjGfjsZsdwwtcj.setJcjb("帮扶组检查"); sjGfjsZsdwwtcj.setJcjb("帮扶组检查");
sjGfjsZsdwwtcj.setYl3(Long.valueOf(yl3));// 帮扶组的id
List<SjGfjsZsdwwtcj> sjGfjsZsdwwtcjs = sjGfjsZsdwwtcjMapper.selectSjGfjsZsdwwtcjList(sjGfjsZsdwwtcj); List<SjGfjsZsdwwtcj> sjGfjsZsdwwtcjs = sjGfjsZsdwwtcjMapper.selectSjGfjsZsdwwtcjList(sjGfjsZsdwwtcj);
for(int i=0;i<sjGfjsZdgzList.size();i++){ for(int i=0;i<sjGfjsZdgzList.size();i++){
...@@ -190,6 +199,7 @@ public class SjGfjsBfzkhpjController extends BaseController ...@@ -190,6 +199,7 @@ public class SjGfjsBfzkhpjController extends BaseController
zsdwkhpj.setZbId(sjGfjsZsdwkhpjZbnew.getId()); zsdwkhpj.setZbId(sjGfjsZsdwkhpjZbnew.getId());
zsdwkhpj.setYl1(i+1L); zsdwkhpj.setYl1(i+1L);
zsdwkhpj.setKhfz("A"); zsdwkhpj.setKhfz("A");
zsdwkhpj.setYl3(yl3);// 帮扶组的id
//计算问题 //计算问题
List<String> collect = sjGfjsZsdwwtcjs.stream() List<String> collect = sjGfjsZsdwwtcjs.stream()
.filter(item -> item.getKhnr().equals(zsdwkhpj.getKhnr()) && item.getKhxd().equals(zsdwkhpj.getKhxd())) .filter(item -> item.getKhnr().equals(zsdwkhpj.getKhnr()) && item.getKhxd().equals(zsdwkhpj.getKhxd()))
......
qianhe-ydsj/src/main/resources/mapper/SjGfjsZsdwkhpjZbMapper.xml
...@@ -199,7 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -199,7 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fjx != null and fjx.toString()=='1'.toString() "> and sffjxs >= #{fjx}</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> <if test="fjx != null and fjx.toString()=='0'.toString() "> and sffjxs = #{fjx}</if>
</where> </where>
order by p.order_num, a.pm,a.zhdf desc order by a.dept_id, 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