修改 上报错误,修改合同时间没有带过来

ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmProjectConstruction.java

@@ -50,6 +50,33 @@ public class BmProjectConstruction extends BaseEntity
     @Excel(name = "开工照片")
     private String constructionPhoto;
 
+    /** 合同约定开工时间* */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "合同约定开工时间*", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date orderBeginTime;
+
+    /** 合同约定竣工时间* */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "合同约定竣工时间*", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date orderEndTime;
+
+
+    public Date getOrderBeginTime() {
+        return orderBeginTime;
+    }
+
+    public void setOrderBeginTime(Date orderBeginTime) {
+        this.orderBeginTime = orderBeginTime;
+    }
+
+    public Date getOrderEndTime() {
+        return orderEndTime;
+    }
+
+    public void setOrderEndTime(Date orderEndTime) {
+        this.orderEndTime = orderEndTime;
+    }
+
     public void setId(Long id)
     {
         this.id = id;

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmConstructionPayInfoServiceImpl.java

@@ -1,19 +1,15 @@
 package com.ruoyi.system.service.impl.project;
 
 import java.util.List;
-
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.project.BmConstructionPayInfo;
-import com.ruoyi.system.domain.project.BmProjectConstruction;
 import com.ruoyi.system.mapper.project.BmConstructionPayInfoMapper;
 import com.ruoyi.system.service.project.IBmConstructionPayInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import static com.ruoyi.system.service.impl.project.BmProjectConstructionServiceImpl.templateSetTime;
-
 
 /**
  * 项目入统Service业务层处理

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmProjectConstructionServiceImpl.java

@@ -53,7 +53,12 @@ public class BmProjectConstructionServiceImpl implements IBmProjectConstructionS
      */
     @Override
     public BmProjectConstruction selectBmProjectConstructionById(Long id) {
-        return bmProjectConstructionMapper.selectBmProjectConstructionById(id);
+        BmProjectConstruction bmProjectConstruction = bmProjectConstructionMapper.selectBmProjectConstructionById(id);
+        Long bmProjectId = bmProjectConstruction.getBmProjectId();
+        BmProject bmProject = bmProjectMapper.selectBmProjectById(bmProjectId);
+        bmProjectConstruction.setOrderBeginTime(bmProject.getOrderBeginTime());
+        bmProjectConstruction.setOrderEndTime(bmProject.getOrderEndTime());
+        return bmProjectConstruction;
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmProjectOrderinfoServiceImpl.java

@@ -64,12 +64,17 @@ public class BmProjectOrderinfoServiceImpl implements IBmProjectOrderinfoService
         bmProjectOrderinfo.setCreateTime(DateUtils.getNowDate());
         bmProjectOrderinfo.setCreateBy(SecurityUtils.getUsername());
         //提取总投资额度更新到bm_project表中
+        //合同约定竣工时间
+        Date agreementEndDate = bmProjectOrderinfo.getAgreementEnddate();
+        //合同约定开工时间
+        Date agreementStartDate = bmProjectOrderinfo.getAgreementStartdate();
+
         Long bmProjectId = bmProjectOrderinfo.getBmProjectId();
         if (bmProjectId == null) {
             return AjaxResult.error("缺少项目id");
         }
         bmProjectOrderinfoMapper.insertBmProjectOrderinfo(bmProjectOrderinfo);
-        return updateBmProjectOrderinfo(bmProjectOrderinfo);
+        return updateBmProject(bmProjectOrderinfo);
     }
 
     /**

ruoyi-ui/src/views/management/report/index.vue

@@ -100,7 +100,7 @@
           plain
           icon="el-icon-plus"
           size="mini"
-          :disabled="multiple"
+          :disabled="single"
           @click="handleReport"
         >上报</el-button>
       </el-col>
@@ -167,6 +167,13 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['BmProjectReport:report:edit']"
           >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleReport(scope.row)"
+            v-hasPermi="['BmProjectReport:report:edit']"
+          >上报</el-button>
           <el-button
             size="mini"
             type="text"
@@ -384,7 +391,7 @@ export default {
     /** 项目上报 */
     handleReport(row){
       this.reset();
-      this.form.id = row.id || this.ids;
+      this.form.id = this.ids[0];
       this.form.reportStatus = '1';
       updateReport(this.form).then(response => {
         this.msgSuccess("上报成功");