Merge branch 'master' of https://gitee.com/xswl_123/dite-shixi-bakcend

core/src/main/java/com/dite/znpt/converts/Impl/ConvertsImpl.java

@@ -484,6 +484,11 @@ public class ConvertsImpl implements Converts {
         postEntity.setPostSort( req.getPostSort() );
         postEntity.setStatus( req.getStatus() );
         postEntity.setRemark( req.getRemark() );
+        postEntity.setStatement( req.getStatement() );
+        postEntity.setResponsibilitiesTask( req.getResponsibilitiesTask() );
+        postEntity.setQualifications( req.getQualifications() );
+        postEntity.setWorkingConditions( req.getWorkingConditions() );
+        postEntity.setSalary( req.getSalary() );
 
         return postEntity;
     }
@@ -515,6 +520,12 @@ public class ConvertsImpl implements Converts {
         postResp.setPostSort( entity.getPostSort() );
         postResp.setCreateTime( entity.getCreateTime() );
         postResp.setUpdateTime( entity.getUpdateTime() );
+        postResp.setStatement( entity.getStatement() );
+        postResp.setResponsibilitiesTask( entity.getResponsibilitiesTask() );
+        postResp.setQualifications( entity.getQualifications() );
+        postResp.setWorkingConditions( entity.getWorkingConditions() );
+        postResp.setSalary( entity.getSalary() );
+
         if ( entity.getStatus() != null ) {
             postResp.setStatus( String.valueOf( entity.getStatus() ) );
         }

core/src/main/java/com/dite/znpt/domain/entity/PostEntity.java

@@ -55,4 +55,24 @@ public class PostEntity extends AuditableEntity implements Serializable {
     @ApiModelProperty("更新时间")
     @TableField("update_time")
     private LocalDateTime updateTime;
+
+    @ApiModelProperty("岗位说明")
+    @TableField("statement")
+    private String statement;
+
+    @ApiModelProperty("岗位任务")
+    @TableField("responsibilities_task")
+    private String responsibilitiesTask;
+
+    @ApiModelProperty("岗位任职资格")
+    @TableField("qualifications")
+    private String qualifications;
+
+    @ApiModelProperty("岗位工作条件")
+    @TableField("working_conditions")
+    private String workingConditions;
+
+    @ApiModelProperty("岗位薪资")
+    @TableField("salary")
+    private Double salary;
 }

core/src/main/java/com/dite/znpt/domain/vo/PostReq.java

@@ -1,5 +1,6 @@
 package com.dite.znpt.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.dite.znpt.util.ValidationGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,4 +35,19 @@ public class PostReq implements Serializable {
 
     @ApiModelProperty("备注")
     private String remark;
+
+    @ApiModelProperty("岗位说明")
+    private String statement;
+
+    @ApiModelProperty("岗位任务")
+    private String responsibilitiesTask;
+
+    @ApiModelProperty("岗位任职资格")
+    private String qualifications;
+
+    @ApiModelProperty("岗位工作条件")
+    private String workingConditions;
+
+    @ApiModelProperty("岗位薪资")
+    private Double salary;
 }

core/src/main/java/com/dite/znpt/domain/vo/PostResp.java

@@ -1,5 +1,6 @@
 package com.dite.znpt.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -42,4 +43,19 @@ public class PostResp implements Serializable {
     @ApiModelProperty("更新时间")
     private LocalDateTime updateTime;
 
+    @ApiModelProperty("岗位说明")
+    private String statement;
+
+    @ApiModelProperty("岗位任务")
+    private String responsibilitiesTask;
+
+    @ApiModelProperty("岗位任职资格")
+    private String qualifications;
+
+    @ApiModelProperty("岗位工作条件")
+    private String workingConditions;
+
+    @ApiModelProperty("岗位薪资")
+    private Double salary;
+
 }

web/src/main/java/com/dite/znpt/web/controller/BudgetController.java

@@ -0,0 +1,18 @@
+package com.dite.znpt.web.controller;
+
+import com.dite.znpt.service.ProjectService;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags = "预算管理")
+@RestController("/budget")
+public class BudgetController {
+    @Resource
+    private ProjectService projectService;
+
+
+}