Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/ErrorCodeConstant.java

@@ -116,4 +116,5 @@ public interface ErrorCodeConstant{
     ErrorCode IOT_DEVICE_ASSOCIATE_NOT_EXISTS = new ErrorCode(289, "设备关联表(如：瑞都主要设备)不存在");
     ErrorCode IOT_RY_IMPROVE_DAILY_REPORT_NOT_EXISTS = new ErrorCode(300, "瑞鹰项目启动设备整改不存在");
     ErrorCode IOT_RY_HI_DAILY_REPORT_NOT_EXISTS = new ErrorCode(400, "瑞鹰历史日报不存在");
+    ErrorCode IOT_RY_IMPROVE_DAILY_REPORT_DETAIL_NOT_EXISTS = new ErrorCode(500, "瑞鹰设备整改日报明细(生产动态拆分)不存在");
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotryimprovedailyreport/IotRyImproveDailyReportController.java

@@ -10,8 +10,12 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.vo.IotRyImproveDailyReportPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.vo.IotRyImproveDailyReportRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.vo.IotRyImproveDailyReportSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail.vo.IotRyImproveDailyReportDetailPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail.vo.IotRyImproveDailyReportDetailRespVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotryimprovedailyreport.IotRyImproveDailyReportDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryimprovedailyreportdetail.IotRyImproveDailyReportDetailDO;
 import cn.iocoder.yudao.module.pms.service.iotryimprovedailyreport.IotRyImproveDailyReportService;
+import cn.iocoder.yudao.module.pms.service.iotryimprovedailyreportdetail.IotRyImproveDailyReportDetailService;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -25,6 +29,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -44,6 +49,8 @@ public class IotRyImproveDailyReportController {
     private IotRyImproveDailyReportService iotRyImproveDailyReportService;
     @Resource
     private DeptService deptService;
+    @Resource
+    private IotRyImproveDailyReportDetailService iotRyImproveDailyReportDetailService;
 
     @PostMapping("/create")
     @Operation(summary = "创建瑞鹰项目启动设备整改")
@@ -83,7 +90,18 @@ public class IotRyImproveDailyReportController {
     @PreAuthorize("@ss.hasPermission('pms:iot-ry-improve-daily-report:query')")
     public CommonResult<IotRyImproveDailyReportRespVO> getIotRyImproveDailyReport(@RequestParam("id") Long id) {
         IotRyImproveDailyReportDO iotRyImproveDailyReport = iotRyImproveDailyReportService.getIotRyImproveDailyReport(id);
-        return success(BeanUtils.toBean(iotRyImproveDailyReport, IotRyImproveDailyReportRespVO.class));
+        IotRyImproveDailyReportRespVO result = BeanUtils.toBean(iotRyImproveDailyReport, IotRyImproveDailyReportRespVO.class);
+        // 设置 设备整改日报明细
+        IotRyImproveDailyReportDetailPageReqVO pageReqVO = new IotRyImproveDailyReportDetailPageReqVO();
+        pageReqVO.setReportId(result.getId());
+        PageResult<IotRyImproveDailyReportDetailDO> pageResult = iotRyImproveDailyReportDetailService.getIotRyImproveDailyReportDetailPage(pageReqVO);
+        List<IotRyImproveDailyReportDetailDO> reports = pageResult.getList();
+        List<IotRyImproveDailyReportDetailRespVO> details = new ArrayList<>();
+        if (CollUtil.isNotEmpty(reports)) {
+            details = BeanUtils.toBean(reports, IotRyImproveDailyReportDetailRespVO.class);
+        }
+        result.setImproveReportDetails(details);
+        return success(result);
     }
 
     @GetMapping("/page")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotryimprovedailyreport/vo/IotRyImproveDailyReportRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.vo;
 
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail.vo.IotRyImproveDailyReportDetailRespVO;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -7,6 +8,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 瑞鹰项目启动设备整改 Response VO")
 @Data
@@ -291,4 +293,7 @@ public class IotRyImproveDailyReportRespVO {
     @Schema(description = "部门名称")
     @ExcelProperty("部门名称")
     private String deptName;
+
+    @Schema(description = "生产动态明细")
+    private List<IotRyImproveDailyReportDetailRespVO> improveReportDetails;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotryimprovedailyreport/vo/IotRyImproveDailyReportSaveReqVO.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.vo;
 
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail.vo.IotRyImproveDailyReportDetailSaveReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 瑞鹰项目启动设备整改新增/修改 Request VO")
 @Data
@@ -211,4 +213,9 @@ public class IotRyImproveDailyReportSaveReqVO {
     @Schema(description = "审批意见")
     private String opinion;
 
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "生产动态明细")
+    private List<IotRyImproveDailyReportDetailSaveReqVO> improveReportDetails;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotryimprovedailyreportdetail/IotRyImproveDailyReportDetailController.java

@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail.vo.IotRyImproveDailyReportDetailPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail.vo.IotRyImproveDailyReportDetailRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail.vo.IotRyImproveDailyReportDetailSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryimprovedailyreportdetail.IotRyImproveDailyReportDetailDO;
+import cn.iocoder.yudao.module.pms.service.iotryimprovedailyreportdetail.IotRyImproveDailyReportDetailService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 瑞鹰设备整改日报明细(生产动态拆分)")
+@RestController
+@RequestMapping("/pms/iot-ry-improve-daily-report-detail")
+@Validated
+public class IotRyImproveDailyReportDetailController {
+
+    @Resource
+    private IotRyImproveDailyReportDetailService iotRyImproveDailyReportDetailService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建瑞鹰设备整改日报明细(生产动态拆分)")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-improve-daily-report-detail:create')")
+    public CommonResult<Long> createIotRyImproveDailyReportDetail(@Valid @RequestBody IotRyImproveDailyReportDetailSaveReqVO createReqVO) {
+        return success(iotRyImproveDailyReportDetailService.createIotRyImproveDailyReportDetail(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新瑞鹰设备整改日报明细(生产动态拆分)")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-improve-daily-report-detail:update')")
+    public CommonResult<Boolean> updateIotRyImproveDailyReportDetail(@Valid @RequestBody IotRyImproveDailyReportDetailSaveReqVO updateReqVO) {
+        iotRyImproveDailyReportDetailService.updateIotRyImproveDailyReportDetail(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除瑞鹰设备整改日报明细(生产动态拆分)")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-improve-daily-report-detail:delete')")
+    public CommonResult<Boolean> deleteIotRyImproveDailyReportDetail(@RequestParam("id") Long id) {
+        iotRyImproveDailyReportDetailService.deleteIotRyImproveDailyReportDetail(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得瑞鹰设备整改日报明细(生产动态拆分)")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-improve-daily-report-detail:query')")
+    public CommonResult<IotRyImproveDailyReportDetailRespVO> getIotRyImproveDailyReportDetail(@RequestParam("id") Long id) {
+        IotRyImproveDailyReportDetailDO iotRyImproveDailyReportDetail = iotRyImproveDailyReportDetailService.getIotRyImproveDailyReportDetail(id);
+        return success(BeanUtils.toBean(iotRyImproveDailyReportDetail, IotRyImproveDailyReportDetailRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得瑞鹰设备整改日报明细(生产动态拆分)分页")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-improve-daily-report-detail:query')")
+    public CommonResult<PageResult<IotRyImproveDailyReportDetailRespVO>> getIotRyImproveDailyReportDetailPage(@Valid IotRyImproveDailyReportDetailPageReqVO pageReqVO) {
+        PageResult<IotRyImproveDailyReportDetailDO> pageResult = iotRyImproveDailyReportDetailService.getIotRyImproveDailyReportDetailPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotRyImproveDailyReportDetailRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出瑞鹰设备整改日报明细(生产动态拆分) Excel")
+    @PreAuthorize("@ss.hasPermission('pms:iot-ry-improve-daily-report-detail:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotRyImproveDailyReportDetailExcel(@Valid IotRyImproveDailyReportDetailPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotRyImproveDailyReportDetailDO> list = iotRyImproveDailyReportDetailService.getIotRyImproveDailyReportDetailPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "瑞鹰设备整改日报明细(生产动态拆分).xls", "数据", IotRyImproveDailyReportDetailRespVO.class,
+                        BeanUtils.toBean(list, IotRyImproveDailyReportDetailRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotryimprovedailyreportdetail/vo/IotRyImproveDailyReportDetailPageReqVO.java

@@ -0,0 +1,60 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 瑞鹰设备整改日报明细(生产动态拆分)分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotRyImproveDailyReportDetailPageReqVO extends PageParam {
+
+    @Schema(description = "施工队伍id", example = "25688")
+    private Long deptId;
+
+    @Schema(description = "设备整改日报id", example = "9387")
+    private Long reportId;
+
+    @Schema(description = "开始时间(年月日时分秒)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] startDateTime;
+
+    @Schema(description = "结束时间(年月日时分秒)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] endDateTime;
+
+    @Schema(description = "时长(H)")
+    private BigDecimal duration;
+
+    @Schema(description = "项目名称", example = "王五")
+    private String projectName;
+
+    @Schema(description = "当日施工详情")
+    private String constructionDetail;
+
+    @Schema(description = "下步计划")
+    private String nextPlan;
+
+    @Schema(description = "排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "2")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotryimprovedailyreportdetail/vo/IotRyImproveDailyReportDetailRespVO.java

@@ -0,0 +1,68 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 瑞鹰设备整改日报明细(生产动态拆分) Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotRyImproveDailyReportDetailRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "28832")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "施工队伍id", example = "25688")
+    @ExcelProperty("施工队伍id")
+    private Long deptId;
+
+    @Schema(description = "设备整改日报id", example = "9387")
+    @ExcelProperty("设备整改日报id")
+    private Long reportId;
+
+    @Schema(description = "开始时间(年月日时分秒)")
+    @ExcelProperty("开始时间(年月日时分秒)")
+    private LocalDateTime startDateTime;
+
+    @Schema(description = "结束时间(年月日时分秒)")
+    @ExcelProperty("结束时间(年月日时分秒)")
+    private LocalDateTime endDateTime;
+
+    @Schema(description = "时长(H)")
+    @ExcelProperty("时长(H)")
+    private BigDecimal duration;
+
+    @Schema(description = "项目名称", example = "王五")
+    @ExcelProperty("项目名称")
+    private String projectName;
+
+    @Schema(description = "当日施工详情")
+    @ExcelProperty("当日施工详情")
+    private String constructionDetail;
+
+    @Schema(description = "下步计划")
+    @ExcelProperty("下步计划")
+    private String nextPlan;
+
+    @Schema(description = "排序值")
+    @ExcelProperty("排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你猜")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "2")
+    @ExcelProperty("状态(0启用 1禁用)")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotryimprovedailyreportdetail/vo/IotRyImproveDailyReportDetailSaveReqVO.java

@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 瑞鹰设备整改日报明细(生产动态拆分)新增/修改 Request VO")
+@Data
+public class IotRyImproveDailyReportDetailSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "28832")
+    private Long id;
+
+    @Schema(description = "施工队伍id", example = "25688")
+    private Long deptId;
+
+    @Schema(description = "设备整改日报id", example = "9387")
+    private Long reportId;
+
+    @Schema(description = "开始时间(年月日时分秒)")
+    private LocalDateTime startDateTime;
+
+    @Schema(description = "结束时间(年月日时分秒)")
+    private LocalDateTime endDateTime;
+
+    @Schema(description = "时长(H)")
+    private BigDecimal duration;
+
+    @Schema(description = "项目名称", example = "王五")
+    private String projectName;
+
+    @Schema(description = "当日施工详情")
+    private String constructionDetail;
+
+    @Schema(description = "下步计划")
+    private String nextPlan;
+
+    @Schema(description = "排序值")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "状态(0启用 1禁用)", example = "2")
+    private Integer status;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotryimprovedailyreportdetail/IotRyImproveDailyReportDetailDO.java

@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.iotryimprovedailyreportdetail;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 瑞鹰设备整改日报明细(生产动态拆分) DO
+ *
+ * @author ruiqi
+ */
+@TableName("rq_iot_ry_improve_daily_report_detail")
+@KeySequence("rq_iot_ry_improve_daily_report_detail_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotRyImproveDailyReportDetailDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 施工队伍id
+     */
+    private Long deptId;
+    /**
+     * 设备整改日报id
+     */
+    private Long reportId;
+    /**
+     * 开始时间(年月日时分秒)
+     */
+    private LocalDateTime startDateTime;
+    /**
+     * 结束时间(年月日时分秒)
+     */
+    private LocalDateTime endDateTime;
+    /**
+     * 时长(H)
+     */
+    private BigDecimal duration;
+    /**
+     * 项目名称
+     */
+    private String projectName;
+    /**
+     * 当日施工详情
+     */
+    private String constructionDetail;
+    /**
+     * 下步计划
+     */
+    private String nextPlan;
+    /**
+     * 排序值
+     */
+    private Integer sort;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotryimprovedailyreportdetail/IotRyImproveDailyReportDetailMapper.java

@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.iotryimprovedailyreportdetail;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail.vo.IotRyImproveDailyReportDetailPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryimprovedailyreportdetail.IotRyImproveDailyReportDetailDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 瑞鹰设备整改日报明细(生产动态拆分) Mapper
+ *
+ * @author ruiqi
+ */
+@Mapper
+public interface IotRyImproveDailyReportDetailMapper extends BaseMapperX<IotRyImproveDailyReportDetailDO> {
+
+    default PageResult<IotRyImproveDailyReportDetailDO> selectPage(IotRyImproveDailyReportDetailPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotRyImproveDailyReportDetailDO>()
+                .eqIfPresent(IotRyImproveDailyReportDetailDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(IotRyImproveDailyReportDetailDO::getReportId, reqVO.getReportId())
+                .betweenIfPresent(IotRyImproveDailyReportDetailDO::getStartDateTime, reqVO.getStartDateTime())
+                .betweenIfPresent(IotRyImproveDailyReportDetailDO::getEndDateTime, reqVO.getEndDateTime())
+                .eqIfPresent(IotRyImproveDailyReportDetailDO::getDuration, reqVO.getDuration())
+                .likeIfPresent(IotRyImproveDailyReportDetailDO::getProjectName, reqVO.getProjectName())
+                .eqIfPresent(IotRyImproveDailyReportDetailDO::getConstructionDetail, reqVO.getConstructionDetail())
+                .eqIfPresent(IotRyImproveDailyReportDetailDO::getNextPlan, reqVO.getNextPlan())
+                .eqIfPresent(IotRyImproveDailyReportDetailDO::getSort, reqVO.getSort())
+                .eqIfPresent(IotRyImproveDailyReportDetailDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(IotRyImproveDailyReportDetailDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(IotRyImproveDailyReportDetailDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotRyImproveDailyReportDetailDO::getId));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotryimprovedailyreport/IotRyImproveDailyReportServiceImpl.java

@@ -10,8 +10,11 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.pms.constant.PmsConstants;
 import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.vo.IotRyImproveDailyReportPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreport.vo.IotRyImproveDailyReportSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail.vo.IotRyImproveDailyReportDetailSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotryimprovedailyreport.IotRyImproveDailyReportDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryimprovedailyreportdetail.IotRyImproveDailyReportDetailDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotryimprovedailyreport.IotRyImproveDailyReportMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotryimprovedailyreportdetail.IotRyImproveDailyReportDetailMapper;
 import cn.iocoder.yudao.module.pms.message.PmsMessage;
 import cn.iocoder.yudao.module.supplier.enums.common.SupplierAuditStatusEnum;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@@ -24,6 +27,7 @@ import cn.iocoder.yudao.module.system.dal.mysql.permission.UserRoleMapper;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import cn.iocoder.yudao.module.system.service.permission.RoleService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import com.google.common.collect.ImmutableMap;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -63,6 +67,8 @@ public class IotRyImproveDailyReportServiceImpl implements IotRyImproveDailyRepo
     private ThreadPoolTaskExecutor pmsThreadPoolTaskExecutor;
     @Resource
     private PmsMessage pmsMessage;
+    @Resource
+    private IotRyImproveDailyReportDetailMapper iotRyImproveDailyReportDetailMapper;
 
     @Override
     public Long createIotRyImproveDailyReport(IotRyImproveDailyReportSaveReqVO createReqVO) {
@@ -80,6 +86,19 @@ public class IotRyImproveDailyReportServiceImpl implements IotRyImproveDailyRepo
         iotRyImproveDailyReport.setAuditStatus(10);
         iotRyImproveDailyReport.setCreator(loginUserDeptId.toString());
         iotRyImproveDailyReportMapper.insert(iotRyImproveDailyReport);
+
+        // 创建生产动态明细
+        List<IotRyImproveDailyReportDetailSaveReqVO> details = createReqVO.getImproveReportDetails();
+        if (CollUtil.isNotEmpty(details)) {
+            List<IotRyImproveDailyReportDetailDO> tobeAddedReports = new ArrayList<>();
+            details.forEach(detail -> {
+                IotRyImproveDailyReportDetailDO tempDetail = BeanUtils.toBean(detail, IotRyImproveDailyReportDetailDO.class);
+                tempDetail.setReportId(iotRyImproveDailyReport.getId());
+                tobeAddedReports.add(tempDetail);
+            });
+            iotRyImproveDailyReportDetailMapper.insertBatch(tobeAddedReports);
+        }
+
         // 查找当前登录人的上级项目部审批人 发送审批通知
         DataPermissionUtils.executeIgnore(() -> {
             // 伊拉克项目部公共账号 填报 在当前部门内部查找 具有 审批权限 ‘项目部日报审批RY’ ‘项目部日报审批RYXJ’ 的人员
@@ -157,6 +176,22 @@ public class IotRyImproveDailyReportServiceImpl implements IotRyImproveDailyRepo
         updateObj.setStatus(1);
         updateObj.setAuditStatus(10);
         iotRyImproveDailyReportMapper.updateById(updateObj);
+
+        // 更新生成动态明细 先删除 再新增
+        int count = iotRyImproveDailyReportDetailMapper.deleteByMap(ImmutableMap.of(
+                "report_id", existReport.getId()
+        ));
+        List<IotRyImproveDailyReportDetailSaveReqVO> details = updateReqVO.getImproveReportDetails();
+        if (CollUtil.isNotEmpty(details)) {
+            List<IotRyImproveDailyReportDetailDO> tobeAddedReports = new ArrayList<>();
+            details.forEach(detail -> {
+                IotRyImproveDailyReportDetailDO tempDetail = BeanUtils.toBean(detail, IotRyImproveDailyReportDetailDO.class);
+                tempDetail.setReportId(existReport.getId());
+                tobeAddedReports.add(tempDetail);
+            });
+            iotRyImproveDailyReportDetailMapper.insertBatch(tobeAddedReports);
+        }
+
         // 钉钉 站内信 提醒项目部人员审批
         // 查找当前登录人的上级项目部审批人 发送审批通知
         DataPermissionUtils.executeIgnore(() -> {

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotryimprovedailyreportdetail/IotRyImproveDailyReportDetailService.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.pms.service.iotryimprovedailyreportdetail;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail.vo.IotRyImproveDailyReportDetailPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail.vo.IotRyImproveDailyReportDetailSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryimprovedailyreportdetail.IotRyImproveDailyReportDetailDO;
+
+import javax.validation.Valid;
+
+/**
+ * 瑞鹰设备整改日报明细(生产动态拆分) Service 接口
+ *
+ * @author ruiqi
+ */
+public interface IotRyImproveDailyReportDetailService {
+
+    /**
+     * 创建瑞鹰设备整改日报明细(生产动态拆分)
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createIotRyImproveDailyReportDetail(@Valid IotRyImproveDailyReportDetailSaveReqVO createReqVO);
+
+    /**
+     * 更新瑞鹰设备整改日报明细(生产动态拆分)
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateIotRyImproveDailyReportDetail(@Valid IotRyImproveDailyReportDetailSaveReqVO updateReqVO);
+
+    /**
+     * 删除瑞鹰设备整改日报明细(生产动态拆分)
+     *
+     * @param id 编号
+     */
+    void deleteIotRyImproveDailyReportDetail(Long id);
+
+    /**
+     * 获得瑞鹰设备整改日报明细(生产动态拆分)
+     *
+     * @param id 编号
+     * @return 瑞鹰设备整改日报明细(生产动态拆分)
+     */
+    IotRyImproveDailyReportDetailDO getIotRyImproveDailyReportDetail(Long id);
+
+    /**
+     * 获得瑞鹰设备整改日报明细(生产动态拆分)分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 瑞鹰设备整改日报明细(生产动态拆分)分页
+     */
+    PageResult<IotRyImproveDailyReportDetailDO> getIotRyImproveDailyReportDetailPage(IotRyImproveDailyReportDetailPageReqVO pageReqVO);
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotryimprovedailyreportdetail/IotRyImproveDailyReportDetailServiceImpl.java

@@ -0,0 +1,72 @@
+package cn.iocoder.yudao.module.pms.service.iotryimprovedailyreportdetail;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail.vo.IotRyImproveDailyReportDetailPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotryimprovedailyreportdetail.vo.IotRyImproveDailyReportDetailSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotryimprovedailyreportdetail.IotRyImproveDailyReportDetailDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotryimprovedailyreportdetail.IotRyImproveDailyReportDetailMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_RY_IMPROVE_DAILY_REPORT_DETAIL_NOT_EXISTS;
+
+
+/**
+ * 瑞鹰设备整改日报明细(生产动态拆分) Service 实现类
+ *
+ * @author ruiqi
+ */
+@Service
+@Validated
+public class IotRyImproveDailyReportDetailServiceImpl implements IotRyImproveDailyReportDetailService {
+
+    @Resource
+    private IotRyImproveDailyReportDetailMapper iotRyImproveDailyReportDetailMapper;
+
+    @Override
+    public Long createIotRyImproveDailyReportDetail(IotRyImproveDailyReportDetailSaveReqVO createReqVO) {
+        // 插入
+        IotRyImproveDailyReportDetailDO iotRyImproveDailyReportDetail = BeanUtils.toBean(createReqVO, IotRyImproveDailyReportDetailDO.class);
+        iotRyImproveDailyReportDetailMapper.insert(iotRyImproveDailyReportDetail);
+        // 返回
+        return iotRyImproveDailyReportDetail.getId();
+    }
+
+    @Override
+    public void updateIotRyImproveDailyReportDetail(IotRyImproveDailyReportDetailSaveReqVO updateReqVO) {
+        // 校验存在
+        validateIotRyImproveDailyReportDetailExists(updateReqVO.getId());
+        // 更新
+        IotRyImproveDailyReportDetailDO updateObj = BeanUtils.toBean(updateReqVO, IotRyImproveDailyReportDetailDO.class);
+        iotRyImproveDailyReportDetailMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteIotRyImproveDailyReportDetail(Long id) {
+        // 校验存在
+        validateIotRyImproveDailyReportDetailExists(id);
+        // 删除
+        iotRyImproveDailyReportDetailMapper.deleteById(id);
+    }
+
+    private void validateIotRyImproveDailyReportDetailExists(Long id) {
+        if (iotRyImproveDailyReportDetailMapper.selectById(id) == null) {
+            throw exception(IOT_RY_IMPROVE_DAILY_REPORT_DETAIL_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public IotRyImproveDailyReportDetailDO getIotRyImproveDailyReportDetail(Long id) {
+        return iotRyImproveDailyReportDetailMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<IotRyImproveDailyReportDetailDO> getIotRyImproveDailyReportDetailPage(IotRyImproveDailyReportDetailPageReqVO pageReqVO) {
+        return iotRyImproveDailyReportDetailMapper.selectPage(pageReqVO);
+    }
+
+}