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

修改bug

parent 48a3d518
......@@ -36,6 +36,7 @@ import javax.persistence.Query;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
......@@ -395,25 +396,26 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
continue;
}
for (ThirdWorkOrderExportVo kdspOrder : kdspOrders){
ThirdWorkOrderExportVo exportVo = new ThirdWorkOrderExportVo();
BeanUtils.copyProperties(kdspOrder,exportVo);
KdspOrderStatusEnum orderStatusEnum = KdspOrderStatusEnum.getByCode(kdspOrder.getOrderStatus());
if (orderStatusEnum != null){
kdspOrder.setOrderStatusText(orderStatusEnum.getDesc());
}else {
kdspOrder.setOrderStatusText(kdspOrder.getOrderStatus()+"");
}
kdspOrder.setId(dbData.getId());
kdspOrder.setProcessInstanceId(dbData.getProcessInstanceId());
kdspOrder.setCreateUser(dbData.getCreateUser());
kdspOrder.setAcceptUser(dbData.getAcceptUser());
kdspOrder.setStatus(dbData.getStatus());
kdspOrder.setProblemDesc(dbData.getProblemDesc());
kdspOrder.setCreateTime(dbData.getCreateTime());
kdspOrder.setFeedbackChannel(dbData.getFeedbackChannel());
kdspOrder.setQuestionLevel(dbData.getQuestionLevel());
kdspOrder.setCloseTime(dbData.getCloseTime());
exportVo.setId(dbData.getId());
exportVo.setProcessInstanceId(dbData.getProcessInstanceId());
exportVo.setCreateUser(dbData.getCreateUser());
exportVo.setAcceptUser(dbData.getAcceptUser());
exportVo.setStatus(dbData.getStatus());
exportVo.setProblemDesc(dbData.getProblemDesc());
exportVo.setCreateTime(dbData.getCreateTime());
exportVo.setFeedbackChannel(dbData.getFeedbackChannel());
exportVo.setQuestionLevel(dbData.getQuestionLevel());
exportVo.setCloseTime(dbData.getCloseTime());
if ("1919954033167388672".equals(dbData.getOrderNo())){
log.info("工单1919954033167388672数据:"+JSON.toJSONString(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