src/main/java/com/th/demo/model/ware/OutRecord.java

@@ -90,6 +90,8 @@ public class OutRecord {
     private String contractNo;
     private String transportName;
 
+    private String inwareDay;
+
     public Double getUnitPrice() {
         return unitPrice;
     }
@@ -458,4 +460,12 @@ public class OutRecord {
     public void setTransportName(String transportName) {
         this.transportName = transportName;
     }
+
+    public String getInwareDay() {
+        return inwareDay;
+    }
+
+    public void setInwareDay(String inwareDay) {
+        this.inwareDay = inwareDay;
+    }
 }

src/main/resource/mapper/ware/OutRecordMapper.xml

@@ -94,6 +94,7 @@
     <result column="unit_price" property="unitPrice" jdbcType="DOUBLE" />
     <result column="contract_no" property="contractNo" jdbcType="VARCHAR" />
     <result column="transport_name" property="transportName" jdbcType="VARCHAR" />
+    <result column="inware_day" property="inwareDay" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="TotalResultMap" type="com.th.demo.model.ware.TotalRecord">
     <result column="total_amount" property="totalAmount" jdbcType="DOUBLE" />
@@ -462,7 +463,7 @@
     select
     e.name as fk_compony_name,p.tally_people as tally_people,p.transport_name as transport_name,p.truck_no as out_car_no,f.user_desc as add_id,t.*,c.ord_no,DATE_FORMAT(d.add_time, '%Y-%m-%d %H:%i:%s') as in_time
     ,(select tt.user_desc as in_user from sys_user tt where tt.id = d.add_id) as in_user,d.car_no as in_car_no
-    ,t.invoice_price,t.distribution_id
+    ,t.invoice_price,t.distribution_id,TIMESTAMPDIFF(DAY, DATE_FORMAT(d.add_time,'%Y-%m-%d %H:%i:%s'), DATE_FORMAT(t.add_time ,'%Y-%m-%d %H:%i:%s')) as inware_day
     from t_ware_out_record t LEFT JOIN sys_user f on t.add_id = f.id
     ,t_ware_distribution p,(select t.plate_no,max(t.ord_no) ord_no from t_ware_store t group by t.plate_no) c,t_ware_in_record d
     LEFT JOIN t_maint_customer e on d.fk_compony_name = e.id

src/main/resource/mapper/ware/StoreMapper.xml

@@ -428,7 +428,8 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
 
 
   <select id="selectStore" resultMap="BaseResultMap" >
-    select e.name as fk_compony_id,DATEDIFF(now(), t.add_time) + IF(TIME(now()) > TIME(t.add_time), 1, 0) as inware_day,t.*
+    select TIMESTAMPDIFF(DAY, DATE_FORMAT(t.add_time,'%Y-%m-%d %H:%i:%s'), DATE_FORMAT(NOW() ,'%Y-%m-%d %H:%i:%s')) as inware_day,
+        e.name as fk_compony_id,t.*
     from t_ware_store t, t_maint_ware a, t_maint_stack b, t_maint_material c,t_maint_customer d,t_maint_customer e
     where t.ware_id = a.id
     and t.stack_id = b.id