Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

MrShi

2025-01-02 77d8f6ccb72cb64c29e77c39fcc8298781d008bb

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java

@@ -135,7 +135,33 @@
                .orderByDesc(YwPatrolScheme::getCreateDate)
        ;
        IPage<YwPatrolTaskRecord> iPage = ywPatrolTaskRecordMapper.selectJoinPage(page,YwPatrolTaskRecord.class,queryWrapper); 
        if(iPage!=null && iPage.getRecords()!=null){
            for(YwPatrolTaskRecord m : iPage.getRecords()){
                getFileListByModel(m);
            }
        }
        return PageData.from(iPage);
    }

    private void getFileListByModel(YwPatrolTaskRecord ywPatrolTaskRecord) {
        //附件数据
        List<Multifile> multifileList = multifileMapper.selectJoinList(Multifile.class,new MPJLambdaWrapper<Multifile>()
                .selectAll(Multifile.class)
                .selectAs(SystemUser::getRealname,Multifile::getUserName)
                .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator)
                .eq(Multifile::getObjId,ywPatrolTaskRecord.getId())
                .eq(Multifile::getIsdeleted,Constants.ZERO)
                .eq(Multifile::getObjType,Constants.MultiFile.FN_PATROL_TASK_RECORD_FILE.getKey()));
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
            String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_PATROL).getCode();
            for (Multifile multifile:multifileList) {
                if(StringUtils.isNotBlank(multifile.getFileurl())){
                    multifile.setFileurlFull(path + multifile.getFileurl());
                }
            }
            ywPatrolTaskRecord.setMultifileList(multifileList);
        }
    }

    @Override
@@ -188,17 +214,24 @@

        if(ywPatrolTaskRecordMapper.selectCount(new QueryWrapper<YwPatrolTaskRecord>().lambda()
                .eq(YwPatrolTaskRecord::getTaskId,ywPatrolTask.getId())
                .eq(YwPatrolTaskRecord::getStatus,Constants.ZERO)
                .ne(YwPatrolTaskRecord::getId,ywPatrolTaskRecord.getId()))==Constants.ZERO){
            ywPatrolTask.setStatus(Constants.THREE);
            ywPatrolTaskMapper.update(null,new UpdateWrapper<YwPatrolTask>().lambda()
                    .eq(YwPatrolTask::getId,ywPatrolTask.getId())
                    .set(YwPatrolTask::getStatus,Constants.THREE)
                    .set(YwPatrolTask::getEditDate,DateUtil.getCurrDateTime())
                    .set(YwPatrolTask::getDealDate,DateUtil.getCurrDateTime())
                    .set(YwPatrolTask::getDealUserId,loginUserInfo.getId())
                    .set(YwPatrolTask::getEditor,loginUserInfo.getId())
            );
        }else{
            ywPatrolTask.setStatus(Constants.ONE);
            ywPatrolTaskMapper.update(null,new UpdateWrapper<YwPatrolTask>().lambda()
                    .eq(YwPatrolTask::getId,ywPatrolTask.getId())
                    .set(YwPatrolTask::getStatus,Constants.ONE)
                    .set(YwPatrolTask::getEditDate,DateUtil.getCurrDateTime())
                    .set(YwPatrolTask::getEditor,loginUserInfo.getId())
            );
        }
        //查询是否存在其他未
       ywPatrolTaskMapper.update(null,new UpdateWrapper<YwPatrolTask>().lambda().eq(YwPatrolTask::getId,ywPatrolTask.getId())
               .set(YwPatrolTask::getStatus,ywPatrolTask.getStatus())
               .set(YwPatrolTask::getEditDate,DateUtil.getCurrDateTime())
               .set(YwPatrolTask::getEditor,loginUserInfo.getId())
       );
        //附件数据
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywPatrolTaskRecord.getMultifileList())){
            for (Multifile multifile:ywPatrolTaskRecord.getMultifileList()) {
@@ -221,6 +254,41 @@


    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public YwPatrolTaskRecord getPointRecordByCode(YwPatrolTaskRecord bean) {
        if(Objects.isNull(bean)
        || Objects.isNull(bean.getTaskId())
        || StringUtils.isBlank(bean.getPointCode())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        YwPatrolTaskRecord ywPatrolTaskRecord = ywPatrolTaskRecordMapper.selectJoinOne(YwPatrolTaskRecord.class,new MPJLambdaWrapper<YwPatrolTaskRecord>()
                .selectAll(YwPatrolTaskRecord.class)
                .selectAs(YwPatrolPoint::getName,YwPatrolTaskRecord::getPointName)
                .selectAs(YwPatrolPoint::getContent,YwPatrolTaskRecord::getContent)
                .selectAs(SystemUser::getRealname,YwPatrolTaskRecord::getRealname)
                .selectAs(Company::getName,YwPatrolTaskRecord::getCompanyName)
                .leftJoin(YwPatrolPoint.class,YwPatrolPoint::getId,YwPatrolTaskRecord::getPointId)
                .leftJoin(SystemUser.class,SystemUser::getId,YwPatrolTaskRecord::getDealUserId)
                .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                .eq(YwPatrolScheme::getIsdeleted, Constants.ZERO)
                .eq(YwPatrolPoint::getCode,bean.getPointCode())
                .eq(YwPatrolTaskRecord::getTaskId,bean.getTaskId())
                .orderByDesc(YwPatrolScheme::getCreateDate)
                .last(" limit 1 ")
        );
        if(Objects.isNull(ywPatrolTaskRecord)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未匹配到巡检点!");
        }
        getFileListByModel(ywPatrolTaskRecord);

        return ywPatrolTaskRecord;

    }




    @Override
    public YwPatrolTaskRecord getDetail(Integer id) {

        YwPatrolTaskRecord ywPatrolTaskRecord = ywPatrolTaskRecordMapper.selectJoinOne(YwPatrolTaskRecord.class,new MPJLambdaWrapper<YwPatrolTaskRecord>()