审批流修改文件路径,财务feign调用审批流接口

blade-ops/blade-swagger/src/main/resources/application-dev.yml

@@ -28,4 +28,7 @@ knife4j:
       - name: 运维管理
         uri: 127.0.0.1:1080
         location: /blade-mocha-item/v2/api-docs
+      - name: 审批管理
+        uri: 127.0.0.1:1080
+        location: /blade-check/v2/api-docs
 

blade-service-api/blade-check-api/src/main/java/com/blade/check/dto/AuditItemsDTO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/dto/AuditItemsDTO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.dto;
+package org.springblade.check.dto;
 
-import com.blade.check.entity.AuditItems;
+import org.springblade.check.entity.AuditItems;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

blade-service-api/blade-check-api/src/main/java/com/blade/check/dto/AuditItemsUsersDTO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/dto/AuditItemsUsersDTO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.dto;
+package org.springblade.check.dto;
 
-import com.blade.check.entity.AuditItemsUsers;
+import org.springblade.check.entity.AuditItemsUsers;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

blade-service-api/blade-check-api/src/main/java/com/blade/check/dto/AuditPathsActsDTO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/dto/AuditPathsActsDTO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.dto;
+package org.springblade.check.dto;
 
-import com.blade.check.entity.AuditPathsActs;
+import org.springblade.check.entity.AuditPathsActs;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

blade-service-api/blade-check-api/src/main/java/com/blade/check/dto/AuditPathsDTO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/dto/AuditPathsDTO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.dto;
+package org.springblade.check.dto;
 
-import com.blade.check.entity.AuditPaths;
+import org.springblade.check.entity.AuditPaths;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

blade-service-api/blade-check-api/src/main/java/com/blade/check/dto/AuditPathsLevelsDTO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/dto/AuditPathsLevelsDTO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.dto;
+package org.springblade.check.dto;
 
-import com.blade.check.entity.AuditPathsLevels;
+import org.springblade.check.entity.AuditPathsLevels;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

blade-service-api/blade-check-api/src/main/java/com/blade/check/dto/AuditProecessDTO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/dto/AuditProecessDTO.java

@@ -14,11 +14,11 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.dto;
+package org.springblade.check.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.entity.AuditProecess;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.entity.AuditProecess;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

blade-service-api/blade-check-api/src/main/java/com/blade/check/entity/AuditItems.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/entity/AuditItems.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service-api/blade-check-api/src/main/java/com/blade/check/entity/AuditItemsUsers.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/entity/AuditItemsUsers.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service-api/blade-check-api/src/main/java/com/blade/check/entity/AuditPaths.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/entity/AuditPaths.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service-api/blade-check-api/src/main/java/com/blade/check/entity/AuditPathsActs.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/entity/AuditPathsActs.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service-api/blade-check-api/src/main/java/com/blade/check/entity/AuditPathsLevels.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/entity/AuditPathsLevels.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service-api/blade-check-api/src/main/java/com/blade/check/entity/AuditProecess.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/entity/AuditProecess.java

@@ -14,10 +14,12 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
@@ -40,7 +42,7 @@ public class AuditProecess implements Serializable {
 	* 1:财务清核
 	*/
 		@ApiModelProperty(value = "1:财务清核")
-		private Long actId;
+		private int actId;
 	/**
 	* 业务id
 	*/
@@ -75,7 +77,7 @@ public class AuditProecess implements Serializable {
 	* 请核时间
 	*/
 		@ApiModelProperty(value = "请核时间")
-		private LocalDateTime sendTime;
+		private Date sendTime;
 	/**
 	* 请核备注
 	*/

blade-service-api/blade-check-api/src/main/java/com/blade/check/feign/ICheckClient.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/feign/ICheckClient.java

@@ -1,10 +1,14 @@
-package com.blade.check.feign;
+package org.springblade.check.feign;
 
 
-import com.blade.check.entity.AuditPathsLevels;
+import org.springblade.check.dto.AuditProecessDTO;
+import org.springblade.check.entity.AuditPathsActs;
+import org.springblade.check.entity.AuditPathsLevels;
 import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -19,11 +23,15 @@ public interface ICheckClient {
 
 	//通过唯一的actId查询审批等级
 	@GetMapping("/auditpathsacts/listLevelsByActId")
-	List<AuditPathsLevels> listLevelsByActId(@RequestParam("actId") int actId,@RequestParam("fidStatus") int fidStatus);
+	List<AuditPathsLevels> listLevelsByActId(@RequestParam("actId") int actId, @RequestParam("fidStatus") String fidStatus);
 
 	//通过actId查询是否开启审批
 	@GetMapping("/auditpathsacts/getActsByActId")
-	AuditPathsLevels getActsByActId(@RequestParam("actId") int actId,@RequestParam("fidStatus") int fidStatus);
+	AuditPathsActs getActsByActId(@RequestParam("actId") int actId, @RequestParam("fidStatus") String fidStatus);
+
+	//开启审批流程
+	@PostMapping("/auditproecess/createFinanceProcess")
+	R createFinanceProcess (@RequestBody AuditProecessDTO auditProecessDTO);
 
 	/**
 	 * 获取商品信息

blade-service-api/blade-check-api/src/main/java/com/blade/check/vo/AuditItemsUsersVO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/vo/AuditItemsUsersVO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.vo;
+package org.springblade.check.vo;
 
-import com.blade.check.entity.AuditItemsUsers;
+import org.springblade.check.entity.AuditItemsUsers;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;

blade-service-api/blade-check-api/src/main/java/com/blade/check/vo/AuditItemsVO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/vo/AuditItemsVO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.vo;
+package org.springblade.check.vo;
 
-import com.blade.check.entity.AuditItems;
+import org.springblade.check.entity.AuditItems;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;

blade-service-api/blade-check-api/src/main/java/com/blade/check/vo/AuditPathsActsVO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/vo/AuditPathsActsVO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.vo;
+package org.springblade.check.vo;
 
-import com.blade.check.entity.AuditPathsActs;
+import org.springblade.check.entity.AuditPathsActs;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;

blade-service-api/blade-check-api/src/main/java/com/blade/check/vo/AuditPathsLevelsVO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/vo/AuditPathsLevelsVO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.vo;
+package org.springblade.check.vo;
 
-import com.blade.check.entity.AuditPathsLevels;
+import org.springblade.check.entity.AuditPathsLevels;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;

blade-service-api/blade-check-api/src/main/java/com/blade/check/vo/AuditPathsVO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/vo/AuditPathsVO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.vo;
+package org.springblade.check.vo;
 
-import com.blade.check.entity.AuditPaths;
+import org.springblade.check.entity.AuditPaths;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;

blade-service-api/blade-check-api/src/main/java/com/blade/check/vo/AuditProecessVO.java → blade-service-api/blade-check-api/src/main/java/org/springblade/check/vo/AuditProecessVO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.vo;
+package org.springblade.check.vo;
 
-import com.blade.check.entity.AuditProecess;
+import org.springblade.check.entity.AuditProecess;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;

blade-service/blade-check/src/main/java/com.blade.check/CheckApplication.java → blade-service/blade-check/src/main/java/org/springblade/check/CheckApplication.java

@@ -14,12 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check;
+package org.springblade.check;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.transaction.annotation.SeataCloudApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 
@@ -30,7 +28,6 @@ import org.springframework.cloud.client.SpringCloudApplication;
  */
 @EnableBladeFeign
 @SpringCloudApplication
-@MapperScan({"com.blade.check.**.mapper.**"})
 @SeataCloudApplication
 public class CheckApplication {
 

blade-service/blade-check/src/main/java/com.blade.check/controller/AuditItemsController.java → blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditItemsController.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.controller;
+package org.springblade.check.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,15 +23,15 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.check.entity.AuditItems;
+import org.springblade.check.vo.AuditItemsVO;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.blade.check.entity.AuditItems;
-import com.blade.check.vo.AuditItemsVO;
-import com.blade.check.service.IAuditItemsService;
+import org.springblade.check.service.IAuditItemsService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 /**
@@ -111,7 +111,7 @@ public class AuditItemsController extends BladeController {
 		return R.status(auditItemsService.saveOrUpdate(auditItems));
 	}
 
-	
+
 	/**
 	 * 删除 审批流任务明细
 	 */
@@ -122,5 +122,5 @@ public class AuditItemsController extends BladeController {
 		return R.status(auditItemsService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

blade-service/blade-check/src/main/java/com.blade.check/controller/AuditItemsUsersController.java → blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditItemsUsersController.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.controller;
+package org.springblade.check.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,15 +23,15 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.check.entity.AuditItemsUsers;
+import org.springblade.check.vo.AuditItemsUsersVO;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.blade.check.entity.AuditItemsUsers;
-import com.blade.check.vo.AuditItemsUsersVO;
-import com.blade.check.service.IAuditItemsUsersService;
+import org.springblade.check.service.IAuditItemsUsersService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 /**
@@ -111,7 +111,7 @@ public class AuditItemsUsersController extends BladeController {
 		return R.status(auditItemsUsersService.saveOrUpdate(auditItemsUsers));
 	}
 
-	
+
 	/**
 	 * 删除 审批流任务明细用户表
 	 */
@@ -122,5 +122,5 @@ public class AuditItemsUsersController extends BladeController {
 		return R.status(auditItemsUsersService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

blade-service/blade-check/src/main/java/com.blade.check/controller/AuditPathsActsController.java → blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditPathsActsController.java

@@ -14,31 +14,27 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.controller;
+package org.springblade.check.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.blade.check.entity.AuditPaths;
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.service.IAuditPathsLevelsService;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.service.IAuditPathsLevelsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
 
+import org.springblade.check.entity.AuditPathsActs;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.blade.check.entity.AuditPathsActs;
-import com.blade.check.vo.AuditPathsActsVO;
-import com.blade.check.service.IAuditPathsActsService;
+import org.springblade.check.service.IAuditPathsActsService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.List;
@@ -86,7 +82,7 @@ public class AuditPathsActsController extends BladeController {
 	}
 
 	@GetMapping("listLevelsByActId")
-    public List<AuditPathsLevels> listLevelsByActId(@ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam int actId,@ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String fidStatus)
+    public List<AuditPathsLevels> listLevelsByActId(@ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam int actId, @ApiParam(value = "feign接口专用,前端勿调", required = true) @RequestParam String fidStatus)
 	{
 		AuditPathsActs pathsActs = auditPathsActsService.getOne(new LambdaQueryWrapper<AuditPathsActs>().eq(AuditPathsActs::getActId, actId).eq(AuditPathsActs::getFidStatus,fidStatus).eq(AuditPathsActs::getTenantId,AuthUtil.getTenantId()));
 		Long pathId = pathsActs.getPathId();

blade-service/blade-check/src/main/java/com.blade.check/controller/AuditPathsController.java → blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditPathsController.java

@@ -14,15 +14,14 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.controller;
+package org.springblade.check.controller;
 
 import com.alibaba.cloud.commons.lang.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.blade.check.entity.AuditPathsActs;
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.service.IAuditPathsActsService;
-import com.blade.check.service.IAuditPathsLevelsService;
+import org.springblade.check.entity.AuditPathsActs;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.service.IAuditPathsActsService;
+import org.springblade.check.service.IAuditPathsLevelsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -30,6 +29,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.check.entity.AuditPaths;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -37,9 +37,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.blade.check.entity.AuditPaths;
-import com.blade.check.vo.AuditPathsVO;
-import com.blade.check.service.IAuditPathsService;
+import org.springblade.check.service.IAuditPathsService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.List;

blade-service/blade-check/src/main/java/com.blade.check/controller/AuditPathsLevelsController.java → blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditPathsLevelsController.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.controller;
+package org.springblade.check.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,15 +23,15 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.vo.AuditPathsLevelsVO;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.vo.AuditPathsLevelsVO;
-import com.blade.check.service.IAuditPathsLevelsService;
+import org.springblade.check.service.IAuditPathsLevelsService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 /**
@@ -111,7 +111,7 @@ public class AuditPathsLevelsController extends BladeController {
 		return R.status(auditPathsLevelsService.saveOrUpdate(auditPathsLevels));
 	}
 
-	
+
 	/**
 	 * 删除 审批流配置明细级别表
 	 */
@@ -122,5 +122,5 @@ public class AuditPathsLevelsController extends BladeController {
 		return R.status(auditPathsLevelsService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

blade-service/blade-check/src/main/java/com.blade.check/controller/AuditProecessController.java → blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditProecessController.java

@@ -14,26 +14,22 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.controller;
+package org.springblade.check.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.blade.check.dto.AuditProecessDTO;
+import org.springblade.check.dto.AuditProecessDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
 
+import org.springblade.check.entity.AuditProecess;
+import org.springblade.check.service.IAuditProecessService;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.blade.check.entity.AuditProecess;
-import com.blade.check.vo.AuditProecessVO;
-import com.blade.check.service.IAuditProecessService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 /**
@@ -64,7 +60,7 @@ public class AuditProecessController extends BladeController {
 	@PostMapping("createFinanceProcess")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "开启-财务审批流记录", notes = "传入auditProecessDTO")
-	public R createFinanceProcess(@RequestBody  AuditProecessDTO auditProecessDTO)
+	public R createFinanceProcess(@RequestBody AuditProecessDTO auditProecessDTO)
 	{
         if(CollectionUtils.isEmpty(auditProecessDTO.getPathsLevelsList()))
         {

blade-service/blade-check/src/main/java/com.blade.check/entity/AuditItems.java → blade-service/blade-check/src/main/java/org/springblade/check/entity/AuditItems.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service/blade-check/src/main/java/com.blade.check/entity/AuditItemsUsers.java → blade-service/blade-check/src/main/java/org/springblade/check/entity/AuditItemsUsers.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service/blade-check/src/main/java/com.blade.check/entity/AuditPaths.java → blade-service/blade-check/src/main/java/org/springblade/check/entity/AuditPaths.java

@@ -14,18 +14,17 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

blade-service/blade-check/src/main/java/com.blade.check/entity/AuditPathsActs.java → blade-service/blade-check/src/main/java/org/springblade/check/entity/AuditPathsActs.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service/blade-check/src/main/java/com.blade.check/entity/AuditPathsLevels.java → blade-service/blade-check/src/main/java/org/springblade/check/entity/AuditPathsLevels.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

blade-service/blade-check/src/main/java/com.blade.check/entity/AuditProecess.java → blade-service/blade-check/src/main/java/org/springblade/check/entity/AuditProecess.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.entity;
+package org.springblade.check.entity;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditItemsMapper.java → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditItemsMapper.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.mapper;
+package org.springblade.check.mapper;
 
-import com.blade.check.entity.AuditItems;
-import com.blade.check.vo.AuditItemsVO;
+import org.springblade.check.entity.AuditItems;
+import org.springblade.check.vo.AuditItemsVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditItemsMapper.xml → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditItemsMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.blade.check.mapper.AuditItemsMapper">
+<mapper namespace="org.springblade.check.mapper.AuditItemsMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="auditItemsResultMap" type="com.blade.check.entity.AuditItems">
+    <resultMap id="auditItemsResultMap" type="org.springblade.check.entity.AuditItems">
         <id column="id" property="id"/>
         <result column="act_id" property="actId"/>
         <result column="bill_id" property="billId"/>

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditItemsUsersMapper.java → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditItemsUsersMapper.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.mapper;
+package org.springblade.check.mapper;
 
-import com.blade.check.entity.AuditItemsUsers;
-import com.blade.check.vo.AuditItemsUsersVO;
+import org.springblade.check.entity.AuditItemsUsers;
+import org.springblade.check.vo.AuditItemsUsersVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditItemsUsersMapper.xml → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditItemsUsersMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.blade.check.mapper.AuditItemsUsersMapper">
+<mapper namespace="org.springblade.check.mapper.AuditItemsUsersMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="auditItemsUsersResultMap" type="com.blade.check.entity.AuditItemsUsers">
+    <resultMap id="auditItemsUsersResultMap" type="org.springblade.check.entity.AuditItemsUsers">
         <id column="id" property="id"/>
         <result column="pid" property="pid"/>
         <result column="bill_no" property="billNo"/>

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditPathsActsMapper.java → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditPathsActsMapper.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.mapper;
+package org.springblade.check.mapper;
 
-import com.blade.check.entity.AuditPathsActs;
-import com.blade.check.vo.AuditPathsActsVO;
+import org.springblade.check.entity.AuditPathsActs;
+import org.springblade.check.vo.AuditPathsActsVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditPathsActsMapper.xml → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditPathsActsMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.blade.check.mapper.AuditPathsActsMapper">
+<mapper namespace="org.springblade.check.mapper.AuditPathsActsMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="auditPathsActsResultMap" type="com.blade.check.entity.AuditPathsActs">
+    <resultMap id="auditPathsActsResultMap" type="org.springblade.check.entity.AuditPathsActs">
         <id column="id" property="id"/>
         <result column="branch_id" property="branchId"/>
         <result column="act_id" property="actId"/>

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditPathsLevelsMapper.java → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditPathsLevelsMapper.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.mapper;
+package org.springblade.check.mapper;
 
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.vo.AuditPathsLevelsVO;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.vo.AuditPathsLevelsVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditPathsLevelsMapper.xml → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditPathsLevelsMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.blade.check.mapper.AuditPathsLevelsMapper">
+<mapper namespace="org.springblade.check.mapper.AuditPathsLevelsMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="auditPathsLevelsResultMap" type="com.blade.check.entity.AuditPathsLevels">
+    <resultMap id="auditPathsLevelsResultMap" type="org.springblade.check.entity.AuditPathsLevels">
         <id column="id" property="id"/>
         <result column="path_id" property="pathId"/>
         <result column="level_id" property="levelId"/>

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditPathsMapper.java → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditPathsMapper.java

@@ -14,12 +14,13 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.mapper;
+package org.springblade.check.mapper;
 
-import com.blade.check.entity.AuditPaths;
-import com.blade.check.vo.AuditPathsVO;
+import org.springblade.check.entity.AuditPaths;
+import org.springblade.check.vo.AuditPathsVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import java.util.List;
 
 /**

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditPathsMapper.xml → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditPathsMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.blade.check.mapper.AuditPathsMapper">
+<mapper namespace="org.springblade.check.mapper.AuditPathsMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="auditPathsResultMap" type="com.blade.check.entity.AuditPaths">
+    <resultMap id="auditPathsResultMap" type="org.springblade.check.entity.AuditPaths">
         <id column="id" property="id"/>
         <result column="path_id" property="pathId"/>
         <result column="path_name" property="pathName"/>

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditProecessMapper.java → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditProecessMapper.java

@@ -14,12 +14,13 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.mapper;
+package org.springblade.check.mapper;
 
-import com.blade.check.entity.AuditProecess;
-import com.blade.check.vo.AuditProecessVO;
+import org.springblade.check.entity.AuditProecess;
+import org.springblade.check.vo.AuditProecessVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import java.util.List;
 
 /**

blade-service/blade-check/src/main/java/com.blade.check/mapper/AuditProecessMapper.xml → blade-service/blade-check/src/main/java/org/springblade/check/mapper/AuditProecessMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.blade.check.mapper.AuditProecessMapper">
+<mapper namespace="org.springblade.check.mapper.AuditProecessMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="auditProecessResultMap" type="com.blade.check.entity.AuditProecess">
+    <resultMap id="auditProecessResultMap" type="org.springblade.check.entity.AuditProecess">
         <id column="id" property="id"/>
         <result column="act_id" property="actId"/>
         <result column="bill_id" property="billId"/>

blade-service/blade-check/src/main/java/com.blade.check/service/IAuditItemsService.java → blade-service/blade-check/src/main/java/org/springblade/check/service/IAuditItemsService.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service;
+package org.springblade.check.service;
 
-import com.blade.check.entity.AuditItems;
-import com.blade.check.vo.AuditItemsVO;
+import org.springblade.check.entity.AuditItems;
+import org.springblade.check.vo.AuditItemsVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

blade-service/blade-check/src/main/java/com.blade.check/service/IAuditItemsUsersService.java → blade-service/blade-check/src/main/java/org/springblade/check/service/IAuditItemsUsersService.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service;
+package org.springblade.check.service;
 
-import com.blade.check.entity.AuditItemsUsers;
-import com.blade.check.vo.AuditItemsUsersVO;
+import org.springblade.check.entity.AuditItemsUsers;
+import org.springblade.check.vo.AuditItemsUsersVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

blade-service/blade-check/src/main/java/com.blade.check/service/IAuditPathsActsService.java → blade-service/blade-check/src/main/java/org/springblade/check/service/IAuditPathsActsService.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service;
+package org.springblade.check.service;
 
-import com.blade.check.entity.AuditPathsActs;
-import com.blade.check.vo.AuditPathsActsVO;
+import org.springblade.check.entity.AuditPathsActs;
+import org.springblade.check.vo.AuditPathsActsVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

blade-service/blade-check/src/main/java/com.blade.check/service/IAuditPathsLevelsService.java → blade-service/blade-check/src/main/java/org/springblade/check/service/IAuditPathsLevelsService.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service;
+package org.springblade.check.service;
 
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.vo.AuditPathsLevelsVO;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.vo.AuditPathsLevelsVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

blade-service/blade-check/src/main/java/com.blade.check/service/IAuditPathsService.java → blade-service/blade-check/src/main/java/org/springblade/check/service/IAuditPathsService.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service;
+package org.springblade.check.service;
 
-import com.blade.check.entity.AuditPaths;
-import com.blade.check.vo.AuditPathsVO;
+import org.springblade.check.entity.AuditPaths;
+import org.springblade.check.vo.AuditPathsVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

blade-service/blade-check/src/main/java/com.blade.check/service/IAuditProecessService.java → blade-service/blade-check/src/main/java/org/springblade/check/service/IAuditProecessService.java

@@ -14,11 +14,11 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service;
+package org.springblade.check.service;
 
-import com.blade.check.dto.AuditProecessDTO;
-import com.blade.check.entity.AuditProecess;
-import com.blade.check.vo.AuditProecessVO;
+import org.springblade.check.dto.AuditProecessDTO;
+import org.springblade.check.entity.AuditProecess;
+import org.springblade.check.vo.AuditProecessVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

blade-service/blade-check/src/main/java/com.blade.check/service/impl/AuditItemsServiceImpl.java → blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditItemsServiceImpl.java

@@ -14,12 +14,12 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service.impl;
+package org.springblade.check.service.impl;
 
-import com.blade.check.entity.AuditItems;
-import com.blade.check.vo.AuditItemsVO;
-import com.blade.check.mapper.AuditItemsMapper;
-import com.blade.check.service.IAuditItemsService;
+import org.springblade.check.entity.AuditItems;
+import org.springblade.check.vo.AuditItemsVO;
+import org.springblade.check.mapper.AuditItemsMapper;
+import org.springblade.check.service.IAuditItemsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;

blade-service/blade-check/src/main/java/com.blade.check/service/impl/AuditItemsUsersServiceImpl.java → blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditItemsUsersServiceImpl.java

@@ -14,12 +14,12 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service.impl;
+package org.springblade.check.service.impl;
 
-import com.blade.check.entity.AuditItemsUsers;
-import com.blade.check.vo.AuditItemsUsersVO;
-import com.blade.check.mapper.AuditItemsUsersMapper;
-import com.blade.check.service.IAuditItemsUsersService;
+import org.springblade.check.entity.AuditItemsUsers;
+import org.springblade.check.vo.AuditItemsUsersVO;
+import org.springblade.check.mapper.AuditItemsUsersMapper;
+import org.springblade.check.service.IAuditItemsUsersService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;

blade-service/blade-check/src/main/java/com.blade.check/service/impl/AuditPathsActsServiceImpl.java → blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditPathsActsServiceImpl.java

@@ -14,12 +14,12 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service.impl;
+package org.springblade.check.service.impl;
 
-import com.blade.check.entity.AuditPathsActs;
-import com.blade.check.vo.AuditPathsActsVO;
-import com.blade.check.mapper.AuditPathsActsMapper;
-import com.blade.check.service.IAuditPathsActsService;
+import org.springblade.check.entity.AuditPathsActs;
+import org.springblade.check.vo.AuditPathsActsVO;
+import org.springblade.check.mapper.AuditPathsActsMapper;
+import org.springblade.check.service.IAuditPathsActsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.stereotype.Service;

blade-service/blade-check/src/main/java/com.blade.check/service/impl/AuditPathsLevelsServiceImpl.java → blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditPathsLevelsServiceImpl.java

@@ -14,12 +14,12 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service.impl;
+package org.springblade.check.service.impl;
 
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.vo.AuditPathsLevelsVO;
-import com.blade.check.mapper.AuditPathsLevelsMapper;
-import com.blade.check.service.IAuditPathsLevelsService;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.vo.AuditPathsLevelsVO;
+import org.springblade.check.mapper.AuditPathsLevelsMapper;
+import org.springblade.check.service.IAuditPathsLevelsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;

blade-service/blade-check/src/main/java/com.blade.check/service/impl/AuditPathsServiceImpl.java → blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditPathsServiceImpl.java

@@ -14,17 +14,17 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service.impl;
+package org.springblade.check.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.blade.check.entity.AuditPaths;
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.mapper.AuditPathsLevelsMapper;
-import com.blade.check.vo.AuditPathsVO;
-import com.blade.check.mapper.AuditPathsMapper;
-import com.blade.check.service.IAuditPathsService;
+import org.springblade.check.entity.AuditPaths;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.mapper.AuditPathsLevelsMapper;
+import org.springblade.check.vo.AuditPathsVO;
+import org.springblade.check.mapper.AuditPathsMapper;
+import org.springblade.check.service.IAuditPathsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.beans.factory.annotation.Autowired;

blade-service/blade-check/src/main/java/com.blade.check/service/impl/AuditProecessServiceImpl.java → blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -14,26 +14,24 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.blade.check.service.impl;
+package org.springblade.check.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.blade.check.dto.AuditProecessDTO;
-import com.blade.check.entity.AuditPathsActs;
-import com.blade.check.entity.AuditPathsLevels;
-import com.blade.check.entity.AuditProecess;
-import com.blade.check.mapper.AuditPathsActsMapper;
-import com.blade.check.vo.AuditProecessVO;
-import com.blade.check.mapper.AuditProecessMapper;
-import com.blade.check.service.IAuditProecessService;
+import org.springblade.check.dto.AuditProecessDTO;
+import org.springblade.check.entity.AuditPathsActs;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.entity.AuditProecess;
+import org.springblade.check.mapper.AuditPathsActsMapper;
+import org.springblade.check.vo.AuditProecessVO;
+import org.springblade.check.mapper.AuditProecessMapper;
+import org.springblade.check.service.IAuditProecessService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.seata.spring.annotation.GlobalTransactional;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 
 /**

blade-service/blade-check/src/main/resources/application-dev.yml

@@ -11,4 +11,4 @@ spring:
 #swagger文档
 swagger:
   base-packages:
-    - com.store.goods
+    - org.springblade.check

blade-service/trade-finance/pom.xml

@@ -87,6 +87,12 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-check-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

blade-service/trade-finance/src/main/java/com/trade/finance/service/impl/SettlementServiceImpl.java

@@ -20,6 +20,10 @@ package com.trade.finance.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.check.dto.AuditProecessDTO;
+import org.springblade.check.entity.AuditPathsActs;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.feign.ICheckClient;
 import com.trade.finance.dto.SettlementDTO;
 import com.trade.finance.entity.Acc;
 import com.trade.finance.entity.Files;
@@ -32,7 +36,6 @@ import com.trade.finance.service.ISettlementService;
 import com.trade.finance.vo.SettlementVO;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
-import org.checkerframework.checker.units.qual.A;
 import org.springblade.client.entity.CorpsBank;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.ISerialClient;
@@ -70,6 +73,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
     private  IOrderDescClient orderDescClient;
 
+    private ICheckClient iCheckClient;
+
 
 
 	@Override
@@ -235,35 +240,30 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	@Transactional
 	public void check(Settlement settlement)
 	{
-		//目前清核直接通过
-		LambdaQueryWrapper<Items> itemsLambdaQueryWrapper=new LambdaQueryWrapper<>();
-		itemsLambdaQueryWrapper.eq(Items::getPid,settlement.getId());
-		List<Items> items = itemsMapper.selectList(itemsLambdaQueryWrapper);
-		if(!CollectionUtils.isEmpty(items))
-		{
-			//有几个申请明细 就生成几个账单明细
-			items.forEach(e->{
-				  Acc acc=new Acc();
-                  BeanUtils.copyProperties(e,acc);
-				  acc.setId(null);
-				  acc.setSrcBillNo(e.getBillNo());
-				  acc.setAccSysNo(e.getSrcOrderno());
-				  acc.setSrcParentId(e.getSrcParentId());
-				  acc.setBillType(settlement.getBillType());
-				  acc.setCreateTime(new Date());
-				  acc.setStatus(0);
-				  acc.setCreateUser(AuthUtil.getUserId());
-				  acc.setCostType(e.getCostType());
-				  accMapper.insert(acc);
-
-				  //绑定accId,从申请表传递给结算表,后续结算时操作账单表的结算金额
-				  e.setAccId(acc.getId());
-				  itemsMapper.updateById(e);
-
-			});
-		}
-		settlement.setCheckStatus("请核成功");
-		baseMapper.updateById(settlement);
+          //判断是否有审批流,如果审批流已开启就进入审批流,否则直接走申请通过
+		  AuditPathsActs pathsActs = iCheckClient.getActsByActId(1, "check_status");
+		  //没开启审批流直接走 通过流程
+          if(pathsActs==null || pathsActs.getIsEnable()==2)
+          {
+             this.passCheck(settlement.getId());
+		  }
+          //如果开启审批流了, 就直接创建审批业务
+          else
+		  {
+		  	  //获取审批级次
+			  List<AuditPathsLevels> auditPathsLevels = iCheckClient.listLevelsByActId(1, "check_status");
+
+			  AuditProecessDTO auditProecessDTO=new AuditProecessDTO();
+			  auditProecessDTO.setPathsLevelsList(auditPathsLevels);
+			  auditProecessDTO.setActId(1);
+			  auditProecessDTO.setBillId(settlement.getId());
+			  auditProecessDTO.setBillNo(settlement.getSrcOrderno());
+			  auditProecessDTO.setSendUserId(AuthUtil.getUserId());
+			  auditProecessDTO.setSendName(AuthUtil.getUserName());
+			  auditProecessDTO.setSendTime(new Date());
+			  auditProecessDTO.setSendMsg(settlement.getRemark());
+			  iCheckClient.createFinanceProcess(auditProecessDTO);
+		  }
 	}
 
 	@Override
@@ -364,4 +364,49 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		return settlementDTO;
 	}
 
+	//审核通过方法
+	public  void  passCheck(Long settlementId)
+	{
+		Settlement settlement = baseMapper.selectById(settlementId);
+		if(settlement ==null)
+		{
+			throw new SecurityException("数据错误,请确认后提交");
+		}
+		//目前清核直接通过
+		LambdaQueryWrapper<Items> itemsLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		itemsLambdaQueryWrapper.eq(Items::getPid,settlement.getId());
+		List<Items> items = itemsMapper.selectList(itemsLambdaQueryWrapper);
+		if(!CollectionUtils.isEmpty(items))
+		{
+			//有几个申请明细 就生成几个账单明细
+			items.forEach(e->{
+				Acc acc=new Acc();
+				BeanUtils.copyProperties(e,acc);
+				acc.setId(null);
+				acc.setSrcBillNo(e.getBillNo());
+				acc.setAccSysNo(e.getSrcOrderno());
+				acc.setSrcParentId(e.getSrcParentId());
+				acc.setBillType(settlement.getBillType());
+				acc.setCreateTime(new Date());
+				acc.setStatus(0);
+				acc.setCreateUser(AuthUtil.getUserId());
+				acc.setCostType(e.getCostType());
+				accMapper.insert(acc);
+
+				//绑定accId,从申请表传递给结算表,后续结算时操作账单表的结算金额
+				e.setAccId(acc.getId());
+				itemsMapper.updateById(e);
+
+			});
+		}
+		settlement.setCheckStatus("请核成功");
+		baseMapper.updateById(settlement);
+	}
+	//审核取消方法
+	public void passCancel(Long settlementId)
+	{
+
+	}
+
+
 }