Merge remote-tracking branch 'origin/master'

jiangping

2024-12-26 6c5165f73c90fbd4e22e4f9a39497b5a25ee37f9

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

@@ -55,10 +55,13 @@

    @Override
    public void deleteById(Integer id, LoginUserInfo user) {
        tmsFactoryParamMapper.update(null,new UpdateWrapper<TmsFactoryParam>().lambda().set(TmsFactoryParam::getIsdeleted,Constants.ONE)
        tmsFactoryParamMapper.update(null,
                new UpdateWrapper<TmsFactoryParam>()
                .lambda()
                .set(TmsFactoryParam::getIsdeleted,Constants.ONE)
                .eq(TmsFactoryParam::getId,id)
                .eq(TmsFactoryParam::getEditDate,new Date())
                .eq(TmsFactoryParam::getEditor,user.getId())
                .set(TmsFactoryParam::getEditDate,new Date())
                .set(TmsFactoryParam::getEditor,user.getId())
        );
    }

@@ -153,10 +156,10 @@
             queryWrapper.eq(TmsFactoryParam::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getCode() != null) {
             queryWrapper.eq(TmsFactoryParam::getCode, pageWrap.getModel().getCode());
             queryWrapper.like(TmsFactoryParam::getCode, pageWrap.getModel().getCode());
        }
        if (pageWrap.getModel().getName() != null) {
             queryWrapper.eq(TmsFactoryParam::getName, pageWrap.getModel().getName());
             queryWrapper.like(TmsFactoryParam::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getSortnum() != null) {
             queryWrapper.eq(TmsFactoryParam::getSortnum, pageWrap.getModel().getSortnum());
@@ -173,13 +176,7 @@
        if (pageWrap.getModel().getParam4() != null) {
             queryWrapper.eq(TmsFactoryParam::getParam4, pageWrap.getModel().getParam4());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        queryWrapper.orderByAsc( TmsFactoryParam::getSortnum);
        return PageData.from(tmsFactoryParamMapper.selectPage(page, queryWrapper));
    }