属性修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Device.java

@@ -6,6 +6,7 @@ import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -99,10 +100,17 @@ public class Device extends Model<Device> {
     private Integer projectId;
 
     @TableField(exist = false)
-    private String startTime;
+    private String projectName;
 
     @TableField(exist = false)
-    private String endTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime startTime;
+
+    @TableField(exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime endTime;
 
     @TableField(exist = false)
     private Boolean startOrEnd;//开始使用还是结束使用 : true 开始使用,false 结束使用

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/DeviceLog.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 
@@ -51,13 +52,17 @@ public class DeviceLog extends Model<DeviceLog> {
      * 开始使用时间
      */
     @TableField("start_time")
-    private String startTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime startTime;
 
     /**
      * 结束使用时间
      */
     @TableField("end_time")
-    private String endTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime endTime;
 
     /**
      * 使用日期

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/DeviceCostMapper.xml

@@ -17,9 +17,9 @@
 
     <select id="getDeviceCostList" resultType="java.util.HashMap">
         select d.device_code deviceCode,d.device_name deviceName,
-               d.device_model deviceModel, d.manufacturer,dc.ymonth ,dc.id
+               d.device_model deviceModel, d.manufacturer,dc.ymonth ,dc.id,dc.month_cost monthCost
         from device d
-        LEFT JOIN device_cost dc on d.id=dc.device_id
+        inner JOIN device_cost dc on d.id=dc.device_id
         <where>
             <if test="companyId !=null">
                and d.company_id=#{companyId}
@@ -38,7 +38,7 @@
     <select id="getDeviceCostTotal" resultType="java.lang.Integer">
         select count(*) total
         from device d
-        LEFT JOIN device_cost dc on d.id=dc.device_id
+        inner JOIN device_cost dc on d.id=dc.device_id
         <where>
             <if test="companyId !=null">
                 and d.company_id=#{companyId}