From 3e76171990be40e226341da1cd7c2d159c9a3b70 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 02 二月 2024 18:11:31 +0800 Subject: [PATCH] 111 --- server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java | 72 +++++++++++++++++++++++++---------- 1 files changed, 51 insertions(+), 21 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 09930a0..bc2c5db 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 @@ -349,12 +363,23 @@ duWorktype.setDuSolutionId(duSolution.getId()); duWorktype.setStatus(Constants.ZERO); duWorktype.setSortnum(j); + duWorktype.setDispatchUnitId(dispatchUnit.getId()); duWorktype.setWorkTypeId(saveDuWorkTypeDTO.getWorkTypeId()); duWorktype.setVideoUrl(saveDuWorkTypeDTO.getVideoUrl()); duWorktype.setStatus2(Constants.ZERO); 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(); } @@ -401,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(); } @@ -432,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(); } @@ -481,6 +524,7 @@ duWorktype.setDuSolutionId(duSolution.getId()); duWorktype.setStatus(Constants.ZERO); duWorktype.setSortnum(duWorkTypeNum + j); + duWorktype.setDispatchUnitId(saveDispatchUnitDTO.getId()); duWorktype.setWorkTypeId(saveDuWorkTypeDTO.getWorkTypeId()); duWorktype.setVideoUrl(saveDuWorkTypeDTO.getVideoUrl()); duWorktype.setStatus2(Constants.ZERO); @@ -847,19 +891,6 @@ @Override public List<DispatchUnit> findByDTO(DispatchUnitQueryDTO dispatchUnitQueryDTO) { LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); -// List<DispatchUnit> dispatchUnitList = dispatchUnitMapper.selectList(new QueryWrapper<DispatchUnit>().lambda() -// .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()) -// .apply(!Objects.isNull(dispatchUnitQueryDTO.getSolutionId()), " id in ( select d.dispatch_unit_id from du_solution d where d.solution_id = "+dispatchUnitQueryDTO.getSolutionId()+" ) " ) -// .exists(!Objects.isNull(dispatchUnitQueryDTO.getApplyId()), -// " select 1 from apply_detail ad where ad.isdeleted = 0 and ad.apply_id = "+dispatchUnitQueryDTO.getApplyId()+" " + -// " ad.du_id = t.id ") -// .orderByAsc(DispatchUnit::getSortnum) -// ); - - List<DispatchUnit> dispatchUnitList = dispatchUnitJoinMapper.selectJoinList(DispatchUnit.class, new MPJLambdaWrapper<DispatchUnit>().selectAll(DispatchUnit.class) .selectAs(DuSolution::getId,DispatchUnit::getDuSolutionId) @@ -867,14 +898,13 @@ .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()+" " + - " ad.du_id = t.id ") + " and ad.du_id = t.id ") ); - - return dispatchUnitList; } -- Gitblit v1.9.3