临时注释掉

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/dao/OrderMapper.java

@@ -10,6 +10,7 @@ import com.github.zuihou.database.mybatis.auth.DataScope;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,4 +34,7 @@ public interface OrderMapper extends SuperMapper<Order> {
 
     int updateproduceStatusBegin();
 
+
+    List<Map> orderStatitcs();
+
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/OrderService.java

@@ -43,6 +43,9 @@ public interface OrderService extends SuperService<Order> {
      */
     Order save(Map<String,Object> data);
 
+
+    Map orderStatitcs();
+
     /**
      * 修改
      */

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderServiceImpl.java

@@ -238,6 +238,19 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
         return order;
     }
 
+
+    @Override
+    public Map orderStatitcs() {
+        List<Map>list = baseMapper.orderStatitcs();
+        Map map = new HashMap();
+        //后台SQL固定两条数据，保证了不会报异常
+        map.put("tadayRate",list.get(0));
+        map.put("weekRate",list.get(1));
+        map.put("lastHour",list.get(2));
+
+        return map;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Order update(OrderUpdateDTO data) {

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskNodeServiceImpl.java

@@ -1464,6 +1464,10 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
                     deleteTaskNodeWrapper.eq("exeStatus","0");
                     deleteTaskNodeWrapper.ne("taskId",tTask.getId());
                     baseMapper.delete(deleteTaskNodeWrapper);
+
+                    //设置workpiece表为NG
+                    currWorkpiece.setTestResult("1");
+                    workpieceService.updateById(currWorkpiece);
                 }
             }
 

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/OrderMapper.xml

@@ -90,6 +90,49 @@
 
     </select>
 
+    <select id="orderStatitcs" resultType="map">
+        SELECT
+        format(case when count(0) = 0 then 0 else sum(
+        CASE
+        WHEN t.test_result = '2' THEN
+        1
+        ELSE
+        0
+        END
+        ) / count(0) end ,2)rate
+        FROM
+        imcs_t_workpiece t
+        WHERE
+        TO_DAYS(t.create_time) = TO_DAYS(NOW())
+        AND t.is_end = '1'
+        union ALL
+        SELECT
+        format(case when count(0) = 0 then 0 else sum(
+        CASE
+        WHEN t.test_result = '2' THEN
+        1
+        ELSE
+        0
+        END
+        ) / count(0) end ,2)rate
+        FROM
+        imcs_t_workpiece t
+        WHERE
+        date(t.create_time)>= date_sub(curdate(), INTERVAL 7 DAY)
+        AND t.is_end = '1'
+        UNION ALL
+        select * from
+        (SELECT
+        case when count(0) = 0 then 0 else TIMESTAMPDIFF(HOUR, t.create_time,NOW()) end rate
+        FROM
+        imcs_t_workpiece t
+        WHERE
+        TO_DAYS(t.create_time) = TO_DAYS(NOW())
+         ORDER BY t.create_time asc limit 1)a
+    </select>
+
+
+
 
     <update id="updateproduceStatusBegin">
       UPDATE imcs_o_order o

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/OrderController.java

@@ -152,6 +152,14 @@ public class OrderController extends SuperController<OrderService, Long, Order,
         return success(order);
     }
 
+
+    @ApiOperation(value = "订单统计(合格率)", notes = "订单统计")
+    @PostMapping("/orderStatitcs")
+    public R<Map> orderStatitcs() {
+        Map map= baseService.orderStatitcs();
+        return success(map);
+    }
+
     @ApiOperation(value = "修改订单", notes = "修改订单")
     @PostMapping("/update")
     public R<Order> update(@RequestBody OrderUpdateDTO model) {