From bd66d76c500f988078d63b86b45c01fb47c7ca07 Mon Sep 17 00:00:00 2001 From: zhousq Date: Thu, 14 Dec 2023 19:00:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?2023-12-14=20=E6=8C=87=E6=A0=87=E9=87=87?= =?UTF-8?q?=E9=9B=86=E5=8D=95=E5=BD=95=E5=85=A5=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=A7=84=E5=88=99=E7=9A=84=E5=BA=8F=E5=8F=B7?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=B8=8D=E5=90=8C=E6=AD=A5bug=EF=BC=9B?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E7=8E=B0=E7=9A=84=E5=85=B6=E4=BB=96?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DcBaseCoderuleDefineMapper.java | 2 + .../service/DcBaseCoderuleDefineService.java | 10 +- .../com/lzbi/common/SelectOptionsControl.java | 2 +- .../controller/DcBusiParamCollectBill.java | 29 +- .../DcBusiTargetBillMasterController.java | 131 +++++++++ .../controller/DcBusiTargetCollectBill.java | 255 ++++++++++++++++++ .../draft/domain/DcBusiBillModelMaster.java | 26 +- .../draft/domain/DcBusiParamBillMaster.java | 1 + .../draft/domain/DcBusiTargetBillMaster.java | 100 +++++++ .../draft/domain/DcBusiTargetBillSub.java | 95 +++++++ .../lzbi/draft/domain/DeptQueryParams.java | 21 ++ .../mapper/DcBusiTargetBillMasterMapper.java | 90 +++++++ .../DcBusiTargetBillMasterService.java | 133 +++++++++ .../asset/DcBaseCoderuleDefineMapper.xml | 14 +- .../draft/DcBusiBillModelMasterMapper.xml | 9 +- .../draft/DcBusiTargetBillMasterMapper.xml | 181 +++++++++++++ 16 files changed, 1080 insertions(+), 19 deletions(-) create mode 100644 lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetBillMasterController.java create mode 100644 lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetCollectBill.java create mode 100644 lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillMaster.java create mode 100644 lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillSub.java create mode 100644 lzbi-module/src/main/java/com/lzbi/draft/domain/DeptQueryParams.java create mode 100644 lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetBillMasterMapper.java create mode 100644 lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetBillMasterService.java create mode 100644 lzbi-module/src/main/resources/mapper/draft/DcBusiTargetBillMasterMapper.xml diff --git a/lzbi-module/src/main/java/com/lzbi/code/mapper/DcBaseCoderuleDefineMapper.java b/lzbi-module/src/main/java/com/lzbi/code/mapper/DcBaseCoderuleDefineMapper.java index b68f9c2..c15e289 100644 --- a/lzbi-module/src/main/java/com/lzbi/code/mapper/DcBaseCoderuleDefineMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/code/mapper/DcBaseCoderuleDefineMapper.java @@ -39,6 +39,7 @@ public interface DcBaseCoderuleDefineMapper extends BaseMapper list = dcBusiBillModelMasterService.selectDcBusiBillModelMasterList(dcBusiBillModelMaster); return getDataTable(list); } + @GetMapping("/userModellist") + public TableDataInfo getUserModellist(DeptQueryParams deptQueryParams) + { startPage(); + List list; + if(StringUtils.isNotNull(deptQueryParams)){ + DcBusiBillModelMaster dcBusiBillModelMaster=new DcBusiBillModelMaster(); + LoginUser loginUser = SecurityUtils.getLoginUser(); + dcBusiBillModelMaster.setCreatedBy(loginUser.getUsername()); + dcBusiBillModelMaster.setModelType("P"); + if(Optional.ofNullable(deptQueryParams.getOrgType()).orElse("").equals("1002")){ + dcBusiBillModelMaster.setCompanyId(Optional.ofNullable(deptQueryParams.getDeptId()).orElse(0L)); + }else{ + dcBusiBillModelMaster.setOrgId(Optional.ofNullable(deptQueryParams.getDeptId()).orElse(0L)); + } + list = dcBusiBillModelMasterService.selectDcBusiBillModelMasterList(dcBusiBillModelMaster); + }else{ + list=new ArrayList<>(); + } + + + return getDataTable(list); + } @GetMapping("/userModelById/{mid}") public AjaxResult getUserModelById(@PathVariable Long mid) { @@ -141,6 +161,7 @@ public class DcBusiParamCollectBill extends BaseController dcBusiBillModelMaster.setBillModelPoint(dcBusiParamBillMaster.getCountTimes()); dcBusiBillModelMaster.setRoleId(loginUser.getUser().getRoleId()); dcBusiBillModelMaster.setDeptId(loginUser.getDeptId()); + dcBusiBillModelMaster.setModelType("P"); long deptId=dcBusiParamBillMaster.getCompanyId(); SysDept sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ; dcBusiBillModelMaster.setCompanyId(deptId); diff --git a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetBillMasterController.java b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetBillMasterController.java new file mode 100644 index 0000000..23725a0 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetBillMasterController.java @@ -0,0 +1,131 @@ +package com.lzbi.draft.controller; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.lzbi.common.annotation.Log; +import com.lzbi.common.core.controller.BaseController; +import com.lzbi.common.core.domain.AjaxResult; +import com.lzbi.common.enums.BusinessType; +import com.lzbi.draft.domain. DcBusiTargetBillMaster; +import com.lzbi.draft.service.DcBusiTargetBillMasterService; +import com.lzbi.common.utils.poi.ExcelUtil; +import com.lzbi.common.core.page.TableDataInfo; + +/** + * 统计指标录入Controller + * + * @author zhousq + * @date 2023-12-14 + */ +@RestController +@RequestMapping("/draft/targetBillMaster") +public class DcBusiTargetBillMasterController extends BaseController +{ + @Autowired + private DcBusiTargetBillMasterService dcBusiTargetBillMasterService; + + /** + * 查询统计指标录入列表 + */ + @ApiOperation("查询统计指标录入列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiTargetBillMaster", value = "", dataType = "DcBusiTargetBillMaster", dataTypeClass = DcBusiTargetBillMaster.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetCollect:list')") + @GetMapping("/list") + public TableDataInfo list(DcBusiTargetBillMaster DcBusiTargetBillMaster) + { + startPage(); + List< DcBusiTargetBillMaster> list = dcBusiTargetBillMasterService.selectDcBusiTargetBillMasterList(DcBusiTargetBillMaster); + return getDataTable(list); + } + + /** + * 导出统计指标录入列表 + */ + @ApiOperation("导出统计指标录入列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiTargetBillMaster", value = "", dataType = "DcBusiTargetBillMaster", dataTypeClass = DcBusiTargetBillMaster.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetCollect:export')") + @Log(title = "统计指标录入", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response,DcBusiTargetBillMaster DcBusiTargetBillMaster) + { + List list = dcBusiTargetBillMasterService.selectDcBusiTargetBillMasterList(DcBusiTargetBillMaster); + ExcelUtil util = new ExcelUtil(DcBusiTargetBillMaster.class); + util.exportExcel(response, list, "统计指标录入数据"); + } + + /** + * 获取统计指标录入详细信息 + */ + @ApiOperation("获取统计指标录入详细信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "", dataType = "Long", dataTypeClass = Long.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetCollect:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(dcBusiTargetBillMasterService.selectDcBusiTargetBillMasterById(id)); + } + + /** + * 新增统计指标录入 + */ + @ApiOperation("新增统计指标录入") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiTargetBillMaster", value = "", dataType = "DcBusiTargetBillMaster", dataTypeClass = DcBusiTargetBillMaster.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetCollect:add')") + @Log(title = "统计指标录入", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DcBusiTargetBillMaster DcBusiTargetBillMaster) + { + return toAjax(dcBusiTargetBillMasterService.insertDcBusiTargetBillMaster(DcBusiTargetBillMaster)); + } + + /** + * 修改统计指标录入 + */ + + @ApiOperation("修改统计指标录入") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiTargetBillMaster", value = "", dataType = "DcBusiTargetBillMaster", dataTypeClass = DcBusiTargetBillMaster.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetCollect:edit')") + @Log(title = "统计指标录入", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DcBusiTargetBillMaster DcBusiTargetBillMaster) + { + return toAjax(dcBusiTargetBillMasterService.updateDcBusiTargetBillMaster(DcBusiTargetBillMaster)); + } + + /** + * 删除统计指标录入 + */ + @ApiOperation("删除统计指标录入") + @ApiImplicitParams({ + @ApiImplicitParam(name = "ids", value = "", dataType = "Long", dataTypeClass =Long.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetCollect:remove')") + @Log(title = "统计指标录入", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(dcBusiTargetBillMasterService.deleteDcBusiTargetBillMasterByIds(ids)); + } +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetCollectBill.java b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetCollectBill.java new file mode 100644 index 0000000..04daeec --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetCollectBill.java @@ -0,0 +1,255 @@ +package com.lzbi.draft.controller; + +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; +import com.lzbi.code.domain.DcBaseCoderuleDefineDao; +import com.lzbi.code.domain.DcBusiCoderuleConfigDao; +import com.lzbi.code.service.CodeNoGenerater; +import com.lzbi.code.service.DcBaseCoderuleDefineService; +import com.lzbi.common.core.controller.BaseController; +import com.lzbi.common.core.domain.AjaxResult; +import com.lzbi.common.core.domain.entity.SysDept; +import com.lzbi.common.core.domain.model.LoginUser; +import com.lzbi.common.core.page.TableDataInfo; +import com.lzbi.common.utils.SecurityUtils; +import com.lzbi.common.utils.StringUtils; +import com.lzbi.draft.domain.*; +import com.lzbi.draft.service.DcBusiBillModelMasterService; +import com.lzbi.draft.service.DcBusiTargetBillMasterService; +import com.lzbi.system.service.ISysDeptService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +/** + * 参数采集（录入）单据主Controller + * + * @author win + * @date 2023-11-28 + */ +@RestController +@RequestMapping("/draft/targetCollect") +public class DcBusiTargetCollectBill extends BaseController +{ + @Autowired + private DcBusiBillModelMasterService dcBusiBillModelMasterService; + @Autowired + private DcBusiTargetBillMasterService dcBusiTargetBillMasterService; + + @Autowired + private DcBaseCoderuleDefineService dcBaseCoderuleDefineService; + @Autowired + private CodeNoGenerater codeNoGenerater; + @Autowired + private ISysDeptService sysDeptService; + /** + * 查询参数采集（录入） + * 根据 + */ + // @PreAuthorize("@ss.hasPermi('param:paramData:list')") + @GetMapping("/list") + public TableDataInfo list(DcBusiTargetBillMaster dcBusiTargetBillMasterDao) + { + startPage(); + //List list = dcBusiTargetBillMasterService.selectDcBusiTargetBillMasterDaoList(dcBusiTargetBillMasterDao); + return getDataTable(null); + } + /** + * 根据根据公司查询模版，现根据用户名进行过滤 + * 根据 + */ + @ApiOperation("根据根据公司查询模版，现根据用户名进行过滤") + @ApiImplicitParams({ + @ApiImplicitParam(name = "companyId", value = "", dataType = "Long", dataTypeClass = Long.class), + }) + //@PreAuthorize("@ss.hasPermi('param:paramData:list')") + @GetMapping("/userModellist/{companyId}") + public TableDataInfo getUserModellist(@PathVariable Long companyId) + { + DcBusiBillModelMaster dcBusiBillModelMaster=new DcBusiBillModelMaster(); + LoginUser loginUser = SecurityUtils.getLoginUser(); + dcBusiBillModelMaster.setCreatedBy(loginUser.getUsername()); + dcBusiBillModelMaster.setCompanyId(Optional.ofNullable(companyId).orElse(null)); + dcBusiBillModelMaster.setModelType("T"); + //dcBusiBillModelMaster.setDeptId(loginUser.getDeptId()); + //dcBusiBillModelMaster.setRoleId(loginUser.getUser().getRoleId()); + startPage(); + List list = dcBusiBillModelMasterService.selectDcBusiBillModelMasterList(dcBusiBillModelMaster); + return getDataTable(list); + } + @GetMapping("/userModellist") + public TableDataInfo getUserModellist(DeptQueryParams deptQueryParams) + { startPage(); + List list; + if(StringUtils.isNotNull(deptQueryParams)){ + DcBusiBillModelMaster dcBusiBillModelMaster=new DcBusiBillModelMaster(); + LoginUser loginUser = SecurityUtils.getLoginUser(); + dcBusiBillModelMaster.setCreatedBy(loginUser.getUsername()); + dcBusiBillModelMaster.setModelType("T"); + if(Optional.ofNullable(deptQueryParams.getOrgType()).orElse("").equals("1002")){ + dcBusiBillModelMaster.setCompanyId(Optional.ofNullable(deptQueryParams.getDeptId()).orElse(0L)); + }else{ + dcBusiBillModelMaster.setOrgId(Optional.ofNullable(deptQueryParams.getDeptId()).orElse(0L)); + } + list = dcBusiBillModelMasterService.selectDcBusiBillModelMasterList(dcBusiBillModelMaster); + }else{ + list=new ArrayList<>(); + } + + + return getDataTable(list); + } + @GetMapping("/userModelById/{mid}") + public AjaxResult getUserModelById(@PathVariable Long mid) + { + DcBusiBillModelMaster dcBusiBillModelMaster = dcBusiBillModelMasterService.selectDcBusiBillModelMasterById(mid); + return AjaxResult.success(dcBusiBillModelMaster); + } + + /** + * 根据根据公司查询模版，现根据角色ID进行过滤 + * 根据 + */ + @ApiOperation("根据根据公司查询模版，现根据角色ID进行过滤") + @ApiImplicitParams({ + @ApiImplicitParam(name = "companyId", value = "", dataType = "Long", dataTypeClass = Long.class), + }) + //@PreAuthorize("@ss.hasPermi('param:paramData:list')") + @GetMapping("/roleModellist/{companyId}") + public TableDataInfo getRoleModellist(@PathVariable Long companyId) + { + DcBusiBillModelMaster dcBusiBillModelMaster=new DcBusiBillModelMaster(); + LoginUser loginUser = SecurityUtils.getLoginUser(); + dcBusiBillModelMaster.setCompanyId(Optional.ofNullable(companyId).orElse(null)); + dcBusiBillModelMaster.setRoleId(loginUser.getUser().getRoleId()); + dcBusiBillModelMaster.setModelType("T"); + startPage(); + List list = dcBusiBillModelMasterService.selectDcBusiBillModelMasterList(dcBusiBillModelMaster); + return getDataTable(list); + } + @ApiOperation("根据单据模版编号获取模版内容信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "modelNo", value = "", dataType = "String", dataTypeClass = String.class), + }) + @GetMapping("/getBillModelDetail/{modelNo}") + public AjaxResult getBillModelDetail(@PathVariable String modelNo){ + List list=new ArrayList<>(); + return AjaxResult.success(); + } + @ApiOperation("保存配置模版") + @ApiImplicitParams({ + @ApiImplicitParam(name = "dcBusiTargetBillMaster", value = "", dataType = "DcBusiParamBillMaster", dataTypeClass = DcBusiTargetBillMaster.class), + }) + @PostMapping("/saveBillModel") + public AjaxResult saveBillModel(@RequestBody DcBusiTargetBillMaster dcBusiParamBillMaster){ + LoginUser loginUser = SecurityUtils.getLoginUser(); + String billModelNo=Optional.ofNullable(getBillModelNo()).orElse(StringUtils.leftPad(String.valueOf(dcBusiParamBillMaster.getCompanyId()),4)+"#"+DateUtil.formatDateTime(DateUtil.date())); + DcBusiBillModelMaster dcBusiBillModelMaster=new DcBusiBillModelMaster(); + dcBusiBillModelMaster.setCreatedTime(DateUtil.date()); + dcBusiBillModelMaster.setCreatedBy(loginUser.getUsername()); + dcBusiBillModelMaster.setBillModelPoint(dcBusiParamBillMaster.getCountTimes()); + dcBusiBillModelMaster.setRoleId(loginUser.getUser().getRoleId()); + dcBusiBillModelMaster.setDeptId(loginUser.getDeptId()); + dcBusiBillModelMaster.setModelType("T"); + long deptId=dcBusiParamBillMaster.getCompanyId(); + SysDept sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ; + dcBusiBillModelMaster.setCompanyId(deptId); + dcBusiBillModelMaster.setCompanyName(sysDept.getDeptName()); + deptId=dcBusiParamBillMaster.getOragnizeId(); + dcBusiBillModelMaster.setOrgId(deptId); + sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ; + dcBusiBillModelMaster.setOrgName(sysDept.getDeptName()); + dcBusiBillModelMaster.setDataState("0"); + dcBusiBillModelMaster.setUseState("1"); + dcBusiBillModelMaster.setFieldCode(dcBusiParamBillMaster.getFieldCode()); + dcBusiBillModelMaster.setFieldName(dcBusiParamBillMaster.getFieldName()); + dcBusiBillModelMaster.setBillModelNo(billModelNo); + dcBusiBillModelMaster.setBillModelName(dcBusiParamBillMaster.getBiilModelName()); + List dcBusiBillModelSubList=new ArrayList<>(); + JSONArray jsonArray=Optional.ofNullable(JSONArray.from(dcBusiParamBillMaster.getSubDatas())).orElse(new JSONArray()); + jsonArray.forEach(item -> { + JSONObject jsb = JSONObject.from(item); + DcBusiBillModelSub modelSub=new DcBusiBillModelSub(); + modelSub.setBillModelNo(billModelNo); + modelSub.setAssetCode(jsb.getString("assetCode")); + modelSub.setAssetName(jsb.getString("assetName")); + //modelSub.setAssetId(item.get); + modelSub.setAssetUnitCode(jsb.getString("targetCode")); + modelSub.setAssetUnitName(jsb.getString("targetName")); + modelSub.setAssetUnitType("T"); + modelSub.setAUnit(jsb.getString("targetUint")); + dcBusiBillModelSubList.add(modelSub); + }); + dcBusiBillModelMaster.setDcBusiBillModelSubList(dcBusiBillModelSubList); + return AjaxResult.success(dcBusiBillModelMasterService.insertDcBusiBillModelMaster(dcBusiBillModelMaster)); + } + @ApiOperation("保存参数采集数据-直接对象方式") + @ApiImplicitParams({ + @ApiImplicitParam(name = "dcBusiParamBillMaster", value = "", dataType = "DcBusiParamBillMaster", dataTypeClass = DcBusiTargetBillMaster.class), + }) + @PostMapping("/saveBillCollectObj") + public AjaxResult saveBillCollectByObj(@RequestBody DcBusiTargetBillMaster dcBusiTargetBillMaster){ + dcBusiTargetBillMaster.setId(null); + return AjaxResult.success(dcBusiTargetBillMasterService.insertDcBusiTargetBillMaster(dcBusiTargetBillMaster)); + } + @ApiOperation("保存参数采集数据-subDatas数组方式") + @ApiImplicitParams({ + @ApiImplicitParam(name = "dcBusiTargetBillMaster", value = "", dataType = "DcBusiTargetBillMaster", dataTypeClass = DcBusiTargetBillMaster.class), + }) + @PostMapping("/saveBillCollectArray") + /*subDatas为动态数据列，值是分开的索要对每个列值进行处理*/ + public AjaxResult saveBillCollectBy(@RequestBody DcBusiTargetBillMaster dcBusiTargetBillMaster){ + List dcBusiTargetBillSubList =new ArrayList<>(); + String billNo=dcBusiTargetBillMaster.getBillNo(); + String fieldCode=dcBusiTargetBillMaster.getFieldCode(); + String fieldName=dcBusiTargetBillMaster.getFieldName(); + String countDate=dcBusiTargetBillMaster.getCountDate(); + dcBusiTargetBillMaster.setBillIncomeDate(countDate); + dcBusiTargetBillMaster.setCreatedBy(SecurityUtils.getLoginUser().getUsername()); + JSONArray jsonArray=Optional.ofNullable(JSONArray.from(dcBusiTargetBillMaster.getSubDatas())).orElse(new JSONArray()); + jsonArray.forEach(item->{ + JSONObject jsb = JSONObject.from(item); + for(int i=1;i<31;i++){ + String fname="val_"+String.valueOf(i); + Double value=jsb.getDouble(fname); + if(StringUtils.isNotNull(value)){ + DcBusiTargetBillSub dcBusiTargetBillSub=new DcBusiTargetBillSub(); + //基本数据 + dcBusiTargetBillSub.setBillNo(billNo); + dcBusiTargetBillSub.setId(null); + dcBusiTargetBillSub.setTargetCode(jsb.getString("targetCode")); + dcBusiTargetBillSub.setAssetCode(jsb.getString("assetCode")); + dcBusiTargetBillSub.setAssetName(jsb.getString("assetName")); + //dcBusiTargetBillSub.setCountDate(jsb.getString("countDate")); + dcBusiTargetBillSub.setCountDate(countDate); + dcBusiTargetBillSub.setTargetUint(jsb.getString("targetUint")); + dcBusiTargetBillSub.setTargetName(jsb.getString("targetName")); + dcBusiTargetBillSub.setFieldCode(fieldCode); + dcBusiTargetBillSub.setFieldName(fieldName); + dcBusiTargetBillSub.setCountDay(i); + dcBusiTargetBillSub.setTargetValue(value); + dcBusiTargetBillSubList.add(dcBusiTargetBillSub); + } + } + + + }); + dcBusiTargetBillMaster.setDcBusiTargetBillSubList(dcBusiTargetBillSubList); + return AjaxResult.success(dcBusiTargetBillMasterService.insertDcBusiTargetBillMaster(dcBusiTargetBillMaster)); + } + private String getBillModelNo(){ + DcBusiCoderuleConfigDao ruleIdByBusicode =Optional.ofNullable(dcBaseCoderuleDefineService.getRuleIdByBusicode("BILL_MODEL_NO")).orElse(new DcBusiCoderuleConfigDao()) ; + + DcBaseCoderuleDefineDao ruleDao = dcBaseCoderuleDefineService.selectDcBaseCoderuleDefineDaoById(ruleIdByBusicode.getRuleId()); + return codeNoGenerater.getCode(ruleDao); + } + + +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelMaster.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelMaster.java index c47cf8e..ca9ed68 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelMaster.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelMaster.java @@ -25,62 +25,76 @@ import com.lzbi.module.base.BaseModuleEntity; public class DcBusiBillModelMaster extends BaseModuleEntity { /** 主键 */ - @ApiModelProperty(name = "主键",notes = "") - @TableId(type= IdType.AUTO) - private Long id ; +// @ApiModelProperty(name = "主键",notes = "") +// @TableId(type= IdType.AUTO) +// private Long id ; private static final long serialVersionUID = 1L; /** 部门Id */ - @Excel(name = "部门Id") - private Long deptId; +// @Excel(name = "部门Id") +// @ApiModelProperty(name = "模版类型",notes = "") +// private Long deptId; /** 角色ID */ @Excel(name = "角色ID") + @ApiModelProperty(name = "角色ID",notes = "") private Long roleId; /** 任务模版编号 */ @Excel(name = "任务模版编号") + @ApiModelProperty(name = "任务模版编号",notes = "") private String billModelNo; /** 任务模版名称 */ @Excel(name = "任务模版名称") + @ApiModelProperty(name = "任务模版名称",notes = "") private String billModelName; /** 所属专业编码 */ @Excel(name = "所属专业编码") + @ApiModelProperty(name = "所属专业编码",notes = "") private String fieldCode; /** 所属公司名称 */ @Excel(name = "所属公司名称") + @ApiModelProperty(name = "所属公司名称",notes = "") private String companyName; /** 所属公司ID */ @Excel(name = "所属公司ID") + @ApiModelProperty(name = "所属公司ID",notes = "") private Long companyId; /** 任务整点 */ @Excel(name = "任务整点") + @ApiModelProperty(name = "任务整点",notes = "") private String billModelPoint; /** 所属组织名称 */ @Excel(name = "所属组织名称") + @ApiModelProperty(name = "所属组织名称",notes = "") private String orgName; /** 所属组织ID */ @Excel(name = "所属组织ID") + @ApiModelProperty(name = "所属组织ID",notes = "") private Long orgId; /** 数据状态 */ @Excel(name = "数据状态") + @ApiModelProperty(name = "数据状态",notes = "") private String dataState; /** 使用状态 */ @Excel(name = "使用状态") + @ApiModelProperty(name = "使用状态",notes = "") private String useState; /** 所属专业名称 */ @Excel(name = "所属专业名称") + @ApiModelProperty(name = "所属专业名称",notes = "") private String fieldName; - + @ApiModelProperty(name = "模版类型",notes = "") + private String modelType; /** 数据录入单模版子信息 */ private List dcBusiBillModelSubList; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamBillMaster.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamBillMaster.java index e4910f3..2c8d9c1 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamBillMaster.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamBillMaster.java @@ -78,6 +78,7 @@ public class DcBusiParamBillMaster extends BaseModuleEntity private String fieldCode; @ApiModelProperty(name = "专业名称",notes = "") private String fieldName; + /** 参数数据采集（录入）明细信息 */ private List dcBusiParamBillSubList; @ApiModelProperty(name = "data数组数据未转换",notes = "") diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillMaster.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillMaster.java new file mode 100644 index 0000000..7802322 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillMaster.java @@ -0,0 +1,100 @@ +package com.lzbi.draft.domain; + +import java.util.List; +import java.util.Date; + +import com.alibaba.fastjson2.JSONArray; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +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; + +/** + * 统计指标录入对象 dc_busi_target_bill_master + * + * @author zhousq + * @date 2023-12-14 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) +@ApiModel(value = "指标采集（录入）单据主表",description = "") +@TableName("dc_busi_target_bill_master") +public class DcBusiTargetBillMaster extends BaseModuleEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 单据编号 */ + @Excel(name = "单据编号") + @ApiModelProperty(name = "单据编号",notes = "") + private String billNo; + + /** 采集时间 */ + @Excel(name = "采集时间") + @ApiModelProperty(name = "采集时间",notes = "") + private String billIncomeDate; + + /** 单据类型 */ + @Excel(name = "单据类型") + @ApiModelProperty(name = "单据类型",notes = "") + private String billType; + + /** 审核类型 */ + @Excel(name = "审核类型") + @ApiModelProperty(name = "审核类型",notes = "") + private String checkType; + + /** 审核状态 */ + @Excel(name = "审核状态") + @ApiModelProperty(name = "审核状态",notes = "") + private String checkStatus; + + /** 公司ID */ + @Excel(name = "公司ID") + @ApiModelProperty(name = "公司ID",notes = "") + private Long companyId; + + /** 公司名称 */ + @Excel(name = "公司名称") + @ApiModelProperty(name = "公司名称",notes = "") + private String companyName; + + /** 组织机构名称 */ + @Excel(name = "组织机构名称") + @ApiModelProperty(name = "组织机构名称",notes = "") + private String organizeName; + + /** 组织机构ID */ + @Excel(name = "组织机构ID") + @ApiModelProperty(name = "组织机构ID",notes = "") + private Long oragnizeId; + + /** 指标数据采集（录入）明细信息 */ + private List dcBusiTargetBillSubList; + @ApiModelProperty(name = "单据模版名称",notes = "") + private String biilModelName ; + @ApiModelProperty(name = "模版编码",notes = "") + private String billModelNo ; + @ApiModelProperty(name = "统计月份",notes = "") + private String countDate ; + @ApiModelProperty(name = "统计日期",notes = "") + private String countTimes; + @ApiModelProperty(name = "专业编码",notes = "") + private String fieldCode; + @ApiModelProperty(name = "专业名称",notes = "") + private String fieldName; + @ApiModelProperty(name = "data数组数据未转换",notes = "") + private JSONArray subDatas; +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillSub.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillSub.java new file mode 100644 index 0000000..5bcd60b --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillSub.java @@ -0,0 +1,95 @@ +package com.lzbi.draft.domain; + +import java.math.BigDecimal; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.lzbi.common.annotation.Excel; +import com.lzbi.module.base.BaseModuleEntity; + +/** + * 指标数据采集（录入）明细对象 dc_busi_target_bill_sub + * + * @author zhousq + * @date 2023-12-14 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) +@ApiModel(value = "指标数据采集（录入）明细表",description = "") +@TableName("dc_busi_target_bill_sub") +public class DcBusiTargetBillSub extends BaseModuleEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @ApiModelProperty(name = "主键",notes = "") + private Long id; + + /** 单据编码 */ + @Excel(name = "单据编码") + @ApiModelProperty(name = "单据编码",notes = "") + private String billNo; + + /** 指标名称 */ + @Excel(name = "指标名称") + @ApiModelProperty(name = "指标名称",notes = "") + private String targetName; + + /** 指标编码 */ + @Excel(name = "指标编码") + @ApiModelProperty(name = "指标编码",notes = "") + private String targetCode; + + /** 指标单位 */ + @Excel(name = "指标单位") + @ApiModelProperty(name = "指标单位",notes = "") + private String targetUint; + + /** 指标值 */ + @Excel(name = "指标值") + @ApiModelProperty(name = "指标值",notes = "") + private Double targetValue; + + /** 统计日期 */ + @Excel(name = "统计日期") + @ApiModelProperty(name = "统计日期",notes = "") + private String countDate; + + /** 天 */ + @Excel(name = "天") + @ApiModelProperty(name = "天",notes = "") + private Integer countDay; + + /** 所属专业编码 */ + @Excel(name = "所属专业编码") + @ApiModelProperty(name = "所属专业编码",notes = "") + private String fieldCode; + + /** 所属专业名称 */ + @Excel(name = "所属专业名称") + @ApiModelProperty(name = "所属专业名称",notes = "") + private String fieldName; + + /** 统计单元编码 */ + @Excel(name = "统计单元编码") + @ApiModelProperty(name = "统计单元编码",notes = "") + private String assetCode; + + /** 统计单元名称 */ + @Excel(name = "统计单元名称") + @ApiModelProperty(name = "统计单元名称",notes = "") + private String assetName; + + +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DeptQueryParams.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DeptQueryParams.java new file mode 100644 index 0000000..7f1a469 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DeptQueryParams.java @@ -0,0 +1,21 @@ +package com.lzbi.draft.domain; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @auth create by Administrator + * @date 2023/12/14 + * DeptQueryParams + */ +@Data +public class DeptQueryParams { + @ApiModelProperty("页码") + private Integer pageNum; + @ApiModelProperty("页长") + private Integer pageSize; + @ApiModelProperty("部门ID") + private Long deptId; + @ApiModelProperty("部门类型") + private String orgType; +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetBillMasterMapper.java b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetBillMasterMapper.java new file mode 100644 index 0000000..46f2714 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetBillMasterMapper.java @@ -0,0 +1,90 @@ +package com.lzbi.draft.mapper; + +import java.util.List; +import com.lzbi.draft.domain.DcBusiTargetBillMaster; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lzbi.draft.domain.DcBusiTargetBillSub; + +/** + * 统计指标录入Mapper接口 + * + * @author zhousq + * @date 2023-12-14 + */ + +public interface DcBusiTargetBillMasterMapper extends BaseMapper +{ + /** + * 查询统计指标录入 + * + * @param id 统计指标录入主键 + * @return 统计指标录入 + */ + public DcBusiTargetBillMaster selectDcBusiTargetBillMasterById(Long id); + + /** + * 查询统计指标录入列表 + * + * @param dcBusiTargetBillMaster 统计指标录入 + * @return 统计指标录入集合 + */ + public List selectDcBusiTargetBillMasterList(DcBusiTargetBillMaster dcBusiTargetBillMaster); + + /** + * 新增统计指标录入 + * + * @param dcBusiTargetBillMaster 统计指标录入 + * @return 结果 + */ + public int insertDcBusiTargetBillMaster(DcBusiTargetBillMaster dcBusiTargetBillMaster); + + /** + * 修改统计指标录入 + * + * @param dcBusiTargetBillMaster 统计指标录入 + * @return 结果 + */ + public int updateDcBusiTargetBillMaster(DcBusiTargetBillMaster dcBusiTargetBillMaster); + + /** + * 删除统计指标录入 + * + * @param id 统计指标录入主键 + * @return 结果 + */ + public int deleteDcBusiTargetBillMasterById(Long id); + + /** + * 批量删除统计指标录入 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDcBusiTargetBillMasterByIds(Long[] ids); + public List selectDcBusiTargetBillMasterBillNoByIds(Long[] ids); + + /** + * 批量删除指标数据采集（录入）明细 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDcBusiTargetBillSubByBillNos(List ids); + + /** + * 批量新增指标数据采集（录入）明细 + * + * @param dcBusiTargetBillSubList 指标数据采集（录入）明细列表 + * @return 结果 + */ + public int batchDcBusiTargetBillSub(List dcBusiTargetBillSubList); + + + /** + * 通过统计指标录入主键删除指标数据采集（录入）明细信息 + * + * @param id 统计指标录入ID + * @return 结果 + */ + public int deleteDcBusiTargetBillSubByBillNo(String billNo); +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetBillMasterService.java b/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetBillMasterService.java new file mode 100644 index 0000000..d10931f --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetBillMasterService.java @@ -0,0 +1,133 @@ +package com.lzbi.draft.service; + +import java.util.List; +import com.lzbi.common.utils.DateUtils; +import com.lzbi.common.utils.StringUtils; +import org.springframework.stereotype.Service; +import java.util.ArrayList; +import com.lzbi.common.utils.DateUtils; +import org.springframework.transaction.annotation.Transactional; +import com.lzbi.draft.domain.DcBusiTargetBillSub; +import com.lzbi.draft.domain.DcBusiTargetBillMaster; +import com.lzbi.draft.mapper.DcBusiTargetBillMasterMapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +/** + * 统计指标录入Service业务层处理 + * + * @author zhousq + * @date 2023-12-14 + */ +@Service +public class DcBusiTargetBillMasterService extends ServiceImpl implements IService +{ + + /** + * 查询统计指标录入 + * + * @param id 统计指标录入主键 + * @return 统计指标录入 + */ + public DcBusiTargetBillMaster selectDcBusiTargetBillMasterById(Long id) + { + return baseMapper.selectDcBusiTargetBillMasterById(id); + } + + /** + * 查询统计指标录入列表 + * + * @param dcBusiTargetBillMaster 统计指标录入 + * @return 统计指标录入 + */ + public List selectDcBusiTargetBillMasterList(DcBusiTargetBillMaster dcBusiTargetBillMaster) + { + return baseMapper.selectDcBusiTargetBillMasterList(dcBusiTargetBillMaster); + } + + /** + * 新增统计指标录入 + * + * @param dcBusiTargetBillMaster 统计指标录入 + * @return 结果 + */ + @Transactional + + public int insertDcBusiTargetBillMaster(DcBusiTargetBillMaster dcBusiTargetBillMaster) + { + dcBusiTargetBillMaster.setCreatedTime(DateUtils.getNowDate()); + int rows = baseMapper.insertDcBusiTargetBillMaster(dcBusiTargetBillMaster); + insertDcBusiTargetBillSub(dcBusiTargetBillMaster); + return rows; + } + + /** + * 修改统计指标录入 + * + * @param dcBusiTargetBillMaster 统计指标录入 + * @return 结果 + */ + @Transactional + + public int updateDcBusiTargetBillMaster(DcBusiTargetBillMaster dcBusiTargetBillMaster) + { + dcBusiTargetBillMaster.setUpdatedTime(DateUtils.getNowDate()); + baseMapper.deleteDcBusiTargetBillSubByBillNo(dcBusiTargetBillMaster.getBillNo()); + insertDcBusiTargetBillSub(dcBusiTargetBillMaster); + return baseMapper.updateDcBusiTargetBillMaster(dcBusiTargetBillMaster); + } + + /** + * 批量删除统计指标录入 + * + * @param ids 需要删除的统计指标录入主键 + * @return 结果 + */ + @Transactional + + public int deleteDcBusiTargetBillMasterByIds(Long[] ids) + { + + List strings = baseMapper.selectDcBusiTargetBillMasterBillNoByIds(ids); + baseMapper.deleteDcBusiTargetBillSubByBillNos(strings); + return baseMapper.deleteDcBusiTargetBillMasterByIds(ids); + } + + /** + * 删除统计指标录入信息 + * + * @param id 统计指标录入主键 + * @return 结果 + */ + @Transactional + + public int deleteDcBusiTargetBillMasterById(Long id) + { + DcBusiTargetBillMaster dcBusiTargetBillMaster = baseMapper.selectDcBusiTargetBillMasterById(id); + baseMapper.deleteDcBusiTargetBillSubByBillNo(dcBusiTargetBillMaster.getBillNo()); + return baseMapper.deleteDcBusiTargetBillMasterById(id); + } + + /** + * 新增指标数据采集（录入）明细信息 + * + * @param dcBusiTargetBillMaster 统计指标录入对象 + */ + public void insertDcBusiTargetBillSub(DcBusiTargetBillMaster dcBusiTargetBillMaster) + { + List dcBusiTargetBillSubDaoList = dcBusiTargetBillMaster.getDcBusiTargetBillSubList(); + String billNo = dcBusiTargetBillMaster.getBillNo(); + if (StringUtils.isNotNull(dcBusiTargetBillSubDaoList)) + { + List list = new ArrayList(); + for (DcBusiTargetBillSub dcBusiTargetBillSubDao : dcBusiTargetBillSubDaoList) + { + dcBusiTargetBillSubDao.setBillNo(billNo); + list.add(dcBusiTargetBillSubDao); + } + if (list.size() > 0) + { + baseMapper.batchDcBusiTargetBillSub(list); + } + } + } +} diff --git a/lzbi-module/src/main/resources/mapper/asset/DcBaseCoderuleDefineMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBaseCoderuleDefineMapper.xml index 423eea2..5b2809f 100644 --- a/lzbi-module/src/main/resources/mapper/asset/DcBaseCoderuleDefineMapper.xml +++ b/lzbi-module/src/main/resources/mapper/asset/DcBaseCoderuleDefineMapper.xml @@ -129,10 +129,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{codeSplitFlag}, - + insert into dc_base_coderule_serial(code_rule_id,serial_id,revision) values (#{param1},0,0) - + + delete from dc_base_coderule_serial where code_rule_id=#{param1} + update dc_base_coderule_define @@ -163,8 +165,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - + + + delete from dc_base_coderule_serial where code_rule_id in + + #{id} + + @@ -67,11 +68,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and data_state = #{dataState} and use_state = #{useState} and field_name like concat('%', #{fieldName}, '%') + and model_type =#{modelType} + + + and bill_no = #{billNo} + and bill_income_date = #{billIncomeDate} + and bill_type = #{billType} + and check_type = #{checkType} + and check_status = #{checkStatus} + and company_id = #{companyId} + and company_name like concat('%', #{companyName}, '%') + and organize_name like concat('%', #{organizeName}, '%') + and oragnize_id = #{oragnizeId} + + + + + + + insert into dc_busi_target_bill_master + + bill_no, + bill_income_date, + bill_type, + check_type, + check_status, + tenant_id, + revision, + created_by, + created_time, + updated_by, + updated_time, + delete_by, + delete_time, + company_id, + company_name, + organize_name, + oragnize_id, + + + #{billNo}, + #{billIncomeDate}, + #{billType}, + #{checkType}, + #{checkStatus}, + #{tenantId}, + #{revision}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + #{deleteBy}, + #{deleteTime}, + #{companyId}, + #{companyName}, + #{organizeName}, + #{oragnizeId}, + + + + + update dc_busi_target_bill_master + + bill_no = #{billNo}, + bill_income_date = #{billIncomeDate}, + bill_type = #{billType}, + check_type = #{checkType}, + check_status = #{checkStatus}, + tenant_id = #{tenantId}, + revision = #{revision}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + delete_by = #{deleteBy}, + delete_time = #{deleteTime}, + company_id = #{companyId}, + company_name = #{companyName}, + organize_name = #{organizeName}, + oragnize_id = #{oragnizeId}, + + where id = #{id} + + + + delete from dc_busi_target_bill_master where id = #{id} + + + + delete from dc_busi_target_bill_master where id in + + #{id} + + + + + delete from dc_busi_target_bill_sub where bill_no in + + #{billNo} + + + + + delete from dc_busi_target_bill_sub where bill_no = #{billNo} + + + + insert into dc_busi_target_bill_sub( id, bill_no, target_name, target_code, target_uint, target_value, count_date, count_day, field_code, field_name, asset_code, asset_name, tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time) values + + ( #{item.id}, #{item.billNo}, #{item.targetName}, #{item.targetCode}, #{item.targetUint}, #{item.targetValue}, #{item.countDate}, #{item.countDay}, #{item.fieldCode}, #{item.fieldName}, #{item.assetCode}, #{item.assetName}, #{item.tenantId}, #{item.revision}, #{item.createdBy}, #{item.createdTime}, #{item.updatedBy}, #{item.updatedTime}, #{item.deleteBy}, #{item.deleteTime}) + + + \ No newline at end of file From dc70d46e8ae714e532a856b9d80b94f599cdbbcb Mon Sep 17 00:00:00 2001 From: zhousq Date: Fri, 15 Dec 2023 08:34:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?2023-12-15=20=E4=BF=AE=E6=94=B9=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lzbi-generator/src/main/resources/vm/java/domain.java.vm | 6 ++++++ lzbi-generator/src/main/resources/vm/java/service.java.vm | 3 ++- .../java/com/lzbi/draft/domain/DcBusiBillModelMaster.java | 6 ------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lzbi-generator/src/main/resources/vm/java/domain.java.vm b/lzbi-generator/src/main/resources/vm/java/domain.java.vm index 919565d..41c781e 100644 --- a/lzbi-generator/src/main/resources/vm/java/domain.java.vm +++ b/lzbi-generator/src/main/resources/vm/java/domain.java.vm @@ -6,6 +6,8 @@ import ${import}; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import lombok.Data; +import io.swagger.annotations.ApiModelProperty; +import lombok.experimental.Accessors; import com.lzbi.common.annotation.Excel; #if($table.crud || $table.sub) import com.lzbi.module.base.BaseModuleEntity; @@ -25,6 +27,7 @@ import com.lzbi.common.core.domain.TreeEntity; #set($Entity="TreeEntity") #end @Data +@Accessors(chain = true) public class ${ClassName} extends ${Entity} { private static final long serialVersionUID = 1L; @@ -41,11 +44,14 @@ public class ${ClassName} extends ${Entity} #end #if($parentheseIndex != -1) @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty(name = "${comment}",notes = "") #elseif($column.javaType == 'Date') @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty(name = "${comment}",notes = "") #else @Excel(name = "${comment}") + @ApiModelProperty(name = "${comment}",notes = "$column.javaField") #end #end private $column.javaType $column.javaField; diff --git a/lzbi-generator/src/main/resources/vm/java/service.java.vm b/lzbi-generator/src/main/resources/vm/java/service.java.vm index 7245529..92c5edb 100644 --- a/lzbi-generator/src/main/resources/vm/java/service.java.vm +++ b/lzbi-generator/src/main/resources/vm/java/service.java.vm @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; #if($table.sub) import java.util.ArrayList; import com.lzbi.common.utils.DateUtils; +import com.lzbi.common.utils.StringUtils import org.springframework.transaction.annotation.Transactional; import ${packageName}.domain.${subClassName}; #end @@ -156,7 +157,7 @@ public class ${ClassName}Service extends ServiceImpl<${ClassName}Mapper, ${Class } if (list.size() > 0) { - baseMapper.batch${subClassName}list); + baseMapper.batch${subClassName}(list); } } } diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelMaster.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelMaster.java index ca9ed68..0e32378 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelMaster.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelMaster.java @@ -1,15 +1,9 @@ package com.lzbi.draft.domain; import java.util.List; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; 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; import com.lzbi.common.annotation.Excel; import com.lzbi.module.base.BaseModuleEntity; From 95737ea6985ebfaf64891ced62c1101f2e8c4f12 Mon Sep 17 00:00:00 2001 From: zhousq Date: Fri, 15 Dec 2023 16:56:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?2023-12-15=20=E4=BF=AE=E6=94=B9=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/vm/vue/index.vue_ruoyi.vm | 684 ++++++++++++++++++ .../com/lzbi/common/SelectOptionsControl.java | 1 + .../controller/DcBusiParamCollectBill.java | 19 + .../controller/DcBusiTargetCollectBill.java | 19 + 4 files changed, 723 insertions(+) create mode 100644 lzbi-generator/src/main/resources/vm/vue/index.vue_ruoyi.vm diff --git a/lzbi-generator/src/main/resources/vm/vue/index.vue_ruoyi.vm b/lzbi-generator/src/main/resources/vm/vue/index.vue_ruoyi.vm new file mode 100644 index 0000000..466424b --- /dev/null +++ b/lzbi-generator/src/main/resources/vm/vue/index.vue_ruoyi.vm @@ -0,0 +1,684 @@ + + + diff --git a/lzbi-module/src/main/java/com/lzbi/common/SelectOptionsControl.java b/lzbi-module/src/main/java/com/lzbi/common/SelectOptionsControl.java index 84b6889..c221a08 100644 --- a/lzbi-module/src/main/java/com/lzbi/common/SelectOptionsControl.java +++ b/lzbi-module/src/main/java/com/lzbi/common/SelectOptionsControl.java @@ -116,6 +116,7 @@ public class SelectOptionsControl extends BaseController { { DcBaseAssetTargetDao dcBaseAssetTargetDao=new DcBaseAssetTargetDao(); dcBaseAssetTargetDao.setAssetCode(assetQueryParams.getAssetCode()); + dcBaseAssetTargetDao.setTargetField(assetQueryParams.getFieldCode()); dcBaseAssetTargetDao.setColumnType("T"); //dcBaseAssetTargetDao.setAssetId(assetQueryParams.getAssetId()); return AjaxResult.success(dcBaseAssetTargetService.selectDcBaseAssetTargetDaoList(dcBaseAssetTargetDao)); diff --git a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamCollectBill.java b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamCollectBill.java index 8ec5f79..4461eeb 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamCollectBill.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamCollectBill.java @@ -201,6 +201,16 @@ public class DcBusiParamCollectBill extends BaseController @PostMapping("/saveBillCollectObj") public AjaxResult saveBillCollectByObj(@RequestBody DcBusiParamBillMaster dcBusiParamBillMaster){ dcBusiParamBillMaster.setId(null); + dcBusiParamBillMaster.setCreatedBy(SecurityUtils.getLoginUser().getUsername()); + dcBusiParamBillMaster.setCreatedTime(DateUtil.date()); + long deptId=dcBusiParamBillMaster.getCompanyId(); + SysDept sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ; + dcBusiParamBillMaster.setCompanyId(deptId); + dcBusiParamBillMaster.setCompanyName(sysDept.getDeptName()); + deptId=dcBusiParamBillMaster.getOragnizeId(); + dcBusiParamBillMaster.setOragnizeId(deptId); + sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ; + dcBusiParamBillMaster.setOrganizeName(sysDept.getDeptName()); return AjaxResult.success(dcBusiParamBillMasterService.insertDcBusiParamBillMasterDao(dcBusiParamBillMaster)); } @ApiOperation("保存参数采集数据-subDatas数组方式") @@ -217,6 +227,15 @@ public class DcBusiParamCollectBill extends BaseController String countDate=dcBusiParamBillMaster.getCountDate(); dcBusiParamBillMaster.setBillIncomeDate(countDate); dcBusiParamBillMaster.setCreatedBy(SecurityUtils.getLoginUser().getUsername()); + dcBusiParamBillMaster.setCreatedTime(DateUtil.date()); + long deptId=dcBusiParamBillMaster.getCompanyId(); + SysDept sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ; + dcBusiParamBillMaster.setCompanyId(deptId); + dcBusiParamBillMaster.setCompanyName(sysDept.getDeptName()); + deptId=dcBusiParamBillMaster.getOragnizeId(); + dcBusiParamBillMaster.setOragnizeId(deptId); + sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ; + dcBusiParamBillMaster.setOrganizeName(sysDept.getDeptName()); JSONArray jsonArray=Optional.ofNullable(JSONArray.from(dcBusiParamBillMaster.getSubDatas())).orElse(new JSONArray()); jsonArray.forEach(item->{ JSONObject jsb = JSONObject.from(item); diff --git a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetCollectBill.java b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetCollectBill.java index 04daeec..2ad3bea 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetCollectBill.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetCollectBill.java @@ -197,6 +197,16 @@ public class DcBusiTargetCollectBill extends BaseController @PostMapping("/saveBillCollectObj") public AjaxResult saveBillCollectByObj(@RequestBody DcBusiTargetBillMaster dcBusiTargetBillMaster){ dcBusiTargetBillMaster.setId(null); + dcBusiTargetBillMaster.setCreatedBy(SecurityUtils.getLoginUser().getUsername()); + dcBusiTargetBillMaster.setCreatedTime(DateUtil.date()); + long deptId=dcBusiTargetBillMaster.getCompanyId(); + SysDept sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ; + dcBusiTargetBillMaster.setCompanyId(deptId); + dcBusiTargetBillMaster.setCompanyName(sysDept.getDeptName()); + deptId=dcBusiTargetBillMaster.getOragnizeId(); + dcBusiTargetBillMaster.setOragnizeId(deptId); + sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ; + dcBusiTargetBillMaster.setOrganizeName(sysDept.getDeptName()); return AjaxResult.success(dcBusiTargetBillMasterService.insertDcBusiTargetBillMaster(dcBusiTargetBillMaster)); } @ApiOperation("保存参数采集数据-subDatas数组方式") @@ -213,6 +223,15 @@ public class DcBusiTargetCollectBill extends BaseController String countDate=dcBusiTargetBillMaster.getCountDate(); dcBusiTargetBillMaster.setBillIncomeDate(countDate); dcBusiTargetBillMaster.setCreatedBy(SecurityUtils.getLoginUser().getUsername()); + dcBusiTargetBillMaster.setCreatedTime(DateUtil.date()); + long deptId=dcBusiTargetBillMaster.getCompanyId(); + SysDept sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ; + dcBusiTargetBillMaster.setCompanyId(deptId); + dcBusiTargetBillMaster.setCompanyName(sysDept.getDeptName()); + deptId=dcBusiTargetBillMaster.getOragnizeId(); + dcBusiTargetBillMaster.setOragnizeId(deptId); + sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ; + dcBusiTargetBillMaster.setOrganizeName(sysDept.getDeptName()); JSONArray jsonArray=Optional.ofNullable(JSONArray.from(dcBusiTargetBillMaster.getSubDatas())).orElse(new JSONArray()); jsonArray.forEach(item->{ JSONObject jsb = JSONObject.from(item); From 74cbd25a8b5e97b9dc4de4b3a9d5728b87bffbed Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Mon, 18 Dec 2023 16:54:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BB=93=E5=B1=80=E5=86=B2=E7=AA=81?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=94=B9dao=E4=BF=AE=E9=A5=B0?= =?UTF-8?q?=E7=9A=84bean=E5=8A=A0=E8=B5=84=E4=BA=A7=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=95=8C=E9=9D=A2=E5=BC=80=E5=8F=91=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lzbi/asset/domain/DcBaseAssetInfo.java | 1 - .../service/DcBusiPlanTargetMonthService.java | 18 +-- .../com/lzbi/common/SelectOptionsControl.java | 22 +-- .../DcBusiTargetAdjustDaySubService.java | 8 +- .../lzbi/module/base/BaseModuleEntity.java | 1 - .../DcBaseAssetTargetController.java | 93 ++++++++++-- .../DcBaseTargetModelController.java | 15 ++ ...tTargetDao.java => DcBaseAssetTarget.java} | 60 +++----- .../mapper/DcBaseAssetTargetMapper.java | 23 +-- .../service/DcBaseAssetTargetService.java | 38 ++--- .../mapper/asset/DcBaseAssetInfoMapper.xml | 137 +++++++----------- .../targetFolder/DcBaseAssetTargetMapper.xml | 55 ++++--- 12 files changed, 260 insertions(+), 211 deletions(-) rename lzbi-module/src/main/java/com/lzbi/targetFolder/domain/{DcBaseAssetTargetDao.java => DcBaseAssetTarget.java} (66%) diff --git a/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseAssetInfo.java b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseAssetInfo.java index 61fb367..8276ae2 100644 --- a/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseAssetInfo.java +++ b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseAssetInfo.java @@ -13,7 +13,6 @@ import lombok.experimental.Accessors; * @date 2023-11-27 */ @Data -//@TableName("dc_base_work_special") @Accessors(chain = true) public class DcBaseAssetInfo 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 7b654a6..9fbb2ad 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 @@ -9,7 +9,7 @@ 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.domain.DcBaseAssetTarget; import com.lzbi.targetFolder.mapper.DcBaseAssetTargetMapper; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -94,10 +94,10 @@ public class DcBusiPlanTargetMonthService extends ServiceImpl list = dcBaseAssetTargetService.selectDcBaseAssetTargetDaoList(dcBaseAssetTargetDao); + List list = dcBaseAssetTargetService.selectDcBaseAssetTargetList(dcBaseAssetTarget); return getDataTable(list); } @@ -53,10 +58,10 @@ public class DcBaseAssetTargetController extends BaseController @PreAuthorize("@ss.hasPermi('target:target:export')") @Log(title = "资产指标配置", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, DcBaseAssetTargetDao dcBaseAssetTargetDao) + public void export(HttpServletResponse response, DcBaseAssetTarget dcBaseAssetTarget) { - List list = dcBaseAssetTargetService.selectDcBaseAssetTargetDaoList(dcBaseAssetTargetDao); - ExcelUtil util = new ExcelUtil(DcBaseAssetTargetDao.class); + List list = dcBaseAssetTargetService.selectDcBaseAssetTargetList(dcBaseAssetTarget); + ExcelUtil util = new ExcelUtil(DcBaseAssetTarget.class); util.exportExcel(response, list, "资产指标配置数据"); } @@ -67,7 +72,7 @@ public class DcBaseAssetTargetController extends BaseController @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(dcBaseAssetTargetService.selectDcBaseAssetTargetDaoById(id)); + return success(dcBaseAssetTargetService.selectDcBaseAssetTargetById(id)); } /** @@ -76,9 +81,9 @@ public class DcBaseAssetTargetController extends BaseController @PreAuthorize("@ss.hasPermi('target:target:add')") @Log(title = "资产指标配置", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody DcBaseAssetTargetDao dcBaseAssetTargetDao) + public AjaxResult add(@RequestBody DcBaseAssetTarget dcBaseAssetTarget) { - return toAjax(dcBaseAssetTargetService.insertDcBaseAssetTargetDao(dcBaseAssetTargetDao)); + return toAjax(dcBaseAssetTargetService.insertDcBaseAssetTarget(dcBaseAssetTarget)); } /** @@ -87,9 +92,9 @@ public class DcBaseAssetTargetController extends BaseController @PreAuthorize("@ss.hasPermi('target:target:edit')") @Log(title = "资产指标配置", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody DcBaseAssetTargetDao dcBaseAssetTargetDao) + public AjaxResult edit(@RequestBody DcBaseAssetTarget dcBaseAssetTarget) { - return toAjax(dcBaseAssetTargetService.updateDcBaseAssetTargetDao(dcBaseAssetTargetDao)); + return toAjax(dcBaseAssetTargetService.updateDcBaseAssetTarget(dcBaseAssetTarget)); } /** @@ -100,7 +105,7 @@ public class DcBaseAssetTargetController extends BaseController @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(dcBaseAssetTargetService.deleteDcBaseAssetTargetDaoByIds(ids)); + return toAjax(dcBaseAssetTargetService.deleteDcBaseAssetTargetByIds(ids)); } @@ -109,11 +114,71 @@ public class DcBaseAssetTargetController extends BaseController */ @PreAuthorize("@ss.hasPermi('target:target:list')") @GetMapping("/listNoPage") - public AjaxResult listNoPage(DcBaseAssetTargetDao dcBaseAssetTargetDao) + public AjaxResult listNoPage(DcBaseAssetTarget dcBaseAssetTarget) { - List list = dcBaseAssetTargetService.selectDcBaseAssetTargetDaoList(dcBaseAssetTargetDao); + List list = dcBaseAssetTargetService.selectDcBaseAssetTargetList(dcBaseAssetTarget); return AjaxResult.success(list); } + /** + * 新增资产信息 + */ + @PreAuthorize("@ss.hasPermi('lzbi:assetInfo:add')") + @Log(title = "资产信息", businessType = BusinessType.INSERT) + @PostMapping("/addBatch") + public AjaxResult addBatch(@RequestBody JSONArray jsonArray) + { + 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"); + DcBaseAssetTarget dcBaseAssetTarget = JSON.toJavaObject(beanObject, DcBaseAssetTarget.class); + dcBaseAssetTarget.setCreatedTime(DateUtils.getNowDate()); + dcBaseAssetTarget.setDeptId(getDeptId()); + dcBaseAssetTarget.setUserId(getUserId()); + dcBaseAssetTarget.setCreatedBy(String.valueOf(getUserId())); + dcBaseAssetTarget.setCreatedTime(DateUtils.getNowDate()); + beanList.add(dcBaseAssetTarget); + } + } catch (Exception e) { + throw new IllegalArgumentException("解析list对象异常！"); + } + return toAjax(dcBaseAssetTargetService.saveBatch(beanList)); + } + + + /** + * 修改资产信息 + */ + @PreAuthorize("@ss.hasPermi('lzbi:assetInfo:edit')") + @Log(title = "资产信息", businessType = BusinessType.UPDATE) + @PutMapping("/editBatch") + public AjaxResult editBatch(@RequestBody JSONArray jsonArray) + { + if (jsonArray == null) { + throw new IllegalArgumentException("未能接收任何参数！"); + } + List beanList = new ArrayList<>(); + try { + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject beanObject = jsonArray.getJSONObject(i); + DcBaseAssetTarget dcBaseAssetTarget = JSON.toJavaObject(beanObject, DcBaseAssetTarget.class); + dcBaseAssetTarget.setUpdatedBy(String.valueOf(getUserId())); + dcBaseAssetTarget.setUpdatedTime(DateUtils.getNowDate()); + beanList.add(dcBaseAssetTarget); + } + } catch (Exception e) { + throw new IllegalArgumentException("解析list对象异常！"); + } + return toAjax(dcBaseAssetTargetService.updateBatchById(beanList)); + } + + + } 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 a891afd..c8a348e 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 @@ -197,6 +197,21 @@ public class DcBaseTargetModelController extends BaseController } + /** + * 查询指标模版配置列表 + */ + @ApiOperation("查询指标模版配置列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBaseTargetModel", value = "", dataType = "DcBaseTargetModel", dataTypeClass = DcBaseTargetModel.class), + }) + @PreAuthorize("@ss.hasPermi('target:targetModel:list')") + @GetMapping("/listNoPage") + public AjaxResult listNoPage(DcBaseTargetModel DcBaseTargetModel) + { + List< DcBaseTargetModel> list = dcBaseTargetModelService.selectDcBaseTargetModelList(DcBaseTargetModel); + return AjaxResult.success(list); + } + } diff --git a/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTargetDao.java b/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTarget.java similarity index 66% rename from lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTargetDao.java rename to lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTarget.java index c017b6f..427f0e9 100644 --- a/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTargetDao.java +++ b/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTarget.java @@ -2,32 +2,29 @@ package com.lzbi.targetFolder.domain; import java.math.BigDecimal; import java.util.Date; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModelProperty; +import lombok.experimental.Accessors; import lombok.Data; import com.lzbi.common.annotation.Excel; import com.lzbi.module.base.BaseModuleEntity; -import lombok.experimental.Accessors; /** * 资产指标配置对象 dc_base_asset_target - * + * * @author Lu.JL - * @date 2023-11-30 + * @date 2023-12-14 */ - @Data - @Accessors(chain = true) -public class DcBaseAssetTargetDao extends BaseModuleEntity +@Data +@Accessors(chain = true) +public class DcBaseAssetTarget extends BaseModuleEntity { private static final long serialVersionUID = 1L; - @TableId(value = "id", type = IdType.AUTO) - /** 主键 */ - private Long id; - /** 资产ID */ - @Excel(name = "资产ID") + /** 统计单元编码 */ + @Excel(name = "统计单元编码") + private String assetCode; + + /** 统计单元ID */ + @Excel(name = "统计单元ID") private Long assetId; /** 指标模型编码 */ @@ -38,6 +35,7 @@ public class DcBaseAssetTargetDao extends BaseModuleEntity @Excel(name = "指标名称") private String targetName; + /** 指标别名 */ @Excel(name = "指标别名") private String targetNameAlias; @@ -73,32 +71,20 @@ public class DcBaseAssetTargetDao extends BaseModuleEntity @Excel(name = "是否积算") private String flagCompute; - /** 排序 */ - @Excel(name = "排序") + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String sort; - /** 统计单元编码 */ - @Excel(name = "统计单元编码") - private String assetCode; - //add by zhousq 2023-12-12 - @ApiModelProperty("所属专业名称") + /** 所属专业名称 */ + @Excel(name = "所属专业名称") private String targetFieldName; - @ApiModelProperty("单位") - private String fieldUnit; - @ApiModelProperty("字段类型") - private String columnType; - - private String value; - private String label; - public String getValue() { - return this.targetCode; - } - - - public String getLabel() { - return this.targetCode; - } + /** T指标P参数 */ + @Excel(name = "T指标P参数") + private String columnType; + /** 单位 */ + @Excel(name = "单位") + private String fieldUnit; } 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 83d0fd4..f647a4b 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 @@ -1,7 +1,8 @@ package com.lzbi.targetFolder.mapper; import java.util.List; -import com.lzbi.targetFolder.domain.DcBaseAssetTargetDao; + +import com.lzbi.targetFolder.domain.DcBaseAssetTarget; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,7 +15,7 @@ import org.apache.ibatis.annotations.Param; */ @Mapper -public interface DcBaseAssetTargetMapper extends BaseMapper +public interface DcBaseAssetTargetMapper extends BaseMapper { /** * 查询资产指标配置 @@ -22,7 +23,7 @@ public interface DcBaseAssetTargetMapper extends BaseMapper selectDcBaseAssetTargetDaoList(DcBaseAssetTargetDao dcBaseAssetTargetDao); + public List selectDcBaseAssetTargetList(DcBaseAssetTarget dcBaseAssetTarget); /** * 新增资产指标配置 * - * @param dcBaseAssetTargetDao 资产指标配置 + * @param dcBaseAssetTarget 资产指标配置 * @return 结果 */ - public int insertDcBaseAssetTargetDao(DcBaseAssetTargetDao dcBaseAssetTargetDao); + public int insertDcBaseAssetTarget(DcBaseAssetTarget dcBaseAssetTarget); /** * 修改资产指标配置 @@ -55,7 +56,7 @@ public interface DcBaseAssetTargetMapper extends BaseMapper implements IService +public class DcBaseAssetTargetService extends ServiceImpl implements IService { @Autowired private DcBaseAssetTargetMapper dcBaseAssetTargetMapper; @@ -27,46 +27,46 @@ public class DcBaseAssetTargetService extends ServiceImpl selectDcBaseAssetTargetDaoList(DcBaseAssetTargetDao dcBaseAssetTargetDao) + public List selectDcBaseAssetTargetList(DcBaseAssetTarget dcBaseAssetTarget) { - return dcBaseAssetTargetMapper.selectDcBaseAssetTargetDaoList(dcBaseAssetTargetDao); + return dcBaseAssetTargetMapper.selectDcBaseAssetTargetList(dcBaseAssetTarget); } /** * 新增资产指标配置 * - * @param dcBaseAssetTargetDao 资产指标配置 + * @param dcBaseAssetTarget 资产指标配置 * @return 结果 */ - public int insertDcBaseAssetTargetDao(DcBaseAssetTargetDao dcBaseAssetTargetDao) + public int insertDcBaseAssetTarget(DcBaseAssetTarget dcBaseAssetTarget) { - dcBaseAssetTargetDao.setCreatedTime(DateUtils.getNowDate()); - return dcBaseAssetTargetMapper.insertDcBaseAssetTargetDao(dcBaseAssetTargetDao); + dcBaseAssetTarget.setCreatedTime(DateUtils.getNowDate()); + return dcBaseAssetTargetMapper.insertDcBaseAssetTarget(dcBaseAssetTarget); } /** * 修改资产指标配置 * - * @param dcBaseAssetTargetDao 资产指标配置 + * @param dcBaseAssetTarget 资产指标配置 * @return 结果 */ - public int updateDcBaseAssetTargetDao(DcBaseAssetTargetDao dcBaseAssetTargetDao) + public int updateDcBaseAssetTarget(DcBaseAssetTarget dcBaseAssetTarget) { - dcBaseAssetTargetDao.setUpdatedTime(DateUtils.getNowDate()); - return dcBaseAssetTargetMapper.updateDcBaseAssetTargetDao(dcBaseAssetTargetDao); + dcBaseAssetTarget.setUpdatedTime(DateUtils.getNowDate()); + return dcBaseAssetTargetMapper.updateDcBaseAssetTarget(dcBaseAssetTarget); } /** @@ -76,9 +76,9 @@ public class DcBaseAssetTargetService extends ServiceImpl - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - 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 - from dc_base_asset_info + 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, user_id 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, + tenant_id, + revision, + created_by, + created_time, + updated_by, + updated_time, + delete_by, + delete_time, asset_name, asset_code, asset_class, @@ -101,10 +71,11 @@ status_asset, comany_id, dept_id, + user_id, #{tenantId}, - #{REVISION}, + #{revision}, #{createdBy}, #{createdTime}, #{updatedBy}, @@ -120,20 +91,21 @@ #{statusAsset}, #{comanyId}, #{deptId}, + #{userId}, update dc_base_asset_info - TENANT_ID = #{tenantId}, - REVISION = #{REVISION}, - CREATED_BY = #{createdBy}, - CREATED_TIME = #{createdTime}, - UPDATED_BY = #{updatedBy}, - UPDATED_TIME = #{updatedTime}, - DELETE_BY = #{deleteBy}, - DELETE_TIME = #{deleteTime}, + tenant_id = #{tenantId}, + revision = #{revision}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + delete_by = #{deleteBy}, + delete_time = #{deleteTime}, asset_name = #{assetName}, asset_code = #{assetCode}, asset_class = #{assetClass}, @@ -143,14 +115,13 @@ status_asset = #{statusAsset}, comany_id = #{comanyId}, dept_id = #{deptId}, + user_id = #{userId}, where id = #{id} - delete - from dc_base_asset_info - where id = #{id} + delete from dc_base_asset_info where id = #{id} diff --git a/lzbi-module/src/main/resources/mapper/targetFolder/DcBaseAssetTargetMapper.xml b/lzbi-module/src/main/resources/mapper/targetFolder/DcBaseAssetTargetMapper.xml index c3ac296..cfc5b45 100644 --- a/lzbi-module/src/main/resources/mapper/targetFolder/DcBaseAssetTargetMapper.xml +++ b/lzbi-module/src/main/resources/mapper/targetFolder/DcBaseAssetTargetMapper.xml @@ -3,13 +3,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + - + + @@ -18,7 +19,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -27,19 +27,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - + - select id, asset_id,asset_code, target_model_code, target_name, target_code, target_field, limit_up, limit_down, value_base, flag_avg, flag_sum, flag_compute, sort, tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time,target_field_name - value_type, - field_unit - from dc_base_asset_target + select id, asset_code, asset_id, target_model_code, target_name, target_name_alias, target_code, target_field, limit_up, limit_down, value_base, flag_avg, flag_sum, flag_compute, tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time, sort, target_field_name, column_type, field_unit from dc_base_asset_target - and asset_id = #{assetId} @@ -53,17 +51,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where id = #{id} - - + + insert into dc_base_asset_target + asset_code, asset_id, target_model_code, target_name, + target_name_alias, target_code, target_field, limit_up, @@ -72,7 +72,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" flag_avg, flag_sum, flag_compute, - sort, tenant_id, revision, created_by, @@ -81,11 +80,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" updated_time, delete_by, delete_time, - + sort, + target_field_name, + column_type, + field_unit, + + #{assetCode}, #{assetId}, #{targetModelCode}, #{targetName}, + #{targetNameAlias}, #{targetCode}, #{targetField}, #{limitUp}, @@ -94,7 +99,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{flagAvg}, #{flagSum}, #{flagCompute}, - #{sort}, #{tenantId}, #{revision}, #{createdBy}, @@ -103,15 +107,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updatedTime}, #{deleteBy}, #{deleteTime}, - + #{sort}, + #{targetFieldName}, + #{columnType}, + #{fieldUnit}, + - + update dc_base_asset_target + asset_code = #{assetCode}, asset_id = #{assetId}, target_model_code = #{targetModelCode}, target_name = #{targetName}, + target_name_alias = #{targetNameAlias}, target_code = #{targetCode}, target_field = #{targetField}, limit_up = #{limitUp}, @@ -120,7 +130,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" flag_avg = #{flagAvg}, flag_sum = #{flagSum}, flag_compute = #{flagCompute}, - sort = #{sort}, tenant_id = #{tenantId}, revision = #{revision}, created_by = #{createdBy}, @@ -129,15 +138,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" updated_time = #{updatedTime}, delete_by = #{deleteBy}, delete_time = #{deleteTime}, + sort = #{sort}, + target_field_name = #{targetFieldName}, + column_type = #{columnType}, + field_unit = #{fieldUnit}, where id = #{id} - + delete from dc_base_asset_target where id = #{id} - + delete from dc_base_asset_target where id in #{id}