Przeglądaj źródła

优化退费流程代码

Your Name 3 lat temu
rodzic
commit
c82d5c3d26

+ 10 - 0
java110-bean/src/main/java/com/java110/dto/visit/VisitDto.java

@@ -48,6 +48,8 @@ public class VisitDto extends PageDto implements Serializable {
     private String carNum;
     private String entourage;
     private String reasonType;
+
+    private String reasonTypeName;
     private String state;
     private String stateName;
     private String stateRemark;
@@ -397,4 +399,12 @@ public class VisitDto extends PageDto implements Serializable {
     public void setParkAreaNum(String parkAreaNum) {
         this.parkAreaNum = parkAreaNum;
     }
+
+    public String getReasonTypeName() {
+        return reasonTypeName;
+    }
+
+    public void setReasonTypeName(String reasonTypeName) {
+        this.reasonTypeName = reasonTypeName;
+    }
 }

+ 10 - 0
java110-bean/src/main/java/com/java110/vo/api/visit/ApiVisitDataVo.java

@@ -41,6 +41,8 @@ public class ApiVisitDataVo implements Serializable {
     private String flowId;
     private String roomId;
 
+    private String reasonTypeName;
+
     public String getvId() {
         return vId;
     }
@@ -320,4 +322,12 @@ public class ApiVisitDataVo implements Serializable {
     public void setParkAreaNum(String parkAreaNum) {
         this.parkAreaNum = parkAreaNum;
     }
+
+    public String getReasonTypeName() {
+        return reasonTypeName;
+    }
+
+    public void setReasonTypeName(String reasonTypeName) {
+        this.reasonTypeName = reasonTypeName;
+    }
 }

+ 3 - 1
java110-db/src/main/resources/mapper/community/VisitV1ServiceDaoImplMapper.xml

@@ -24,13 +24,15 @@
         phoneNumber,t.free_time,t.free_time freeTime,t.visit_case,t.visit_case
         visitCase,t.state,t.community_id,t.community_id communityId,t.entourage,t.record_state,t.record_state
         recordState,t.create_time createTime,td.name stateName,t.car_num carNum,t.car_state,t.car_state carState,
-        t.car_remark,t.car_remark carStateRemark,td2.name carStateName,t.room_id,t.room_id roomId
+        t.car_remark,t.car_remark carStateRemark,td2.name carStateName,t.room_id,t.room_id roomId,td3.`name` reasonTypeName
         from s_visit_info t
         left join parking_space ps on t.ps_id = ps.ps_id and ps.status_cd = '0'
         left join parking_area pa on ps.pa_id = pa.pa_id and pa.status_cd = '0'
         left join t_dict td on t.state = td.status_cd and td.table_name = 's_visit_info' and td.table_columns = 'state'
         left join t_dict td2 on t.car_state = td2.status_cd and td2.table_name = 's_visit_info' and td2.table_columns =
         'car_state'
+        left join t_dict td3 on t.reason_type = td3.status_cd and td3.table_name = 's_visit_info' and td3.table_columns =
+        'reason_type'
         where 1 =1
         <if test="departureTime !=null and departureTime != ''">
             and t.departure_time= #{departureTime}

+ 1 - 2
service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java

@@ -117,8 +117,7 @@ public class ListVisitsCmd extends Cmd {
             responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(initAddVisitParameter), HttpStatus.OK);
         } else {
             VisitDto visitDto = BeanConvertUtil.covertBean(reqJson, VisitDto.class);
-            if (reqJson.containsKey("channel") && !StringUtil.isEmpty(reqJson.getString("channel"))
-                    && "PC".equals(reqJson.getString("channel"))) {
+            if ("PC".equals(reqJson.getString("channel"))) {
                 visitDto.setCreateUserId("");
             }
             int count = visitV1InnerServiceSMO.queryVisitsCount(visitDto);