From 3eeb0b4bbd2d2cef9495b69a7cdba55d7d1d26f7 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 5 Aug 2024 08:33:33 +0800 Subject: [PATCH] fix --- .../market/WxFinanceController.java | 27 ++++++++++++++++++ .../controller/rent/WxAllBillController.java | 4 ++- .../db/migration/V202408000000001.sql | 2 ++ .../domain/po/WxFinancePrintData.java | 2 ++ .../domain/po/WxFinancePrintTemplate.java | 3 ++ .../com/iformall/enums/EnumBillAllType.java | 28 +++++++++++-------- .../mapper/WxFinancePrintTemplateMapper.java | 2 -- .../iformall/service/WxFinanceService.java | 11 ++++++++ .../service/impl/WxFinanceServiceImpl.java | 17 +++++++++++ .../mapper/WxFinancePrintDataMapper.xml | 5 ++++ .../mapper/WxFinancePrintTemplateMapper.xml | 11 ++------ 11 files changed, 90 insertions(+), 22 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index 035a5308d..e0a8053f8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -2,6 +2,7 @@ package com.iformall.controller.market; import com.aliyun.openservices.shade.com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; +import com.iformall.annotation.TenantIgnore; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; @@ -9,6 +10,8 @@ import com.iformall.domain.dto.FinanceSetOffDTO; import com.iformall.domain.po.WxAllBill; import com.iformall.domain.po.WxBillPayWay; import com.iformall.domain.po.WxEnergyFees; +import com.iformall.domain.po.WxFinancePrintData; +import com.iformall.domain.po.WxFinancePrintTemplate; import com.iformall.domain.po.WxFinanceReceive; import com.iformall.domain.po.WxFinanceReceiveSetoff; import com.iformall.domain.po.base.BaseEntity; @@ -313,4 +316,28 @@ public class WxFinanceController extends BaseController { return new ResultData(); } + @ApiOperation("打印项列表") + @GetMapping("printDatas") + @TenantIgnore + public ResultData printDatas(@ModelAttribute WxFinancePrintData record) { + record.setSortColumns("sort asc"); + return new ResultData(wxFinanceService.printDataList(record)); + } + + @ApiOperation("打印项列表") + @GetMapping("printTemplates") + @TenantIgnore + public ResultData printTemplates(@ModelAttribute WxFinancePrintTemplate record) { + record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); + return new ResultData(wxFinanceService.printTemplateList(record)); + } + + @ApiOperation("打印项列表") + @GetMapping("templateDetail") + @TenantIgnore + public ResultData templateDetail(@ModelAttribute WxFinancePrintTemplate record) { + record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); + return new ResultData(wxFinanceService.getTemplateById(record.getId())); + } + } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index 5694557cd..7a7be7848 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -225,7 +225,9 @@ public class WxAllBillController extends BillBaseController { public ResultData billTypes() { Map tmap = new HashMap(); for (EnumBillAllType t : EnumBillAllType.values()) { - tmap.put(t.getCode(), t.getMessage()); + if (t.isShow()) { + tmap.put(t.getCode(), t.getMessage()); + } } return new ResultData(tmap); } diff --git a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql index 8a61fafeb..2ea32edba 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql @@ -150,6 +150,7 @@ CREATE TABLE `wx_finance_print_data` ( `is_del` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL, `remark` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注', `type` int(1) NOT NULL COMMENT '类型', + `sort` int(1) NOT NULL DEFAULT '0' COMMENT '排序', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='租赁合同'; @@ -162,6 +163,7 @@ CREATE TABLE `wx_finance_print_template` ( `name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '模板名称', `is_del` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL, `content` text COLLATE utf8mb4_unicode_ci COMMENT '内容', + `type` int(1) NOT NULL COMMENT '类型', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='租赁合同'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintData.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintData.java index 02def4956..a4e6e36b1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintData.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintData.java @@ -25,4 +25,6 @@ public class WxFinancePrintData extends BaseEntity { private String remark; @io.swagger.annotations.ApiModelProperty(value="EnumFinancePrintDataType",name="type") private Integer type; + @io.swagger.annotations.ApiModelProperty(value="排序",name="sort") + private Integer sort; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java index 75a841bc7..b324fd661 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java @@ -33,6 +33,9 @@ public class WxFinancePrintTemplate extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "isDel", name = "isDel") private Integer isDel; + @io.swagger.annotations.ApiModelProperty(value = "EnumFinancePrintDataType", name = "type") + private Integer type; + @io.swagger.annotations.ApiModelProperty(value = "单价", name = "content") private String content; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java index da18cddf2..2c994115f 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java @@ -5,16 +5,16 @@ import java.util.List; public enum EnumBillAllType { - RENT(1,"租金",1L,false), - RENT_BUSSINESS_MANAGE(11,"商业管理费",2L,false), - RENT_OPERATION_MANAGE(12,"运营管理费",3L,false), - RENT_DEPOSIT(13,"租赁押金",null,true), - PROPERTY(2,"物业",5L,false), - PROPERTY_DEPOSIT(21,"物业押金",6L,true), - DAILY(3, "能耗(水电空调)费",null,false), - OTHER(4, "其他费用",null,false), - OTHER_DEPOSIT(5, "其他押金",null,true), - ADVANCE(6,"预收",null,true) + RENT(1,"租金",1L,false,true), + RENT_BUSSINESS_MANAGE(11,"商业管理费",2L,false,true), + RENT_OPERATION_MANAGE(12,"运营管理费",3L,false,true), + RENT_DEPOSIT(13,"租赁押金",null,true,true), + PROPERTY(2,"物业",5L,false,true), + PROPERTY_DEPOSIT(21,"物业押金",6L,true,true), + DAILY(3, "能耗(水电空调)费",null,false,true), + OTHER(4, "其他费用",null,false,true), + OTHER_DEPOSIT(5, "其他押金",null,true,true), + ADVANCE(6,"预收",null,true,false)//没有形成真正的账单 ; public static EnumBillAllType getEnum(Integer code) { @@ -30,12 +30,14 @@ public enum EnumBillAllType { private String message; private Long energyFeesId;//wx_energy_fees(费用科目)里的id,不可配置的有这个 private boolean isFixedPrice;//是否强制为一次性费用 + private boolean isShow;//是否显示为查询条件 - EnumBillAllType(Integer code, String message,Long energyFeesId,boolean isFixedPrice) { + EnumBillAllType(Integer code, String message,Long energyFeesId,boolean isFixedPrice,boolean isShow) { this.code = code; this.message = message; this.energyFeesId = energyFeesId; this.isFixedPrice = isFixedPrice; + this.isShow = isShow; } public Integer getCode() { @@ -53,6 +55,10 @@ public enum EnumBillAllType { public boolean isFixedPrice() { return isFixedPrice; } + + public boolean isShow() { + return isShow; + } public static EnumBillAllType[] getSystemTypes() { EnumBillAllType[] ret = new EnumBillAllType[] {RENT,RENT_BUSSINESS_MANAGE,RENT_OPERATION_MANAGE, diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFinancePrintTemplateMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFinancePrintTemplateMapper.java index 8b4517ba6..de1c61398 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxFinancePrintTemplateMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFinancePrintTemplateMapper.java @@ -12,8 +12,6 @@ public interface WxFinancePrintTemplateMapper extends CommonMapper findList(WxFinancePrintTemplate wxBillRent); - WxFinancePrintTemplate selectById(@Param("id")Long id,@Param("tenantId")String tenantId); - void setIsDel(@Param("id")Long id,@Param("tenantId")String tenantId,@Param("isDel")Integer isDel); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index 85c749033..e8107494c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -7,6 +7,8 @@ import com.iformall.domain.dto.FinanceSetOffDTO; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxAllBill; import com.iformall.domain.po.WxBillPayWay; +import com.iformall.domain.po.WxFinancePrintData; +import com.iformall.domain.po.WxFinancePrintTemplate; import com.iformall.domain.po.WxFinanceReceive; import com.iformall.domain.po.WxFinanceReceiveBill; import com.iformall.domain.po.WxFinanceReceiveSetoff; @@ -39,4 +41,13 @@ public interface WxFinanceService { void createAdvance(WxFinanceReceive record,MallUserInfo user); PageInfo receiveSetoffListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize); + + + + + + //打印 + List printDataList(WxFinancePrintData record); + List printTemplateList(WxFinancePrintTemplate record); + WxFinancePrintTemplate getTemplateById(Long id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index e82ec67db..5d5aef099 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -15,6 +15,8 @@ import com.iformall.domain.po.WxAllBill; import com.iformall.domain.po.WxBillPayWay; import com.iformall.domain.po.WxEnergyFees; import com.iformall.domain.po.WxEnergyFeesSetoff; +import com.iformall.domain.po.WxFinancePrintData; +import com.iformall.domain.po.WxFinancePrintTemplate; import com.iformall.domain.po.WxFinanceReceive; import com.iformall.domain.po.WxFinanceReceiveBill; import com.iformall.domain.po.WxFinanceReceivePayway; @@ -854,6 +856,21 @@ public class WxFinanceServiceImpl implements WxFinanceService { return page; } + @Override + public List printDataList(WxFinancePrintData record) { + return wxFinancePrintDataMapper.findList(record); + } + + @Override + public List printTemplateList(WxFinancePrintTemplate record) { + return wxFinancePrintTemplateMapper.findList(record); + } + + @Override + public WxFinancePrintTemplate getTemplateById(Long id) { + return wxFinancePrintTemplateMapper.selectById(id); + } + diff --git a/mallinkService/src/main/resources/mapper/WxFinancePrintDataMapper.xml b/mallinkService/src/main/resources/mapper/WxFinancePrintDataMapper.xml index 42fd7e9ae..fc60e1107 100644 --- a/mallinkService/src/main/resources/mapper/WxFinancePrintDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinancePrintDataMapper.xml @@ -7,6 +7,7 @@ + @@ -31,6 +32,10 @@ and `type` = #{type} + + + and `sort` = #{sort} + and id in diff --git a/mallinkService/src/main/resources/mapper/WxFinancePrintTemplateMapper.xml b/mallinkService/src/main/resources/mapper/WxFinancePrintTemplateMapper.xml index 3eb5146ef..6f25bf241 100644 --- a/mallinkService/src/main/resources/mapper/WxFinancePrintTemplateMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinancePrintTemplateMapper.xml @@ -8,12 +8,13 @@ + - `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`name`,`price`,`content` + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`type`,`name`,`price`,`content` @@ -27,7 +28,7 @@ and name like concat('%', #{name},'%') and `is_del` = #{isDel} - + and `type` = #{type} and id in @@ -44,12 +45,6 @@ - - update wx_finance_print_template set is_del = #{isDel} where id = #{id} and `tenant_id` = #{tenantId}