张氏APP 后台
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
feige
2023-09-15 bfd7201c84e250e88b9a83ba55317b16f08c7a38 
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java


@@ -18,6 +18,7 @@


import com.ruoyi.service.ZInfoUserService;


import com.ruoyi.service.ZfCleanService;




import com.ruoyi.service.ZfLogService;


import com.ruoyi.util.ArraysUtil;


import lombok.extern.slf4j.Slf4j;


import org.springframework.stereotype.Service;


@@ -25,6 +26,7 @@


import org.springframework.web.multipart.MultipartFile;




import javax.annotation.Resource;


import java.time.LocalDateTime;


import java.util.ArrayList;


import java.util.Arrays;


import java.util.HashMap;


@@ -54,10 +56,14 @@


    @Resource


    ZAuthorityService zAuthorityService;




    @Resource


    ZfLogService zfLogService;




    private LambdaQueryWrapper<ZfClean> buildCondition(ZfClean zfClean,List<Long> familyIdList) {


        LambdaQueryWrapper<ZfClean> lqw = new LambdaQueryWrapper<>();


        lqw.orderByDesc(ZfClean::getCreateTime);


        lqw.eq(zfClean.getKind() != null, ZfClean::getKind, zfClean.getKind())


                .eq(zfClean.getId()!=null,ZfClean::getId,zfClean.getId())


                .like(StringUtils.isNotEmpty(zfClean.getSuitable()), ZfClean::getSuitable, zfClean.getSuitable())


                .like(StringUtils.isNotEmpty(zfClean.getType()), ZfClean::getType, zfClean.getType())


                .like(StringUtils.isNotEmpty(zfClean.getMethod()), ZfClean::getMethod, zfClean.getMethod())


@@ -266,7 +272,7 @@


                        bean.setOwnData(0);


                    }


                }


        ).collect(Collectors.toList());


        ).sorted((a,b)-> b.getOwnData()-a.getOwnData()).collect(Collectors.toList());


    }




    @Override


@@ -449,6 +455,14 @@


            throw new RuntimeException("你没有权限操作此家庭的数据");


        }




        //操作后加入日志


        ZfLog zfLog = new ZfLog();


        zfLog.setUpdateTime(LocalDateTime.now());


        zfLog.setModule("保洁收纳");


        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());


        zfLogService.save(zfLog);






        if(updateById(zfClean)){


            return AjaxResult.success();


        }else {