乐团档案满意度调查

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/PhotoDao.java

@@ -14,4 +14,6 @@ public interface PhotoDao extends BaseDAO<Integer, Photo> {
     int deleteByIds(@Param("ids") String ids);
 
     int batchInsert(@Param("photoList") List<Photo> photoList);
+
+    int batchUpdate(@Param("photoList") List<Photo> photoList);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/QuestionnaireUserResultDao.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.QuestionnaireResultDto;
 import com.ym.mec.biz.dal.dto.QuestionnaireUserResultDto;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.biz.dal.entity.QuestionnaireUserResult;
@@ -18,11 +19,21 @@ public interface QuestionnaireUserResultDao extends BaseDAO<Long, QuestionnaireU
      */
     int countByTopicId(Integer topicId);
 
-    void delByActiveIdAndUserId(@Param("activityId") Integer activityId, @Param("userId") Integer userId);
+    void delByActiveIdAndUserId(@Param("activityId") Integer activityId,
+                                @Param("userId") Integer userId,
+                                @Param("activeType") String activeType);
 
     void batchInsert1(@Param("questionnaireUserResultList") List<QuestionnaireUserResult> questionnaireUserResultList);
 
     int findDetailCount(Map<String, Object> params);
 
     List<QuestionnaireUserResultDto> queryDetailPage(Map<String, Object> params);
+
+    /**
+     * 获取乐团满意度答案
+     * @param activeId
+     * @param activeType
+     * @return
+     */
+    QuestionnaireResultDto getQuestionResult(@Param("activeId") Integer activeId, @Param("activeType") String activeType);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupQuestionnaire.java

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.util.List;
+
 /**
  * 对应数据库表(music_group_questionnaire):
  */
@@ -10,8 +12,8 @@ public class MusicGroupQuestionnaire {
 	/**  */
 	private Integer id;
 	
-	/** 问题编号 */
-	private Integer questionnaireQuestionId;
+	/** 问卷编号 */
+	private Integer questionnaireTopicId;
 	
 	/** 乐团编号 */
 	private String musicGroupId;
@@ -30,7 +32,17 @@ public class MusicGroupQuestionnaire {
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	private QuestionnaireUserResult questionnaireUserResult;
+
+	public QuestionnaireUserResult getQuestionnaireUserResult() {
+		return questionnaireUserResult;
+	}
+
+	public void setQuestionnaireUserResult(QuestionnaireUserResult questionnaireUserResult) {
+		this.questionnaireUserResult = questionnaireUserResult;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}
@@ -38,15 +50,15 @@ public class MusicGroupQuestionnaire {
 	public Integer getId(){
 		return this.id;
 	}
-			
-	public void setQuestionnaireQuestionId(Integer questionnaireQuestionId){
-		this.questionnaireQuestionId = questionnaireQuestionId;
+
+	public Integer getQuestionnaireTopicId() {
+		return questionnaireTopicId;
 	}
-	
-	public Integer getQuestionnaireQuestionId(){
-		return this.questionnaireQuestionId;
+
+	public void setQuestionnaireTopicId(Integer questionnaireTopicId) {
+		this.questionnaireTopicId = questionnaireTopicId;
 	}
-			
+
 	public void setMusicGroupId(String musicGroupId){
 		this.musicGroupId = musicGroupId;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/QuestionnaireUserResult.java

@@ -17,7 +17,8 @@ public class QuestionnaireUserResult {
 	/**  */
 	private QuestionnaireActiveTypeEnum activeType;
 
-	/**  */
+	//如果是乐器置换那么是ReplacementInstrumentCooperationId
+	//如果是乐团满意度调查那么是music_group_questionnaire_id
 	private Integer activeId;
 	
 	/**  */

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/QuestionnaireActiveTypeEnum.java

@@ -3,7 +3,8 @@ package com.ym.mec.biz.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum QuestionnaireActiveTypeEnum implements BaseEnum<String, QuestionnaireActiveTypeEnum> {
-	REPLACEMENT("REPLACEMENT", "乐器置换");
+	REPLACEMENT("REPLACEMENT", "乐器置换"),
+	MUSIC_GROUP_QUESTION("MUSIC_GROUP_QUESTION", "乐团满意度调查");
 
 	private String code;
 

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupQuestionnaireService.java

@@ -1,8 +1,32 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.entity.MusicGroupQuestionnaire;
+import com.ym.mec.biz.dal.entity.QuestionnaireTopic;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.Map;
+
 public interface MusicGroupQuestionnaireService extends BaseService<Integer, MusicGroupQuestionnaire> {
 
+    /**
+     * 新增乐团调查问卷
+     * @param musicGroupQuestionnaire
+     */
+    void add(MusicGroupQuestionnaire musicGroupQuestionnaire);
+
+    /**
+     * 获取问卷题目详情
+     * @return
+     */
+    QuestionnaireTopic getQuestionDetail();
+
+    /**
+     * 修改乐团满意度调查
+     * @param musicGroupQuestionnaire
+     */
+    void updateResult(MusicGroupQuestionnaire musicGroupQuestionnaire);
+
+    Map<String,Object> getDetail(Integer id);
+
+    void del(Integer id);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/PhotoService.java

@@ -10,4 +10,6 @@ public interface PhotoService extends BaseService<Integer, Photo> {
     int del(String ids);
 
     int batchAdd(List<Photo> photoList);
+
+    int batchUpdate(List<Photo> photoList);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/ReplacementInstrumentActivityService.java

@@ -45,7 +45,6 @@ public interface ReplacementInstrumentActivityService extends BaseService<Intege
      */
     ReplacementInstrumentActivityStatDto getInfo(Integer id);
 
-
     /**
      * 获取问卷列表
      * @param queryInfo

mec-biz/src/main/java/com/ym/mec/biz/service/SysConfigService.java

@@ -228,6 +228,9 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
 
     String HOMEWORK_OPEN_FLAG = "homework_open_flag";
 
+    //乐团问卷调查编号
+    String MUSIC_GROUP_TOPIC_ID = "music_group_topic_id";
+
     /**
      * @return com.ym.mec.biz.dal.entity.SysConfig
      * @params paramName

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupQuestionnaireServiceImpl.java

@@ -1,22 +1,103 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.biz.dal.dao.QuestionnaireUserResultDao;
+import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.dto.QuestionnaireResultDto;
+import com.ym.mec.biz.dal.entity.QuestionnaireTopic;
+import com.ym.mec.biz.dal.entity.QuestionnaireUserResult;
+import com.ym.mec.biz.dal.enums.QuestionnaireActiveTypeEnum;
+import com.ym.mec.biz.service.QuestionnaireTopicService;
+import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.biz.dal.entity.MusicGroupQuestionnaire;
 import com.ym.mec.biz.service.MusicGroupQuestionnaireService;
 import com.ym.mec.biz.dal.dao.MusicGroupQuestionnaireDao;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class MusicGroupQuestionnaireServiceImpl extends BaseServiceImpl<Integer, MusicGroupQuestionnaire>  implements MusicGroupQuestionnaireService {
 	
 	@Autowired
 	private MusicGroupQuestionnaireDao musicGroupQuestionnaireDao;
+	@Autowired
+	private SysConfigDao sysConfigDao;
+	@Autowired
+	private QuestionnaireTopicService questionnaireTopicService;
+	@Autowired
+	private QuestionnaireUserResultDao questionnaireUserResultDao;
 
 	@Override
 	public BaseDAO<Integer, MusicGroupQuestionnaire> getDAO() {
 		return musicGroupQuestionnaireDao;
 	}
-	
+
+    @Override
+	@Transactional(rollbackFor = Exception.class)
+    public void add(MusicGroupQuestionnaire musicGroupQuestionnaire) {
+		musicGroupQuestionnaireDao.insert(musicGroupQuestionnaire);
+		//保存问卷结果
+		QuestionnaireUserResult questionnaireUserResult = musicGroupQuestionnaire.getQuestionnaireUserResult();
+		if(questionnaireUserResult == null){
+			throw new BizException("请录入问卷结果");
+		}
+		questionnaireUserResult.setActiveId(musicGroupQuestionnaire.getId());
+		questionnaireUserResult.setActiveType(QuestionnaireActiveTypeEnum.MUSIC_GROUP_QUESTION);
+		questionnaireUserResultDao.insert(questionnaireUserResult);
+	}
+
+	@Override
+	public QuestionnaireTopic getQuestionDetail() {
+		String topicId = sysConfigDao.findConfigValue(SysConfigService.MUSIC_GROUP_TOPIC_ID);
+		if(StringUtils.isEmpty(topicId)){
+			topicId = "1";
+		}
+		return questionnaireTopicService.getDetail(Integer.parseInt(topicId));
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateResult(MusicGroupQuestionnaire musicGroupQuestionnaire) {
+		MusicGroupQuestionnaire questionnaire = musicGroupQuestionnaireDao.get(musicGroupQuestionnaire.getId());
+		if(questionnaire == null){
+			throw new BizException("修改失败：问卷不存在");
+		}
+		musicGroupQuestionnaireDao.update(questionnaire);
+		//保存问卷结果
+		QuestionnaireUserResult questionnaireUserResult = musicGroupQuestionnaire.getQuestionnaireUserResult();
+		if(questionnaireUserResult == null){
+			throw new BizException("请录入问卷结果");
+		}
+		questionnaireUserResult.setActiveId(musicGroupQuestionnaire.getId());
+		questionnaireUserResult.setActiveType(QuestionnaireActiveTypeEnum.MUSIC_GROUP_QUESTION);
+		//删除原来的问卷结果
+		questionnaireUserResultDao.delByActiveIdAndUserId(musicGroupQuestionnaire.getId(), null,"MUSIC_GROUP_QUESTION");
+		questionnaireUserResultDao.insert(questionnaireUserResult);
+	}
+
+	@Override
+	public Map<String,Object> getDetail(Integer id) {
+		Map<String,Object> resultMap = new HashMap<>(2);
+		MusicGroupQuestionnaire musicGroupQuestionnaire = musicGroupQuestionnaireDao.get(id);
+		resultMap.put("musicGroupQuestionnaire",musicGroupQuestionnaire);
+		//获取问卷结果
+		QuestionnaireResultDto questionnaireResultDto = questionnaireUserResultDao.getQuestionResult(musicGroupQuestionnaire.getId(),"MUSIC_GROUP_QUESTION");
+		resultMap.put("questionResult",questionnaireResultDto);
+		return resultMap;
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void del(Integer id) {
+		questionnaireUserResultDao.delByActiveIdAndUserId(id, null,"MUSIC_GROUP_QUESTION");
+		musicGroupQuestionnaireDao.delete(id);
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PhotoServiceImpl.java

@@ -30,4 +30,9 @@ public class PhotoServiceImpl extends BaseServiceImpl<Integer, Photo>  implement
 	public int batchAdd(List<Photo> photoList) {
 		return photoDao.batchInsert(photoList);
 	}
+
+    @Override
+    public int batchUpdate(List<Photo> photoList) {
+		return photoDao.batchUpdate(photoList);
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/QuestionnaireUserResultServiceImpl.java

@@ -68,6 +68,7 @@ public class QuestionnaireUserResultServiceImpl extends BaseServiceImpl<Long, Qu
 	public Map<String,Object> questionnaireUserResultExport(Integer cooperationId,List<QuestionnaireQuestion> questionList) {
 		HashMap<String, Object> paramMap = new HashMap<>(2);
 		paramMap.put("activeId",cooperationId);
+		paramMap.put("activeType","REPLACEMENT");
 		List<QuestionnaireUserResult> userResults = questionnaireUserResultDao.findAll(paramMap);
 
 		Map<String,Object> resultMap = new HashMap<>(2);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ReplacementInstrumentActivityServiceImpl.java

@@ -191,7 +191,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
 
             if (questionnaireUserResultList != null && questionnaireUserResultList.size() > 0) {
                 //删除原来的问卷结果
-                questionnaireUserResultDao.delByActiveIdAndUserId(activity.getReplacementInstrumentCooperationId(), sysUser.getId());
+                questionnaireUserResultDao.delByActiveIdAndUserId(activity.getReplacementInstrumentCooperationId(), sysUser.getId(),"REPLACEMENT");
             }
             if (replacementInstrumentActivity.getInstrumentsId() != null && (activity.getInstrumentsId() == null || activity.getInstrumentsId() == 0)) {
                 sendPush = true;

mec-biz/src/main/resources/config/mybatis/MusicGroupQuestionnaireMapper.xml

@@ -8,7 +8,7 @@
 	
 	<resultMap type="com.ym.mec.biz.dal.entity.MusicGroupQuestionnaire" id="MusicGroupQuestionnaire">
 		<result column="id_" property="id" />
-		<result column="questionnaire_question_id_" property="questionnaireQuestionId" />
+		<result column="questionnaire_topic_id_" property="questionnaireTopicId" />
 		<result column="music_group_id_" property="musicGroupId" />
 		<result column="target_" property="target" />
 		<result column="operator_id_" property="operatorId" />
@@ -29,29 +29,29 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupQuestionnaire" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_questionnaire (questionnaire_question_id_,music_group_id_,target_,operator_id_,question_time_,create_time_,update_time_)
-		VALUES(#{questionnaireQuestionId},#{musicGroupId},#{target},#{operatorId},#{questionTime},NOW(),NOW())
+		INSERT INTO music_group_questionnaire (questionnaire_topic_id_,music_group_id_,target_,operator_id_,question_time_,create_time_,update_time_)
+		VALUES(#{questionnaireTopicId},#{musicGroupId},#{target},#{operatorId},#{questionTime},NOW(),NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupQuestionnaire">
 		UPDATE music_group_questionnaire <set>
 		<if test="operatorId != null">
-		operator_id_ = #{operatorId},
+			operator_id_ = #{operatorId},
 		</if>
 		<if test="target != null">
-		target_ = #{target},
+			target_ = #{target},
 		</if>
-		<if test="questionnaireQuestionId != null">
-		questionnaire_question_id_ = #{questionnaireQuestionId},
+		<if test="questionnaireTopicId != null">
+			questionnaire_topic_id_ = #{questionnaireTopicId},
 		</if>
 		<if test="questionTime != null">
-		question_time_ = #{questionTime},
+			question_time_ = #{questionTime},
 		</if>
 		<if test="musicGroupId != null">
-		music_group_id_ = #{musicGroupId},
+			music_group_id_ = #{musicGroupId},
 		</if>
-		update_time_ = NOW()
+			update_time_ = NOW()
 		</set> WHERE id_ = #{id}
 	</update>
 	
@@ -62,11 +62,23 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupQuestionnaire" parameterType="map">
-		SELECT * FROM music_group_questionnaire ORDER BY id_ <include refid="global.limit"/>
+		SELECT mgq.*,su.real_name_ FROM music_group_questionnaire mgq
+		LEFT JOIN sys_user su ON su.id_ = mgq.operator_id_
+		<include refid="queryPageSql"/>
+		ORDER BY mgq.id_
+		<include refid="global.limit"/>
 	</select>
+	<sql id="queryPageSql">
+		<where>
+			<if test="search != null and search != ''">
+				AND mgq.music_group_id_ = #{search}
+			</if>
+		</where>
+	</sql>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_questionnaire
+		SELECT COUNT(mgq.id_) FROM music_group_questionnaire mgq
+		<include refid="queryPageSql"/>
 	</select>
 </mapper>

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

@@ -66,8 +66,33 @@
 		update_time_ = NOW()
 		</set> WHERE id_ = #{id}
 	</update>
-	
-	<!-- 根据主键删除一条记录 -->
+    <update id="batchUpdate">
+		<foreach collection="photoList" item="item" separator=";">
+			UPDATE photo_ <set>
+			<if test="item.order != null">
+				order_ = #{item.order},
+			</if>
+			<if test="item.photoAlbumId != null">
+				photo_album_id_ = #{item.photoAlbumId},
+			</if>
+			<if test="item.url != null">
+				url_ = #{url},
+			</if>
+			<if test="item.clientShow != null">
+				client_show_ = #{item.clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+			</if>
+			<if test="item.thumbnailUrl != null">
+				thumbnail_url_ = #{item.thumbnailUrl},
+			</if>
+			<if test="item.name != null">
+				name_ = #{item.name},
+			</if>
+			update_time_ = NOW()
+		</set> WHERE id_ = #{item.id}
+		</foreach>
+	</update>
+
+    <!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
 		DELETE FROM photo_ WHERE id_ = #{id} 
 	</delete>
@@ -75,7 +100,7 @@
 		DELETE FROM photo_ WHERE photo_album_id_ = #{albumId}
 	</delete>
 	<delete id="deleteByIds">
-		DELETE FROM photo_ WHERE FIND_IN_SET(id_,#{id})
+		DELETE FROM photo_ WHERE FIND_IN_SET(id_,#{ids})
 	</delete>
 
 	<!-- 分页查询 -->

mec-biz/src/main/resources/config/mybatis/QuestionnaireUserResultMapper.xml

@@ -31,7 +31,10 @@
 		SELECT * FROM questionnaire_user_result
 		<where>
 			<if test="activeId != null">
-				active_id_ = #{activeId}
+				AND active_id_ = #{activeId}
+			</if>
+			<if test="activeType != null and activeType != ''">
+				AND active_type_ = #{activeType}
 			</if>
 		</where>
 		ORDER BY user_id_,id_
@@ -73,16 +76,14 @@
 		<if test="questionnaireTopicId != null">
 			questionnaire_topic_id_ = #{questionnaireTopicId},
 		</if>
-		<if test="updateTime != null">
-			update_time_ = #{updateTime},
-		</if>
 		<if test="questionnaireQuestionItemIdList != null">
 			questionnaire_question_item_id_list_ = #{questionnaireQuestionItemIdList},
 		</if>
 		<if test="additionalValue != null">
 			additional_value_ = #{additionalValue},
 		</if>
-		</set> WHERE id_ = #{id}
+			update_time_ = NOW()
+	</set> WHERE id_ = #{id}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -90,7 +91,11 @@
 		DELETE FROM questionnaire_user_result WHERE id_ = #{id} 
 	</delete>
     <delete id="delByActiveIdAndUserId">
-		DELETE FROM questionnaire_user_result WHERE active_id_ = #{activityId} AND user_id_ = #{userId}
+		DELETE FROM questionnaire_user_result
+		WHERE active_id_ = #{activityId} AND active_type_ = #{activeType}
+		<if test="userId != null">
+		  AND user_id_ = #{userId}
+		</if>
 	</delete>
 
     <!-- 分页查询 -->
@@ -172,4 +177,21 @@
 		GROUP BY qu1.user_id_,qq.id_
 		ORDER BY qu1.user_id_,qq.sort_
 	</select>
+
+	<resultMap id="QuestionnaireResultDto" type="com.ym.mec.biz.dal.dto.QuestionnaireResultDto">
+		<result column="id_" property="userResultId" />
+		<result property="content" column="content_"/>
+		<result property="answerValue" column="answer_value_"/>
+		<result column="questionnaire_question_id_" property="questionnaireQuestionId" />
+		<result column="questionnaire_question_item_id_list_" property="questionnaireQuestionItemIdList" />
+		<result column="additional_value_" property="additionalValue" />
+	</resultMap>
+	<select id="getQuestionResult" resultMap="QuestionnaireResultDto">
+		SELECT qur.*,qq.content_,GROUP_CONCAT(qqi.answer_value_ ORDER BY qqi.sort_) answer_value_ FROM questionnaire_user_result qur
+		LEFT JOIN questionnaire_question qq ON qq.id_ = qur.questionnaire_question_id_
+		LEFT JOIN questionnaire_question_item qqi ON FIND_IN_SET(qqi.id_,qur.questionnaire_question_item_id_list_)
+		WHERE qur.active_id_ = #{activeId} AND qur.active_type_ = #{activeType}
+		GROUP BY qq.id_
+		ORDER BY qq.sort_
+	</select>
 </mapper>

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

@@ -0,0 +1,78 @@
+package com.ym.mec.web.controller;
+
+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("musicGroupQuestionnaire")
+@Api(tags = "乐团满意度调查")
+@RestController
+public class MusicGroupQuestionnaireController extends BaseController {
+
+    @Autowired
+    private MusicGroupQuestionnaireService musicGroupQuestionnaireService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupQuestionnaire/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")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupQuestionnaire/getQuestionDetail')")
+    @AuditLogAnnotation(operateName = "获取题目详情详情")
+    public Object getDetail() {
+        return succeed(musicGroupQuestionnaireService.getQuestionDetail());
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/del")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupQuestionnaire/del')")
+    public Object del(Integer id){
+        musicGroupQuestionnaireService.del(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupQuestionnaire/update')")
+    public Object update(@RequestBody MusicGroupQuestionnaire musicGroupQuestionnaire){
+        musicGroupQuestionnaireService.updateResult(musicGroupQuestionnaire);
+        return succeed();
+    }
+
+    @ApiOperation(value = "获取详情")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupQuestionnaire/get')")
+    @GetMapping("/update")
+    public Object get(Integer id){
+        return succeed(musicGroupQuestionnaireService.getDetail(id));
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupQuestionnaire/queryPage')")
+    public Object queryPage(QueryInfo queryInfo){
+        return succeed(musicGroupQuestionnaireService.queryPage(queryInfo));
+    }
+}

mec-web/src/main/java/com/ym/mec/web/controller/PhotoController.java

@@ -31,10 +31,10 @@ public class PhotoController extends BaseController {
 	}
 
 	@ApiOperation("修改")
-	@PostMapping(value = "update")
-	@PreAuthorize("@pcs.hasPermissions('photo/update')")
-	public Object update(Photo photo) {
-		return succeed(photoService.update(photo));
+	@PostMapping(value = "batchUpdate")
+	@PreAuthorize("@pcs.hasPermissions('photo/batchUpdate')")
+	public Object batchUpdate(@RequestBody List<Photo> photoList) {
+		return succeed(photoService.batchUpdate(photoList));
 	}
 
 	@ApiOperation("删除")

mec-web/src/main/java/com/ym/mec/web/controller/QuestionnaireUserResultController.java

@@ -16,7 +16,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;