Merge remote-tracking branch 'origin/master'

lishuai

2023-12-26 70577a6d6cf2bded29e71dcad11a0c2605193d20

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

@@ -45,25 +45,25 @@
    @Override
    public Integer create(Problems problems) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Problems insert = new Problems();
        Problems newProblems = new Problems();

        insert.setCreator(loginUserInfo.getId());
        insert.setCreateDate(new Date());
        insert.setEditor(loginUserInfo.getId());
        insert.setEditDate(new Date());
        insert.setIsdeleted(Constants.ZERO);
        insert.setRemark(problems.getRemark());
        insert.setTitle(problems.getTitle());
        newProblems.setCreator(loginUserInfo.getId());
        newProblems.setCreateDate(new Date());
        newProblems.setEditor(loginUserInfo.getId());
        newProblems.setEditDate(new Date());
        newProblems.setIsdeleted(Constants.ZERO);
        newProblems.setRemark(problems.getRemark());
        newProblems.setTitle(problems.getTitle());
        if(null != problems.getObjectList() && problems.getObjectList().size() > 0) {
            insert.setOptions(JSON.toJSONString(problems.getObjectList()));
            newProblems.setOptions(JSON.toJSONString(problems.getObjectList()));
        }
        insert.setAnswer(problems.getAnswer());
        insert.setSortnu(problems.getSortnu());
        insert.setType(problems.getType());
        insert.setScore(problems.getScore());
        insert.setUseType(problems.getUseType());
        problemsMapper.insert(problems);
        return insert.getId();
        newProblems.setAnswer(problems.getAnswer());
        newProblems.setSortnu(problems.getSortnu());
        newProblems.setType(problems.getType());
        newProblems.setScore(problems.getScore());
        newProblems.setUseType(problems.getUseType());
        problemsMapper.insert(newProblems);
        return newProblems.getId();
    }

    @Override
@@ -93,7 +93,9 @@
        update.setEditor(loginUserInfo.getId());
        update.setEditDate(new Date());
        update.setTitle(problems.getTitle());
        update.setOptions(problems.getOptions());
        if(null != problems.getObjectList() && problems.getObjectList().size() > 0) {
            update.setOptions(JSON.toJSONString(problems.getObjectList()));
        }
        update.setAnswer(problems.getAnswer());
        update.setSortnu(problems.getSortnu());
        update.setType(problems.getType());
@@ -174,7 +176,7 @@
            queryWrapper.lambda().eq(Problems::getSortnu, pageWrap.getModel().getSortnu());
        }
        if (pageWrap.getModel().getType() != null) {
            queryWrapper.lambda().eq(Problems::getType, pageWrap.getModel().getType());
            queryWrapper.lambda().in(Problems::getType, pageWrap.getModel().getType());
        }
        if (pageWrap.getModel().getScore() != null) {
            queryWrapper.lambda().eq(Problems::getScore, pageWrap.getModel().getScore());
@@ -184,7 +186,17 @@
        }
        queryWrapper.lambda().orderByAsc(Problems::getSortnu);
        queryWrapper.select("problems.*, (select REALNAME from system_user where system_user.id = problems.CREATOR) as creatorName");
        return PageData.from(problemsMapper.selectPage(page, queryWrapper));
        IPage<Problems> problemsIPage = problemsMapper.selectPage(page, queryWrapper);
        if(null != problemsIPage && problemsIPage.getRecords().size() > 0) {
            List<Problems> newProblems = new ArrayList<>();
            List<Problems> newDatas = problemsIPage.getRecords();
            for (Problems dto:newDatas) {
                dto.setObjectList(JSON.parseArray(dto.getOptions(), OptionsObject.class));
                newProblems.add(dto);
            }
            problemsIPage.setRecords(newProblems);
        }
        return PageData.from(problemsIPage);
    }

    @Override