|
@@ -32,6 +32,7 @@ import com.ankaibei.workFlow.webadmin.ankaibei.service.ApplyForCostService;
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.service.CostInfoService;
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.service.CostInfoService;
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.utils.FlowTaskStart;
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.utils.FlowTaskStart;
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.vo.CommunicationInfoVo;
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.vo.CommunicationInfoVo;
|
|
|
|
+import com.ankaibei.workFlow.webadmin.ankaibei.vo.CostInfoVo;
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.vo.PurchaseInfoVo;
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.vo.PurchaseInfoVo;
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.vo.RepastExpenseVo;
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.vo.RepastExpenseVo;
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.vo.ResMsg;
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.vo.ResMsg;
|
|
@@ -286,7 +287,7 @@ public class ApplyForCostServiceImpl implements ApplyForCostService {
|
|
public ResMsg purchaseSubmitBatch(List<PurchaseInfoVo> purchaseInfoVos) {
|
|
public ResMsg purchaseSubmitBatch(List<PurchaseInfoVo> purchaseInfoVos) {
|
|
for (PurchaseInfoVo purchaseInfoVo : purchaseInfoVos) {
|
|
for (PurchaseInfoVo purchaseInfoVo : purchaseInfoVos) {
|
|
CostInfoEntity costInfoEntity = new CostInfoEntity();
|
|
CostInfoEntity costInfoEntity = new CostInfoEntity();
|
|
- costInfoEntity.setApplyCostId(purchaseInfoVo.getPurchaseId());
|
|
|
|
|
|
+ costInfoEntity.setCostId(purchaseInfoVo.getPurchaseId());
|
|
costInfoEntity.setCostType("采购费");
|
|
costInfoEntity.setCostType("采购费");
|
|
//查询采购费用详情
|
|
//查询采购费用详情
|
|
ResMsg infoDetails = costInfoService.findCostInfoDetails(costInfoEntity);
|
|
ResMsg infoDetails = costInfoService.findCostInfoDetails(costInfoEntity);
|
|
@@ -442,7 +443,7 @@ public class ApplyForCostServiceImpl implements ApplyForCostService {
|
|
public ResMsg restSubmitBatch(List<RestsInfoVo> restsInfoVos) {
|
|
public ResMsg restSubmitBatch(List<RestsInfoVo> restsInfoVos) {
|
|
for (RestsInfoVo restsInfoVo : restsInfoVos) {
|
|
for (RestsInfoVo restsInfoVo : restsInfoVos) {
|
|
CostInfoEntity costInfoEntity = new CostInfoEntity();
|
|
CostInfoEntity costInfoEntity = new CostInfoEntity();
|
|
- costInfoEntity.setApplyCostId(restsInfoVo.getRestsId());
|
|
|
|
|
|
+ costInfoEntity.setCostId(restsInfoVo.getRestsId());
|
|
costInfoEntity.setCostType("其他费用");
|
|
costInfoEntity.setCostType("其他费用");
|
|
//查询其他费用详情
|
|
//查询其他费用详情
|
|
ResMsg infoDetails = costInfoService.findCostInfoDetails(costInfoEntity);
|
|
ResMsg infoDetails = costInfoService.findCostInfoDetails(costInfoEntity);
|
|
@@ -595,7 +596,7 @@ public class ApplyForCostServiceImpl implements ApplyForCostService {
|
|
public ResMsg trafficSubmitBatch(List<TrafficExpenseVo> trafficExpenseVos) {
|
|
public ResMsg trafficSubmitBatch(List<TrafficExpenseVo> trafficExpenseVos) {
|
|
for (TrafficExpenseVo trafficExpenseVo : trafficExpenseVos) {
|
|
for (TrafficExpenseVo trafficExpenseVo : trafficExpenseVos) {
|
|
CostInfoEntity costInfoEntity = new CostInfoEntity();
|
|
CostInfoEntity costInfoEntity = new CostInfoEntity();
|
|
- costInfoEntity.setApplyCostId(trafficExpenseVo.getId());
|
|
|
|
|
|
+ costInfoEntity.setCostId(trafficExpenseVo.getId());
|
|
costInfoEntity.setCostType("交通费");
|
|
costInfoEntity.setCostType("交通费");
|
|
//查询交通费用详情
|
|
//查询交通费用详情
|
|
ResMsg infoDetails = costInfoService.findCostInfoDetails(costInfoEntity);
|
|
ResMsg infoDetails = costInfoService.findCostInfoDetails(costInfoEntity);
|
|
@@ -747,7 +748,7 @@ public class ApplyForCostServiceImpl implements ApplyForCostService {
|
|
public ResMsg repastSubmitBatch(List<RepastExpenseVo> repastExpenseVos) {
|
|
public ResMsg repastSubmitBatch(List<RepastExpenseVo> repastExpenseVos) {
|
|
for (RepastExpenseVo repastExpenseVo : repastExpenseVos) {
|
|
for (RepastExpenseVo repastExpenseVo : repastExpenseVos) {
|
|
CostInfoEntity costInfoEntity = new CostInfoEntity();
|
|
CostInfoEntity costInfoEntity = new CostInfoEntity();
|
|
- costInfoEntity.setApplyCostId(repastExpenseVo.getId());
|
|
|
|
|
|
+ costInfoEntity.setCostId(repastExpenseVo.getId());
|
|
costInfoEntity.setCostType("餐饮费");
|
|
costInfoEntity.setCostType("餐饮费");
|
|
//查询餐饮费用详情
|
|
//查询餐饮费用详情
|
|
ResMsg infoDetails = costInfoService.findCostInfoDetails(costInfoEntity);
|
|
ResMsg infoDetails = costInfoService.findCostInfoDetails(costInfoEntity);
|
|
@@ -899,7 +900,7 @@ public class ApplyForCostServiceImpl implements ApplyForCostService {
|
|
public ResMsg travelSubmitBatch(List<TravelExpenseVo> travelExpenseVos) {
|
|
public ResMsg travelSubmitBatch(List<TravelExpenseVo> travelExpenseVos) {
|
|
for (TravelExpenseVo travelExpenseVo : travelExpenseVos) {
|
|
for (TravelExpenseVo travelExpenseVo : travelExpenseVos) {
|
|
CostInfoEntity costInfoEntity = new CostInfoEntity();
|
|
CostInfoEntity costInfoEntity = new CostInfoEntity();
|
|
- costInfoEntity.setApplyCostId(travelExpenseVo.getId());
|
|
|
|
|
|
+ costInfoEntity.setCostId(travelExpenseVo.getId());
|
|
costInfoEntity.setCostType("差旅费");
|
|
costInfoEntity.setCostType("差旅费");
|
|
//查询差旅费用详情
|
|
//查询差旅费用详情
|
|
ResMsg infoDetails = costInfoService.findCostInfoDetails(costInfoEntity);
|
|
ResMsg infoDetails = costInfoService.findCostInfoDetails(costInfoEntity);
|
|
@@ -1018,6 +1019,97 @@ public class ApplyForCostServiceImpl implements ApplyForCostService {
|
|
return new ResMsg(CodeEnum.OK);
|
|
return new ResMsg(CodeEnum.OK);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 不分费用类型的批量提交
|
|
|
|
+ */
|
|
|
|
+ @Override
|
|
|
|
+ public ResMsg costSubmitBatch(List<CostInfoVo> CostInfos) {
|
|
|
|
+ for (CostInfoVo costVo : CostInfos) {
|
|
|
|
+ CostInfoEntity costNew = new CostInfoEntity();
|
|
|
|
+ BeanUtils.copyProperties(costVo, costNew);
|
|
|
|
+ //查询差旅费用详情
|
|
|
|
+ ResMsg infoDetails = costInfoService.findCostInfoDetails(costNew);
|
|
|
|
+ if (!"200".equals(infoDetails.getCode())) {
|
|
|
|
+ return infoDetails;
|
|
|
|
+ }
|
|
|
|
+ //根据不同的费用类型调用不同的流程启动
|
|
|
|
+
|
|
|
|
+ switch (costVo.getCostType()) {
|
|
|
|
+ case "通讯费":
|
|
|
|
+ //通讯费用申请流程的启动
|
|
|
|
+ CommunicationInfoEntity save = (CommunicationInfoEntity) infoDetails.getData();
|
|
|
|
+ ResMsg resMsg = communicationFlowStart(save);
|
|
|
|
+ if (!"200".equals(resMsg.getCode())) {
|
|
|
|
+ return resMsg;
|
|
|
|
+ }
|
|
|
|
+ save.setFlowTaskStatus(FlowTaskStatus.SUBMITTED);
|
|
|
|
+ communicationMapper.save(save);
|
|
|
|
+ break;
|
|
|
|
+ case "采购费":
|
|
|
|
+ //采购费用申请流程的启动
|
|
|
|
+ PurchaseInfoVo infoVo = (PurchaseInfoVo) infoDetails.getData();
|
|
|
|
+ Optional<PurchaseInfoEntity> byId = purchaseInfoMapper.findById(infoVo.getPurchaseId());
|
|
|
|
+ ResMsg resMsgTwo = purchaseFlowStart(infoVo);
|
|
|
|
+ if (!"200".equals(resMsgTwo.getCode())) {
|
|
|
|
+ return resMsgTwo;
|
|
|
|
+ }
|
|
|
|
+ byId.get().setFlowTaskStatus(FlowTaskStatus.SUBMITTED);
|
|
|
|
+ purchaseInfoMapper.save(byId.get());
|
|
|
|
+ break;
|
|
|
|
+ case "其他费用":
|
|
|
|
+ //其他费用申请流程的启动
|
|
|
|
+ RestsInfoVo saveA = (RestsInfoVo) infoDetails.getData();
|
|
|
|
+ Optional<RestsInfoEntity> byIdA = restInfoMapper.findById(saveA.getRestsId());
|
|
|
|
+ ResMsg resMsgThree = restFlowStart(byIdA.get());
|
|
|
|
+ if (!"200".equals(resMsgThree.getCode())) {
|
|
|
|
+ return resMsgThree;
|
|
|
|
+ }
|
|
|
|
+ // byId.get().setFlowTaskStatus(FlowTaskStatus.SUBMITTED);
|
|
|
|
+ byIdA.get().setFlowTaskStatus(FlowTaskStatus.SUBMITTED);
|
|
|
|
+ restInfoMapper.save(byIdA.get());
|
|
|
|
+ break;
|
|
|
|
+ case "交通费":
|
|
|
|
+ //采购费用申请流程的启动
|
|
|
|
+ TrafficExpenseVo trafficExpenseVo = (TrafficExpenseVo) infoDetails.getData();
|
|
|
|
+ Optional<TrafficExpenseEntity> byIdB = trafficExpenseMapper.findById(trafficExpenseVo.getId());
|
|
|
|
+ ResMsg resMsgFore = trafficExpenseFlowStart(byIdB.get());
|
|
|
|
+ if (!"200".equals(resMsgFore.getCode())) {
|
|
|
|
+ return resMsgFore;
|
|
|
|
+ }
|
|
|
|
+ byIdB.get().setFlowTaskStatus(FlowTaskStatus.SUBMITTED);
|
|
|
|
+ trafficExpenseMapper.save(byIdB.get());
|
|
|
|
+ break;
|
|
|
|
+ case "餐饮费":
|
|
|
|
+ //餐饮费用申请流程的启动
|
|
|
|
+ RepastExpenseVo saveC = (RepastExpenseVo) infoDetails.getData();
|
|
|
|
+ Optional<RepastExpenseEntity> byIdC = repastExpenseMapper.findById(saveC.getId());
|
|
|
|
+ ResMsg resMsgFive = repastExpenseFlowStart(byIdC.get());
|
|
|
|
+ if (!"200".equals(resMsgFive.getCode())) {
|
|
|
|
+ return resMsgFive;
|
|
|
|
+ }
|
|
|
|
+ byIdC.get().setFlowTaskStatus(FlowTaskStatus.SUBMITTED);
|
|
|
|
+ repastExpenseMapper.save(byIdC.get());
|
|
|
|
+ break;
|
|
|
|
+ case "差旅费":
|
|
|
|
+ //餐饮费用申请流程的启动
|
|
|
|
+ TravelExpenseVo travelExpenseVo = (TravelExpenseVo) infoDetails.getData();
|
|
|
|
+ Optional<TravelExpenseEntity> byIdD = travelExpenseMapper.findById(travelExpenseVo.getId());
|
|
|
|
+ ResMsg resMsgSix = travelExpenseFlowStart(byIdD.get());
|
|
|
|
+ if (!"200".equals(resMsgSix.getCode())) {
|
|
|
|
+ return resMsgSix;
|
|
|
|
+ }
|
|
|
|
+ byIdD.get().setFlowTaskStatus(FlowTaskStatus.SUBMITTED);
|
|
|
|
+ travelExpenseMapper.save(byIdD.get());
|
|
|
|
+ break;
|
|
|
|
+ default:
|
|
|
|
+ // 处理其他情况
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return new ResMsg(CodeEnum.OK);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 查询用户信息
|
|
* 查询用户信息
|
|
*/
|
|
*/
|
|
@@ -1025,4 +1117,5 @@ public class ApplyForCostServiceImpl implements ApplyForCostService {
|
|
Optional<UserInfoEntity> byId = userInfoMapper.findById(userId);
|
|
Optional<UserInfoEntity> byId = userInfoMapper.findById(userId);
|
|
return byId.orElse(null);
|
|
return byId.orElse(null);
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|