From 3cf1435a6e6e87e9c2b7dccfb872ac208298a1d1 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Thu, 23 Jan 2025 17:51:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?i=E7=9A=96=E9=80=81=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IwsCostPushController.java | 16 ++++++++ .../material/push/domain/IwsCostPushBean.java | 8 ++++ .../push/mapper/IwsCostPushMapper.java | 5 +++ .../push/service/IwsCostPushService.java | 5 +++ .../service/impl/IwsCostPushServiceImpl.java | 8 ++++ .../material/push/IwsCostPushMapper.xml | 37 +++++++++++++++++++ 6 files changed, 79 insertions(+) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java index 2789ead7..a7cbba2f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java @@ -6,10 +6,13 @@ import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.material.push.domain.IwsCostPushBean; import com.bonus.material.push.service.IwsCostPushService; import io.swagger.annotations.ApiOperation; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -21,6 +24,7 @@ import java.util.List; */ @RestController @RequestMapping("/iws_cost_push") +@Validated public class IwsCostPushController extends BaseController { @Resource @@ -51,4 +55,16 @@ public class IwsCostPushController extends BaseController { } + /** + * 查询费用推送审核列表 + * @param obj 查询条件 + */ + @GetMapping("/getCostPushCheckList") + @ApiOperation("查询费用推送审核列表--分页") + public TableDataInfo getCostPushCheckList(@NotNull @Valid IwsCostPushBean obj) { + startPage(); + List list = iwsCostPushService.getCostPushCheckList(obj); + return getDataTable(list); + } + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java index dc8bfd03..2267b08c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java @@ -2,8 +2,11 @@ package com.bonus.material.push.domain; import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; import java.io.Serializable; import java.time.LocalDateTime; import java.util.List; @@ -65,6 +68,8 @@ public class IwsCostPushBean implements Serializable { private String time; + // 月份 + @NotBlank(message = "月份不能为空") private String month; private String type; @@ -96,6 +101,9 @@ public class IwsCostPushBean implements Serializable { private List ids; + @ApiModelProperty(value = "审核状态") + private Byte checkStatus; + // 推送备注 private String pushRemark; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/IwsCostPushMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/IwsCostPushMapper.java index 8a2e83c2..14324a09 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/IwsCostPushMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/IwsCostPushMapper.java @@ -24,4 +24,9 @@ public interface IwsCostPushMapper { * 更新协议push状态 */ int updateAgreementIsPush(IwsCostPushBean o); + + /** + * 查询费用推送审核数据列表 + */ + List getCostPushCheckList(IwsCostPushBean o); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/IwsCostPushService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/IwsCostPushService.java index 3f5ec855..115b512f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/IwsCostPushService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/IwsCostPushService.java @@ -18,4 +18,9 @@ public interface IwsCostPushService { */ List findAgreement(IwsCostPushBean o); + + /** + * 查询费用推送审核数据列表 + */ + List getCostPushCheckList(IwsCostPushBean o); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/IwsCostPushServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/IwsCostPushServiceImpl.java index 07ae8fd1..7a94e1c0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/IwsCostPushServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/IwsCostPushServiceImpl.java @@ -33,4 +33,12 @@ public class IwsCostPushServiceImpl implements IwsCostPushService { public List findAgreement(IwsCostPushBean o) { return iwsCostPushMapper.findAgreement(o); } + + /** + * 查询费用推送审核数据列表 + */ + @Override + public List getCostPushCheckList(IwsCostPushBean o) { + return iwsCostPushMapper.getCostPushCheckList(o); + } } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml index 04cbf726..801b003b 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml @@ -44,4 +44,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + \ No newline at end of file From 965b23e254d36a26560deedafe2b095ed33382e7 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Fri, 24 Jan 2025 15:08:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=9F=E8=B5=81=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AF=B9=E4=BA=8E=E6=97=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9A=84=E5=A2=9E=E5=8A=A0=E8=A1=8C=EF=BC=8Ci=E7=9A=96?= =?UTF-8?q?=E9=80=81ruan=E4=BF=AE=E6=94=B9=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/common/biz/config/PoiOutPage.java | 65 +++++++++++++++++-- .../controller/IwsCostPushController.java | 2 +- .../material/push/IwsCostPushMapper.xml | 2 +- 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java index 061fb7c1..b1c6fe14 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java @@ -231,7 +231,18 @@ public class PoiOutPage { } else { // 如果没有数据，则仅显示表头 // rowNum++; - rowNum = createDataRows(sheet, rowNum, result, contentStyle, list.size()); +// rowNum = createDataRows(sheet, rowNum, result, contentStyle, list.size()); + HSSFRow row = sheet.createRow(rowNum++); + HSSFCell cell = row.createCell(0); + cell.setCellStyle(headerStyle); + cell.setCellValue("暂无数据"); + sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (list.size() - 1))); + CellRangeAddress cellRange = new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (list.size() - 1)); + // 设置边框样式 + RegionUtil.setBorderTop(BorderStyle.THIN, cellRange, sheet); + RegionUtil.setBorderBottom(BorderStyle.THIN, cellRange, sheet); + RegionUtil.setBorderLeft(BorderStyle.THIN, cellRange, sheet); + RegionUtil.setBorderRight(BorderStyle.THIN, cellRange, sheet); } rowNum = createTotalRow(sheet, rowNum, list, totalCost, headerStyle); return workbook; @@ -271,7 +282,18 @@ public class PoiOutPage { } else { // 如果没有数据，则仅显示表头 // rowNum++; - rowNum = createDataRows(sheet, rowNum, resultLease, contentStyle, listLease.size()); +// rowNum = createDataRows(sheet, rowNum, resultLease, contentStyle, listLease.size()); + HSSFRow row = sheet.createRow(rowNum++); + HSSFCell cell = row.createCell(0); + cell.setCellStyle(headerStyle); + cell.setCellValue("暂无数据"); + sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listLease.size() - 1))); + CellRangeAddress cellRange = new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listLease.size() - 1)); + // 设置边框样式 + RegionUtil.setBorderTop(BorderStyle.THIN, cellRange, sheet); + RegionUtil.setBorderBottom(BorderStyle.THIN, cellRange, sheet); + RegionUtil.setBorderLeft(BorderStyle.THIN, cellRange, sheet); + RegionUtil.setBorderRight(BorderStyle.THIN, cellRange, sheet); } rowNum = createTotalRow(sheet, rowNum, listLease, totalCostLease, headerStyle); @@ -288,7 +310,18 @@ public class PoiOutPage { } else { // 如果没有数据，则仅显示表头 // rowNum++; - rowNum = createDataRows(sheet, rowNum, resultRepair, contentStyle, listRepair.size()); +// rowNum = createDataRows(sheet, rowNum, resultRepair, contentStyle, listRepair.size()); + HSSFRow row = sheet.createRow(rowNum++); + HSSFCell cell = row.createCell(0); + cell.setCellStyle(headerStyle); + cell.setCellValue("暂无数据"); + sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listRepair.size() - 1))); + CellRangeAddress cellRange = new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listRepair.size() - 1)); + // 设置边框样式 + RegionUtil.setBorderTop(BorderStyle.THIN, cellRange, sheet); + RegionUtil.setBorderBottom(BorderStyle.THIN, cellRange, sheet); + RegionUtil.setBorderLeft(BorderStyle.THIN, cellRange, sheet); + RegionUtil.setBorderRight(BorderStyle.THIN, cellRange, sheet); } rowNum = createTotalRow(sheet, rowNum, listRepair, totalCostRepair, headerStyle); @@ -305,7 +338,18 @@ public class PoiOutPage { } else { // 如果没有数据，则仅显示表头 // rowNum++; - rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size()); +// rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size()); + HSSFRow row = sheet.createRow(rowNum++); + HSSFCell cell = row.createCell(0); + cell.setCellStyle(headerStyle); + cell.setCellValue("暂无数据"); + sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listScrap.size() - 1))); + CellRangeAddress cellRange = new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listScrap.size() - 1)); + // 设置边框样式 + RegionUtil.setBorderTop(BorderStyle.THIN, cellRange, sheet); + RegionUtil.setBorderBottom(BorderStyle.THIN, cellRange, sheet); + RegionUtil.setBorderLeft(BorderStyle.THIN, cellRange, sheet); + RegionUtil.setBorderRight(BorderStyle.THIN, cellRange, sheet); } rowNum = createTotalRow(sheet, rowNum, listScrap, totalCostScrap, headerStyle); @@ -322,7 +366,18 @@ public class PoiOutPage { } else { // 如果没有数据，则仅显示表头 // rowNum++; - rowNum = createDataRows(sheet, rowNum, resultLose, contentStyle, listLose.size()); +// rowNum = createDataRows(sheet, rowNum, resultLose, contentStyle, listLose.size()); + HSSFRow row = sheet.createRow(rowNum++); + HSSFCell cell = row.createCell(0); + cell.setCellStyle(headerStyle); + cell.setCellValue("暂无数据"); + sheet.addMergedRegion(new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listLose.size() - 1))); + CellRangeAddress cellRange = new CellRangeAddress(rowNum - 1, rowNum - 1, 0, (short) (listLose.size() - 1)); + // 设置边框样式 + RegionUtil.setBorderTop(BorderStyle.THIN, cellRange, sheet); + RegionUtil.setBorderBottom(BorderStyle.THIN, cellRange, sheet); + RegionUtil.setBorderLeft(BorderStyle.THIN, cellRange, sheet); + RegionUtil.setBorderRight(BorderStyle.THIN, cellRange, sheet); } rowNum = createTotalRow(sheet, rowNum, listLose, totalCostLose, headerStyle); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java index a7cbba2f..b4639789 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java @@ -61,7 +61,7 @@ public class IwsCostPushController extends BaseController { */ @GetMapping("/getCostPushCheckList") @ApiOperation("查询费用推送审核列表--分页") - public TableDataInfo getCostPushCheckList(@NotNull @Valid IwsCostPushBean obj) { + public TableDataInfo getCostPushCheckList(IwsCostPushBean obj) { startPage(); List list = iwsCostPushService.getCostPushCheckList(obj); return getDataTable(list); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml index 801b003b..a9c4a420 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml @@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT pmc.id AS id, pmc.AGREEMENT_ID AS agreementId, IF(ISNULL(pmc.check_status), 0, pmc.check_status) AS checkStatus, pmc.LEASE_MONEY AS leaseMoney, pmc.LOST_MONEY AS lostMoney, pmc.REPAIR_MONEY AS repairMoney, pmc.SCRAP_MONEY AS scrapMoney, - bma.agreement_code AS agreementCode, IF(bma.is_slt = 1, '已结算', '未结算') AS isSettlement, + bma.agreement_code AS agreementCode, bma.is_slt AS isSettlement, bp.pro_name AS projectName, bu.unit_name AS unitName, ROUND(