Parcourir la source

新需求变更

suntianwu il y a 2 ans
Parent
commit
fd250c1d2d

+ 1 - 1
purchase-admin/src/main/java/com/ozs/web/controller/pm/PmTaskReleaseController.java

@@ -56,7 +56,7 @@ public class PmTaskReleaseController extends BaseController {
         return success(page);
     }
 
-    @ApiOperation(value = "下达任务", notes = "必传demandId和上传附件,其他字段不传")
+    @ApiOperation(value = "下达任务", notes = "必传demandId、taskReleaseTime和上传附件,其他字段不传")
     @PostMapping("/releaseTask")
     @PreAuthorize("@ss.hasPermi('pm:taskRelease:releaseTask')")
     @Log(title = ModularConstans.taskRelease, businessType = BusinessType.UPDATE)

+ 3 - 0
purchase-system/src/main/java/com/ozs/pm/doman/PmDemand.java

@@ -178,6 +178,9 @@ public class PmDemand implements Serializable {
     @TableField("CREATE_BY")
     private String createBy;
 
+    @ApiModelProperty("任务下达时间")
+    @TableField("TASK_RELEASE_TIME")
+    private Date taskReleaseTime;
 
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

+ 6 - 0
purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmDemandReqVo.java

@@ -1,5 +1,6 @@
 package com.ozs.pm.doman.vo.requestVo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.vo.PageVo;
 import com.ozs.system.domain.SysFileRef;
 import io.swagger.annotations.ApiModel;
@@ -9,6 +10,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -90,6 +92,10 @@ public class PmDemandReqVo extends PageVo {
     @ApiModelProperty("上传附件")
     private List<SysFileRef> sysFileRefs;
 
+    @ApiModelProperty("任务下达时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date taskReleaseTime;
+
     /**
      * 流程图中的模块名称
      */

+ 3 - 0
purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmDemandResVo.java

@@ -203,6 +203,9 @@ public class PmDemandResVo extends BaseEntity
     @ApiModelProperty("调整建议")
     private String adjustAdvice;
 
+    @ApiModelProperty("任务下达时间")
+    private Date taskReleaseTime;
+
     /** 需求建档对象  */
     @ApiModelProperty("需求建档对象")
     private PmBookBuildingResVo pmBookBuildingResVo;

+ 2 - 0
purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -868,6 +868,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     public boolean releaseTask(PmDemandReqVo pmDemandReqVo) {
         PmDemand pmDemand = new PmDemand();
         pmDemand.setDemandId(pmDemandReqVo.getDemandId());
+        pmDemand.setTaskReleaseTime(pmDemandReqVo.getTaskReleaseTime());
+
         pmDemand.setProjectStatus(PmProjectStatus.WAIT_SELECT_AGENT.getCode());
         List<SysFileRef> sysFileRefs = pmDemandReqVo.getSysFileRefs();