Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupBuyParamsDto.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
@@ -8,7 +9,7 @@ import java.util.List;
  * @Author Joburgess
  * @Date 2019/10/2
  */
-public class VipGroupBuyParamsDto {
+public class VipGroupBuyParamsDto extends BaseEntity {
 
     @ApiModelProperty(value = "vip课程ID")
     private Long vipGroupId;

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/TenantCloudCourseRecordVo.java

@@ -26,13 +26,13 @@ public class TenantCloudCourseRecordVo implements Serializable {
     private Integer courseId;
 
     @ApiModelProperty(value = "分部名称")
-    private Integer organName;
+    private String organName;
 
     @ApiModelProperty(value = "机构Id")
     private Integer tenantId;
 
     @ApiModelProperty(value = "机构名称")
-    private Integer tenantName;
+    private String tenantName;
 
     @ApiModelProperty(value = "课程类型  CourseSchedule.CourseScheduleType")
     private String type;
@@ -82,11 +82,11 @@ public class TenantCloudCourseRecordVo implements Serializable {
         this.courseId = courseId;
     }
 
-    public Integer getOrganName() {
+    public String getOrganName() {
         return organName;
     }
 
-    public void setOrganName(Integer organName) {
+    public void setOrganName(String organName) {
         this.organName = organName;
     }
 
@@ -98,11 +98,11 @@ public class TenantCloudCourseRecordVo implements Serializable {
         this.tenantId = tenantId;
     }
 
-    public Integer getTenantName() {
+    public String getTenantName() {
         return tenantName;
     }
 
-    public void setTenantName(Integer tenantName) {
+    public void setTenantName(String tenantName) {
         this.tenantName = tenantName;
     }
 

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

@@ -18,11 +18,13 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.ByteArrayInputStream;
@@ -53,9 +55,10 @@ public class AppRedemptionCodeServiceImpl extends ServiceImpl<RedemptionCodeDao,
     private final static Logger logger = LoggerFactory.getLogger(AppRedemptionCodeServiceImpl.class);
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List<AppRedemptionCode> importRedemptionCode(MultipartFile file) throws Exception {
         Map<String, List<Map<String, Object>>> sheetsListMap = POIUtil.importExcel(
-                new ByteArrayInputStream(file.getBytes()), 2, file.getOriginalFilename());
+                new ByteArrayInputStream(file.getBytes()), 0, file.getOriginalFilename());
 
         InputStream inputStream = new ClassPathResource("columnMapper.ini").getInputStream();
         Map<String, String> columns = IniFileUtil.readIniFile(inputStream, TemplateTypeEnum.REDEMPTIONCODE.getMsg());
@@ -83,13 +86,20 @@ public class AppRedemptionCodeServiceImpl extends ServiceImpl<RedemptionCodeDao,
                 try {
                     AppRedemptionCode redemptionCode = JSONObject.parseObject(objectMap.toJSONString(),
                                                                               AppRedemptionCode.class);
+                    if (redemptionCode.getCode() == null) continue;
                     redemptionCodesList.add(redemptionCode);
-                    redemptionCodeDao.insert(redemptionCode);
                 } catch (Exception ex) {
-                    throw new BizException("导入数据出错", ex);
+                    throw new BizException("导入数据出错:" + ex, ex);
                 }
             }
         }
+        try {
+            redemptionCodeDao.insertBatch(redemptionCodesList);
+        } catch (DuplicateKeyException dupKeyEx) {
+            throw new BizException("数据重复:" + dupKeyEx.getCause(), dupKeyEx);
+        } catch (Exception ex) {
+            throw new BizException("导入数据出错:" + ex, ex);
+        }
         return redemptionCodesList;
     }
 

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

@@ -609,18 +609,13 @@
 
     <sql id="queryStudentIdsByClassGroupIdSql">
         <where>
-            <if test="classGroupId != null">
-                AND class_group_id_ = #{classGroupId}
-            </if>
+            class_group_id_ = #{classGroupId}
             <if test="groupType != null">
                 AND group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
             <if test="musicGroupId != null">
                 AND music_group_id_ = #{musicGroupId}
             </if>
-            <if test="tenantId!=null">
-                AND tenant_id_=#{tenantId}
-            </if>
         </where>
     </sql>
     <select id="getStudentClassGroupBishopTeacherMap" resultType="com.ym.mec.biz.dal.dto.BaseMapDto">

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

@@ -234,18 +234,13 @@
     </select>
     <sql id="queryTeacherIdsByClassGroupIdSql">
         <where>
-            <if test="classGroupId != null">
-                AND class_group_id_ = #{classGroupId}
-            </if>
+            class_group_id_ = #{classGroupId}
             <if test="groupType != null">
                 AND group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
             <if test="musicGroupId != null">
                 AND music_group_id_ = #{musicGroupId}
             </if>
-            <if test="tenantId != null">
-                AND tenant_id_ = #{tenantId}
-            </if>
         </where>
     </sql>
 </mapper>

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

@@ -86,7 +86,7 @@
 
     <sql id="queryPageSql">
         <where>
-        	tenant_id_ = #{tenantId}
+        	i.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND FIND_IN_SET(i.organ_id_,#{organId})
             </if>

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

@@ -122,7 +122,7 @@
     </select>
     <sql id="queryPageSql">
         <where>
-        	tenant_id_ = #{tenantId}
+        	mgq.tenant_id_ = #{tenantId}
             <if test="ids != null and ids != ''">
                 AND FIND_IN_SET(mgq.id_,#{ids})
             </if>

mec-web/src/main/resources/columnMapper.ini

@@ -50,5 +50,5 @@
 缴费单号 = calenderId
 
 [兑换码分配模板表]
-分配码 = code
-兑换链接 = url
+代码 = code
+链接地址 = url