update

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

@@ -2,6 +2,7 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.web.dal.entity.Subject;
+import com.ym.mec.web.dal.entity.SubjectGoodsMapper;
 import com.ym.mec.web.dal.page.GoodsQueryInfo;
 import com.ym.mec.web.dal.page.SubjectQueryInfo;
 import com.ym.mec.web.service.SubjectService;
@@ -67,9 +68,9 @@ public class SubjectController extends BaseController {
 
     @ApiOperation(value = "标记声部关联的商品列表")
     @PostMapping("/markGoods")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public Object markGoods(@RequestParam Integer musicGroupId){
-        return succeed(subjectService.findDefaultSubByGroupId(musicGroupId));
+    public Object markGoods(@RequestBody List<SubjectGoodsMapper> subjectGoodsMappers){
+        subjectService.markGoods(subjectGoodsMappers);
+        return succeed();
     }
 
     @ApiOperation(value = "通过乐团编号获取声部列表以及声部报名、缴费、计划人数")

mec-web/src/main/java/com/ym/mec/web/dal/entity/SubjectGoodsMapper.java

@@ -28,12 +28,23 @@ public class SubjectGoodsMapper {
 	@ApiModelProperty(value = "商品类型", required = false)
 	private GoodsType type;
 
+	@ApiModelProperty(value = "删除标记，删除时传true，其他传null", required = false)
+	private boolean delFlag = false;
+
 	/**  */
 	private java.util.Date createTime;
 
 	/**  */
 	private java.util.Date updateTime;
 
+	public boolean getDelFlag() {
+		return delFlag;
+	}
+
+	public void setDelFlag(boolean delFlag) {
+		this.delFlag = delFlag;
+	}
+
 	public void setId(Long id) {
 		this.id = id;
 	}

mec-web/src/main/java/com/ym/mec/web/service/SubjectService.java

@@ -4,6 +4,7 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.dto.SubjectApplyDetailDto;
 import com.ym.mec.web.dal.entity.Subject;
+import com.ym.mec.web.dal.entity.SubjectGoodsMapper;
 import com.ym.mec.web.dal.page.SubjectQueryInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -44,4 +45,10 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      * @param subject
      */
     void upSetSubject(Subject subject);
+
+    /**
+     * 修改、保存声部与乐器关联
+     * @param subjectGoodsMappers
+     */
+    void markGoods(List<SubjectGoodsMapper> subjectGoodsMappers);
 }

mec-web/src/main/java/com/ym/mec/web/service/impl/SubjectServiceImpl.java

@@ -5,8 +5,10 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.web.dal.dao.StudentRegistrationDao;
 import com.ym.mec.web.dal.dao.SubjectDao;
+import com.ym.mec.web.dal.dao.SubjectGoodsMapperDao;
 import com.ym.mec.web.dal.dto.SubjectApplyDetailDto;
 import com.ym.mec.web.dal.entity.Subject;
+import com.ym.mec.web.dal.entity.SubjectGoodsMapper;
 import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import com.ym.mec.web.dal.page.SubjectQueryInfo;
 import com.ym.mec.web.service.SubjectService;
@@ -18,11 +20,13 @@ import java.util.List;
 
 @Service
 public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  implements SubjectService {
-	
+
 	@Autowired
 	private SubjectDao subjectDao;
 	@Autowired
 	private StudentRegistrationDao studentRegistrationDao;
+	@Autowired
+	private SubjectGoodsMapperDao subjectGoodsMapperDao;
 
 	@Override
 	public BaseDAO<Integer, Subject> getDAO() {
@@ -68,6 +72,27 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
 		}
 	}
 
+	@Override
+	public void markGoods(List<SubjectGoodsMapper> subjectGoodsMappers) {
+		subjectGoodsMappers.forEach(e->{
+            upsetGoods(e);
+        });
+	}
+
+	private void upsetGoods(SubjectGoodsMapper subjectGoodsMapper){
+        if(subjectGoodsMapper.getId() != null){
+            if(subjectGoodsMapper.getDelFlag()){
+                subjectGoodsMapperDao.delete(subjectGoodsMapper.getId());
+                return;
+            }
+            subjectGoodsMapper.setUpdateTime(new Date());
+            subjectGoodsMapperDao.update(subjectGoodsMapper);
+        }else {
+            subjectGoodsMapperDao.insert(subjectGoodsMapper);
+        }
+	}
+
+
 	private Integer upset(Subject subject,Integer parentId){
 		if(parentId != null){
 			subject.setParentSubjectId(parentId);