From 9527290586e6c5f6a9c764f64dccc4c9a1c87e56 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 10 四月 2025 17:25:13 +0800 Subject: [PATCH] 代码初始化 --- server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 78 +++++++++++++++++++++++++++++++++++++- 1 files changed, 75 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java index 60995de..c6a91b9 100644 --- a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java +++ b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java @@ -380,6 +380,13 @@ } //鏌ヨ鏃ュ織淇℃伅 workorder.setLogList(this.getLogList(workorder.getId())); + if(Constants.equalsInteger(workorder.getType(),Constants.ONE)){ + //濡傛灉鏄疍CA鎻愪氦璁板綍锛屾煡璇㈠瓙宸ュ崟闆嗗悎 + Workorder param = new Workorder(); + param.setIsdeleted(Constants.ZERO); + param.setDcaRecordId(workorder.getId()); + workorder.setDcaChildList(findList(param)); + } return workorder; } @@ -464,9 +471,72 @@ } @Override - public List<Workorder> findList(Workorder workorder) { - QueryWrapper<Workorder> wrapper = new QueryWrapper<>(workorder); - return workorderMapper.selectList(wrapper); + public List<Workorder> findList(Workorder pageWrap) { + MPJLambdaWrapper<Workorder> queryWrapper = new MPJLambdaWrapper<>(); + pageWrap.setIsdeleted(Constants.ZERO); + queryWrapper + .selectAll(Workorder.class) + .selectAs(Member::getName,Workorder::getMemberName) + .selectAs(Member::getCompanyName,Workorder::getCompanyName) + .selectAs(Member::getPhone,Workorder::getMemberPhone) + .select(" c3.name ",Workorder::getTypeName) + .select(" c4.name ",Workorder::getProblemName) + .leftJoin(Member.class,Member::getId,Workorder::getMemberId) + .leftJoin(" category c3 on t.TYPE_ID = c3.id ") //椋庨櫓绫诲瀷 + .leftJoin(" category c4 on t.PROBLEM_ID = c4.id ") //DCA闂缂栫爜 + .eq( pageWrap.getId() != null, Workorder::getId, pageWrap.getId()) + .eq( pageWrap.getCreator() != null, Workorder::getCreator, pageWrap.getCreator()) + .ge( pageWrap.getCreateDate() != null, Workorder::getCreateDate, Utils.Date.getStart( pageWrap.getCreateDate())) + .le( pageWrap.getCreateDate() != null, Workorder::getCreateDate, Utils.Date.getEnd( pageWrap.getCreateDate())) + .eq( pageWrap.getEditor() != null, Workorder::getEditor, pageWrap.getEditor()) + .ge( pageWrap.getEditDate() != null, Workorder::getEditDate, Utils.Date.getStart( pageWrap.getEditDate())) + .le( pageWrap.getEditDate() != null, Workorder::getEditDate, Utils.Date.getEnd( pageWrap.getEditDate())) + .eq( pageWrap.getIsdeleted() != null, Workorder::getIsdeleted, pageWrap.getIsdeleted()) + .eq( pageWrap.getCategoryId() != null, Workorder::getCategoryId, pageWrap.getCategoryId()) + .eq( pageWrap.getRemark() != null, Workorder::getRemark, pageWrap.getRemark()) + .eq( pageWrap.getStatus() != null, Workorder::getStatus, pageWrap.getStatus()) + .eq( pageWrap.getSortnum() != null, Workorder::getSortnum, pageWrap.getSortnum()) + .eq( pageWrap.getType() != null, Workorder::getType, pageWrap.getType()) + .eq( pageWrap.getMemberId() != null, Workorder::getMemberId, pageWrap.getMemberId()) + .eq( pageWrap.getCompanyId() != null, Workorder::getCompanyId, pageWrap.getCompanyId()) + .eq( pageWrap.getSubmitDate() != null, Workorder::getSubmitDate, pageWrap.getSubmitDate()) + .eq( pageWrap.getMemberType() != null, Workorder::getMemberType, pageWrap.getMemberType()) + .eq( pageWrap.getMemberQwids() != null, Workorder::getMemberQwids, pageWrap.getMemberQwids()) + .like( pageWrap.getMemberNames() != null, Workorder::getMemberNames, pageWrap.getMemberNames()) + .eq( pageWrap.getLocaltionId() != null, Workorder::getLocaltionId, pageWrap.getLocaltionId()) + .eq( pageWrap.getOutJiuyi() != null, Workorder::getOutJiuyi, pageWrap.getOutJiuyi()) + .eq( pageWrap.getIsYiwushi() != null, Workorder::getIsYiwushi, pageWrap.getIsYiwushi()) + .eq( pageWrap.getIsHurted() != null, Workorder::getIsHurted, pageWrap.getIsHurted()) + .eq( pageWrap.getWorkRelated() != null, Workorder::getWorkRelated, pageWrap.getWorkRelated()) + .eq( pageWrap.getEventInfo() != null, Workorder::getEventInfo, pageWrap.getEventInfo()) + .eq( pageWrap.getEmialMemberIds() != null, Workorder::getEmialMemberIds, pageWrap.getEmialMemberIds()) + .eq( pageWrap.getQwnoticeMemberIds() != null, Workorder::getQwnoticeMemberIds, pageWrap.getQwnoticeMemberIds()) + .eq( pageWrap.getHappenTime() != null, Workorder::getHappenTime, pageWrap.getHappenTime()) + .eq( pageWrap.getTypeId() != null, Workorder::getTypeId, pageWrap.getTypeId()) + .eq( pageWrap.getRiskInfo() != null, Workorder::getRiskInfo, pageWrap.getRiskInfo()) + .eq( pageWrap.getManagerId() != null, Workorder::getManagerId, pageWrap.getManagerId()) + .eq( pageWrap.getDealerId() != null, Workorder::getDealerId, pageWrap.getDealerId()) + .ge( pageWrap.getDispatchTime() != null, Workorder::getDispatchTime, Utils.Date.getStart( pageWrap.getDispatchTime())) + .le( pageWrap.getDispatchTime() != null, Workorder::getDispatchTime, Utils.Date.getEnd( pageWrap.getDispatchTime())) + .eq( pageWrap.getDispatchInfo() != null, Workorder::getDispatchInfo, pageWrap.getDispatchInfo()) + .ge( pageWrap.getDealTime() != null, Workorder::getDealTime, Utils.Date.getStart( pageWrap.getDealTime())) + .le( pageWrap.getDealTime() != null, Workorder::getDealTime, Utils.Date.getEnd( pageWrap.getDealTime())) + .eq( pageWrap.getDealInfo() != null, Workorder::getDealInfo, pageWrap.getDealInfo()) + .eq( pageWrap.getProblemTitle() != null, Workorder::getProblemTitle, pageWrap.getProblemTitle()) + .eq( pageWrap.getProblemId() != null, Workorder::getProblemId, pageWrap.getProblemId()) + .eq( pageWrap.getProblemInfo() != null, Workorder::getProblemInfo, pageWrap.getProblemInfo()) + .eq( pageWrap.getLocationName() != null, Workorder::getLocationName, pageWrap.getLocationName()) + .like( pageWrap.getCode() != null, Workorder::getCode, pageWrap.getCode()) + .eq( pageWrap.getDcaYesNum() != null, Workorder::getDcaYesNum, pageWrap.getDcaYesNum()) + .eq( pageWrap.getDcaNoNum() != null, Workorder::getDcaNoNum, pageWrap.getDcaNoNum()) + .eq( pageWrap.getDcaRecordId() != null, Workorder::getDcaRecordId, pageWrap.getDcaRecordId()) + .eq( pageWrap.getDcaCsIds() != null, Workorder::getDcaCsIds, pageWrap.getDcaCsIds()) ; + if ( pageWrap.getMemberName() != null) { + queryWrapper.and( ms->ms.like(Member::getName, pageWrap.getMemberName()) + .or().like(Member::getPhone, pageWrap.getMemberName()) ); + } + queryWrapper.orderByDesc(Workorder::getProblemId); + return workorderMapper.selectJoinList(Workorder.class,queryWrapper); } @Override @@ -480,11 +550,13 @@ .selectAs(Member::getName,Workorder::getMemberName) .selectAs(Member::getCompanyName,Workorder::getCompanyName) .selectAs(Member::getPhone,Workorder::getMemberPhone) + .select(" c2.name ",Workorder::getCategoryName) .select(" c3.name ",Workorder::getTypeName) .select(" c4.name ",Workorder::getProblemName) .leftJoin(Member.class,Member::getId,Workorder::getMemberId) .leftJoin(" category c3 on t.TYPE_ID = c3.id ") //椋庨櫓绫诲瀷 .leftJoin(" category c4 on t.PROBLEM_ID = c4.id ") //DCA闂缂栫爜 + .leftJoin(" category c2 on t.CATEGORY_ID = c2.id ") //DCA闂缂栫爜 .eq(pageWrap.getModel().getId() != null, Workorder::getId, pageWrap.getModel().getId()) .eq(pageWrap.getModel().getCreator() != null, Workorder::getCreator, pageWrap.getModel().getCreator()) .ge(pageWrap.getModel().getCreateDate() != null, Workorder::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate())) -- Gitblit v1.9.3