diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java index b66046e28e..3ca1283a52 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java @@ -92,6 +92,9 @@ public class AppBusDepositBuscenterDetailVo implements Vo { @ApiModelProperty("开户银行") private String depositBank; + @ApiModelProperty("审核结果") + private String confirmDetail; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java index af59fc327d..760a81a35c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java @@ -8,12 +8,12 @@ import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListV import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit; import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService; import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService; +import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation; +import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.common.base.config.component.FileUploadComponent; @@ -21,7 +21,6 @@ import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import lombok.extern.slf4j.Slf4j; -import org.bouncycastle.voms.VOMSAttribute; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -61,6 +60,8 @@ public class BusDepositService extends MybatisBaseService()); } vo.setCustomerList(customerList); + //查询审核结果 + //判断财务是否已审核 + if ("已办结".equals(busMainDeposit.getNodeState())) { + //查询款项确认的busSid是否存在该申请的sid + ResultBean finCollectionConfirmationResultBean = finCollectionConfirmationFeign.selectByBusSid(busMainDeposit.getSid()); + //审核状态(1待审核/2已驳回/3已审核) + FinCollectionConfirmation finCollectionConfirmation = finCollectionConfirmationResultBean.getData(); + if (finCollectionConfirmation != null) { + if(finCollectionConfirmation.getAuditState() != null){ + if(finCollectionConfirmation.getAuditState() ==1){ + vo.setConfirmDetail("待确认"); + }else if(finCollectionConfirmation.getAuditState() ==2){ + String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回,驳回原因是:"+finCollectionConfirmation.getReason(); + vo.setConfirmDetail(confirmationDetails); + }else{ + String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已确认"; + vo.setConfirmDetail(confirmationDetails); + } + }else{ + vo.setConfirmDetail("待确认"); + } + } + } return vo; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 769a59c7da..72eaa90fbb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -844,14 +844,23 @@ public class BusMainDepositService extends MybatisBaseService imagess = Arrays.asList(imagesFile); + List imagess = Arrays.asList(imagesFile.split(",")); imagess.removeAll(Collections.singleton(null)); if (!imagess.isEmpty()) { for (int i = 0; i < imagess.size(); i++) { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java index 3296a0292f..ac03ec94f2 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java @@ -113,4 +113,10 @@ public class FinCollectionConfirmation extends BaseEntity { @ApiModelProperty("驳回原因") private String reason; + @ApiModelProperty("审核人") + private String confirmName; + @ApiModelProperty("审核人sid") + private String confirmNameSid; + @ApiModelProperty("审核") + private String confirmDate; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index 3e7bae2126..63968d5828 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -78,7 +78,7 @@ public interface FinCollectionConfirmationFeign { @ApiOperation("出纳确认") @PostMapping("/cashierConfirm") - public ResultBean cashierConfirm(@RequestParam("sid") String sid); + public ResultBean cashierConfirm(@RequestParam("sid") String sid,@RequestParam("userSid")String userSid); @ApiOperation("出纳驳回") @PostMapping("/cashierReject") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java index 075e8d1c77..76578a921b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java @@ -74,7 +74,7 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf } @Override - public ResultBean cashierConfirm(String sid) { + public ResultBean cashierConfirm(String sid,String userSid) { return null; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionRejectQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionRejectQuery.java index ea4e905209..b3ae3f1414 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionRejectQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionRejectQuery.java @@ -14,4 +14,6 @@ public class FinCollectionRejectQuery { private String sid; @ApiModelProperty("驳回原因") private String reason; + @ApiModelProperty("当前登录人用户sid") + private String userSid; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index 9cdd844936..a7e21eb77a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -94,8 +94,8 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF } @Override - public ResultBean cashierConfirm(String sid) { - return finCollectionConfirmationService.cashierConfirm(sid); + public ResultBean cashierConfirm(String sid,String userSid) { + return finCollectionConfirmationService.cashierConfirm(sid,userSid); } @Override diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index f9659f13d0..eddc33887f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -1245,6 +1245,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(userSid); + if(userVoResultBean.getData() != null){ + confirmation.setConfirmName(userVoResultBean.getData().getName()); + } + confirmation.setConfirmDate(DateUtil.today()); + confirmation.setConfirmNameSid(userSid); baseMapper.updateById(confirmation); //删除临时表的数据 ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid); @@ -1293,7 +1300,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(userSid); + if(userVoResultBean.getData() != null){ + confirmation.setConfirmName(userVoResultBean.getData().getName()); + } + confirmation.setConfirmDate(DateUtil.today()); + confirmation.setConfirmNameSid(userSid); baseMapper.updateById(confirmation); //删除临时表的数据 ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java index cf35c9fb4e..30a711e83e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java @@ -86,4 +86,7 @@ public class DepositBuscenterDetailVo implements Vo { @ApiModelProperty("开户银行") private String depositBank; + @ApiModelProperty("财务审核结果") + private String confirmDetail; + }