update

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

@@ -13,11 +13,11 @@ public interface SysMusicScoreCategoriesDao extends BaseDAO<Integer, SysMusicSco
 
     List<SysMusicScoreCategories> findByParentId(@Param("parentId") Integer parentId);
 
-    void batchInsert(@Param("categoriesList") List<SysMusicScoreCategories> sysMusicScoreCategoriesList);
+    void batchInsert(@Param("categoriesList") List<SysMusicScoreCategories> sysMusicScoreCategoriesList, @Param("organId") String organId, @Param("enable") Boolean enable);
 
     void batchDel(@Param("categoriesIds") String categoriesIds);
 
     String findByCategoriesIds(@Param("categoriesIds") String categoriesIds);
 
-    void batchUpdate(@Param("categories") List<SysMusicScoreCategories> updateCategories);
+    void batchUpdate(@Param("categories") List<SysMusicScoreCategories> updateCategories, @Param("organId") String organId, @Param("enable") Boolean enable);
 }

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

@@ -17,7 +17,7 @@ public class SysMusicScoreCategories {
 
 	private String organId;
 
-	private Boolean enable;
+	private Boolean enable = false;
 	
 	/** 名称 */
 	private String name;
@@ -36,6 +36,16 @@ public class SysMusicScoreCategories {
 
 	private String delCategoriesIds;
 
+	private String organNames;
+
+	public String getOrganNames() {
+		return organNames;
+	}
+
+	public void setOrganNames(String organNames) {
+		this.organNames = organNames;
+	}
+
 	public Boolean getEnable() {
 		return enable;
 	}

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

@@ -46,19 +46,25 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void save(SysMusicScoreCategories musicScoreCategories) {
+		String organId = musicScoreCategories.getOrganId();
+		Boolean enable = musicScoreCategories.getEnable();
 		musicScoreCategories.setParentId(0);
 		sysMusicScoreCategoriesDao.insert(musicScoreCategories);
 		List<SysMusicScoreCategories> sysMusicScoreCategoriesList = musicScoreCategories.getSysMusicScoreCategoriesList();
 		if(sysMusicScoreCategoriesList != null && sysMusicScoreCategoriesList.size() > 0){
 			for (SysMusicScoreCategories categories : sysMusicScoreCategoriesList) {
+				categories.setOrganId(organId);
+				categories.setEnable(enable);
 				categories.setParentId(musicScoreCategories.getId());
 				sysMusicScoreCategoriesDao.insert(categories);
 				List<SysMusicScoreCategories> categoriesList = categories.getSysMusicScoreCategoriesList();
 				if(categoriesList != null && categoriesList.size() > 0){
 					categoriesList.forEach(e->{
+						e.setOrganId(organId);
+						e.setEnable(enable);
 						e.setParentId(categories.getId());
 					});
-					sysMusicScoreCategoriesDao.batchInsert(categoriesList);
+					sysMusicScoreCategoriesDao.batchInsert(categoriesList,organId,enable);
 				}
 			}
 		}
@@ -67,6 +73,8 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void updateCategories(SysMusicScoreCategories musicScoreCategories) {
+		String organId = musicScoreCategories.getOrganId();
+		Boolean enable = musicScoreCategories.getEnable();
 		sysMusicScoreCategoriesDao.update(musicScoreCategories);
 		String delCategoriesIds = musicScoreCategories.getDelCategoriesIds();
 		if(StringUtils.isNotEmpty(delCategoriesIds)){
@@ -84,14 +92,18 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 			List<SysMusicScoreCategories> insertCategoriesList = sysMusicScoreCategoriesList.stream().filter(e -> e.getId() == null).collect(Collectors.toList());
 			if(insertCategoriesList != null && insertCategoriesList.size() > 0){
 				for (SysMusicScoreCategories categories : insertCategoriesList) {
+					categories.setOrganId(organId);
+					categories.setEnable(enable);
 					categories.setParentId(musicScoreCategories.getId());
 					sysMusicScoreCategoriesDao.insert(categories);
 					List<SysMusicScoreCategories> categoriesList = categories.getSysMusicScoreCategoriesList();
 					if(categoriesList != null && categoriesList.size() > 0){
 						categoriesList.forEach(e->{
+							e.setOrganId(organId);
+							e.setEnable(enable);
 							e.setParentId(categories.getId());
 						});
-						sysMusicScoreCategoriesDao.batchInsert(categoriesList);
+						sysMusicScoreCategoriesDao.batchInsert(categoriesList,organId,enable);
 					}
 				}
 			}
@@ -103,22 +115,25 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 						List<SysMusicScoreCategories> insertCategories = categoriesList.stream().filter(e -> e.getId() == null).collect(Collectors.toList());
 						if(insertCategories != null && insertCategories.size() > 0){
 							for (SysMusicScoreCategories insertCategory : insertCategories) {
+								insertCategory.setOrganId(organId);
+								insertCategory.setEnable(enable);
 								insertCategory.setParentId(categories.getId());
 							}
-							sysMusicScoreCategoriesDao.batchInsert(insertCategories);
+							sysMusicScoreCategoriesDao.batchInsert(insertCategories,organId,enable);
 						}
 						List<SysMusicScoreCategories> updateCategories = categoriesList.stream().filter(e -> e.getId() == null).collect(Collectors.toList());
 						if(updateCategories != null && updateCategories.size() > 0){
-							sysMusicScoreCategoriesDao.batchUpdate(updateCategories);
+							sysMusicScoreCategoriesDao.batchUpdate(updateCategories,organId,enable);
 						}
 					}
 				}
-				sysMusicScoreCategoriesDao.batchUpdate(updateCategoriesList);
+				sysMusicScoreCategoriesDao.batchUpdate(updateCategoriesList,organId,enable);
 			}
 		}
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void del(Integer id) {
 		String byCategoriesIds = sysMusicScoreCategoriesDao.findByCategoriesIds(id.toString());
 		byCategoriesIds = sysMusicScoreCategoriesDao.findByCategoriesIds(byCategoriesIds);

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

@@ -37,7 +37,7 @@
 		INSERT INTO sys_music_score_categories (parent_id_,name_,cover_img_,operator_id_,create_time_,update_time_,organ_id_,enable_)
 		VALUES
 		<foreach collection="categoriesList" item="bean" separator=",">
-			(#{bean.parentId},#{bean.name},#{bean.coverImg},#{bean.operatorId},NOW(),NOW(),#{bean.organId},#{bean.enable})
+			(#{bean.parentId},#{bean.name},#{bean.coverImg},#{bean.operatorId},NOW(),NOW(),#{organId},#{enable})
 		</foreach>
 	</insert>
 
@@ -45,7 +45,7 @@
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysMusicScoreCategories">
 		UPDATE sys_music_score_categories <set>
 			<if test="parentId != null">
-			parent_id_ = #{parentId},
+				parent_id_ = #{parentId},
 			</if>
 			<if test="organId != null">
 				organ_id_ = #{organId},
@@ -54,21 +54,16 @@
 				enable_ = #{enable},
 			</if>
 			<if test="operatorId != null">
-			operator_id_ = #{operatorId},
+				operator_id_ = #{operatorId},
 			</if>
 			<if test="coverImg != null">
-			cover_img_ = #{coverImg},
-			</if>
-			<if test="id != null">
-			id_ = #{id},
-			</if>
-			<if test="updateTime != null">
-			update_time_ = #{updateTime},
+				cover_img_ = #{coverImg},
 			</if>
 			<if test="name != null">
-			name_ = #{name},
+				name_ = #{name},
 			</if>
-			</set> WHERE id_ = #{id}
+				update_time_ = NOW()
+	</set> WHERE id_ = #{id}
 	</update>
 	<update id="batchUpdate">
 		<foreach collection="categories" item="bean" index="index" open="" close="" separator=";">
@@ -76,17 +71,20 @@
 			<if test="bean.operatorId != null">
 				operator_id_ = #{bean.operatorId},
 			</if>
+			<if test="organId != null">
+				organ_id_ = #{organId},
+			</if>
+			<if test="enable != null">
+				enable_ = #{enable},
+			</if>
 			<if test="bean.coverImg != null">
 				cover_img_ = #{bean.coverImg},
 			</if>
-			<if test="updateTime != null">
-				update_time_ = #{updateTime},
-			</if>
 			<if test="bean.name != null">
 				name_ = #{bean.name},
 			</if>
 			update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{bean.id}
 		</foreach>
 	</update>