jms请核接口修改

2.撤销请核接口判断修改

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

@@ -380,7 +380,7 @@ public class LosAuditProecess implements Serializable {
 	 * 自定义3
 	 */
 	@ApiModelProperty(value = "自定义3")
-	private String customizeThree;
+	private Date customizeThree;
 
 	/**
 	 * 自定义4

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

@@ -52,10 +52,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -409,7 +406,10 @@ 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));
+			Map<String,Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(),feeCenterList);
+			if (ObjectUtils.isNotNull(map)){
+				auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
+			}
 			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/BillsServiceImpl.java

@@ -76,7 +76,6 @@ import org.springblade.los.trade.mapper.DispatchVehiclesMapper;
 import org.springblade.los.trade.mapper.InOutStorageMapper;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
-import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -1592,7 +1591,19 @@ 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));
+			auditProecessDTO.setCustomizeOne(declare.getMblno());
+			Map<String, Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(), feeCenterList);
+			if (ObjectUtils.isNotNull(map)) {
+				auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
+			}
+			if ("SE".equals(declare.getBusinessType())) {
+				auditProecessDTO.setCustomizeThree(declare.getEtd());
+			} else if ("SI".equals(declare.getBusinessType())) {
+				auditProecessDTO.setCustomizeThree(declare.getEta());
+			}
+			auditProecessDTO.setCustomizeFour(declare.getShortName());
+			auditProecessDTO.setCustomizeFive(declare.getCarrierShortName());
+			auditProecessDTO.setCustomizeSix(declare.getCyShortName());
 			R financeProcess = auditProecessService.createFinanceProcess(auditProecessDTO);
 			if (!financeProcess.isSuccess()) {
 				throw new SecurityException("操作失败,请联系管理员");
@@ -1607,7 +1618,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 	@Transactional(rollbackFor = Exception.class)
 	public Bills revokeCheckOrder(Bills bills) {
 		Bills declare = baseMapper.selectById(bills.getId());
-		if (3 == declare.getStatus()) {
+		if (declare.getStatus() > 1) {
 			throw new SecurityException("审核已通过，撤销失败");
 		}
 		R financeProcess = auditProecessService.deteleByBillId(bills.getId());
@@ -4279,6 +4290,19 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				} else if ("SI".equals(declare.getBusinessType())) {
 					auditProecessDTO.setEtd(declare.getEta());
 				}
+				auditProecessDTO.setCustomizeOne(declare.getMblno());
+				Map<String, Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(), feeCenterList);
+				if (ObjectUtils.isNotNull(map)) {
+					auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
+				}
+				if ("SE".equals(declare.getBusinessType())) {
+					auditProecessDTO.setCustomizeThree(declare.getEtd());
+				} else if ("SI".equals(declare.getBusinessType())) {
+					auditProecessDTO.setCustomizeThree(declare.getEta());
+				}
+				auditProecessDTO.setCustomizeFour(declare.getShortName());
+				auditProecessDTO.setCustomizeFive(declare.getCarrierShortName());
+				auditProecessDTO.setCustomizeSix(declare.getCyShortName());
 				R financeProcess = auditProecessService.createFinanceProcess(auditProecessDTO);
 				if (!financeProcess.isSuccess()) {
 					throw new SecurityException("操作失败,请联系管理员");
@@ -4314,7 +4338,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			throw new RuntimeException("未查到单据信息");
 		}
 		for (Bills declare : billsList) {
-			if (3 == declare.getStatus()) {
+			if (declare.getStatus() > 1) {
 				throw new SecurityException("审核已通过，撤销失败");
 			}
 			R financeProcess = auditProecessService.deteleByBillId(declare.getId());