2 次代码提交

作者 SHA1 备注 提交日期
  LiuCheng 01bb98f5c6 出库记录库龄 2 个月前
  LiuCheng f514b04c6c 时间计算 2 个月前

+ 10
- 0
src/main/java/com/th/demo/model/ware/OutRecord.java 查看文件

90
     private String contractNo;
90
     private String contractNo;
91
     private String transportName;
91
     private String transportName;
92
 
92
 
93
+    private String inwareDay;
94
+
93
     public Double getUnitPrice() {
95
     public Double getUnitPrice() {
94
         return unitPrice;
96
         return unitPrice;
95
     }
97
     }
458
     public void setTransportName(String transportName) {
460
     public void setTransportName(String transportName) {
459
         this.transportName = transportName;
461
         this.transportName = transportName;
460
     }
462
     }
463
+
464
+    public String getInwareDay() {
465
+        return inwareDay;
466
+    }
467
+
468
+    public void setInwareDay(String inwareDay) {
469
+        this.inwareDay = inwareDay;
470
+    }
461
 }
471
 }

+ 2
- 1
src/main/resource/mapper/ware/OutRecordMapper.xml 查看文件

94
     <result column="unit_price" property="unitPrice" jdbcType="DOUBLE" />
94
     <result column="unit_price" property="unitPrice" jdbcType="DOUBLE" />
95
     <result column="contract_no" property="contractNo" jdbcType="VARCHAR" />
95
     <result column="contract_no" property="contractNo" jdbcType="VARCHAR" />
96
     <result column="transport_name" property="transportName" jdbcType="VARCHAR" />
96
     <result column="transport_name" property="transportName" jdbcType="VARCHAR" />
97
+    <result column="inware_day" property="inwareDay" jdbcType="VARCHAR" />
97
   </resultMap>
98
   </resultMap>
98
   <resultMap id="TotalResultMap" type="com.th.demo.model.ware.TotalRecord">
99
   <resultMap id="TotalResultMap" type="com.th.demo.model.ware.TotalRecord">
99
     <result column="total_amount" property="totalAmount" jdbcType="DOUBLE" />
100
     <result column="total_amount" property="totalAmount" jdbcType="DOUBLE" />
462
     select
463
     select
463
     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
464
     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
464
     ,(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
465
     ,(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
465
-    ,t.invoice_price,t.distribution_id
466
+    ,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
466
     from t_ware_out_record t LEFT JOIN sys_user f on t.add_id = f.id
467
     from t_ware_out_record t LEFT JOIN sys_user f on t.add_id = f.id
467
     ,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
468
     ,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
468
     LEFT JOIN t_maint_customer e on d.fk_compony_name = e.id
469
     LEFT JOIN t_maint_customer e on d.fk_compony_name = e.id

+ 2
- 1
src/main/resource/mapper/ware/StoreMapper.xml 查看文件

428
 
428
 
429
 
429
 
430
   <select id="selectStore" resultMap="BaseResultMap" >
430
   <select id="selectStore" resultMap="BaseResultMap" >
431
-    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.*
431
+    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,
432
+        e.name as fk_compony_id,t.*
432
     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
433
     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
433
     where t.ware_id = a.id
434
     where t.ware_id = a.id
434
     and t.stack_id = b.id
435
     and t.stack_id = b.id

正在加载...
取消
保存