完善项目周报功能：

修改项目周报界面
 修改项目周报暂存逻辑
 完善项目周报部分逻辑

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectReportController.java

@@ -77,8 +77,9 @@ public class ErpProjectReportController extends BaseController {
     @Log(title = "项目周报信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ErpProjectReportBo bo) {
+    public R<ErpProjectReportBo> add(@Validated(AddGroup.class) @RequestBody ErpProjectReportBo bo) {
-        return toAjax(erpProjectReportService.insertByBo(bo));
+        erpProjectReportService.insertByBo(bo);
+        return R.ok(bo);
     }
 
     /**

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectReport.java

@@ -121,4 +121,6 @@ public class ErpProjectReport extends TenantEntity {
      */
     @TableField(exist = false)
     private String deputyName;
+
+    private String status;
 }

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectReportBo.java

@@ -110,4 +110,6 @@ public class ErpProjectReportBo extends BaseEntity {
      * 分管副总名称
      */
     private String deputyName;
+
+    private String status;
 }

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReportDetailVo.java

@@ -7,6 +7,7 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.oa.erp.domain.ErpProjectReportDetail;
 
 import java.io.Serial;
@@ -23,7 +24,7 @@ import java.util.Date;
 @Data
 @ExcelIgnoreUnannotated
 @AutoMapper(target = ErpProjectReportDetail.class)
-public class ErpProjectReportDetailVo implements Serializable {
+public class ErpProjectReportDetailVo extends BaseEntity implements Serializable  {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReportVo.java

@@ -141,5 +141,5 @@ public class ErpProjectReportVo extends BaseEntity implements Serializable {
 //    @ExcelProperty(value = "项目类型名称")
     private String typeName;
 
-
+    private String status;
 }

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReportDetailServiceImpl.java

@@ -84,7 +84,7 @@ public class ErpProjectReportDetailServiceImpl implements IErpProjectReportDetai
     @Override
     public TableDataInfo<ErpProjectReportDetailVo> queryPageList(ErpProjectReportDetailBo bo, PageQuery pageQuery) {
         MPJLambdaWrapper<ErpProjectReportDetail> lqw = buildQueryWrapper(bo);
-        lqw.orderByDesc(ErpProjectReportDetail::getFillTime);
+        lqw.orderByDesc(ErpProjectReportDetail::getUpdateTime);
         Page<ErpProjectReportDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
@@ -98,6 +98,7 @@ public class ErpProjectReportDetailServiceImpl implements IErpProjectReportDetai
     @Override
     public List<ErpProjectReportDetailVo> queryList(ErpProjectReportDetailBo bo) {
         MPJLambdaWrapper<ErpProjectReportDetail> lqw = buildQueryWrapper(bo);
+        lqw.orderByDesc(ErpProjectReportDetail::getUpdateTime);
         return baseMapper.selectVoList(lqw);
     }
 
@@ -196,11 +197,13 @@ public class ErpProjectReportDetailServiceImpl implements IErpProjectReportDetai
                 erpProjectReportService.insertByBo(projectReport);
                 projectDetailReport.setReportId(projectReport.getReportId());
                 projectDetailReport.setProjectId(projectReport.getProjectId());
+                projectDetailReport.setProjectPhases(projectReport.getReportId().toString());
             }
         } else {
             erpProjectReportService.insertByBo(projectReport);
             projectDetailReport.setReportId(projectReport.getReportId());
             projectDetailReport.setProjectId(projectReport.getProjectId());
+            projectDetailReport.setProjectPhases(projectReport.getReportId().toString());
         }
         ErpProjectReportDetail erpProjectReportDetail = MapstructUtils.convert(projectDetailReport, ErpProjectReportDetail.class);
         validEntityBeforeSave(erpProjectReportDetail);

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReportServiceImpl.java

@@ -64,6 +64,7 @@ public class ErpProjectReportServiceImpl implements IErpProjectReportService {
     @Override
     public TableDataInfo<ErpProjectReportVo> queryPageList(ErpProjectReportBo bo, PageQuery pageQuery) {
         MPJLambdaWrapper<ErpProjectReport> lqw = buildQueryWrapper(bo);
+        lqw.orderByDesc(ErpProjectReport::getUpdateTime);
         Page<ErpProjectReportVo> result = baseMapper.selectCustomErpProjectReportVoList(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
@@ -77,6 +78,7 @@ public class ErpProjectReportServiceImpl implements IErpProjectReportService {
     @Override
     public List<ErpProjectReportVo> queryList(ErpProjectReportBo bo) {
         MPJLambdaWrapper<ErpProjectReport> lqw = buildQueryWrapper(bo);
+        lqw.orderByDesc(ErpProjectReport::getUpdateTime);
         return baseMapper.selectVoAndUserList(lqw);
     }
 

ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReportMapper.xml

@@ -29,6 +29,7 @@
         t.update_by,
         t.update_time,
         t.project_code,
+        t.status,
         d.dept_name AS deptName,
         u1.nick_name AS managerName,
         u2.nick_name AS chargeName,