Merge remote-tracking branch 'origin/master'

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

@@ -108,6 +108,12 @@ public class DegreeRegistration {
      */
     private Integer status;
 
+
+    /**
+     * 0-未支付 1-支付中 2-支付中
+     */
+    private String statusStr;
+
     /**
      *  是否重新支付
      */
@@ -265,4 +271,12 @@ public class DegreeRegistration {
     public void setTheoryCert(String theoryCert) {
         this.theoryCert = theoryCert;
     }
+
+    public String getStatusStr() {
+        return statusStr;
+    }
+
+    public void setStatusStr(String statusStr) {
+        this.statusStr = statusStr;
+    }
 }

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

@@ -106,10 +106,15 @@ public class DegreeQueryInfo extends QueryInfo {
      */
     private Date updateTime;
 
-    /**
-     * 0-未支付 1-支付中 2-支付中
-     */
-    private Integer status;
+
+    @ApiModelProperty(value = "开始日期（不包含时分秒）",required = false)
+    private String startTime;
+
+    @ApiModelProperty(value = "结束日期",required = false)
+    private String endTime;
+
+    @ApiModelProperty(value = "状态 reg-报名 pay-已缴费",required = false)
+    private String status;
 
 
     public Integer getId() {
@@ -224,14 +229,6 @@ public class DegreeQueryInfo extends QueryInfo {
         this.updateTime = updateTime;
     }
 
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
     public String getLevel() {
         return level;
     }
@@ -255,4 +252,28 @@ public class DegreeQueryInfo extends QueryInfo {
     public void setTheoryCert(String theoryCert) {
         this.theoryCert = theoryCert;
     }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 }

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

@@ -210,34 +210,39 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 }
                 //原来乐团的注册学生
                 List<StudentRegistration> musicGroupStudentRegistrationList = studentRegistrationDao.findStudentListByIdList(e.getRegisterIdList());
-                for (StudentRegistration studentRegistration : musicGroupStudentRegistrationList) {
-                    studentRegistration.setId(null);
-                    studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.APPLY);
-                    studentRegistration.setPaymentStatus(PaymentStatusEnum.OPEN);
-                    studentRegistration.setMusicGroupId(musicGroupId);
-                    studentRegistration.setSubjectId(e.getSubjectId());
-                    studentRegistration.setActualSubjectId(e.getSubjectId());
-                    studentRegistration.setTemporaryCourseFee(null);
-                }
-                studentRegistrationList.addAll(musicGroupStudentRegistrationList);
 
                 for (MusicGroupSubjectPlan musicGroupSubjectPlan : musicGroupSubjectPlans) {
                     if (!musicGroupSubjectPlan.getSubjectId().equals(e.getSubjectId())) continue;
                     musicGroupSubjectPlan.setExpectedStudentNum(e.getRegisterIdList().size());
                     musicGroupSubjectPlan.setApplyStudentNum(e.getRegisterIdList().size());
+                    if (musicGroupSubjectPlan.getFee().compareTo(BigDecimal.ZERO) == 0) {
+                        musicGroupSubjectPlan.setPaidStudentNum(e.getRegisterIdList().size());
+                    }
+
+                    for (StudentRegistration studentRegistration : musicGroupStudentRegistrationList) {
+                        studentRegistration.setId(null);
+                        if (musicGroupSubjectPlan.getFee().compareTo(BigDecimal.ZERO) == 0) {
+                            studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.NORMAL);
+                            studentRegistration.setPaymentStatus(PaymentStatusEnum.YES);
+                        } else {
+                            studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.APPLY);
+                            studentRegistration.setPaymentStatus(PaymentStatusEnum.OPEN);
+                        }
+                        studentRegistration.setMusicGroupId(musicGroupId);
+                        studentRegistration.setSubjectId(e.getSubjectId());
+                        studentRegistration.setActualSubjectId(e.getSubjectId());
+                        studentRegistration.setTemporaryCourseFee(null);
+                    }
                 }
+
+                studentRegistrationList.addAll(musicGroupStudentRegistrationList);
             });
             musicGroup.setStatus(MusicGroupStatusEnum.PAY);
             //是否是免费团
             if (musicGroupSubjectPlans != null && musicGroupSubjectPlans.size() > 0) {
-                int size = musicGroupSubjectPlans.stream().filter(e -> e.getFee().compareTo(BigDecimal.ZERO) == 1).collect(Collectors.toList()).size();
+                int size = (int) musicGroupSubjectPlans.stream().filter(e -> e.getFee().compareTo(BigDecimal.ZERO) > 0).count();
                 if (size < 1) {
                     musicGroup.setStatus(MusicGroupStatusEnum.PREPARE);
-                    if (studentRegistrationList.size() > 0) {
-                        //修改为已缴费
-                        studentRegistrationList.forEach(e -> e.setPaymentStatus(PaymentStatusEnum.YES));
-                    }
-                    musicGroupSubjectPlans.forEach(e -> e.setPaidStudentNum(e.getApplyStudentNum()));
                 }
             }
             if (studentRegistrationList.size() > 0) {
@@ -351,9 +356,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         String receiver = "daya";
         //深圳的零星缴费是在深圳
         String sDaYaOrganIds = sysConfigDao.findConfigValue(SysConfigService.SZ_DA_YA_ORGAN_IDS);
-        if(StringUtils.isNotBlank(sDaYaOrganIds)){
+        if (StringUtils.isNotBlank(sDaYaOrganIds)) {
             List<String> sDaYaOrganIdList = Arrays.asList(sDaYaOrganIds.split(","));
-            if(sDaYaOrganIdList.contains(chargeInfo.getOrganId().toString())){
+            if (sDaYaOrganIdList.contains(chargeInfo.getOrganId().toString())) {
                 receiver = "sdaya";
             }
         }
@@ -1061,7 +1066,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         List<HighClassGroupDto> highClassGroup = classGroupDao.findHighClassGroup(musicGroupId, classGroupIds);
 
-        if(classGroupIds != null && !classGroupIds.isEmpty()){
+        if (classGroupIds != null && !classGroupIds.isEmpty()) {
             List<Integer> classGroupSet = highClassGroup.stream().map(HighClassGroupDto::getId).collect(Collectors.toList());
             Map<Integer, Long> totalNumMap = MapUtil.convertIntegerMap(courseScheduleDao.countTotalNumByClassGroupId(classGroupSet, null));
             highClassGroup.removeIf(next -> totalNumMap.get(next.getId()) != null && totalNumMap.get(next.getId()) > 0);
@@ -1102,9 +1107,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         String baseURL = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         String url = baseURL + "/#/smallRegister?musicGroupId=" + musicGroupId;
-        classGroupIds =  highClassGroup.stream().map(e->e.getId().toString()).collect(Collectors.joining(","));
-        if(classGroupIds != null && !classGroupIds.isEmpty()){
-            url = baseURL + "/#/smallRegister?musicGroupId=" + musicGroupId+"&classGroupIds="+classGroupIds;
+        classGroupIds = highClassGroup.stream().map(e -> e.getId().toString()).collect(Collectors.joining(","));
+        if (classGroupIds != null && !classGroupIds.isEmpty()) {
+            url = baseURL + "/#/smallRegister?musicGroupId=" + musicGroupId + "&classGroupIds=" + classGroupIds;
         }
         String serverPhone = sysConfigDao.findConfigValue(SysConfigService.SERVER_PHONE);
         sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.SMS_BASICS_SKILL_APPLY_MESSAGE,
@@ -1434,7 +1439,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             //删除续费周期
             musicGroupStudentFeeDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
             //删除缴费明细
-            musicGroupPaymentCalenderDetailDao.deleteByUserIdAndMusicGroupId(userId,musicGroupId);
+            musicGroupPaymentCalenderDetailDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
             // 退团
             studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.QUIT);
             studentRegistration.setUpdateTime(date);
@@ -1536,7 +1541,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //删除续费周期
         musicGroupStudentFeeDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
         //删除缴费明细
-        musicGroupPaymentCalenderDetailDao.deleteByUserIdAndMusicGroupId(userId,musicGroupId);
+        musicGroupPaymentCalenderDetailDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
 
         // 退团
         studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.QUIT);

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

@@ -39,8 +39,11 @@
 
     <sql id="queryPageSql">
         <where>
-            <if test="status != null">
-                AND status_= #{status}
+            <if test="status != null and status=='reg'">
+                <![CDATA[AND status_ <= 1]]>
+            </if>
+            <if test="status != null and status=='pay'">
+                AND status_ = 2
             </if>
             <if test="id != null">
                 AND id_ = #{id}
@@ -63,15 +66,18 @@
             <if test="subject != null">
                 AND subject_= #{subject}
             </if>
-            <if test="subject != null">
-                AND subject_= #{subject}
-            </if>
             <if test="mobile != null">
                 AND mobile_= #{mobile}
             </if>
             <if test="level != null">
                 AND level_= #{level}
             </if>
+            <if test="startTime != null">
+                AND DATE_FORMAT(create_time_,"%Y-%m-%d") >= #{startTime}
+            </if>
+            <if test="endTime != null">
+                <![CDATA[AND DATE_FORMAT(create_time_,"%Y-%m-%d") <= #{endTime}]]>
+            </if>
         </where>
     </sql>
 
@@ -91,7 +97,7 @@
     </select>
 
     <select id="getTotalAmount" parameterType="map" resultMap="DegreeRegistration">
-        SELECT SUM(money_) money_ ,SUM(theory_money_) theory_money_ FROM degree_registration
+        SELECT SUM(case when status_ = 2 then money_ else 0 end) money_ ,SUM(case when status_ = 2 then theory_money_ else 0 end) theory_money_ FROM degree_registration
         <include refid="queryPageSql"/>
     </select>
 

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

@@ -26,7 +26,6 @@ public class DegreeController extends BaseController { ;
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('degree/queryPage')")
     public HttpResponseResult queryPage(DegreeQueryInfo queryInfo) {
-        queryInfo.setStatus(2);
         queryInfo.setSort("create_time_");
         queryInfo.setOrder("DESC");
         return succeed(degreeRegistrationService.getPageList(queryInfo));

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

@@ -1571,8 +1571,7 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "考级报名导出")
     @RequestMapping("export/degreeRegistration")
     @PreAuthorize("@pcs.hasPermissions('export/degreeRegistration')")
-    public void queryPage(DegreeQueryInfo queryInfo,HttpServletResponse response) throws IOException {
-        queryInfo.setStatus(2);
+    public void degreeRegistration(DegreeQueryInfo queryInfo,HttpServletResponse response) throws IOException {
         queryInfo.setSort("create_time_");
         queryInfo.setOrder("ASC");
         queryInfo.setRows(65000);
@@ -1587,15 +1586,20 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             for (DegreeRegistration row : pageList.getRows()) {
-                if(row.getGender().equals(1)){
+                if(row.getGender().equals("1")){
                     row.setGender("男");
                 } else {
                     row.setGender("女");
                 }
+				if (row.getStatus().equals(2)) {
+					row.setStatusStr("已缴费");
+				} else {
+					row.setStatusStr("未缴费");
+				}
             }
 
-            String[] header = {"名字", "性别", "身份证号", "城市", "学校", "乐器", "考试级别", "乐理级别", "乐理级别证书", "家长联系电话", "考级费用", "乐理费用", "备注"};
-            String[] body = {"name", "gender", "idcard", "city", "school", "subject", "level", "theoryLevel", "theoryCert", "mobile", "money", "theoryMoney", "memo"};
+            String[] header = {"姓名", "性别", "身份证号", "城市", "学校", "报考乐器", "报考级别", "乐理级别", "乐理级别证书", "家长联系电话", "考级费用", "乐理费用", "备注","缴费状态","报名时间"};
+            String[] body = {"name", "gender", "idcard", "city", "school", "subject", "level", "theoryLevel", "theoryCert", "mobile", "money", "theoryMoney", "memo","statusStr","createTime"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, pageList.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");

mec-web/src/main/java/com/ym/mec/web/controller/education/EduDegreeController.java

@@ -1,59 +1,28 @@
 package com.ym.mec.web.controller.education;
 
-
-import com.ym.mec.biz.dal.dao.DegreeRegistrationDao;
-import com.ym.mec.biz.dal.dao.SporadicChargeInfoDao;
-import com.ym.mec.biz.dal.entity.DegreeRegistration;
-import com.ym.mec.biz.dal.entity.SporadicChargeInfo;
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
-import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
 import com.ym.mec.biz.dal.page.DegreeQueryInfo;
-import com.ym.mec.biz.dal.page.SporadicChargeInfoQueryInfo;
 import com.ym.mec.biz.service.DegreeRegistrationService;
-import com.ym.mec.biz.service.SporadicChargeInfoService;
-import com.ym.mec.biz.service.StudentPaymentOrderService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
-import com.ym.mec.util.idcard.IdcardValidator;
-import com.ym.mec.util.validator.CommonValidator;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Map;
-
 @RequestMapping("eduDegree")
 @Api(tags = "教务端考级报名服务")
 @RestController
 public class EduDegreeController extends BaseController {
 
     @Autowired
-    private StudentPaymentOrderService studentPaymentOrderService;
-
-    @Autowired
-    private DegreeRegistrationDao degreeRegistrationDao;
-
-    @Autowired
     private DegreeRegistrationService degreeRegistrationService;
 
-    @Autowired
-    private SporadicChargeInfoDao sporadicChargeInfoDao;
-
-    @Autowired
-    private SporadicChargeInfoService sporadicChargeInfoService;
-
 
     @ApiOperation(value = "查询收费列表")
     @GetMapping("/queryPage")
     public HttpResponseResult queryPage(DegreeQueryInfo queryInfo) {
-        queryInfo.setStatus(2);
         queryInfo.setSort("create_time_");
         queryInfo.setOrder("DESC");
         return succeed(degreeRegistrationService.getPageList(queryInfo));