Skip to content

Q
qianhe-ydsj
Commit f508ae10 by wangqi
Options

直属单位自查

parent b182a5ee
Showing with 26 additions and 17 deletions
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfJcdwkhpjfjxController.java
...@@ -249,22 +249,22 @@ public class SjZdbfJcdwkhpjfjxController extends BaseController ...@@ -249,22 +249,22 @@ public class SjZdbfJcdwkhpjfjxController extends BaseController
SjZdbfZsdwkhpjfjx zsdwkhpj=new SjZdbfZsdwkhpjfjx(); SjZdbfZsdwkhpjfjx zsdwkhpj=new SjZdbfZsdwkhpjfjx();
System.out.println(row); System.out.println(row);
//id //id
String id=new DataFormatter().formatCellValue(row.getCell(7)); String id=new DataFormatter().formatCellValue(row.getCell(4));
if(StringUtils.isEmpty(id)){ if(StringUtils.isEmpty(id)){
return AjaxResult.error("id不能为空"); return AjaxResult.error("id不能为空");
} }
zsdwkhpj.setId(Long.parseLong(id)); zsdwkhpj.setId(Long.parseLong(id));
//主表id //主表id
String zbid=new DataFormatter().formatCellValue(row.getCell(8)); String zbid=new DataFormatter().formatCellValue(row.getCell(5));
if(StringUtils.isEmpty(zbid)){ if(StringUtils.isEmpty(zbid)){
return AjaxResult.error("主表id不能为空"); return AjaxResult.error("主表id不能为空");
} }
zsdwkhpj.setZbId(Long.parseLong(zbid)); zsdwkhpj.setZbId(Long.parseLong(zbid));
//是否发生 //是否发生
String sffs=new DataFormatter().formatCellValue(row.getCell(5)); String sffs=new DataFormatter().formatCellValue(row.getCell(2));
zsdwkhpj.setSffs(sffs); zsdwkhpj.setSffs(sffs);
//问题描述 //问题描述
String wtms=new DataFormatter().formatCellValue(row.getCell(6)); String wtms=new DataFormatter().formatCellValue(row.getCell(3));
zsdwkhpj.setWtms(wtms); zsdwkhpj.setWtms(wtms);
list.add(zsdwkhpj); list.add(zsdwkhpj);
} }
......
qianhe-ydsj/src/main/java/com/qianhe/controller/SjZdbfZsdwwtcjController.java
...@@ -137,7 +137,8 @@ public class SjZdbfZsdwwtcjController extends BaseController ...@@ -137,7 +137,8 @@ public class SjZdbfZsdwwtcjController extends BaseController
public AjaxResult add(@RequestBody SjZdbfZsdwwtcj sjZdbfZsdwwtcj) public AjaxResult add(@RequestBody SjZdbfZsdwwtcj sjZdbfZsdwwtcj)
{ {
sjZdbfZsdwwtcj.setJcjb("直属单位自查"); sjZdbfZsdwwtcj.setJcjb("直属单位自查");
sjZdbfZsdwwtcj.setYl3(sjZdbfZsdwwtcj.getDeptId()); SysDept dept = sysDeptMapper.selectDeptById(sjZdbfZsdwwtcj.getDeptId());
sjZdbfZsdwwtcj.setYl3(dept.getParentId());
return toAjax(sjZdbfZsdwwtcjService.insertSjZdbfZsdwwtcj(sjZdbfZsdwwtcj)); return toAjax(sjZdbfZsdwwtcjService.insertSjZdbfZsdwwtcj(sjZdbfZsdwwtcj));
} }
...@@ -150,7 +151,8 @@ public class SjZdbfZsdwwtcjController extends BaseController ...@@ -150,7 +151,8 @@ public class SjZdbfZsdwwtcjController extends BaseController
public AjaxResult edit(@RequestBody SjZdbfZsdwwtcj sjZdbfZsdwwtcj) public AjaxResult edit(@RequestBody SjZdbfZsdwwtcj sjZdbfZsdwwtcj)
{ {
sjZdbfZsdwwtcj.setJcjb("直属单位自查"); sjZdbfZsdwwtcj.setJcjb("直属单位自查");
sjZdbfZsdwwtcj.setYl3(sjZdbfZsdwwtcj.getDeptId()); SysDept dept = sysDeptMapper.selectDeptById(sjZdbfZsdwwtcj.getDeptId());
sjZdbfZsdwwtcj.setYl3(dept.getParentId());
return toAjax(sjZdbfZsdwwtcjService.updateSjZdbfZsdwwtcj(sjZdbfZsdwwtcj)); return toAjax(sjZdbfZsdwwtcjService.updateSjZdbfZsdwwtcj(sjZdbfZsdwwtcj));
} }
......
qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjZdbfJcdwkhpjServiceImpl.java
...@@ -151,7 +151,7 @@ public class SjZdbfJcdwkhpjServiceImpl implements ISjZdbfJcdwkhpjService ...@@ -151,7 +151,7 @@ public class SjZdbfJcdwkhpjServiceImpl implements ISjZdbfJcdwkhpjService
sjZdbfZsdwkhpjZb.setDjyjkfs(new BigDecimal(kf)); sjZdbfZsdwkhpjZb.setDjyjkfs(new BigDecimal(kf));
//扣分比列 //扣分比列
BigDecimal df = sjZdbfZsdwkhpjZb.getDjyjzfs().add(new BigDecimal(kf)); BigDecimal df = sjZdbfZsdwkhpjZb.getDjyjzfs().add(new BigDecimal(kf));
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getDjyjzfs(),BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getDjyjzfs(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
sjZdbfZsdwkhpjZb.setDjyjkfbl(new BigDecimal(100).subtract(kfbl)); sjZdbfZsdwkhpjZb.setDjyjkfbl(new BigDecimal(100).subtract(kfbl));
//得分 //得分
sjZdbfZsdwkhpjZb.setDjyjdf(df); sjZdbfZsdwkhpjZb.setDjyjdf(df);
...@@ -162,7 +162,11 @@ public class SjZdbfJcdwkhpjServiceImpl implements ISjZdbfJcdwkhpjService ...@@ -162,7 +162,11 @@ public class SjZdbfJcdwkhpjServiceImpl implements ISjZdbfJcdwkhpjService
sjZdbfZsdwkhpjZb.setSztskfs(new BigDecimal(kf)); sjZdbfZsdwkhpjZb.setSztskfs(new BigDecimal(kf));
//扣分比列 //扣分比列
BigDecimal df = sjZdbfZsdwkhpjZb.getSztszfs().add(new BigDecimal(kf)); BigDecimal df = sjZdbfZsdwkhpjZb.getSztszfs().add(new BigDecimal(kf));
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getSztszfs(),BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP); /* BigDecimal aa = df.divide(sjZdbfZsdwkhpjZb.getSztszfs(),4,BigDecimal.ROUND_HALF_UP);
BigDecimal bb = aa.multiply(new BigDecimal(100));
BigDecimal cc = bb.setScale(2, BigDecimal.ROUND_HALF_UP);*/
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getSztszfs(),4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
sjZdbfZsdwkhpjZb.setSztsfbl(new BigDecimal(100).subtract(kfbl)); sjZdbfZsdwkhpjZb.setSztsfbl(new BigDecimal(100).subtract(kfbl));
//得分 //得分
sjZdbfZsdwkhpjZb.setSztsdf(df); sjZdbfZsdwkhpjZb.setSztsdf(df);
...@@ -170,7 +174,7 @@ public class SjZdbfJcdwkhpjServiceImpl implements ISjZdbfJcdwkhpjService ...@@ -170,7 +174,7 @@ public class SjZdbfJcdwkhpjServiceImpl implements ISjZdbfJcdwkhpjService
sjZdbfZsdwkhpjZb.setGlgfkfs(new BigDecimal(kf)); sjZdbfZsdwkhpjZb.setGlgfkfs(new BigDecimal(kf));
//扣分比列 //扣分比列
BigDecimal df = sjZdbfZsdwkhpjZb.getGlgfzfs().add(new BigDecimal(kf)); BigDecimal df = sjZdbfZsdwkhpjZb.getGlgfzfs().add(new BigDecimal(kf));
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getGlgfzfs(),BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getGlgfzfs(),4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
sjZdbfZsdwkhpjZb.setGlgfbl(new BigDecimal(100).subtract(kfbl)); sjZdbfZsdwkhpjZb.setGlgfbl(new BigDecimal(100).subtract(kfbl));
//得分 //得分
sjZdbfZsdwkhpjZb.setGlgfdf(df); sjZdbfZsdwkhpjZb.setGlgfdf(df);
...@@ -178,7 +182,7 @@ public class SjZdbfJcdwkhpjServiceImpl implements ISjZdbfJcdwkhpjService ...@@ -178,7 +182,7 @@ public class SjZdbfJcdwkhpjServiceImpl implements ISjZdbfJcdwkhpjService
sjZdbfZsdwkhpjZb.setYwcxkfs(new BigDecimal(kf)); sjZdbfZsdwkhpjZb.setYwcxkfs(new BigDecimal(kf));
//扣分比列 //扣分比列
BigDecimal df = sjZdbfZsdwkhpjZb.getYwcxzfs().add(new BigDecimal(kf)); BigDecimal df = sjZdbfZsdwkhpjZb.getYwcxzfs().add(new BigDecimal(kf));
BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getYwcxzfs(),BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal kfbl =df.divide(sjZdbfZsdwkhpjZb.getYwcxzfs(),4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
sjZdbfZsdwkhpjZb.setYwcxbl(new BigDecimal(100).subtract(kfbl)); sjZdbfZsdwkhpjZb.setYwcxbl(new BigDecimal(100).subtract(kfbl));
//得分 //得分
sjZdbfZsdwkhpjZb.setYwcxdf(df); sjZdbfZsdwkhpjZb.setYwcxdf(df);
...@@ -193,7 +197,7 @@ public class SjZdbfJcdwkhpjServiceImpl implements ISjZdbfJcdwkhpjService ...@@ -193,7 +197,7 @@ public class SjZdbfJcdwkhpjServiceImpl implements ISjZdbfJcdwkhpjService
//总扣分 //总扣分
sjZdbfZsdwkhpjZb.setZkf(sum.subtract(sunfs)); sjZdbfZsdwkhpjZb.setZkf(sum.subtract(sunfs));
//总扣分比例 //总扣分比例
BigDecimal bigDecimal = sunfs.divide(sum,BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal bigDecimal = sunfs.divide(sum,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
sjZdbfZsdwkhpjZb.setZkfbl(new BigDecimal(100).subtract(bigDecimal)); sjZdbfZsdwkhpjZb.setZkfbl(new BigDecimal(100).subtract(bigDecimal));
//综合得分 //综合得分
String deptDfl = dept.getDeptDfl(); String deptDfl = dept.getDeptDfl();
......
qianhe-ydsj/src/main/resources/mapper/SjZdbfZsdwwtcjMapper.xml
...@@ -145,9 +145,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -145,9 +145,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
</insert> </insert>
<insert id="batchSave"> <insert id="batchSave">
insert into sj_zdbf_zsdwwtcj( dept_id, rq, jcjb, wtmc, khnr, khxd, pjbzid, pjbzmc, zgzrr, zgcs, zgqx, zgzt) values insert into sj_zdbf_zsdwwtcj( dept_id, rq, jcjb, wtmc, khnr, khxd, pjbzid, pjbzmc, zgzrr, zgcs, zgqx, zgzt,create_by,create_time,remark,yl1,yl2,yl3,yl4,yl5) values
<foreach item="item" index="index" collection="list" separator=","> <foreach item="item" index="index" collection="list" separator=",">
( #{item.deptId}, #{item.rq}, #{item.jcjb}, #{item.wtmc}, #{item.khnr}, #{item.khxd}, #{item.pjbzid}, #{item.pjbzmc}, #{item.zgzrr}, #{item.zgcs}, #{item.zgqx}, #{item.zgzt}) ( #{item.deptId}, #{item.rq}, #{item.jcjb}, #{item.wtmc}, #{item.khnr}, #{item.khxd}, #{item.pjbzid}, #{item.pjbzmc}, #{item.zgzrr}, #{item.zgcs}, #{item.zgqx}, #{item.zgzt}
, #{item.createBy}, #{item.createTime}, #{item.remark},#{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5})
</foreach> </foreach>
</insert> </insert>
......
qianhe-ydsj/src/main/resources/mapper/SjZdbfbfzjcMapper.xml
...@@ -148,9 +148,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -148,9 +148,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
</insert> </insert>
<insert id="batchSave"> <insert id="batchSave">
insert into sj_zdbf_zsdwwtcj( dept_id, rq, jcjb, wtmc, khnr, khxd, pjbzid, pjbzmc, zgzrr, zgcs, zgqx, zgzt) values insert into sj_zdbf_zsdwwtcj( dept_id, rq, jcjb, wtmc, khnr, khxd, pjbzid, pjbzmc, zgzrr, zgcs, zgqx, zgzt,create_by,create_time,remark,yl1,yl2,yl3,yl4,yl5) values
<foreach item="item" index="index" collection="list" separator=","> <foreach item="item" index="index" collection="list" separator=",">
( #{item.deptId}, #{item.rq}, #{item.jcjb}, #{item.wtmc}, #{item.khnr}, #{item.khxd}, #{item.pjbzid}, #{item.pjbzmc}, #{item.zgzrr}, #{item.zgcs}, #{item.zgqx}, #{item.zgzt}) ( #{item.deptId}, #{item.rq}, #{item.jcjb}, #{item.wtmc}, #{item.khnr}, #{item.khxd}, #{item.pjbzid}, #{item.pjbzmc}, #{item.zgzrr}, #{item.zgcs}, #{item.zgqx}, #{item.zgzt}
, #{item.createBy}, #{item.createTime}, #{item.remark},#{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5})
</foreach> </foreach>
</insert> </insert>
......
qianhe-ydsj/src/main/resources/mapper/SjZdbfjgbmjcMapper.xml
...@@ -149,9 +149,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -149,9 +149,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
</insert> </insert>
<insert id="batchSave"> <insert id="batchSave">
insert into sj_zdbf_zsdwwtcj( dept_id, rq, jcjb, wtmc, khnr, khxd, pjbzid, pjbzmc, zgzrr, zgcs, zgqx, zgzt) values insert into sj_zdbf_zsdwwtcj( dept_id, rq, jcjb, wtmc, khnr, khxd, pjbzid, pjbzmc, zgzrr, zgcs, zgqx, zgzt,create_by,create_time,remark,yl1,yl2,yl3,yl4,yl5) values
<foreach item="item" index="index" collection="list" separator=","> <foreach item="item" index="index" collection="list" separator=",">
( #{item.deptId}, #{item.rq}, #{item.jcjb}, #{item.wtmc}, #{item.khnr}, #{item.khxd}, #{item.pjbzid}, #{item.pjbzmc}, #{item.zgzrr}, #{item.zgcs}, #{item.zgqx}, #{item.zgzt}) ( #{item.deptId}, #{item.rq}, #{item.jcjb}, #{item.wtmc}, #{item.khnr}, #{item.khxd}, #{item.pjbzid}, #{item.pjbzmc}, #{item.zgzrr}, #{item.zgcs}, #{item.zgqx}, #{item.zgzt}
, #{item.createBy}, #{item.createTime}, #{item.remark},#{item.yl1}, #{item.yl2}, #{item.yl3}, #{item.yl4}, #{item.yl5})
</foreach> </foreach>
</insert> </insert>
......
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