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 09:33:27 +08:00
parent 5d56cec7e5
commit b4b5b7581e
1 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,8 +197,8 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
BusProjectXmjxVo old = queryById(update.getId());
//专业更新 不能改变id
if (bo.getZyszBos() != null && !bo.getZyszBos().isEmpty()){
// List<BusProjectXmjxWcjdHistoryVo> historyVos = historyService.queryList(new BusProjectXmjxWcjdHistoryBo());
//如果涉及到动态专业 那么这里就要继续完善
for (BusProjectZyzbBo nowZy : bo.getZyszBos()) {
boolean flag = false;
@ -206,33 +206,69 @@ public class BusProjectXmjxServiceImpl extends ServiceImpl<BusProjectXmjxMapper,
//从新的之中找到了老的
if (nowZy != null && oldZy.getId().equals(nowZy.getId())){
flag = true;
//更新之前判断历史是否需要更新
//设计
if (!nowZy.getSjfzr().equals(oldZy.getSjfzr()) || !nowZy.getSjwcjd().equals(oldZy.getSjwcjd())){
//更新之前判断历史是否需要更新 新增的时候会加历史记录 修改的时候如果只变了进度 那么更新历史中这个专业这个岗位这个人的进度
//设计 人变了 人没变进度变了更新 人进度都没变
if (!nowZy.getSjfzr().equals(oldZy.getSjfzr())){
BusProjectXmjxWcjdHistoryBo sjBo = new BusProjectXmjxWcjdHistoryBo();
sjBo.setMainId(nowZy.getId());
sjBo.setUserId(nowZy.getSjfzr());
sjBo.setUserType(1L);
sjBo.setWcjd(nowZy.getSjwcjd());
historyService.insertByBo(sjBo);
} else if (!nowZy.getSjwcjd().equals(oldZy.getSjwcjd())) {
BusProjectXmjxWcjdHistoryBo sjBo = new BusProjectXmjxWcjdHistoryBo();
sjBo.setMainId(nowZy.getId());
sjBo.setUserId(nowZy.getSjfzr());
sjBo.setUserType(1L);
sjBo.setWcjd(oldZy.getSjwcjd());
List<BusProjectXmjxWcjdHistoryVo> historyVos = historyService.queryList(sjBo);
if (historyVos!=null && !historyVos.isEmpty()){
sjBo.setId(historyVos.getFirst().getId());
sjBo.setWcjd(nowZy.getSjwcjd());
historyService.updateByBo(sjBo);
}
}
//校审
if (!nowZy.getJsfzr().equals(oldZy.getJsfzr()) || !nowZy.getJswcjd().equals(oldZy.getJswcjd())){
if (!nowZy.getJsfzr().equals(oldZy.getJsfzr())){
BusProjectXmjxWcjdHistoryBo jsBo = new BusProjectXmjxWcjdHistoryBo();
jsBo.setMainId(nowZy.getId());
jsBo.setUserId(nowZy.getJsfzr());
jsBo.setUserType(2L);
jsBo.setWcjd(nowZy.getJswcjd());
historyService.insertByBo(jsBo);
} else if (!nowZy.getJswcjd().equals(oldZy.getJswcjd())) {
BusProjectXmjxWcjdHistoryBo jsBo = new BusProjectXmjxWcjdHistoryBo();
jsBo.setMainId(nowZy.getId());
jsBo.setUserId(nowZy.getJsfzr());
jsBo.setUserType(2L);
jsBo.setWcjd(oldZy.getJswcjd());
List<BusProjectXmjxWcjdHistoryVo> historyVos = historyService.queryList(jsBo);
if (historyVos!=null && !historyVos.isEmpty()){
jsBo.setId(historyVos.getFirst().getId());
jsBo.setWcjd(nowZy.getJswcjd());
historyService.updateByBo(jsBo);
}
}
//审核
if (!nowZy.getShfzr().equals(oldZy.getShfzr()) || !nowZy.getShwcjd().equals(oldZy.getShwcjd())){
if (!nowZy.getShfzr().equals(oldZy.getShfzr())){
BusProjectXmjxWcjdHistoryBo shBo = new BusProjectXmjxWcjdHistoryBo();
shBo.setMainId(nowZy.getId());
shBo.setUserId(nowZy.getShfzr());
shBo.setUserType(3L);
shBo.setWcjd(nowZy.getShwcjd());
historyService.insertByBo(shBo);
} else if (!nowZy.getShwcjd().equals(oldZy.getShwcjd())) {
BusProjectXmjxWcjdHistoryBo shBo = new BusProjectXmjxWcjdHistoryBo();
shBo.setMainId(nowZy.getId());
shBo.setUserId(nowZy.getShfzr());
shBo.setUserType(3L);
shBo.setWcjd(oldZy.getShwcjd());
List<BusProjectXmjxWcjdHistoryVo> historyVos = historyService.queryList(shBo);
if (historyVos!=null && !historyVos.isEmpty()){
shBo.setId(historyVos.getFirst().getId());
shBo.setWcjd(nowZy.getShwcjd());
historyService.updateByBo(shBo);
}
}
zyszService.updateByBo(nowZy);