From 6e41324f84f0cf70871ca05292c5420bdcaaa98c Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期日, 04 二月 2024 14:36:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 6 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java index e88c688..d8b8640 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java @@ -8,10 +8,7 @@ import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; -import com.doumee.dao.business.DispatchUnitMapper; -import com.doumee.dao.business.DuLogMapper; -import com.doumee.dao.business.DuSolutionMapper; -import com.doumee.dao.business.DuWorktypeMapper; +import com.doumee.dao.business.*; import com.doumee.dao.business.dto.*; import com.doumee.dao.business.join.DispatchUnitJoinMapper; import com.doumee.dao.business.join.DuLogJoinMapper; @@ -71,6 +68,9 @@ @Autowired private SystemDictDataBiz systemDictDataBiz; + @Autowired + private NoticesMapper noticesMapper; + @Override @Transactional(rollbackFor = {Exception.class,BusinessException.class}) public Integer checkWorktype(DispatchUnit param) { @@ -126,6 +126,13 @@ //瀛樺偍鎿嶄綔鍘嗗彶 this.saveDuLog(update,Constants.DispatchUnitLogType.WORK_TYPE_AUDIT_UN_PASS,update.getCheckInfo()); } + + + //瀛樺偍寰呭姙淇℃伅 + Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.DISPATCH_UNIT; + //鍒犻櫎鍏朵粬寰呭姙 + noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId())); + return 1; } @@ -263,6 +270,13 @@ //瀛樺偍鎿嶄綔鍘嗗彶 this.saveDuLog(dispatchUnit,Constants.DispatchUnitLogType.AUDIT_UN_PASS,update.getCheckInfo()); } + + //瀛樺偍寰呭姙淇℃伅 + Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.DISPATCH_UNIT; + //鍒犻櫎鍏朵粬寰呭姙 + noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,dispatchUnit.getId())); + + return 1; } @Override @@ -356,6 +370,16 @@ duWorktypeMapper.insert(duWorktype); } } + + + //瀛樺偍寰呭姙淇℃伅 + Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.DISPATCH_UNIT; + //鍒犻櫎鍏朵粬寰呭姙 + noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,dispatchUnit.getId())); + Notices notices = new Notices(noticeObjectType,Constants.ZERO,dispatchUnit.getId(),dispatchUnit.getName(), + dispatchUnit.getCompanyId(), Constants.NoticeType.ZERO); + noticesMapper.insert(notices); + return dispatchUnit.getId(); } @@ -402,6 +426,15 @@ // this.dealDuData(saveDispatchUnitDTO,loginUserInfo); + + //瀛樺偍寰呭姙淇℃伅 + Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.DISPATCH_UNIT; + //鍒犻櫎鍏朵粬寰呭姙 + noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,dispatchUnit.getId())); + Notices notices = new Notices(noticeObjectType,Constants.ZERO,dispatchUnit.getId(),dispatchUnit.getName(), + dispatchUnit.getCompanyId(), Constants.NoticeType.ZERO); + noticesMapper.insert(notices); + return dispatchUnit.getId(); } @@ -433,6 +466,15 @@ //瀛樺偍鎿嶄綔鍘嗗彶 this.saveDuLog(dispatchUnit,Constants.DispatchUnitLogType.ADD_WORK_TYPE,null); this.dealDuData(saveDispatchUnitDTO,loginUserInfo); + + //瀛樺偍寰呭姙淇℃伅 + Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.DISPATCH_UNIT; + //鍒犻櫎鍏朵粬寰呭姙 + noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,dispatchUnit.getId())); + Notices notices = new Notices(noticeObjectType,Constants.ZERO,dispatchUnit.getId(),dispatchUnit.getName(), + dispatchUnit.getCompanyId(), Constants.NoticeType.ONE); + noticesMapper.insert(notices); + return dispatchUnit.getId(); } @@ -513,7 +555,7 @@ if(Objects.isNull(dispatchUnit)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌娲鹃仯鍗曚綅淇℃伅"); } - //娲鹃仯鍗曚綅瀹℃壒 + //娲鹃仯鍗曚綅瀹℃牳 if(dispatchUnitAuditDTO.getAuditType().equals(Constants.ZERO)){ if(dispatchUnit.getStatus().equals(Constants.ONE)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"娲鹃仯鍗曚綅淇℃伅宸插鏍�"); @@ -856,7 +898,8 @@ .eq(DispatchUnit::getIsdeleted,Constants.ZERO) .eq(loginUserInfo.getType().equals(Constants.ONE),DispatchUnit::getCompanyId,loginUserInfo.getCompanyId()) .eq(DispatchUnit::getStatus,Constants.ZERO) - .eq(DispatchUnit::getDataType,dispatchUnitQueryDTO.getDataType()) + //.eq(DispatchUnit::getDataType,dispatchUnitQueryDTO.getDataType()) + .eq(DispatchUnit::getDataType,Constants.TWO) .eq(!Objects.isNull(dispatchUnitQueryDTO.getSolutionId()),DuSolution::getSolutionId,dispatchUnitQueryDTO.getSolutionId()) .exists(!Objects.isNull(dispatchUnitQueryDTO.getApplyId()), " select 1 from apply_detail ad where ad.isdeleted = 0 and ad.apply_id = "+dispatchUnitQueryDTO.getApplyId()+" " + -- Gitblit v1.9.3