优化代码

java110-bean/src/main/java/com/java110/dto/rentingAppointment/RentingAppointmentDto.java

@@ -25,6 +25,7 @@ public class RentingAppointmentDto extends PageDto implements Serializable {
     private String appointmentId;
     private String remark;
     private String state;
+    private String stateName;
     private String tenantSex;
     private String storeId;
     private String roomId;
@@ -139,4 +140,12 @@ public class RentingAppointmentDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

java110-db/src/main/resources/mapper/user/RentingAppointmentServiceDaoImplMapper.xml

@@ -20,8 +20,9 @@
         select t.msg,t.tenant_tel,t.tenant_tel tenantTel,t.tenant_name,t.tenant_name
         tenantName,t.appointment_time,t.appointment_time appointmentTime,t.appointment_room_id,t.appointment_room_id
         appointmentRoomId,t.appointment_id,t.appointment_id appointmentId,t.remark,t.status_cd,t.status_cd
-        statusCd,t.state,t.tenant_sex,t.tenant_sex tenantSex,t.store_id,t.store_id storeId,t.room_id,t.room_id roomId
+        statusCd,t.state,t.tenant_sex,t.tenant_sex tenantSex,t.store_id,t.store_id storeId,t.room_id,t.room_id roomId,td.`name` stateName
         from renting_appointment t
+        LEFT JOIN t_dict td on t.state=td.status_cd and td.table_columns = 'state' and td.table_name = 'renting_appointment'
         where 1 =1
         <if test="msg !=null and msg != ''">
             and t.msg= #{msg}

service-user/src/main/java/com/java110/user/api/RentingAppointmentApi.java

@@ -66,10 +66,10 @@ public class RentingAppointmentApi {
     @RequestMapping(value = "/updateRentingAppointment", method = RequestMethod.POST)
     public ResponseEntity<String> updateRentingAppointment(@RequestBody JSONObject reqJson) {
 
-        Assert.hasKeyAndValue(reqJson, "tenantName", "请求报文中未包含tenantName");
-        Assert.hasKeyAndValue(reqJson, "tenantSex", "请求报文中未包含tenantSex");
-        Assert.hasKeyAndValue(reqJson, "tenantTel", "请求报文中未包含tenantTel");
-        Assert.hasKeyAndValue(reqJson, "appointmentTime", "请求报文中未包含appointmentTime");
+//        Assert.hasKeyAndValue(reqJson, "tenantName", "请求报文中未包含tenantName");
+//        Assert.hasKeyAndValue(reqJson, "tenantSex", "请求报文中未包含tenantSex");
+//        Assert.hasKeyAndValue(reqJson, "tenantTel", "请求报文中未包含tenantTel");
+//        Assert.hasKeyAndValue(reqJson, "appointmentTime", "请求报文中未包含appointmentTime");
         Assert.hasKeyAndValue(reqJson, "appointmentId", "appointmentId不能为空");
 
 
@@ -107,11 +107,18 @@ public class RentingAppointmentApi {
     @RequestMapping(value = "/queryRentingAppointment", method = RequestMethod.GET)
     public ResponseEntity<String> queryRentingAppointment(@RequestHeader(value = "store-id") String storeId,
                                                           @RequestParam(value = "page") int page,
-                                                          @RequestParam(value = "row") int row) {
+                                                          @RequestParam(value = "row") int row,
+                                                          @RequestParam(value = "state", required = false) String state,
+                                                          @RequestParam(value = "tenantName", required = false) String tenantName,
+                                                          @RequestParam(value = "tenantTel", required = false) String tenantTel
+    ) {
         RentingAppointmentDto rentingAppointmentDto = new RentingAppointmentDto();
         rentingAppointmentDto.setPage(page);
         rentingAppointmentDto.setRow(row);
         rentingAppointmentDto.setStoreId(storeId);
+        rentingAppointmentDto.setState(state);
+        rentingAppointmentDto.setTenantName(tenantName);
+        rentingAppointmentDto.setTenantTel(tenantTel);
         return getRentingAppointmentBMOImpl.get(rentingAppointmentDto);
     }
 }