Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo into yingxh

yxh

2023-06-30 5d1ada4f57b77067cb3a58d8a38858ba73982a48

Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo into yingxh

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java

@@ -262,5 +262,60 @@
    @ApiModelProperty("捐献家属人数")
    private Integer donorrelatives;

    @Override
    public String toString() {
        return "ServiceReimbursementShared{" +
                "id=" + id +
                ", userno='" + userno + '\'' +
                ", username='" + username + '\'' +
                ", travelers='" + travelers + '\'' +
                ", idcardtype='" + idcardtype + '\'' +
                ", idcardno='" + idcardno + '\'' +
                ", phone='" + phone + '\'' +
                ", depositbank='" + depositbank + '\'' +
                ", bankcardno='" + bankcardno + '\'' +
                ", branchbankname='" + branchbankname + '\'' +
                ", annexbankcard='" + annexbankcard + '\'' +
                ", annexfiles='" + annexfiles + '\'' +
                ", amountrequested=" + amountrequested +
                ", prepaidamount=" + prepaidamount +
                ", invoicecount=" + invoicecount +
                ", attachcount=" + attachcount +
                ", managerno='" + managerno + '\'' +
                ", managername='" + managername + '\'' +
                ", deptmentno='" + deptmentno + '\'' +
                ", deptmentname='" + deptmentname + '\'' +
                ", opochecker='" + opochecker + '\'' +
                ", finvicepresident='" + finvicepresident + '\'' +
                ", busvicepresident='" + busvicepresident + '\'' +
                ", officedirector='" + officedirector + '\'' +
                ", financedirector='" + financedirector + '\'' +
                ", financechecher='" + financechecher + '\'' +
                ", infoid=" + infoid +
                ", donorno='" + donorno + '\'' +
                ", donorname='" + donorname + '\'' +
                ", reason='" + reason + '\'' +
                ", recordstatus=" + recordstatus +
                ", uploadflag='" + uploadflag + '\'' +
                ", uploadtime=" + uploadtime +
                ", totalamount=" + totalamount +
                ", bigstrmoney='" + bigstrmoney + '\'' +
                ", flowlevel=" + flowlevel +
                ", costtype='" + costtype + '\'' +
                ", costtypename='" + costtypename + '\'' +
                ", oaid='" + oaid + '\'' +
                ", oabdzt='" + oabdzt + '\'' +
                ", fileurl='" + fileurl + '\'' +
                ", filename='" + filename + '\'' +
                ", fileid='" + fileid + '\'' +
                ", reimid=" + reimid +
                ", delFlag=" + delFlag +
                ", donorbank='" + donorbank + '\'' +
                ", donorbankcard='" + donorbankcard + '\'' +
                ", donorremark='" + donorremark + '\'' +
                ", donoramount=" + donoramount +
                ", donorrelatives=" + donorrelatives +
                '}';
    }
}


 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java

@@ -16,6 +16,7 @@
import com.ruoyi.project.service.IServiceReimbursementSharedService;
import com.ruoyi.project.service.IServiceReimbursementdetailSharedService;
import com.ruoyi.project.service.IServiceReimbursementpayeeSharedService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -34,6 +35,7 @@
 * @author ruoyi
 * @date 2022-01-24
 */
@Slf4j
@Service
public class ServiceReimbursementServiceImpl extends ServiceImpl<ServiceReimbursementMapper, ServiceReimbursement> implements IServiceReimbursementService {

@@ -204,8 +206,8 @@
        //下面需求调用文件的接口，调用成功返回后，得到filename和fileid 用这二个值去更新数据

        String filePath = RuoYiConfig.getUploadPath();
        String strMutfileUrl = remShare.getFileurl();//可能存在多个地址，以,分开

        // String strMutfileUrl = remShare.getFileurl();//可能存在多个地址，以,分开
        String strMutfileUrl = remShare.getAnnexfiles();
        String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes;
        //String strFUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/attachment?token="+strRes;
        //strFUrl = String.format(strFUrl, strRes);
@@ -289,12 +291,13 @@

        }

//        long nId = remShare.getId();
//        remShare.setId(nId);
//        remShare.setFilename(filename);
//        remShare.setFileid(fileid);
//        boolean bRet = serviceReimbursementServiceShare.updateById(remShare);
//        if (!bRet) return -1;
        long nId = remShare.getId();
        remShare.setId(nId);
        remShare.setFilename(filename);
        remShare.setFileid(fileid);
        log.info("remShare的数据为 : {}:", remShare.toString());
        boolean bRet = sharedService.updateById(remShare);
        if (!bRet) return -1;

        return 0;
    }