pms 日报非生产时间细化

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrddailyreport/vo/IotRdDailyReportRespVO.java

@@ -126,6 +126,35 @@ public class IotRdDailyReportRespVO {
     @ExcelProperty("非生产时间原因")
     private String rdNptReason;
 
+
+    @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 BigDecimal partyaDesign;
+    @Schema(description = "甲方准备-非生产时间")
+    private BigDecimal partyaPrepare;
+    @Schema(description = "甲方资源-非生产时间")
+    private BigDecimal partyaResource;
+    @Schema(description = "其它非生产时间")
+    private BigDecimal otherNptTime;
+    @Schema(description = "其它非生产时间原因")
+    private String otherNptReason;
+
+
     @Schema(description = "施工开始日期")
     @ExcelProperty("施工开始日期")
     private LocalDateTime constructionStartDate;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrddailyreport/vo/IotRdDailyReportSaveReqVO.java

@@ -84,6 +84,35 @@ public class IotRdDailyReportSaveReqVO {
     @Schema(description = "非生产时间原因", example = "不喜欢")
     private String rdNptReason;
 
+
+    @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 BigDecimal partyaDesign;
+    @Schema(description = "甲方准备-非生产时间")
+    private BigDecimal partyaPrepare;
+    @Schema(description = "甲方资源-非生产时间")
+    private BigDecimal partyaResource;
+    @Schema(description = "其它非生产时间")
+    private BigDecimal otherNptTime;
+    @Schema(description = "其它非生产时间原因")
+    private String otherNptReason;
+
+
     @Schema(description = "施工开始日期")
     private LocalDateTime constructionStartDate;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/vo/IotRhDailyReportRespVO.java

@@ -100,6 +100,35 @@ public class IotRhDailyReportRespVO {
     @ExcelProperty("非生产时间原因")
     private String nptReasonName;
 
+
+    @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 BigDecimal partyaDesign;
+    @Schema(description = "甲方准备-非生产时间")
+    private BigDecimal partyaPrepare;
+    @Schema(description = "甲方资源-非生产时间")
+    private BigDecimal partyaResource;
+    @Schema(description = "其它非生产时间")
+    private BigDecimal otherNptTime;
+    @Schema(description = "其它非生产时间原因")
+    private String otherNptReason;
+
+
     @Schema(description = "施工开始日期")
     @ExcelProperty("施工开始日期")
     private LocalDateTime constructionStartDate;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/vo/IotRhDailyReportSaveReqVO.java

@@ -52,6 +52,35 @@ public class IotRhDailyReportSaveReqVO {
     @Schema(description = "非生产时间原因")
     private String nptReason;
 
+
+    @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 BigDecimal partyaDesign;
+    @Schema(description = "甲方准备-非生产时间")
+    private BigDecimal partyaPrepare;
+    @Schema(description = "甲方资源-非生产时间")
+    private BigDecimal partyaResource;
+    @Schema(description = "其它非生产时间")
+    private BigDecimal otherNptTime;
+    @Schema(description = "其它非生产时间原因")
+    private String otherNptReason;
+
+
     @Schema(description = "施工开始日期")
     private LocalDateTime constructionStartDate;
 

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

@@ -124,7 +124,16 @@ public class IotRyDailyReportRespVO {
     @Schema(description = "冬休非生产时间(H)")
     @ExcelProperty("冬休非生产时间(H)")
     private BigDecimal winterBreakTime;
-
+    @Schema(description = "甲方设计-非生产时间")
+    private BigDecimal partyaDesign;
+    @Schema(description = "甲方准备-非生产时间")
+    private BigDecimal partyaPrepare;
+    @Schema(description = "甲方资源-非生产时间")
+    private BigDecimal partyaResource;
+    @Schema(description = "其它非生产时间")
+    private BigDecimal otherNptTime;
+    @Schema(description = "其它非生产时间原因")
+    private String otherNptReason;
 
     @Schema(description = "施工开始日期")
     @ExcelProperty("施工开始日期")

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

@@ -92,6 +92,20 @@ public class IotRyDailyReportSaveReqVO {
     @Schema(description = "冬休非生产时间(H)")
     private BigDecimal winterBreakTime;
 
+    @Schema(description = "甲方设计-非生产时间")
+    private BigDecimal partyaDesign;
+
+    @Schema(description = "甲方准备-非生产时间")
+    private BigDecimal partyaPrepare;
+
+    @Schema(description = "甲方资源-非生产时间")
+    private BigDecimal partyaResource;
+
+    @Schema(description = "其它非生产时间")
+    private BigDecimal otherNptTime;
+
+    @Schema(description = "其它非生产时间原因")
+    private String otherNptReason;
 
     @Schema(description = "施工开始日期")
     private LocalDateTime constructionStartDate;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotrddailyreport/IotRdDailyReportDO.java

@@ -134,6 +134,60 @@ public class IotRdDailyReportDO extends BaseDO {
      * 非生产时间原因
      */
     private String rdNptReason;
+
+    /**
+     * 事故非生产时间(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;
+    /**
+     * 甲方设计-非生产时间
+     */
+    private BigDecimal partyaDesign;
+    /**
+     * 甲方准备-非生产时间
+     */
+    private BigDecimal partyaPrepare;
+    /**
+     * 甲方资源-非生产时间
+     */
+    private BigDecimal partyaResource;
+    /**
+     * 其它非生产时间
+     */
+    private BigDecimal otherNptTime;
+    /**
+     * 其它非生产时间原因
+     */
+    private String otherNptReason;
+
     /**
      * 施工开始日期
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotrhdailyreport/IotRhDailyReportDO.java

@@ -85,6 +85,60 @@ public class IotRhDailyReportDO extends BaseDO {
      * 非生产时间原因
      */
     private String nptReason;
+
+    /**
+     * 事故非生产时间(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;
+    /**
+     * 甲方设计-非生产时间
+     */
+    private BigDecimal partyaDesign;
+    /**
+     * 甲方准备-非生产时间
+     */
+    private BigDecimal partyaPrepare;
+    /**
+     * 甲方资源-非生产时间
+     */
+    private BigDecimal partyaResource;
+    /**
+     * 其它非生产时间
+     */
+    private BigDecimal otherNptTime;
+    /**
+     * 其它非生产时间原因
+     */
+    private String otherNptReason;
+
     /**
      * 施工开始日期
      */

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

@@ -147,6 +147,27 @@ public class IotRyDailyReportDO extends BaseDO {
      */
     private BigDecimal winterBreakTime;
 
+    /**
+     * 甲方设计-非生产时间
+     */
+    private BigDecimal partyaDesign;
+    /**
+     * 甲方准备-非生产时间
+     */
+    private BigDecimal partyaPrepare;
+    /**
+     * 甲方资源-非生产时间
+     */
+    private BigDecimal partyaResource;
+    /**
+     * 其它非生产时间
+     */
+    private BigDecimal otherNptTime;
+    /**
+     * 其它非生产时间原因
+     */
+    private String otherNptReason;
+
     /**
      * 施工开始日期
      */