sinake
6 天以前 e70592c8731df88028db03c98f1d210e8e686ce8
查询捐献完成列表基本信息数据出错
已修改6个文件
18 ■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatecompletioninfoService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonationwitnessService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
@@ -122,7 +122,7 @@
    @RepeatSubmit(interval = 5000)
    public AjaxResult add(@RequestBody ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
        log.info("新增捐献完成:{}", serviceDonatecompletioninfoVO);
        boolean save = serviceDonatecompletioninfoService.add(serviceDonatecompletioninfoVO);
        long save = serviceDonatecompletioninfoService.add(serviceDonatecompletioninfoVO);
        return AjaxResult.success(save);
    }
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
@@ -126,7 +126,7 @@
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO) {
        boolean save = serviceDonationwitnessService.add(serviceDonationwitnessVO);
        long save = serviceDonationwitnessService.add(serviceDonationwitnessVO);
        log.info("新增捐献见证是否成功:{},id为:{},infoId为:{}", save, serviceDonationwitnessVO.getId(), serviceDonationwitnessVO.getInfoid());
        return AjaxResult.success(save);
    }
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatecompletioninfoService.java
@@ -27,7 +27,7 @@
     */
    public List<ServiceDonatecompletioninfo> queryList(ServiceDonatecompletioninfo serviceDonatecompletioninfo);
    public boolean add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO);
    public long add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO);
    public boolean edit(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO);
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonationwitnessService.java
@@ -30,7 +30,7 @@
    public List<ServiceDonationwitness> selectServiceDonationwitnessList(ServiceDonationwitness serviceDonationwitness);
    public Boolean add(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO);
    public long add(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO);
    public Boolean edit(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO);
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
@@ -81,7 +81,7 @@
    }
    @Override
    public boolean add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
    public long add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
        ServiceDonatecompletioninfo serviceDonatecompletioninfo = DtoConversionUtils.sourceToTarget(serviceDonatecompletioninfoVO, ServiceDonatecompletioninfo.class);
        boolean b = false;
        if (ObjectUtils.isNotEmpty(serviceDonatecompletioninfo)) {
@@ -94,7 +94,7 @@
                }
            }
        }
        return b;
        return serviceDonatecompletioninfo.getId();
    }
    @Override
@@ -117,7 +117,7 @@
    public List<DonationCompletionBaseInfoDTO> getDonationCompletionBaseInfo(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO) {
        List<DonationCompletionBaseInfoDTO> donationCompletionBaseInfoDTOList = serviceDonatecompletioninfoMapper.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);
        if (CollectionUtils.isNotEmpty(donationCompletionBaseInfoDTOList) && donationCompletionBaseInfoVO.getPageNum() == null) {
        if (CollectionUtils.isNotEmpty(donationCompletionBaseInfoDTOList) && donationCompletionBaseInfoVO.getPageNum() != null) {
            for (DonationCompletionBaseInfoDTO donationCompletionBaseInfoDTO : donationCompletionBaseInfoDTOList) {
                ServiceDonatecomporgan serviceDonatecomporgan = new ServiceDonatecomporgan();
                serviceDonatecomporgan.setInfoid(donationCompletionBaseInfoDTO.getInfoid());
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
@@ -86,7 +86,7 @@
    }
    @Override
    public Boolean add(ServiceDonationwitnessVO serviceDonationwitnessVO) {
    public long add(ServiceDonationwitnessVO serviceDonationwitnessVO) {
        ServiceDonationwitness serviceDonationwitness = DtoConversionUtils.sourceToTarget(serviceDonationwitnessVO, ServiceDonationwitness.class);
        boolean save = false;
        if (ObjectUtils.isNotEmpty(serviceDonationwitness)) {
@@ -99,7 +99,7 @@
                }
            }
        }
        return save;
        return serviceDonationwitness.getId();
    }
    @Override