优化代码

java110-bean/src/main/java/com/java110/dto/communitySpacePersonTime/CommunitySpacePersonTimeDto.java

@@ -30,6 +30,7 @@ public class CommunitySpacePersonTimeDto extends PageDto implements Serializable
     private String appointmentTime;
 
     private String state;
+    private String[] states;
 
 
     private Date createTime;
@@ -117,4 +118,12 @@ public class CommunitySpacePersonTimeDto extends PageDto implements Serializable
     public void setState(String state) {
         this.state = state;
     }
+
+    public String[] getStates() {
+        return states;
+    }
+
+    public void setStates(String[] states) {
+        this.states = states;
+    }
 }

java110-db/src/main/resources/mapper/community/CommunitySpacePersonTimeV1ServiceDaoImplMapper.xml

@@ -37,6 +37,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="states !=null ">
+            and t.state in
+            <foreach collection="states" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="hours !=null and hours != ''">
             and t.hours= #{hours}
         </if>

service-community/src/main/java/com/java110/community/cmd/communitySpace/ListCommunitySpacePersonCmd.java

@@ -102,6 +102,10 @@ public class ListCommunitySpacePersonCmd extends Cmd {
 
         CommunitySpacePersonTimeDto communitySpaceOpenTimeDto = new CommunitySpacePersonTimeDto();
         communitySpaceOpenTimeDto.setCspIds(cspIds.toArray(new String[cspIds.size()]));
+        communitySpaceOpenTimeDto.setStates(new String[]{
+                CommunitySpacePersonTimeDto.STATE_WAIT_CONFIRM,
+                CommunitySpacePersonTimeDto.STATE_FINISH
+        });
         List<CommunitySpacePersonTimeDto> communitySpacePersonTimeDtos
                 = communitySpacePersonTimeV1InnerServiceSMOImpl.queryCommunitySpacePersonTimes(communitySpaceOpenTimeDto);