yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotopeationfill/IotOpeationFillController.java

@@ -229,7 +229,7 @@ public class IotOpeationFillController {
         if(fillDO1.getIsReport()!=null && fillDO1.getIsReport()==1){
 
             IotRhDailyReportSaveReqVO saveReqVO = new IotRhDailyReportSaveReqVO();
-            IotRyDailyReportPageReqVO saveReqRyVO = new IotRyDailyReportPageReqVO();
+            IotRyDailyReportSaveReqVO saveReqRyVO = new IotRyDailyReportSaveReqVO();
 
             Map<String,Object> stringRhObjectMap = BeanUtil.beanToMap(saveReqVO);
             Map<String,Object> stringRyObjectMap = BeanUtil.beanToMap(saveReqRyVO);

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreport/vo/IotRyDailyReportRespVO.java

@@ -81,6 +81,39 @@ public class IotRyDailyReportRespVO {
     @ExcelProperty("非生产时间原因")
     private String nptReason;
 
+
+    @Schema(description = "进尺工作时间(H)")
+    @ExcelProperty("进尺工作时间(H)")
+    private BigDecimal drillingWorkingTime;
+    @Schema(description = "其它生产时间(H)")
+    @ExcelProperty("其它生产时间(H)")
+    private BigDecimal otherProductionTime;
+    @Schema(description = "事故非生产时间(H)")
+    @ExcelProperty("事故非生产时间(H)")
+    private BigDecimal accidentTime;
+    @Schema(description = "修理非生产时间(H)")
+    @ExcelProperty("修理非生产时间(H)")
+    private BigDecimal repairTime;
+    @Schema(description = "自停非生产时间(H)")
+    @ExcelProperty("自停非生产时间(H)")
+    private BigDecimal selfStopTime;
+    @Schema(description = "复杂非生产时间(H)")
+    @ExcelProperty("复杂非生产时间(H)")
+    private BigDecimal complexityTime;
+    @Schema(description = "搬迁非生产时间(H)")
+    @ExcelProperty("搬迁非生产时间(H)")
+    private BigDecimal relocationTime;
+    @Schema(description = "整改非生产时间(H)")
+    @ExcelProperty("整改非生产时间(H)")
+    private BigDecimal rectificationTime;
+    @Schema(description = "等停非生产时间(H)")
+    @ExcelProperty("等停非生产时间(H)")
+    private BigDecimal waitingStopTime;
+    @Schema(description = "冬休非生产时间(H)")
+    @ExcelProperty("冬休非生产时间(H)")
+    private BigDecimal winterBreakTime;
+
+
     @Schema(description = "施工开始日期")
     @ExcelProperty("施工开始日期")
     private LocalDateTime constructionStartDate;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreport/vo/IotRyDailyReportSaveReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotrydailyreport.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -61,6 +62,29 @@ public class IotRyDailyReportSaveReqVO {
     @Schema(description = "非生产时间原因", example = "不香")
     private String nptReason;
 
+
+    @Schema(description = "进尺工作时间(H)")
+    private BigDecimal drillingWorkingTime;
+    @Schema(description = "其它生产时间(H)")
+    private BigDecimal otherProductionTime;
+    @Schema(description = "事故非生产时间(H)")
+    private BigDecimal accidentTime;
+    @Schema(description = "修理非生产时间(H)")
+    private BigDecimal repairTime;
+    @Schema(description = "自停非生产时间(H)")
+    private BigDecimal selfStopTime;
+    @Schema(description = "复杂非生产时间(H)")
+    private BigDecimal complexityTime;
+    @Schema(description = "搬迁非生产时间(H)")
+    private BigDecimal relocationTime;
+    @Schema(description = "整改非生产时间(H)")
+    private BigDecimal rectificationTime;
+    @Schema(description = "等停非生产时间(H)")
+    private BigDecimal waitingStopTime;
+    @Schema(description = "冬休非生产时间(H)")
+    private BigDecimal winterBreakTime;
+
+
     @Schema(description = "施工开始日期")
     private LocalDateTime constructionStartDate;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotrydailyreport/IotRyDailyReportDO.java

@@ -93,6 +93,48 @@ public class IotRyDailyReportDO extends BaseDO {
      * 非生产时间原因
      */
     private String nptReason;
+
+    /**
+     * 进尺工作时间(H)
+     */
+    private BigDecimal drillingWorkingTime;
+    /**
+     * 其它生产时间(H)
+     */
+    private BigDecimal otherProductionTime;
+    /**
+     * 事故非生产时间(H)
+     */
+    private BigDecimal accidentTime;
+    /**
+     * 修理非生产时间(H)
+     */
+    private BigDecimal repairTime;
+    /**
+     * 自停非生产时间(H)
+     */
+    private BigDecimal selfStopTime;
+    /**
+     * 复杂非生产时间(H)
+     */
+    private BigDecimal complexityTime;
+    /**
+     * 搬迁非生产时间(H)
+     */
+    private BigDecimal relocationTime;
+    /**
+     * 整改非生产时间(H)
+     */
+    private BigDecimal rectificationTime;
+    /**
+     * 等停非生产时间(H)
+     */
+    private BigDecimal waitingStopTime;
+    /**
+     * 冬休非生产时间
+     */
+    private BigDecimal winterBreakTime;
+
     /**
      * 施工开始日期
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/IotOperationPlanJob.java

@@ -228,14 +228,6 @@ public class IotOperationPlanJob implements JobHandler {
         iotOpeationFillOrderMapper.insertBatch(orderList1);
 
 
-        Set<Long> pdeptList = new HashSet<>();
-        pdeptList =  deptService.getChildDeptIdListFromCache(plan.getDeptId());
-        pdeptList.add(plan.getDeptId());
-
-        //查询日报计划
-        List<IotOperationPlanDO> rpList = planMapper.getReportPlan(pdeptList);
-        List<Long> rpdList = rpList.stream().map(IotOperationPlanDO::getDeptId).collect(Collectors.toList());
-
 
         Set<Long> rdIdList = new HashSet<>();
         rdIdList =  deptService.getChildDeptIdListFromCache(163L);
@@ -249,18 +241,31 @@ public class IotOperationPlanJob implements JobHandler {
         boolean exist = rdIdList.contains(plan.getDeptId());
 
         if(!exist){
-            //1、有指定队伍插入指定队伍日报设备
 
-            if(rpList.size()>0){
+
+            //瑞鹰SCP项目部50010队伍临时创建
+            if(plan.getDeptId()==287){
                 //筛选日报工单
-                List<IotOpeationFillOrderDO> virOrderList = orderList1.stream().filter(e->rpdList.contains(e.getDeptId())).collect(Collectors.toList());
-                if(virOrderList.size()>0){
-                    //创建日报设备
-                    List <IotOpeationFillDO> devList = opeationFillService.reportMethod(virOrderList);
-                    //插入日报设备
-                    iotOpeationFillMapper.insertFill(devList);
+                List<IotOpeationFillOrderDO> virOrderList = new ArrayList<>();
+
+                IotOpeationFillOrderDO fillDO = new IotOpeationFillOrderDO();
+
+                fillDO.setOrderName("50010队"+"/"+LocalDate.now()+"运行记录填报");
+                fillDO.setDeptId(293L);
+                fillDO.setOrderStatus(0);
+                fillDO.setCreateTime(LocalDateTime.now());
+                fillDO.setUserName("李小虎");
+                fillDO.setUserId(486);
+                fillDO.setMobile(String.valueOf(17723897643L));
+                virOrderList.add(fillDO);
+
+                orderList1.addAll(virOrderList);
+                iotOpeationFillOrderMapper.insertBatch(virOrderList);
+                //创建日报设备
+                List <IotOpeationFillDO> devList = opeationFillService.reportMethod(virOrderList);
+                //插入日报设备
+                iotOpeationFillMapper.insertFill(devList);
 
-                }
 
             }