优化代码

java110-bean/src/main/java/com/java110/dto/applyRoomDiscount/ApplyRoomDiscountDto.java

@@ -18,6 +18,7 @@ public class ApplyRoomDiscountDto extends PageDto implements Serializable {
     public static final String STATE_APPLY = "1";//申请验房
 
     private String applyType;
+    private String applyTypeName;
     private String ardId;
     private String createUserName;
     private String createUserTel;
@@ -194,4 +195,12 @@ public class ApplyRoomDiscountDto extends PageDto implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getApplyTypeName() {
+        return applyTypeName;
+    }
+
+    public void setApplyTypeName(String applyTypeName) {
+        this.applyTypeName = applyTypeName;
+    }
 }

java110-db/src/main/resources/mapper/fee/ApplyRoomDiscountServiceDaoImplMapper.xml

@@ -23,9 +23,11 @@
         statusCd,t.check_remark,t.check_remark checkRemark,t.room_id,t.room_id roomId,t.room_name,t.room_name
         roomName,t.review_user_id,t.review_user_id reviewUserId,t.review_remark,t.review_remark
         reviewRemark,t.start_time,t.start_time startTime,t.end_time,t.end_time
-        endTime,t.state,td.name stateName,t.community_id,t.community_id communityId,t.discount_id,t.discount_id discountId
+        endTime,t.state,td.name stateName,t.community_id,t.community_id communityId,t.discount_id,t.discount_id discountId,
+        ardt.type_name applyTypeName
         from apply_room_discount t
         left join t_dict td on t.state = td.status_cd and td.table_name='apply_room_discount' and td.table_columns = 'state'
+        left join apply_room_discount_type ardt on t.apply_type = ardt.apply_type and t.community_id = ardt.community_id and ardt.status_cd = '0'
         where 1 =1
         <if test="applyType !=null and applyType != ''">
             and t.apply_type= #{applyType}

service-fee/src/main/java/com/java110/fee/api/ApplyRoomDiscountApi.java

@@ -151,6 +151,7 @@ public class ApplyRoomDiscountApi {
                                                          @RequestParam(value = "roomName", required = false) String roomName,
                                                          @RequestParam(value = "roomId", required = false) String roomId,
                                                          @RequestParam(value = "state", required = false) String state,
+                                                         @RequestParam(value = "applyType", required = false) String applyType,
                                                          @RequestParam(value = "page") int page,
                                                          @RequestParam(value = "row") int row) {
         ApplyRoomDiscountDto applyRoomDiscountDto = new ApplyRoomDiscountDto();
@@ -160,6 +161,7 @@ public class ApplyRoomDiscountApi {
         applyRoomDiscountDto.setRoomName(roomName);
         applyRoomDiscountDto.setRoomId(roomId);
         applyRoomDiscountDto.setState(state);
+        applyRoomDiscountDto.setApplyType(applyType);
         return getApplyRoomDiscountBMOImpl.get(applyRoomDiscountDto);
     }