diff --git a/src/main/java/org/springblade/modules/business/mapper/InvoiceApplyMapper.xml b/src/main/java/org/springblade/modules/business/mapper/InvoiceApplyMapper.xml index d38f48d..5906ded 100644 --- a/src/main/java/org/springblade/modules/business/mapper/InvoiceApplyMapper.xml +++ b/src/main/java/org/springblade/modules/business/mapper/InvoiceApplyMapper.xml @@ -11,7 +11,7 @@ from ( left join blade_user u on wo.repair_person = u.id WHERE wo.is_deleted= 0 AND wo.`status` = 8 UNION ALL - SELECT 2 as business_type, mt.id as buseness_id, mt.task_code as buseness_code, u.`name` as serviceman, COUNT(mtd.price) as price + SELECT 2 as business_type, mt.id as business_id, mt.task_code as buseness_code, u.`name` as serviceman, COUNT(mtd.price) as price from lab_maintenance_task mt left join blade_user u on mt.serviceman_id = u.id left join lab_maintenance_task_detail mtd on mt.id = mtd.task_id diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/supplies/Goods.java b/src/main/java/org/springblade/modules/business/pojo/entity/supplies/Goods.java index 326045d..da1383d 100644 --- a/src/main/java/org/springblade/modules/business/pojo/entity/supplies/Goods.java +++ b/src/main/java/org/springblade/modules/business/pojo/entity/supplies/Goods.java @@ -141,6 +141,11 @@ public class Goods extends BaseEntity { */ private Integer allEnterNum; + /** + * 描述 + */ + private String describes; + /** * 库存价值 */