Merge branch 'master' of http://103.249.252.109:90/lcy/education

src/main/java/org/rcisoft/business/tquestion/controller/TQuestionController.java

@@ -2,10 +2,13 @@ package org.rcisoft.business.tquestion.controller;
 
 
 /*固定导入*/
+import com.sun.org.apache.regexp.internal.RE;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.json.JSONArray;
+import org.rcisoft.business.tquestion.entity.TQuestionOptions;
+import org.rcisoft.business.tquestion.service.impl.TQuestionServiceImpl;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.BindingResult;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +54,33 @@ public class TQuestionController extends PaginationController<TQuestion> {
             tQuestion);
     }
 
+    @ApiOperation(value = "新增选项",notes = "新增加一个选项")
+    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "qid", value = "题目id", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "alias", value = "列别名", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "desc", value = "列描述", required = true, dataType = "varchar")})
+    @PostMapping("/addOption")
+    @PreAuthorize("hasRole('ROLE_1002')")
+    public Result addoption(@PathVariable TQuestionOptions tQuestionOptions){
+        PersistModel data = tQuestionServiceImpl.saveoption(tQuestionOptions);
+        return Result.builder(data,
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                tQuestionOptions);
+    }
+
+    @ApiOperation(value="删除选项", notes="根据ID删除一个选项")
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "businessId", required = true, dataType = "varchar")})
+    @PostMapping("/removeOption")
+    @PreAuthorize("hasRole('ROLE_1002')")
+    public Result deleteOption(@PathVariable String id) {
+        return Result.builder(new PersistModel(tQuestionServiceImpl.removeOption(id,getToken())),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                id);
+    }
+
+
     @ApiOperation(value="删除题目", notes="根据ID删除一个题")
     @ApiImplicitParam(name = "id", value = "businessId", required = true, dataType = "varchar")
     @PostMapping("/remove")
@@ -66,7 +96,7 @@ public class TQuestionController extends PaginationController<TQuestion> {
     @ApiImplicitParams({@ApiImplicitParam(name = "id数组", value = "businessId数组", required = true, dataType = "varchar")})
     @PostMapping("/removeByIds")
     @PreAuthorize("hasRole('ROLE_1002')")
-    public Result deletes(@PathVariable String idInfoList ) {
+    public Result deletes( String idInfoList ) {
         PersistModel data = new PersistModel(tQuestionServiceImpl.removeByIds(idInfoList));
         return Result.builder(data,
                 MessageConstant.MESSAGE_ALERT_SUCCESS,

src/main/java/org/rcisoft/business/tquestion/dao/TQuestionRepository.java

@@ -40,7 +40,7 @@ public interface TQuestionRepository extends BaseMapper<TQuestion> {
             +"<if test=\"business_id != null and business_id != ''\">and business_id = #{business_id}</if></script>")
     List<TQuestion> queryTQuestions(TQuestion tQuestion);
 
-    @Update("<script> update t_question set del_flag = 1 and flag = 0 where FIND_IN_SET(business_id,idInfoList)</script>")
+    @Update("<script> update t_question set del_flag = 1 , flag = 0 where FIND_IN_SET(business_id,#{idInfoList})</script>")
     int deleteByIds(String idInfoList);
 
     @Insert("<script>INSERT INTO t_question_options " +

src/main/java/org/rcisoft/business/tquestion/service/TQuestionService.java

 package org.rcisoft.business.tquestion.service;
 
 import org.rcisoft.business.tquestion.entity.TQuestion;
+import org.rcisoft.business.tquestion.entity.TQuestionOptions;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.aop.PageUtil;
 
@@ -52,4 +53,8 @@ public interface TQuestionService {
     List<TQuestion> queryTQuestions(TQuestion tQuestion);
 
     int removeByIds(String idInfoList);
+
+    PersistModel saveoption(TQuestionOptions tQuestionOptions);
+
+    int removeOption(String id, String token);
 }

src/main/java/org/rcisoft/business/tquestion/service/impl/TQuestionServiceImpl.java

@@ -2,6 +2,7 @@ package org.rcisoft.business.tquestion.service.impl;
 
 import org.apache.commons.collections.MapUtils;
 import org.json.JSONArray;
+import org.rcisoft.business.tquestion.dao.TQuestionOptionsRepository;
 import org.rcisoft.business.tquestion.entity.TQuestionOptions;
 import org.rcisoft.core.constant.MessageConstant;
 import org.rcisoft.core.util.UserUtil;
@@ -34,6 +35,8 @@ public class TQuestionServiceImpl implements TQuestionService {
     @Autowired
     private TQuestionRepository tQuestionRepository;
 
+    @Autowired
+    private TQuestionOptionsRepository tQuestionOptionsRepository;
 
     /**
     * 保存 tQuestion
@@ -61,6 +64,37 @@ public class TQuestionServiceImpl implements TQuestionService {
         return new PersistModel(line);
     }
 
+    /**
+     * 增加选项
+     * @param tQuestionOptions
+     * @return
+     */
+    @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
+    @Override
+    public PersistModel saveoption(TQuestionOptions tQuestionOptions) {
+        tQuestionOptions.setCommonBusinessId();
+        int line = tQuestionOptionsRepository.insertSelective(tQuestionOptions);
+        return new PersistModel(line);
+    }
+
+    /**
+     * 删除选项
+     * @param id
+     * @param token
+     * @return
+     */
+    @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
+    @Override
+    public int removeOption(String id, String token){
+        TQuestionOptions tQuestionOptions = new TQuestionOptions();
+        tQuestionOptions.setBusinessId(id);
+//        UserUtil.setCurrentMergeOperation(tQuestion);
+        int line = tQuestionOptionsRepository.deleteByPrimaryKey(id);
+        log.info(UserUtil.getUserInfoProp(token,UserUtil.USER_USERNAME)+"逻辑删除了ID为"+
+                tQuestionOptions.getBusinessId()+"的信息");
+        return line;
+    }
+
     /**
     * 逻辑删除
     * @param id
@@ -124,4 +158,5 @@ public class TQuestionServiceImpl implements TQuestionService {
         return tQuestionRepository.deleteByIds(idInfoList);
     }
 
+
 }