1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -908,7 +908,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
         sheet.setColumnWidth(11, 12 * 256 + 184);
         sheet.setColumnWidth(12, 12 * 256 + 184);
         sheet.setColumnWidth(13, 12 * 256 + 184);
-        sheet.setColumnWidth(14, 1 * 256 + 184);
+        sheet.setColumnWidth(14, 12 * 256 + 184);
+        sheet.setColumnWidth(15, 1 * 256 + 184);
 
         // 创建单元格对象
         HSSFCell cell = null;
@@ -956,6 +957,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
         cell.setCellStyle(styleTitle);
         cell = row0.createCell(13);
         cell.setCellStyle(styleTitle);
+        cell = row0.createCell(14);
+        cell.setCellStyle(styleTitle);
         rownum++;
 
         HSSFRow row1 = sheet.createRow((int) rownum);
@@ -999,6 +1002,9 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
         cell = row1.createCell(13);
         cell.setCellValue("未回款/已付款（元）");
         cell.setCellStyle(styleDetail);
+        cell = row1.createCell(14);
+        cell.setCellValue("已开发票金额（元）");
+        cell.setCellStyle(styleDetail);
 
         rownum++;
 
@@ -1006,6 +1012,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
         if (CollectionUtils.isNotEmpty(contractManagementInfos)) {
             for (int i = 0; i < contractManagementInfos.size(); i++) {
                 ContractManagementInfo contractManagementInfo = contractManagementInfos.get(i);
+                ContractProcessInfo contractProcessInfo = contractProcessInfoService.selectOne(new EntityWrapper<ContractProcessInfo>()
+                .eq("contract_id",contractManagementInfo.getId()));
                 HSSFRow rowx = sheet.createRow((int) rownum);
                 rowx.setHeightInPoints(20);
                 cell = rowx.createCell(1);
@@ -1039,7 +1047,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 cell.setCellValue(editFloat(contractManagementInfo.getCompletedQuantity()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(11);
-                cell.setCellValue(editString(contractManagementInfo.getStatus()));
+                cell.setCellValue(editString(contractManagementInfo.getStatus()!=null?contractManagementInfo.getStatus():contractManagementInfo.getApproveStatus()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(12);
                 cell.setCellValue(DateUtil.formatDate(contractManagementInfo.getSigningDate() != null ? addDateOneDay(contractManagementInfo.getSigningDate()) : addDateOneDay(new Date()), DateUtils.DATE_FMT_YYYY_MM_DD));
@@ -1047,6 +1055,9 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 cell = rowx.createCell(13);
                 cell.setCellValue(editFloat(contractManagementInfo.getMildewGrain()));
                 cell.setCellStyle(styleDetail);
+                cell = rowx.createCell(14);
+                cell.setCellValue(editFloat(Float.valueOf(String.valueOf(contractProcessInfo.getGoodsName()!=null?contractProcessInfo.getGoodsName():"0"))));
+                cell.setCellStyle(styleDetail);
                 rownum++;
             }