lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

12-23-修改项目绩效合同产值

Browse Source
This commit is contained in:
青云
2025-12-23 20:21:04 +08:00
parent b64dc2597e
commit fa869173e3
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectXmjxServiceImpl.java
View File

@ -442,33 +442,33 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
if (Objects.equals(zyszVo.getMainId(), vo.getId())){ if (Objects.equals(zyszVo.getMainId(), vo.getId())){
//计算设计产值 合同产值 * 系数 * 专业占比 * 设计产值系数 //计算设计产值 合同产值 * 系数 * 专业占比 * 设计产值系数
zyszVo.setSjcz( zyszVo.setSjcz(
vo.getHtcz().multiply(vo.getXs()) (vo.getHtcz().multiply(vo.getXs())
.multiply(zyszVo.getZyzb()) .multiply(zyszVo.getZyzb())
.multiply(sjcz) .multiply(sjcz)
.setScale(6, RoundingMode.HALF_UP).stripTrailingZeros()//万元，保留6位小数，四舍五入 .setScale(6, RoundingMode.HALF_UP)).stripTrailingZeros()//万元，保留6位小数，四舍五入
); );
zsjcz = zsjcz.add(zyszVo.getSjcz()); zsjcz = zsjcz.add(zyszVo.getSjcz());
//计算校审产值 合同产值 * 系数 * 专业占比 * 校审产值系数 //计算校审产值 合同产值 * 系数 * 专业占比 * 校审产值系数
zyszVo.setJscz( zyszVo.setJscz(
vo.getHtcz().multiply(vo.getXs()) (vo.getHtcz().multiply(vo.getXs())
.multiply(zyszVo.getZyzb()) .multiply(zyszVo.getZyzb())
.multiply(jscz) .multiply(jscz)
.setScale(6, RoundingMode.HALF_UP).stripTrailingZeros() .setScale(6, RoundingMode.HALF_UP)).stripTrailingZeros()
); );
zjscz = zjscz.add(zyszVo.getJscz()); zjscz = zjscz.add(zyszVo.getJscz());
//计算审核产值 合同产值 * 系数 * 专业占比 * 审核产值系数 //计算审核产值 合同产值 * 系数 * 专业占比 * 审核产值系数
zyszVo.setShcz( zyszVo.setShcz(
vo.getHtcz().multiply(vo.getXs()) (vo.getHtcz().multiply(vo.getXs())
.multiply(zyszVo.getZyzb()) .multiply(zyszVo.getZyzb())
.multiply(shcz) .multiply(shcz)
.setScale(6, RoundingMode.HALF_UP).stripTrailingZeros() .setScale(6, RoundingMode.HALF_UP)).stripTrailingZeros()
); );
zshcz = zshcz.add(zyszVo.getShcz()); zshcz = zshcz.add(zyszVo.getShcz());
//计算审核绩效 审核产值 * 绩效系数 //计算审核绩效 审核产值 * 绩效系数
zyszVo.setShjx(zyszVo.getShcz().multiply(jx).setScale(6, RoundingMode.HALF_UP).stripTrailingZeros()); zyszVo.setShjx((zyszVo.getShcz().multiply(jx).setScale(6, RoundingMode.HALF_UP)).stripTrailingZeros());
zshjx = zshjx.add(zyszVo.getShjx()); zshjx = zshjx.add(zyszVo.getShjx());
//通过历史记录构建人员详情 //通过历史记录构建人员详情
BusProjectXmjxRyxq shTemp = null; BusProjectXmjxRyxq shTemp = null;
@ -510,13 +510,13 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
ryxqs.add(shRyxq); ryxqs.add(shRyxq);
} }
} }
zyszVo.setShywccz(shywccz.stripTrailingZeros()); zyszVo.setShywccz(shywccz.stripTrailingZeros().stripTrailingZeros());
zyszVo.setShywcjx(shywcjx.stripTrailingZeros()); zyszVo.setShywcjx(shywcjx.stripTrailingZeros().stripTrailingZeros());
zyszVo.setShsycz((zyszVo.getShcz().subtract(shywccz)).stripTrailingZeros());//审核剩余产值 zyszVo.setShsycz((zyszVo.getShcz().subtract(shywccz)).stripTrailingZeros());//审核剩余产值
zyszVo.setShsyjx((zyszVo.getShjx().subtract(shywcjx)).stripTrailingZeros());//审核剩余绩效 zyszVo.setShsyjx((zyszVo.getShjx().subtract(shywcjx)).stripTrailingZeros());//审核剩余绩效
//计算校审绩效 校审产值 * 绩效系数 //计算校审绩效 校审产值 * 绩效系数
zyszVo.setJsjx(zyszVo.getJscz().multiply(jx).setScale(6, RoundingMode.HALF_UP).stripTrailingZeros()); zyszVo.setJsjx((zyszVo.getJscz().multiply(jx).setScale(6, RoundingMode.HALF_UP)).stripTrailingZeros());
zjsjx = zjsjx.add(zyszVo.getJsjx()); zjsjx = zjsjx.add(zyszVo.getJsjx());
//通过历史记录构建人员详情 //通过历史记录构建人员详情
BusProjectXmjxRyxq jsTemp = null; BusProjectXmjxRyxq jsTemp = null;
@ -559,14 +559,14 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
ryxqs.add(jsRyxq); ryxqs.add(jsRyxq);
} }
} }
zyszVo.setJsywccz(jsywccz.stripTrailingZeros()); zyszVo.setJsywccz(jsywccz.stripTrailingZeros().stripTrailingZeros());
zyszVo.setJsywcjx(jsywcjx.stripTrailingZeros()); zyszVo.setJsywcjx(jsywcjx.stripTrailingZeros().stripTrailingZeros());
zyszVo.setJssycz((zyszVo.getJscz().subtract(jsywccz)).stripTrailingZeros());//校审剩余产值 zyszVo.setJssycz((zyszVo.getJscz().subtract(jsywccz)).stripTrailingZeros());//校审剩余产值
zyszVo.setJssyjx((zyszVo.getJsjx().subtract(jsywcjx)).stripTrailingZeros());//校审剩余绩效 zyszVo.setJssyjx((zyszVo.getJsjx().subtract(jsywcjx)).stripTrailingZeros());//校审剩余绩效
//计算设计绩效 设计产值 * 绩效系数 //计算设计绩效 设计产值 * 绩效系数
BigDecimal sjywccz = BigDecimal.ZERO;//设计已完成产值 BigDecimal sjywccz = BigDecimal.ZERO;//设计已完成产值
zyszVo.setSjjx(zyszVo.getSjcz().multiply(jx).setScale(6, RoundingMode.HALF_UP).stripTrailingZeros()); zyszVo.setSjjx((zyszVo.getSjcz().multiply(jx).setScale(6, RoundingMode.HALF_UP)).stripTrailingZeros());
zsjjx = zsjjx.add(zyszVo.getSjjx()); zsjjx = zsjjx.add(zyszVo.getSjjx());
//通过历史记录构建人员详情 //通过历史记录构建人员详情
BusProjectXmjxRyxq sjTemp = null; BusProjectXmjxRyxq sjTemp = null;
@ -607,8 +607,8 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
ryxqs.add(sjRyxq); ryxqs.add(sjRyxq);
} }
} }
zyszVo.setSjywccz(sjywccz.stripTrailingZeros()); zyszVo.setSjywccz(sjywccz.stripTrailingZeros().stripTrailingZeros());
zyszVo.setSjywcjx(sjywcjx.stripTrailingZeros()); zyszVo.setSjywcjx(sjywcjx.stripTrailingZeros().stripTrailingZeros());
zyszVo.setSjsycz((zyszVo.getSjcz().subtract(sjywccz)).stripTrailingZeros()); zyszVo.setSjsycz((zyszVo.getSjcz().subtract(sjywccz)).stripTrailingZeros());
zyszVo.setSjsyjx((zyszVo.getSjjx().subtract(sjywcjx)).stripTrailingZeros());//设计剩余绩效 zyszVo.setSjsyjx((zyszVo.getSjjx().subtract(sjywcjx)).stripTrailingZeros());//设计剩余绩效