diff --git a/lzbi-common/pom.xml b/lzbi-common/pom.xml index 6b2f583..99cf4f1 100644 --- a/lzbi-common/pom.xml +++ b/lzbi-common/pom.xml @@ -148,6 +148,12 @@ aviator 5.4.1 + + + org.postgresql + postgresql + 42.2.19 + \ No newline at end of file diff --git a/lzbi-module/src/main/java/com/lzbi/asset/controller/DcBaseParamModelController.java b/lzbi-module/src/main/java/com/lzbi/asset/controller/DcBaseParamModelController.java new file mode 100644 index 0000000..666f3fb --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/asset/controller/DcBaseParamModelController.java @@ -0,0 +1,132 @@ +package com.lzbi.asset.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.lzbi.common.annotation.Log; +import com.lzbi.common.core.controller.BaseController; +import com.lzbi.common.core.domain.AjaxResult; +import com.lzbi.common.core.page.TableDataInfo; +import com.lzbi.common.enums.BusinessType; +import com.lzbi.common.utils.DateUtils; +import com.lzbi.common.utils.poi.ExcelUtil; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import org.springframework.web.bind.annotation.*; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import com.lzbi.asset.domain.DcBaseParamModel; +import com.lzbi.asset.service.DcBaseParamModelService; + +/** + * 参数模版管理Controller + * + * @author zhousq + * @date 2023-11-24 + */ +@RestController +@RequestMapping("/asset/paramModel") +public class DcBaseParamModelController extends BaseController +{ + @Autowired + private DcBaseParamModelService dcBaseParamModelService; + + /** + * 分页列表查询 + * @return 分页数据 + */ + @GetMapping("/list") + public TableDataInfo list(DcBaseParamModel dcBaseParamModel) + { startPage(); + List list = dcBaseParamModelService.selectByVo(dcBaseParamModel); + return getDataTable(list); + } + /** + *根据ID获取详情 + *@param id + @return DcBaseParamModel 没有反馈空 + */ + @ApiOperation("根据ID获取参数模版表详细信息") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(dcBaseParamModelService.getById(id)); + } + /** + * 参数模版表-新增 + *@param + *@return DcBaseParamModel + */ + @ApiOperation("新增参数模版表一条数据") + @Log(title = "", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Valid @RequestBody DcBaseParamModel dcBaseParamModel) { + //BeanValidators.validateWithException(validator, dcBaseParamModel); + dcBaseParamModel.setCreatedBy(getUsername()); + dcBaseParamModel.setCreatedTime(DateUtils.getNowDate()); + dcBaseParamModel.setTenantId("0"); + dcBaseParamModel.setUpdatedBy(getUsername()); + dcBaseParamModel.setUpdatedTime(DateUtils.getNowDate()); + return toAjax(dcBaseParamModelService.insertByVo(dcBaseParamModel)); + } + /** + * 参数模版表-修改 + *@param + *@return DcBaseParamModel + */ + @ApiOperation("参数模版表修改") + @Log(title = "", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Valid @RequestBody DcBaseParamModel dcBaseParamModel) { + //BeanValidators.validateWithException(validator, dcBaseParamModel); + dcBaseParamModel.setUpdatedBy(getUsername()); + dcBaseParamModel.setUpdatedTime(DateUtils.getNowDate()); + return toAjax(dcBaseParamModelService.updateById(dcBaseParamModel)); + } + /** + * 通过ID删除参数模版表 + * @param id + * @return 成功1 失败0 + */ + @ApiOperation("根据ID删除参数模版表") + @Log(title = "单一参数模版表", businessType = BusinessType.DELETE) + @DeleteMapping("/id/{id}") + public AjaxResult batchRemove(@PathVariable Long id) { + DcBaseParamModel dcBaseParamModel=new DcBaseParamModel(); + dcBaseParamModel.setId(id); + return toAjax(dcBaseParamModelService.removeById( dcBaseParamModel)); + } + /** + * 批量删除参数模版表 + * @param ids 数组 + * @return 删除的条数 + */ + @ApiOperation("批量删除参数模版表") + @Log(title = "批量删除参数模版表", businessType = BusinessType.DELETE) + @DeleteMapping("/ids/{ids}") + public AjaxResult batchRemove(@PathVariable Long[] ids) { + List collect = Arrays.stream(ids).collect(Collectors.toList()); + return toAjax(dcBaseParamModelService.removeBatchByIds(collect)); + } + /** + * 通过模版导入"参数模版表数据 + * + */ + @ApiOperation("参数模版表数据导入") + @PostMapping("/importTemplate") + public void importTemplate(HttpServletResponse response) { + ExcelUtil util = new ExcelUtil<>(DcBaseParamModel.class); + util.importTemplateExcel(response, "参数模版表导出数据"); + } + /** + * "参数模版表数据导出功能 + */ + @ApiOperation("导出参数模版表数据") + @PostMapping("/export") + public void export(HttpServletResponse response, DcBaseParamModel dcBaseParamModel) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List list = dcBaseParamModelService.list(queryWrapper); + ExcelUtil util = new ExcelUtil<>(DcBaseParamModel.class); + util.exportExcel(response, list, "导出的参数模版表数据"); + } +} diff --git a/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseParamModel.java b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseParamModel.java new file mode 100644 index 0000000..912c2d7 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseParamModel.java @@ -0,0 +1,47 @@ +package com.lzbi.asset.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import com.lzbi.module.base.BaseModuleEntity; + +/** + * 参数模版表; + * @author : zhousq + * @date : 2023-11-24 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) +@ApiModel(value = "参数模版表",description = "") +//@TableName("dc_base_param_model") +public class DcBaseParamModel extends BaseModuleEntity{ + + /** 主键 */ + @ApiModelProperty(name = "主键",notes = "") + private long id ; + /** 参数模型编码 */ + @ApiModelProperty(name = "参数模型编码",notes = "") + private String paramModelCode ; + /** 参数模型名称 */ + @ApiModelProperty(name = "参数模型名称",notes = "") + private String paramModelName ; + /** 所属专业 */ + @ApiModelProperty(name = "所属专业",notes = "") + private String paramModelField ; + /** 参数模型分组 */ + @ApiModelProperty(name = "参数模型分组",notes = "") + private String paramModelGroup ; + /** 参数来源 */ + @ApiModelProperty(name = "参数来源",notes = "") + private String paramModelSource ; + /** 状态标识 */ + @ApiModelProperty(name = "状态标识",notes = "") + private String flagStatus ; + +} \ No newline at end of file diff --git a/lzbi-module/src/main/java/com/lzbi/asset/mapper/DcBaseParamModelMapper.java b/lzbi-module/src/main/java/com/lzbi/asset/mapper/DcBaseParamModelMapper.java new file mode 100644 index 0000000..dfdb686 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/asset/mapper/DcBaseParamModelMapper.java @@ -0,0 +1,17 @@ +package com.lzbi.asset.mapper; + +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lzbi.asset.domain.DcBaseParamModel; +import java.util.List; + +/** + * 参数模版表;(dc_base_param_model)表数据库访问层 + * @author : zhousq + * @date : 2023-11-24 + */ +@InterceptorIgnore(tenantLine = "true") +public interface DcBaseParamModelMapper extends BaseMapper{ + List selectByVo( DcBaseParamModel beanVo); + int insertByVo( DcBaseParamModel beanVo); +} \ No newline at end of file diff --git a/lzbi-module/src/main/java/com/lzbi/asset/service/DcBaseParamModelService.java b/lzbi-module/src/main/java/com/lzbi/asset/service/DcBaseParamModelService.java new file mode 100644 index 0000000..0e6b0cd --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/asset/service/DcBaseParamModelService.java @@ -0,0 +1,25 @@ +package com.lzbi.asset.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lzbi.asset.mapper.DcBaseParamModelMapper; +import org.springframework.stereotype.Service; +import com.lzbi.asset.domain.DcBaseParamModel; +import java.util.List; + +/** + * 参数模版表;(dc_base_param_model)表服务接口 + * @author : zhousq + * @date : 2023-11-24 + */ +@Service +public class DcBaseParamModelService extends ServiceImpl implements IService { + + public List selectByVo( DcBaseParamModel dcBaseParamModel){ + return baseMapper.selectByVo(dcBaseParamModel); + } + public int insertByVo( DcBaseParamModel dcBaseParamModel){ + return baseMapper.insertByVo(dcBaseParamModel); + } + +} \ No newline at end of file diff --git a/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiDataScreenMainController.java b/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiDataScreenMainController.java index f090316..500463a 100644 --- a/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiDataScreenMainController.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiDataScreenMainController.java @@ -2,18 +2,15 @@ package com.lzbi.bi.controller; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.lzbi.bi.domain.DcBusiDataScreenVo; -import com.lzbi.bi.domain.DcBusiTargetDraft; import com.lzbi.bi.service.DcBusiDataScreenMainService; import com.lzbi.common.core.controller.BaseController; import com.lzbi.common.core.domain.AjaxResult; import com.lzbi.common.utils.StringUtils; -import com.lzbi.common.utils.http.HttpUtils; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiTargetAdjustController.java b/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiTargetAdjustController.java deleted file mode 100644 index b68bb2f..0000000 --- a/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiTargetAdjustController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.lzbi.bi.controller; - -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.bi.domain.DcBusiTargetAdjust; -import com.lzbi.bi.service.IDcBusiTargetAdjustService; -import com.lzbi.common.utils.poi.ExcelUtil; -import com.lzbi.common.core.page.TableDataInfo; - -/** - * 资产指标调整单Controller - * - * @author zhousq - * @date 2023-11-23 - */ -@RestController -@RequestMapping("/asset/AssetTargetAdjustBill") -public class DcBusiTargetAdjustController extends BaseController -{ - @Autowired - private IDcBusiTargetAdjustService dcBusiTargetAdjustService; - - /** - * 查询资产指标调整单列表 - */ - @PreAuthorize("@ss.hasPermi('assetData:AssetTargetAdjustBill:list')") - @GetMapping("/list") - public TableDataInfo list(DcBusiTargetAdjust dcBusiTargetAdjust) - { - startPage(); - List list = dcBusiTargetAdjustService.selectDcBusiTargetAdjustList(dcBusiTargetAdjust); - return getDataTable(list); - } - - /** - * 导出资产指标调整单列表 - */ - @PreAuthorize("@ss.hasPermi('assetData:AssetTargetAdjustBill:export')") - @Log(title = "资产指标调整单", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DcBusiTargetAdjust dcBusiTargetAdjust) - { - List list = dcBusiTargetAdjustService.selectDcBusiTargetAdjustList(dcBusiTargetAdjust); - ExcelUtil util = new ExcelUtil(DcBusiTargetAdjust.class); - util.exportExcel(response, list, "资产指标调整单数据"); - } - - /** - * 获取资产指标调整单详细信息 - */ - @PreAuthorize("@ss.hasPermi('assetData:AssetTargetAdjustBill:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(dcBusiTargetAdjustService.selectDcBusiTargetAdjustById(id)); - } - - /** - * 新增资产指标调整单 - */ - @PreAuthorize("@ss.hasPermi('assetData:AssetTargetAdjustBill:add')") - @Log(title = "资产指标调整单", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody DcBusiTargetAdjust dcBusiTargetAdjust) - { - return toAjax(dcBusiTargetAdjustService.insertDcBusiTargetAdjust(dcBusiTargetAdjust)); - } - - /** - * 修改资产指标调整单 - */ - @PreAuthorize("@ss.hasPermi('assetData:AssetTargetAdjustBill:edit')") - @Log(title = "资产指标调整单", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody DcBusiTargetAdjust dcBusiTargetAdjust) - { - return toAjax(dcBusiTargetAdjustService.updateDcBusiTargetAdjust(dcBusiTargetAdjust)); - } - - /** - * 删除资产指标调整单 - */ - @PreAuthorize("@ss.hasPermi('assetData:AssetTargetAdjustBill:remove')") - @Log(title = "资产指标调整单", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(dcBusiTargetAdjustService.deleteDcBusiTargetAdjustByIds(ids)); - } -} diff --git a/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiTargetDraftController.java b/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiTargetDraftController.java deleted file mode 100644 index 6922f88..0000000 --- a/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiTargetDraftController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.lzbi.bi.controller; - -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.bi.domain.DcBusiTargetDraft; -import com.lzbi.bi.service.IDcBusiTargetDraftService; -import com.lzbi.common.utils.poi.ExcelUtil; -import com.lzbi.common.core.page.TableDataInfo; - -/** - * 指标数据底稿Controller - * - * @author zhousq - * @date 2023-11-23 - */ -@RestController -@RequestMapping("/asset/AssetTargetdraft") -public class DcBusiTargetDraftController extends BaseController -{ - @Autowired - private IDcBusiTargetDraftService dcBusiTargetDraftService; - - /** - * 查询指标数据底稿列表 - */ - @PreAuthorize("@ss.hasPermi('assetData:AssetTargetdraft:list')") - @GetMapping("/list") - public TableDataInfo list(DcBusiTargetDraft dcBusiTargetDraft) - { - startPage(); - List list = dcBusiTargetDraftService.selectDcBusiTargetDraftList(dcBusiTargetDraft); - return getDataTable(list); - } - - /** - * 导出指标数据底稿列表 - */ - @PreAuthorize("@ss.hasPermi('assetData:AssetTargetdraft:export')") - @Log(title = "指标数据底稿", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DcBusiTargetDraft dcBusiTargetDraft) - { - List list = dcBusiTargetDraftService.selectDcBusiTargetDraftList(dcBusiTargetDraft); - ExcelUtil util = new ExcelUtil(DcBusiTargetDraft.class); - util.exportExcel(response, list, "指标数据底稿数据"); - } - - /** - * 获取指标数据底稿详细信息 - */ - @PreAuthorize("@ss.hasPermi('assetData:AssetTargetdraft:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(dcBusiTargetDraftService.selectDcBusiTargetDraftById(id)); - } - - /** - * 新增指标数据底稿 - */ - @PreAuthorize("@ss.hasPermi('assetData:AssetTargetdraft:add')") - @Log(title = "指标数据底稿", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody DcBusiTargetDraft dcBusiTargetDraft) - { - return toAjax(dcBusiTargetDraftService.insertDcBusiTargetDraft(dcBusiTargetDraft)); - } - - /** - * 修改指标数据底稿 - */ - @PreAuthorize("@ss.hasPermi('assetData:AssetTargetdraft:edit')") - @Log(title = "指标数据底稿", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody DcBusiTargetDraft dcBusiTargetDraft) - { - return toAjax(dcBusiTargetDraftService.updateDcBusiTargetDraft(dcBusiTargetDraft)); - } - - /** - * 删除指标数据底稿 - */ - @PreAuthorize("@ss.hasPermi('assetData:AssetTargetdraft:remove')") - @Log(title = "指标数据底稿", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(dcBusiTargetDraftService.deleteDcBusiTargetDraftByIds(ids)); - } -} diff --git a/lzbi-module/src/main/java/com/lzbi/bi/domain/DcBaseAssetInfo.java b/lzbi-module/src/main/java/com/lzbi/bi/domain/DcBaseAssetInfo.java deleted file mode 100644 index bc1a4b5..0000000 --- a/lzbi-module/src/main/java/com/lzbi/bi/domain/DcBaseAssetInfo.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.lzbi.bi.domain; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; -import com.lzbi.module.base.BaseModuleEntity; - -/** - * 资产信息表; - * @author : zhousq - * @date : 2023-11-16 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -@ApiModel(value = "资产信息表",description = "") -@TableName("dc_base_asset_info") -public class DcBaseAssetInfo extends BaseModuleEntity{ - - /** 资产ID */ - @ApiModelProperty(name = "资产ID",notes = "") - @TableId - private long id ; - /** 资产名称 */ - @ApiModelProperty(name = "资产名称",notes = "") - private String assetName ; - /** 资产编码 */ - @ApiModelProperty(name = "资产编码",notes = "") - private String assetCode ; - /** 资产类别;设备型资产；管理型资产； */ - @ApiModelProperty(name = "资产类别",notes = "设备型资产；管理型资产；") - private String assetClass ; - /** 部门共享;0不共享；1限定部门共享；2所有部门可见 */ - @ApiModelProperty(name = "部门共享",notes = "0不共享；1限定部门共享；2所有部门可见") - private String flagValidateDept ; - /** 角色内共享;0不共享；1限定角色共享；2所有角色可见 */ - @ApiModelProperty(name = "角色内共享",notes = "0不共享；1限定角色共享；2所有角色可见") - private String flagValidateRole ; - /** 用户共享;0不共享；1限定用户共享；2所有用户可见 */ - @ApiModelProperty(name = "用户共享",notes = "0不共享；1限定用户共享；2所有用户可见") - private String flagValidateUser ; - /** 资产状态 */ - @ApiModelProperty(name = "资产状态",notes = "") - private String statusAsset ; - /** 所属公司 */ - @ApiModelProperty(name = "所属公司",notes = "") - private Integer comanyId ; - /** 所属组织结构 */ - @ApiModelProperty(name = "所属组织结构",notes = "") - private Integer deptId ; - /** 生产专业 */ - @ApiModelProperty(name = "生产专业",notes = "") - private String workType ; - -} \ No newline at end of file diff --git a/lzbi-module/src/main/java/com/lzbi/bi/domain/DcBusiTargetAdjust.java b/lzbi-module/src/main/java/com/lzbi/bi/domain/DcBusiTargetAdjust.java deleted file mode 100644 index e49297a..0000000 --- a/lzbi-module/src/main/java/com/lzbi/bi/domain/DcBusiTargetAdjust.java +++ /dev/null @@ -1,296 +0,0 @@ -package com.lzbi.bi.domain; - -import java.math.BigDecimal; -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 com.lzbi.common.annotation.Excel; -import com.lzbi.common.core.domain.BaseEntity; - -/** - * 资产指标调整单对象 dc_busi_target_adjust - * - * @author zhousq - * @date 2023-11-23 - */ -public class DcBusiTargetAdjust extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 租户号 */ - @Excel(name = "租户号") - private String tenantId; - - /** 乐观锁 */ - @Excel(name = "乐观锁") - private Long REVISION; - - /** 创建人 */ - @Excel(name = "创建人") - private String createdBy; - - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date createdTime; - - /** 更新人 */ - @Excel(name = "更新人") - private String updatedBy; - - /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date updatedTime; - - /** 删除人 */ - @Excel(name = "删除人") - private String deleteBy; - - /** 删除时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date deleteTime; - - /** 单据号 */ - @Excel(name = "单据号") - private String billSerial; - - /** 单据类别 */ - @Excel(name = "单据类别") - private String biilType; - - /** 指标编码 */ - @Excel(name = "指标编码") - private String targetCode; - - /** 资产ID */ - @Excel(name = "资产ID") - private Long assetId; - - /** 原始值 */ - @Excel(name = "原始值") - private BigDecimal valOrginal; - - /** 调整值 */ - @Excel(name = "调整值") - private BigDecimal valAdjust; - - /** 结果值 */ - @Excel(name = "结果值") - private BigDecimal valResult; - - /** 主键 */ - private Long id; - - /** 调整目标日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "调整目标日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date dateAdjust; - - /** 调整目标时间 */ - @Excel(name = "调整目标时间") - private String hourAdjust; - - /** 调整目标日期字符串 */ - @Excel(name = "调整目标日期字符串") - private String dateAdjustStr; - - public void setTenantId(String tenantId) - { - this.tenantId = tenantId; - } - - public String getTenantId() - { - return tenantId; - } - public void setREVISION(Long REVISION) - { - this.REVISION = REVISION; - } - - public Long getREVISION() - { - return REVISION; - } - public void setCreatedBy(String createdBy) - { - this.createdBy = createdBy; - } - - public String getCreatedBy() - { - return createdBy; - } - public void setCreatedTime(Date createdTime) - { - this.createdTime = createdTime; - } - - public Date getCreatedTime() - { - return createdTime; - } - public void setUpdatedBy(String updatedBy) - { - this.updatedBy = updatedBy; - } - - public String getUpdatedBy() - { - return updatedBy; - } - public void setUpdatedTime(Date updatedTime) - { - this.updatedTime = updatedTime; - } - - public Date getUpdatedTime() - { - return updatedTime; - } - public void setDeleteBy(String deleteBy) - { - this.deleteBy = deleteBy; - } - - public String getDeleteBy() - { - return deleteBy; - } - public void setDeleteTime(Date deleteTime) - { - this.deleteTime = deleteTime; - } - - public Date getDeleteTime() - { - return deleteTime; - } - public void setBillSerial(String billSerial) - { - this.billSerial = billSerial; - } - - public String getBillSerial() - { - return billSerial; - } - public void setBiilType(String biilType) - { - this.biilType = biilType; - } - - public String getBiilType() - { - return biilType; - } - public void setTargetCode(String targetCode) - { - this.targetCode = targetCode; - } - - public String getTargetCode() - { - return targetCode; - } - public void setAssetId(Long assetId) - { - this.assetId = assetId; - } - - public Long getAssetId() - { - return assetId; - } - public void setValOrginal(BigDecimal valOrginal) - { - this.valOrginal = valOrginal; - } - - public BigDecimal getValOrginal() - { - return valOrginal; - } - public void setValAdjust(BigDecimal valAdjust) - { - this.valAdjust = valAdjust; - } - - public BigDecimal getValAdjust() - { - return valAdjust; - } - public void setValResult(BigDecimal valResult) - { - this.valResult = valResult; - } - - public BigDecimal getValResult() - { - return valResult; - } - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setDateAdjust(Date dateAdjust) - { - this.dateAdjust = dateAdjust; - } - - public Date getDateAdjust() - { - return dateAdjust; - } - public void setHourAdjust(String hourAdjust) - { - this.hourAdjust = hourAdjust; - } - - public String getHourAdjust() - { - return hourAdjust; - } - public void setDateAdjustStr(String dateAdjustStr) - { - this.dateAdjustStr = dateAdjustStr; - } - - public String getDateAdjustStr() - { - return dateAdjustStr; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("tenantId", getTenantId()) - .append("REVISION", getREVISION()) - .append("createdBy", getCreatedBy()) - .append("createdTime", getCreatedTime()) - .append("updatedBy", getUpdatedBy()) - .append("updatedTime", getUpdatedTime()) - .append("deleteBy", getDeleteBy()) - .append("deleteTime", getDeleteTime()) - .append("billSerial", getBillSerial()) - .append("biilType", getBiilType()) - .append("targetCode", getTargetCode()) - .append("assetId", getAssetId()) - .append("valOrginal", getValOrginal()) - .append("valAdjust", getValAdjust()) - .append("valResult", getValResult()) - .append("id", getId()) - .append("dateAdjust", getDateAdjust()) - .append("hourAdjust", getHourAdjust()) - .append("dateAdjustStr", getDateAdjustStr()) - .toString(); - } -} diff --git a/lzbi-module/src/main/java/com/lzbi/bi/domain/DcBusiTargetDraft.java b/lzbi-module/src/main/java/com/lzbi/bi/domain/DcBusiTargetDraft.java deleted file mode 100644 index 525ea5c..0000000 --- a/lzbi-module/src/main/java/com/lzbi/bi/domain/DcBusiTargetDraft.java +++ /dev/null @@ -1,729 +0,0 @@ -package com.lzbi.bi.domain; - -import java.math.BigDecimal; -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 com.lzbi.common.annotation.Excel; -import com.lzbi.common.core.domain.BaseEntity; - -/** - * 指标数据底稿对象 dc_busi_target_draft - * - * @author zhousq - * @date 2023-11-23 - */ -public class DcBusiTargetDraft extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 租户号 */ - @Excel(name = "租户号") - private String tenantId; - - /** 乐观锁 */ - @Excel(name = "乐观锁") - private Long REVISION; - - /** 创建人 */ - @Excel(name = "创建人") - private String createdBy; - - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date createdTime; - - /** 更新人 */ - @Excel(name = "更新人") - private String updatedBy; - - /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date updatedTime; - - /** 删除人 */ - @Excel(name = "删除人") - private String deleteBy; - - /** 删除时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date deleteTime; - - /** 主键 */ - private Long id; - - /** 指标主键 */ - @Excel(name = "指标主键") - private Long targetId; - - /** 指标编码 */ - @Excel(name = "指标编码") - private String targetCode; - - /** 年份 */ - @Excel(name = "年份") - private String countYear; - - /** 月份 */ - @Excel(name = "月份") - private String countMonth; - - /** 日 */ - @Excel(name = "日") - private String countDay; - - /** 1时;[00:00:00，00：59:59] */ - @Excel(name = "1时;[00:00:00，00：59:59]") - private BigDecimal val01; - - /** 2时;[01:00:00，01：59:59] */ - @Excel(name = "2时;[01:00:00，01：59:59]") - private BigDecimal val02; - - /** 3时;[02:00:00，02：59:59] */ - @Excel(name = "3时;[02:00:00，02：59:59]") - private BigDecimal val03; - - /** 4时 */ - @Excel(name = "4时") - private BigDecimal val04; - - /** 5时 */ - @Excel(name = "5时") - private BigDecimal val05; - - /** 6时 */ - @Excel(name = "6时") - private BigDecimal val06; - - /** 7时 */ - @Excel(name = "7时") - private BigDecimal val07; - - /** 8时 */ - @Excel(name = "8时") - private BigDecimal val08; - - /** 9时 */ - @Excel(name = "9时") - private BigDecimal val09; - - /** 10时 */ - @Excel(name = "10时") - private BigDecimal val10; - - /** 11时 */ - @Excel(name = "11时") - private BigDecimal val11; - - /** 12时 */ - @Excel(name = "12时") - private BigDecimal val12; - - /** 13时 */ - @Excel(name = "13时") - private BigDecimal val13; - - /** 14时 */ - @Excel(name = "14时") - private BigDecimal val14; - - /** 15时 */ - @Excel(name = "15时") - private BigDecimal val15; - - /** 16时 */ - @Excel(name = "16时") - private BigDecimal val16; - - /** 17时 */ - @Excel(name = "17时") - private BigDecimal val17; - - /** 18时 */ - @Excel(name = "18时") - private BigDecimal val18; - - /** 18时 */ - @Excel(name = "18时") - private BigDecimal val19; - - /** 20时 */ - @Excel(name = "20时") - private BigDecimal val20; - - /** 21时 */ - @Excel(name = "21时") - private BigDecimal val21; - - /** 22时 */ - @Excel(name = "22时") - private BigDecimal val22; - - /** 23时 */ - @Excel(name = "23时") - private BigDecimal val23; - - /** 24时 */ - @Excel(name = "24时") - private BigDecimal val24; - - /** 公司 */ - @Excel(name = "公司") - private String companyCode; - - /** 公司名称 */ - @Excel(name = "公司名称") - private String companyName; - - /** 组织机构代码 */ - @Excel(name = "组织机构代码") - private String orgCode; - - /** 组织机构名称 */ - @Excel(name = "组织机构名称") - private String orgName; - - /** 生产专业 */ - @Excel(name = "生产专业") - private String workType; - - /** 统计单元名称 */ - @Excel(name = "统计单元名称") - private String countUnitName; - - /** 资产ID */ - @Excel(name = "资产ID") - private Long assetId; - - /** 上线 */ - @Excel(name = "上线") - private BigDecimal valUpLimit; - - /** 下线 */ - @Excel(name = "下线") - private BigDecimal valDownLimit; - - /** 均值 */ - @Excel(name = "均值") - private BigDecimal valAvg; - - /** 合值 */ - @Excel(name = "合值") - private BigDecimal valTotal; - - /** 积算 */ - @Excel(name = "积算") - private BigDecimal valCompute; - - public void setTenantId(String tenantId) - { - this.tenantId = tenantId; - } - - public String getTenantId() - { - return tenantId; - } - public void setREVISION(Long REVISION) - { - this.REVISION = REVISION; - } - - public Long getREVISION() - { - return REVISION; - } - public void setCreatedBy(String createdBy) - { - this.createdBy = createdBy; - } - - public String getCreatedBy() - { - return createdBy; - } - public void setCreatedTime(Date createdTime) - { - this.createdTime = createdTime; - } - - public Date getCreatedTime() - { - return createdTime; - } - public void setUpdatedBy(String updatedBy) - { - this.updatedBy = updatedBy; - } - - public String getUpdatedBy() - { - return updatedBy; - } - public void setUpdatedTime(Date updatedTime) - { - this.updatedTime = updatedTime; - } - - public Date getUpdatedTime() - { - return updatedTime; - } - public void setDeleteBy(String deleteBy) - { - this.deleteBy = deleteBy; - } - - public String getDeleteBy() - { - return deleteBy; - } - public void setDeleteTime(Date deleteTime) - { - this.deleteTime = deleteTime; - } - - public Date getDeleteTime() - { - return deleteTime; - } - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setTargetId(Long targetId) - { - this.targetId = targetId; - } - - public Long getTargetId() - { - return targetId; - } - public void setTargetCode(String targetCode) - { - this.targetCode = targetCode; - } - - public String getTargetCode() - { - return targetCode; - } - public void setCountYear(String countYear) - { - this.countYear = countYear; - } - - public String getCountYear() - { - return countYear; - } - public void setCountMonth(String countMonth) - { - this.countMonth = countMonth; - } - - public String getCountMonth() - { - return countMonth; - } - public void setCountDay(String countDay) - { - this.countDay = countDay; - } - - public String getCountDay() - { - return countDay; - } - public void setVal01(BigDecimal val01) - { - this.val01 = val01; - } - - public BigDecimal getVal01() - { - return val01; - } - public void setVal02(BigDecimal val02) - { - this.val02 = val02; - } - - public BigDecimal getVal02() - { - return val02; - } - public void setVal03(BigDecimal val03) - { - this.val03 = val03; - } - - public BigDecimal getVal03() - { - return val03; - } - public void setVal04(BigDecimal val04) - { - this.val04 = val04; - } - - public BigDecimal getVal04() - { - return val04; - } - public void setVal05(BigDecimal val05) - { - this.val05 = val05; - } - - public BigDecimal getVal05() - { - return val05; - } - public void setVal06(BigDecimal val06) - { - this.val06 = val06; - } - - public BigDecimal getVal06() - { - return val06; - } - public void setVal07(BigDecimal val07) - { - this.val07 = val07; - } - - public BigDecimal getVal07() - { - return val07; - } - public void setVal08(BigDecimal val08) - { - this.val08 = val08; - } - - public BigDecimal getVal08() - { - return val08; - } - public void setVal09(BigDecimal val09) - { - this.val09 = val09; - } - - public BigDecimal getVal09() - { - return val09; - } - public void setVal10(BigDecimal val10) - { - this.val10 = val10; - } - - public BigDecimal getVal10() - { - return val10; - } - public void setVal11(BigDecimal val11) - { - this.val11 = val11; - } - - public BigDecimal getVal11() - { - return val11; - } - public void setVal12(BigDecimal val12) - { - this.val12 = val12; - } - - public BigDecimal getVal12() - { - return val12; - } - public void setVal13(BigDecimal val13) - { - this.val13 = val13; - } - - public BigDecimal getVal13() - { - return val13; - } - public void setVal14(BigDecimal val14) - { - this.val14 = val14; - } - - public BigDecimal getVal14() - { - return val14; - } - public void setVal15(BigDecimal val15) - { - this.val15 = val15; - } - - public BigDecimal getVal15() - { - return val15; - } - public void setVal16(BigDecimal val16) - { - this.val16 = val16; - } - - public BigDecimal getVal16() - { - return val16; - } - public void setVal17(BigDecimal val17) - { - this.val17 = val17; - } - - public BigDecimal getVal17() - { - return val17; - } - public void setVal18(BigDecimal val18) - { - this.val18 = val18; - } - - public BigDecimal getVal18() - { - return val18; - } - public void setVal19(BigDecimal val19) - { - this.val19 = val19; - } - - public BigDecimal getVal19() - { - return val19; - } - public void setVal20(BigDecimal val20) - { - this.val20 = val20; - } - - public BigDecimal getVal20() - { - return val20; - } - public void setVal21(BigDecimal val21) - { - this.val21 = val21; - } - - public BigDecimal getVal21() - { - return val21; - } - public void setVal22(BigDecimal val22) - { - this.val22 = val22; - } - - public BigDecimal getVal22() - { - return val22; - } - public void setVal23(BigDecimal val23) - { - this.val23 = val23; - } - - public BigDecimal getVal23() - { - return val23; - } - public void setVal24(BigDecimal val24) - { - this.val24 = val24; - } - - public BigDecimal getVal24() - { - return val24; - } - public void setCompanyCode(String companyCode) - { - this.companyCode = companyCode; - } - - public String getCompanyCode() - { - return companyCode; - } - public void setCompanyName(String companyName) - { - this.companyName = companyName; - } - - public String getCompanyName() - { - return companyName; - } - public void setOrgCode(String orgCode) - { - this.orgCode = orgCode; - } - - public String getOrgCode() - { - return orgCode; - } - public void setOrgName(String orgName) - { - this.orgName = orgName; - } - - public String getOrgName() - { - return orgName; - } - public void setWorkType(String workType) - { - this.workType = workType; - } - - public String getWorkType() - { - return workType; - } - public void setCountUnitName(String countUnitName) - { - this.countUnitName = countUnitName; - } - - public String getCountUnitName() - { - return countUnitName; - } - public void setAssetId(Long assetId) - { - this.assetId = assetId; - } - - public Long getAssetId() - { - return assetId; - } - public void setValUpLimit(BigDecimal valUpLimit) - { - this.valUpLimit = valUpLimit; - } - - public BigDecimal getValUpLimit() - { - return valUpLimit; - } - public void setValDownLimit(BigDecimal valDownLimit) - { - this.valDownLimit = valDownLimit; - } - - public BigDecimal getValDownLimit() - { - return valDownLimit; - } - public void setValAvg(BigDecimal valAvg) - { - this.valAvg = valAvg; - } - - public BigDecimal getValAvg() - { - return valAvg; - } - public void setValTotal(BigDecimal valTotal) - { - this.valTotal = valTotal; - } - - public BigDecimal getValTotal() - { - return valTotal; - } - public void setValCompute(BigDecimal valCompute) - { - this.valCompute = valCompute; - } - - public BigDecimal getValCompute() - { - return valCompute; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("tenantId", getTenantId()) - .append("REVISION", getREVISION()) - .append("createdBy", getCreatedBy()) - .append("createdTime", getCreatedTime()) - .append("updatedBy", getUpdatedBy()) - .append("updatedTime", getUpdatedTime()) - .append("deleteBy", getDeleteBy()) - .append("deleteTime", getDeleteTime()) - .append("id", getId()) - .append("targetId", getTargetId()) - .append("targetCode", getTargetCode()) - .append("countYear", getCountYear()) - .append("countMonth", getCountMonth()) - .append("countDay", getCountDay()) - .append("val01", getVal01()) - .append("val02", getVal02()) - .append("val03", getVal03()) - .append("val04", getVal04()) - .append("val05", getVal05()) - .append("val06", getVal06()) - .append("val07", getVal07()) - .append("val08", getVal08()) - .append("val09", getVal09()) - .append("val10", getVal10()) - .append("val11", getVal11()) - .append("val12", getVal12()) - .append("val13", getVal13()) - .append("val14", getVal14()) - .append("val15", getVal15()) - .append("val16", getVal16()) - .append("val17", getVal17()) - .append("val18", getVal18()) - .append("val19", getVal19()) - .append("val20", getVal20()) - .append("val21", getVal21()) - .append("val22", getVal22()) - .append("val23", getVal23()) - .append("val24", getVal24()) - .append("companyCode", getCompanyCode()) - .append("companyName", getCompanyName()) - .append("orgCode", getOrgCode()) - .append("orgName", getOrgName()) - .append("workType", getWorkType()) - .append("countUnitName", getCountUnitName()) - .append("assetId", getAssetId()) - .append("valUpLimit", getValUpLimit()) - .append("valDownLimit", getValDownLimit()) - .append("valAvg", getValAvg()) - .append("valTotal", getValTotal()) - .append("valCompute", getValCompute()) - .toString(); - } -} diff --git a/lzbi-module/src/main/java/com/lzbi/bi/mapper/DcBaseAssetInfoMapper.java b/lzbi-module/src/main/java/com/lzbi/bi/mapper/DcBaseAssetInfoMapper.java deleted file mode 100644 index c3b32c4..0000000 --- a/lzbi-module/src/main/java/com/lzbi/bi/mapper/DcBaseAssetInfoMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.lzbi.bi.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.lzbi.bi.domain.DcBaseAssetInfo; -import java.util.List; - -/** - * 资产信息表;(dc_base_asset_info)表数据库访问层 - * @author : zhousq - * @date : 2023-11-16 - */ -@InterceptorIgnore(tenantLine = "true") -public interface DcBaseAssetInfoMapper extends BaseMapper{ - List selectByVo( DcBaseAssetInfo beanVo); - int insertByVo( DcBaseAssetInfo beanVo); -} \ No newline at end of file diff --git a/lzbi-module/src/main/java/com/lzbi/bi/mapper/DcBusiTargetAdjustMapper.java b/lzbi-module/src/main/java/com/lzbi/bi/mapper/DcBusiTargetAdjustMapper.java deleted file mode 100644 index f1167b8..0000000 --- a/lzbi-module/src/main/java/com/lzbi/bi/mapper/DcBusiTargetAdjustMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.lzbi.bi.mapper; - -import java.util.List; -import com.lzbi.bi.domain.DcBusiTargetAdjust; - -/** - * 资产指标调整单Mapper接口 - * - * @author zhousq - * @date 2023-11-23 - */ -public interface DcBusiTargetAdjustMapper -{ - /** - * 查询资产指标调整单 - * - * @param id 资产指标调整单主键 - * @return 资产指标调整单 - */ - public DcBusiTargetAdjust selectDcBusiTargetAdjustById(Long id); - - /** - * 查询资产指标调整单列表 - * - * @param dcBusiTargetAdjust 资产指标调整单 - * @return 资产指标调整单集合 - */ - public List selectDcBusiTargetAdjustList(DcBusiTargetAdjust dcBusiTargetAdjust); - - /** - * 新增资产指标调整单 - * - * @param dcBusiTargetAdjust 资产指标调整单 - * @return 结果 - */ - public int insertDcBusiTargetAdjust(DcBusiTargetAdjust dcBusiTargetAdjust); - - /** - * 修改资产指标调整单 - * - * @param dcBusiTargetAdjust 资产指标调整单 - * @return 结果 - */ - public int updateDcBusiTargetAdjust(DcBusiTargetAdjust dcBusiTargetAdjust); - - /** - * 删除资产指标调整单 - * - * @param id 资产指标调整单主键 - * @return 结果 - */ - public int deleteDcBusiTargetAdjustById(Long id); - - /** - * 批量删除资产指标调整单 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteDcBusiTargetAdjustByIds(Long[] ids); -} diff --git a/lzbi-module/src/main/java/com/lzbi/bi/mapper/DcBusiTargetDraftMapper.java b/lzbi-module/src/main/java/com/lzbi/bi/mapper/DcBusiTargetDraftMapper.java deleted file mode 100644 index 9ee2e35..0000000 --- a/lzbi-module/src/main/java/com/lzbi/bi/mapper/DcBusiTargetDraftMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.lzbi.bi.mapper; - -import java.util.List; -import com.lzbi.bi.domain.DcBusiTargetDraft; - -/** - * 指标数据底稿Mapper接口 - * - * @author zhousq - * @date 2023-11-23 - */ -public interface DcBusiTargetDraftMapper -{ - /** - * 查询指标数据底稿 - * - * @param id 指标数据底稿主键 - * @return 指标数据底稿 - */ - public DcBusiTargetDraft selectDcBusiTargetDraftById(Long id); - - /** - * 查询指标数据底稿列表 - * - * @param dcBusiTargetDraft 指标数据底稿 - * @return 指标数据底稿集合 - */ - public List selectDcBusiTargetDraftList(DcBusiTargetDraft dcBusiTargetDraft); - - /** - * 新增指标数据底稿 - * - * @param dcBusiTargetDraft 指标数据底稿 - * @return 结果 - */ - public int insertDcBusiTargetDraft(DcBusiTargetDraft dcBusiTargetDraft); - - /** - * 修改指标数据底稿 - * - * @param dcBusiTargetDraft 指标数据底稿 - * @return 结果 - */ - public int updateDcBusiTargetDraft(DcBusiTargetDraft dcBusiTargetDraft); - - /** - * 删除指标数据底稿 - * - * @param id 指标数据底稿主键 - * @return 结果 - */ - public int deleteDcBusiTargetDraftById(Long id); - - /** - * 批量删除指标数据底稿 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteDcBusiTargetDraftByIds(Long[] ids); -} diff --git a/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java b/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java index 30b8aa7..1fabe54 100644 --- a/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java @@ -4,13 +4,10 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lzbi.bi.domain.DcBusiDataScreenDto; import com.lzbi.bi.domain.DcBusiDataScreenVo; -import com.lzbi.bi.domain.DcBusiTargetAdjust; import com.lzbi.bi.mapper.DcBusiDataScreenMainMapper; -import com.lzbi.bi.mapper.DcBusiTargetAdjustMapper; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Map; /** * 资产指标调整单;(dc_busi_target_adjust)表服务接口 diff --git a/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiTargetAdjustService.java b/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiTargetAdjustService.java deleted file mode 100644 index 0ac6215..0000000 --- a/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiTargetAdjustService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.lzbi.bi.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.lzbi.bi.mapper.DcBusiTargetAdjustMapper; -import org.springframework.stereotype.Service; -import com.lzbi.bi.domain.DcBusiTargetAdjust; -import java.util.List; - -/** - * 资产指标调整单;(dc_busi_target_adjust)表服务接口 - * @author : zhousq - * @date : 2023-11-16 - */ -@Service -public class DcBusiTargetAdjustService extends ServiceImpl implements IService { - - public List selectByVo( DcBusiTargetAdjust dcBusiTargetAdjust){ - return baseMapper.selectByVo(dcBusiTargetAdjust); - } - public int insertByVo( DcBusiTargetAdjust dcBusiTargetAdjust){ - return baseMapper.insertByVo(dcBusiTargetAdjust); - } - -} \ No newline at end of file diff --git a/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiTargetDraftService.java b/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiTargetDraftService.java deleted file mode 100644 index adf8c0d..0000000 --- a/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiTargetDraftService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.lzbi.bi.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.lzbi.bi.mapper.DcBusiTargetDraftMapper; -import org.springframework.stereotype.Service; -import com.lzbi.bi.domain.DcBusiTargetDraft; -import java.util.List; - -/** - * 指标数据底稿表;(dc_busi_target_draft)表服务接口 - * @author : zhousq - * @date : 2023-11-16 - */ -@Service -public class DcBusiTargetDraftService extends ServiceImpl implements IService { - - public List selectByVo( DcBusiTargetDraft dcBusiTargetDraft){ - return baseMapper.selectByVo(dcBusiTargetDraft); - } - public int insertByVo( DcBusiTargetDraft dcBusiTargetDraft){ - return baseMapper.insertByVo(dcBusiTargetDraft); - } - -} \ No newline at end of file diff --git a/lzbi-module/src/main/java/com/lzbi/bi/service/IDcBusiTargetAdjustService.java b/lzbi-module/src/main/java/com/lzbi/bi/service/IDcBusiTargetAdjustService.java deleted file mode 100644 index 1c9e326..0000000 --- a/lzbi-module/src/main/java/com/lzbi/bi/service/IDcBusiTargetAdjustService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.lzbi.bi.service; - -import java.util.List; -import com.lzbi.bi.domain.DcBusiTargetAdjust; - -/** - * 资产指标调整单Service接口 - * - * @author zhousq - * @date 2023-11-23 - */ -public interface IDcBusiTargetAdjustService -{ - /** - * 查询资产指标调整单 - * - * @param id 资产指标调整单主键 - * @return 资产指标调整单 - */ - public DcBusiTargetAdjust selectDcBusiTargetAdjustById(Long id); - - /** - * 查询资产指标调整单列表 - * - * @param dcBusiTargetAdjust 资产指标调整单 - * @return 资产指标调整单集合 - */ - public List selectDcBusiTargetAdjustList(DcBusiTargetAdjust dcBusiTargetAdjust); - - /** - * 新增资产指标调整单 - * - * @param dcBusiTargetAdjust 资产指标调整单 - * @return 结果 - */ - public int insertDcBusiTargetAdjust(DcBusiTargetAdjust dcBusiTargetAdjust); - - /** - * 修改资产指标调整单 - * - * @param dcBusiTargetAdjust 资产指标调整单 - * @return 结果 - */ - public int updateDcBusiTargetAdjust(DcBusiTargetAdjust dcBusiTargetAdjust); - - /** - * 批量删除资产指标调整单 - * - * @param ids 需要删除的资产指标调整单主键集合 - * @return 结果 - */ - public int deleteDcBusiTargetAdjustByIds(Long[] ids); - - /** - * 删除资产指标调整单信息 - * - * @param id 资产指标调整单主键 - * @return 结果 - */ - public int deleteDcBusiTargetAdjustById(Long id); -} diff --git a/lzbi-module/src/main/java/com/lzbi/bi/service/IDcBusiTargetDraftService.java b/lzbi-module/src/main/java/com/lzbi/bi/service/IDcBusiTargetDraftService.java deleted file mode 100644 index e6d2d30..0000000 --- a/lzbi-module/src/main/java/com/lzbi/bi/service/IDcBusiTargetDraftService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.lzbi.bi.service; - -import java.util.List; -import com.lzbi.bi.domain.DcBusiTargetDraft; - -/** - * 指标数据底稿Service接口 - * - * @author zhousq - * @date 2023-11-23 - */ -public interface IDcBusiTargetDraftService -{ - /** - * 查询指标数据底稿 - * - * @param id 指标数据底稿主键 - * @return 指标数据底稿 - */ - public DcBusiTargetDraft selectDcBusiTargetDraftById(Long id); - - /** - * 查询指标数据底稿列表 - * - * @param dcBusiTargetDraft 指标数据底稿 - * @return 指标数据底稿集合 - */ - public List selectDcBusiTargetDraftList(DcBusiTargetDraft dcBusiTargetDraft); - - /** - * 新增指标数据底稿 - * - * @param dcBusiTargetDraft 指标数据底稿 - * @return 结果 - */ - public int insertDcBusiTargetDraft(DcBusiTargetDraft dcBusiTargetDraft); - - /** - * 修改指标数据底稿 - * - * @param dcBusiTargetDraft 指标数据底稿 - * @return 结果 - */ - public int updateDcBusiTargetDraft(DcBusiTargetDraft dcBusiTargetDraft); - - /** - * 批量删除指标数据底稿 - * - * @param ids 需要删除的指标数据底稿主键集合 - * @return 结果 - */ - public int deleteDcBusiTargetDraftByIds(Long[] ids); - - /** - * 删除指标数据底稿信息 - * - * @param id 指标数据底稿主键 - * @return 结果 - */ - public int deleteDcBusiTargetDraftById(Long id); -} diff --git a/lzbi-module/src/main/java/com/lzbi/bi/service/impl/DcBusiTargetAdjustServiceImpl.java b/lzbi-module/src/main/java/com/lzbi/bi/service/impl/DcBusiTargetAdjustServiceImpl.java deleted file mode 100644 index 09f2882..0000000 --- a/lzbi-module/src/main/java/com/lzbi/bi/service/impl/DcBusiTargetAdjustServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.lzbi.bi.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.lzbi.bi.mapper.DcBusiTargetAdjustMapper; -import com.lzbi.bi.domain.DcBusiTargetAdjust; -import com.lzbi.bi.service.IDcBusiTargetAdjustService; - -/** - * 资产指标调整单Service业务层处理 - * - * @author zhousq - * @date 2023-11-23 - */ -@Service -public class DcBusiTargetAdjustServiceImpl implements IDcBusiTargetAdjustService -{ - @Autowired - private DcBusiTargetAdjustMapper dcBusiTargetAdjustMapper; - - /** - * 查询资产指标调整单 - * - * @param id 资产指标调整单主键 - * @return 资产指标调整单 - */ - @Override - public DcBusiTargetAdjust selectDcBusiTargetAdjustById(Long id) - { - return dcBusiTargetAdjustMapper.selectDcBusiTargetAdjustById(id); - } - - /** - * 查询资产指标调整单列表 - * - * @param dcBusiTargetAdjust 资产指标调整单 - * @return 资产指标调整单 - */ - @Override - public List selectDcBusiTargetAdjustList(DcBusiTargetAdjust dcBusiTargetAdjust) - { - return dcBusiTargetAdjustMapper.selectDcBusiTargetAdjustList(dcBusiTargetAdjust); - } - - /** - * 新增资产指标调整单 - * - * @param dcBusiTargetAdjust 资产指标调整单 - * @return 结果 - */ - @Override - public int insertDcBusiTargetAdjust(DcBusiTargetAdjust dcBusiTargetAdjust) - { - return dcBusiTargetAdjustMapper.insertDcBusiTargetAdjust(dcBusiTargetAdjust); - } - - /** - * 修改资产指标调整单 - * - * @param dcBusiTargetAdjust 资产指标调整单 - * @return 结果 - */ - @Override - public int updateDcBusiTargetAdjust(DcBusiTargetAdjust dcBusiTargetAdjust) - { - return dcBusiTargetAdjustMapper.updateDcBusiTargetAdjust(dcBusiTargetAdjust); - } - - /** - * 批量删除资产指标调整单 - * - * @param ids 需要删除的资产指标调整单主键 - * @return 结果 - */ - @Override - public int deleteDcBusiTargetAdjustByIds(Long[] ids) - { - return dcBusiTargetAdjustMapper.deleteDcBusiTargetAdjustByIds(ids); - } - - /** - * 删除资产指标调整单信息 - * - * @param id 资产指标调整单主键 - * @return 结果 - */ - @Override - public int deleteDcBusiTargetAdjustById(Long id) - { - return dcBusiTargetAdjustMapper.deleteDcBusiTargetAdjustById(id); - } -} diff --git a/lzbi-module/src/main/java/com/lzbi/bi/service/impl/DcBusiTargetDraftServiceImpl.java b/lzbi-module/src/main/java/com/lzbi/bi/service/impl/DcBusiTargetDraftServiceImpl.java deleted file mode 100644 index 51d6229..0000000 --- a/lzbi-module/src/main/java/com/lzbi/bi/service/impl/DcBusiTargetDraftServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.lzbi.bi.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.lzbi.bi.mapper.DcBusiTargetDraftMapper; -import com.lzbi.bi.domain.DcBusiTargetDraft; -import com.lzbi.bi.service.IDcBusiTargetDraftService; - -/** - * 指标数据底稿Service业务层处理 - * - * @author zhousq - * @date 2023-11-23 - */ -@Service -public class DcBusiTargetDraftServiceImpl implements IDcBusiTargetDraftService -{ - @Autowired - private DcBusiTargetDraftMapper dcBusiTargetDraftMapper; - - /** - * 查询指标数据底稿 - * - * @param id 指标数据底稿主键 - * @return 指标数据底稿 - */ - @Override - public DcBusiTargetDraft selectDcBusiTargetDraftById(Long id) - { - return dcBusiTargetDraftMapper.selectDcBusiTargetDraftById(id); - } - - /** - * 查询指标数据底稿列表 - * - * @param dcBusiTargetDraft 指标数据底稿 - * @return 指标数据底稿 - */ - @Override - public List selectDcBusiTargetDraftList(DcBusiTargetDraft dcBusiTargetDraft) - { - return dcBusiTargetDraftMapper.selectDcBusiTargetDraftList(dcBusiTargetDraft); - } - - /** - * 新增指标数据底稿 - * - * @param dcBusiTargetDraft 指标数据底稿 - * @return 结果 - */ - @Override - public int insertDcBusiTargetDraft(DcBusiTargetDraft dcBusiTargetDraft) - { - return dcBusiTargetDraftMapper.insertDcBusiTargetDraft(dcBusiTargetDraft); - } - - /** - * 修改指标数据底稿 - * - * @param dcBusiTargetDraft 指标数据底稿 - * @return 结果 - */ - @Override - public int updateDcBusiTargetDraft(DcBusiTargetDraft dcBusiTargetDraft) - { - return dcBusiTargetDraftMapper.updateDcBusiTargetDraft(dcBusiTargetDraft); - } - - /** - * 批量删除指标数据底稿 - * - * @param ids 需要删除的指标数据底稿主键 - * @return 结果 - */ - @Override - public int deleteDcBusiTargetDraftByIds(Long[] ids) - { - return dcBusiTargetDraftMapper.deleteDcBusiTargetDraftByIds(ids); - } - - /** - * 删除指标数据底稿信息 - * - * @param id 指标数据底稿主键 - * @return 结果 - */ - @Override - public int deleteDcBusiTargetDraftById(Long id) - { - return dcBusiTargetDraftMapper.deleteDcBusiTargetDraftById(id); - } -} diff --git a/lzbi-module/src/main/java/com/lzbi/serial/controller/CodeRuleDefineController.java b/lzbi-module/src/main/java/com/lzbi/serial/controller/CodeRuleDefineController.java new file mode 100644 index 0000000..a46f652 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/serial/controller/CodeRuleDefineController.java @@ -0,0 +1,102 @@ +package com.lzbi.serial.controller; + + +import javax.servlet.http.HttpServletResponse; + + +import com.lzbi.common.core.controller.BaseController; +import com.lzbi.common.core.domain.AjaxResult; +import com.lzbi.common.core.page.TableDataInfo; +import com.lzbi.common.utils.poi.ExcelUtil; +import com.lzbi.serial.domain.CodeRuleDefine; +import com.lzbi.serial.service.CodeRuleDefineService; +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 java.util.List; + + +/** + * 单据编号定定义Controller + * + * @author ruoyi + * @date 2022-12-20 + */ +@RestController +@RequestMapping("/define") +public class CodeRuleDefineController extends BaseController +{ + @Autowired + private CodeRuleDefineService codeRuleDefineService; + + /** + * 查询单据编号定定义列表 + */ + + @GetMapping("/list") + public TableDataInfo list(CodeRuleDefine sysBillnoDefine) + { + startPage(); + List list = codeRuleDefineService.selectCodeRuleDefineList(sysBillnoDefine); + return getDataTable(list); + } + + /** + * 导出单据编号定定义列表 + */ + + @PostMapping("/export") + public void export(HttpServletResponse response, CodeRuleDefine sysBillnoDefine) + { + List list = codeRuleDefineService.selectCodeRuleDefineList(sysBillnoDefine); + ExcelUtil util = new ExcelUtil(CodeRuleDefine.class); + util.exportExcel(response, list, "单据编号定定义数据"); + } + + /** + * 获取单据编号定定义详细信息 + */ + + @GetMapping(value = "/{defineId}") + public AjaxResult getInfo(@PathVariable("defineId") Long defineId) + { + return success(codeRuleDefineService.selectCodeRuleDefineByDefineId(defineId)); + } + + /** + * 新增单据编号定定义 + */ + + @PostMapping + public AjaxResult add(@RequestBody CodeRuleDefine sysBillnoDefine) + { + return toAjax(codeRuleDefineService.insertCodeRuleDefine(sysBillnoDefine)); + } + + /** + * 修改单据编号定定义 + */ + + @PutMapping + public AjaxResult edit(@RequestBody CodeRuleDefine sysBillnoDefine) + { + return toAjax(codeRuleDefineService.updateCodeRuleDefine(sysBillnoDefine)); + } + + /** + * 删除单据编号定定义 + */ + + @DeleteMapping("/{defineIds}") + public AjaxResult remove(@PathVariable Long[] defineIds) + { + return toAjax(codeRuleDefineService.deleteCodeRuleDefineByDefineIds(defineIds)); + } +} diff --git a/lzbi-module/src/main/java/com/lzbi/serial/controller/CodeRuleSerialController.java b/lzbi-module/src/main/java/com/lzbi/serial/controller/CodeRuleSerialController.java new file mode 100644 index 0000000..5540e04 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/serial/controller/CodeRuleSerialController.java @@ -0,0 +1,191 @@ +package com.lzbi.serial.controller; + + +import com.lzbi.common.core.controller.BaseController; +import com.lzbi.common.core.domain.AjaxResult; +import com.lzbi.common.core.domain.entity.SysUser; +import com.lzbi.common.core.domain.model.LoginUser; +import com.lzbi.common.core.page.TableDataInfo; +import com.lzbi.common.utils.DateUtils; +import com.lzbi.common.utils.SecurityUtils; +import com.lzbi.common.utils.StringUtils; +import com.lzbi.serial.domain.CodeRuleDefine; +import com.lzbi.serial.domain.CodeRuleSerial; +import com.lzbi.serial.service.CodeRuleDefineService; +import com.lzbi.serial.service.CodeRuleSerialService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 单据流水号Controller + * + * @author ruoyi + * @date 2022-12-20 + */ +@RestController +@RequestMapping("/serial") +public class CodeRuleSerialController extends BaseController { + @Autowired + private CodeRuleSerialService codeRuleSerialService; + @Autowired + private CodeRuleDefineService codeRuleDefineService; + /** + * 查询单据流水号列表 + */ + @GetMapping("/list") + public TableDataInfo list(CodeRuleSerial codeRuleSerial) { + startPage(); + List list = codeRuleSerialService.selectCodeRuleSerialList(codeRuleSerial); + return getDataTable(list); + } + + + + /** + * 获取单据流水号详细信息 + */ + + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(codeRuleSerialService.selectCodeRuleSerialById(id)); + } + + /** + * 新增单据流水号 + */ + + @PostMapping + public AjaxResult add(@RequestBody CodeRuleSerial codeRuleSerial) { + return toAjax(codeRuleSerialService.insertCodeRuleSerial(codeRuleSerial)); + } + + /** + * 修改单据流水号 + */ + + @PutMapping + public AjaxResult edit(@RequestBody CodeRuleSerial codeRuleSerial) { + return toAjax(codeRuleSerialService.updateCodeRuleSerial(codeRuleSerial)); + } + + /** + * 删除单据流水号 + */ + + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(codeRuleSerialService.deleteCodeRuleSerialByIds(ids)); + } + + /** + * addby zhousq 获取单据流水号 + * 根据单据的ID获取单据header + * 通过headerYYYYMMDD 获取当日流水号 查询无记录需要新增一条，有记录需要先进行更新流水号成功后返回，否则失败 + * 2023-1-16 增加动态配置能力，可以在数据库配置 格式、长度 + * 原有方法作废 + */ + + String billsize; + + + @GetMapping("/getBillNo") + public AjaxResult getBillNo(@RequestParam long id) { + String billNo = ""; + long serialsize = 4; + //查询订单头 + CodeRuleDefine codeRuleDefine = codeRuleDefineService.selectCodeRuleDefineByDefineId(id); + if (codeRuleDefine.getDefHeader().isEmpty()) { + return AjaxResult.error("没有定义过ID为" + String.valueOf(id) + "的编号规则类型！"); + } + billNo = codeRuleDefine.getDefHeader() + DateUtils.dateTimeNow(codeRuleDefine.getDefHeaderType()); + serialsize=codeRuleDefine.getSerialLength(); + CodeRuleSerial codeRuleSerial = codeRuleSerialService.selectCodeRuleSerialByHeader(billNo); + SysUser sysUser = SecurityUtils.getLoginUser().getUser(); + if (null== codeRuleSerial || null == codeRuleSerial.getHeaderBillno()) { + codeRuleSerial=new CodeRuleSerial(); + codeRuleSerial.setHeaderBillno(billNo); + codeRuleSerial.setLockSerial(1L); + codeRuleSerial.setSerialNo(1L); + codeRuleSerial.setCreatedTime(DateUtils.getNowDate()); + codeRuleSerial.setCreatedBy(sysUser.getUserName()); + codeRuleSerial.setUpdatedBy(sysUser.getUserName()); + codeRuleSerial.setUpdatedTime(DateUtils.getNowDate()); + int ret = codeRuleSerialService.insertCodeRuleSerial(codeRuleSerial); + if (ret > 0) { + return AjaxResult.success("获取规则编号成功",billNo + StringUtils.padl(1L, (int)serialsize)); + } else { + return AjaxResult.error("新建规则编号失败！"); + } + + } else { + long serialnum = codeRuleSerial.getSerialNo(); + codeRuleSerial.setSerialNo(serialnum + 1L); + codeRuleSerial.setLockSerial(serialnum); + codeRuleSerial.setUpdatedBy(sysUser.getUserName()); + codeRuleSerial.setUpdatedTime(DateUtils.getNowDate()); + int ret = codeRuleSerialService.updateCodeRuleSerialLock(codeRuleSerial); + if (ret > 0) { + + return AjaxResult.success("ok",billNo + StringUtils.padl(codeRuleSerial.getSerialNo(), (int)serialsize)); + } else { + return AjaxResult.error("新建规则编号失败！请稍后重试"); + } + + } + + } + @Deprecated + public AjaxResult getBillNoOld(@RequestParam long id) { + String billNo = ""; + int serialsize = 4; + try { + serialsize = Integer.parseInt(billsize); + } catch (NumberFormatException numberFormatException) { + serialsize = 4; + } + //查询订单头 + LoginUser loginUser = SecurityUtils.getLoginUser(); + SysUser sysUser = loginUser.getUser(); + CodeRuleDefine sysBillnoDefine = codeRuleDefineService.selectCodeRuleDefineByDefineId(id); + if (sysBillnoDefine.getDefHeader().isEmpty()) { + return AjaxResult.error("没有定义过ID为" + String.valueOf(id) + "的单据类型！"); + } + billNo = sysBillnoDefine.getDefHeader() + DateUtils.dateTimeNow("YYYYMMdd"); + CodeRuleSerial codeRuleSerial = codeRuleSerialService.selectCodeRuleSerialByHeader(billNo); + if (null== codeRuleSerial || null == codeRuleSerial.getHeaderBillno()) { + codeRuleSerial=new CodeRuleSerial(); + codeRuleSerial.setHeaderBillno(billNo); + codeRuleSerial.setLockSerial(1L); + codeRuleSerial.setSerialNo(1L); + codeRuleSerial.setCreatedTime(DateUtils.getNowDate()); + codeRuleSerial.setCreatedBy(sysUser.getUserName()); + codeRuleSerial.setUpdatedBy(sysUser.getUserName()); + codeRuleSerial.setUpdatedTime(DateUtils.getNowDate()); + int ret = codeRuleSerialService.insertCodeRuleSerial(codeRuleSerial); + if (ret > 0) { + return AjaxResult.success("获取单据流水号成功",billNo + StringUtils.padl(1L, serialsize)); + } else { + return AjaxResult.error("新建单据流水号失败！"); + } + + } else { + long serialnum = codeRuleSerial.getSerialNo(); + codeRuleSerial.setSerialNo(serialnum + 1L); + codeRuleSerial.setLockSerial(serialnum); + codeRuleSerial.setUpdatedBy(sysUser.getUserName()); + codeRuleSerial.setUpdatedTime(DateUtils.getNowDate()); + int ret = codeRuleSerialService.updateCodeRuleSerialLock(codeRuleSerial); + if (ret > 0) { + + return AjaxResult.success("ok",billNo + StringUtils.padl(codeRuleSerial.getSerialNo(), serialsize)); + } else { + return AjaxResult.error("获取单据流水号失败！请稍后重试"); + } + + } + + } + +} diff --git a/lzbi-module/src/main/java/com/lzbi/serial/domain/CodeRuleDefine.java b/lzbi-module/src/main/java/com/lzbi/serial/domain/CodeRuleDefine.java new file mode 100644 index 0000000..0784e3e --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/serial/domain/CodeRuleDefine.java @@ -0,0 +1,52 @@ +package com.lzbi.serial.domain; + +import com.lzbi.module.base.BaseModuleEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + + +/** + * 单据编号定定义对象 sys_billno_define + * + * @author ruoyi + * @date 2022-12-20 + */ +@Data +@ApiModel("编码规则定义") +public class CodeRuleDefine extends BaseModuleEntity +{ + private static final long serialVersionUID = 1L; + @ApiModelProperty("编码规则ID") + /** 定义ID唯一 */ + private Long defineId; + + /** 单据开头名称 */ + @ApiModelProperty("编码规则头") + private String defHeader; + /** 单据类型 */ + @ApiModelProperty("编码规则类型") + private String defClass; + /** 所属部门id */ + @ApiModelProperty("编码规则头") + private Long deptId; + @ApiModelProperty("编码规则头") + private String defHeaderType; + @ApiModelProperty("编码规则头") + private Long serialLength; + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("defineId", getDefineId()) + .append("defHeader", getDefHeader()) + .append("defClass", getDefClass()) + .append("deptId", getDeptId()) + .append("defHeaderType", getDefHeaderType()) + .append("serialLength", getSerialLength()) + .toString(); + } +} diff --git a/lzbi-module/src/main/java/com/lzbi/serial/domain/CodeRuleSerial.java b/lzbi-module/src/main/java/com/lzbi/serial/domain/CodeRuleSerial.java new file mode 100644 index 0000000..4701091 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/serial/domain/CodeRuleSerial.java @@ -0,0 +1,48 @@ +package com.lzbi.serial.domain; + +import com.lzbi.module.base.BaseModuleEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + + +/** + * 单据流水号对象 sys_billno_serial + * + * @author ruoyi + * @date 2022-12-20 + */ +@Data +@ApiModel("") +public class CodeRuleSerial extends BaseModuleEntity +{ + private static final long serialVersionUID = 1L; + + /** 唯一标识符 */ + private Long id; + + /** 单据开头名称+YYYYMMDD */ + @ApiModelProperty("单据开头名称") + private String headerBillno; + + /** 版本锁 */ + @ApiModelProperty("版本锁") + private Long lockSerial; + + /** 流水号 */ + @ApiModelProperty("流水号") + private Long serialNo; + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("headerBillno", getHeaderBillno()) + .append("lockSerial", getLockSerial()) + .append("serialNo", getSerialNo()) + .toString(); + } +} diff --git a/lzbi-module/src/main/java/com/lzbi/serial/mapper/CodeRuleDefineMapper.java b/lzbi-module/src/main/java/com/lzbi/serial/mapper/CodeRuleDefineMapper.java new file mode 100644 index 0000000..304d695 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/serial/mapper/CodeRuleDefineMapper.java @@ -0,0 +1,62 @@ +package com.lzbi.serial.mapper; + +import com.lzbi.serial.domain.CodeRuleDefine; + +import java.util.List; + +/** + * 单据编号定定义Mapper接口 + * + * @author ruoyi + * @date 2022-12-20 + */ +public interface CodeRuleDefineMapper +{ + /** + * 查询单据编号定定义 + * + * @param defineId 单据编号定定义主键 + * @return 单据编号定定义 + */ + public CodeRuleDefine selectCodeRuleDefineByDefineId(Long defineId); + + /** + * 查询单据编号定定义列表 + * + * @param + * @return 单据编号定定义集合 + */ + public List selectCodeRuleDefineList(CodeRuleDefine codeRuleDefine); + + /** + * 新增单据编号定定义 + * + * @param + * @return 结果 + */ + public int insertCodeRuleDefine(CodeRuleDefine codeRuleDefine); + + /** + * 修改单据编号定定义 + * + * @param + * @return 结果 + */ + public int updateCodeRuleDefine(CodeRuleDefine codeRuleDefine); + + /** + * 删除单据编号定定义 + * + * @param defineId 单据编号定定义主键 + * @return 结果 + */ + public int deleteCodeRuleDefineByDefineId(Long defineId); + + /** + * 批量删除单据编号定定义 + * + * @param defineIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCodeRuleDefineByDefineIds(Long[] defineIds); +} diff --git a/lzbi-module/src/main/java/com/lzbi/serial/mapper/CodeRuleSerialMapper.java b/lzbi-module/src/main/java/com/lzbi/serial/mapper/CodeRuleSerialMapper.java new file mode 100644 index 0000000..fa18202 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/serial/mapper/CodeRuleSerialMapper.java @@ -0,0 +1,73 @@ +package com.lzbi.serial.mapper; + +import com.lzbi.serial.domain.CodeRuleSerial; + +import java.util.List; + +/** + * 单据流水号Mapper接口 + * + * @author ruoyi + * @date 2022-12-20 + */ +public interface CodeRuleSerialMapper +{ + /** + * 查询单据流水号 + * + * @param id 单据流水号主键 + * @return 单据流水号 + */ + public CodeRuleSerial selectCodeRuleSerialById(Long id); + + /** + * 查询单据流水号列表 + * + * @param + * @return 单据流水号集合 + */ + public List selectCodeRuleSerialList(CodeRuleSerial codeRuleSerial); + + /** + * 新增单据流水号 + * + * @param + * @return 结果 + */ + public int insertCodeRuleSerial(CodeRuleSerial codeRuleSerial); + + /** + * 修改单据流水号 + * + * @param + * @return 结果 + */ + public int updateCodeRuleSerial(CodeRuleSerial codeRuleSerial); + + /** + * 删除单据流水号 + * + * @param id 单据流水号主键 + * @return 结果 + */ + public int deleteCodeRuleSerialById(Long id); + + /** + * 批量删除单据流水号 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCodeRuleSerialByIds(Long[] ids); + + + public CodeRuleSerial selectCodeRuleSerialByHeader(String headerBillno); + /** + * 成功获取完成流水号获取为1，失败为0 + * + * @param svo 必须包含参数 header 单据头 serialno + * @return 单据流水号 + */ + + public int updateCodeRuleSerialLock(CodeRuleSerial svo); +} diff --git a/lzbi-module/src/main/java/com/lzbi/serial/service/CodeRuleDefineService.java b/lzbi-module/src/main/java/com/lzbi/serial/service/CodeRuleDefineService.java new file mode 100644 index 0000000..1cf43ff --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/serial/service/CodeRuleDefineService.java @@ -0,0 +1,103 @@ +package com.lzbi.serial.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lzbi.common.core.domain.model.LoginUser; +import com.lzbi.common.utils.DateUtils; +import com.lzbi.common.utils.SecurityUtils; +import com.lzbi.serial.domain.CodeRuleDefine; +import com.lzbi.serial.mapper.CodeRuleDefineMapper; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 单据编号定定义Service业务层处理 + * + * @author ruoyi + * @date 2022-12-20 + */ +@Service +public class CodeRuleDefineService extends ServiceImpl implements IService +{ + + + /** + * 查询单据编号定定义 + * + * @param defineId 单据编号定定义主键 + * @return 单据编号定定义 + */ + + public CodeRuleDefine selectCodeRuleDefineByDefineId(Long defineId) + { + return baseMapper.selectCodeRuleDefineByDefineId(defineId); + } + + /** + * 查询单据编号定定义列表 + * + * @param codeRuleDefine 单据编号定定义 + * @return 单据编号定定义 + */ + + public List selectCodeRuleDefineList(CodeRuleDefine codeRuleDefine) + { + return baseMapper.selectCodeRuleDefineList(codeRuleDefine); + } + + /** + * 新增单据编号定定义 + * + * @param codeRuleDefine 单据编号定定义 + * @return 结果 + */ + + public int insertCodeRuleDefine(CodeRuleDefine codeRuleDefine) + { + LoginUser loginUser= SecurityUtils.getLoginUser(); + codeRuleDefine.setCreatedBy(loginUser.getUsername()); + codeRuleDefine.setCreatedTime(DateUtils.getNowDate()); + codeRuleDefine.setDeptId(loginUser.getDeptId()); + return baseMapper.insertCodeRuleDefine(codeRuleDefine); + } + + /** + * 修改单据编号定定义 + * + * @param codeRuleDefine 单据编号定定义 + * @return 结果 + */ + + public int updateCodeRuleDefine(CodeRuleDefine codeRuleDefine) + { + codeRuleDefine.setUpdatedTime(DateUtils.getNowDate()); + return baseMapper.updateCodeRuleDefine(codeRuleDefine); + } + + /** + * 批量删除单据编号定定义 + * + * @param defineIds 需要删除的单据编号定定义主键 + * @return 结果 + */ + + public int deleteCodeRuleDefineByDefineIds(Long[] defineIds) + { + return baseMapper.deleteCodeRuleDefineByDefineIds(defineIds); + } + + /** + * 删除单据编号定定义信息 + * + * @param defineId 单据编号定定义主键 + * @return 结果 + */ + + public int deleteCodeRuleDefineByDefineId(Long defineId) + { + return baseMapper.deleteCodeRuleDefineByDefineId(defineId); + } +} diff --git a/lzbi-module/src/main/java/com/lzbi/serial/service/CodeRuleSerialService.java b/lzbi-module/src/main/java/com/lzbi/serial/service/CodeRuleSerialService.java new file mode 100644 index 0000000..7c2f910 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/serial/service/CodeRuleSerialService.java @@ -0,0 +1,112 @@ +package com.lzbi.serial.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lzbi.common.utils.DateUtils; +import com.lzbi.serial.domain.CodeRuleSerial; +import com.lzbi.serial.mapper.CodeRuleSerialMapper; + + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 单据流水号Service业务层处理 + * + * @author ruoyi + * @date 2022-12-20 + */ +@Service +public class CodeRuleSerialService extends ServiceImpl implements IService +{ + + /** + * 查询单据流水号 + * + * @param id 单据流水号主键 + * @return 单据流水号 + */ + + public CodeRuleSerial selectCodeRuleSerialById(Long id) + { + return baseMapper.selectCodeRuleSerialById(id); + } + + public CodeRuleSerial selectCodeRuleSerialByHeader(String header){ + return baseMapper.selectCodeRuleSerialByHeader(header); + } + /** + * 成功获取完成流水号获取为1，失败为0 + * + * @param svo 必须包含参数 header 单据头 serialno + * @return 单据流水号 + */ + + public int updateCodeRuleSerialLock(CodeRuleSerial svo){ + return baseMapper.updateCodeRuleSerialLock(svo); + } + + /** + * 查询单据流水号列表 + * + * @param sysBillnoSerial 单据流水号 + * @return 单据流水号 + */ + + public List selectCodeRuleSerialList(CodeRuleSerial sysBillnoSerial) + { + return baseMapper.selectCodeRuleSerialList(sysBillnoSerial); + } + + /** + * 新增单据流水号 + * + * @param + * @return 结果 + */ + + public int insertCodeRuleSerial(CodeRuleSerial codeRuleSerial) + { + codeRuleSerial.setCreatedTime(DateUtils.getNowDate()); + return baseMapper.insertCodeRuleSerial(codeRuleSerial); + } + + /** + * 修改单据流水号 + * + * @param + * @return 结果 + */ + + public int updateCodeRuleSerial(CodeRuleSerial codeRuleSerial) + { + codeRuleSerial.setUpdatedTime(DateUtils.getNowDate()); + return baseMapper.updateCodeRuleSerial(codeRuleSerial); + } + + /** + * 批量删除单据流水号 + * + * @param ids 需要删除的单据流水号主键 + * @return 结果 + */ + + public int deleteCodeRuleSerialByIds(Long[] ids) + { + return baseMapper.deleteCodeRuleSerialByIds(ids); + } + + /** + * 删除单据流水号信息 + * + * @param id 单据流水号主键 + * @return 结果 + */ + + public int deleteCodeRuleSerialById(Long id) + { + return baseMapper.deleteCodeRuleSerialById(id); + } +} diff --git a/lzbi-module/src/main/resources/mapper/DcBaseAssetInfoMapper.xml b/lzbi-module/src/main/resources/mapper/DcBaseAssetInfoMapper.xml deleted file mode 100644 index b9783b7..0000000 --- a/lzbi-module/src/main/resources/mapper/DcBaseAssetInfoMapper.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select - TENANT_ID, - REVISION, - CREATED_BY, - CREATED_TIME, - UPDATED_BY, - UPDATED_TIME, - DELETE_BY, - DELETE_TIME, - id, - asset_name, - asset_code, - asset_class, - flag_validate_dept, - flag_validate_role, - flag_validate_user, - status_asset, - comany_id, - dept_id, - work_type, - from dc_base_asset_info - - - - insert into dc_base_asset_info - - TENANT_ID, - REVISION, - CREATED_BY, - CREATED_TIME, - UPDATED_BY, - UPDATED_TIME, - DELETE_BY, - DELETE_TIME, - asset_id, - asset_name, - asset_code, - asset_class, - flag_validate_dept, - flag_validate_role, - flag_validate_user, - status_asset, - comany_id, - dept_id, - work_type, - - - #{tenantId}, - #{revision}, - #{createdBy}, - #{createdTime}, - #{updatedBy}, - #{updatedTime}, - #{deleteBy}, - #{deleteTime}, - #{assetId}, - #{assetName}, - #{assetCode}, - #{assetClass}, - #{flagValidateDept}, - #{flagValidateRole}, - #{flagValidateUser}, - #{statusAsset}, - #{comanyId}, - #{deptId}, - #{workType}, - - - - \ No newline at end of file diff --git a/lzbi-module/src/main/resources/mapper/DcBusiTargetAdjustMapper.xml b/lzbi-module/src/main/resources/mapper/DcBusiTargetAdjustMapper.xml deleted file mode 100644 index 2b9e59d..0000000 --- a/lzbi-module/src/main/resources/mapper/DcBusiTargetAdjustMapper.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select - TENANT_ID, - REVISION, - CREATED_BY, - CREATED_TIME, - UPDATED_BY, - UPDATED_TIME, - DELETE_BY, - DELETE_TIME, - bill_serial, - biil_type, - target_code, - asset_id, - val_orginal, - val_adjust, - val_result, - id, - date_adjust, - hour_adjust, - date_adjust_str - from dc_busi_target_adjust - - - - insert into dc_busi_target_adjust - - TENANT_ID, - REVISION, - CREATED_BY, - CREATED_TIME, - UPDATED_BY, - UPDATED_TIME, - DELETE_BY, - DELETE_TIME, - bill_serial, - biil_type, - target_code, - asset_id, - val_orginal, - val_adjust, - val_result, - id, - date_adjust, - hour_adjust, - date_adjust_str, - - - #{tenantId}, - #{revision}, - #{createdBy}, - #{createdTime}, - #{updatedBy}, - #{updatedTime}, - #{deleteBy}, - #{deleteTime}, - #{billSerial}, - #{biilType}, - #{targetCode}, - #{assetId}, - #{valOrginal}, - #{valAdjust}, - #{valResult}, - #{id}, - #{dateAdjust}, - #{hourAdjust}, - #{dateAdjustStr}, - - - - \ No newline at end of file diff --git a/lzbi-module/src/main/resources/mapper/DcBusiTargetDraftMapper.xml b/lzbi-module/src/main/resources/mapper/DcBusiTargetDraftMapper.xml deleted file mode 100644 index 494e566..0000000 --- a/lzbi-module/src/main/resources/mapper/DcBusiTargetDraftMapper.xml +++ /dev/null @@ -1,327 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select - TENANT_ID, - REVISION, - CREATED_BY, - CREATED_TIME, - UPDATED_BY, - UPDATED_TIME, - DELETE_BY, - DELETE_TIME, - id, - target_id, - target_code, - count_year, - count_month, - count_day, - val01, - val02, - val03, - val04, - val05, - val06, - val07, - val08, - val09, - val10, - val11, - val12, - val13, - val14, - val15, - val16, - val17, - val18, - val19, - val20, - val21, - val22, - val23, - val24, - company_code, - company_name, - org_code, - org_name, - work_type, - count_unit_name, - asset_id, - val_up_limit, - val_down_limit, - val_avg, - val_total, - val_compute, - from dc_busi_target_draft - - - - insert into dc_busi_target_draft - - TENANT_ID, - REVISION, - CREATED_BY, - CREATED_TIME, - UPDATED_BY, - UPDATED_TIME, - DELETE_BY, - DELETE_TIME, - id, - target_id, - target_code, - count_year, - count_month, - count_day, - val01, - val02, - val03, - val04, - val05, - val06, - val07, - val08, - val09, - val10, - val11, - val12, - val13, - val14, - val15, - val16, - val17, - val18, - val19, - val20, - val21, - val22, - val23, - val24, - company_code, - company_name, - org_code, - org_name, - work_type, - count_unit_name, - asset_id, - val_up_limit, - val_down_limit, - val_avg, - val_total, - val_compute, - - - #{tenantId}, - #{revision}, - #{createdBy}, - #{createdTime}, - #{updatedBy}, - #{updatedTime}, - #{deleteBy}, - #{deleteTime}, - #{id}, - #{targetId}, - #{targetCode}, - #{countYear}, - #{countMonth}, - #{countDay}, - #{val01}, - #{val02}, - #{val03}, - #{val04}, - #{val05}, - #{val06}, - #{val07}, - #{val08}, - #{val09}, - #{val10}, - #{val11}, - #{val12}, - #{val13}, - #{val14}, - #{val15}, - #{val16}, - #{val17}, - #{val18}, - #{val19}, - #{val20}, - #{val21}, - #{val22}, - #{val23}, - #{val24}, - #{companyCode}, - #{companyName}, - #{orgCode}, - #{orgName}, - #{workType}, - #{countUnitName}, - #{assetId}, - #{valUpLimit}, - #{valDownLimit}, - #{valAvg}, - #{valTotal}, - #{valCompute}, - - - - \ No newline at end of file diff --git a/lzbi-module/src/main/resources/mapper/asset/DcBaseParamModelMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBaseParamModelMapper.xml new file mode 100644 index 0000000..10c0f32 --- /dev/null +++ b/lzbi-module/src/main/resources/mapper/asset/DcBaseParamModelMapper.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + TENANT_ID, + REVISION, + CREATED_BY, + CREATED_TIME, + UPDATED_BY, + UPDATED_TIME, + DELETE_BY, + DELETE_TIME, + id, + param_model_code, + param_model_name, + param_model_field, + param_model_group, + param_model_source, + flag_status + from dc_base_param_model + + + + insert into dc_base_param_model + + TENANT_ID, + REVISION, + CREATED_BY, + CREATED_TIME, + UPDATED_BY, + UPDATED_TIME, + DELETE_BY, + DELETE_TIME, + param_model_code, + param_model_name, + param_model_field, + param_model_group, + param_model_source, + flag_status, + + + #{tenantId}, + #{revision}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + #{deleteBy}, + #{deleteTime}, + #{paramModelCode}, + #{paramModelName}, + #{paramModelField}, + #{paramModelGroup}, + #{paramModelSource}, + #{flagStatus}, + + + + \ No newline at end of file diff --git a/lzbi-module/src/main/resources/mapper/assetData/DcBusiTargetAdjustMapper.xml b/lzbi-module/src/main/resources/mapper/assetData/DcBusiTargetAdjustMapper.xml deleted file mode 100644 index 00e3818..0000000 --- a/lzbi-module/src/main/resources/mapper/assetData/DcBusiTargetAdjustMapper.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - select TENANT_ID, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DELETE_BY, DELETE_TIME, bill_serial, biil_type, target_code, asset_id, val_orginal, val_adjust, val_result, id, date_adjust, hour_adjust, date_adjust_str from dc_busi_target_adjust - - - - - - - - insert into dc_busi_target_adjust - - TENANT_ID, - REVISION, - CREATED_BY, - CREATED_TIME, - UPDATED_BY, - UPDATED_TIME, - DELETE_BY, - DELETE_TIME, - bill_serial, - biil_type, - target_code, - asset_id, - val_orginal, - val_adjust, - val_result, - date_adjust, - hour_adjust, - date_adjust_str, - - - #{tenantId}, - #{REVISION}, - #{createdBy}, - #{createdTime}, - #{updatedBy}, - #{updatedTime}, - #{deleteBy}, - #{deleteTime}, - #{billSerial}, - #{biilType}, - #{targetCode}, - #{assetId}, - #{valOrginal}, - #{valAdjust}, - #{valResult}, - #{dateAdjust}, - #{hourAdjust}, - #{dateAdjustStr}, - - - - - update dc_busi_target_adjust - - TENANT_ID = #{tenantId}, - REVISION = #{REVISION}, - CREATED_BY = #{createdBy}, - CREATED_TIME = #{createdTime}, - UPDATED_BY = #{updatedBy}, - UPDATED_TIME = #{updatedTime}, - DELETE_BY = #{deleteBy}, - DELETE_TIME = #{deleteTime}, - bill_serial = #{billSerial}, - biil_type = #{biilType}, - target_code = #{targetCode}, - asset_id = #{assetId}, - val_orginal = #{valOrginal}, - val_adjust = #{valAdjust}, - val_result = #{valResult}, - date_adjust = #{dateAdjust}, - hour_adjust = #{hourAdjust}, - date_adjust_str = #{dateAdjustStr}, - - where id = #{id} - - - - delete from dc_busi_target_adjust where id = #{id} - - - - delete from dc_busi_target_adjust where id in - - #{id} - - - \ No newline at end of file diff --git a/lzbi-module/src/main/resources/mapper/assetData/DcBusiTargetDraftMapper.xml b/lzbi-module/src/main/resources/mapper/assetData/DcBusiTargetDraftMapper.xml deleted file mode 100644 index 6a94c13..0000000 --- a/lzbi-module/src/main/resources/mapper/assetData/DcBusiTargetDraftMapper.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select TENANT_ID, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DELETE_BY, DELETE_TIME, id, target_id, target_code, count_year, count_month, count_day, val01, val02, val03, val04, val05, val06, val07, val08, val09, val10, val11, val12, val13, val14, val15, val16, val17, val18, val19, val20, val21, val22, val23, val24, company_code, company_name, org_code, org_name, work_type, count_unit_name, asset_id, val_up_limit, val_down_limit, val_avg, val_total, val_compute from dc_busi_target_draft - - - - - - - - insert into dc_busi_target_draft - - TENANT_ID, - REVISION, - CREATED_BY, - CREATED_TIME, - UPDATED_BY, - UPDATED_TIME, - DELETE_BY, - DELETE_TIME, - target_id, - target_code, - count_year, - count_month, - count_day, - val01, - val02, - val03, - val04, - val05, - val06, - val07, - val08, - val09, - val10, - val11, - val12, - val13, - val14, - val15, - val16, - val17, - val18, - val19, - val20, - val21, - val22, - val23, - val24, - company_code, - company_name, - org_code, - org_name, - work_type, - count_unit_name, - asset_id, - val_up_limit, - val_down_limit, - val_avg, - val_total, - val_compute, - - - #{tenantId}, - #{REVISION}, - #{createdBy}, - #{createdTime}, - #{updatedBy}, - #{updatedTime}, - #{deleteBy}, - #{deleteTime}, - #{targetId}, - #{targetCode}, - #{countYear}, - #{countMonth}, - #{countDay}, - #{val01}, - #{val02}, - #{val03}, - #{val04}, - #{val05}, - #{val06}, - #{val07}, - #{val08}, - #{val09}, - #{val10}, - #{val11}, - #{val12}, - #{val13}, - #{val14}, - #{val15}, - #{val16}, - #{val17}, - #{val18}, - #{val19}, - #{val20}, - #{val21}, - #{val22}, - #{val23}, - #{val24}, - #{companyCode}, - #{companyName}, - #{orgCode}, - #{orgName}, - #{workType}, - #{countUnitName}, - #{assetId}, - #{valUpLimit}, - #{valDownLimit}, - #{valAvg}, - #{valTotal}, - #{valCompute}, - - - - - update dc_busi_target_draft - - TENANT_ID = #{tenantId}, - REVISION = #{REVISION}, - CREATED_BY = #{createdBy}, - CREATED_TIME = #{createdTime}, - UPDATED_BY = #{updatedBy}, - UPDATED_TIME = #{updatedTime}, - DELETE_BY = #{deleteBy}, - DELETE_TIME = #{deleteTime}, - target_id = #{targetId}, - target_code = #{targetCode}, - count_year = #{countYear}, - count_month = #{countMonth}, - count_day = #{countDay}, - val01 = #{val01}, - val02 = #{val02}, - val03 = #{val03}, - val04 = #{val04}, - val05 = #{val05}, - val06 = #{val06}, - val07 = #{val07}, - val08 = #{val08}, - val09 = #{val09}, - val10 = #{val10}, - val11 = #{val11}, - val12 = #{val12}, - val13 = #{val13}, - val14 = #{val14}, - val15 = #{val15}, - val16 = #{val16}, - val17 = #{val17}, - val18 = #{val18}, - val19 = #{val19}, - val20 = #{val20}, - val21 = #{val21}, - val22 = #{val22}, - val23 = #{val23}, - val24 = #{val24}, - company_code = #{companyCode}, - company_name = #{companyName}, - org_code = #{orgCode}, - org_name = #{orgName}, - work_type = #{workType}, - count_unit_name = #{countUnitName}, - asset_id = #{assetId}, - val_up_limit = #{valUpLimit}, - val_down_limit = #{valDownLimit}, - val_avg = #{valAvg}, - val_total = #{valTotal}, - val_compute = #{valCompute}, - - where id = #{id} - - - - delete from dc_busi_target_draft where id = #{id} - - - - delete from dc_busi_target_draft where id in - - #{id} - - - \ No newline at end of file diff --git a/lzbi-module/src/main/resources/mapper/serial/CodeRuleDefineMapper.xml b/lzbi-module/src/main/resources/mapper/serial/CodeRuleDefineMapper.xml new file mode 100644 index 0000000..3358381 --- /dev/null +++ b/lzbi-module/src/main/resources/mapper/serial/CodeRuleDefineMapper.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + select define_id, def_header, def_class, dept_id, create_by, create_time, update_by, update_time,def_header_type,serial_length from sys_billno_define + + + + + + + + insert into sys_billno_define + + define_id, + def_header, + def_class, + dept_id, + create_by, + create_time, + update_by, + update_time, + def_header_type, + serial_length, + + + #{defineId}, + #{defHeader}, + #{defClass}, + #{deptId}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{defHeaderType}, + #{serialLength}, + + + + + update sys_billno_define + + def_header = #{defHeader}, + def_class = #{defClass}, + dept_id = #{deptId}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + def_header_type = #{defHeaderType}, + serial_length = #{serialLength}, + + where define_id = #{defineId} + + + + delete from sys_billno_define where define_id = #{defineId} + + + + delete from sys_billno_define where define_id in + + #{defineId} + + + \ No newline at end of file diff --git a/lzbi-module/src/main/resources/mapper/serial/CodeRuleSerialMapper.xml b/lzbi-module/src/main/resources/mapper/serial/CodeRuleSerialMapper.xml new file mode 100644 index 0000000..7129323 --- /dev/null +++ b/lzbi-module/src/main/resources/mapper/serial/CodeRuleSerialMapper.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + select id, header_billno, lock_serial, seselectCodeRuleSerialListrial_no, create_by, create_time, update_by, update_time from sys_billno_serial + + + + + + + + insert into sys_billno_serial + + header_billno, + lock_serial, + serial_no, + create_by, + create_time, + update_by, + update_time, + + + #{headerBillno}, + #{lockSerial}, + #{serialNo}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update sys_billno_serial + + header_billno = #{headerBillno}, + lock_serial = #{lockSerial}, + serial_no = #{serialNo}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from sys_billno_serial where id = #{id} + + + + delete from sys_billno_serial where id in + + #{id} + + + + + + update sys_billno_serial + + lock_serial= #{serialNo},serial_no = #{serialNo}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where header_billno = #{headerBillno} and lock_serial= #{lockSerial} + + + + + \ No newline at end of file