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

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
dbafc3a7eb eaad6ab2b5
commit
7207d4ee43
5 changed files with 90 additions and 10 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. 70
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
  2. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
  3. 13
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
  4. 12
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  5. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java

70
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
View File

@ -2280,6 +2280,36 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
//更新业务中的流程相关的参数
updateFlowFiled(map);
busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
ResultBean<List<LatestTaskVo>> listResultBeans = flowTaskFeign.getLatestTasks(busArrearsCarryVehicleApply.getProcInstId());
String nextNodeUserSids = listResultBeans.getData().get(0).getASSIGNEE_();
String nextName = listResultBeans.getData().get(0).getName_();
if ("发起申请".equals(nextName)) {
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());
BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply = busArrearsCarryVehicleApply;
Future future1 = pool.submit(() -> {
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
List<String> vinSidList = baseMapper.selectByNo(finalBusArrearsCarryVehicleApply.getSid());
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
vinSidList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKTCZZ.getTypeKey());
baseVehicleStateDto.setBusSid(v);
dtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
@ -2297,9 +2327,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(query.getBusinessSid());
messageFlowableQuery.setModuleName("欠款提车申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
/* ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
String nextName = listResultBean.getData().get(0).getName_();
String nextName = listResultBean.getData().get(0).getName_();*/
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
baseVehicleTempstateFeign.delByBusSid(finalBusArrearsCarryVehicleApply.getSid());
@ -2351,14 +2381,46 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
if (!resultBean.getSuccess()) {
return rb.setMsg("操作失败!");
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
String nextNodeUserSids = resultBean.getData().getNextNodeUserSids();
busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(busArrearsCarryVehicleApply.getProcInstId());
/* ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(busArrearsCarryVehicleApply.getProcInstId());
String nextName = listResultBean.getData().get(0).getName_();
if ("发起申请".equals(nextName)) {
baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
*/
ResultBean<List<LatestTaskVo>> listResultBeans = flowTaskFeign.getLatestTasks(busArrearsCarryVehicleApply.getProcInstId());
// String nextNodeUserSids = listResultBeans.getData().get(0).getASSIGNEE_();
String nextName = listResultBeans.getData().get(0).getName_();
if ("发起申请".equals(nextName)) {
baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid());
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());
BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply = busArrearsCarryVehicleApply;
Future future1 = pool.submit(() -> {
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
List<String> vinSidList = baseMapper.selectByNo(finalBusArrearsCarryVehicleApply.getSid());
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
vinSidList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKTCZZ.getTypeKey());
baseVehicleStateDto.setBusSid(v);
dtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
return rb.success().setData(resultBean.getData());
}
}

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
View File

@ -103,6 +103,7 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
IPage<AppDeliveredApplyPageVo> getRetrievalApplyList(IPage<AppDeliveredApplyPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppDeliveredApplyPageQuery> qw, @Param("name") String name);
List<String> selectVinNo(@Param("contractId") String contractId, @Param("list") List<String> vinSid);
List<String> selectVinNosss(@Param("contractId") String contractId, @Param("list") List<String> vinSid);
String selectNum(String billNo);

13
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
View File

@ -110,6 +110,19 @@
</foreach>
</select>
<select id="selectVinNosss" resultType="java.lang.String">
select RIGHT(bv.linkNo, 8)
from bus_sales_order_vehicle bv
left join bus_sales_order bo on bv.salesOrderSid = bo.sid
left join anrui_base.base_vehicle_state bs on bs.busSid = bv.sid
where bo.contractNo = #{contractId}
and bs.busState != '401' and (bs.finState != '1' or bs.carryVehicleState != '1')
and bv.linkSid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<select id="selectNum" resultType="java.lang.String">
select RIGHT(billNo, 4)
from bus_delivered_apply

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

@ -373,7 +373,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if (busDeliveredApply == null) {
return rb.setMsg("该申请不存在");
}
List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
/*List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(dtoSid);
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
@ -384,7 +384,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
stateDtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
}
}*/
List<BusDeliveredApplyDetailsDto> dtoList = dto.getDetailsList();
if (dtoList.size() > 0) {
busDeliveredApplyDetailsService.saveList(dtoList, busDeliveredApply.getSid());
@ -523,7 +523,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
}*/
if (sidsList.size() > 0) {
for (int i = 0; i < sidsList.size(); i++) {
List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
/*List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sidsList.get(i));
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
@ -534,7 +534,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
stateDtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
}
}*/
busDeliveredApplyDetailsService.deleteByApplySid(sidsList.get(i));
busDeliveredUseMessageService.deleteByApplySid(sidsList.get(i));
busDeliveredDetailsDiscountService.deleteByApplySid(sidsList.get(i));
@ -2430,6 +2430,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
return rb.setMsg(String.join(",", vinNoLists) + "已发起过出库流程");
}
}
List<String> vinNoListss = baseMapper.selectVinNosss(dto.getContractId(), vinSid);
if (!vinNoListss.isEmpty()) {
return rb.setMsg(String.join(",", vinNoListss) + "不符合出库的条件");
}
//判断是否存在优惠包超出的情况
int giveNumBySid = 0;
for (int i = 0; i < carList.size(); i++) {

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
View File

@ -168,7 +168,7 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
}
}
List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
/* List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
List<String> vinSidList = selectVinSidByApplySid(sid);
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
@ -179,7 +179,7 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
stateDtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
}
}*/
}
/**

Write Preview
Loading…
Cancel
Save