Merge branch 'dailyReport' into test

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/vo/IotProjectTaskPageReqVO.java

@@ -49,7 +49,7 @@ public class IotProjectTaskPageReqVO extends PageParam {
     private String workloadUnit;
 
     @Schema(description = "状态", example = "1")
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/vo/IotProjectTaskRespVO.java

@@ -59,9 +59,9 @@ public class IotProjectTaskRespVO {
     @ExcelProperty("工作量单位(段/层/方/井深/进尺)")
     private String workloadUnit;
 
-    @Schema(description = "状态", example = "1")
+    @Schema(description = "状态", example = "dq sg")
     @ExcelProperty("状态")
-    private Integer status;
+    private String status;
 
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/vo/IotProjectTaskSaveReqVO.java

@@ -42,7 +42,7 @@ public class IotProjectTaskSaveReqVO {
     private String workloadDesign;
 
     @Schema(description = "状态", example = "1")
-    private Integer status;
+    private String status;
 
     @Schema(description = "工作量单位(段/层/方/井深/进尺)")
     private String workloadUnit;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttaskschedule/vo/IotProjectTaskSchedulePageReqVO.java

@@ -24,7 +24,7 @@ public class IotProjectTaskSchedulePageReqVO extends PageParam {
     private Long taskId;
 
     @Schema(description = "施工状态(工作量开始/动迁/准备/施工)", example = "2")
-    private Integer status;
+    private String status;
 
     @Schema(description = "施工阶段描述", example = "你说的对")
     private String description;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttaskschedule/vo/IotProjectTaskScheduleRespVO.java

@@ -26,7 +26,7 @@ public class IotProjectTaskScheduleRespVO {
 
     @Schema(description = "施工状态(工作量开始/动迁/准备/施工)", example = "2")
     @ExcelProperty("施工状态(工作量开始/动迁/准备/施工)")
-    private Integer status;
+    private String status;
 
     @Schema(description = "施工阶段描述", example = "你说的对")
     @ExcelProperty("施工阶段描述")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttaskschedule/vo/IotProjectTaskScheduleSaveReqVO.java

@@ -19,7 +19,7 @@ public class IotProjectTaskScheduleSaveReqVO {
     private Long taskId;
 
     @Schema(description = "施工状态(工作量开始/动迁/准备/施工)", example = "2")
-    private Integer status;
+    private String status;
 
     @Schema(description = "施工阶段描述", example = "你说的对")
     private String description;

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

@@ -77,7 +77,7 @@ public class IotRhDailyReportPageReqVO extends PageParam {
     private String nextPlan;
 
     @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "2")
-    private Integer constructionStatus;
+    private String constructionStatus;
 
     @Schema(description = "人员情况")
     private String personnel;

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

@@ -87,7 +87,7 @@ public class IotRhDailyReportRespVO {
 
     @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "2")
     @ExcelProperty("施工状态(动迁 准备 施工 完工)")
-    private Integer constructionStatus;
+    private String constructionStatus;
 
     @Schema(description = "人员情况")
     @ExcelProperty("人员情况")

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

@@ -65,7 +65,7 @@ public class IotRhDailyReportSaveReqVO {
     private String nextPlan;
 
     @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "2")
-    private Integer constructionStatus;
+    private String constructionStatus;
 
     @Schema(description = "人员情况")
     private String personnel;

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

@@ -83,7 +83,7 @@ public class IotRyDailyReportPageReqVO extends PageParam {
     private String nextPlan;
 
     @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "1")
-    private Integer rigStatus;
+    private String rigStatus;
 
     @Schema(description = "人员情况")
     private String personnel;

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

@@ -132,7 +132,7 @@ public class IotRyDailyReportRespVO {
 
     @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "1")
     @ExcelProperty("施工状态(动迁 准备 施工 完工)")
-    private Integer rigStatus;
+    private String rigStatus;
 
     @Schema(description = "人员情况")
     @ExcelProperty("人员情况")

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

@@ -1,6 +1,5 @@
 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;
 
@@ -98,7 +97,7 @@ public class IotRyDailyReportSaveReqVO {
     private String nextPlan;
 
     @Schema(description = "施工状态(动迁 准备 施工 完工)", example = "1")
-    private Integer rigStatus;
+    private String rigStatus;
 
     @Schema(description = "人员情况")
     private String personnel;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotprojecttask/IotProjectTaskDO.java

@@ -76,7 +76,7 @@ public class IotProjectTaskDO extends BaseDO {
     /**
      * 状态
      */
-    private Integer status;
+    private String status;
     /**
      * 用户名
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotprojecttaskschedule/IotProjectTaskScheduleDO.java

@@ -39,7 +39,7 @@ public class IotProjectTaskScheduleDO extends BaseDO {
     /**
      * 施工状态(工作量开始/动迁/准备/施工)
      */
-    private Integer status;
+    private String status;
     /**
      * 施工阶段描述
      */

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

@@ -100,7 +100,7 @@ public class IotRhDailyReportDO extends BaseDO {
     /**
      * 施工状态(动迁 准备 施工 完工)
      */
-    private Integer constructionStatus;
+    private String constructionStatus;
     /**
      * 人员情况
      */

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

@@ -154,7 +154,7 @@ public class IotRyDailyReportDO extends BaseDO {
     /**
      * 施工状态(动迁 准备 施工 完工)
      */
-    private Integer rigStatus;
+    private String rigStatus;
     /**
      * 人员情况
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotrydailyreport/IotRyDailyReportServiceImpl.java

@@ -84,6 +84,7 @@ public class IotRyDailyReportServiceImpl implements IotRyDailyReportService {
             taskId = task.getId();
             // 根据日报状态 查询 日报所属任务的状态 瑞鹰任务状态数据字典 rigStatus
             if (ObjUtil.isNotEmpty(createReqVO.getRigStatus())) {
+                // ry任务施工状态 需要与 任务施工状态 匹配
                 task.setStatus(createReqVO.getRigStatus());
                 // 更新任务状态
                 iotProjectTaskMapper.updateById(task);

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/iotprojecttask/IotRhDailyReportMapper.xml

@@ -107,7 +107,7 @@
                     MIN(CASE WHEN construction_status = 1 THEN construction_start_date END)
             ) AS relocation_days
         FROM rq_iot_rh_daily_report
-        WHERE construction_status IN (1, 3)
+        WHERE construction_status IN ('dq', 'sg')
           AND deleted = 0
         GROUP BY dept_id;
     </select>

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/iotprojecttask/IotRyDailyReportMapper.xml

@@ -76,9 +76,9 @@
                 dept_id,
                 MAX(create_time) AS max_create_time
             FROM rq_iot_ry_daily_report
-            WHERE rig_status = 12
+            WHERE rig_status = 'wg'
             GROUP BY dept_id
         ) r2 ON r1.dept_id = r2.dept_id AND r1.create_time = r2.max_create_time
-        WHERE r1.rig_status = 12;
+        WHERE r1.rig_status = 'wg';
     </select>
 </mapper>