Merge remote-tracking branch 'origin/master' into master

imcs-admin-boot/imcs-authority-server/src/main/java/com/github/zuihou/job/DashboardJob.java

@@ -157,6 +157,10 @@ public class DashboardJob {
             orderMap.put("orderData", orderData);
             dataScreenMap.put("orderMap", orderMap);
 
+            //获取合格率信息数据
+            Map orderStatistics = orderService.orderStatitcs();
+            dataScreenMap.put("orderStatistics", orderStatistics);
+
             Page<Repair> repairPage = new Page<Repair>(1L, 5);
             repairPage.setSearchCount(false);
             IPage<Repair> repairData = repairService.pageList(repairPage, new LbqWrapper<Repair>());

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-biz/src/main/resources/mapper_business/base/productionReadyCenter/AutoNodeMapper.xml

@@ -27,7 +27,7 @@
         id,node_no,create_time,create_user,update_time,update_user,module_id,delay_flag,
         resource_id, prority, success_opt, fail_opt, procedure_id, instruction_id, procedure_productionresource_id,
         resourceName,instructionName,failCode,successCode,remark,code,self_examine,examine_match_conf,examine_rate,examine_break_conf,rated_workHours,stock_conf,resource_in_id,
-        position_in_id,position_in_ask,resource_out_id,position_out_id,position_out_ask,interface_type,node_name,complete_batch_sort
+        position_in_id,position_in_ask,resource_out_id,position_out_id,position_out_ask,interface_type,node_name,complete_batch_sort,exe_status,exe_result
     </sql>
 
     <select id="pageList" resultMap="BaseResultMap">
@@ -43,7 +43,7 @@
 
     <select id="taskAutoNodeList" parameterType="com.github.zuihou.business.productionReadyCenter.entity.AutoNode" resultType="com.github.zuihou.business.productionReadyCenter.entity.AutoNode">
         select a.*,c.name as resourceName,'' code,'' as instructionName,'' remark,a.exe_result as exeResult,b.start_time as startTime,
-        b.end_time as endTime,b.feedback,b.feedback_file as feedbackFile,b.exe_status as exeStatus
+        b.end_time as endTime,b.feedback,b.feedback_file as feedbackFile,a.exe_status as exeStatus
         from imcs_t_task_node a
         left join imcs_a_auto_node_log b on a.id = b.task_node_id
         left join imcs_tenant_productionresource c on a.resource_id = c.id

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) {

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/AutoNode.java

@@ -146,6 +146,24 @@ public class AutoNode extends Entity<Long> {
     @Excel(name = "父节点id")
     private Long parentId;
 
+//    /**
+//     * 执行结果(1-成功0-失败)
+//     */
+//    @ApiModelProperty(value = "执行结果(1-成功0-失败)")
+//    @Length(max = 16, message = "执行结果(1-成功0-失败)长度不能超过16")
+//    @TableField(exist = false)
+//    @Excel(name = "执行结果(1-成功0-失败)")
+//    private String exeResult;
+
+    /**
+     * 状态(1-待执行2-进行中3-已完成）
+     */
+    @ApiModelProperty(value = "状态(1-待执行2-进行中3-已完成）")
+    @Length(max = 16, message = "状态(1-待执行2-进行中3-已完成）长度不能超过16")
+    @TableField(exist = false)
+    @Excel(name = "状态(1-待执行2-进行中3-已完成）")
+    private String exeStatus;
+
     /**
      * 工序生产资源ID
      */
@@ -275,9 +293,9 @@ public class AutoNode extends Entity<Long> {
     @TableField(exist = false)
     private String feedbackFile;
 
-    @ApiModelProperty(value = "执行状态(1-待执行2-进行中3-已完成）")
-    @TableField(exist = false)
-    private String exeStatus;
+//    @ApiModelProperty(value = "执行状态(1-待执行2-进行中3-已完成）")
+//    @TableField(exist = false)
+//    private String exeStatus;
 
     /**
      * 订单id