From 960b94d9d176d75606d9c97ce52df2bfd99b1845 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 12 Aug 2024 16:26:55 +0800 Subject: [PATCH] fix --- .../controller/market/WxEnergyController.java | 18 ++++++++++++++- .../domain/po/WxEnergyMeterReading.java | 9 +++++++- .../domain/po/WxEnergyReadingCalcute.java | 7 ++++-- .../domain/po/WxFinancePrintData.java | 2 ++ .../mapper/WxEnergyMeterReadingMapper.java | 2 ++ .../mapper/WxEnergyReadingCalcuteMapper.java | 2 ++ .../com/iformall/service/WxEnergyService.java | 2 ++ .../service/impl/WxEnergyServiceImpl.java | 23 +++++++++++++++++-- .../mapper/WxEnergyMeterReadingMapper.xml | 8 ++++++- .../mapper/WxEnergyReadingCalcuteMapper.xml | 8 ++++++- .../mapper/WxFinancePrintDataMapper.xml | 7 +++++- 11 files changed, 79 insertions(+), 9 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java index f1a4f25cf..9cb6a67a8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -273,7 +273,15 @@ public class WxEnergyController extends BaseController { return new ResultData(); } - @ApiOperation("生成科目抄表计算数据") + @PostMapping("readingIsDel") + public ResultData readingIsDel(@RequestBody WxEnergyMeterReading record) { + record.updateTenantInfo(getTenantInfo()); + record.setIsDel(EnumYesOrNo.YES.getCode()); + wxEnergyService.setReadingIsDel(record); + return new ResultData(); + } + + @ApiOperation("新建科目抄表计算数据") @PostMapping("createReadingCalcute") public ResultData createReadingCalcute(@RequestBody WxEnergyReadingCalcute record) { record.updateTenantInfo(getTenantInfo()); @@ -333,4 +341,12 @@ public class WxEnergyController extends BaseController { return new ResultData(number); } + @PostMapping("calcuteIsDel") + public ResultData calcuteIsDel(@RequestBody WxEnergyReadingCalcute record) { + record.updateTenantInfo(getTenantInfo()); + record.setIsDel(EnumYesOrNo.YES.getCode()); + wxEnergyService.setReadingCalcuteIsDel(record); + return new ResultData(); + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java index 101279716..dfaefd8f7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.common.IdWorker; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumBillAllType; import com.iformall.enums.EnumBillDailyBuildWay; import com.iformall.enums.EnumBillRentApplyStatus; import com.iformall.enums.EnumBillStatus; @@ -127,6 +128,9 @@ public class WxEnergyMeterReading extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="单价",name="price") private String price; + @io.swagger.annotations.ApiModelProperty(value="是否删除",name="isDel") + private Integer isDel; + @TableField(exist = false) private List meterReadingList; @@ -199,6 +203,7 @@ public class WxEnergyMeterReading extends TenantEntity { daily.setUpdateByName(user.getName()); daily.setUpdatetime(new Date()); daily.setReceivePay(needPay); + daily.setNeedPay(needPay); daily.setPay("0"); daily.setStarttime(this.startTime); daily.setEndtime(this.endTime); @@ -206,10 +211,12 @@ public class WxEnergyMeterReading extends TenantEntity { daily.setStatus(EnumBillStatus.WAIT_PAY.getCode()); daily.setShopId(this.shopId); daily.setShopNumber(this.shopNumber); - daily.setBillType(EnumEnergyMeterType.getEnum(meterType).getBillDailyType()); + daily.setBillType(EnumBillAllType.DAILY.getCode()); + daily.setEnergyFeesId(calcute.getFeesId()); daily.setPriceDetail(detail); daily.setServiceChargePay("0"); daily.setBillRemark(remark); + daily.setIsPreview(EnumYesOrNo.NO.getCode()); daily.setEnergyReadingCalcuteId(calcute.getId()); daily.setEnergyReadingId(id); return daily; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java index 5e326081e..2d2444c6e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java @@ -69,7 +69,7 @@ public class WxEnergyReadingCalcute extends TenantEntity { if (null != importSuccess && importSuccess.intValue() == EnumYesOrNo.YES.getCode().intValue()) { return "成功"; }else { - return "部分失败"; + return "未完成导入"; } } @@ -84,8 +84,11 @@ public class WxEnergyReadingCalcute extends TenantEntity { if (null != calcuteSuccess && calcuteSuccess.intValue() == EnumYesOrNo.YES.getCode().intValue()) { return "成功"; }else { - return "部分失败"; + return "未完成计算"; } } + @io.swagger.annotations.ApiModelProperty(value = "是否删除", name = "isDel") + private Integer isDel; + } 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 f2fac51fc..7ff7832ab 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintData.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintData.java @@ -40,6 +40,8 @@ public class WxFinancePrintData extends BaseEntity { private Integer isEdit; @io.swagger.annotations.ApiModelProperty(value="默认值",name="defaultValue") private String defaultValue; + @io.swagger.annotations.ApiModelProperty(value="默认值",name="defaultValue") + private String tenantId; @TableField(exist = false) private Object printComponents; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterReadingMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterReadingMapper.java index 3750cd4dd..9fe576084 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterReadingMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterReadingMapper.java @@ -20,4 +20,6 @@ public interface WxEnergyMeterReadingMapper extends CommonMapper findBuildingSumMoney(WxEnergyMeterReading wxBillRent); List findFloorSumMoney(WxEnergyMeterReading wxBillRent); + + void setIsDel(@Param("id")Long id,@Param("tenantId")String tenantId,@Param("isDel")Integer isDel); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteMapper.java index 27c952407..909e2b0c6 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyReadingCalcuteMapper.java @@ -13,4 +13,6 @@ public interface WxEnergyReadingCalcuteMapper extends CommonMapper findList(WxEnergyReadingCalcute wxBillRent); WxEnergyReadingCalcute 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/WxEnergyService.java b/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java index ef3affd2b..20fd36eeb 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java @@ -51,6 +51,7 @@ public interface WxEnergyService { void updateReading(WxEnergyMeterReading record,MallUserInfo userInfo); void commitReading(WxEnergyMeterReading record,MallUserInfo userInfo); WxEnergyMeterReading getReadingById(WxEnergyMeterReading record); + void setReadingIsDel(WxEnergyMeterReading record); //抄表科目计算数据 PageInfo readingCalcuteListAsPage(WxEnergyReadingCalcute record, Integer pageIndex, Integer pageSize); @@ -59,4 +60,5 @@ public interface WxEnergyService { void exportReadingCalcute(WxEnergyReadingCalcute record,HttpServletRequest request, HttpServletResponse response); void importReadingCalcute(MultipartFile mFile, MallUserInfo user, HttpServletRequest request, HttpServletResponse response); Integer calcuteReading(WxEnergyReadingCalcute record, MallUserInfo user); + void setReadingCalcuteIsDel(WxEnergyReadingCalcute record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index 341e4a042..77db50c6a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -552,6 +552,18 @@ public class WxEnergyServiceImpl implements WxEnergyService { return wxEnergyMeterReadingMapper.selectById(record.getId(), record.getTenantId()); } + @Override + public void setReadingIsDel(WxEnergyMeterReading record) { + WxEnergyMeterReading calcute = this.getReadingById(record); + if (null == calcute) { + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "记录未查询到"); + } + wxEnergyMeterReadingMapper.setIsDel(record.getId(), record.getTenantId(), record.getIsDel()); + } + + + + @Override public PageInfo readingCalcuteListAsPage(WxEnergyReadingCalcute record, Integer pageIndex, Integer pageSize) { @@ -825,6 +837,7 @@ public class WxEnergyServiceImpl implements WxEnergyService { WxEnergyMeterReading reading = new WxEnergyMeterReading(); reading.updateTenantInfo(record); reading.setTimeId(record.getTimeId()); + reading.setIsDel(EnumYesOrNo.NO.getCode()); reading.setIsPublic(EnumYesOrNo.NO.getCode()); WxEnergyFees fq = new WxEnergyFees(); @@ -1018,7 +1031,13 @@ public class WxEnergyServiceImpl implements WxEnergyService { return 0; } - - + @Override + public void setReadingCalcuteIsDel(WxEnergyReadingCalcute record) { + WxEnergyReadingCalcute calcute = this.getReadingCalcuteById(record); + if (null == calcute) { + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "记录未查询到"); + } + wxEnergyReadingCalcuteMapper.setIsDel(record.getId(), record.getTenantId(), record.getIsDel()); + } } diff --git a/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml index 51625efe6..b635c3190 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyMeterReadingMapper.xml @@ -30,11 +30,12 @@ + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`cur_number`,`pre_number`,`pre_time`,`pre_by`,`pre_by_name`,`start_time`,`end_time`,`create_by`,`create_by_name`, - `update_by`,`update_by_name`,`remark`,`time_id`,`meter_id`,`meter_type`,`meter_rate`,`is_public`,`meter_name`,`shop_id`,`shop_number`,`building_id`,`floor_id`,`price` + `update_by`,`update_by_name`,`remark`,`time_id`,`meter_id`,`meter_type`,`meter_rate`,`is_public`,`meter_name`,`shop_id`,`shop_number`,`building_id`,`floor_id`,`price`,`is_del` @@ -56,6 +57,7 @@ and shop_number like concat('%', #{shopNumber},'%') and `building_id` = #{buildingId} and `floor_id` = #{floorId} + and `is_del` = #{isDel} and create_by_name like concat('%', #{createByName},'%') and shop_id in @@ -104,6 +106,10 @@ group by floor_id + + + update wx_energy_meter_reading set is_del = #{isDel} where id = #{id} and `tenant_id` = #{tenantId} + diff --git a/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml index e4fcc5450..14d00a665 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml @@ -18,11 +18,12 @@ + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`create_by`,`create_by_name`, - `update_by`,`update_by_name`,`remark`,`time_id`,`fees_id`,`is_calcuted`,`is_imported`,`import_success`,`calcute_success` + `update_by`,`update_by_name`,`remark`,`time_id`,`fees_id`,`is_calcuted`,`is_imported`,`import_success`,`calcute_success`,`is_del` @@ -41,6 +42,7 @@ and `is_imported` = #{isImported} and `import_success` = #{importSuccess} and `calcute_success` = #{calcuteSuccess} + and `is_del` = #{isDel} and id in @@ -62,6 +64,10 @@ from wx_energy_reading_calcute where id = #{id} and `tenant_id` = #{tenantId} + + + update wx_energy_reading_calcute set is_del = #{isDel} where id = #{id} and `tenant_id` = #{tenantId} + diff --git a/mallinkService/src/main/resources/mapper/WxFinancePrintDataMapper.xml b/mallinkService/src/main/resources/mapper/WxFinancePrintDataMapper.xml index ada8def8f..471c4f026 100644 --- a/mallinkService/src/main/resources/mapper/WxFinancePrintDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinancePrintDataMapper.xml @@ -12,10 +12,11 @@ + - `id`,`name`,`is_del`,`remark`,`type`,`sort`,`print_data_type`,`print_data_json`,`is_edit`,`default_value` + `id`,`name`,`is_del`,`remark`,`type`,`sort`,`print_data_type`,`print_data_json`,`is_edit`,`default_value`,`tenant_id` @@ -44,6 +45,10 @@ and `is_edit` = #{isEdit} + + + and (`tenant_id` = #{tenantId} or `tenant_id` is null) + and id in