Commit 630be618 by “zcwang”

modify:导出完善

parent fd0fdb5b
...@@ -207,6 +207,7 @@ public class ChangeFlowExportCallback implements DesCallbackService { ...@@ -207,6 +207,7 @@ public class ChangeFlowExportCallback implements DesCallbackService {
changeFlowExcelDTOList.add(changeFlowExcelDTO); changeFlowExcelDTOList.add(changeFlowExcelDTO);
} }
} }
break;
case SUPPLIER: case SUPPLIER:
// 供应商变更,以行动项循环 // 供应商变更,以行动项循环
for (ChangeExecRecord changeExecRecord : changeExecRecords) { for (ChangeExecRecord changeExecRecord : changeExecRecords) {
...@@ -234,6 +235,7 @@ public class ChangeFlowExportCallback implements DesCallbackService { ...@@ -234,6 +235,7 @@ public class ChangeFlowExportCallback implements DesCallbackService {
: ""); : "");
changeFlowExcelDTOList.add(changeFlowExcelDTO); changeFlowExcelDTOList.add(changeFlowExcelDTO);
} }
break;
case OTHER: case OTHER:
default: default:
// 供应商变更,以行动项循环 // 供应商变更,以行动项循环
...@@ -282,7 +284,8 @@ public class ChangeFlowExportCallback implements DesCallbackService { ...@@ -282,7 +284,8 @@ public class ChangeFlowExportCallback implements DesCallbackService {
changeFlowExcelDTO.setChangeExecRiskDesc(changeExecRecord.getChangeRiskDesc()); changeFlowExcelDTO.setChangeExecRiskDesc(changeExecRecord.getChangeRiskDesc());
changeFlowExcelDTO.setChangeExecProject(changeExecRecord.getChangeExecProject()); changeFlowExcelDTO.setChangeExecProject(changeExecRecord.getChangeExecProject());
changeFlowExcelDTO.setChangeChecking(changeExecRecord.getChangeChecking()); changeFlowExcelDTO.setChangeChecking(changeExecRecord.getChangeChecking());
changeFlowExcelDTO.setChangeExecFinishTime(changeExecRecord.getChangeExecFinishTime()); changeFlowExcelDTO.setChangeExecFinishTime(
DateUtils.parseLongToString(changeExecRecord.getChangeExecFinishTime(), DateUtils.DATE_TIME_FORMAT));
changeFlowExcelDTO.setChangeExecFinishDesc(changeExecRecord.getChangeExecFinishDesc()); changeFlowExcelDTO.setChangeExecFinishDesc(changeExecRecord.getChangeExecFinishDesc());
} }
......
...@@ -198,7 +198,7 @@ public class ChangeFlowExcelDTO { ...@@ -198,7 +198,7 @@ public class ChangeFlowExcelDTO {
* 行动完成时间 * 行动完成时间
*/ */
@Excel(name = "行动完成时间") @Excel(name = "行动完成时间")
private Long changeExecFinishTime; private String changeExecFinishTime;
/** /**
* 行动完成情况 * 行动完成情况
......
...@@ -9,6 +9,7 @@ package com.netease.mail.yanxuan.change.integration.qc; ...@@ -9,6 +9,7 @@ package com.netease.mail.yanxuan.change.integration.qc;
import java.util.List; import java.util.List;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import com.netease.mail.yanxuan.change.common.bean.AjaxResult; import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
...@@ -23,6 +24,6 @@ import com.netease.yanxuan.missa.client.annotation.MissaClient; ...@@ -23,6 +24,6 @@ import com.netease.yanxuan.missa.client.annotation.MissaClient;
@MissaClient(serviceCode = "yanxuan-qc-api") @MissaClient(serviceCode = "yanxuan-qc-api")
public interface QcRpcService { public interface QcRpcService {
@PostMapping("/xhr/item/getQcCategoryListByItemId.json") @GetMapping("/xhr/item/getQcCategoryListByItemId.json")
AjaxResult<List<QcCategoryVO>> getQcCategoryListByItemId(Long itemId); AjaxResult<List<QcCategoryVO>> getQcCategoryListByItemId(Long itemId);
} }
\ No newline at end of file
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