Merge remote-tracking branch 'origin/master'

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

@@ -50,4 +50,13 @@ public interface InspectionItemPlanConclusionDao extends BaseDAO<Long, Inspectio
      * @return
      */
     List<CourseSchedule> getPlanConclusionCourses(@Param("planId") Long planId);
+
+    /**
+     * 获取日程检查结果的数量
+     *
+     * @param planId
+     * @param checkConclusion
+     * @return
+     */
+    int getCountByPlanIdAndCheckConclusion(@Param("planId") Long planId, @Param("checkConclusion") Integer checkConclusion);
 }

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

@@ -87,10 +87,17 @@ public class InspectionItemPlan {
     @ApiModelProperty(value = "处理方式")
     private String memo;
 
+
+    /**
+     * 巡查结果是否异常 0-正常 1-异常
+     */
+    @ApiModelProperty(value = "巡查结果是否异常 0-正常 1-异常")
+    private Integer conclusionStatus;
+
     /**
      * 0 -未提交 1-正常 2-异常
      */
-    @ApiModelProperty(value = "0 -未提交 1-正常 2-异常")
+    @ApiModelProperty(value = "提交状态 0 -未提交 1-正常 2-异常")
     private Integer status;
 
     /**
@@ -276,4 +283,12 @@ public class InspectionItemPlan {
     public void setOrganName(String organName) {
         this.organName = organName;
     }
+
+    public Integer getConclusionStatus() {
+        return conclusionStatus;
+    }
+
+    public void setConclusionStatus(Integer conclusionStatus) {
+        this.conclusionStatus = conclusionStatus;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/InspectionItemPlanQueryInfo.java

@@ -22,6 +22,12 @@ public class InspectionItemPlanQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "乐团主管id",required = false)
     private Integer userId;
 
+    @ApiModelProperty(value = "巡查结果是否异常 0-正常 1-异常",required = false)
+    private Integer conclusionStatus;
+
+    @ApiModelProperty(value = "提交状态 0 -未提交 1-正常 2-异常",required = false)
+    private Integer status;
+
     @ApiModelProperty(value = "是否已提交 0-未提交 1-已提交 ",required = false)
     private Integer hasSubmit;
 
@@ -103,4 +109,20 @@ public class InspectionItemPlanQueryInfo extends QueryInfo {
     public void setMusicGroupId(String musicGroupId) {
         this.musicGroupId = musicGroupId;
     }
+
+    public Integer getConclusionStatus() {
+        return conclusionStatus;
+    }
+
+    public void setConclusionStatus(Integer conclusionStatus) {
+        this.conclusionStatus = conclusionStatus;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 }

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

@@ -1104,6 +1104,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                         if (musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
                             salary = TeachTypeEnum.BISHOP.equals(classGroupTeacher.getTeacherRole()) ? teacherDefaultMusicGroupSalaryHigh.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalaryHigh.getAssistantTeacher90MinSalary();
                         }
+                        if(Objects.isNull(salary)){
+                            throw new BizException("请设置老师课酬");
+                        }
                         salary = salary.multiply(new BigDecimal(studentNum));
                     }
                     if(Objects.isNull(salary)){
@@ -1267,6 +1270,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                             if (musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
                                 salary = TeachTypeEnum.BISHOP.equals(classGroupTeacher.getTeacherRole()) ? teacherDefaultMusicGroupSalaryHigh.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalaryHigh.getAssistantTeacher90MinSalary();
                             }
+                            if(Objects.isNull(salary)){
+                                throw new BizException("请设置老师课酬");
+                            }
                             salary = salary.multiply(new BigDecimal(studentNum));
                         }
                         if(Objects.isNull(salary)){
@@ -3927,6 +3933,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                                         if (musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
                                             salary = TeachTypeEnum.BISHOP.equals(classGroupTeacher.getTeacherRole()) ? teacherDefaultMusicGroupSalaryHigh.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalaryHigh.getAssistantTeacher90MinSalary();
                                         }
+                                        if(Objects.isNull(salary)){
+                                            throw new BizException("请设置老师课酬");
+                                        }
                                         salary = salary.multiply(new BigDecimal(aLong));
                                     }
                                     if(Objects.isNull(salary)){

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

@@ -175,6 +175,9 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
                         if (musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
                             salary = TeachTypeEnum.BISHOP.equals(classGroupTeacher.getTeacherRole()) ? teacherDefaultMusicGroupSalaryHigh.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalaryHigh.getAssistantTeacher90MinSalary();
                         }
+                        if(Objects.isNull(salary)){
+                            throw new BizException("请设置老师课酬");
+                        }
                         salary = salary.multiply(new BigDecimal(studentNum));
                     }
                     if(Objects.isNull(salary)){
@@ -358,6 +361,9 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
                         if (musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
                             salary = TeachTypeEnum.BISHOP.equals(classGroupTeacher.getTeacherRole()) ? teacherDefaultMusicGroupSalaryHigh.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalaryHigh.getAssistantTeacher90MinSalary();
                         }
+                        if(Objects.isNull(salary)){
+                            throw new BizException("请设置老师课酬");
+                        }
                         salary = salary.multiply(new BigDecimal(studentNum));
                     }
                     if(Objects.isNull(salary)){
@@ -562,6 +568,9 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
                         if (musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
                             salary = TeachTypeEnum.BISHOP.equals(classGroupTeacher.getTeacherRole()) ? teacherDefaultMusicGroupSalaryHigh.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalaryHigh.getAssistantTeacher90MinSalary();
                         }
+                        if(Objects.isNull(salary)){
+                            throw new BizException("请设置老师课酬");
+                        }
                         salary = salary.multiply(new BigDecimal(studentNum));
                     }
                     if(Objects.isNull(salary)){

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

@@ -3360,7 +3360,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					} else if (newCourseSchedule.getGroupType() == GroupType.VIP) {
 						Map<String, BigDecimal> salaryMap = vipGroupService.countVipGroupPredictFee(vipGroup, teacherId, null, null);
 
-						BigDecimal teacherSalary=BigDecimal.ZERO;
+						BigDecimal teacherSalary=null;
 
 						if(Objects.nonNull(salaryMap)){
 							teacherSalary=newCourseSchedule.getTeachMode() == TeachModeEnum.OFFLINE?salaryMap.get("offlineTeacherSalary"):salaryMap.get("onlineTeacherSalary");
@@ -3377,6 +3377,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							throw new BizException("请设置老师 的网管课课酬");
 						}
 					}
+					if(ts.getExpectSalary() == null){
+						throw new BizException("请设置老师的课酬");
+					}
 					insertCourseScheduleTeacherSalaryList.add(ts);
 				}
 			}

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

@@ -1183,6 +1183,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 baseSalary = TeachTypeEnum.BISHOP.equals(courseScheduleTeacherSalary.getTeacherRole()) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
                 classTimeDuty = new BigDecimal(classCourseDuration).divide(new BigDecimal(40), BigDecimal.ZERO.intValue(), BigDecimal.ROUND_DOWN);
             }
+            
+            if(Objects.isNull(baseSalary)){
+                throw new BizException("课酬设置异常");
+            }
 
             salary = baseSalary.multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);
 

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

@@ -376,10 +376,13 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         }
         courseScheduleDao.batchAddCourseSchedules(practiceCourses);
         TeacherDefaultPracticeGroupSalary teacherDefaultPracticeGroupSalary = teacherDefaultPracticeGroupSalaryDao.findByTeacherAndCourseMinutes(practiceGroupBuyParams.getUserId(),practiceCourseMinutes);
-        BigDecimal teacherDefaultSalary=BigDecimal.ZERO;
+        BigDecimal teacherDefaultSalary=null;
         if(Objects.nonNull(teacherDefaultPracticeGroupSalary)){
             teacherDefaultSalary=teacherDefaultPracticeGroupSalary.getMainTeacherSalary();
         }
+        if(teacherDefaultSalary == null){
+        	throw new BizException("请设置老师课酬");
+        }
         BigDecimal studentSingleCourseCost=amount.divide(new BigDecimal(practiceCourses.size()), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN);
         BigDecimal studentSingleCourseOriginalCost=originalAmount.divide(new BigDecimal(practiceCourses.size()), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN);
         for (CourseSchedule courseSchedule : practiceCourses) {
@@ -1057,7 +1060,7 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         practiceCourses.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
         courseScheduleDao.batchAddCourseSchedules(practiceCourses);
 
-        BigDecimal teacherDefaultSalary=BigDecimal.ZERO;
+        BigDecimal teacherDefaultSalary=new BigDecimal(16.67);
         for (CourseSchedule courseSchedule : practiceCourses) {
             //课程与老师薪水表
             CourseScheduleTeacherSalary courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();

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

@@ -70,6 +70,9 @@ public class InspectionItemPlanConclusionServiceImpl extends BaseServiceImpl<Lon
         if (inspectionItemPlanConclusionDto.getStatus() == null) {
             return inspectionItemPlanConclusionDto;
         }
+        //获取巡查结果的异常数量
+        int eConclusionNum = inspectionItemPlanConclusionDao.getCountByPlanIdAndCheckConclusion(planId, 0);
+        inspectionItemPlan.setConclusionStatus(0);
 
         //未提交过，更新提交信息
         if (inspectionItemPlan.getStatus().equals(0)) {
@@ -77,6 +80,9 @@ public class InspectionItemPlanConclusionServiceImpl extends BaseServiceImpl<Lon
             inspectionItemPlan.setSubmitedTime(nowDate);
             inspectionItemPlan.setStatus(inspectionItemPlanConclusionDto.getStatus());
             inspectionItemPlan.setUpdateTime(nowDate);
+            if (eConclusionNum > 0) {
+                inspectionItemPlan.setConclusionStatus(1);
+            }
             inspectionItemPlanDao.update(inspectionItemPlan);
             //更新提交次数
             InspectionItem inspectionItem = inspectionItemDao.get(inspectionItemPlan.getItemId());
@@ -91,9 +97,12 @@ public class InspectionItemPlanConclusionServiceImpl extends BaseServiceImpl<Lon
             inspectionItemPlan.setSubmitedGps(inspectionItemPlanConclusionDto.getSubmitedGps());
             inspectionItemPlan.setSubmitedTime(nowDate);
             inspectionItemPlan.setStatus(inspectionItemPlanConclusionDto.getStatus());
-            inspectionItemPlan.setUpdateTime(nowDate);
-            inspectionItemPlanDao.update(inspectionItemPlan);
         }
+        if (eConclusionNum > 0) {
+            inspectionItemPlan.setConclusionStatus(1);
+        }
+        inspectionItemPlan.setUpdateTime(nowDate);
+        inspectionItemPlanDao.update(inspectionItemPlan);
         return inspectionItemPlanConclusionDto;
     }
 

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

@@ -2381,6 +2381,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (courseSchedule == null) {
             throw new BizException("课程信息不存在");
         }
+        
+        if(salary == null){
+        	throw new BizException("请设置老师课酬");
+        }
 
         if ("all".equals(scope)) {
             Integer classGrpupId = courseSchedule.getClassGroupId();

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

@@ -203,6 +203,9 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
             throw new BizException("请设置教师课酬");
         }
         BigDecimal teacherDefaultSalary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal("1");
+        if(teacherDefaultSalary == null){
+        	throw new BizException("请设置教师课酬");
+        }
         BigDecimal studentSingleCourseCost=BigDecimal.ZERO;
         for (CourseSchedule courseSchedule : courses) {
             //课程与老师薪水表

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

@@ -2984,10 +2984,13 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         }
         courseScheduleDao.batchAddCourseSchedules(practiceCourses);
         TeacherDefaultPracticeGroupSalary teacherDefaultPracticeGroupSalary = teacherDefaultPracticeGroupSalaryDao.findByTeacherAndCourseMinutes(practiceGroupBuyParams.getUserId(), practiceCourseMinutes);
-        BigDecimal teacherDefaultSalary = BigDecimal.ZERO;
+        BigDecimal teacherDefaultSalary = null;
         if (Objects.nonNull(teacherDefaultPracticeGroupSalary)) {
             teacherDefaultSalary = teacherDefaultPracticeGroupSalary.getMainTeacherSalary();
         }
+        if(teacherDefaultSalary == null){
+        	throw new BizException("请设置教师课酬");
+        }
         BigDecimal studentSingleCourseCost = amount.divide(new BigDecimal(practiceCourses.size()), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN);
 
         BigDecimal oneMonthOriginalPrice=practiceGroupBuyParams.getDrillTimesOnWeek()==1?practiceGroupSellPrice.getOnceOriginalPrice():practiceGroupSellPrice.getTwiceOriginalPrice();

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

@@ -180,6 +180,9 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 									}
 									list.add(ts);
 								}
+								if(ts.getExpectSalary() == null){
+									throw new BizException("请设置教师课酬");
+								}
 							}
 						}
 					}

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

@@ -102,10 +102,21 @@
     </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_,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_
-        LEFT JOIN class_group cg ON cg.id_=cs.class_group_id_
-        LEFT JOIN sys_user su on iipc.teacher_id_ = su.id_
-        WHERE plan_id_ = #{planId} GROUP BY iipc.course_schedule_id_,iipc.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_
+                 LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_
+                 LEFT JOIN sys_user su on iipc.teacher_id_ = su.id_
+        WHERE plan_id_ = #{planId}
+        GROUP BY iipc.course_schedule_id_, iipc.teacher_id_
+    </select>
+
+    <select id="getCountByPlanIdAndCheckConclusion" resultType="int">
+        SELECT COUNT(*)
+        FROM inspection_item_plan_conclusion
+        WHERE plan_id_ = #{planId}
+          AND check_conclusion_ = #{checkConclusion}
     </select>
 </mapper>

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

@@ -17,6 +17,7 @@
         <result column="submited_gps_" property="submitedGps"/>
         <result column="submited_time_" property="submitedTime"/>
         <result column="memo_" property="memo"/>
+        <result column="conclusion_status_" property="conclusionStatus"/>
         <result column="status_" property="status"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -27,7 +28,7 @@
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id_, inspection_id_, item_id_, user_id_, plan_start_, plan_end_,organ_id_, cooperation_organ_id_,
-        music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, status_, create_time_,
+        music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, conclusion_status_, status_, create_time_,
         update_time_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="InspectionItemPlan">
@@ -47,7 +48,7 @@
         <!--@mbg.generated-->
         insert into inspection_item_plan (inspection_id_, item_id_, user_id_, plan_start_, plan_end_,
         organ_id_,cooperation_organ_id_,
-        music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, status_,
+        music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, conclusion_status_, status_,
         create_time_, update_time_)
         values (#{inspectionId}, #{itemId}, #{userId}, #{planStart}, #{planEnd}, #{organId},#{cooperationOrganId},
         #{musicGroupId}, #{schoolGps}, #{submitedGps}, #{submitedTime}, #{memo}, #{status},
@@ -93,6 +94,9 @@
             <if test="memo != null">
                 memo_ = #{memo},
             </if>
+            <if test="conclusionStatus != null">
+                conclusion_status_ = #{conclusionStatus},
+            </if>
             <if test="status != null">
                 status_ = #{status},
             </if>
@@ -139,7 +143,13 @@
                 AND iip.cooperation_organ_id_ = #{cooperationOrganId}
             </if>
             <if test="musicGroupId != null">
-               AND iip.music_group_id_ = #{musicGroupId}
+                AND iip.music_group_id_ = #{musicGroupId}
+            </if>
+            <if test="conclusionStatus != null">
+                AND iip.conclusion_status = #{conclusionStatus}
+            </if>
+            <if test="status !=null">
+                AND iip.status_ = #{status}
             </if>
             <if test='hasSubmit != null and hasSubmit.toString()=="1".toString()'>
                 AND iip.status_ > 0