From 22c17adc3ec2a25e6656cd69961f49a888d433b3 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 28 二月 2024 17:06:19 +0800
Subject: [PATCH] zjh 本地 2024/02/28 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 288 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 203 insertions(+), 85 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index a65cfb6..2bfda41 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -72,8 +72,6 @@
@Resource
private ITjStandardService tjStandardService;
@Resource
- private ITjAdviceService tjAdviceService;
- @Resource
private IDictCompService dictCompService;
@Resource
private ITjReportTemplateService reportTemplateService;
@@ -90,6 +88,43 @@
@Autowired
private ISysDictDataService dictDataService;
+ @Resource
+ private ITbTransitionService transitionService;
+
+ @Autowired
+ private ITjBigPositiveService tjBigPositiveService;
+
+ @GetMapping("/savePdf")
+ @ApiOperation(value = "浠庢湰鍦板瓨鍌ㄦā鏉垮埌鏁版嵁搴�")
+ public AjaxResult savePdf() {
+ //浠庢枃浠跺湴鍧�璇诲叆PDF鏂囦欢 浠呭瓨鍌ㄤ竴娆�
+ String base64String = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\浣撴妯℃澘5.pdf");
+ TjReportTemplate tem = new TjReportTemplate();
+ tem.setName("浣撴鎶ュ憡妯℃澘5");
+ tem.setRemark("浣撴鎶ュ憡妯℃澘5");
+ tem.setTemplate(base64String);
+ tem.setFlag("1");
+ tem.setOpen("0");
+ final boolean save = reportTemplateService.save(tem);
+ if(save){
+ return AjaxResult.success("淇濆瓨鎴愬姛");
+ }
+ return AjaxResult.success("淇濆瓨澶辫触");
+// String base64String2 = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\蹇冪數鍥�1.pdf");
+// TjReport tem2 = new TjReport();
+// tem2.setTjNumber(tjNumber);
+// tem2.setReport(base64String2);
+// tem2.setType("蹇冪數鍥�");
+// tjReportService.save(tem2);
+//
+// String base64String1 = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\闄勪欢2.pdf");
+// TjReport tem1 = new TjReport();
+// tem1.setTjNumber(tjNumber);
+// tem1.setReport(base64String1);
+// tem1.setType("闄勪欢");
+// tjReportService.save(tem1);
+
+ }
// /* *//**
@@ -227,49 +262,15 @@
@Transactional
public AjaxResult toPdf(@PathVariable("TjNumber") @ApiParam(value = "浣撴鍙�") String tjNumber) {
- //浠庢枃浠跺湴鍧�璇诲叆PDF鏂囦欢 浠呭瓨鍌ㄤ竴娆�
- // TODO: 2023/3/21 灏嗘ā鏉夸繚瀛樺埌鏁版嵁搴� 涓�娆′娇鐢ㄥ悗娉ㄩ噴
-// String base64String = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\浣撴妯℃澘4.pdf");
-// TjReportTemplate tem = new TjReportTemplate();
-// tem.setName("浣撴鎶ュ憡妯℃澘4");
-// tem.setRemark("浣撴鎶ュ憡妯℃澘4");
-// tem.setTemplate(base64String);
-// tem.setFlag("1");
-// tem.setOpen("0");
-// reportTemplateService.save(tem);
-// // TODO: 2023/3/21 灏嗗績鐢靛浘淇濆瓨鍒版暟鎹簱 涓�娆′娇鐢ㄥ悗娉ㄩ噴 鏆傛椂鐢ㄤ簬娴嬭瘯
-// String base64String2 = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\蹇冪數鍥�1.pdf");
-// TjReport tem2 = new TjReport();
-// tem2.setTjNumber(tjNumber);
-// tem2.setReport(base64String2);
-// tem2.setType("蹇冪數鍥�");
-// tjReportService.save(tem2);
-//
-// String base64String1 = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\闄勪欢2.pdf");
-// TjReport tem1 = new TjReport();
-// tem1.setTjNumber(tjNumber);
-// tem1.setReport(base64String1);
-// tem1.setType("闄勪欢");
-// tjReportService.save(tem1);
-//
-// String base64String3 = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\鍖诲鍚嶈瘝.pdf");
-// TjReport tem3 = new TjReport();
-// tem3.setTjNumber(tjNumber);
-// tem3.setReport(base64String3);
-// tem3.setType("鍖诲鍚嶈瘝");
-// tjReportService.save(tem3);
-
-
int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
if (num > 0) return AjaxResult.error("鏈夊欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
-
-
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrder::getTjNumber, tjNumber);
TjOrder tjOrder = tjOrderService.getOne(wq);
if (null != tjOrder) {
LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ TjReportTemplate reportTemplate =null;
if (tjOrder.getTjCategory()!=null){
//鏌ヨ瀛楀吀
LambdaQueryWrapper<SysDictData> wqq = new LambdaQueryWrapper<>();
@@ -290,12 +291,13 @@
}else {
tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
}
+ tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
+ reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
+ }else {
+ tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
+ reportTemplate = reportTemplateService.list(tjReportTemplateLambdaQueryWrapper).get(2);
}
-
-
- tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
- TjReportTemplate one1 = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
- String template = one1.getTemplate();
+ String template = reportTemplate.getTemplate();
String userId = SecurityUtils.getLoginUser().getUsername();
PDFBinaryUtil.base64StringToPDF(template, FileUtil.mkdir(value).getPath() + "\\" + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
@@ -403,12 +405,40 @@
data.put("docname", tjOrder.getCheckDoctor());
}
//寮傚父椤圭洰
- data.put("yichang", "銆�1銆戝眻鍏変笉姝n" +
- "銆�2銆戞墎妗冧綋鑲モ激\n" +
- "銆�3銆戜綋閲嶆寚鏁板饩糪n" +
- "銆�4銆戔編鑴傚紓甯革紙鎬昏儐鍥洪唶澧炩炯锛涒舰娌逛笁閰饩硷級\n" +
- "銆�5銆懳�-饩曟皑閰拌浆绉婚叾澧炩炯锛涘ぉ饣斿啲姘ㄩ吀姘ㄥ熀杞Щ閰跺饩硷紱涓欐皑閰告皑鍩鸿浆绉婚叾澧炩炯\n" +
- "銆�6銆戣交饩勪腑搴﹁剛鑲倽");
+// data.put("yichang", "銆�1銆戝眻鍏変笉姝n" +
+// "銆�2銆戞墎妗冧綋鑲モ激\n" +
+// "銆�3銆戜綋閲嶆寚鏁板饩糪n" +
+// "銆�4銆戔編鑴傚紓甯革紙鎬昏儐鍥洪唶澧炩炯锛涒舰娌逛笁閰饩硷級\n" +
+// "銆�5銆懳�-饩曟皑閰拌浆绉婚叾澧炩炯锛涘ぉ饣斿啲姘ㄩ吀姘ㄥ熀杞Щ閰跺饩硷紱涓欐皑閰告皑鍩鸿浆绉婚叾澧炩炯\n" +
+// "銆�6銆戣交饩勪腑搴﹁剛鑲倽");
+
+ //鎷兼帴閲嶅ぇ闃虫�х粨鏋�
+ StringBuffer str=new StringBuffer();
+ str.append("銆愰噸澶ч槼鎬ч」鐩�慭n");
+ LambdaQueryWrapper<TjBigPositive> bigPositiveLambdaQueryWrapper=new LambdaQueryWrapper<>();
+ bigPositiveLambdaQueryWrapper.eq(TjBigPositive::getTjNumber,tjNumber);
+ final List<TjBigPositive> list1 = tjBigPositiveService.list(bigPositiveLambdaQueryWrapper);
+ if(list1!=null&&list1.size()>0){
+ for (int i = 0; i < list1.size(); i++) {
+ str.append((i+1)+"銆�"+list1.get(i).getProName()+";\n");
+ }
+ }else {
+ str.append(" 鏃狅紱\n");
+ }
+ //鎷兼帴寮傚父椤圭洰
+ str.append("銆愬紓甯告儏鍐甸」鐩�慭n");
+ if(list.size()>0){
+ for (int i = 0; i < list.size(); i++) {
+ if (list.get(i).getExceptionDesc()==1){
+ str.append((i+1)+"銆�"+projectService.getById(list.get(i).getProId()).getProName()+";\n");
+ }
+ }
+ }else {
+ str.append(" 鏃狅紱\n");
+ }
+
+ //寮傚父椤圭洰
+ data.put("yichang", str.toString());
// 閬嶅巻data 缁檖df琛ㄥ崟琛ㄦ牸璧嬪��
for (String key : data.keySet()) {
@@ -427,11 +457,11 @@
//璁剧疆鏂囨。鐨勯〉杈硅窛灏辨槸璺濈椤甸潰杈逛笂鐨勮窛绂伙紝鍒嗗埆涓猴細宸﹁竟璺濓紝鍙宠竟璺濓紝涓婅竟璺濓紝涓嬭竟璺�
document.setMargins(70, 70, 40, 40);
//鐢熸垚pdf鐨勪綅缃互鍙婂悕绉�
- String fileName = value + "\\" + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf";
+ String fileName = value + "\\" + userId +tjNumber+ "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf";
OutputStream outputStream = Files.newOutputStream(Paths.get(fileName));
PdfWriter pdfWriter = PdfWriter.getInstance(document, outputStream);
- pdfWriter.setPageEvent(new MyHeaderFooter());// 椤电湁椤佃剼
+ //pdfWriter.setPageEvent(new MyHeaderFooter());// 椤电湁椤佃剼
document.open();
@@ -439,13 +469,20 @@
Map<TjOrderRemark, List<TjPdfVO>> tjOrderRemarkObjectMap = addTable(tjNumber);
+ Map<TjOrderRemark, List<TjPdfVO>> tjOrderRemarkListMap = addHuaYanTable(tjNumber);
+ tjOrderRemarkObjectMap.putAll(tjOrderRemarkListMap);
for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : tjOrderRemarkObjectMap.entrySet()) {
List<TjPdfVO> value = entry.getValue();
LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
wqqq.eq(TjProject::getProId, entry.getKey().getProId());
TjProject one11 = projectService.getOne(wqqq);
- if ("1".equals(one11.getProCheckMethod())) {
- String titleName = one11.getProName();
+ //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
+ if (null !=one11 && "N".equals(one11.getNeedReport())){
+ continue;
+ }
+ String titleName =null;
+ if (null !=one11 && "1".equals(one11.getResultType())) {
+ titleName =one11.getProName();
// 璁剧疆鏍囬瀛椾綋鏍峰紡
Font titleFonts = PdfUtils.setFont(9);
Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
@@ -509,7 +546,12 @@
LineSeparator objectName = new LineSeparator();
document.add(objectName);
} else {
- String titleName = one11.getProName();
+ if(null !=one11){
+ titleName = one11.getProName();
+ }else {
+ titleName = entry.getKey().getProName();
+ }
+
// 璁剧疆鏍囬瀛椾綋鏍峰紡
Font titleFonts = PdfUtils.setFont(9);
Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
@@ -576,31 +618,50 @@
pdfWriter.close();
outputStream.close();
- // TODO: 2023/3/29 鏌ヨ闄勪欢pdf 濡傚績鐢靛浘銆侀檮浠�
- LambdaQueryWrapper<TjReport> rtwq1 = new LambdaQueryWrapper<>();
- rtwq1.eq(TjReport::getType, "鍖诲鍚嶈瘝");
-// rtwq1.eq(TjReport::getTjNumber, tjNumber);
- TjReport one11111 = tjReportService.getOne(rtwq1);
- String report1 = one11111.getReport();
- PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + "\\" + userId + "鍖诲鍚嶈瘝.pdf");
+// LambdaQueryWrapper<TjReport> rtwq1 = new LambdaQueryWrapper<>();
+// rtwq1.eq(TjReport::getType, "鍖诲鍚嶈瘝");
+//// rtwq1.eq(TjReport::getTjNumber, tjNumber);
+// TjReport one11111 = tjReportService.getOne(rtwq1);
+// if(null !=one11111){
+// String report1 = one11111.getReport();
+// PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + "\\" + userId + "鍖诲鍚嶈瘝.pdf");
+// }
LambdaQueryWrapper<TjReport> rtwq = new LambdaQueryWrapper<>();
rtwq.eq(TjReport::getType, "蹇冪數鍥�");
-// rtwq.eq(TjReport::getTjNumber, tjNumber);
+ rtwq.eq(TjReport::getTjNumber, tjNumber);
TjReport one1111 = tjReportService.getOne(rtwq);
- String report = one1111.getReport();
- PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + "\\" + userId + "蹇冪數鍥�.pdf");
+ if(null !=one1111){
+ String report = one1111.getReport();
+ PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + "\\" +tjNumber+ userId + "蹇冪數鍥�.pdf");
+ }
LambdaQueryWrapper<TjReport> rtwq12 = new LambdaQueryWrapper<>();
rtwq12.eq(TjReport::getType, "闄勪欢");
-// rtwq12.eq(TjReport::getTjNumber, tjNumber);
+ rtwq12.eq(TjReport::getTjNumber, tjNumber);
TjReport one111112 = tjReportService.getOne(rtwq12);
- String report12 = one111112.getReport();
- PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + "\\" + userId + "闄勪欢.pdf");
-
+ if(null !=one111112){
+ String report12 = one111112.getReport();
+ PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + "\\" +tjNumber+ userId + "闄勪欢.pdf");
+ }
//鍚堝苟
- String[] files1 = {value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + "\\" + userId + "鍖诲鍚嶈瘝.pdf", value + "\\" + userId + "闄勪欢.pdf", value + "\\" + userId + "蹇冪數鍥�.pdf"};
+ String[] files1=null;
+ if (one1111!=null ){
+ if (one111112!=null){
+ files1 = new String[ ]{value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + "\\" + tjNumber + userId + "闄勪欢.pdf", value + "\\" + tjNumber + userId + "蹇冪數鍥�.pdf"};
+ }else {
+ files1 = new String[]{value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf",value + "\\" + tjNumber + userId + "蹇冪數鍥�.pdf"};
+ }
+ }else {
+ if (one111112!=null){
+ files1 = new String[]{value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + "\\" + tjNumber + userId + "闄勪欢.pdf"};
+ }else {
+ files1 = new String[]{value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + tjNumber + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf"};
+ }
+ }
+ //鍚堝苟
+// String[] files1 = {value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + tjNumber+"浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + "\\" +tjNumber+ userId + "闄勪欢.pdf", value + "\\" + tjNumber + userId + "蹇冪數鍥�.pdf"};
String outputPath1 = value + "\\";
String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
@@ -619,10 +680,9 @@
tjReport.setType("浣撴鎶ュ憡");
tjReportService.save(tjReport);
- //TODO 2023/2/3 16:21 鐢熸垚浣撴鎶ュ憡pdf鍚庡垹闄ゆ湰鍦版枃浠�
//FileUtil.del(value + "\\" + tjNumber + "浣撴鎶ュ憡.pdf");
//FileUtil.del(value + "\\" + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
- //FileUtil.del(value + "\\" + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf");
+ //FileUtil.del(value + "\\" + userId +tjNumber+ "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf");
//FileUtil.del(value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf");
//FileUtil.del(value + "\\" + userId + "蹇冪數鍥�.pdf");
@@ -641,12 +701,14 @@
} catch (Exception e) {
e.printStackTrace();
return AjaxResult.success("PDF瀵煎嚭澶辫触");
+ }finally {
+ transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(),tjOrder.getCardId());
}
}
}
return AjaxResult.success("璇ョ敤鎴蜂綋妫�鏈畬鎴愶紝涓嶈兘鎵撳嵃鎶ュ憡锛侊紒锛�");
}
-
+ //闈炲寲楠岄」鐩姤鍛�
public Map<TjOrderRemark, List<TjPdfVO>> addTable(String tjNumber) {
//鍒涘缓map 閿负鐖堕」鐩� 鍊间负瀛愰」鐩泦鍚�
Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
@@ -661,6 +723,7 @@
wq.eq(TjOrderDetail::getOrderId, one.getOrderId());
//20230323鍒ゆ柇椤圭洰宸叉
wq.ne(TjOrderDetail::getTjStatus, 0);
+ wq.ne(TjOrderDetail::getProId,projectService.getHuaYanProId());
List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);
//閬嶅巻浣撴璁板綍 灏嗛」鐩殑鍏蜂綋淇℃伅
@@ -677,21 +740,82 @@
TjCustomer customer = tjCustomerService.getOne(wq22);
LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
+ wqq.ne(TjOrderRemark::getDeptId,"241");
List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
- printReport.put(tjOrderRemark, null);
+
+ printReport.put(tjOrderRemark,null);
}
+ extracted(printReport, tjOrderDetails, customer);
+ return printReport;
+ }
+
+
+ //鍖栭獙椤圭洰鎶ュ憡
+ public Map<TjOrderRemark, List<TjPdfVO>> addHuaYanTable(String tjNumber) {
+ //鍒涘缓map 閿负鐖堕」鐩� 鍊间负瀛愰」鐩泦鍚�
+ Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
+ //鏌ュ埌璇ュ鎴风殑浣撴璁板綍
+// LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
+// wq1.eq(TjOrder::getTjNumber, tjNumber);
+// TjOrder one = tjOrderService.getOne(wq1);
+
+ //鎷垮埌浣撴璁板綍鐨刼rderid锛屾煡鍑洪」鐩缁嗕俊鎭�
+// LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjOrderDetail::getOrderId, one.getOrderId());
+// //20230323鍒ゆ柇椤圭洰宸叉
+// wq.ne(TjOrderDetail::getTjStatus, 0);
+// wq.eq(TjOrderDetail::getProId,projectService.getHuaYanProId());
+// List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);
+ List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.addHuaYanTable(tjNumber);
+ //閬嶅巻浣撴璁板綍 灏嗛」鐩殑鍏蜂綋淇℃伅
+ //閬嶅巻瀹㈡埛鎵�閫夌殑椤圭洰(鍖呭惈瀛愰」鐖堕」)
+// for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+// TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
+// if (null != tjProject) {
+// tjOrderDetail.setProject(tjProject);
+// }
+// }
+
+// LambdaQueryWrapper<TjCustomer> wq22 = new LambdaQueryWrapper<>();
+// wq22.eq(TjCustomer::getCusId, one.getUserId());
+// TjCustomer customer = tjCustomerService.getOne(wq22);
+// LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
+// wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
+// wqq.eq(TjOrderRemark::getDeptId,"241");
+// List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
+ List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.addHuaYanTable(tjNumber);
+
+ for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
+ printReport.put(tjOrderRemark,null);
+ }
+ for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
+ List<TjPdfVO> tjPdfVOS = new ArrayList<>();
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ if(entry.getKey().getProId().equals(tjOrderDetail.getProId())){
+ TjPdfVO tjPdfVO = new TjPdfVO();
+ tjPdfVO.setProName(tjOrderDetail.getProName());
+ tjPdfVO.setProResult(tjOrderDetail.getProResult());
+ tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
+ tjPdfVO.setStandardValue(tjOrderDetail.getStanId());
+ tjPdfVOS.add(tjPdfVO);
+ }
+ }
+ printReport.put(entry.getKey(), tjPdfVOS);
+ }
+ return printReport;
+ }
+
+ private void extracted(Map<TjOrderRemark, List<TjPdfVO>> printReport, List<TjOrderDetail> tjOrderDetails, TjCustomer customer) {
for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
List<TjPdfVO> tjPdfVOS = new ArrayList<>();
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (null == tjOrderDetail.getProject()) {
System.out.println("'''''''''''''''''''''''''''''''''''" + tjOrderDetail.getOrderDetailId());
}
-
if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())) {
-
LambdaQueryWrapper<TjStandard> wq6 = new LambdaQueryWrapper<>();
wq6.eq(TjStandard::getProId, tjOrderDetail.getProId());
List<TjStandard> list2 = tjStandardService.list(wq6);
@@ -746,7 +870,6 @@
}
printReport.put(entry.getKey(), tjPdfVOS);
}
- return printReport;
}
@@ -1378,25 +1501,20 @@
LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
wqq.like(TjOrder::getUserId, cusId);
List<TjOrder> orderList = tjOrderService.list(wqq);
- if (orderList!=null){
+ if (orderList!=null && orderList.size()>0){
for (TjOrder tjOrder : orderList) {
if (tjOrder!=null){
LambdaQueryWrapper<TjReport> wq = new LambdaQueryWrapper<>();
wq.eq(TjReport::getTjNumber, tjOrder.getTjNumber());
wq.eq(TjReport::getType,"浣撴鎶ュ憡");
- res.add(tjReportService.getOne(wq));
+ TjReport one = tjReportService.getOne(wq);
+ if(null !=one){
+ res.add(one);
+ }
}
}
return AjaxResult.success(res);
}
return AjaxResult.error("鏆傛棤鍘嗗彶鎶ュ憡");
}
-
-
-
-
-
-
-
-
}
--
Gitblit v1.8.0