zouxuan 4 lat temu
rodzic
commit
e0bd5b5896

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/PhotoMapper.xml

@@ -76,7 +76,7 @@
 				photo_album_id_ = #{item.photoAlbumId},
 			</if>
 			<if test="item.url != null">
-				url_ = #{url},
+				url_ = #{item.url},
 			</if>
 			<if test="item.clientShow != null">
 				client_show_ = #{item.clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},

+ 1 - 2
mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupQuestionnaireController.java

@@ -41,7 +41,6 @@ public class MusicGroupQuestionnaireController extends BaseController {
     @ApiOperation(value = "获取题目详情详情")
     @GetMapping("/getQuestionDetail")
     @PreAuthorize("@pcs.hasPermissions('musicGroupQuestionnaire/getQuestionDetail')")
-    @AuditLogAnnotation(operateName = "获取题目详情详情")
     public Object getDetail() {
         return succeed(musicGroupQuestionnaireService.getQuestionDetail());
     }
@@ -64,7 +63,7 @@ public class MusicGroupQuestionnaireController extends BaseController {
 
     @ApiOperation(value = "获取详情")
     @PreAuthorize("@pcs.hasPermissions('musicGroupQuestionnaire/get')")
-    @GetMapping("/update")
+    @GetMapping("/get")
     public Object get(Integer id){
         return succeed(musicGroupQuestionnaireService.getDetail(id));
     }

+ 71 - 0
mec-web/src/main/java/com/ym/mec/web/controller/education/MusicGroupQuestionnaireController.java

@@ -0,0 +1,71 @@
+package com.ym.mec.web.controller.education;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.MusicGroupQuestionnaire;
+import com.ym.mec.biz.service.MusicGroupQuestionnaireService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+import com.yonge.log.model.AuditLogAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("eduMusicGroupQuestionnaire")
+@Api(tags = "乐团满意度调查")
+@RestController
+public class MusicGroupQuestionnaireController extends BaseController {
+
+    @Autowired
+    private MusicGroupQuestionnaireService musicGroupQuestionnaireService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    public Object add(@RequestBody MusicGroupQuestionnaire musicGroupQuestionnaire){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if(musicGroupQuestionnaire.getOperatorId() == null){
+            musicGroupQuestionnaire.setOperatorId(sysUser.getId());
+        }
+        musicGroupQuestionnaireService.add(musicGroupQuestionnaire);
+        return succeed();
+    }
+
+    @ApiOperation(value = "获取题目详情详情")
+    @GetMapping("/getQuestionDetail")
+    public Object getDetail() {
+        return succeed(musicGroupQuestionnaireService.getQuestionDetail());
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/del")
+    public Object del(Integer id){
+        musicGroupQuestionnaireService.del(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    public Object update(@RequestBody MusicGroupQuestionnaire musicGroupQuestionnaire){
+        musicGroupQuestionnaireService.updateResult(musicGroupQuestionnaire);
+        return succeed();
+    }
+
+    @ApiOperation(value = "获取详情")
+    @GetMapping("/get")
+    public Object get(Integer id){
+        return succeed(musicGroupQuestionnaireService.getDetail(id));
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo){
+        return succeed(musicGroupQuestionnaireService.queryPage(queryInfo));
+    }
+}