diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java index 3412216bf9..fcc9367399 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java @@ -142,4 +142,6 @@ public class ScmSpecialRebateVo implements Vo { private BigDecimal notUploadMoney; @ApiModelProperty("二次核对状态") private String secondCheckState; + @ApiModelProperty("备注") + private String remarks; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml index e53101c5ad..d4722b9c27 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml @@ -8,7 +8,7 @@ expectItureCost + expectTreatCost + expectSuppCost AS expectCost, expectItureCost + expectTreatCost + expectSuppCost AS withholdCost, onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost AS money, - estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney AS notUploadMoney + estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0) AS notUploadMoney FROM scm_special_rebate ${ew.sqlSegment} @@ -129,7 +129,7 @@ *, expectItureCost + expectTreatCost + expectSuppCost AS withholdCost, onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost AS money, - estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney AS notUploadMoney, + estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0) AS notUploadMoney, IF(secondaryUploadMoney > 0 AND isAdjustment = '是','是','否') AS secondCheckState, @row_number := @row_number + 1 AS rankNo FROM scm_special_rebate,( @@ -145,7 +145,7 @@ SELECT *, expectItureCost + expectTreatCost + expectSuppCost AS withholdCost, onceItureCost + onceTreatCost + onceSuppCost AS money, - estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney AS notUploadMoney, + estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0) AS notUploadMoney, IF(secondaryUploadMoney > 0 AND isAdjustment = '是','是','否') AS secondCheckState, IF( uploadDate IS NOT NULL @@ -167,7 +167,7 @@ SELECT *, expectItureCost + expectTreatCost + expectSuppCost AS withholdCost, onceItureCost + onceTreatCost + onceSuppCost AS money, - estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney AS notUploadMoney, + estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0) AS notUploadMoney, IF(secondaryUploadMoney > 0 AND isAdjustment = '是','是','否') AS secondCheckState, IF( uploadDate IS NOT NULL diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java index 94857ed0e0..5a9b2f2dc7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java @@ -64,10 +64,6 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign { @Autowired private ScmSpecialRebateService scmSpecialRebateService; @Autowired - private ScmSpecialRebateWithService scmSpecialRebateWithService; - @Autowired - private ScmSpecialRebateWithApplyService scmSpecialRebateWithApplyService; - @Autowired HttpServletResponse response; @Override @@ -242,7 +238,7 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign { ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(sid); Integer state = scmSpecialRebate.getState(); if (state != 0) { - return rb.setMsg("请选择状态为未预提的记录删除"); + return rb.setMsg("请选择流程状态为未预提的记录删除"); } } scmSpecialRebateService.delBySids(sids); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index 8f70009095..d44428f56f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java @@ -1939,6 +1939,11 @@ public class ScmSpecialRebateService extends MybatisBaseService oneExcelVos = baseMapper.excelListOne(qw); for (OneExcelVo oneExcelVo : oneExcelVos) { oneExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parseDate(oneExcelVo.getCreateTime()))); + if ("1".equals(oneExcelVo.getOnceCheckState())){ + oneExcelVo.setOnceCheckState("是"); + }else { + oneExcelVo.setOnceCheckState("否"); + } } return oneExcelVos; } @@ -2010,6 +2015,11 @@ public class ScmSpecialRebateService extends MybatisBaseService twoExcelVos = baseMapper.excelListTwo(qw); for (TwoExcelVo twoExcelVo : twoExcelVos) { twoExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parseDate(twoExcelVo.getCreateTime()))); + if ("1".equals(twoExcelVo.getOnceCheckState())){ + twoExcelVo.setOnceCheckState("是"); + }else { + twoExcelVo.setOnceCheckState("否"); + } } return twoExcelVos; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml index e44c5fd239..8ff1f2a870 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml @@ -10,7 +10,8 @@ expectTreatCost + expectSuppCost AS expectCost, expectTreatCost + expectSuppCost AS withholdCost, onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money, - estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney AS notUploadMoney + estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0) AS notUploadMoney, + IF(secondaryUploadMoney > 0 AND isAdjustment = '是','是','否') AS secondCheckState FROM scm_veh_rebate @@ -68,7 +69,7 @@ *, expectTreatCost + expectSuppCost AS withholdCost, onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money, - estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney AS notUploadMoney, + estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0) AS notUploadMoney, IF(secondaryUploadMoney > 0 AND isAdjustment = '是','是','否') AS secondCheckState, @row_number := @row_number + 1 AS rankNo FROM @@ -86,14 +87,14 @@ *, expectTreatCost + expectSuppCost AS withholdCost, onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money, - estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney AS notUploadMoney, + estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0) AS notUploadMoney, IF(secondaryUploadMoney > 0 AND isAdjustment = '是','是','否') AS secondCheckState, IF( uploadDate IS NOT NULL AND uploadDate != '', '已上传', '未上传' - ) AS uploadState, + ) AS uploadState, @row_number := @row_number + 1 AS rankNo FROM scm_veh_rebate,( @@ -110,14 +111,14 @@ *, expectTreatCost + expectSuppCost AS withholdCost, onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money, - estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney AS notUploadMoney, + estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0) AS notUploadMoney, IF(secondaryUploadMoney > 0 AND isAdjustment = '是','是','否') AS secondCheckState, IF( uploadDate IS NOT NULL AND uploadDate != '', '已上传', '未上传' - ) AS uploadState, + ) AS uploadState, @row_number := @row_number + 1 AS rankNo FROM scm_veh_rebate,( @@ -168,7 +169,7 @@ expectTreatCost + expectSuppCost AS expectCost, expectTreatCost + expectSuppCost AS withholdCost, onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money, - estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney AS notUploadMoney + estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0) AS notUploadMoney FROM scm_veh_rebate diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java index 168dd88557..3a49b4c8a4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java @@ -148,8 +148,6 @@ public class ScmVehRebateRest implements ScmVehRebateFeign { tempRow.setHeight((short) 500); // 循环单元格填入数据 for (int j = 0; j < 30; j++) { - //列宽自适应，j为自适应的列，true就是自适应，false就是不自适应，默认不自适应 - sheet.autoSizeColumn(j, true); XSSFCell tempCell = tempRow.createCell(j); tempCell.setCellStyle(contentStyle); String tempValue = ""; @@ -246,6 +244,8 @@ public class ScmVehRebateRest implements ScmVehRebateFeign { break; } tempCell.setCellValue(tempValue); + //列宽自适应，j为自适应的列，true就是自适应，false就是不自适应，默认不自适应 + sheet.autoSizeColumn(j, true); } } //导出到浏览器下载 @@ -350,8 +350,6 @@ public class ScmVehRebateRest implements ScmVehRebateFeign { tempRow.setHeight((short) 500); // 循环单元格填入数据 for (int j = 0; j < 26; j++) { - //列宽自适应，j为自适应的列，true就是自适应，false就是不自适应，默认不自适应 - sheet.autoSizeColumn(j, true); XSSFCell tempCell = tempRow.createCell(j); tempCell.setCellStyle(contentStyle); String tempValue = ""; @@ -436,6 +434,8 @@ public class ScmVehRebateRest implements ScmVehRebateFeign { break; } tempCell.setCellValue(tempValue); + //列宽自适应，j为自适应的列，true就是自适应，false就是不自适应，默认不自适应 + sheet.autoSizeColumn(j, true); } } //导出到浏览器下载 @@ -502,8 +502,6 @@ public class ScmVehRebateRest implements ScmVehRebateFeign { tempRow.setHeight((short) 500); // 循环单元格填入数据 for (int j = 0; j < 26; j++) { - //列宽自适应，j为自适应的列，true就是自适应，false就是不自适应，默认不自适应 - sheet.autoSizeColumn(j, true); XSSFCell tempCell = tempRow.createCell(j); tempCell.setCellStyle(contentStyle); String tempValue = ""; @@ -588,6 +586,8 @@ public class ScmVehRebateRest implements ScmVehRebateFeign { break; } tempCell.setCellValue(tempValue); + //列宽自适应，j为自适应的列，true就是自适应，false就是不自适应，默认不自适应 + sheet.autoSizeColumn(j, true); } } //导出到浏览器下载 @@ -633,7 +633,7 @@ public class ScmVehRebateRest implements ScmVehRebateFeign { ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(sid); Integer state = scmVehRebate.getState(); if (state != 0) { - return rb.setMsg("请选择状态为未预提的记录删除"); + return rb.setMsg("请选择流程状态为未预提的记录删除"); } } scmVehRebateService.delBySids(sids); @@ -733,7 +733,6 @@ public class ScmVehRebateRest implements ScmVehRebateFeign { cellStyle.setBorderLeft(BorderStyle.THIN); //左边框 cellStyle.setBorderRight(BorderStyle.THIN); //右边框 cellStyle.setBorderTop(BorderStyle.THIN); //上边框 - // 生成12号字体 XSSFFont font = wb.createFont(); font.setColor((short) 8); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index fa2337e54f..032f3ac981 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -591,6 +591,11 @@ public class ScmVehRebateService extends MybatisBaseService oneExcelVos = baseMapper.excelListOne(qw); for (OneExcelVo oneExcelVo : oneExcelVos) { oneExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parseDate(oneExcelVo.getCreateTime()))); + if ("1".equals(oneExcelVo.getOnceCheckState())){ + oneExcelVo.setOnceCheckState("是"); + }else { + oneExcelVo.setOnceCheckState("否"); + } } return oneExcelVos; } @@ -671,6 +676,11 @@ public class ScmVehRebateService extends MybatisBaseService twoExcelVos = baseMapper.excelListTwo(qw); for (TwoExcelVo twoExcelVo : twoExcelVos) { twoExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parseDate(twoExcelVo.getCreateTime()))); + if ("1".equals(twoExcelVo.getOnceCheckState())){ + twoExcelVo.setOnceCheckState("是"); + }else { + twoExcelVo.setOnceCheckState("否"); + } } return twoExcelVos; }