生产任务添加是否逾期

hx-mes/src/main/java/com/fjhx/mes/entity/production/dto/ProduceOrderDetailSelectDto.java

@@ -42,4 +42,9 @@ public class ProduceOrderDetailSelectDto extends BaseSelectDto {
      */
     private List<Long> taskIds;
 
+    /**
+     * 是否逾期
+     */
+    private Integer isOverdue;
+
 }

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionOrderDetailVo.java

@@ -112,14 +112,19 @@ public class ProductionOrderDetailVo extends ProductionOrderDetail {
      */
     private List<ContractProductBomVo> contractProductBomList;
 
-    /**
-     * 投产时间
-     */
-    private Date produceTime;
+	/**
+	 * 投产时间
+	 */
+	private Date produceTime;
 
-    /**
-     * 生产公司Id
-     */
-    private String companyName;
+	/**
+	 * 生产公司Id
+	 */
+	private String companyName;
+
+	/**
+	 * 是否逾期
+	 */
+	private Integer isOverdue;
 
 }

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderDetailServiceImpl.java

@@ -85,6 +85,11 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
             wrapper.eq("po", ProductionOrder::getCompanyId, dto.getCompanyId());
         }
 
+        //是否逾期过滤
+        if (ObjectUtil.isNotEmpty(dto.getIsOverdue())) {
+            wrapper.eq("IF(IFNULL(po.finish_time,NOW())>po.delivery_period,1,0)", dto.getIsOverdue());
+        }
+
         Page<ProductionOrderDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ProductionOrderDetailVo> records = page.getRecords();
         if (ObjectUtil.isEmpty(records)) {

hx-mes/src/main/resources/mapper/production/ProduceOrderDetailMapper.xml

@@ -17,11 +17,12 @@
 			   pod.update_user,
 			   pod.update_time,
 			   pod.del_flag,
-			   po.code        AS orderCode,
-			   po.create_time AS orderCreateTime,
+			   po.code                                                        AS orderCode,
+			   po.create_time                                                 AS orderCreateTime,
 			   po.produce_time,
 			   po.delivery_period,
-			   po.company_id
+			   po.company_id,
+			   (if(IFNULL(po.finish_time, NOW()) > po.delivery_period, 1, 0)) AS isOverdue
 		FROM production_order_detail pod
 				 LEFT JOIN production_order po ON pod.produce_order_id = po.id
 			${ew.customSqlSegment}