优化代码

java110-bean/src/main/java/com/java110/dto/chargeMachineOrder/ChargeMachineOrderDto.java

@@ -35,6 +35,15 @@ public class ChargeMachineOrderDto extends PageDto implements Serializable {
     private String communityId;
     private String energy;
 
+    private String machineCode;
+    private String machineName;
+    private String portCode;
+    private String portName;
+
+    private String durationPrice;
+
+    private String stateName;
+
 
     private Date createTime;
 
@@ -177,4 +186,52 @@ public class ChargeMachineOrderDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getMachineCode() {
+        return machineCode;
+    }
+
+    public void setMachineCode(String machineCode) {
+        this.machineCode = machineCode;
+    }
+
+    public String getMachineName() {
+        return machineName;
+    }
+
+    public void setMachineName(String machineName) {
+        this.machineName = machineName;
+    }
+
+    public String getPortCode() {
+        return portCode;
+    }
+
+    public void setPortCode(String portCode) {
+        this.portCode = portCode;
+    }
+
+    public String getPortName() {
+        return portName;
+    }
+
+    public void setPortName(String portName) {
+        this.portName = portName;
+    }
+
+    public String getDurationPrice() {
+        return durationPrice;
+    }
+
+    public void setDurationPrice(String durationPrice) {
+        this.durationPrice = durationPrice;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml

@@ -21,8 +21,13 @@
         portId,t.person_name,t.person_name personName,t.machine_id,t.machine_id
         machineId,t.acct_detail_id,t.acct_detail_id acctDetailId,t.person_id,t.person_id
         personId,t.charge_hours,t.charge_hours chargeHours,t.start_time,t.start_time startTime,t.end_time,t.end_time
-        endTime,t.state,t.person_tel,t.person_tel personTel,t.community_id,t.community_id communityId,t.energy
+        endTime,t.state,t.person_tel,t.person_tel personTel,t.community_id,t.community_id communityId,t.energy,
+        cm.machine_name machineName,cm.machine_code machineCode,cm.duration_price durationPrice,
+        cmp.port_code portCode,cmp.port_name portName,td.`name` stateName
         from charge_machine_order t
+        left join charge_machine cm on t.machine_id = cm.machine_id and cm.status_cd = '0'
+        left join charge_machine_port cmp on t.port_id = cmp.port_id and cmp.status_cd = '0'
+        left join t_dict td on td.status_cd = t.state and td.table_name = 'charge_machine_order' and td.table_columns = 'state'
         where 1 =1
         <if test="amount !=null and amount != ''">
             and t.amount= #{amount}