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

12-22-项目绩效-中板-修改-剩余已完成产值版-绩效版

Browse Source
This commit is contained in:
青云
2025-12-22 16:40:23 +08:00
parent d933e78798
commit facd2ff1c5
2 changed files with 42 additions and 48 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/domain/vo/BusProjectZyzbVo.java
View File

@ -178,4 +178,34 @@ public class BusProjectZyzbVo implements Serializable {
* 审核绩效
*/
private BigDecimal shjx;
/**
* 设计已完成绩效
*/
private BigDecimal sjywcjx;
/**
* 校审已完成绩效
*/
private BigDecimal jsywcjx;
/**
* 审核已完成绩效
*/
private BigDecimal shywcjx;
/**
* 设计剩余绩效
*/
private BigDecimal sjsyjx;
/**
* 校审剩余绩效
*/
private BigDecimal jssyjx;
/**
* 审核剩余绩效
*/
private BigDecimal shsyjx;
}

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

@ -312,54 +312,6 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
}
// for (BusProjectZyzbVo oldZy : old.getZyszVos()) {
// boolean flag = false;
// BusProjectZyzbBo newValue = null;
//
// for (BusProjectZyzbBo nowZy : bo.getZyszBos()) {
// //如果新id对应旧id则更新 如果为空或者没找到就添加
// if (nowZy.getId() != null && oldZy.getId().equals(nowZy.getId())){
//
// //设计
// if (!nowZy.getSjfzr().equals(oldZy.getSjfzr()) ||
// !nowZy.getSjwcjd().equals(oldZy.getSjwcjd())){
// BusProjectXmjxWcjdHistoryBo sjBo = new BusProjectXmjxWcjdHistoryBo();
// sjBo.setMainId(nowZy.getId());
// sjBo.setUserId(nowZy.getSjfzr());
// sjBo.setUserType(1L);
// sjBo.setWcjd(nowZy.getSjwcjd());
// historyService.insertByBo(sjBo);
// }
// //校审
// if (!nowZy.getJsfzr().equals(oldZy.getJsfzr()) || !nowZy.getJswcjd().equals(oldZy.getJswcjd())){
// BusProjectXmjxWcjdHistoryBo jsBo = new BusProjectXmjxWcjdHistoryBo();
// jsBo.setMainId(nowZy.getId());
// jsBo.setUserId(nowZy.getJsfzr());
// jsBo.setUserType(2L);
// jsBo.setWcjd(nowZy.getJswcjd());
// historyService.insertByBo(jsBo);
// }
// //审核
// if (!nowZy.getShfzr().equals(oldZy.getShfzr()) || !nowZy.getShwcjd().equals(oldZy.getShwcjd())){
// BusProjectXmjxWcjdHistoryBo shBo = new BusProjectXmjxWcjdHistoryBo();
// shBo.setMainId(nowZy.getId());
// shBo.setUserId(nowZy.getShfzr());
// shBo.setUserType(3L);
// shBo.setWcjd(nowZy.getShwcjd());
// historyService.insertByBo(shBo);
// }
//
// zyszService.updateByBo(nowZy);
// newValue = nowZy;
// flag = true;
// break;
// }
// }
// if (!flag){
// zyszService.insertByBo(newValue);
// addHistory(newValue);
// }
// }
}else {
if (old.getZyszVos() != null && !old.getZyszVos().isEmpty()){
zyszService.removeByIds(old.getZyszVos());
@ -519,6 +471,7 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
//通过历史记录构建人员详情
BusProjectXmjxRyxq shTemp = null;
BigDecimal shywccz = BigDecimal.ZERO;//审核已完成产值
BigDecimal shywcjx = BigDecimal.ZERO;//审核已完成绩效
for (BusProjectXmjxWcjdHistoryVo historyVo : historyVos) {
if (historyVo.getUserType().equals(3L) &&
historyVo.getMainId().equals(zyszVo.getId())
@ -548,12 +501,15 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
shRyxq.setSyjx(shTemp.getSyjx().subtract(shRyxq.getJx()));
}
shywccz = shywccz.add(shRyxq.getCz());
shywcjx = shywcjx.add(shRyxq.getJx());
shTemp = shRyxq;
ryxqs.add(shRyxq);
}
}
zyszVo.setShywccz(shywccz);
zyszVo.setShywcjx(shywcjx);
zyszVo.setShsycz(zyszVo.getShcz().subtract(shywccz));//审核剩余产值
zyszVo.setShsyjx(zyszVo.getShjx().subtract(shywcjx));//审核剩余绩效
//计算校审绩效 校审产值 * 绩效系数
zyszVo.setJsjx(zyszVo.getJscz().multiply(jx).setScale(6, RoundingMode.HALF_UP));
@ -561,6 +517,7 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
//通过历史记录构建人员详情
BusProjectXmjxRyxq jsTemp = null;
BigDecimal jsywccz = BigDecimal.ZERO;//校审已完成产值
BigDecimal jsywcjx = BigDecimal.ZERO;//校审已完成绩效
for (BusProjectXmjxWcjdHistoryVo historyVo : historyVos) {
if (historyVo.getUserType().equals(2L) &&
historyVo.getMainId().equals(zyszVo.getId())
@ -591,12 +548,15 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
jsRyxq.setSyjx(jsTemp.getSyjx().subtract(jsRyxq.getJx()));
}
jsywccz = jsywccz.add(jsRyxq.getCz());
jsywcjx = jsywcjx.add(jsRyxq.getJx());
jsTemp = jsRyxq;
ryxqs.add(jsRyxq);
}
}
zyszVo.setJsywccz(jsywccz);
zyszVo.setJsywcjx(jsywcjx);
zyszVo.setJssycz(zyszVo.getJscz().subtract(jsywccz));//校审剩余产值
zyszVo.setJssyjx(zyszVo.getJsjx().subtract(jsywcjx));//校审剩余绩效
//计算设计绩效 设计产值 * 绩效系数
BigDecimal sjywccz = BigDecimal.ZERO;//设计已完成产值
@ -604,6 +564,7 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
zsjjx = zsjjx.add(zyszVo.getSjjx());
//通过历史记录构建人员详情
BusProjectXmjxRyxq sjTemp = null;
BigDecimal sjywcjx = BigDecimal.ZERO;//设计已完成绩效
for (BusProjectXmjxWcjdHistoryVo historyVo : historyVos) {
if (historyVo.getUserType().equals(1L) &&
historyVo.getMainId().equals(zyszVo.getId())
@ -633,12 +594,15 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
sjRyxq.setSyjx(sjTemp.getSyjx().subtract(sjRyxq.getJx()));
}
sjywccz = sjywccz.add(sjRyxq.getCz());
sjywcjx = sjywcjx.add(sjRyxq.getJx());
sjTemp = sjRyxq;
ryxqs.add(sjRyxq);
}
}
zyszVo.setSjywccz(sjywccz);
zyszVo.setSjywcjx(sjywcjx);
zyszVo.setSjsycz(zyszVo.getSjcz().subtract(sjywccz));
zyszVo.setSjsyjx(zyszVo.getSjjx().subtract(sjywcjx));//设计剩余绩效
//添加数组
zyszVos1.add(zyszVo);//专业详情