经营报表修改

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.enums.SubjectChangeStatusEnum;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -13,6 +14,9 @@ public class SubjectChangeQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "合作单位id",required = false)
     private Integer cooperationOrganId;
 
+    @ApiModelProperty(value = "状态",required = false)
+    private SubjectChangeStatusEnum status;
+
     @ApiModelProperty(value = "开始时间",required = false)
     private Date startTime;
 
@@ -52,4 +56,12 @@ public class SubjectChangeQueryInfo extends QueryInfo {
     public void setCooperationOrganId(Integer cooperationOrganId) {
         this.cooperationOrganId = cooperationOrganId;
     }
+
+    public SubjectChangeStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(SubjectChangeStatusEnum status) {
+        this.status = status;
+    }
 }

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

@@ -239,6 +239,9 @@
             <if test="organIdList != null and organIdList != ''">
                 AND FIND_IN_SET(sc.organ_id_,#{organIdList})
             </if>
+            <if test="status != null">
+                AND sc.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
             <if test="cooperationOrganId != null">
                 AND sc.cooperation_organ_id_ = #{cooperationOrganId}
             </if>
@@ -295,6 +298,7 @@
         FROM subject_change
         WHERE music_group_id_ = #{musicGroupId}
           AND student_id_ = #{studentId}
-          AND status_ IN (0, 1) LIMIT 1
+          AND status_ IN (0, 1)
+        LIMIT 1
     </select>
 </mapper>

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

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.SellOrder;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
 import com.ym.mec.biz.dal.entity.SubjectChange;
+import com.ym.mec.biz.dal.enums.SubjectChangeStatusEnum;
 import com.ym.mec.biz.dal.page.SellOrderQueryInfo;
 import com.ym.mec.biz.dal.page.SubjectChangeQueryInfo;
 import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
@@ -71,6 +72,7 @@ public class SubjectChangeController extends BaseController {
         if (queryInfo.getEndTime() != null) {
             queryInfo.setEndTime(DateUtil.getLastTimeWithDay(queryInfo.getEndTime()));
         }
+        queryInfo.setStatus(SubjectChangeStatusEnum.SUCCESSED);
         return succeed(subjectChangeService.getPageList(queryInfo));
     }