Merge remote-tracking branch 'origin/master'

zhaowenxuan

7 天以前 0892d843cd394f383ff50f480f7f22f2ec3829bc

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSurveyQuestionServiceImpl.java

@@ -27,6 +27,9 @@
    @Autowired
    private TjSurveyQuestionMapper tjSurveyQuestionMapper;

    @Autowired
    private ITjSurveyQuestionService tjSurveyQuestionService;

    /**
     * 查询问卷问题
     *
@@ -60,15 +63,17 @@
     * @param tjSurveyQuestion 问卷问题
     * @return 结果
     */
    @Transactional
//    @Transactional
    @Override
    public int insertTjSurveyQuestion(TjSurveyQuestion tjSurveyQuestion) {
        tjSurveyQuestion.setCreateTime(DateUtils.getNowDate());
        tjSurveyQuestion.setCreateBy(SecurityUtils.getLoginUser().getUsername());
        int rows = tjSurveyQuestionMapper.insertTjSurveyQuestion(tjSurveyQuestion);
        System.out.println(tjSurveyQuestion);
        insertTjSurveyOptions(tjSurveyQuestion);
        return rows;
//        int rows = tjSurveyQuestionMapper.insertTjSurveyQuestion(tjSurveyQuestion);
        if (tjSurveyQuestionService.save(tjSurveyQuestion)) {
            insertTjSurveyOptions(tjSurveyQuestion);
            return 1;
        }
        return 0;
    }

    /**
@@ -107,7 +112,7 @@
     */
    @Transactional
    @Override
    public int deleteTjSurveyQuestionByQid(String qid) {
    public int deleteTjSurveyQuestionByQid(Long qid) {
        tjSurveyQuestionMapper.deleteTjSurveyOptionsByQid(qid);
        return tjSurveyQuestionMapper.deleteTjSurveyQuestionByQid(qid);
    }
@@ -129,11 +134,11 @@
     */
    public void insertTjSurveyOptions(TjSurveyQuestion tjSurveyQuestion) {
        List<TjSurveyOptions> tjSurveyOptionsList = tjSurveyQuestion.getTjSurveyOptionsList();
        String qid = tjSurveyQuestion.getQid();
        Long qid = tjSurveyQuestion.getQid();
        if (StringUtils.isNotNull(tjSurveyOptionsList)) {
            List<TjSurveyOptions> list = new ArrayList<TjSurveyOptions>();
            for (TjSurveyOptions tjSurveyOptions : tjSurveyOptionsList) {
                tjSurveyOptions.setQid(qid);
                tjSurveyOptions.setQid(qid.toString());
                tjSurveyOptions.setDeleted(0);
                tjSurveyOptions.setCreateBy(SecurityUtils.getLoginUser().getUsername());
                tjSurveyOptions.setCreateTime(DateUtils.getNowDate());