jms审核记录增加自定义字段6个

blade-service-api/blade-los-api/src/main/java/org/springblade/los/check/entity/LosAuditProecess.java

@@ -365,6 +365,42 @@ public class LosAuditProecess implements Serializable {
 	private Date etd;
 
 	/**
+	 * 自定义1
+	 */
+	@ApiModelProperty(value = "自定义1")
+	private String customizeOne;
+
+	/**
+	 * 自定义2
+	 */
+	@ApiModelProperty(value = "自定义2")
+	private String customizeTwo;
+
+	/**
+	 * 自定义3
+	 */
+	@ApiModelProperty(value = "自定义3")
+	private String customizeThree;
+
+	/**
+	 * 自定义4
+	 */
+	@ApiModelProperty(value = "自定义4")
+	private String customizeFour;
+
+	/**
+	 * 自定义5
+	 */
+	@ApiModelProperty(value = "自定义5")
+	private String customizeFive;
+
+	/**
+	 * 自定义6
+	 */
+	@ApiModelProperty(value = "自定义6")
+	private String customizeSix;
+
+	/**
 	 * 开船日期
 	 */
 	@TableField(exist = false)

blade-service/blade-los/src/main/java/org/springblade/los/business/generalBill/service/impl/GeneralBillServiceImpl.java

@@ -34,6 +34,7 @@ import org.springblade.los.business.generalBill.entity.GeneralBill;
 import org.springblade.los.business.generalBill.mapper.GeneralBillMapper;
 import org.springblade.los.business.generalBill.service.IGeneralBillService;
 import org.springblade.los.business.generalBill.vo.GeneralBillVO;
+import org.springblade.los.business.sea.service.IDataProcessingService;
 import org.springblade.los.check.dto.LosAuditProecessDTO;
 import org.springblade.los.check.entity.LosAuditPathsActs;
 import org.springblade.los.check.entity.LosAuditPathsLevels;
@@ -83,6 +84,8 @@ public class GeneralBillServiceImpl extends ServiceImpl<GeneralBillMapper, Gener
 
 	private final IAuditProecessService auditProecessService;
 
+	private final IDataProcessingService dataProcessingUtil;
+
 	@Override
 	public IPage<GeneralBillVO> selectGeneralBillPage(IPage<GeneralBillVO> page, GeneralBillVO generalBill) {
 		return page.setRecords(baseMapper.selectGeneralBillPage(page, generalBill));
@@ -117,17 +120,7 @@ public class GeneralBillServiceImpl extends ServiceImpl<GeneralBillMapper, Gener
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public R submit(GeneralBill generalBill) {
-		String deptId = "";
-		String deptName = "";
 		String branchId = deptUtils.getDeptPid() + "";
-		//获取部门ids对应中文名
-		if (ObjectUtils.isNotNull(branchId)) {
-			deptId = deptUtils.getDeptPid() + "";
-			R<List<String>> res = sysClient.getDeptNames(branchId);
-			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
-				deptName = String.join(",", res.getData());
-			}
-		}
 		if (generalBill.getId() == null) {
 			BusinessType businessType = bBusinessTypeService.getOne(new LambdaQueryWrapper<BusinessType>()
 				.select(BusinessType::getId)
@@ -151,11 +144,7 @@ public class GeneralBillServiceImpl extends ServiceImpl<GeneralBillMapper, Gener
 			generalBill.setCreateUser(AuthUtil.getUserId());
 			generalBill.setCreateUserName(AuthUtil.getUserName());
 			generalBill.setTenantId(AuthUtil.getTenantId());
-			if (ObjectUtils.isNotNull(branchId)) {
-				generalBill.setBranchId(branchId);
-				generalBill.setCreateDept(deptId);
-				generalBill.setCreateDeptName(deptName);
-			}
+			generalBill.setBranchId(branchId);
 			// 初始创建为1
 			generalBill.setVersion("1");
 			this.save(generalBill);
@@ -349,6 +338,10 @@ public class GeneralBillServiceImpl extends ServiceImpl<GeneralBillMapper, Gener
 		Long pathId = losAuditPathsActs.getPathId();
 		auditPathsLevels = auditPathsLevelsService.list(new LambdaQueryWrapper<LosAuditPathsLevels>()
 			.eq(LosAuditPathsLevels::getTenantId, AuthUtil.getTenantId()).eq(LosAuditPathsLevels::getPathId, pathId));
+		String business = sysClient.getParamServiceNew("business");
+		if ("1".equals(business) && !auditPathsLevels.isEmpty()) {
+			auditPathsLevels = dataProcessingUtil.toExamine(auditPathsLevels, declare.getAccDept());
+		}
 		auditProecessDTO.setTimes(1);
 		auditProecessDTO.setProcessType(processType);
 		List<FeeCenter> feeCenterList = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
@@ -416,6 +409,7 @@ public class GeneralBillServiceImpl extends ServiceImpl<GeneralBillMapper, Gener
 			auditProecessDTO.setSrcId(declare.getSrcId());
 			auditProecessDTO.setSrcCnName(declare.getSrcCnName());
 			auditProecessDTO.setSrcEnName(declare.getSrcEnName());
+			auditProecessDTO.setCustomizeTwo(dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(),feeCenterList));
 			R financeProcess = auditProecessService.createFinanceProcess(auditProecessDTO);
 			if (!financeProcess.isSuccess()) {
 				throw new SecurityException("操作失败,请联系管理员");

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/IDataProcessingService.java

@@ -1,6 +1,7 @@
 package org.springblade.los.business.sea.service;
 
 import org.springblade.los.check.entity.LosAuditPathsLevels;
+import org.springblade.los.finance.fee.entity.FeeCenter;
 
 import java.util.List;
 
@@ -11,4 +12,6 @@ import java.util.List;
 public interface IDataProcessingService {
 
 	 List<LosAuditPathsLevels> toExamine(List<LosAuditPathsLevels> auditPathsLevels, String deptId);
+
+	String profitStatus(Long id, String businessType, List<FeeCenter> feeCenterList);
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -1592,6 +1592,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			} else if ("SI".equals(declare.getBusinessType())) {
 				auditProecessDTO.setEtd(declare.getEta());
 			}
+			auditProecessDTO.setCustomizeTwo(dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(),feeCenterList));
 			R financeProcess = auditProecessService.createFinanceProcess(auditProecessDTO);
 			if (!financeProcess.isSuccess()) {
 				throw new SecurityException("操作失败,请联系管理员");

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/DataProcessingImplService.java

@@ -7,6 +7,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.los.Util.IDeptUtils;
 import org.springblade.los.business.sea.service.IDataProcessingService;
 import org.springblade.los.check.entity.LosAuditPathsLevels;
+import org.springblade.los.finance.fee.entity.FeeCenter;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
@@ -75,4 +76,9 @@ public class DataProcessingImplService implements IDataProcessingService {
 		}
 		return auditPathsLevels;
 	}
+
+	@Override
+	public String profitStatus(Long id, String businessType, List<FeeCenter> feeCenterList) {
+		return null;
+	}
 }

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

@@ -80,7 +80,6 @@ public class AuditProecessController extends BladeController {
 	public R list(LosAuditProecess auditProecess, Query query) {
 		LambdaQueryWrapper<LosAuditProecess> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(LosAuditProecess::getIsDelete, 0);//是否删除
-		lambdaQueryWrapper.like(LosAuditProecess::getAuditUserId, String.valueOf(AuthUtil.getUserId()));//审核人id
 		lambdaQueryWrapper.eq(StringUtils.isNotBlank(auditProecess.getProcessType()), LosAuditProecess::getProcessType, auditProecess.getProcessType());//业务类型
 		lambdaQueryWrapper.eq(StringUtils.isNotBlank(auditProecess.getAuditStatus()), LosAuditProecess::getAuditStatus, auditProecess.getAuditStatus());//审核状态
 		lambdaQueryWrapper.eq(auditProecess.getCorpId() != null, LosAuditProecess::getCorpId, auditProecess.getCorpId());//往来单位
@@ -102,6 +101,7 @@ public class AuditProecessController extends BladeController {
 				auditProecess.getSrcCnName()).or().like(LosAuditProecess::getSrcEnName, auditProecess.getSrcCnName()));
 		lambdaQueryWrapper.ne(StringUtils.isBlank(auditProecess.getAuditStatus()), LosAuditProecess::getAuditStatus, "N");
 		if (!AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.like(LosAuditProecess::getAuditUserId, String.valueOf(AuthUtil.getUserId()));//审核人id
 			lambdaQueryWrapper.eq(LosAuditProecess::getSalesCompanyId, deptUtils.getDeptPid());//公司
 		}
 		IPage pages = auditProecessService.page(Condition.getPage(query), lambdaQueryWrapper);