Merge branch 'tzq' into 'develop'

审批bug修复

See merge request 8timerv2/8timerapiv200!34

src/main/java/cn/timer/api/bean/spmk/SpmkApprovalG.java

 package cn.timer.api.bean.spmk;
 package cn.timer.api.bean.spmk;
 
 
-import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Table;
@@ -19,7 +18,6 @@ import lombok.NoArgsConstructor;
 /**
 /**
  * @author Tang 2020-04-17
  * @author Tang 2020-04-17
  */
  */
-@Entity
 @Data
 @Data
 @Builder
 @Builder
 @NoArgsConstructor
 @NoArgsConstructor

src/main/java/cn/timer/api/bean/spmk/SpmkApprovalTemplate.java

@@ -21,7 +21,6 @@ import lombok.NoArgsConstructor;
 /**
 /**
  * @author Tang 2020-04-17
  * @author Tang 2020-04-17
  */
  */
-@Entity
 @Data
 @Data
 @Builder
 @Builder
 @NoArgsConstructor
 @NoArgsConstructor

src/main/java/cn/timer/api/bean/spmk/SpmkApprovalTemplateG.java

@@ -21,7 +21,6 @@ import lombok.NoArgsConstructor;
 /**
 /**
  * @author Tang 2020-04-17
  * @author Tang 2020-04-17
  */
  */
-@Entity
 @Data
 @Data
 @Builder
 @Builder
 @NoArgsConstructor
 @NoArgsConstructor

src/main/java/cn/timer/api/bean/spmk/SpmkApproveDetail.java

@@ -19,7 +19,6 @@ import lombok.NoArgsConstructor;
 /**
 /**
  * @author Tang 2020-04-17
  * @author Tang 2020-04-17
  */
  */
-@Entity
 @Data
 @Data
 @Builder
 @Builder
 @NoArgsConstructor
 @NoArgsConstructor

src/main/java/cn/timer/api/bean/spmk/SpmkApproveExecuteRecord.java

@@ -21,7 +21,6 @@ import lombok.NoArgsConstructor;
 /**
 /**
  * @author Tang 2020-04-17
  * @author Tang 2020-04-17
  */
  */
-@Entity
 @Data
 @Data
 @Builder
 @Builder
 @NoArgsConstructor
 @NoArgsConstructor

src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java

@@ -21,7 +21,6 @@ import lombok.NoArgsConstructor;
 /**
 /**
  * @author Tang 2020-04-17
  * @author Tang 2020-04-17
  */
  */
-@Entity
 @Data
 @Data
 @Builder
 @Builder
 @NoArgsConstructor
 @NoArgsConstructor

src/main/java/cn/timer/api/bean/spmk/SpmkCustomApproval.java

@@ -21,7 +21,6 @@ import lombok.NoArgsConstructor;
 /**
 /**
  * @author Tang 2020-04-17
  * @author Tang 2020-04-17
  */
  */
-@Entity
 @Data
 @Data
 @Builder
 @Builder
 @NoArgsConstructor
 @NoArgsConstructor

src/main/java/cn/timer/api/bean/spmk/SpmkInitiatorConfig.java

@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
  * 
  * 
  * @author Tang 2020-04-17
  * @author Tang 2020-04-17
  */
  */
-@Entity
+
 @Data
 @Data
 @Builder
 @Builder
 @NoArgsConstructor
 @NoArgsConstructor

src/main/java/cn/timer/api/controller/spmk/SpmkServiceImpl.java

@@ -535,10 +535,10 @@ public class SpmkServiceImpl {
 	/**
 	/**
 	 * 排序-审批模板组
 	 * 排序-审批模板组
 	 */
 	 */
-	@PutMapping(value = "/list_approval_template_g")
+	@PutMapping(value = "/update_approval_template_g")
 	@ApiOperation(value = "排序-审批模板组", httpMethod = "PUT", notes = "排序-审批模板组")
 	@ApiOperation(value = "排序-审批模板组", httpMethod = "PUT", notes = "排序-审批模板组")
 	@ApiOperationSupport(order = 1)
 	@ApiOperationSupport(order = 1)
-	public Result<Object> ranksAtg(@PathVariable List<SpmkApprovalTemplateG> list){
+	public Result<Object> ranksAtg(@RequestBody List<SpmkApprovalTemplateG> list){
 
 
         return spmkApprovalTemplateGMapper.updateListRandsById(list) ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
         return spmkApprovalTemplateGMapper.updateListRandsById(list) ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
 	}
 	}
@@ -592,10 +592,10 @@ public class SpmkServiceImpl {
 	/**
 	/**
 	 * 排序-审批模板
 	 * 排序-审批模板
 	 */
 	 */
-	@PutMapping(value = "/list_approval_template_g")
+	@PutMapping(value = "/update_approval_template")
 	@ApiOperation(value = "查询列表-审批模板组", httpMethod = "PUT", notes = "查询列表-审批模板组")
 	@ApiOperation(value = "查询列表-审批模板组", httpMethod = "PUT", notes = "查询列表-审批模板组")
 	@ApiOperationSupport(order = 1)
 	@ApiOperationSupport(order = 1)
-	public Result<Object> ranksAt(@PathVariable List<SpmkApprovalTemplate> list){
+	public Result<Object> ranksAt(@RequestBody List<SpmkApprovalTemplate> list){
 
 
         return spmkApprovalTemplateMapper.updateListRandsById(list) ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
         return spmkApprovalTemplateMapper.updateListRandsById(list) ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
 	
 	
@@ -643,10 +643,10 @@ public class SpmkServiceImpl {
 	/**
 	/**
 	 * 排序-审批组
 	 * 排序-审批组
 	 */
 	 */
-	@PutMapping(value = "/list_approval_template_g")
+	@PutMapping(value = "/update_approval_g")
 	@ApiOperation(value = "排序-审批组", httpMethod = "PUT", notes = "排序-审批组")
 	@ApiOperation(value = "排序-审批组", httpMethod = "PUT", notes = "排序-审批组")
 	@ApiOperationSupport(order = 1)
 	@ApiOperationSupport(order = 1)
-	public Result<Object> ranksAg(@PathVariable List<SpmkApprovalG> list){
+	public Result<Object> ranksAg(@RequestBody List<SpmkApprovalG> list){
 
 
         return spmkApprovalGMapper.updateListRandsById(list) ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
         return spmkApprovalGMapper.updateListRandsById(list) ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
 	}
 	}
@@ -728,10 +728,10 @@ public class SpmkServiceImpl {
 	/**
 	/**
 	 * 排序-自定义审批
 	 * 排序-自定义审批
 	 */
 	 */
-	@PutMapping(value = "/list_custom_approval")
-	@ApiOperation(value = "查询列表-审批模板组", httpMethod = "PUT", notes = "查询列表-审批模板组")
+	@PutMapping(value = "/update_custom_approval")
+	@ApiOperation(value = "排序-自定义审批", httpMethod = "PUT", notes = "排序-自定义审批")
 	@ApiOperationSupport(order = 1)
 	@ApiOperationSupport(order = 1)
-	public Result<Object> ranksCa(@PathVariable List<SpmkCustomApproval> list){
+	public Result<Object> ranksCa(@RequestBody List<SpmkCustomApproval> list){
 
 
         return spmkCustomApprovalMapper.updateListRandsById(list) ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
         return spmkCustomApprovalMapper.updateListRandsById(list) ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
 	
 	

src/main/java/cn/timer/api/dto/spmk/SpmkApprovalGDto.java

@@ -10,7 +10,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 
 
-@Entity
 @Data
 @Data
 @NoArgsConstructor
 @NoArgsConstructor
 @AllArgsConstructor
 @AllArgsConstructor

src/main/java/cn/timer/api/dto/spmk/SpmkApprovalTemplateDto.java

@@ -11,7 +11,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 
 
-@Entity
 @Data
 @Data
 @Builder
 @Builder
 @NoArgsConstructor
 @NoArgsConstructor

src/main/java/cn/timer/api/dto/spmk/SpmkApprovalTemplateGDto.java

@@ -10,7 +10,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 
 
-@Entity
 @Data
 @Data
 @NoArgsConstructor
 @NoArgsConstructor
 @AllArgsConstructor
 @AllArgsConstructor

src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java

@@ -10,7 +10,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 
 
-@Entity
+
 @Data
 @Data
 @Builder
 @Builder
 @NoArgsConstructor
 @NoArgsConstructor

src/main/java/cn/timer/api/dto/spmk/SpmkApproveSummaryDto.java

 package cn.timer.api.dto.spmk;
 package cn.timer.api.dto.spmk;
 
 
-import java.util.Date;
-
-import javax.persistence.Entity;
-
-import cn.timer.api.bean.spmk.SpmkApproveDetail;
 import cn.timer.api.bean.spmk.SpmkApproveSummary;
 import cn.timer.api.bean.spmk.SpmkApproveSummary;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 
 
-@Entity
+
 @Data
 @Data
 @Builder
 @Builder
 @NoArgsConstructor
 @NoArgsConstructor

src/main/java/cn/timer/api/dto/spmk/SpmkCustomApprovalDto.java

@@ -3,8 +3,6 @@ package cn.timer.api.dto.spmk;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
-import javax.persistence.Entity;
-
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONObject;
 import cn.timer.api.bean.spmk.SpmkInitiatorConfig;
 import cn.timer.api.bean.spmk.SpmkInitiatorConfig;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +11,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 
 
-@Entity
 @Data
 @Data
 @Builder
 @Builder
 @NoArgsConstructor
 @NoArgsConstructor