Merge remote-tracking branch 'origin/master'

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

@@ -51,6 +51,9 @@ public class InspectionItemPlanConclusion {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
+    @ApiModelProperty(value = "班级信息")
+    private String classInfo;
+
     public Long getId() {
         return id;
     }
@@ -114,4 +117,12 @@ public class InspectionItemPlanConclusion {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public String getClassInfo() {
+        return classInfo;
+    }
+
+    public void setClassInfo(String classInfo) {
+        this.classInfo = classInfo;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/InspectionItemPlanConclusionService.java

@@ -38,7 +38,7 @@ public interface InspectionItemPlanConclusionService extends BaseService<Long, I
      * @param planId
      * @return
      */
-    Map<Long,List<InspectionItemPlanConclusion>> getPlanConclusion(Long planId);
+    List<Map<String, String>> getPlanConclusion(Long planId);
 }
 
 

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

@@ -3151,10 +3151,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					if (DateUtil.minutesBetween(practiceGroup.getCoursesExpireDate(), newCourseSchedule.getEndClassTime()) > 0) {
 						throw new BizException("调整失败: 截止时间超过课程有效期");
 					}
-					practiceGroup.setCoursesStartDate(courseScheduleDao.getFirstTime(practiceGroup.getId(),PRACTICE.getCode()));
-					practiceGroup.setCoursesExpireDate(courseScheduleDao.getLastTime(practiceGroup.getId(),PRACTICE.getCode()));
-					practiceGroup.setUpdateTime(date);
-					practiceGroupDao.update(practiceGroup);
 				}
 			}
         }
@@ -5398,15 +5394,17 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			if(Objects.isNull(mainCoursePayment.getBeMerged())){
 				throw new BizException("当前课程暂不支持此操作");
 			}
-//			if(mainCoursePayment.getBeMerged()){
-//				deletePaymentIds.add(mainCoursePayment.getId().intValue());
-//				continue;
-//			}
+			if(mainCoursePayment.getBeMerged()){
+				deletePaymentIds.add(mainCoursePayment.getId().intValue());
+				continue;
+			}
 //			mainCoursePayment.setExpectPrice(mainCoursePayment.getExpectPrice().subtract(otherCoursePayment.getExpectPrice()));
 //			updatePayments.add(mainCoursePayment);
 		}
 
-		courseScheduleStudentPaymentDao.batchDeleteWithID(deletePaymentIds);
+		if(!CollectionUtils.isEmpty(deletePaymentIds)){
+			courseScheduleStudentPaymentDao.batchDeleteWithID(deletePaymentIds);
+		}
 //		courseScheduleStudentPaymentDao.batchUpdate(updatePayments);
 
 		List<CourseScheduleModifyLog> insertCourseScheduleModifyLogList = new ArrayList<>();

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

@@ -18,10 +18,7 @@ import com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion;
 import com.ym.mec.biz.service.InspectionItemPlanConclusionService;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -129,9 +126,21 @@ public class InspectionItemPlanConclusionServiceImpl extends BaseServiceImpl<Lon
     }
 
     @Override
-    public Map<Long, List<InspectionItemPlanConclusion>> getPlanConclusion(Long planId) {
+    public List<Map<String, String>> getPlanConclusion(Long planId) {
         List<InspectionItemPlanConclusion> conclusions = inspectionItemPlanConclusionDao.getInspectionItemPlanConclusion(planId, null);
-        return conclusions.stream().collect(Collectors.groupingBy(InspectionItemPlanConclusion::getCourseScheduleId));
+        Map<Long, List<InspectionItemPlanConclusion>> courseConclusions = conclusions.stream().collect(Collectors.groupingBy(InspectionItemPlanConclusion::getCourseScheduleId));
+        List<Map<String, String>> conclusionMaps = new ArrayList<>();
+        courseConclusions.forEach((courseId, inspectionItemPlanConclusions) -> {
+            Map<String, String> conclusionMap = new LinkedHashMap<>();
+            for (InspectionItemPlanConclusion conclusion : inspectionItemPlanConclusions) {
+                if (!conclusionMap.containsKey("name")) {
+                    conclusionMap.put("name", conclusion.getClassInfo());
+                }
+                conclusionMap.put(conclusion.getCheckItem().toString(), conclusion.getCheckConclusion().toString());
+            }
+            conclusionMaps.add(conclusionMap);
+        });
+        return conclusionMaps;
     }
 }
 

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

@@ -276,8 +276,8 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
         SysUserCoursesAccountDetail sysUserCoursesAccountDetail = new SysUserCoursesAccountDetail();
         if(changeMoney.compareTo(cashAccount.getCourseBalance())>0){
             changeMoney = changeMoney.subtract(cashAccount.getCourseBalance());
+            sysUserCoursesAccountDetail.setAmount(cashAccount.getCourseBalance());
             cashAccount.setCourseBalance(BigDecimal.ZERO);
-            sysUserCoursesAccountDetail.setAmount(changeMoney);
         }else{
             cashAccount.setCourseBalance(cashAccount.getCourseBalance().subtract(changeMoney));
             sysUserCoursesAccountDetail.setAmount(changeMoney);

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

@@ -1110,7 +1110,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(Objects.isNull(vipGroupActivity)||vipGroupCategory.getMusicTheory()){
 			BigDecimal ots = teacherDefaultVipGroupSalary.getOfflineClassesSalary();
 			BigDecimal ofts = teacherDefaultVipGroupSalary.getOfflineClassesSalary();
-			if(Objects.nonNull(vipGroup.getStatus())&&normalStudentNum!=vipGroupCategory.getStudentNum()){
+			if(Objects.nonNull(vipGroup.getStatus())&&vipGroupCategory.getMusicTheory()){
 				ots = ots.multiply(new BigDecimal(normalStudentNum)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
 				ofts = ofts.multiply(new BigDecimal(normalStudentNum>5?5:normalStudentNum)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
 			}
@@ -2998,7 +2998,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				surplusCoursesPrice=surplusCoursesPrice.multiply(discount).setScale(CommonConstants.DECIMAL_FINAL_PLACE,BigDecimal.ROUND_HALF_UP);
 			}
 
-			sysUserCashAccountService.subtractFromCourseBalanceAndBalance(studentId,surplusCoursesPrice,PlatformCashAccountDetailTypeEnum.PAY_FEE, "后台添加学员扣减账户金额");
+			sysUserCashAccountService.subtractFromCourseBalanceAndBalance(studentId,surplusCoursesPrice,PlatformCashAccountDetailTypeEnum.PAY_FEE, "后台添加学员金额扣减");
 
 			List<CourseScheduleStudentPayment> courseScheduleStudentPayments=new ArrayList<>();
 

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ym.mec.biz.dal.dao.InspectionItemPlanConclusionDao">
-    <resultMap id="BaseResultMap" type="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion">
+    <resultMap id="InspectionItemPlanConclusion" type="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion">
         <!--@mbg.generated-->
         <!--@Table inspection_item_plan_conclusion-->
         <id column="id_" property="id"/>
@@ -12,12 +12,13 @@
         <result column="check_conclusion_" property="checkConclusion"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="classInfo" property="classInfo"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id_, plan_id_,course_schedule_id_, teacher_id_, check_item_, check_conclusion_, create_time_, update_time_
     </sql>
-    <select id="get" resultMap="BaseResultMap">
+    <select id="get" resultMap="InspectionItemPlanConclusion">
         <!--@mbg.generated-->
         select
         <include refid="Base_Column_List"/>
@@ -94,17 +95,21 @@
         GROUP BY plan_id_
     </select>
 
-    <select id="getInspectionItemPlanConclusion" resultMap="BaseResultMap">
-        SELECT * FROM inspection_item_plan_conclusion WHERE plan_id_=#{planId}
+    <select id="getInspectionItemPlanConclusion" resultMap="InspectionItemPlanConclusion">
+        SELECT iipc.*,CONCAT(cg.name_, ' - ', su.real_name_) classInfo FROM inspection_item_plan_conclusion iipc
+        LEFT JOIN course_schedule cs ON iipc.course_schedule_id_ = cs.id_
+        LEFT JOIN class_group cg ON cg.id_=cs.class_group_id_
+        LEFT JOIN sys_user su on su.id_ = iipc.teacher_id_
+        WHERE iipc.plan_id_=#{planId}
         <if test="checkItem != null">
-            AND check_item_ = #{checkItem}
+            AND iipc.check_item_ = #{checkItem}
         </if>
-        ORDER BY check_item_ ASC,course_schedule_id_ ASC
+        ORDER BY iipc.check_item_ ASC,iipc.course_schedule_id_ ASC
     </select>
 
     <select id="getPlanConclusionCourses" resultMap="com.ym.mec.biz.dal.dao.CourseScheduleDao.CourseSchedule">
-        SELECT iipc.course_schedule_id_             id_,
-               iipc.teacher_id_                     actual_teacher_id_,
+        SELECT iipc.course_schedule_id_               id_,
+               iipc.teacher_id_                       actual_teacher_id_,
                CONCAT(cg.name_, ' - ', su.real_name_) name_
         FROM inspection_item_plan_conclusion iipc
                  LEFT JOIN course_schedule cs ON iipc.course_schedule_id_ = cs.id_

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

@@ -158,7 +158,7 @@ public class EmployeeController extends BaseController {
             sysUser = sysUserFeignService.queryUserById(userId);
         }
         String organIds = new String();
-        if(Objects.nonNull(organId)){
+        if(Objects.isNull(organId)){
             if (!sysUser.getIsSuperAdmin()) {
                 Employee employee = employeeService.get(sysUser.getId());
                 if (StringUtils.isEmpty(organIds)) {

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

@@ -1,6 +1,5 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion;
 import com.ym.mec.biz.service.InspectionItemPlanConclusionService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -26,8 +25,15 @@ public class InspectionItemPlanConclusionController extends BaseController {
     @GetMapping("/getPlanConclusion")
     @PreAuthorize("@pcs.hasPermissions('inspectionItemPlanConclusion/getPlanConclusion')")
     @ApiImplicitParams({@ApiImplicitParam(name = "planId", value = "日程id", required = true, dataType = "int")})
-    public HttpResponseResult<Map<Long, List<InspectionItemPlanConclusion>>> getInfo(Long planId, Integer checkItem) {
+    public HttpResponseResult<List<Map<String, String>>> getPlanConclusion(Long planId) {
+        return succeed(InspectionItemPlanConclusionService.getPlanConclusion(planId));
+    }
+
+    @ApiOperation(value = "导出日程的巡查结果")
+    @GetMapping("/exportPlanConclusion")
+    @PreAuthorize("@pcs.hasPermissions('inspectionItemPlanConclusion/exportPlanConclusion')")
+    @ApiImplicitParams({@ApiImplicitParam(name = "planId", value = "日程id", required = true, dataType = "int")})
+    public HttpResponseResult<List<Map<String, String>>> exportPlanConclusion(Long planId) {
         return succeed(InspectionItemPlanConclusionService.getPlanConclusion(planId));
     }
-    
 }