Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/ProjectDto.java

@@ -75,7 +75,14 @@ public class ProjectDto  extends BaseDto {
     @ApiModelProperty(value = "项目提交日期")
     private Date submitDate;
 
+    @ApiModelProperty(value = "流程id")
+    private String instanceId;
+
+    @ApiModelProperty(value = "流程状态")
+    private String status;
+
     @ApiModelProperty(value = "备注")
     private String remark;
 
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/Project.java

@@ -131,6 +131,18 @@ public class Project extends BaseEntity {
     private Date submitDate;
 
     /**
+     * 流程id
+     */
+    @TableField("instance_id")
+    private String instanceId;
+
+    /**
+     * 流程状态
+     */
+    @TableField("status")
+    private String status;
+
+    /**
      * 备注
      */
 	@TableField("remark")

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java

 package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
+import com.yeejoin.amos.boot.module.ugp.biz.service.impl.ProjectInitiationServiceImpl;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.Date;
 import java.util.List;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.ProjectServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -30,6 +33,8 @@ public class ProjectController extends BaseController {
 
     @Autowired
     ProjectServiceImpl projectServiceImpl;
+	@Autowired
+	ProjectInitiationServiceImpl projectInitiationService;
 
     /**
      * 新增项目信息表
@@ -40,6 +45,8 @@ public class ProjectController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增项目信息表", notes = "新增项目信息表")
 	public ResponseModel<ProjectDto> save(@RequestBody ProjectDto model) {
+		model.setStartDate(new Date());
+		model.setSubmitDate(new Date());
 	    model = projectServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
@@ -54,7 +61,8 @@ public class ProjectController extends BaseController {
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新项目信息表", notes = "根据sequenceNbr更新项目信息表")
 	public ResponseModel<ProjectDto> updateBySequenceNbrProject(@RequestBody ProjectDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
+	    model.setRecDate(new Date());
+		model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(projectServiceImpl.updateWithModel(model));
 	}