施工交付增加其他录入交付功能

唐耀东

2022-10-12 d1bcbbefab4da603c275ed61d0018a46dbc67d1e

 ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsManualServiceImpl.java

@@ -7,6 +7,7 @@
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.core.page.PagePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.oa.domain.BsRules;
import com.ruoyi.oa.domain.BsTemplate;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
@@ -50,6 +51,7 @@
    private LambdaQueryWrapper<BsManual> buildQueryWrapper(BsManualBo bo) {
        Map<String, Object> params = bo.getParams();
        LambdaQueryWrapper<BsManual> lqw = Wrappers.lambdaQuery();
        lqw.like(bo.getManual() != null, BsManual::getManual, bo.getManual());
        return lqw;
    }

@@ -59,10 +61,10 @@
        if (list.size() > 0) {
            throw new ServiceException("手册重复", HttpStatus.HTTP_PARTIAL);
        }
        List<BsManual> vList = baseMapper.selectList(new LambdaQueryWrapper<BsManual>().eq(BsManual::getVersionCode, bo.getVersionCode()));
        if (vList.size() > 0) {
            throw new ServiceException("发布版本重复", HttpStatus.HTTP_PARTIAL);
        }
//        List<BsManual> vList = baseMapper.selectList(new LambdaQueryWrapper<BsManual>().eq(BsManual::getVersionCode, bo.getVersionCode()));
//        if (vList.size() > 0) {
//            throw new ServiceException("发布版本重复", HttpStatus.HTTP_PARTIAL);
//        }
        BsManual add = BeanUtil.toBean(bo, BsManual.class);
        validEntityBeforeSave(add);
        boolean flag = save(add);
@@ -80,12 +82,12 @@
        if (list.size() > 0) {
            throw new ServiceException("手册重复", HttpStatus.HTTP_PARTIAL);
        }
        List<BsManual> vList = baseMapper.selectList(new LambdaQueryWrapper<BsManual>()
            .eq(BsManual::getVersionCode, bo.getVersionCode())
            .ne(BsManual::getId, bo.getId()));
        if (vList.size() > 0) {
            throw new ServiceException("发布版本重复", HttpStatus.HTTP_PARTIAL);
        }
//        List<BsManual> vList = baseMapper.selectList(new LambdaQueryWrapper<BsManual>()
//            .eq(BsManual::getVersionCode, bo.getVersionCode())
//            .ne(BsManual::getId, bo.getId()));
//        if (vList.size() > 0) {
//            throw new ServiceException("发布版本重复", HttpStatus.HTTP_PARTIAL);
//        }
        BsManual update = BeanUtil.toBean(bo, BsManual.class);
        validEntityBeforeSave(update);
        return updateById(update);