yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
dimengzhe 2 years ago
parent
24776fd648
commit
671d2352fd
2 changed files with 46 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  2. 40
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

19
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -37,8 +37,10 @@ import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.base.api.basevehiclecertificate.CertificateStateQuery;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutApplyDto;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutDto;
@ -47,6 +49,7 @@ import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.common.enums.CertificState;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered;
@ -870,10 +873,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
PushMessageQuery pushMessageQuery = new PushMessageQuery();
pushMessageQuery.setReceivedSids(recipientSidList);
pushMessageQuery.setModuleName("业务");
pushMessageQuery.setMsgContent("您有待移交的合格证，请前往合格证移交查看");
pushMessageQuery.setMsgContent("您有待移交的合格证，请前往合格证管理中查看");
pushMessageQuery.setApp_type("2");
pushMessageQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
pushMessageQuery.setMsgTitle("合格证待移交提醒");
pushMessageQuery.setMsgTitle("合格证移交提醒");
pushMessageQuery.setBusinessSid(busDeliveredApply.getSid());
// 消息推送
messageFeign.pushNoUriMessage(pushMessageQuery);
@ -891,7 +894,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
pushMessageQuery.setMsgContent("您有待移交的随车资料，请前往随车资料管理查看");
pushMessageQuery.setApp_type("2");
pushMessageQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
pushMessageQuery.setMsgTitle("随车资料待移交提醒");
pushMessageQuery.setMsgTitle("随车资料移交提醒");
pushMessageQuery.setBusinessSid(busDeliveredApply.getSid());
// 消息推送
messageFeign.pushNoUriMessage(pushMessageQuery);
@ -927,7 +930,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
pushMessageQuery.setMsgContent("您有待移交的优惠包，请前往优惠包交接查看");
pushMessageQuery.setApp_type("2");
pushMessageQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
pushMessageQuery.setMsgTitle("优惠包待移交提醒");
pushMessageQuery.setMsgTitle("优惠包移交提醒");
pushMessageQuery.setBusinessSid(busDeliveredApply.getSid());
// 消息推送
messageFeign.pushNoUriMessage(pushMessageQuery);
@ -947,8 +950,14 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
finVehicleInvoiceFeign.updateBySid(finVehicleInvoice.getSid());
}
}
//合格证的状态修改为待移交状态
CertificateStateQuery certificateStateQuery = new CertificateStateQuery();
certificateStateQuery.setVinSid(vinSid);
certificateStateQuery.setTransferStateKey(CertificState.TransferState.TRANSTATE_DYJ.getCode());
certificateStateQuery.setTransferStateValue(CertificState.TransferState.TRANSTATE_DYJ.getRemarks());
baseVehicleCertificateFeign.updateYjState(certificateStateQuery);
}
} else {
if ("重新提交".equals(bv.getComment())) {
//将待出库中的车辆更改状态为出库申请0

40
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
View File

@ -94,10 +94,7 @@ 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.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
import com.yxt.anrui.portal.api.sysuser.*;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.Base64;
@ -107,10 +104,7 @@ import com.yxt.common.base.utils.WordUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.messagecenter.api.message.Message;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import com.yxt.messagecenter.api.message.*;
import com.yxt.messagecenter.api.messagelist.MessageList;
import com.yxt.messagecenter.api.messagelist.MessageListFeign;
import org.apache.commons.lang3.StringUtils;
@ -812,6 +806,36 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
if (oneBillMoney == null) {
busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
}
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
FinBillApplication finalFinBillApplication = finBillApplication;
//推送给财务开票角色的人员
Future future8 = pool.submit(() -> {
//财务开票角色
List<String> recipientSidList = new ArrayList<>();
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid("0e28bdeb-d5c4-4893-8ff7-edb15d3b172f");
userQuery.setOrgSidPath(bv.getOrgSidPath());
recipientSidList = sysUserFeign.getUserSidByRole(userQuery).getData();
PushMessageQuery pushMessageQuery = new PushMessageQuery();
pushMessageQuery.setReceivedSids(recipientSidList);
pushMessageQuery.setModuleName("业务");
pushMessageQuery.setMsgContent("您有发票需要开具，请前往开票管理查看");
pushMessageQuery.setApp_type("2");
pushMessageQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
pushMessageQuery.setMsgTitle("开票提醒");
pushMessageQuery.setBusinessSid(finalFinBillApplication.getSid());
// 消息推送
messageFeign.pushNoUriMessage(pushMessageQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
} else {
finBillApplication = fetchBySid(businessSid);
try {

Write Preview
Loading…
Cancel
Save