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

liukangdong

2024-11-27 a856cfc04747d4d8f3605168531b253240d2e87c

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

@@ -65,13 +65,15 @@
        ywPatrolPointMapper.insert(ywPatrolPoint);


        if(Objects.nonNull(ywPatrolPoint.getMultifile())){
            ywPatrolPoint.getMultifile().setCreator(loginUserInfo.getId());
            ywPatrolPoint.getMultifile().setCreateDate(new Date());
            ywPatrolPoint.getMultifile().setIsdeleted(Constants.ZERO);
            ywPatrolPoint.getMultifile().setObjType(Constants.MultiFile.FN_PATROL_POINT_FILE.getKey());
            ywPatrolPoint.getMultifile().setObjId(ywPatrolPoint.getId());
            multifileMapper.insert(ywPatrolPoint.getMultifile());
        if(Objects.nonNull(ywPatrolPoint.getFileUrl())){
            Multifile multifile = new Multifile();
            multifile.setCreator(loginUserInfo.getId());
            multifile.setCreateDate(new Date());
            multifile.setIsdeleted(Constants.ZERO);
            multifile.setObjType(Constants.MultiFile.FN_PATROL_POINT_FILE.getKey());
            multifile.setObjId(ywPatrolPoint.getId());
            multifile.setFileurl(ywPatrolPoint.getFileUrl());
            multifileMapper.insert(multifile);
        }

        return ywPatrolPoint.getId();
@@ -123,13 +125,15 @@
                .eq(Multifile::getObjType,Constants.MultiFile.FN_PATROL_POINT_FILE.getKey())
        );

        if(Objects.nonNull(ywPatrolPoint.getMultifile())){
            ywPatrolPoint.getMultifile().setCreator(loginUserInfo.getId());
            ywPatrolPoint.getMultifile().setCreateDate(new Date());
            ywPatrolPoint.getMultifile().setIsdeleted(Constants.ZERO);
            ywPatrolPoint.getMultifile().setObjType(Constants.MultiFile.FN_PATROL_POINT_FILE.getKey());
            ywPatrolPoint.getMultifile().setObjId(ywPatrolPoint.getId());
            multifileMapper.insert(ywPatrolPoint.getMultifile());
        if(Objects.nonNull(ywPatrolPoint.getFileUrl())){
            Multifile multifile = new Multifile();
            multifile.setCreator(loginUserInfo.getId());
            multifile.setCreateDate(new Date());
            multifile.setIsdeleted(Constants.ZERO);
            multifile.setObjType(Constants.MultiFile.FN_PATROL_POINT_FILE.getKey());
            multifile.setObjId(ywPatrolPoint.getId());
            multifile.setFileurl(ywPatrolPoint.getFileUrl());
            multifileMapper.insert(multifile);
        }

    }
@@ -157,8 +161,7 @@
        if(Objects.nonNull(multifile)){
            String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_PATROL).getCode();
            multifile.setFileurlFull(path + multifile.getFileurl());
            ywPatrolPoint.setMultifile(multifile);
            ywPatrolPoint.setFileFullUrl(path + multifile.getFileurl());
        }
        return ywPatrolPoint;
    }