From 2459f52f45cda593a921868bcba358618bbcf28a Mon Sep 17 00:00:00 2001 From: bobol Date: Tue, 26 Dec 2023 09:57:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=8C=87=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=94=B9=E8=A1=A8=E5=90=8D=E7=B1=BB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...=> DcBusiDayPlanBillMasterController.java} | 70 +++++----- .../DcBusiPlanBillSubController.java | 131 ------------------ ...ster.java => DcBusiDayPlanBillMaster.java} | 8 +- ...BillSub.java => DcBusiDayPlanBillSub.java} | 7 +- ...ava => DcBusiDayPlanBillMasterMapper.java} | 31 +++-- ...r.java => DcBusiDayPlanBillSubMapper.java} | 19 +-- ...va => DcBusiDayPlanBillMasterService.java} | 115 ++++++++------- ....java => DcBusiDayPlanBillSubService.java} | 31 +++-- ....xml => DcBusiDayPlanBillMasterMapper.xml} | 40 +++--- ...per.xml => DcBusiDayPlanBillSubMapper.xml} | 20 +-- 10 files changed, 169 insertions(+), 303 deletions(-) rename lzbi-module/src/main/java/com/lzbi/bill/controller/{DcBusiPlanBillMasterController.java => DcBusiDayPlanBillMasterController.java} (57%) delete mode 100644 lzbi-module/src/main/java/com/lzbi/bill/controller/DcBusiPlanBillSubController.java rename lzbi-module/src/main/java/com/lzbi/bill/domain/{DcBusiPlanBillMaster.java => DcBusiDayPlanBillMaster.java} (88%) rename lzbi-module/src/main/java/com/lzbi/bill/domain/{DcBusiPlanBillSub.java => DcBusiDayPlanBillSub.java} (86%) rename lzbi-module/src/main/java/com/lzbi/bill/mapper/{DcBusiPlanBillMasterMapper.java => DcBusiDayPlanBillMasterMapper.java} (58%) rename lzbi-module/src/main/java/com/lzbi/bill/mapper/{DcBusiPlanBillSubMapper.java => DcBusiDayPlanBillSubMapper.java} (59%) rename lzbi-module/src/main/java/com/lzbi/bill/service/{DcBusiPlanBillMasterService.java => DcBusiDayPlanBillMasterService.java} (66%) rename lzbi-module/src/main/java/com/lzbi/bill/service/{DcBusiPlanBillSubService.java => DcBusiDayPlanBillSubService.java} (55%) rename lzbi-module/src/main/resources/mapper/asset/{DcBusiPlanBillMasterMapper.xml => DcBusiDayPlanBillMasterMapper.xml} (91%) rename lzbi-module/src/main/resources/mapper/asset/{DcBusiPlanBillSubMapper.xml => DcBusiDayPlanBillSubMapper.xml} (89%) diff --git a/lzbi-module/src/main/java/com/lzbi/bill/controller/DcBusiPlanBillMasterController.java b/lzbi-module/src/main/java/com/lzbi/bill/controller/DcBusiDayPlanBillMasterController.java similarity index 57% rename from lzbi-module/src/main/java/com/lzbi/bill/controller/DcBusiPlanBillMasterController.java rename to lzbi-module/src/main/java/com/lzbi/bill/controller/DcBusiDayPlanBillMasterController.java index d9cd0db..c132cd8 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/controller/DcBusiPlanBillMasterController.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/controller/DcBusiDayPlanBillMasterController.java @@ -1,7 +1,5 @@ package com.lzbi.bill.controller; -import com.lzbi.common.utils.DateUtils; -import com.lzbi.common.utils.SecurityUtils; -import com.lzbi.draft.domain.DcBusiTargetBillMaster; +import com.lzbi.bill.domain.DcBusiDayPlanBillMaster; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -21,37 +19,36 @@ import com.lzbi.common.annotation.Log; import com.lzbi.common.core.controller.BaseController; import com.lzbi.common.core.domain.AjaxResult; import com.lzbi.common.enums.BusinessType; -import com.lzbi.bill.domain. DcBusiPlanBillMaster; -import com.lzbi.bill.service.DcBusiPlanBillMasterService; +import com.lzbi.bill.service.DcBusiDayPlanBillMasterService; import com.lzbi.common.utils.poi.ExcelUtil; import com.lzbi.common.core.page.TableDataInfo; /** - * 计划单据主Controller + * 日计划计划单据主Controller * * @author lienbo * @date 2023-12-21 */ @RestController -@RequestMapping("/bill/planBillMaster") -public class DcBusiPlanBillMasterController extends BaseController +@RequestMapping("/bill/dayPlanBill") +public class DcBusiDayPlanBillMasterController extends BaseController { @Autowired - private DcBusiPlanBillMasterService dcBusiPlanBillMasterService; + private DcBusiDayPlanBillMasterService dcBusiDayPlanBillMasterService; /** * 查询计划单据主列表 */ @ApiOperation("查询计划单据主列表") @ApiImplicitParams({ - @ApiImplicitParam(name = "DcBusiPlanBillMaster", value = "", dataType = "DcBusiPlanBillMaster", dataTypeClass = DcBusiPlanBillMaster.class), + @ApiImplicitParam(name = "DcBusiDayPlanBillMaster", value = "", dataType = "DcBusiDayPlanBillMaster", dataTypeClass = DcBusiDayPlanBillMaster.class), }) - @PreAuthorize("@ss.hasPermi('bill:planBillMaster:list')") + @PreAuthorize("@ss.hasPermi('bill:dayPlanBill:list')") @GetMapping("/list") - public TableDataInfo list(DcBusiPlanBillMaster DcBusiPlanBillMaster) + public TableDataInfo list(DcBusiDayPlanBillMaster DcBusiDayPlanBillMaster) { startPage(); - List< DcBusiPlanBillMaster> list = dcBusiPlanBillMasterService.selectDcBusiPlanBillMasterList(DcBusiPlanBillMaster); + List list = dcBusiDayPlanBillMasterService.selectDcBusiPlanBillMasterList(DcBusiDayPlanBillMaster); return getDataTable(list); } @@ -60,15 +57,15 @@ public class DcBusiPlanBillMasterController extends BaseController */ @ApiOperation("导出计划单据主列表") @ApiImplicitParams({ - @ApiImplicitParam(name = "DcBusiPlanBillMaster", value = "", dataType = "DcBusiPlanBillMaster", dataTypeClass = DcBusiPlanBillMaster.class), + @ApiImplicitParam(name = "DcBusiDayPlanBillMaster", value = "", dataType = "DcBusiDayPlanBillMaster", dataTypeClass = DcBusiDayPlanBillMaster.class), }) - @PreAuthorize("@ss.hasPermi('bill:planBillMaster:export')") + @PreAuthorize("@ss.hasPermi('bill:dayPlanBill:export')") @Log(title = "计划单据主", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response,DcBusiPlanBillMaster DcBusiPlanBillMaster) + public void export(HttpServletResponse response, DcBusiDayPlanBillMaster DcBusiDayPlanBillMaster) { - List list = dcBusiPlanBillMasterService.selectDcBusiPlanBillMasterList(DcBusiPlanBillMaster); - ExcelUtil util = new ExcelUtil(DcBusiPlanBillMaster.class); + List list = dcBusiDayPlanBillMasterService.selectDcBusiPlanBillMasterList(DcBusiDayPlanBillMaster); + ExcelUtil util = new ExcelUtil(DcBusiDayPlanBillMaster.class); util.exportExcel(response, list, "计划单据主数据"); } @@ -79,11 +76,11 @@ public class DcBusiPlanBillMasterController extends BaseController @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "", dataType = "Long", dataTypeClass = Long.class), }) - @PreAuthorize("@ss.hasPermi('bill:planBillMaster:query')") + @PreAuthorize("@ss.hasPermi('bill:dayPlanBill:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(dcBusiPlanBillMasterService.selectDcBusiPlanBillMasterById(id)); + return success(dcBusiDayPlanBillMasterService.selectDcBusiPlanBillMasterById(id)); } /** @@ -93,11 +90,11 @@ public class DcBusiPlanBillMasterController extends BaseController @ApiImplicitParams({ @ApiImplicitParam(name = "billNo", value = "", dataType = "String", dataTypeClass = String.class), }) - @PreAuthorize("@ss.hasPermi('bill:planBillMaster:query')") + @PreAuthorize("@ss.hasPermi('bill:dayPlanBill:query')") @GetMapping(value = "/billNo/{billNo}") public AjaxResult getInfo(@PathVariable("billNo") String billNo) { - return success(dcBusiPlanBillMasterService.selectDcBusiPlanBillMasterByBillNo(billNo)); + return success(dcBusiDayPlanBillMasterService.selectDcBusiPlanBillMasterByBillNo(billNo)); } /** @@ -105,14 +102,14 @@ public class DcBusiPlanBillMasterController extends BaseController */ @ApiOperation("新增计划单据主") @ApiImplicitParams({ - @ApiImplicitParam(name = "DcBusiPlanBillMaster", value = "", dataType = "DcBusiPlanBillMaster", dataTypeClass = DcBusiPlanBillMaster.class), + @ApiImplicitParam(name = "DcBusiDayPlanBillMaster", value = "", dataType = "DcBusiDayPlanBillMaster", dataTypeClass = DcBusiDayPlanBillMaster.class), }) - @PreAuthorize("@ss.hasPermi('bill:planBillMaster:add')") + @PreAuthorize("@ss.hasPermi('bill:dayPlanBill:add')") @Log(title = "计划单据主", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody DcBusiPlanBillMaster DcBusiPlanBillMaster) + public AjaxResult add(@RequestBody DcBusiDayPlanBillMaster DcBusiDayPlanBillMaster) { - return toAjax(dcBusiPlanBillMasterService.insertDcBusiPlanBillMaster(DcBusiPlanBillMaster)); + return toAjax(dcBusiDayPlanBillMasterService.insertDcBusiPlanBillMaster(DcBusiDayPlanBillMaster)); } /** @@ -121,14 +118,14 @@ public class DcBusiPlanBillMasterController extends BaseController @ApiOperation("修改计划单据主") @ApiImplicitParams({ - @ApiImplicitParam(name = "DcBusiPlanBillMaster", value = "", dataType = "DcBusiPlanBillMaster", dataTypeClass = DcBusiPlanBillMaster.class), + @ApiImplicitParam(name = "DcBusiDayPlanBillMaster", value = "", dataType = "DcBusiDayPlanBillMaster", dataTypeClass = DcBusiDayPlanBillMaster.class), }) - @PreAuthorize("@ss.hasPermi('bill:planBillMaster:edit')") + @PreAuthorize("@ss.hasPermi('bill:dayPlanBill:edit')") @Log(title = "计划单据主", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody DcBusiPlanBillMaster DcBusiPlanBillMaster) + public AjaxResult edit(@RequestBody DcBusiDayPlanBillMaster DcBusiDayPlanBillMaster) { - return toAjax(dcBusiPlanBillMasterService.updateDcBusiPlanBillMaster(DcBusiPlanBillMaster)); + return toAjax(dcBusiDayPlanBillMasterService.updateDcBusiPlanBillMaster(DcBusiDayPlanBillMaster)); } /** @@ -138,39 +135,42 @@ public class DcBusiPlanBillMasterController extends BaseController @ApiImplicitParams({ @ApiImplicitParam(name = "ids", value = "", dataType = "Long", dataTypeClass =Long.class), }) - @PreAuthorize("@ss.hasPermi('bill:planBillMaster:remove')") + @PreAuthorize("@ss.hasPermi('bill:dayPlanBill:remove')") @Log(title = "计划单据主", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(dcBusiPlanBillMasterService.deleteDcBusiPlanBillMasterByIds(ids)); + return toAjax(dcBusiDayPlanBillMasterService.deleteDcBusiPlanBillMasterByIds(ids)); } @ApiOperation("驳回") + @PreAuthorize("@ss.hasPermi('bill:dayPlanBill:check')") @ApiImplicitParams({ @ApiImplicitParam(name = "billNo", value = "", dataType = "String", dataTypeClass = String.class), }) @PostMapping("/checkBack/{billNo}") public AjaxResult checkBack(@PathVariable String billNo){ - return AjaxResult.success(dcBusiPlanBillMasterService.checkBack(billNo)); + return AjaxResult.success(dcBusiDayPlanBillMasterService.checkBack(billNo)); } @ApiOperation("审核") + @PreAuthorize("@ss.hasPermi('bill:dayPlanBill:check')") @ApiImplicitParams({ @ApiImplicitParam(name = "billNo", value = "", dataType = "String", dataTypeClass = String.class), }) @PostMapping("/checkPass/{billNo}") public AjaxResult checkPass(@PathVariable String billNo){ - return AjaxResult.success(dcBusiPlanBillMasterService.checkPass(billNo)); + return AjaxResult.success(dcBusiDayPlanBillMasterService.checkPass(billNo)); } @ApiOperation("反审核") + @PreAuthorize("@ss.hasPermi('bill:dayPlanBill:check')") @ApiImplicitParams({ @ApiImplicitParam(name = "billNo", value = "", dataType = "String", dataTypeClass = String.class), }) @PostMapping("/checkRevert/{billNo}") public AjaxResult checkRevert(@PathVariable String billNo){ - return AjaxResult.success(dcBusiPlanBillMasterService.checkRevert(billNo)); + return AjaxResult.success(dcBusiDayPlanBillMasterService.checkRevert(billNo)); } } diff --git a/lzbi-module/src/main/java/com/lzbi/bill/controller/DcBusiPlanBillSubController.java b/lzbi-module/src/main/java/com/lzbi/bill/controller/DcBusiPlanBillSubController.java deleted file mode 100644 index 24d2982..0000000 --- a/lzbi-module/src/main/java/com/lzbi/bill/controller/DcBusiPlanBillSubController.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.lzbi.bill.controller; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.lzbi.common.annotation.Log; -import com.lzbi.common.core.controller.BaseController; -import com.lzbi.common.core.domain.AjaxResult; -import com.lzbi.common.enums.BusinessType; -import com.lzbi.bill.domain. DcBusiPlanBillSub; -import com.lzbi.bill.service.DcBusiPlanBillSubService; -import com.lzbi.common.utils.poi.ExcelUtil; -import com.lzbi.common.core.page.TableDataInfo; - -/** - * 计划单据明细Controller - * - * @author lienbo - * @date 2023-12-21 - */ -@RestController -@RequestMapping("/bill/planBillSub") -public class DcBusiPlanBillSubController extends BaseController -{ - @Autowired - private DcBusiPlanBillSubService dcBusiPlanBillSubService; - - /** - * 查询计划单据明细列表 - */ - @ApiOperation("查询计划单据明细列表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "DcBusiPlanBillSub", value = "", dataType = "DcBusiPlanBillSub", dataTypeClass = DcBusiPlanBillSub.class), - }) - @PreAuthorize("@ss.hasPermi('bill:planBillSub:list')") - @GetMapping("/list") - public TableDataInfo list(DcBusiPlanBillSub DcBusiPlanBillSub) - { - startPage(); - List< DcBusiPlanBillSub> list = dcBusiPlanBillSubService.selectDcBusiPlanBillSubList(DcBusiPlanBillSub); - return getDataTable(list); - } - - /** - * 导出计划单据明细列表 - */ - @ApiOperation("导出计划单据明细列表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "DcBusiPlanBillSub", value = "", dataType = "DcBusiPlanBillSub", dataTypeClass = DcBusiPlanBillSub.class), - }) - @PreAuthorize("@ss.hasPermi('bill:planBillSub:export')") - @Log(title = "计划单据明细", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response,DcBusiPlanBillSub DcBusiPlanBillSub) - { - List list = dcBusiPlanBillSubService.selectDcBusiPlanBillSubList(DcBusiPlanBillSub); - ExcelUtil util = new ExcelUtil(DcBusiPlanBillSub.class); - util.exportExcel(response, list, "计划单据明细数据"); - } - - /** - * 获取计划单据明细详细信息 - */ - @ApiOperation("获取计划单据明细详细信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "", dataType = "Long", dataTypeClass = Long.class), - }) - @PreAuthorize("@ss.hasPermi('bill:planBillSub:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(dcBusiPlanBillSubService.selectDcBusiPlanBillSubById(id)); - } - - /** - * 新增计划单据明细 - */ - @ApiOperation("新增计划单据明细") - @ApiImplicitParams({ - @ApiImplicitParam(name = "DcBusiPlanBillSub", value = "", dataType = "DcBusiPlanBillSub", dataTypeClass = DcBusiPlanBillSub.class), - }) - @PreAuthorize("@ss.hasPermi('bill:planBillSub:add')") - @Log(title = "计划单据明细", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody DcBusiPlanBillSub DcBusiPlanBillSub) - { - return toAjax(dcBusiPlanBillSubService.insertDcBusiPlanBillSub(DcBusiPlanBillSub)); - } - - /** - * 修改计划单据明细 - */ - - @ApiOperation("修改计划单据明细") - @ApiImplicitParams({ - @ApiImplicitParam(name = "DcBusiPlanBillSub", value = "", dataType = "DcBusiPlanBillSub", dataTypeClass = DcBusiPlanBillSub.class), - }) - @PreAuthorize("@ss.hasPermi('bill:planBillSub:edit')") - @Log(title = "计划单据明细", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody DcBusiPlanBillSub DcBusiPlanBillSub) - { - return toAjax(dcBusiPlanBillSubService.updateDcBusiPlanBillSub(DcBusiPlanBillSub)); - } - - /** - * 删除计划单据明细 - */ - @ApiOperation("删除计划单据明细") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "", dataType = "Long", dataTypeClass =Long.class), - }) - @PreAuthorize("@ss.hasPermi('bill:planBillSub:remove')") - @Log(title = "计划单据明细", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(dcBusiPlanBillSubService.deleteDcBusiPlanBillSubByIds(ids)); - } -} diff --git a/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiPlanBillMaster.java b/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiDayPlanBillMaster.java similarity index 88% rename from lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiPlanBillMaster.java rename to lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiDayPlanBillMaster.java index 613aa8b..eeedc18 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiPlanBillMaster.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiDayPlanBillMaster.java @@ -2,9 +2,7 @@ package com.lzbi.bill.domain; import java.util.List; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; + import lombok.Data; import io.swagger.annotations.ApiModelProperty; import lombok.experimental.Accessors; @@ -19,7 +17,7 @@ import com.lzbi.module.base.BaseModuleEntity; */ @Data @Accessors(chain = true) -public class DcBusiPlanBillMaster extends BaseModuleEntity +public class DcBusiDayPlanBillMaster extends BaseModuleEntity { private static final long serialVersionUID = 1L; @@ -86,6 +84,6 @@ public class DcBusiPlanBillMaster extends BaseModuleEntity private String fieldName; /** 计划单据明细信息 */ - private List dcBusiPlanBillSubList; + private List dcBusiDayPlanBillSubList; } diff --git a/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiPlanBillSub.java b/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiDayPlanBillSub.java similarity index 86% rename from lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiPlanBillSub.java rename to lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiDayPlanBillSub.java index a5ee3e7..2a0e965 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiPlanBillSub.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiDayPlanBillSub.java @@ -2,12 +2,9 @@ package com.lzbi.bill.domain; import java.math.BigDecimal; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; + import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.lzbi.common.annotation.Excel; -import com.lzbi.module.base.BaseModuleEntity; /** * 计划单据明细对象 dc_busi_plan_bill_sub @@ -16,7 +13,7 @@ import com.lzbi.module.base.BaseModuleEntity; * @date 2023-12-21 */ @Data -public class DcBusiPlanBillSub +public class DcBusiDayPlanBillSub { private static final long serialVersionUID = 1L; diff --git a/lzbi-module/src/main/java/com/lzbi/bill/mapper/DcBusiPlanBillMasterMapper.java b/lzbi-module/src/main/java/com/lzbi/bill/mapper/DcBusiDayPlanBillMasterMapper.java similarity index 58% rename from lzbi-module/src/main/java/com/lzbi/bill/mapper/DcBusiPlanBillMasterMapper.java rename to lzbi-module/src/main/java/com/lzbi/bill/mapper/DcBusiDayPlanBillMasterMapper.java index f27f8f7..ed90f38 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/mapper/DcBusiPlanBillMasterMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/mapper/DcBusiDayPlanBillMasterMapper.java @@ -1,9 +1,10 @@ package com.lzbi.bill.mapper; import java.util.List; -import com.lzbi.bill.domain.DcBusiPlanBillMaster; + +import com.lzbi.bill.domain.DcBusiDayPlanBillMaster; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.lzbi.bill.domain.DcBusiPlanBillSub; +import com.lzbi.bill.domain.DcBusiDayPlanBillSub; /** * 计划单据主Mapper接口 @@ -12,7 +13,7 @@ import com.lzbi.bill.domain.DcBusiPlanBillSub; * @date 2023-12-21 */ -public interface DcBusiPlanBillMasterMapper extends BaseMapper +public interface DcBusiDayPlanBillMasterMapper extends BaseMapper { /** * 查询计划单据主 @@ -20,47 +21,47 @@ public interface DcBusiPlanBillMasterMapper extends BaseMapper selectDcBusiPlanBillMasterList(DcBusiPlanBillMaster dcBusiPlanBillMaster); + public List selectDcBusiPlanBillMasterList(DcBusiDayPlanBillMaster dcBusiDayPlanBillMaster); /** * 新增计划单据主 * - * @param dcBusiPlanBillMaster 计划单据主 + * @param dcBusiDayPlanBillMaster 计划单据主 * @return 结果 */ - public int insertDcBusiPlanBillMaster(DcBusiPlanBillMaster dcBusiPlanBillMaster); + public int insertDcBusiPlanBillMaster(DcBusiDayPlanBillMaster dcBusiDayPlanBillMaster); /** * 修改计划单据主 * - * @param dcBusiPlanBillMaster 计划单据主 + * @param dcBusiDayPlanBillMaster 计划单据主 * @return 结果 */ - public int updateDcBusiPlanBillMaster(DcBusiPlanBillMaster dcBusiPlanBillMaster); + public int updateDcBusiPlanBillMaster(DcBusiDayPlanBillMaster dcBusiDayPlanBillMaster); /** * 修改计划单据主 * - * @param dcBusiPlanBillMaster 计划单据主 + * @param dcBusiDayPlanBillMaster 计划单据主 * @return 结果 */ - public int updateDcBusiPlanBillMasterByBillNo(DcBusiPlanBillMaster dcBusiPlanBillMaster); + public int updateDcBusiPlanBillMasterByBillNo(DcBusiDayPlanBillMaster dcBusiDayPlanBillMaster); /** * 删除计划单据主 @@ -89,10 +90,10 @@ public interface DcBusiPlanBillMasterMapper extends BaseMapper dcBusiPlanBillSubList); + public int batchDcBusiPlanBillSub(List dcBusiDayPlanBillSubList); /** diff --git a/lzbi-module/src/main/java/com/lzbi/bill/mapper/DcBusiPlanBillSubMapper.java b/lzbi-module/src/main/java/com/lzbi/bill/mapper/DcBusiDayPlanBillSubMapper.java similarity index 59% rename from lzbi-module/src/main/java/com/lzbi/bill/mapper/DcBusiPlanBillSubMapper.java rename to lzbi-module/src/main/java/com/lzbi/bill/mapper/DcBusiDayPlanBillSubMapper.java index 1508267..9a8346e 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/mapper/DcBusiPlanBillSubMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/mapper/DcBusiDayPlanBillSubMapper.java @@ -1,7 +1,8 @@ package com.lzbi.bill.mapper; import java.util.List; -import com.lzbi.bill.domain.DcBusiPlanBillSub; + +import com.lzbi.bill.domain.DcBusiDayPlanBillSub; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -11,7 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @date 2023-12-21 */ -public interface DcBusiPlanBillSubMapper extends BaseMapper +public interface DcBusiDayPlanBillSubMapper extends BaseMapper { /** * 查询计划单据明细 @@ -19,31 +20,31 @@ public interface DcBusiPlanBillSubMapper extends BaseMapper * @param id 计划单据明细主键 * @return 计划单据明细 */ - public DcBusiPlanBillSub selectDcBusiPlanBillSubById(Long id); + public DcBusiDayPlanBillSub selectDcBusiPlanBillSubById(Long id); /** * 查询计划单据明细列表 * - * @param dcBusiPlanBillSub 计划单据明细 + * @param dcBusiDayPlanBillSub 计划单据明细 * @return 计划单据明细集合 */ - public List selectDcBusiPlanBillSubList(DcBusiPlanBillSub dcBusiPlanBillSub); + public List selectDcBusiPlanBillSubList(DcBusiDayPlanBillSub dcBusiDayPlanBillSub); /** * 新增计划单据明细 * - * @param dcBusiPlanBillSub 计划单据明细 + * @param dcBusiDayPlanBillSub 计划单据明细 * @return 结果 */ - public int insertDcBusiPlanBillSub(DcBusiPlanBillSub dcBusiPlanBillSub); + public int insertDcBusiPlanBillSub(DcBusiDayPlanBillSub dcBusiDayPlanBillSub); /** * 修改计划单据明细 * - * @param dcBusiPlanBillSub 计划单据明细 + * @param dcBusiDayPlanBillSub 计划单据明细 * @return 结果 */ - public int updateDcBusiPlanBillSub(DcBusiPlanBillSub dcBusiPlanBillSub); + public int updateDcBusiPlanBillSub(DcBusiDayPlanBillSub dcBusiDayPlanBillSub); /** * 删除计划单据明细 diff --git a/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanBillMasterService.java b/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiDayPlanBillMasterService.java similarity index 66% rename from lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanBillMasterService.java rename to lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiDayPlanBillMasterService.java index df9f824..4592fb4 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanBillMasterService.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiDayPlanBillMasterService.java @@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lzbi.bi.domain.DcBusiTargetDraftDaynew; import com.lzbi.bi.mapper.DcBusiTargetDraftDaynewMapper; -import com.lzbi.bill.domain.DcBusiPlanBillMaster; -import com.lzbi.bill.domain.DcBusiPlanBillSub; -import com.lzbi.bill.mapper.DcBusiPlanBillMasterMapper; -import com.lzbi.bill.mapper.DcBusiPlanBillSubMapper; +import com.lzbi.bill.domain.DcBusiDayPlanBillMaster; +import com.lzbi.bill.domain.DcBusiDayPlanBillSub; +import com.lzbi.bill.mapper.DcBusiDayPlanBillMasterMapper; +import com.lzbi.bill.mapper.DcBusiDayPlanBillSubMapper; import com.lzbi.common.core.domain.entity.SysDept; import com.lzbi.common.utils.DateUtils; import com.lzbi.common.utils.SecurityUtils; @@ -22,7 +22,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; /** @@ -32,13 +31,13 @@ import java.util.List; * @date 2023-12-21 */ @Service -public class DcBusiPlanBillMasterService extends ServiceImpl implements IService { +public class DcBusiDayPlanBillMasterService extends ServiceImpl implements IService { @Autowired private SysDeptServiceImpl sysDeptService; @Resource - private DcBusiPlanBillSubMapper dcBusiPlanBillSubMapper; + private DcBusiDayPlanBillSubMapper dcBusiDayPlanBillSubMapper; @Resource private DcBusiTargetDraftDaynewMapper dcBusiTargetDraftDaynewMapper; @@ -52,83 +51,83 @@ public class DcBusiPlanBillMasterService extends ServiceImpl dcBusiPlanBillSubs = dcBusiPlanBillSubMapper.selectDcBusiPlanBillSubList(params); - if (!CollectionUtils.isEmpty(dcBusiPlanBillSubs)) { - dcBusiPlanBillMaster.setDcBusiPlanBillSubList(dcBusiPlanBillSubs); - dcBusiPlanBillMaster.setFieldCode(dcBusiPlanBillSubs.get(0).getFieldCode()); - dcBusiPlanBillMaster.setFieldName(dcBusiPlanBillSubs.get(0).getFieldName()); + List dcBusiDayPlanBillSubs = dcBusiDayPlanBillSubMapper.selectDcBusiPlanBillSubList(params); + if (!CollectionUtils.isEmpty(dcBusiDayPlanBillSubs)) { + dcBusiDayPlanBillMaster.setDcBusiDayPlanBillSubList(dcBusiDayPlanBillSubs); + dcBusiDayPlanBillMaster.setFieldCode(dcBusiDayPlanBillSubs.get(0).getFieldCode()); + dcBusiDayPlanBillMaster.setFieldName(dcBusiDayPlanBillSubs.get(0).getFieldName()); } - return dcBusiPlanBillMaster; + return dcBusiDayPlanBillMaster; } /** * 查询计划单据主列表 * - * @param dcBusiPlanBillMaster 计划单据主 + * @param dcBusiDayPlanBillMaster 计划单据主 * @return 计划单据主 */ - public List selectDcBusiPlanBillMasterList(DcBusiPlanBillMaster dcBusiPlanBillMaster) { - return baseMapper.selectDcBusiPlanBillMasterList(dcBusiPlanBillMaster); + public List selectDcBusiPlanBillMasterList(DcBusiDayPlanBillMaster dcBusiDayPlanBillMaster) { + return baseMapper.selectDcBusiPlanBillMasterList(dcBusiDayPlanBillMaster); } /** * 新增计划单据主 * - * @param dcBusiPlanBillMaster 计划单据主 + * @param dcBusiDayPlanBillMaster 计划单据主 * @return 结果 */ @Transactional - public int insertDcBusiPlanBillMaster(DcBusiPlanBillMaster dcBusiPlanBillMaster) { - DcBusiPlanBillMaster params = new DcBusiPlanBillMaster(); - params.setBillNo(dcBusiPlanBillMaster.getBillNo()); - List dcBusiPlanBillMasters = this.selectDcBusiPlanBillMasterList(params); + public int insertDcBusiPlanBillMaster(DcBusiDayPlanBillMaster dcBusiDayPlanBillMaster) { + DcBusiDayPlanBillMaster params = new DcBusiDayPlanBillMaster(); + params.setBillNo(dcBusiDayPlanBillMaster.getBillNo()); + List dcBusiDayPlanBillMasters = this.selectDcBusiPlanBillMasterList(params); // 如果单据号重复了 - if (!CollectionUtils.isEmpty(dcBusiPlanBillMasters)) { + if (!CollectionUtils.isEmpty(dcBusiDayPlanBillMasters)) { throw new RuntimeException("单据号已存在，不可重复录入"); } // 查询公司 - SysDept company = sysDeptService.selectDeptById(dcBusiPlanBillMaster.getCompanyId()); + SysDept company = sysDeptService.selectDeptById(dcBusiDayPlanBillMaster.getCompanyId()); if (ObjectUtils.isNotEmpty(company)) { - dcBusiPlanBillMaster.setCompanyName(company.getDeptName()); + dcBusiDayPlanBillMaster.setCompanyName(company.getDeptName()); } // 查询组织 - SysDept organize = sysDeptService.selectDeptById(dcBusiPlanBillMaster.getOragnizeId()); + SysDept organize = sysDeptService.selectDeptById(dcBusiDayPlanBillMaster.getOragnizeId()); if (ObjectUtils.isNotEmpty(organize)) { - dcBusiPlanBillMaster.setOrganizeName(organize.getDeptName()); + dcBusiDayPlanBillMaster.setOrganizeName(organize.getDeptName()); } - dcBusiPlanBillMaster.setCreatedTime(DateUtils.getNowDate()); - dcBusiPlanBillMaster.setCreatedBy(SecurityUtils.getLoginUser().getUsername()); - int rows = baseMapper.insertDcBusiPlanBillMaster(dcBusiPlanBillMaster); - insertDcBusiPlanBillSub(dcBusiPlanBillMaster); + dcBusiDayPlanBillMaster.setCreatedTime(DateUtils.getNowDate()); + dcBusiDayPlanBillMaster.setCreatedBy(SecurityUtils.getLoginUser().getUsername()); + int rows = baseMapper.insertDcBusiPlanBillMaster(dcBusiDayPlanBillMaster); + insertDcBusiPlanBillSub(dcBusiDayPlanBillMaster); return rows; } /** * 修改计划单据主 * - * @param dcBusiPlanBillMaster 计划单据主 + * @param dcBusiDayPlanBillMaster 计划单据主 * @return 结果 */ @Transactional - public int updateDcBusiPlanBillMaster(DcBusiPlanBillMaster dcBusiPlanBillMaster) { - dcBusiPlanBillMaster.setUpdatedTime(DateUtils.getNowDate()); - dcBusiPlanBillMaster.setUpdatedBy(SecurityUtils.getLoginUser().getUsername()); - baseMapper.deleteDcBusiPlanBillSubByBillNo(dcBusiPlanBillMaster.getBillNo()); - insertDcBusiPlanBillSub(dcBusiPlanBillMaster); - return baseMapper.updateDcBusiPlanBillMasterByBillNo(dcBusiPlanBillMaster); + public int updateDcBusiPlanBillMaster(DcBusiDayPlanBillMaster dcBusiDayPlanBillMaster) { + dcBusiDayPlanBillMaster.setUpdatedTime(DateUtils.getNowDate()); + dcBusiDayPlanBillMaster.setUpdatedBy(SecurityUtils.getLoginUser().getUsername()); + baseMapper.deleteDcBusiPlanBillSubByBillNo(dcBusiDayPlanBillMaster.getBillNo()); + insertDcBusiPlanBillSub(dcBusiDayPlanBillMaster); + return baseMapper.updateDcBusiPlanBillMasterByBillNo(dcBusiDayPlanBillMaster); } public int checkBack(String billNo) { - DcBusiPlanBillMaster master = new DcBusiPlanBillMaster(); + DcBusiDayPlanBillMaster master = new DcBusiDayPlanBillMaster(); master.setBillNo(billNo); master.setUpdatedBy(SecurityUtils.getUsername()); master.setCreatedTime(DateUtils.getNowDate()); @@ -139,7 +138,7 @@ public class DcBusiPlanBillMasterService extends ServiceImpl subList = dcBusiPlanBillSubMapper.selectDcBusiPlanBillSubList(subParams); + List subList = dcBusiDayPlanBillSubMapper.selectDcBusiPlanBillSubList(subParams); if (!CollectionUtils.isEmpty(subList)) { // 循环修改底稿表数据 for (int i = 0, len = subList.size(); i < len; i++) { @@ -194,7 +193,7 @@ public class DcBusiPlanBillMasterService extends ServiceImpl subList = dcBusiPlanBillSubMapper.selectDcBusiPlanBillSubList(subParams); + List subList = dcBusiDayPlanBillSubMapper.selectDcBusiPlanBillSubList(subParams); for (int i = 0, len = subList.size(); i < len; i++) { DcBusiTargetDraftDaynew dcBusiTargetDraftDaynew = new DcBusiTargetDraftDaynew(); dcBusiTargetDraftDaynew.setCompanyId(master.getCompanyId()); @@ -255,9 +254,9 @@ public class DcBusiPlanBillMasterService extends ServiceImpl dcBusiPlanBillSubDaoList = dcBusiPlanBillMaster.getDcBusiPlanBillSubList(); - if (StringUtils.isNotNull(dcBusiPlanBillSubDaoList)) { - for (DcBusiPlanBillSub dcBusiPlanBillSubDao : dcBusiPlanBillSubDaoList) { - dcBusiPlanBillSubDao.setBillNo(dcBusiPlanBillMaster.getBillNo()); - dcBusiPlanBillSubMapper.insertDcBusiPlanBillSub(dcBusiPlanBillSubDao); + public void insertDcBusiPlanBillSub(DcBusiDayPlanBillMaster dcBusiDayPlanBillMaster) { + List dcBusiDayPlanBillSubDaoList = dcBusiDayPlanBillMaster.getDcBusiDayPlanBillSubList(); + if (StringUtils.isNotNull(dcBusiDayPlanBillSubDaoList)) { + for (DcBusiDayPlanBillSub dcBusiDayPlanBillSubDao : dcBusiDayPlanBillSubDaoList) { + dcBusiDayPlanBillSubDao.setBillNo(dcBusiDayPlanBillMaster.getBillNo()); + dcBusiDayPlanBillSubMapper.insertDcBusiPlanBillSub(dcBusiDayPlanBillSubDao); } } } diff --git a/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanBillSubService.java b/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiDayPlanBillSubService.java similarity index 55% rename from lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanBillSubService.java rename to lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiDayPlanBillSubService.java index b4acd2c..4f86463 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanBillSubService.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiDayPlanBillSubService.java @@ -1,10 +1,11 @@ package com.lzbi.bill.service; import java.util.List; + +import com.lzbi.bill.domain.DcBusiDayPlanBillSub; import com.lzbi.common.utils.DateUtils; import org.springframework.stereotype.Service; -import com.lzbi.bill.domain.DcBusiPlanBillSub; -import com.lzbi.bill.mapper.DcBusiPlanBillSubMapper; +import com.lzbi.bill.mapper.DcBusiDayPlanBillSubMapper; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** @@ -14,7 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * @date 2023-12-21 */ @Service -public class DcBusiPlanBillSubService extends ServiceImpl implements IService +public class DcBusiDayPlanBillSubService extends ServiceImpl implements IService { /** @@ -23,7 +24,7 @@ public class DcBusiPlanBillSubService extends ServiceImpl selectDcBusiPlanBillSubList(DcBusiPlanBillSub dcBusiPlanBillSub) + public List selectDcBusiPlanBillSubList(DcBusiDayPlanBillSub dcBusiDayPlanBillSub) { - return baseMapper.selectDcBusiPlanBillSubList(dcBusiPlanBillSub); + return baseMapper.selectDcBusiPlanBillSubList(dcBusiDayPlanBillSub); } /** * 新增计划单据明细 * - * @param dcBusiPlanBillSub 计划单据明细 + * @param dcBusiDayPlanBillSub 计划单据明细 * @return 结果 */ - public int insertDcBusiPlanBillSub(DcBusiPlanBillSub dcBusiPlanBillSub) + public int insertDcBusiPlanBillSub(DcBusiDayPlanBillSub dcBusiDayPlanBillSub) { - dcBusiPlanBillSub.setCreatedTime(DateUtils.getNowDate()); - return baseMapper.insertDcBusiPlanBillSub(dcBusiPlanBillSub); + dcBusiDayPlanBillSub.setCreatedTime(DateUtils.getNowDate()); + return baseMapper.insertDcBusiPlanBillSub(dcBusiDayPlanBillSub); } /** * 修改计划单据明细 * - * @param dcBusiPlanBillSub 计划单据明细 + * @param dcBusiDayPlanBillSub 计划单据明细 * @return 结果 */ - public int updateDcBusiPlanBillSub(DcBusiPlanBillSub dcBusiPlanBillSub) + public int updateDcBusiPlanBillSub(DcBusiDayPlanBillSub dcBusiDayPlanBillSub) { - dcBusiPlanBillSub.setUpdatedTime(DateUtils.getNowDate()); - return baseMapper.updateDcBusiPlanBillSub(dcBusiPlanBillSub); + dcBusiDayPlanBillSub.setUpdatedTime(DateUtils.getNowDate()); + return baseMapper.updateDcBusiPlanBillSub(dcBusiDayPlanBillSub); } /** diff --git a/lzbi-module/src/main/resources/mapper/asset/DcBusiPlanBillMasterMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBusiDayPlanBillMasterMapper.xml similarity index 91% rename from lzbi-module/src/main/resources/mapper/asset/DcBusiPlanBillMasterMapper.xml rename to lzbi-module/src/main/resources/mapper/asset/DcBusiDayPlanBillMasterMapper.xml index db5c8ee..2b8f4d6 100644 --- a/lzbi-module/src/main/resources/mapper/asset/DcBusiPlanBillMasterMapper.xml +++ b/lzbi-module/src/main/resources/mapper/asset/DcBusiDayPlanBillMasterMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -25,13 +25,13 @@ - - - + @@ -73,10 +73,10 @@ company_name, organize_name, oragnize_id - from dc_busi_plan_bill_master + from dc_busi_day_plan_bill_master - @@ -134,13 +134,13 @@ a.company_name, a.organize_name, a.oragnize_id - from dc_busi_plan_bill_master a + from dc_busi_day_plan_bill_master a where a.bill_no = #{billNo} - - insert into dc_busi_plan_bill_master + insert into dc_busi_day_plan_bill_master bill_no, bill_income_date, @@ -181,8 +181,8 @@ - - update dc_busi_plan_bill_master + + update dc_busi_day_plan_bill_master bill_no = #{billNo}, bill_income_date = #{billIncomeDate}, @@ -205,8 +205,8 @@ where id = #{id} - - update dc_busi_plan_bill_master + + update dc_busi_day_plan_bill_master bill_income_date = #{billIncomeDate}, bill_type = #{billType}, @@ -230,19 +230,19 @@ delete - from dc_busi_plan_bill_master + from dc_busi_day_plan_bill_master where id = #{id} - delete from dc_busi_plan_bill_master where id in + delete from dc_busi_day_plan_bill_master where id in #{id} - delete from dc_busi_plan_bill_sub where bill_no in + delete from dc_busi_day_plan_bill_sub where bill_no in #{billNo} @@ -250,12 +250,12 @@ delete - from dc_busi_plan_bill_sub + from dc_busi_day_plan_bill_sub where bill_no = #{billNo} - insert into dc_busi_plan_bill_sub( id, bill_no, field_code, field_name, asset_code, asset_name, target_code, + insert into dc_busi_day_plan_bill_sub( id, bill_no, field_code, field_name, asset_code, asset_name, target_code, taget_name, plan_value, date_year, date_month, date_day, tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time) values diff --git a/lzbi-module/src/main/resources/mapper/asset/DcBusiPlanBillSubMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBusiDayPlanBillSubMapper.xml similarity index 89% rename from lzbi-module/src/main/resources/mapper/asset/DcBusiPlanBillSubMapper.xml rename to lzbi-module/src/main/resources/mapper/asset/DcBusiDayPlanBillSubMapper.xml index 65a97f8..46d3254 100644 --- a/lzbi-module/src/main/resources/mapper/asset/DcBusiPlanBillSubMapper.xml +++ b/lzbi-module/src/main/resources/mapper/asset/DcBusiDayPlanBillSubMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -20,10 +20,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, bill_no, field_code, field_name, asset_code, asset_name, target_code, target_name, plan_value, date_year, date_month, date_day, tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time from dc_busi_plan_bill_sub + select id, bill_no, field_code, field_name, asset_code, asset_name, target_code, target_name, plan_value, date_year, date_month, date_day, tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time from dc_busi_day_plan_bill_sub - and bill_no = #{billNo} @@ -45,8 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - - insert into dc_busi_plan_bill_sub + + insert into dc_busi_day_plan_bill_sub bill_no, field_code, @@ -75,8 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - update dc_busi_plan_bill_sub + + update dc_busi_day_plan_bill_sub bill_no = #{billNo}, field_code = #{fieldCode}, @@ -94,11 +94,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from dc_busi_plan_bill_sub where id = #{id} + delete from dc_busi_day_plan_bill_sub where id = #{id} - delete from dc_busi_plan_bill_sub where id in + delete from dc_busi_day_plan_bill_sub where id in #{id}