update

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

@@ -1,10 +1,9 @@
 package com.ym.mec.biz.dal.dao;
 
+import java.util.List;
+
 import com.ym.mec.biz.dal.entity.DegreeLevelFee;
 import com.ym.mec.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 public interface DegreeLevelFeeDao extends BaseDAO<Long, DegreeLevelFee> {
 
@@ -13,6 +12,6 @@ public interface DegreeLevelFeeDao extends BaseDAO<Long, DegreeLevelFee> {
      *
      * @return
      */
-    List<DegreeLevelFee> getAll();
+    List<DegreeLevelFee> getAll(Integer tenantId);
 
 }

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

@@ -12,10 +12,12 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.http.HttpUtil;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,8 +26,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.*;
-
-import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
@@ -140,7 +140,7 @@ public class ChildrenDayReserveServiceImpl extends BaseServiceImpl<Integer, Chil
 
     @Override
     public DegreeFeeDto getFeeInfo(Integer organId) {
-        List<DegreeLevelFee> degreeLevelFee = degreeLevelFeeDao.getAll();
+        List<DegreeLevelFee> degreeLevelFee = degreeLevelFeeDao.getAll(TenantContextHolder.getTenantId());
         OrganizationDegreeCourseFee courseFee = organizationDegreeCourseFeeDao.getByOrganId(organId);
         DegreeFeeDto degreeFeeDto = new DegreeFeeDto();
         degreeFeeDto.setDegreeLevelFee(degreeLevelFee);
@@ -242,7 +242,7 @@ public class ChildrenDayReserveServiceImpl extends BaseServiceImpl<Integer, Chil
         }
         degreePayDto.setReserveId(userReserve.getId());
 
-        List<DegreeLevelFee> degreeLevelFees = degreeLevelFeeDao.getAll();
+        List<DegreeLevelFee> degreeLevelFees = degreeLevelFeeDao.getAll(TenantContextHolder.getTenantId());
 
         //订单总金额
         BigDecimal orderAmount = BigDecimal.ZERO;

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

@@ -13,6 +13,7 @@
 		<result column="change_info_" property="changeInfo" />
 		<result column="create_time_" property="createTime" />
 		<result column="class_name_" property="className" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -22,13 +23,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="DataChangeLog">
-		SELECT * FROM data_change_log ORDER BY id_
+		SELECT * FROM data_change_log where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.DataChangeLog" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO data_change_log (id_,data_id_,operator_id_,change_info_,create_time_,class_name_)
-		VALUES(#{id},#{dataId},#{operatorId},#{changeInfo},NOW(),#{className})
+		INSERT INTO data_change_log (id_,data_id_,operator_id_,change_info_,create_time_,class_name_,tenant_id_)
+		VALUES(#{id},#{dataId},#{operatorId},#{changeInfo},NOW(),#{className},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -47,7 +48,7 @@
 			<if test="changeInfo != null">
 				change_info_ = #{changeInfo},
 			</if>
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -57,11 +58,11 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="DataChangeLog" parameterType="map">
-		SELECT * FROM data_change_log ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM data_change_log where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM data_change_log
+		SELECT COUNT(*) FROM data_change_log where tenant_id_ = #{tenantId}
 	</select>
 </mapper>

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

@@ -10,6 +10,7 @@
         <result column="theory_" property="theory"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+		<result column="tenant_id_" property="tenantId" />
     </resultMap>
     <select id="get" parameterType="java.lang.Integer" resultMap="DegreeLevelFee">
         <!--@mbg.generated-->
@@ -25,8 +26,8 @@
     <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.DegreeLevelFee"
             useGeneratedKeys="true">
         <!--@mbg.generated-->
-        insert into degree_level_fee (level_, grade_, theory_, create_time_, update_time_)
-        values (#{level}, #{grade}, #{theory}, #{createTime}, #{updateTime})
+        insert into degree_level_fee (level_, grade_, theory_, create_time_, update_time_,tenant_id_)
+        values (#{level}, #{grade}, #{theory}, #{createTime}, #{updateTime},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.DegreeLevelFee">
         <!--@mbg.generated-->
@@ -48,13 +49,13 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 全查询 -->
     <select id="getAll" resultMap="DegreeLevelFee">
         SELECT *
-        FROM degree_level_fee
+        FROM degree_level_fee where tenant_id_ = #{tenantId}
         ORDER BY level_ ASC
     </select>
 </mapper>

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

@@ -69,11 +69,11 @@ public class CourseScheduleTeacherSalaryController extends BaseController {
 
         Map<String, Object> result=new HashMap<>();
         result.put("pageInfo", courseScheduleTeacherSalaryService.findIsSettlementCourseSalarys(queryInfo));
-        int i = courseScheduleTeacherSalaryDao.countOpenConfirmSalarysWithMonth(queryInfo.getMonth(), TeacherSalaryConfirmStatus.UNCONFIRMED);
+        int i = courseScheduleTeacherSalaryDao.countOpenConfirmSalarysWithMonth(queryInfo.getMonth(), TeacherSalaryConfirmStatus.UNCONFIRMED, queryInfo.getTeacherId());
         if(i>0){
             result.put("isOpenConfirm", 1);
         }else{
-            int j = courseScheduleTeacherSalaryDao.countOpenConfirmSalarysWithMonth(queryInfo.getMonth(), null);
+            int j = courseScheduleTeacherSalaryDao.countOpenConfirmSalarysWithMonth(queryInfo.getMonth(), null, queryInfo.getTeacherId());
             if(j<=0){
                 result.put("isOpenConfirm", 2);
             }else{

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

@@ -14,11 +14,14 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.IdGeneratorService;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.excel.POIUtil;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +33,7 @@ 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;
 import java.math.BigDecimal;
@@ -1504,7 +1508,7 @@ public class ExportController extends BaseController {
     @RequestMapping("export/studentVipPractice")
     @PreAuthorize("@pcs.hasPermissions('export/studentVipPractice')")
     public HttpResponseResult exportStudentVipPractice(String organId) throws IOException {
-        boolean hasCourse = courseScheduleStudentPaymentDao.hasCourse(organId);
+        boolean hasCourse = courseScheduleStudentPaymentDao.hasCourse(organId, TenantContextHolder.getTenantId());
         if (!hasCourse) {
             return failed("没有可导出的数据");
         }