Merge remote-tracking branch 'origin/master'

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dao/ExamManualLedgerDao.java

@@ -55,23 +55,23 @@ public interface ExamManualLedgerDao extends BaseDAO<Long, ExamManualLedger> {
 
     /**
      * 获取每天支出
-     * @param tenantId
+     * @param organId
      * @param days
      * @return
      */
-    List<Map<String, BigDecimal>> getDayPayment(@Param("tenantId") String tenantId, @Param("days") List<String> days);
+    List<Map<String, BigDecimal>> getDayPayment(@Param("organId") Integer organId, @Param("days") List<String> days);
 
     /**
      * 获取当年支出
-     * @param tenantId
+     * @param organId
      * @return
      */
-    BigDecimal getAnnualPayment(String tenantId);
+    BigDecimal getAnnualPayment(Integer organId);
 
     /**
      * 获取当月支出
-     * @param tenantId
+     * @param organId
      * @return
      */
-    BigDecimal getMonthPayment(String tenantId);
+    BigDecimal getMonthPayment(Integer organId);
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dao/ExamRegistrationPaymentDao.java

@@ -92,22 +92,22 @@ public interface ExamRegistrationPaymentDao extends BaseDAO<Long, ExamRegistrati
 
     /**
      * 年收入
-     * @param tenantId
+     * @param childOrganIds
      * @return
      */
-    BigDecimal getAnnualIncome(@Param("tenantId") String tenantId);
+    BigDecimal getAnnualIncome(@Param("childOrganIds") List<Integer> childOrganIds);
 
     /**
      * 月收入
-     * @param tenantId
+     * @param childOrganIds
      * @return
      */
-    BigDecimal getMonthIncome(@Param("tenantId") String tenantId);
+    BigDecimal getMonthIncome(@Param("childOrganIds") List<Integer> childOrganIds);
 
     /**
      * 日收入
-     * @param tenantId
+     * @param childOrganIds
      * @return
      */
-    List<Map<String, BigDecimal>> getDayIncome(@Param("tenantId") String tenantId, @Param("days") List<String> days);
+    List<Map<String, BigDecimal>> getDayIncome(@Param("childOrganIds") List<Integer> childOrganIds, @Param("days") List<String> days);
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/ExaminationBasicService.java

@@ -97,10 +97,9 @@ public interface ExaminationBasicService extends BaseService<Long, ExaminationBa
      * @describe 获取首页收入支出
      * @author zouxuan
      * @date 15:42
-     * @param tenantId:
      * @param day:
      * @return java.lang.Object
      */
-    Object homeBalanceOfPayment(String tenantId,Integer day);
+    Object homeBalanceOfPayment(Integer day);
 
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExaminationBasicServiceImpl.java

@@ -7,6 +7,7 @@ import com.keao.edu.common.exception.BizException;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.SysMessageService;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
+import com.keao.edu.common.tenant.OrganContextHolder;
 import com.keao.edu.common.tenant.TenantContextHolder;
 import com.keao.edu.thirdparty.message.provider.YimeiSmsPlugin;
 import com.keao.edu.user.api.enums.ExamModeEnum;
@@ -490,14 +491,15 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
 
 
     @Override
-    public Object homeBalanceOfPayment(String tenantId,Integer day) {
+    public Object homeBalanceOfPayment(Integer day) {
         if(day == null){
             day = 7;
         }
         day = day * -1;
-
-        BigDecimal annualIncome = examRegistrationPaymentDao.getAnnualIncome(tenantId);
-        BigDecimal monthIncome = examRegistrationPaymentDao.getMonthIncome(tenantId);
+        Integer organId = OrganContextHolder.getOrganId();
+        List<Integer> childOrganIds = organizationService.getChildOrganIds(organId, true);
+        BigDecimal annualIncome = examRegistrationPaymentDao.getAnnualIncome(childOrganIds);
+        BigDecimal monthIncome = examRegistrationPaymentDao.getMonthIncome(childOrganIds);
 
         LocalDate today = LocalDate.now();
         List<String> days=new ArrayList<>();
@@ -505,8 +507,9 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
         for (int i = -1 ;i > day;i--){
             days.add(today.plusDays(i).toString());
         }
-        Map<String,BigDecimal> dayIncomes = MapUtil.convertMybatisMap(examRegistrationPaymentDao.getDayIncome(tenantId,days),String.class,BigDecimal.class);
-        Map<String,BigDecimal> dayPayments = MapUtil.convertMybatisMap(examManualLedgerDao.getDayPayment(tenantId,days),String.class,BigDecimal.class);
+        Map<String,BigDecimal> dayIncomes = MapUtil.convertMybatisMap(examRegistrationPaymentDao.getDayIncome(childOrganIds,days),String.class,BigDecimal.class);
+
+        Map<String,BigDecimal> dayPayments = MapUtil.convertMybatisMap(examManualLedgerDao.getDayPayment(organId,days),String.class,BigDecimal.class);
         days.forEach(e->{
             if(dayIncomes.get(e) == null){
                 dayIncomes.put(e,BigDecimal.ZERO);
@@ -522,8 +525,8 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
         dayPayments.entrySet().stream().sorted(Map.Entry.comparingByKey())
                 .forEachOrdered(e -> hashMap2.put(e.getKey(), e.getValue()));
 
-        BigDecimal annualPayment = examManualLedgerDao.getAnnualPayment(tenantId);
-        BigDecimal monthPayment = examManualLedgerDao.getMonthPayment(tenantId);
+        BigDecimal annualPayment = examManualLedgerDao.getAnnualPayment(organId);
+        BigDecimal monthPayment = examManualLedgerDao.getMonthPayment(organId);
         HashMap<Object, Object> resultMap = new HashMap<>(6);
         resultMap.put("annualIncome",annualIncome);
         resultMap.put("monthIncome",monthIncome);

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamManualLedgerMapper.xml

@@ -208,7 +208,7 @@
     </select>
     <select id="getDayPayment" resultType="java.util.Map">
 		SELECT DATE_FORMAT(eml.trans_time_,'%Y-%m-%d') 'key',SUM(eml.amount_) 'value' FROM exam_manual_ledger eml
-		WHERE eml.tenant_id_ = #{tenantId} AND eml.trans_direction_ = 'EXPENDITURE'
+		WHERE eml.organ_id_ = #{organId} AND eml.trans_direction_ = 'EXPENDITURE'
 		AND DATE_FORMAT(eml.trans_time_,'%Y-%m-%d') IN
 		<foreach collection="days" open="(" close=")" item="day" separator=",">
 			#{day}
@@ -218,11 +218,11 @@
 	<select id="getAnnualPayment" resultType="java.math.BigDecimal">
 		SELECT SUM(eml.amount_) FROM exam_manual_ledger eml
         WHERE eml.trans_direction_ = 'EXPENDITURE' AND DATE_FORMAT(eml.trans_time_,'%Y') = DATE_FORMAT(NOW(),'%Y')
-        AND eml.tenant_id_ = #{tenantId}
+        AND eml.organ_id_ = #{organId}
 	</select>
 	<select id="getMonthPayment" resultType="java.math.BigDecimal">
 		SELECT SUM(eml.amount_) FROM exam_manual_ledger eml
         WHERE eml.trans_direction_ = 'EXPENDITURE' AND DATE_FORMAT(eml.trans_time_,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')
-        AND eml.tenant_id_ = #{tenantId}
+        AND eml.organ_id_ = #{organId}
 	</select>
 </mapper>

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamRegistrationPaymentMapper.xml

@@ -247,16 +247,25 @@
     <select id="getAnnualIncome" resultType="java.math.BigDecimal">
         SELECT SUM(erp.trans_amount_) FROM exam_registration_payment erp
         WHERE erp.trans_status_ = 'SUCCESS' AND DATE_FORMAT(erp.trans_successed_time_,'%Y') = DATE_FORMAT(NOW(),'%Y')
-        AND erp.tenant_id_ = #{tenantId};
+        AND erp.organ_id_ IN
+        <foreach collection="childOrganIds" separator="," item="organId" open="(" close=")">
+            #{organId}
+        </foreach>
     </select>
     <select id="getMonthIncome" resultType="java.math.BigDecimal">
         SELECT SUM(erp.trans_amount_) FROM exam_registration_payment erp
         WHERE erp.trans_status_ = 'SUCCESS' AND DATE_FORMAT(erp.trans_successed_time_,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')
-        AND erp.tenant_id_ = #{tenantId}
+        AND erp.organ_id_ IN
+        <foreach collection="childOrganIds" separator="," item="organId" open="(" close=")">
+            #{organId}
+        </foreach>
     </select>
     <select id="getDayIncome" resultType="java.util.Map">
         SELECT DATE_FORMAT(erp.trans_successed_time_,'%Y-%m-%d') 'key',SUM(erp.trans_amount_) 'value' FROM exam_registration_payment erp
-        WHERE erp.tenant_id_ = #{tenantId} AND erp.trans_status_ = 'SUCCESS'
+        WHERE erp.organ_id_ IN
+        <foreach collection="childOrganIds" separator="," item="organId" open="(" close=")">
+            #{organId}
+        </foreach> AND erp.trans_status_ = 'SUCCESS'
         AND DATE_FORMAT(erp.trans_successed_time_,'%Y-%m-%d') IN
         <foreach collection="days" open="(" close=")" item="day" separator=",">
             #{day}

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamReviewMapper.xml

@@ -200,12 +200,11 @@
 	</resultMap>
 	<sql id="queryExamReviewRecordListSql">
 		<where>
-			ersr.sign_in_time_ IS NOT NULL
 			<if test="reviewFlag != null and reviewFlag == 1">
-				AND er.id_ IS NOT NULL
+				AND ersr.sign_in_time_ IS NOT NULL AND er.id_ IS NOT NULL
 			</if>
 			<if test="reviewFlag != null and reviewFlag == 0">
-				AND er.id_ IS NULL AND ser.is_finished_exam_ IN (0,5)
+				AND ersr.sign_in_time_ IS NOT NULL AND er.id_ IS NULL AND ser.is_finished_exam_ IN (0,5)
 			</if>
 			<if test="roomId != 0">
 				AND ersr.exam_room_id_ = #{roomId}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExaminationBasicController.java

@@ -136,7 +136,6 @@ public class ExaminationBasicController extends BaseController {
     @PostMapping(value = "/homeBalanceOfPayment")
     @PreAuthorize("@pcs.hasPermissions('examinationBasic/homeBalanceOfPayment')")
     public HttpResponseResult homeBalanceOfPayment(Integer day){
-        String tenantId = TenantContextHolder.getTenantId();
-        return succeed(examinationBasicService.homeBalanceOfPayment(tenantId,day));
+        return succeed(examinationBasicService.homeBalanceOfPayment(day));
     }
 }