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 index 666f3fb..fcbf22b 100644 --- a/lzbi-module/src/main/java/com/lzbi/asset/controller/DcBaseParamModelController.java +++ b/lzbi-module/src/main/java/com/lzbi/asset/controller/DcBaseParamModelController.java @@ -1,5 +1,8 @@ package com.lzbi.asset.controller; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.lzbi.common.annotation.Log; import com.lzbi.common.core.controller.BaseController; @@ -12,7 +15,11 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; + +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -36,6 +43,7 @@ public class DcBaseParamModelController extends BaseController * 分页列表查询 * @return 分页数据 */ + @PreAuthorize("@ss.hasPermi('asset:paramModel:list')") @GetMapping("/list") public TableDataInfo list(DcBaseParamModel dcBaseParamModel) { startPage(); @@ -47,6 +55,7 @@ public class DcBaseParamModelController extends BaseController *@param id @return DcBaseParamModel 没有反馈空 */ + @PreAuthorize("@ss.hasPermi('asset:paramModel:query')") @ApiOperation("根据ID获取参数模版表详细信息") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -57,6 +66,7 @@ public class DcBaseParamModelController extends BaseController *@param *@return DcBaseParamModel */ + @PreAuthorize("@ss.hasPermi('asset:paramModel:add')") @ApiOperation("新增参数模版表一条数据") @Log(title = "", businessType = BusinessType.INSERT) @PostMapping @@ -74,6 +84,7 @@ public class DcBaseParamModelController extends BaseController *@param *@return DcBaseParamModel */ + @PreAuthorize("@ss.hasPermi('asset:paramModel:edit')") @ApiOperation("参数模版表修改") @Log(title = "", businessType = BusinessType.UPDATE) @PutMapping @@ -83,27 +94,16 @@ public class DcBaseParamModelController extends BaseController 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 删除的条数 */ + @PreAuthorize("@ss.hasPermi('asset:paramModel:remove')") @ApiOperation("批量删除参数模版表") @Log(title = "批量删除参数模版表", businessType = BusinessType.DELETE) - @DeleteMapping("/ids/{ids}") + @DeleteMapping("/{ids}") public AjaxResult batchRemove(@PathVariable Long[] ids) { List collect = Arrays.stream(ids).collect(Collectors.toList()); return toAjax(dcBaseParamModelService.removeBatchByIds(collect)); @@ -121,6 +121,7 @@ public class DcBaseParamModelController extends BaseController /** * "参数模版表数据导出功能 */ + @PreAuthorize("@ss.hasPermi('asset:paramModel:export')") @ApiOperation("导出参数模版表数据") @PostMapping("/export") public void export(HttpServletResponse response, DcBaseParamModel dcBaseParamModel) { @@ -129,4 +130,68 @@ public class DcBaseParamModelController extends BaseController ExcelUtil util = new ExcelUtil<>(DcBaseParamModel.class); util.exportExcel(response, list, "导出的参数模版表数据"); } + + + + + + /** + * 新增参数模版 + */ + @PreAuthorize("@ss.hasPermi('asset:paramModel:add')") + @Log(title = "参数模版", businessType = BusinessType.INSERT) + @PostMapping("/addBatch") + public AjaxResult addBatch(@RequestBody JSONArray jsonArray) + { + if (jsonArray == null) { + throw new IllegalArgumentException("未能接收任何参数！"); + } + List dcBaseParamModelList = new ArrayList<>(); + try { + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject beanObject = jsonArray.getJSONObject(i); + // 移除ID属性 + beanObject.remove("id"); + DcBaseParamModel dcBaseParamModel = JSON.toJavaObject(beanObject, DcBaseParamModel.class); + dcBaseParamModel.setCreatedTime(DateUtils.getNowDate()); + dcBaseParamModel.setDeptId(getDeptId()); + dcBaseParamModel.setUserId(getUserId()); + dcBaseParamModel.setCreatedBy(String.valueOf(getUserId())); + dcBaseParamModel.setCreatedTime(DateUtils.getNowDate()); + dcBaseParamModelList.add(dcBaseParamModel); + } + } catch (Exception e) { + throw new IllegalArgumentException("解析list对象异常！"); + } + return toAjax(dcBaseParamModelService.saveBatch(dcBaseParamModelList)); + } + + + /** + * 修改指标模版配置 + */ + @PreAuthorize("@ss.hasPermi('asset:paramModel:edit')") + @Log(title = "指标模版配置", businessType = BusinessType.UPDATE) + @PutMapping("/editBatch") + public AjaxResult editBatch(@RequestBody JSONArray jsonArray) + { + if (jsonArray == null) { + throw new IllegalArgumentException("未能接收任何参数！"); + } + List dcBaseParamModelList = new ArrayList<>(); + try { + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject beanObject = jsonArray.getJSONObject(i); + DcBaseParamModel dcBaseParamModel = JSON.toJavaObject(beanObject, DcBaseParamModel.class); + dcBaseParamModel.setUpdatedBy(String.valueOf(getUserId())); + dcBaseParamModel.setUpdatedTime(DateUtils.getNowDate()); + dcBaseParamModelList.add(dcBaseParamModel); + } + } catch (Exception e) { + throw new IllegalArgumentException("解析list对象异常！"); + } + return toAjax(dcBaseParamModelService.updateBatchById(dcBaseParamModelList)); + } + + } 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 index 4455be5..a2aa9ba 100644 --- a/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseParamModel.java +++ b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseParamModel.java @@ -24,7 +24,7 @@ public class DcBaseParamModel extends BaseModuleEntity{ /** 主键 */ @ApiModelProperty(name = "主键",notes = "") - private long id ; + private Long id ; /** 参数模型编码 */ @ApiModelProperty(name = "参数模型编码",notes = "") private String paramModelCode ; diff --git a/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBusiParamSource.java b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBusiParamSource.java index d3a1d8e..3b7c343 100644 --- a/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBusiParamSource.java +++ b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBusiParamSource.java @@ -49,7 +49,7 @@ public class DcBusiParamSource extends BaseModuleEntity{ /** 主键 */ @ApiModelProperty(name = "主键",notes = "") @TableId(type= IdType.AUTO) - private Integer id ; + private Long id ; /** 所属专业 */ @ApiModelProperty(name = "所属专业",notes = "") private String fieldCode ; diff --git a/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBusiWorkReadConfig.java b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBusiWorkReadConfig.java index 4416cbe..b117dc7 100644 --- a/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBusiWorkReadConfig.java +++ b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBusiWorkReadConfig.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import com.lzbi.common.annotation.Excel; import com.lzbi.module.base.BaseModuleEntity; +import lombok.experimental.Accessors; /** * 互联参数读取数据对照对象 dc_busi_work_read_config @@ -13,6 +14,7 @@ import com.lzbi.module.base.BaseModuleEntity; * @date 2023-12-04 */ @Data + @Accessors(chain = true) public class DcBusiWorkReadConfig extends BaseModuleEntity { private static final long serialVersionUID = 1L; diff --git a/lzbi-module/src/main/java/com/lzbi/asset/mapper/DcBaseAssetInfoMapper.java b/lzbi-module/src/main/java/com/lzbi/asset/mapper/DcBaseAssetInfoMapper.java index ee394ee..1f27ef6 100644 --- a/lzbi-module/src/main/java/com/lzbi/asset/mapper/DcBaseAssetInfoMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/asset/mapper/DcBaseAssetInfoMapper.java @@ -31,14 +31,6 @@ public interface DcBaseAssetInfoMapper { */ public List selectDcBaseAssetInfoList(DcBaseAssetInfo dcBaseAssetInfo); - /** - * 根据资产编码查询资产信息 - * - * @param assetCode 资产编码 - * @return 资产信息 - */ - DcBaseAssetInfo selectDcBaseAssetInfoByAssetCode(String assetCode); - /** * 新增资产信息 * diff --git a/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiPlanTargetMonth.java b/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiPlanTargetMonth.java index 3ca8f6f..636eada 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiPlanTargetMonth.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiPlanTargetMonth.java @@ -3,6 +3,7 @@ package com.lzbi.bill.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import lombok.Data; @@ -16,6 +17,7 @@ import com.lzbi.module.base.BaseModuleEntity; * @date 2023-12-06 */ @Data +@Accessors(chain = true) public class DcBusiPlanTargetMonth extends BaseModuleEntity { private static final long serialVersionUID = 1L; diff --git a/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanTargetMonthService.java b/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanTargetMonthService.java index 1bbde3f..7b654a6 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanTargetMonthService.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanTargetMonthService.java @@ -1,12 +1,26 @@ package com.lzbi.bill.service; import java.util.List; + +import com.lzbi.asset.domain.DcBaseAssetInfo; +import com.lzbi.asset.mapper.DcBaseAssetInfoMapper; +import com.lzbi.common.core.domain.entity.SysDept; import com.lzbi.common.utils.DateUtils; +import com.lzbi.special.domain.DcBaseWorkSpecial; +import com.lzbi.special.mapper.DcBaseWorkSpecialMapper; +import com.lzbi.system.service.impl.SysDeptServiceImpl; +import com.lzbi.targetFolder.domain.DcBaseAssetTargetDao; +import com.lzbi.targetFolder.mapper.DcBaseAssetTargetMapper; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.lzbi.bill.domain.DcBusiPlanTargetMonth; import com.lzbi.bill.mapper.DcBusiPlanTargetMonthMapper; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import javax.annotation.Resource; + /** * 指标月度计划Service业务层处理 * @@ -17,6 +31,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; public class DcBusiPlanTargetMonthService extends ServiceImpl implements IService { + @Autowired + private SysDeptServiceImpl sysDeptService; + + @Resource + private DcBaseAssetInfoMapper dcBaseAssetInfoMapper; + + @Resource + private DcBaseWorkSpecialMapper dcBaseWorkSpecialMapper; + + @Resource + private DcBaseAssetTargetMapper dcBaseAssetTargetMapper; + /** * 查询指标月度计划 * @@ -48,6 +74,32 @@ public class DcBusiPlanTargetMonthService extends ServiceImpl dcBusiTargetAdjustDayMasterDao) { return toAjax(dcBusiTargetAdjustDayMasterService.updateDcBusiTargetAdjustDayMasterDao(dcBusiTargetAdjustDayMasterDao)); } diff --git a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetAdjustDaySubController.java b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetAdjustDaySubController.java new file mode 100644 index 0000000..5ebb855 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetAdjustDaySubController.java @@ -0,0 +1,105 @@ +package com.lzbi.draft.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.lzbi.draft.domain.DcBusiTargetAdjustDaySubDao; +import com.lzbi.draft.service.DcBusiTargetAdjustDaySubService; +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.common.utils.poi.ExcelUtil; +import com.lzbi.common.core.page.TableDataInfo; + +/** + * 统计单元指标调整单子(日)Controller + * + * @author win + * @date 2023-12-05 + */ +@RestController +@RequestMapping("/asset/target/adjust/sub") +public class DcBusiTargetAdjustDaySubController extends BaseController +{ + @Autowired + private DcBusiTargetAdjustDaySubService dcBusiTargetAdjustDaySubService; + + /** + * 查询统计单元指标调整单子(日)列表 + */ + @PreAuthorize("@ss.hasPermi('asset:targetAdjustBill:list')") + @GetMapping("/list") + public TableDataInfo list(DcBusiTargetAdjustDaySubDao dcBusiTargetAdjustDaySubDao) + { + startPage(); + List list = dcBusiTargetAdjustDaySubService.selectDcBusiTargetAdjustDaySubDaoList(dcBusiTargetAdjustDaySubDao); + return getDataTable(list); + } + + /** + * 导出统计单元指标调整单子(日)列表 + */ + @PreAuthorize("@ss.hasPermi('asset:targetAdjustBill:export')") + @Log(title = "统计单元指标调整单子(日)", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DcBusiTargetAdjustDaySubDao dcBusiTargetAdjustDaySubDao) + { + List list = dcBusiTargetAdjustDaySubService.selectDcBusiTargetAdjustDaySubDaoList(dcBusiTargetAdjustDaySubDao); + ExcelUtil util = new ExcelUtil(DcBusiTargetAdjustDaySubDao.class); + util.exportExcel(response, list, "统计单元指标调整单子(日)数据"); + } + + /** + * 获取统计单元指标调整单子(日)详细信息 + */ + @PreAuthorize("@ss.hasPermi('asset:targetAdjustBill:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(dcBusiTargetAdjustDaySubService.selectDcBusiTargetAdjustDaySubDaoById(id)); + } + +// /** +// * 新增统计单元指标调整单子(日) +// */ +// @PreAuthorize("@ss.hasPermi('asset:targetAdjustBill:add')") +// @Log(title = "统计单元指标调整单子(日)", businessType = BusinessType.INSERT) +// @PostMapping +// public AjaxResult add(@RequestBody DcBusiTargetAdjustDaySubDao dcBusiTargetAdjustDaySubDao) +// { +// return toAjax(dcBusiTargetAdjustDaySubService.insertDcBusiTargetAdjustDaySubDao(dcBusiTargetAdjustDaySubDao)); +// } + + /** + * 修改统计单元指标调整单子(日) + */ + @PreAuthorize("@ss.hasPermi('asset:targetAdjustBill:edit')") + @Log(title = "统计单元指标调整单子(日)", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DcBusiTargetAdjustDaySubDao dcBusiTargetAdjustDaySubDao) + { + return toAjax(dcBusiTargetAdjustDaySubService.updateDcBusiTargetAdjustDaySubDao(dcBusiTargetAdjustDaySubDao)); + } + + /** + * 删除统计单元指标调整单子(日) + */ + @PreAuthorize("@ss.hasPermi('asset:targetAdjustBill:remove')") + @Log(title = "统计单元指标调整单子(日)", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(dcBusiTargetAdjustDaySubService.deleteDcBusiTargetAdjustDaySubDaoByIds(ids)); + } +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamBillSub.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamBillSub.java index ecb82c6..c5eeac2 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamBillSub.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamBillSub.java @@ -30,7 +30,7 @@ public class DcBusiParamBillSub extends BaseModuleEntity{ /** 主键 */ @ApiModelProperty(name = "主键",notes = "") @TableId(type = IdType.AUTO) - private Integer id ; + private Long id ; /** 单据编码 */ @ApiModelProperty(name = "单据编码",notes = "") private String billNo ; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamDraftDay.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamDraftDay.java index 4825b10..ea7b110 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamDraftDay.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamDraftDay.java @@ -5,6 +5,7 @@ import java.util.Date; import lombok.Data; import com.lzbi.common.annotation.Excel; import com.lzbi.module.base.BaseModuleEntity; +import lombok.experimental.Accessors; /** * 参数数据底稿（日）对象 dc_busi_param_draft_day @@ -13,6 +14,7 @@ import com.lzbi.module.base.BaseModuleEntity; * @date 2023-12-06 */ @Data +@Accessors(chain = true) public class DcBusiParamDraftDay extends BaseModuleEntity { private static final long serialVersionUID = 1L; @@ -31,7 +33,7 @@ public class DcBusiParamDraftDay extends BaseModuleEntity /** 主键 */ @Excel(name = "主键") - private String id; + private Long id; /** 公司编码 */ private Integer companyId; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetAdjustDayMasterDao.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetAdjustDayMasterDao.java index b3f4000..7d24c9a 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetAdjustDayMasterDao.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetAdjustDayMasterDao.java @@ -6,6 +6,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import lombok.Data; @@ -21,6 +22,7 @@ import springfox.documentation.annotations.ApiIgnore; */ @ApiModel(value = "DcBusiTargetAdjustDayMasterDao对象", description = "资产指标调整单主表对象") @Data +@Accessors(chain = true) public class DcBusiTargetAdjustDayMasterDao extends BaseModuleEntity { /** * 待审核状态 @@ -37,7 +39,7 @@ public class DcBusiTargetAdjustDayMasterDao extends BaseModuleEntity { /** * 人工 */ - public static final String CHECK_TYPE_ARTIFICIAL = "0"; + public static final String CHECK_TYPE_ARTIFICIAL = "1"; private static final long serialVersionUID = 1L; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetAdjustDaySubDao.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetAdjustDaySubDao.java index 7530a0b..97e6e3c 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetAdjustDaySubDao.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetAdjustDaySubDao.java @@ -6,6 +6,7 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import lombok.Data; @@ -20,6 +21,7 @@ import com.lzbi.module.base.BaseModuleEntity; */ @ApiModel(value = "DcBusiTargetAdjustDaySubDao对象", description = "资产指标调整单子表对象") @Data +@Accessors(chain = true) public class DcBusiTargetAdjustDaySubDao extends BaseModuleEntity { private static final long serialVersionUID = 1L; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftDay.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftDay.java index 82bbd85..4e5f7bd 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftDay.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftDay.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.lzbi.common.annotation.Excel; import com.lzbi.module.base.BaseModuleEntity; +import lombok.experimental.Accessors; /** * 指标数据底稿(日)对象 dc_busi_target_draft_day @@ -14,6 +15,7 @@ import com.lzbi.module.base.BaseModuleEntity; * @date 2023-11-28 */ @Data +@Accessors(chain = true) public class DcBusiTargetDraftDay extends BaseModuleEntity { private static final long serialVersionUID = 1L; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftMonth.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftMonth.java index cd1f44f..954e627 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftMonth.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftMonth.java @@ -6,6 +6,7 @@ import java.util.Date; import lombok.Data; import com.lzbi.common.annotation.Excel; import com.lzbi.module.base.BaseModuleEntity; +import lombok.experimental.Accessors; /** * 指标数据底稿(月)对象 dc_busi_target_draft_month @@ -14,6 +15,7 @@ import com.lzbi.module.base.BaseModuleEntity; * @date 2023-12-06 */ @Data +@Accessors(chain = true) public class DcBusiTargetDraftMonth extends BaseModuleEntity { private static final long serialVersionUID = 1L; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetAdjustDaySubMapper.java b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetAdjustDaySubMapper.java index 4a4e996..a6e56cd 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetAdjustDaySubMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetAdjustDaySubMapper.java @@ -60,4 +60,16 @@ public interface DcBusiTargetAdjustDaySubMapper extends BaseMapper dcBusiTargetAdjustDaySubDaos = dcBusiTargetAdjustDaySubMapper.selectDcBusiTargetAdjustDaySubDaoList(dcBusiTargetAdjustDaySubDao); + dcBusiTargetAdjustDayMasterDao.setChildren(dcBusiTargetAdjustDaySubDaos); + return dcBusiTargetAdjustDayMasterDao; } /** @@ -98,12 +103,12 @@ public class DcBusiTargetAdjustDayMasterService extends ServiceImpl children = dcBusiTargetAdjustDayMasterDao.getChildren(); + for (DcBusiTargetAdjustDaySubDao dcBusiTargetAdjustDaySubDao : children) { + dcBusiTargetAdjustDaySubDao.setBillNoMaster(dcBusiTargetAdjustDayMasterDao.getBillSerial()); + dcBusiTargetAdjustDaySubService.insertDcBusiTargetAdjustDaySubDao(dcBusiTargetAdjustDaySubDao, assetCode); + } dcBusiTargetAdjustDayMasterDao.setUpdatedTime(DateUtils.getNowDate()); return baseMapper.updateDcBusiTargetAdjustDayMasterDao(dcBusiTargetAdjustDayMasterDao); } @@ -138,8 +172,10 @@ public class DcBusiTargetAdjustDayMasterService extends ServiceImpl dcBusiTargetDraftDayList = dcBusiTargetDraftDayMapper.selectDcBusiTargetDraftDayList(dcBusiTargetDraftDay); // 如果未查询出来指标数据底稿数据，就新增，否则修改 if (CollectionUtils.isEmpty(dcBusiTargetDraftDayList)) { @@ -224,7 +260,7 @@ public class DcBusiTargetAdjustDayMasterService extends ServiceImpl implements IService { + @Resource + private DcBaseAssetTargetMapper dcBaseAssetTargetMapper; + /** * 查询统计单元指标调整单子(日) * @@ -45,14 +53,16 @@ public class DcBusiTargetAdjustDaySubService extends ServiceImpl list = dcBaseWorkSpecialService.selectDcBaseWorkSpecialList(dcBaseWorkSpecial); return AjaxResult.success(list); } - - /** * 新增生产专业管理 */ diff --git a/lzbi-module/src/main/java/com/lzbi/special/mapper/DcBaseWorkSpecialMapper.java b/lzbi-module/src/main/java/com/lzbi/special/mapper/DcBaseWorkSpecialMapper.java index a941785..562ac42 100644 --- a/lzbi-module/src/main/java/com/lzbi/special/mapper/DcBaseWorkSpecialMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/special/mapper/DcBaseWorkSpecialMapper.java @@ -25,14 +25,6 @@ public interface DcBaseWorkSpecialMapper extends BaseMapper public DcBaseWorkSpecial selectDcBaseWorkSpecialById(Long id); public DcBaseWorkSpecial selectDcBaseWorkSpecialByCode(String specialCode); - /** - * 查询生产专业管理 - * - * @param specialCode 专业编码 - * @return 生产专业管理 - */ - public DcBaseWorkSpecial selectDcBaseWorkSpecialBySpecialCode(String specialCode); - /** * 查询生产专业管理列表 * diff --git a/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseAssetTargetController.java b/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseAssetTargetController.java index 54cd131..867d91e 100644 --- a/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseAssetTargetController.java +++ b/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseAssetTargetController.java @@ -2,6 +2,7 @@ package com.lzbi.targetFolder.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; diff --git a/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseTargetModelController.java b/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseTargetModelController.java index 0bd1def..a891afd 100644 --- a/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseTargetModelController.java +++ b/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseTargetModelController.java @@ -1,7 +1,18 @@ package com.lzbi.targetFolder.controller; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; +import com.lzbi.common.utils.DateUtils; +import com.lzbi.targetFolder.domain.DcBaseTargetModel; +import com.lzbi.targetFolder.service.DcBaseTargetModelService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -16,16 +27,15 @@ 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.targetFolder.domain.DcBaseTargetModelDao; -import com.lzbi.targetFolder.service.DcBaseTargetModelService; import com.lzbi.common.utils.poi.ExcelUtil; import com.lzbi.common.core.page.TableDataInfo; + /** * 指标模版配置Controller - * + * * @author Lu.JL - * @date 2023-11-29 + * @date 2023-12-07 */ @RestController @RequestMapping("/target/targetModel") @@ -37,81 +47,156 @@ public class DcBaseTargetModelController extends BaseController /** * 查询指标模版配置列表 */ + @ApiOperation("查询指标模版配置列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBaseTargetModel", value = "", dataType = "DcBaseTargetModel", dataTypeClass = DcBaseTargetModel.class), + }) @PreAuthorize("@ss.hasPermi('target:targetModel:list')") @GetMapping("/list") - public TableDataInfo list(DcBaseTargetModelDao dcBaseTargetModelDao) + public TableDataInfo list(DcBaseTargetModel DcBaseTargetModel) { startPage(); - List list = dcBaseTargetModelService.selectDcBaseTargetModelDaoList(dcBaseTargetModelDao); + List< DcBaseTargetModel> list = dcBaseTargetModelService.selectDcBaseTargetModelList(DcBaseTargetModel); return getDataTable(list); } /** * 导出指标模版配置列表 */ + @ApiOperation("导出指标模版配置列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBaseTargetModel", value = "", dataType = "DcBaseTargetModel", dataTypeClass = DcBaseTargetModel.class), + }) @PreAuthorize("@ss.hasPermi('target:targetModel:export')") @Log(title = "指标模版配置", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, DcBaseTargetModelDao dcBaseTargetModelDao) + public void export(HttpServletResponse response,DcBaseTargetModel DcBaseTargetModel) { - List list = dcBaseTargetModelService.selectDcBaseTargetModelDaoList(dcBaseTargetModelDao); - ExcelUtil util = new ExcelUtil(DcBaseTargetModelDao.class); + List list = dcBaseTargetModelService.selectDcBaseTargetModelList(DcBaseTargetModel); + ExcelUtil util = new ExcelUtil(DcBaseTargetModel.class); util.exportExcel(response, list, "指标模版配置数据"); } /** * 获取指标模版配置详细信息 */ + @ApiOperation("获取指标模版配置详细信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "", dataType = "Long", dataTypeClass = Long.class), + }) @PreAuthorize("@ss.hasPermi('target:targetModel:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(dcBaseTargetModelService.selectDcBaseTargetModelDaoById(id)); + return success(dcBaseTargetModelService.selectDcBaseTargetModelById(id)); } /** * 新增指标模版配置 */ + @ApiOperation("新增指标模版配置") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBaseTargetModel", value = "", dataType = "DcBaseTargetModel", dataTypeClass = DcBaseTargetModel.class), + }) @PreAuthorize("@ss.hasPermi('target:targetModel:add')") @Log(title = "指标模版配置", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody DcBaseTargetModelDao dcBaseTargetModelDao) + public AjaxResult add(@RequestBody DcBaseTargetModel DcBaseTargetModel) { - return toAjax(dcBaseTargetModelService.insertDcBaseTargetModelDao(dcBaseTargetModelDao)); + return toAjax(dcBaseTargetModelService.insertDcBaseTargetModel(DcBaseTargetModel)); } /** * 修改指标模版配置 */ + + @ApiOperation("修改指标模版配置") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBaseTargetModel", value = "", dataType = "DcBaseTargetModel", dataTypeClass = DcBaseTargetModel.class), + }) @PreAuthorize("@ss.hasPermi('target:targetModel:edit')") @Log(title = "指标模版配置", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody DcBaseTargetModelDao dcBaseTargetModelDao) + public AjaxResult edit(@RequestBody DcBaseTargetModel DcBaseTargetModel) { - return toAjax(dcBaseTargetModelService.updateDcBaseTargetModelDao(dcBaseTargetModelDao)); + return toAjax(dcBaseTargetModelService.updateDcBaseTargetModel(DcBaseTargetModel)); } /** * 删除指标模版配置 */ + @ApiOperation("删除指标模版配置") + @ApiImplicitParams({ + @ApiImplicitParam(name = "ids", value = "", dataType = "Long", dataTypeClass =Long.class), + }) @PreAuthorize("@ss.hasPermi('target:targetModel:remove')") @Log(title = "指标模版配置", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") + @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(dcBaseTargetModelService.deleteDcBaseTargetModelDaoByIds(ids)); + return toAjax(dcBaseTargetModelService.deleteDcBaseTargetModelByIds(ids)); } + /** - * 查询指标模版配置列表 + * 新增指标模版配置 */ - @PreAuthorize("@ss.hasPermi('target:targetModel:list')") - @GetMapping("/listNoPage") - public AjaxResult listNoPage(DcBaseTargetModelDao dcBaseTargetModelDao) + @PreAuthorize("@ss.hasPermi('target:targetModel:add')") + @Log(title = "指标模版配置", businessType = BusinessType.INSERT) + @PostMapping("/addBatch") + public AjaxResult addBatch(@RequestBody JSONArray jsonArray) { - List list = dcBaseTargetModelService.selectDcBaseTargetModelDaoList(dcBaseTargetModelDao); - return AjaxResult.success(list); + if (jsonArray == null) { + throw new IllegalArgumentException("未能接收任何参数！"); + } + List beanList = new ArrayList<>(); + try { + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject beanObject = jsonArray.getJSONObject(i); + // 移除ID属性 + beanObject.remove("id"); + DcBaseTargetModel dcBaseTargetModel = JSON.toJavaObject(beanObject, DcBaseTargetModel.class); + dcBaseTargetModel.setCreatedTime(DateUtils.getNowDate()); + dcBaseTargetModel.setDeptId(getDeptId()); + dcBaseTargetModel.setUserId(getUserId()); + dcBaseTargetModel.setCreatedBy(String.valueOf(getUserId())); + dcBaseTargetModel.setCreatedTime(DateUtils.getNowDate()); + beanList.add(dcBaseTargetModel); + } + } catch (Exception e) { + throw new IllegalArgumentException("解析list对象异常！"); + } + return toAjax(dcBaseTargetModelService.saveBatch(beanList)); } + /** + * 修改指标模版配置 + */ + @PreAuthorize("@ss.hasPermi('target:targetModel:edit')") + @Log(title = "指标模版配置", businessType = BusinessType.UPDATE) + @PutMapping("editBatch") + public AjaxResult editBatch(@RequestBody JSONArray jsonArray) + { + if (jsonArray == null) { + throw new IllegalArgumentException("未能接收任何参数！"); + } + List dcBaseWorkSpecialList = new ArrayList<>(); + try { + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject beanObject = jsonArray.getJSONObject(i); + DcBaseTargetModel dcBaseTargetModel = JSON.toJavaObject(beanObject, DcBaseTargetModel.class); + dcBaseTargetModel.setUpdatedBy(String.valueOf(getUserId())); + dcBaseTargetModel.setUpdatedTime(DateUtils.getNowDate()); + dcBaseWorkSpecialList.add(dcBaseTargetModel); + } + } catch (Exception e) { + throw new IllegalArgumentException("解析list对象异常！"); + } + return toAjax(dcBaseTargetModelService.updateBatchById(dcBaseWorkSpecialList)); + } + + + + } diff --git a/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTargetDao.java b/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTargetDao.java index 4f48bf9..c017b6f 100644 --- a/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTargetDao.java +++ b/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTargetDao.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.lzbi.common.annotation.Excel; import com.lzbi.module.base.BaseModuleEntity; +import lombok.experimental.Accessors; /** * 资产指标配置对象 dc_base_asset_target @@ -17,6 +18,7 @@ import com.lzbi.module.base.BaseModuleEntity; * @date 2023-11-30 */ @Data + @Accessors(chain = true) public class DcBaseAssetTargetDao extends BaseModuleEntity { private static final long serialVersionUID = 1L; @@ -36,6 +38,9 @@ public class DcBaseAssetTargetDao extends BaseModuleEntity @Excel(name = "指标名称") private String targetName; + @Excel(name = "指标别名") + private String targetNameAlias; + /** 指标编码 */ @Excel(name = "指标编码") private String targetCode; diff --git a/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseTargetModelDao.java b/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseTargetModel.java similarity index 71% rename from lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseTargetModelDao.java rename to lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseTargetModel.java index 8945f97..bc25936 100644 --- a/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseTargetModelDao.java +++ b/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseTargetModel.java @@ -1,5 +1,10 @@ package com.lzbi.targetFolder.domain; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.experimental.Accessors; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import lombok.Data; import com.lzbi.common.annotation.Excel; import com.lzbi.module.base.BaseModuleEntity; @@ -8,16 +13,14 @@ import com.lzbi.module.base.BaseModuleEntity; * 指标模版配置对象 dc_base_target_model * * @author Lu.JL - * @date 2023-11-29 + * @date 2023-12-07 */ - @Data -public class DcBaseTargetModelDao extends BaseModuleEntity +@Data +@Accessors(chain = true) +public class DcBaseTargetModel extends BaseModuleEntity { private static final long serialVersionUID = 1L; - /** 主键 */ - private Long id; - /** 指标模版编码 */ @Excel(name = "指标模版编码") private String targetModelCode; @@ -38,6 +41,4 @@ public class DcBaseTargetModelDao extends BaseModuleEntity @Excel(name = "指标等级") private Long targetModelLevel; - - } diff --git a/lzbi-module/src/main/java/com/lzbi/targetFolder/mapper/DcBaseAssetTargetMapper.java b/lzbi-module/src/main/java/com/lzbi/targetFolder/mapper/DcBaseAssetTargetMapper.java index 9c950ab..83d0fd4 100644 --- a/lzbi-module/src/main/java/com/lzbi/targetFolder/mapper/DcBaseAssetTargetMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/targetFolder/mapper/DcBaseAssetTargetMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.lzbi.targetFolder.domain.DcBaseAssetTargetDao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 资产指标配置Mapper接口 @@ -22,6 +23,14 @@ public interface DcBaseAssetTargetMapper extends BaseMapper +public interface DcBaseTargetModelMapper extends BaseMapper { /** * 查询指标模版配置 - * + * * @param id 指标模版配置主键 * @return 指标模版配置 */ - public DcBaseTargetModelDao selectDcBaseTargetModelDaoById(Long id); + public DcBaseTargetModel selectDcBaseTargetModelById(Long id); /** * 查询指标模版配置列表 - * - * @param dcBaseTargetModelDao 指标模版配置 + * + * @param dcBaseTargetModel 指标模版配置 * @return 指标模版配置集合 */ - public List selectDcBaseTargetModelDaoList(DcBaseTargetModelDao dcBaseTargetModelDao); + public List selectDcBaseTargetModelList(DcBaseTargetModel dcBaseTargetModel); /** * 新增指标模版配置 - * - * @param dcBaseTargetModelDao 指标模版配置 + * + * @param dcBaseTargetModel 指标模版配置 * @return 结果 */ - public int insertDcBaseTargetModelDao(DcBaseTargetModelDao dcBaseTargetModelDao); + public int insertDcBaseTargetModel(DcBaseTargetModel dcBaseTargetModel); /** * 修改指标模版配置 - * + * * @param dcBaseTargetModel 指标模版配置 * @return 结果 */ - public int updateDcBaseTargetModelDao(DcBaseTargetModelDao dcBaseTargetModelDao); + public int updateDcBaseTargetModel(DcBaseTargetModel dcBaseTargetModel); /** * 删除指标模版配置 - * + * * @param id 指标模版配置主键 * @return 结果 */ - public int deleteDcBaseTargetModelDaoById(Long id); + public int deleteDcBaseTargetModelById(Long id); /** * 批量删除指标模版配置 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteDcBaseTargetModelDaoByIds(Long[] ids); + public int deleteDcBaseTargetModelByIds(Long[] ids); } diff --git a/lzbi-module/src/main/java/com/lzbi/targetFolder/service/DcBaseTargetModelService.java b/lzbi-module/src/main/java/com/lzbi/targetFolder/service/DcBaseTargetModelService.java index dd91986..041926e 100644 --- a/lzbi-module/src/main/java/com/lzbi/targetFolder/service/DcBaseTargetModelService.java +++ b/lzbi-module/src/main/java/com/lzbi/targetFolder/service/DcBaseTargetModelService.java @@ -2,91 +2,91 @@ package com.lzbi.targetFolder.service; import java.util.List; -import com.lzbi.common.utils.DateUtils; -import org.springframework.stereotype.Service; -import com.lzbi.targetFolder.domain.DcBaseTargetModelDao; -import com.lzbi.targetFolder.mapper.DcBaseTargetModelMapper; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lzbi.common.utils.DateUtils; +import com.lzbi.targetFolder.domain.DcBaseTargetModel; +import com.lzbi.targetFolder.mapper.DcBaseTargetModelMapper; +import org.springframework.stereotype.Service; /** * 指标模版配置Service业务层处理 - * + * * @author Lu.JL - * @date 2023-11-29 + * @date 2023-12-07 */ @Service -public class DcBaseTargetModelService extends ServiceImpl implements IService +public class DcBaseTargetModelService extends ServiceImpl implements IService { /** * 查询指标模版配置 - * + * * @param id 指标模版配置主键 * @return 指标模版配置 */ - public DcBaseTargetModelDao selectDcBaseTargetModelDaoById(Long id) + public DcBaseTargetModel selectDcBaseTargetModelById(Long id) { - return baseMapper.selectDcBaseTargetModelDaoById(id); + return baseMapper.selectDcBaseTargetModelById(id); } /** * 查询指标模版配置列表 - * - * @param dcBaseTargetModelDao 指标模版配置 + * + * @param dcBaseTargetModel 指标模版配置 * @return 指标模版配置 */ - public List selectDcBaseTargetModelDaoList(DcBaseTargetModelDao dcBaseTargetModelDao) + public List selectDcBaseTargetModelList(DcBaseTargetModel dcBaseTargetModel) { - return baseMapper.selectDcBaseTargetModelDaoList(dcBaseTargetModelDao); + return baseMapper.selectDcBaseTargetModelList(dcBaseTargetModel); } /** * 新增指标模版配置 - * - * @param dcBaseTargetModelDao 指标模版配置 + * + * @param dcBaseTargetModel 指标模版配置 * @return 结果 */ - public int insertDcBaseTargetModelDao(DcBaseTargetModelDao dcBaseTargetModelDao) + public int insertDcBaseTargetModel(DcBaseTargetModel dcBaseTargetModel) { - dcBaseTargetModelDao.setCreatedTime(DateUtils.getNowDate()); - return baseMapper.insertDcBaseTargetModelDao(dcBaseTargetModelDao); + dcBaseTargetModel.setCreatedTime(DateUtils.getNowDate()); + return baseMapper.insertDcBaseTargetModel(dcBaseTargetModel); } /** * 修改指标模版配置 - * - * @param dcBaseTargetModelDao 指标模版配置 + * + * @param dcBaseTargetModel 指标模版配置 * @return 结果 */ - public int updateDcBaseTargetModelDao(DcBaseTargetModelDao dcBaseTargetModelDao) + public int updateDcBaseTargetModel(DcBaseTargetModel dcBaseTargetModel) { - dcBaseTargetModelDao.setUpdatedTime(DateUtils.getNowDate()); - return baseMapper.updateDcBaseTargetModelDao(dcBaseTargetModelDao); + dcBaseTargetModel.setUpdatedTime(DateUtils.getNowDate()); + return baseMapper.updateDcBaseTargetModel(dcBaseTargetModel); } /** * 批量删除指标模版配置 - * + * * @param ids 需要删除的指标模版配置主键 * @return 结果 */ - public int deleteDcBaseTargetModelDaoByIds(Long[] ids) + public int deleteDcBaseTargetModelByIds(Long[] ids) { - return baseMapper.deleteDcBaseTargetModelDaoByIds(ids); + return baseMapper.deleteDcBaseTargetModelByIds(ids); } /** * 删除指标模版配置信息 - * + * * @param id 指标模版配置主键 * @return 结果 */ - public int deleteDcBaseTargetModelDaoById(Long id) + public int deleteDcBaseTargetModelById(Long id) { - return baseMapper.deleteDcBaseTargetModelDaoById(id); + return baseMapper.deleteDcBaseTargetModelById(id); } } diff --git a/lzbi-module/src/main/java/com/lzbi/task/service/WorkParamReadService.java b/lzbi-module/src/main/java/com/lzbi/task/service/WorkParamReadService.java index a15825c..1f71412 100644 --- a/lzbi-module/src/main/java/com/lzbi/task/service/WorkParamReadService.java +++ b/lzbi-module/src/main/java/com/lzbi/task/service/WorkParamReadService.java @@ -13,7 +13,7 @@ import java.util.List; /** * 编码规则定义Service业务层处理 - * + * * @author win * @date 2023-11-29 */ @@ -23,7 +23,7 @@ public class WorkParamReadService extends ServiceImpl readWorkValue(ReadQueryParams readQueryParams){ return baseMapper.readWorkValue(readQueryParams); } diff --git a/lzbi-module/src/main/resources/mapper/asset/DcBusiPlanTargetMonthMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBusiPlanTargetMonthMapper.xml index 16a78b3..9415311 100644 --- a/lzbi-module/src/main/resources/mapper/asset/DcBusiPlanTargetMonthMapper.xml +++ b/lzbi-module/src/main/resources/mapper/asset/DcBusiPlanTargetMonthMapper.xml @@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and count_year = #{countYear} and count_month = #{countMonth} + order by created_time desc + - - where id = #{id} - - + + insert into dc_base_target_model target_model_code, @@ -57,7 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" updated_time, delete_by, delete_time, - + dept_id, + user_id, + #{targetModelCode}, #{targetModelName}, @@ -72,10 +76,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updatedTime}, #{deleteBy}, #{deleteTime}, - + #{deptId}, + #{userId}, + - + update dc_base_target_model target_model_code = #{targetModelCode}, @@ -91,16 +97,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" updated_time = #{updatedTime}, delete_by = #{deleteBy}, delete_time = #{deleteTime}, + dept_id = #{deptId}, + user_id = #{userId}, where id = #{id} - + delete from dc_base_target_model where id = #{id} - - delete from dc_base_target_model where id in + + delete from dc_base_target_model where id in #{id}