From 95737ea6985ebfaf64891ced62c1101f2e8c4f12 Mon Sep 17 00:00:00 2001 From: zhousq Date: Fri, 15 Dec 2023 16:56:31 +0800 Subject: [PATCH] =?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);