优化班次功能

java110-bean/src/main/java/com/java110/dto/classes/ClassesDto.java

@@ -1,9 +1,11 @@
 package com.java110.dto.classes;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.classesTime.ClassesTimeDto;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -29,6 +31,8 @@ public class ClassesDto extends PageDto implements Serializable {
 
     private String statusCd = "0";
 
+    private List<ClassesTimeDto> times;
+
 
     public String getClassesId() {
         return classesId;
@@ -86,4 +90,12 @@ public class ClassesDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public List<ClassesTimeDto> getTimes() {
+        return times;
+    }
+
+    public void setTimes(List<ClassesTimeDto> times) {
+        this.times = times;
+    }
 }

java110-bean/src/main/java/com/java110/dto/classesTime/ClassesTimeDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.classesTime;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,9 +16,10 @@ import java.util.Date;
 public class ClassesTimeDto extends PageDto implements Serializable {
 
     private String classesId;
-private String timeId;
-private String startTime;
-private String endTime;
+    private String[] classesIds;
+    private String timeId;
+    private String startTime;
+    private String endTime;
 
 
     private Date createTime;
@@ -28,25 +30,32 @@ private String endTime;
     public String getClassesId() {
         return classesId;
     }
-public void setClassesId(String classesId) {
+
+    public void setClassesId(String classesId) {
         this.classesId = classesId;
     }
-public String getTimeId() {
+
+    public String getTimeId() {
         return timeId;
     }
-public void setTimeId(String timeId) {
+
+    public void setTimeId(String timeId) {
         this.timeId = timeId;
     }
-public String getStartTime() {
+
+    public String getStartTime() {
         return startTime;
     }
-public void setStartTime(String startTime) {
+
+    public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
-public String getEndTime() {
+
+    public String getEndTime() {
         return endTime;
     }
-public void setEndTime(String endTime) {
+
+    public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
 
@@ -66,4 +75,12 @@ public void setEndTime(String endTime) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String[] getClassesIds() {
+        return classesIds;
+    }
+
+    public void setClassesIds(String[] classesIds) {
+        this.classesIds = classesIds;
+    }
 }

java110-db/src/main/resources/mapper/store/ClassesTimeV1ServiceDaoImplMapper.xml

@@ -24,6 +24,13 @@
         <if test="classesId !=null and classesId != ''">
             and t.classes_id= #{classesId}
         </if>
+        <if test="classesIds !=null">
+            and t.classes_id in
+            <foreach collection="classesIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
         <if test="timeId !=null and timeId != ''">
             and t.time_id= #{timeId}
         </if>
@@ -72,8 +79,11 @@
         select count(1) count
         from classes_time t
         where 1 =1
-        <if test="classesId !=null and classesId != ''">
-            and t.classes_id= #{classesId}
+        <if test="classesIds !=null">
+            and t.classes_id in
+            <foreach collection="classesIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         <if test="timeId !=null and timeId != ''">
             and t.time_id= #{timeId}

service-store/src/main/java/com/java110/store/smo/impl/ClassesV1InnerServiceSMOImpl.java

@@ -16,6 +16,8 @@
 package com.java110.store.smo.impl;
 
 
+import com.java110.dto.classesTime.ClassesTimeDto;
+import com.java110.intf.store.IClassesTimeV1InnerServiceSMO;
 import com.java110.store.dao.IClassesV1ServiceDao;
 import com.java110.intf.store.IClassesV1InnerServiceSMO;
 import com.java110.dto.classes.ClassesDto;
@@ -45,28 +47,31 @@ public class ClassesV1InnerServiceSMOImpl extends BaseServiceSMO implements ICla
     @Autowired
     private IClassesV1ServiceDao classesV1ServiceDaoImpl;
 
+    @Autowired
+    private IClassesTimeV1InnerServiceSMO classesTimeV1InnerServiceSMOImpl;
+
 
     @Override
-    public int saveClasses(@RequestBody  ClassesPo classesPo) {
+    public int saveClasses(@RequestBody ClassesPo classesPo) {
         int saveFlag = classesV1ServiceDaoImpl.saveClassesInfo(BeanConvertUtil.beanCovertMap(classesPo));
         return saveFlag;
     }
 
-     @Override
-    public int updateClasses(@RequestBody  ClassesPo classesPo) {
+    @Override
+    public int updateClasses(@RequestBody ClassesPo classesPo) {
         int saveFlag = classesV1ServiceDaoImpl.updateClassesInfo(BeanConvertUtil.beanCovertMap(classesPo));
         return saveFlag;
     }
 
-     @Override
-    public int deleteClasses(@RequestBody  ClassesPo classesPo) {
-       classesPo.setStatusCd("1");
-       int saveFlag = classesV1ServiceDaoImpl.updateClassesInfo(BeanConvertUtil.beanCovertMap(classesPo));
-       return saveFlag;
+    @Override
+    public int deleteClasses(@RequestBody ClassesPo classesPo) {
+        classesPo.setStatusCd("1");
+        int saveFlag = classesV1ServiceDaoImpl.updateClassesInfo(BeanConvertUtil.beanCovertMap(classesPo));
+        return saveFlag;
     }
 
     @Override
-    public List<ClassesDto> queryClassess(@RequestBody  ClassesDto classesDto) {
+    public List<ClassesDto> queryClassess(@RequestBody ClassesDto classesDto) {
 
         //校验是否传了 分页信息
 
@@ -78,12 +83,35 @@ public class ClassesV1InnerServiceSMOImpl extends BaseServiceSMO implements ICla
 
         List<ClassesDto> classess = BeanConvertUtil.covertBeanList(classesV1ServiceDaoImpl.getClassesInfo(BeanConvertUtil.beanCovertMap(classesDto)), ClassesDto.class);
 
+        if (classess == null || classess.size() < 1) {
+            return classess;
+        }
+        List<String> classesIds = new ArrayList<>();
+        for (ClassesDto tmpClassesDto : classess) {
+            classesIds.add(tmpClassesDto.getClassesId());
+        }
+
+        ClassesTimeDto classesTimeDto = new ClassesTimeDto();
+        classesTimeDto.setClassesIds(classesIds.toArray(new String[classesIds.size()]));
+        List<ClassesTimeDto> classesTimeDtos = classesTimeV1InnerServiceSMOImpl.queryClassesTimes(classesTimeDto);
+        List<ClassesTimeDto> times = null;
+        for(ClassesDto tmpClassesDto : classess){
+            times = new ArrayList<>();
+            for(ClassesTimeDto tmpClassesTimeDto: classesTimeDtos){
+                if(tmpClassesDto.getClassesId().equals(tmpClassesTimeDto.getClassesId())){
+                    times.add(tmpClassesTimeDto);
+                }
+            }
+            tmpClassesDto.setTimes(times);
+        }
+
         return classess;
     }
 
 
     @Override
     public int queryClassessCount(@RequestBody ClassesDto classesDto) {
-        return classesV1ServiceDaoImpl.queryClassessCount(BeanConvertUtil.beanCovertMap(classesDto));    }
+        return classesV1ServiceDaoImpl.queryClassessCount(BeanConvertUtil.beanCovertMap(classesDto));
+    }
 
 }