Skip to content

Q
qianhe-ydsj
Commit 220a2bba by wangjian
Options

2025-09-17 wj 整体修改2

parent 578388d8
Showing with 79 additions and 4 deletions
qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsBfzkhpjController.java
...@@ -121,6 +121,7 @@ public class SjGfjsBfzkhpjController extends BaseController ...@@ -121,6 +121,7 @@ public class SjGfjsBfzkhpjController extends BaseController
sjGfjsZsdwkhpjZb.setNd(nd); sjGfjsZsdwkhpjZb.setNd(nd);
sjGfjsZsdwkhpjZb.setDeptId(deptId); sjGfjsZsdwkhpjZb.setDeptId(deptId);
sjGfjsZsdwkhpjZb.setZqfw(sjGfjsZsdwkhpj.getZqfw()); sjGfjsZsdwkhpjZb.setZqfw(sjGfjsZsdwkhpj.getZqfw());
sjGfjsZsdwkhpjZb.setJb("帮扶组");
SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew =sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb); SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew =sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb);
if(sjGfjsZsdwkhpjZbnew==null){ if(sjGfjsZsdwkhpjZbnew==null){
sjGfjsZsdwkhpjZbnew=new SjGfjsZsdwkhpjZb(); sjGfjsZsdwkhpjZbnew=new SjGfjsZsdwkhpjZb();
...@@ -136,6 +137,28 @@ public class SjGfjsBfzkhpjController extends BaseController ...@@ -136,6 +137,28 @@ public class SjGfjsBfzkhpjController extends BaseController
sjGfjsZsdwkhpjZbnew.setZt("0");//未提交 sjGfjsZsdwkhpjZbnew.setZt("0");//未提交
sjGfjsZsdwkhpjZbService.insertSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZbnew); sjGfjsZsdwkhpjZbService.insertSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZbnew);
} }
//排名需要对帮扶的直属单位、基层单位均录入排名
SjGfjsZsdwkhpjZb zs_zb_qry = new SjGfjsZsdwkhpjZb();
zs_zb_qry.setDeptId(sjGfjsZsdwkhpjZbnew.getParentDeptId());
zs_zb_qry.setNd(sjGfjsZsdwkhpjZbnew.getNd());
zs_zb_qry.setZqfw(sjGfjsZsdwkhpjZbnew.getZqfw());
zs_zb_qry.setJb(sjGfjsZsdwkhpjZbnew.getJb());
List<SjGfjsZsdwkhpjZb> zs_zbs = sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZbList_Bfz(zs_zb_qry);
if(zs_zbs == null || zs_zbs.size() <= 0){//基层单位对应的直属单位 没有主表数据 就插入一个
SysDept deptZs = sysDeptMapper.selectDeptById(sjGfjsZsdwkhpjZbnew.getParentDeptId());
SjGfjsZsdwkhpjZb zs_zb=new SjGfjsZsdwkhpjZb();
zs_zb.setNd(sjGfjsZsdwkhpjZbnew.getNd());
zs_zb.setParentDeptId(deptZs.getDeptId());
zs_zb.setZqfw(sjGfjsZsdwkhpjZbnew.getZqfw());
zs_zb.setZqlx("年度");
zs_zb.setJb("帮扶组");
zs_zb.setDeptDfl(deptZs.getDeptDfl());
zs_zb.setDeptLx(deptZs.getDeptLx());
zs_zb.setDeptYwfl(deptZs.getDeptYwfl());
zs_zb.setZt("0");//未提交
sjGfjsZsdwkhpjZbService.insertSjGfjsZsdwkhpjZb(zs_zb);
}
//先保存再查询 //先保存再查询
SjGfjsZdgz sjGfjsZdgz=new SjGfjsZdgz(); SjGfjsZdgz sjGfjsZdgz=new SjGfjsZdgz();
...@@ -466,8 +489,58 @@ public class SjGfjsBfzkhpjController extends BaseController ...@@ -466,8 +489,58 @@ public class SjGfjsBfzkhpjController extends BaseController
@PutMapping("/editBfzpm") @PutMapping("/editBfzpm")
public AjaxResult editBfzpm(@RequestBody SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew) public AjaxResult editBfzpm(@RequestBody SjGfjsZsdwkhpjZb in)
{ {
return toAjax(sjGfjsZsdwkhpjZbService.updateSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZbnew)); Long in_id = in.getId();
int in_pm = in.getPm();
if (in_id == null) {
return error("未获取到主键id！");
}
if (in_pm <= 0) {
return error("排名不能小于等于0！");
}
//校验排名不能重复
SjGfjsZsdwkhpjZb upd_id_zb = sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZbById(in.getId());
if (upd_id_zb.getDeptId() != null) {
//基层单位的 deptId不是是空
SjGfjsZsdwkhpjZb qry_zb = new SjGfjsZsdwkhpjZb();
qry_zb.setZt("1");
qry_zb.setJb("帮扶组");
qry_zb.setNd(upd_id_zb.getNd());
qry_zb.setZqfw(upd_id_zb.getZqfw());
qry_zb.setZqlx(upd_id_zb.getZqlx());
qry_zb.setParentDeptId(upd_id_zb.getParentDeptId());
//查询出现有数据 排名情况
List<SjGfjsZsdwkhpjZb> list = sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZbList(qry_zb);
//基层单位的 deptId不是是空
List<SjGfjsZsdwkhpjZb> list_jc = list.stream().filter(e -> e.getDeptId() != null).collect(Collectors.toList());
//校验是否有重复 重复则 true
boolean chongfu = list_jc.stream().filter(e -> e.getPm() == in_pm).anyMatch(e -> !in_id.equals(e.getId()));
if (chongfu) {
return error("输入的排名重复！");
}
} else if (upd_id_zb.getDeptId() == null) {
//直属单位的 deptId是空
SjGfjsZsdwkhpjZb qry_zb = new SjGfjsZsdwkhpjZb();
qry_zb.setZt("1");
qry_zb.setJb("帮扶组");
qry_zb.setNd(upd_id_zb.getNd());
qry_zb.setZqfw(upd_id_zb.getZqfw());
qry_zb.setZqlx(upd_id_zb.getZqlx());
//查询出现有数据 排名情况
List<SjGfjsZsdwkhpjZb> list = sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZbList(qry_zb);
//直属单位的 deptId是空
List<SjGfjsZsdwkhpjZb> list_zs = list.stream().filter(e -> e.getDeptId() == null).collect(Collectors.toList());
//校验是否有重复 重复则 true
boolean chongfu = list_zs.stream().filter(e -> e.getPm() == in_pm).anyMatch(e -> !in_id.equals(e.getId()));
if (chongfu) {
return error("输入的排名重复！");
}
}
return toAjax(sjGfjsZsdwkhpjZbService.updateSjGfjsZsdwkhpjZb(in));
} }
} }
qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsJcdwkhpjController.java
...@@ -134,6 +134,7 @@ public class SjGfjsJcdwkhpjController extends BaseController ...@@ -134,6 +134,7 @@ public class SjGfjsJcdwkhpjController extends BaseController
sjGfjsZsdwkhpjZb.setNd(nd); sjGfjsZsdwkhpjZb.setNd(nd);
sjGfjsZsdwkhpjZb.setDeptId(deptId); sjGfjsZsdwkhpjZb.setDeptId(deptId);
sjGfjsZsdwkhpjZb.setZqfw(sjGfjsZsdwkhpj.getZqfw()); sjGfjsZsdwkhpjZb.setZqfw(sjGfjsZsdwkhpj.getZqfw());
sjGfjsZsdwkhpjZb.setJb("基层单位");
SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew =sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb); SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew =sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb);
if(sjGfjsZsdwkhpjZbnew==null){ if(sjGfjsZsdwkhpjZbnew==null){
sjGfjsZsdwkhpjZbnew=new SjGfjsZsdwkhpjZb(); sjGfjsZsdwkhpjZbnew=new SjGfjsZsdwkhpjZb();
......
qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsZsdwkhpjController.java
...@@ -122,6 +122,7 @@ public class SjGfjsZsdwkhpjController extends BaseController ...@@ -122,6 +122,7 @@ public class SjGfjsZsdwkhpjController extends BaseController
sjGfjsZsdwkhpjZb.setNd(nd); sjGfjsZsdwkhpjZb.setNd(nd);
sjGfjsZsdwkhpjZb.setDeptId(deptId); sjGfjsZsdwkhpjZb.setDeptId(deptId);
sjGfjsZsdwkhpjZb.setZqfw(sjGfjsZsdwkhpj.getZqfw()); sjGfjsZsdwkhpjZb.setZqfw(sjGfjsZsdwkhpj.getZqfw());
sjGfjsZsdwkhpjZb.setJb("直属单位");
SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew =sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb); SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew =sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZb);
if(sjGfjsZsdwkhpjZbnew==null){ if(sjGfjsZsdwkhpjZbnew==null){
sjGfjsZsdwkhpjZbnew=new SjGfjsZsdwkhpjZb(); sjGfjsZsdwkhpjZbnew=new SjGfjsZsdwkhpjZb();
...@@ -501,7 +502,7 @@ public class SjGfjsZsdwkhpjController extends BaseController ...@@ -501,7 +502,7 @@ public class SjGfjsZsdwkhpjController extends BaseController
return !in_id.equals(e.getId()); // 目标id不为null时，直接比较是否不等 return !in_id.equals(e.getId()); // 目标id不为null时，直接比较是否不等
}); });
if (chongfu) { if (chongfu) {
return error("出入的排名重复！"); return error("输入的排名重复！");
} }
return toAjax(sjGfjsZsdwkhpjZbService.updateSjGfjsZsdwkhpjZb(in)); return toAjax(sjGfjsZsdwkhpjZbService.updateSjGfjsZsdwkhpjZb(in));
......
qianhe-ydsj/src/main/resources/mapper/SjGfjsZsdwkhpjZbMapper.xml
...@@ -207,7 +207,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -207,7 +207,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id} where id = #{id}
</select> </select>
<select id="selectSjGfjsZsdwkhpjZb" resultType="com.qianhe.domain.SjGfjsZsdwkhpjZb"> <select id="selectSjGfjsZsdwkhpjZb" resultType="com.qianhe.domain.SjGfjsZsdwkhpjZb">
select *from sj_gfjs_zsdwkhpj_zb where nd=#{nd} and dept_id=#{deptId} and zqfw=#{zqfw} select *from sj_gfjs_zsdwkhpj_zb where nd=#{nd} and dept_id=#{deptId} and zqfw=#{zqfw} and jb=#{jb}
</select> </select>
<insert id="insertSjGfjsZsdwkhpjZb" parameterType="SjGfjsZsdwkhpjZb" useGeneratedKeys="true" keyProperty="id"> <insert id="insertSjGfjsZsdwkhpjZb" parameterType="SjGfjsZsdwkhpjZb" useGeneratedKeys="true" keyProperty="id">
......
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