Commit 4d77abd5 authored by yajun.zhang's avatar yajun.zhang

修改bug

parent 48a3d518
...@@ -36,6 +36,7 @@ import javax.persistence.Query; ...@@ -36,6 +36,7 @@ import javax.persistence.Query;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
...@@ -395,25 +396,26 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService { ...@@ -395,25 +396,26 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
continue; continue;
} }
for (ThirdWorkOrderExportVo kdspOrder : kdspOrders){ for (ThirdWorkOrderExportVo kdspOrder : kdspOrders){
ThirdWorkOrderExportVo exportVo = new ThirdWorkOrderExportVo();
BeanUtils.copyProperties(kdspOrder,exportVo);
KdspOrderStatusEnum orderStatusEnum = KdspOrderStatusEnum.getByCode(kdspOrder.getOrderStatus()); KdspOrderStatusEnum orderStatusEnum = KdspOrderStatusEnum.getByCode(kdspOrder.getOrderStatus());
if (orderStatusEnum != null){ if (orderStatusEnum != null){
kdspOrder.setOrderStatusText(orderStatusEnum.getDesc()); kdspOrder.setOrderStatusText(orderStatusEnum.getDesc());
}else { }else {
kdspOrder.setOrderStatusText(kdspOrder.getOrderStatus()+""); kdspOrder.setOrderStatusText(kdspOrder.getOrderStatus()+"");
} }
kdspOrder.setId(dbData.getId()); exportVo.setId(dbData.getId());
kdspOrder.setProcessInstanceId(dbData.getProcessInstanceId()); exportVo.setProcessInstanceId(dbData.getProcessInstanceId());
kdspOrder.setCreateUser(dbData.getCreateUser()); exportVo.setCreateUser(dbData.getCreateUser());
kdspOrder.setAcceptUser(dbData.getAcceptUser()); exportVo.setAcceptUser(dbData.getAcceptUser());
kdspOrder.setStatus(dbData.getStatus()); exportVo.setStatus(dbData.getStatus());
kdspOrder.setProblemDesc(dbData.getProblemDesc()); exportVo.setProblemDesc(dbData.getProblemDesc());
kdspOrder.setCreateTime(dbData.getCreateTime()); exportVo.setCreateTime(dbData.getCreateTime());
kdspOrder.setFeedbackChannel(dbData.getFeedbackChannel()); exportVo.setFeedbackChannel(dbData.getFeedbackChannel());
kdspOrder.setQuestionLevel(dbData.getQuestionLevel()); exportVo.setQuestionLevel(dbData.getQuestionLevel());
kdspOrder.setCloseTime(dbData.getCloseTime()); exportVo.setCloseTime(dbData.getCloseTime());
if ("1919954033167388672".equals(dbData.getOrderNo())){ if ("1919954033167388672".equals(dbData.getOrderNo())){
log.info("工单1919954033167388672数据:"+JSON.toJSONString(kdspOrder)); log.info("工单1919954033167388672数据:"+JSON.toJSONString(kdspOrder));
} }
exportVos.add(kdspOrder); exportVos.add(kdspOrder);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment