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

liukangdong

2024-06-11 4c40dff48454e0eeb80d6db068d28a5bb259bde0

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

 admin/.env.development

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,4 @@
# å¼€å‘环境配置
NODE_ENV = 'development'

VUE_APP_API_URL  = 'http://localhost:10010'

 admin/src/components/common/GlobalRigthWindow.vue

@@ -72,7 +72,7 @@
// è¾“入框高度
$input-height: 32px;
.global-window {
  top: 80px !important;
  top: 56px !important;
  left: 218px !important;
  // å¤´éƒ¨æ ‡é¢˜
  ::v-deep .el-drawer__header {

 admin/src/components/common/GlobalWindow.vue

@@ -83,7 +83,7 @@
// è¾“入框高度
$input-height: 32px;
.global-window {
  top: 80px !important;
  top: 56px !important;
  left: 250px !important;
  // å¤´éƒ¨æ ‡é¢˜
  ::v-deep .el-drawer__header {

 server/system_service/src/main/java/com/doumee/core/utils/FtpUtil.java

@@ -267,7 +267,7 @@
        return false;
    }

    public boolean uploadInputstreamBatch(InputStream inputStream, String remote, Boolean close)  {
    public boolean uploadInputstreamBatch(InputStream inputStream, String remote, Boolean close , Integer index )  {
        // è®¾ç½®PassiveMode传输
        try {
            ftpClient.enterLocalPassiveMode();
@@ -279,7 +279,7 @@
            if (remote.contains("/")) {
                remoteFileName = remote.substring(remote.lastIndexOf("/") + 1);
                // åˆ›å»ºæœåŠ¡å™¨è¿œç¨‹ç›®å½•ç»“构，创建失败直接返回
                if (StringUtils.equals(CreateDirecroty(remote, ftpClient), "2")) {
                if (Constants.equalsInteger(index,Constants.ONE) && StringUtils.equals(CreateDirecroty(remote, ftpClient), "2")) {
                    log.error("创建ftp目录失败======================="+remote);
                    return false;
                }

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java

@@ -101,7 +101,7 @@
                        String date = DateUtil.getNowShortDate();
                        String fName = date + "/" + UUID.randomUUID() + endType;
                        String fileName = folder + "/" + fName;
                        boolean r = ftp.uploadInputstreamBatch(is, fileName, Constants.equalsInteger(index ,fileList.size()));
                        boolean r = ftp.uploadInputstreamBatch(is, fileName, Constants.equalsInteger(index ,fileList.size()),index);
                        if (r) {
                            JSONObject fileJSON = new JSONObject();
                            fileJSON.put("url", prefixPath + fileName);

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

@@ -637,6 +637,7 @@
        List<Approve> levelList = getLevelListFromResult(approveGroupList,approveDateVO,memberId);
        List<Approve> copyList = getAllCopyList(approveGroupList);
        //遍历level查询每一级别业务数据
        if(levelList!=null){
        for(Approve level:levelList){
            List<Approve> tlist = getLevelInfoFromList(level,approveGroupList);
            approveDateVO.getApproveList().addAll(tlist);
@@ -644,6 +645,7 @@
                    ||Constants.equalsInteger(Constants.approveStatus.unPass,  tlist.get(0).getStatus())
                    ||Constants.equalsInteger(Constants.approveStatus.cancel,  tlist.get(0).getStatus())){
                break;
                }
            }
        }

@@ -799,7 +801,7 @@
            }
        }
        if(CollectionUtils.isEmpty(approveList)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"审批信息：级别数据异常");
         //   throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"审批信息：级别数据异常");
        }
        return  approveList;
    }

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

@@ -188,7 +188,8 @@
        if(Constants.equalsInteger(model.getStatus(),Constants.FOUR)){
            String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
            Member member = memberMapper.selectById(model.getCancelUser());
            Member member1 = memberMapper.selectById(model.getCancelUser());

            Approve approve = new Approve();
            approve.setApproveType(Constants.ZERO);
            approve.setCreateDate(model.getCancelTime());
@@ -196,9 +197,11 @@
            approve.setStatusInfo("已撤销");
            approve.setStatus(Constants.FOUR);
            approve.setType(Constants.ZERO);
            approve.setMemberName(member.getName());
            if(StringUtils.isNotBlank(member.getFaceImg())){
                approve.setFaceImg(path + member.getFaceImg());
            if(member1!=null) {
                approve.setMemberName(member1.getName());
                if (StringUtils.isNotBlank(member1.getFaceImg())) {
                    approve.setFaceImg(path + member1.getFaceImg());
                }
            }
            approve.setCheckInfo(model.getCancelInfo());
            approveList.add(approve);