diff --git a/lzbi-admin/src/main/resources/application.yml b/lzbi-admin/src/main/resources/application.yml index 95f25c2..81e0beb 100644 --- a/lzbi-admin/src/main/resources/application.yml +++ b/lzbi-admin/src/main/resources/application.yml @@ -100,7 +100,7 @@ pagehelper: # Swagger配置 swagger: # 是否开启swagger - enabled: true + enabled: false # 请求前缀 pathMapping: / diff --git a/lzbi-common/src/main/java/com/lzbi/common/core/controller/BaseController.java b/lzbi-common/src/main/java/com/lzbi/common/core/controller/BaseController.java index dcd2135..89b6b3f 100644 --- a/lzbi-common/src/main/java/com/lzbi/common/core/controller/BaseController.java +++ b/lzbi-common/src/main/java/com/lzbi/common/core/controller/BaseController.java @@ -26,6 +26,7 @@ import com.lzbi.common.utils.sql.SqlUtil; * * @author ruoyi */ + public class BaseController { protected final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/lzbi-module/src/main/java/com/lzbi/asset/controller/DcBaseAssetInfoController.java b/lzbi-module/src/main/java/com/lzbi/asset/controller/DcBaseAssetInfoController.java index bdfceb5..243f3aa 100644 --- a/lzbi-module/src/main/java/com/lzbi/asset/controller/DcBaseAssetInfoController.java +++ b/lzbi-module/src/main/java/com/lzbi/asset/controller/DcBaseAssetInfoController.java @@ -79,6 +79,10 @@ public class DcBaseAssetInfoController extends BaseController { @Log(title = "资产信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody DcBaseAssetInfo dcBaseAssetInfo) { + dcBaseAssetInfo.setCreatedTime(DateUtils.getNowDate()); + dcBaseAssetInfo.setCreatedBy(String.valueOf(getUserId())); + dcBaseAssetInfo.setDeptId(getDeptId()); + dcBaseAssetInfo.setUserId(getUserId()); return toAjax(dcBaseAssetInfoService.insertDcBaseAssetInfo(dcBaseAssetInfo)); } @@ -89,6 +93,8 @@ public class DcBaseAssetInfoController extends BaseController { @Log(title = "资产信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody DcBaseAssetInfo dcBaseAssetInfo) { + dcBaseAssetInfo.setUpdatedBy(getUsername()); + dcBaseAssetInfo.setUpdatedTime(DateUtils.getNowDate()); return toAjax(dcBaseAssetInfoService.updateDcBaseAssetInfo(dcBaseAssetInfo)); } @@ -122,10 +128,9 @@ public class DcBaseAssetInfoController extends BaseController { beanObject.remove("id"); DcBaseAssetInfo dcBaseAssetInfo = JSON.toJavaObject(beanObject, DcBaseAssetInfo.class); dcBaseAssetInfo.setCreatedTime(DateUtils.getNowDate()); + dcBaseAssetInfo.setCreatedBy(String.valueOf(getUserId())); dcBaseAssetInfo.setDeptId(getDeptId()); dcBaseAssetInfo.setUserId(getUserId()); - dcBaseAssetInfo.setCreatedBy(String.valueOf(getUserId())); - dcBaseAssetInfo.setCreatedTime(DateUtils.getNowDate()); beanList.add(dcBaseAssetInfo); } } catch (Exception e) { 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 fcbf22b..004f976 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 @@ -72,11 +72,10 @@ public class DcBaseParamModelController extends BaseController @PostMapping public AjaxResult add(@Valid @RequestBody DcBaseParamModel dcBaseParamModel) { //BeanValidators.validateWithException(validator, dcBaseParamModel); - dcBaseParamModel.setCreatedBy(getUsername()); dcBaseParamModel.setCreatedTime(DateUtils.getNowDate()); - dcBaseParamModel.setTenantId("0"); - dcBaseParamModel.setUpdatedBy(getUsername()); - dcBaseParamModel.setUpdatedTime(DateUtils.getNowDate()); + dcBaseParamModel.setCreatedBy(String.valueOf(getUserId())); + dcBaseParamModel.setDeptId(getDeptId()); + dcBaseParamModel.setUserId(getUserId()); return toAjax(dcBaseParamModelService.insertByVo(dcBaseParamModel)); } /** @@ -154,10 +153,9 @@ public class DcBaseParamModelController extends BaseController beanObject.remove("id"); DcBaseParamModel dcBaseParamModel = JSON.toJavaObject(beanObject, DcBaseParamModel.class); dcBaseParamModel.setCreatedTime(DateUtils.getNowDate()); + dcBaseParamModel.setCreatedBy(String.valueOf(getUserId())); dcBaseParamModel.setDeptId(getDeptId()); dcBaseParamModel.setUserId(getUserId()); - dcBaseParamModel.setCreatedBy(String.valueOf(getUserId())); - dcBaseParamModel.setCreatedTime(DateUtils.getNowDate()); dcBaseParamModelList.add(dcBaseParamModel); } } catch (Exception e) { 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 a2aa9ba..0fdb568 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 @@ -22,9 +22,6 @@ import com.lzbi.module.base.BaseModuleEntity; @TableName("dc_base_param_model") public class DcBaseParamModel extends BaseModuleEntity{ - /** 主键 */ - @ApiModelProperty(name = "主键",notes = "") - private Long id ; /** 参数模型编码 */ @ApiModelProperty(name = "参数模型编码",notes = "") private String paramModelCode ; diff --git a/lzbi-module/src/main/java/com/lzbi/code/service/CodeNoGenerater.java b/lzbi-module/src/main/java/com/lzbi/code/service/CodeNoGenerater.java index abad783..5904bd0 100644 --- a/lzbi-module/src/main/java/com/lzbi/code/service/CodeNoGenerater.java +++ b/lzbi-module/src/main/java/com/lzbi/code/service/CodeNoGenerater.java @@ -36,7 +36,13 @@ public class CodeNoGenerater { // String spitChar= Optional.ofNullable(ruleDao.getCodeSplitFlag()).orElse(""); spitChar=spitChar.equals("*")?"":spitChar; - codeBuffer.append(ruleDao.getCodeHeader()).append(spitChar).append(getBody(ruleDao)).append(spitChar).append(StringUtils.leftPad(serial,serialLen,'0')); + String body=getBody(ruleDao); + codeBuffer.append(ruleDao.getCodeHeader()); + if(!"".equals(body)){ + codeBuffer.append(spitChar); + codeBuffer.append(body); + } + codeBuffer.append(spitChar).append(StringUtils.leftPad(serial,serialLen,'0')); return codeBuffer.toString(); } 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 077f92f..33a6049 100644 --- a/lzbi-module/src/main/java/com/lzbi/common/SelectOptionsControl.java +++ b/lzbi-module/src/main/java/com/lzbi/common/SelectOptionsControl.java @@ -116,7 +116,7 @@ public class SelectOptionsControl extends BaseController { { DcBaseAssetTarget dcBaseAssetTarget=new DcBaseAssetTarget(); dcBaseAssetTarget.setAssetCode(assetQueryParams.getAssetCode()); - dcBaseAssetTarget.setTargetField(assetQueryParams.getFieldCode()); + dcBaseAssetTarget.setFieldCode(assetQueryParams.getFieldCode()); dcBaseAssetTarget.setColumnType("T"); //dcBaseAssetTargetDao.setAssetId(assetQueryParams.getAssetId()); return AjaxResult.success(dcBaseAssetTargetService.selectDcBaseAssetTargetList(dcBaseAssetTarget)); @@ -126,7 +126,7 @@ public class SelectOptionsControl extends BaseController { { DcBaseAssetTarget dcBaseAssetTarget=new DcBaseAssetTarget(); dcBaseAssetTarget.setAssetCode(assetQueryParams.getAssetCode()); - dcBaseAssetTarget.setTargetField(assetQueryParams.getFieldCode()); + dcBaseAssetTarget.setFieldCode(assetQueryParams.getFieldCode()); dcBaseAssetTarget.setColumnType("P"); //dcBaseAssetTargetDao.setAssetId(assetQueryParams.getAssetId()); return AjaxResult.success(dcBaseAssetTargetService.selectDcBaseAssetTargetList(dcBaseAssetTarget)); diff --git a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamBillMasterController.java b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamBillMasterController.java index 587af03..4108948 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamBillMasterController.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamBillMasterController.java @@ -1,24 +1,25 @@ package com.lzbi.draft.controller; import java.util.List; -import javax.servlet.http.HttpServletResponse; + +import com.lzbi.common.utils.DateUtils; +import com.lzbi.common.utils.SecurityUtils; +import com.lzbi.draft.domain.DcBusiParamBillSub; +import com.lzbi.draft.service.DcBusiParamBillSubService; +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; -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.DcBusiParamBillMaster; import com.lzbi.draft.service.DcBusiParamBillMasterService; -import com.lzbi.common.utils.poi.ExcelUtil; import com.lzbi.common.core.page.TableDataInfo; /** @@ -29,15 +30,21 @@ import com.lzbi.common.core.page.TableDataInfo; */ @RestController @RequestMapping("/draft/paramInBill") + public class DcBusiParamBillMasterController extends BaseController { @Autowired private DcBusiParamBillMasterService dcBusiParamBillMasterService; - + @Autowired + private DcBusiParamBillSubService dcBusiParamBillSubService; /** * 查询参数采集（录入）单据主列表 */ - @PreAuthorize("@ss.hasPermi('param:paramData:list')") + //@PreAuthorize("@ss.hasPermi('param:paramData:list')") + @ApiOperation("参数采集单详情") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiParamBillMaster", value = "", dataType = "DcBusiParamBillMaster", dataTypeClass = DcBusiParamBillMaster.class), + }) @GetMapping("/list") public TableDataInfo list(DcBusiParamBillMaster dcBusiParamBillMasterDao) { @@ -46,59 +53,43 @@ public class DcBusiParamBillMasterController extends BaseController return getDataTable(list); } - /** - * 导出参数采集（录入）单据主列表 - */ - @PreAuthorize("@ss.hasPermi('param:paramData:export')") - @Log(title = "参数采集（录入）单据主", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DcBusiParamBillMaster dcBusiParamBillMasterDao) - { - List list = dcBusiParamBillMasterService.selectDcBusiParamBillMasterDaoList(dcBusiParamBillMasterDao); - ExcelUtil util = new ExcelUtil(DcBusiParamBillMaster.class); - util.exportExcel(response, list, "参数采集（录入）单据主数据"); + @ApiOperation("参数采集单详情") + @ApiImplicitParams({ + @ApiImplicitParam(name = "billNo", value = "", dataType = "String", dataTypeClass = String.class), + }) + @GetMapping("/detail/{billNo}") + public AjaxResult getParamInBillDetail(@PathVariable String billNo){ + DcBusiParamBillSub sub=new DcBusiParamBillSub(); + sub.setBillNo(billNo); + List list = dcBusiParamBillSubService.selectByVo(sub); + return AjaxResult.success(list); } - - /** - * 获取参数采集（录入）单据主详细信息 - */ - @PreAuthorize("@ss.hasPermi('param:paramData:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(dcBusiParamBillMasterService.selectDcBusiParamBillMasterDaoById(id)); + @ApiOperation("采集单驳回") + @ApiImplicitParams({ + @ApiImplicitParam(name = "billNo", value = "", dataType = "String", dataTypeClass = String.class), + }) + @GetMapping("/checkBack/{billNo}") + public AjaxResult checkParamInBillBack(@PathVariable String billNo){ + DcBusiParamBillMaster master=new DcBusiParamBillMaster(); + master.setBillNo(billNo); + master.setUpdatedBy(SecurityUtils.getUsername()); + master.setCreatedTime(DateUtils.getNowDate()); + master.setCheckStatus("9"); + return AjaxResult.success(dcBusiParamBillMasterService.checkBill(master)); } - /** - * 新增参数采集（录入）单据主 - */ - @PreAuthorize("@ss.hasPermi('param:paramData:add')") - @Log(title = "参数采集（录入）单据主", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody DcBusiParamBillMaster dcBusiParamBillMasterDao) - { - return toAjax(dcBusiParamBillMasterService.insertDcBusiParamBillMasterDao(dcBusiParamBillMasterDao)); - } - - /** - * 修改参数采集（录入）单据主 - */ - @PreAuthorize("@ss.hasPermi('param:paramData:edit')") - @Log(title = "参数采集（录入）单据主", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody DcBusiParamBillMaster dcBusiParamBillMasterDao) - { - return toAjax(dcBusiParamBillMasterService.updateDcBusiParamBillMasterDao(dcBusiParamBillMasterDao)); + @ApiOperation("采集单审核") + @ApiImplicitParams({ + @ApiImplicitParam(name = "billNo", value = "", dataType = "String", dataTypeClass = String.class), + }) + @GetMapping("/check/{billNo}") + public AjaxResult checkParamInBill(@PathVariable String billNo){ + DcBusiParamBillMaster master=new DcBusiParamBillMaster(); + master.setUpdatedBy(SecurityUtils.getUsername()); + master.setCreatedTime(DateUtils.getNowDate()); + master.setBillNo(billNo); + master.setCheckStatus("1"); + return AjaxResult.success(dcBusiParamBillMasterService.checkBill(master)); } - /** - * 删除参数采集（录入）单据主 - */ - @PreAuthorize("@ss.hasPermi('param:paramData:remove')") - @Log(title = "参数采集（录入）单据主", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(dcBusiParamBillMasterService.deleteDcBusiParamBillMasterDaoByIds(ids)); - } } 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 4461eeb..5d6d897 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 @@ -177,13 +177,18 @@ public class DcBusiParamCollectBill extends BaseController 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 datasets=Optional.ofNullable(dcBusiParamBillMaster.getSubDatas()).orElse(new JSONObject()); + JSONArray dataArray=new JSONArray(); + dataArray.addAll(datasets.getJSONArray("insertRecords")); + dataArray.addAll(datasets.getJSONArray("updateRecords")); + //JSONArray jsonArray=Optional.ofNullable(JSONArray.from(dcBusiParamBillMaster.getSubDatas())).orElse(new JSONArray()); + dataArray.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.setAssetUnitAlialsName(jsb.getString("assetAlialsName")); //modelSub.setAssetId(item.get); modelSub.setAssetUnitCode(jsb.getString("paramCode")); modelSub.setAssetUnitName(jsb.getString("paramName")); @@ -236,8 +241,12 @@ public class DcBusiParamCollectBill extends BaseController 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->{ + // JSONArray jsonArray=Optional.ofNullable(JSONArray.from(dcBusiParamBillMaster.getSubDatas())).orElse(new JSONArray()); + JSONObject datasets=Optional.ofNullable(dcBusiParamBillMaster.getSubDatas()).orElse(new JSONObject()); + JSONArray dataArray=new JSONArray(); + dataArray.addAll(datasets.getJSONArray("insertRecords")); + dataArray.addAll(datasets.getJSONArray("updateRecords")); + dataArray.forEach(item->{ JSONObject jsb = JSONObject.from(item); for(int i=1;i<25;i++){ String fname="val_"+String.valueOf(i); 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 index 23725a0..4ac567a 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetBillMasterController.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetBillMasterController.java @@ -1,4 +1,11 @@ package com.lzbi.draft.controller; +import com.lzbi.common.utils.DateUtils; +import com.lzbi.common.utils.SecurityUtils; +import com.lzbi.draft.domain.DcBusiParamBillMaster; +import com.lzbi.draft.domain.DcBusiParamBillSub; +import com.lzbi.draft.domain.DcBusiTargetBillSub; +import com.lzbi.draft.service.DcBusiParamBillSubService; +import com.lzbi.draft.service.DcBusiTargetBillSubService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -30,12 +37,13 @@ import com.lzbi.common.core.page.TableDataInfo; * @date 2023-12-14 */ @RestController -@RequestMapping("/draft/targetBillMaster") +@RequestMapping("/draft/targetInBill") public class DcBusiTargetBillMasterController extends BaseController { @Autowired private DcBusiTargetBillMasterService dcBusiTargetBillMasterService; - + @Autowired + private DcBusiTargetBillSubService dcBusiTargetBillSubService; /** * 查询统计指标录入列表 */ @@ -43,7 +51,7 @@ public class DcBusiTargetBillMasterController extends BaseController @ApiImplicitParams({ @ApiImplicitParam(name = "DcBusiTargetBillMaster", value = "", dataType = "DcBusiTargetBillMaster", dataTypeClass = DcBusiTargetBillMaster.class), }) - @PreAuthorize("@ss.hasPermi('draft:targetCollect:list')") + //@PreAuthorize("@ss.hasPermi('draft:targetCollect:list')") @GetMapping("/list") public TableDataInfo list(DcBusiTargetBillMaster DcBusiTargetBillMaster) { @@ -52,80 +60,43 @@ public class DcBusiTargetBillMasterController extends BaseController 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("获取统计指标录入详细信息") + @ApiOperation("指标采集单详情") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "", dataType = "Long", dataTypeClass = Long.class), + @ApiImplicitParam(name = "billNo", value = "", dataType = "String", dataTypeClass = String.class), }) - @PreAuthorize("@ss.hasPermi('draft:targetCollect:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(dcBusiTargetBillMasterService.selectDcBusiTargetBillMasterById(id)); + @GetMapping("/detail/{billNo}") + public AjaxResult getParamInBillDetail(@PathVariable String billNo){ + DcBusiTargetBillSub sub=new DcBusiTargetBillSub(); + sub.setBillNo(billNo); + List list = dcBusiTargetBillSubService.selectDcBusiTargetBillSubList(sub); + return AjaxResult.success(list); } - - /** - * 新增统计指标录入 - */ - @ApiOperation("新增统计指标录入") + @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), + @ApiImplicitParam(name = "billNo", value = "", dataType = "String", dataTypeClass = String.class), }) - @PreAuthorize("@ss.hasPermi('draft:targetCollect:edit')") - @Log(title = "统计指标录入", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody DcBusiTargetBillMaster DcBusiTargetBillMaster) - { - return toAjax(dcBusiTargetBillMasterService.updateDcBusiTargetBillMaster(DcBusiTargetBillMaster)); + @GetMapping("/checkBack/{billNo}") + public AjaxResult checkParamInBillBack(@PathVariable String billNo){ + DcBusiTargetBillMaster master=new DcBusiTargetBillMaster(); + master.setBillNo(billNo); + master.setUpdatedBy(SecurityUtils.getUsername()); + master.setCreatedTime(DateUtils.getNowDate()); + master.setCheckStatus("9"); + return AjaxResult.success(dcBusiTargetBillMasterService.checkBill(master)); } - /** - * 删除统计指标录入 - */ - @ApiOperation("删除统计指标录入") + @ApiOperation("采集单审核") @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "", dataType = "Long", dataTypeClass =Long.class), + @ApiImplicitParam(name = "billNo", value = "", dataType = "String", dataTypeClass = String.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)); + @GetMapping("/check/{billNo}") + public AjaxResult checkParamInBill(@PathVariable String billNo){ + DcBusiTargetBillMaster master=new DcBusiTargetBillMaster(); + master.setUpdatedBy(SecurityUtils.getUsername()); + master.setCreatedTime(DateUtils.getNowDate()); + master.setBillNo(billNo); + master.setCheckStatus("1"); + return AjaxResult.success(dcBusiTargetBillMasterService.checkBill(master)); } } diff --git a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetBillSubController.java b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetBillSubController.java new file mode 100644 index 0000000..b491dce --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetBillSubController.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. DcBusiTargetBillSub; +import com.lzbi.draft.service.DcBusiTargetBillSubService; +import com.lzbi.common.utils.poi.ExcelUtil; +import com.lzbi.common.core.page.TableDataInfo; + +/** + * 指标数据采集（录入）明细Controller + * + * @author zhousq + * @date 2023-12-19 + */ +@RestController +@RequestMapping("/draft/targetBIllSub") +public class DcBusiTargetBillSubController extends BaseController +{ + @Autowired + private DcBusiTargetBillSubService dcBusiTargetBillSubService; + + /** + * 查询指标数据采集（录入）明细列表 + */ + @ApiOperation("查询指标数据采集（录入）明细列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiTargetBillSub", value = "", dataType = "DcBusiTargetBillSub", dataTypeClass = DcBusiTargetBillSub.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetBIllSub:list')") + @GetMapping("/list") + public TableDataInfo list(DcBusiTargetBillSub DcBusiTargetBillSub) + { + startPage(); + List< DcBusiTargetBillSub> list = dcBusiTargetBillSubService.selectDcBusiTargetBillSubList(DcBusiTargetBillSub); + return getDataTable(list); + } + + /** + * 导出指标数据采集（录入）明细列表 + */ + @ApiOperation("导出指标数据采集（录入）明细列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiTargetBillSub", value = "", dataType = "DcBusiTargetBillSub", dataTypeClass = DcBusiTargetBillSub.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetBIllSub:export')") + @Log(title = "指标数据采集（录入）明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response,DcBusiTargetBillSub DcBusiTargetBillSub) + { + List list = dcBusiTargetBillSubService.selectDcBusiTargetBillSubList(DcBusiTargetBillSub); + ExcelUtil util = new ExcelUtil(DcBusiTargetBillSub.class); + util.exportExcel(response, list, "指标数据采集（录入）明细数据"); + } + + /** + * 获取指标数据采集（录入）明细详细信息 + */ + @ApiOperation("获取指标数据采集（录入）明细详细信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "", dataType = "Long", dataTypeClass = Long.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetBIllSub:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(dcBusiTargetBillSubService.selectDcBusiTargetBillSubById(id)); + } + + /** + * 新增指标数据采集（录入）明细 + */ + @ApiOperation("新增指标数据采集（录入）明细") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiTargetBillSub", value = "", dataType = "DcBusiTargetBillSub", dataTypeClass = DcBusiTargetBillSub.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetBIllSub:add')") + @Log(title = "指标数据采集（录入）明细", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DcBusiTargetBillSub DcBusiTargetBillSub) + { + return toAjax(dcBusiTargetBillSubService.insertDcBusiTargetBillSub(DcBusiTargetBillSub)); + } + + /** + * 修改指标数据采集（录入）明细 + */ + + @ApiOperation("修改指标数据采集（录入）明细") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiTargetBillSub", value = "", dataType = "DcBusiTargetBillSub", dataTypeClass = DcBusiTargetBillSub.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetBIllSub:edit')") + @Log(title = "指标数据采集（录入）明细", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DcBusiTargetBillSub DcBusiTargetBillSub) + { + return toAjax(dcBusiTargetBillSubService.updateDcBusiTargetBillSub(DcBusiTargetBillSub)); + } + + /** + * 删除指标数据采集（录入）明细 + */ + @ApiOperation("删除指标数据采集（录入）明细") + @ApiImplicitParams({ + @ApiImplicitParam(name = "ids", value = "", dataType = "Long", dataTypeClass =Long.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetBIllSub:remove')") + @Log(title = "指标数据采集（录入）明细", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(dcBusiTargetBillSubService.deleteDcBusiTargetBillSubByIds(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 index 2ad3bea..bda6fb7 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 @@ -173,13 +173,17 @@ public class DcBusiTargetCollectBill extends BaseController 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 datasets=Optional.ofNullable(dcBusiParamBillMaster.getSubDatas()).orElse(new JSONObject()); + JSONArray dataArray=new JSONArray(); + dataArray.addAll(datasets.getJSONArray("insertRecords")); + dataArray.addAll(datasets.getJSONArray("updateRecords")); + dataArray.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.setAssetUnitAlialsName(jsb.getString("assetAlialsName")); //modelSub.setAssetId(item.get); modelSub.setAssetUnitCode(jsb.getString("targetCode")); modelSub.setAssetUnitName(jsb.getString("targetName")); @@ -232,8 +236,11 @@ public class DcBusiTargetCollectBill extends BaseController 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 datasets=Optional.ofNullable(dcBusiTargetBillMaster.getSubDatas()).orElse(new JSONObject()); + JSONArray dataArray=new JSONArray(); + dataArray.addAll(datasets.getJSONArray("insertRecords")); + dataArray.addAll(datasets.getJSONArray("updateRecords")); + dataArray.forEach(item->{ JSONObject jsb = JSONObject.from(item); for(int i=1;i<31;i++){ String fname="val_"+String.valueOf(i); 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 2c8d9c1..49d45c8 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 @@ -1,6 +1,7 @@ package com.lzbi.draft.domain; import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.annotation.IdType; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -82,7 +83,7 @@ public class DcBusiParamBillMaster extends BaseModuleEntity /** 参数数据采集（录入）明细信息 */ private List dcBusiParamBillSubList; @ApiModelProperty(name = "data数组数据未转换",notes = "") - private JSONArray subDatas; + private JSONObject subDatas; 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 index 7802322..4dbc03e 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillMaster.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillMaster.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Date; import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -96,5 +97,5 @@ public class DcBusiTargetBillMaster extends BaseModuleEntity @ApiModelProperty(name = "专业名称",notes = "") private String fieldName; @ApiModelProperty(name = "data数组数据未转换",notes = "") - private JSONArray subDatas; + private JSONObject 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 index 5bcd60b..614d6d8 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillSub.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillSub.java @@ -2,17 +2,12 @@ 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 lombok.Data; +import io.swagger.annotations.ApiModelProperty; +import lombok.experimental.Accessors; import com.lzbi.common.annotation.Excel; import com.lzbi.module.base.BaseModuleEntity; @@ -20,76 +15,82 @@ import com.lzbi.module.base.BaseModuleEntity; * 指标数据采集（录入）明细对象 dc_busi_target_bill_sub * * @author zhousq - * @date 2023-12-14 + * @date 2023-12-19 */ @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 = "") + @ApiModelProperty(name = "单据编码",notes = "billNo") private String billNo; /** 指标名称 */ @Excel(name = "指标名称") - @ApiModelProperty(name = "指标名称",notes = "") + @ApiModelProperty(name = "指标名称",notes = "targetName") private String targetName; /** 指标编码 */ @Excel(name = "指标编码") - @ApiModelProperty(name = "指标编码",notes = "") + @ApiModelProperty(name = "指标编码",notes = "targetCode") private String targetCode; /** 指标单位 */ @Excel(name = "指标单位") - @ApiModelProperty(name = "指标单位",notes = "") + @ApiModelProperty(name = "指标单位",notes = "targetUint") private String targetUint; /** 指标值 */ @Excel(name = "指标值") - @ApiModelProperty(name = "指标值",notes = "") + @ApiModelProperty(name = "指标值",notes = "targetValue") private Double targetValue; /** 统计日期 */ @Excel(name = "统计日期") - @ApiModelProperty(name = "统计日期",notes = "") + @ApiModelProperty(name = "统计日期",notes = "countDate") private String countDate; /** 天 */ @Excel(name = "天") - @ApiModelProperty(name = "天",notes = "") + @ApiModelProperty(name = "天",notes = "countDay") private Integer countDay; /** 所属专业编码 */ @Excel(name = "所属专业编码") - @ApiModelProperty(name = "所属专业编码",notes = "") + @ApiModelProperty(name = "所属专业编码",notes = "fieldCode") private String fieldCode; /** 所属专业名称 */ @Excel(name = "所属专业名称") - @ApiModelProperty(name = "所属专业名称",notes = "") + @ApiModelProperty(name = "所属专业名称",notes = "fieldName") private String fieldName; /** 统计单元编码 */ @Excel(name = "统计单元编码") - @ApiModelProperty(name = "统计单元编码",notes = "") + @ApiModelProperty(name = "统计单元编码",notes = "assetCode") private String assetCode; /** 统计单元名称 */ @Excel(name = "统计单元名称") - @ApiModelProperty(name = "统计单元名称",notes = "") + @ApiModelProperty(name = "统计单元名称",notes = "assetName") private String assetName; + /** 创建人 */ + private String createdBy; + + /** 创建时间 */ + private Date createdTime; + + /** 更新人 */ + private String updatedBy; + + /** 更新时间 */ + private Date updatedTime; } diff --git a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiParamBillMasterMapper.java b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiParamBillMasterMapper.java index 1dc92a6..40c56e7 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiParamBillMasterMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiParamBillMasterMapper.java @@ -46,6 +46,7 @@ public interface DcBusiParamBillMasterMapper extends BaseMapper selectDcBusiTargetBillMasterList(DcBusiTargetBillMaster dcBusiTargetBillMaster); - + public int updateDcBusiTargetBillMasterByVo(DcBusiTargetBillMaster dcBusiTargetBillMaster); /** * 新增统计指标录入 * diff --git a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetBillSubMapper.java b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetBillSubMapper.java new file mode 100644 index 0000000..238b274 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetBillSubMapper.java @@ -0,0 +1,63 @@ +package com.lzbi.draft.mapper; + +import java.util.List; +import com.lzbi.draft.domain.DcBusiTargetBillSub; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 指标数据采集（录入）明细Mapper接口 + * + * @author zhousq + * @date 2023-12-19 + */ + +public interface DcBusiTargetBillSubMapper extends BaseMapper +{ + /** + * 查询指标数据采集（录入）明细 + * + * @param id 指标数据采集（录入）明细主键 + * @return 指标数据采集（录入）明细 + */ + public DcBusiTargetBillSub selectDcBusiTargetBillSubById(Long id); + + /** + * 查询指标数据采集（录入）明细列表 + * + * @param dcBusiTargetBillSub 指标数据采集（录入）明细 + * @return 指标数据采集（录入）明细集合 + */ + public List selectDcBusiTargetBillSubList(DcBusiTargetBillSub dcBusiTargetBillSub); + + /** + * 新增指标数据采集（录入）明细 + * + * @param dcBusiTargetBillSub 指标数据采集（录入）明细 + * @return 结果 + */ + public int insertDcBusiTargetBillSub(DcBusiTargetBillSub dcBusiTargetBillSub); + + /** + * 修改指标数据采集（录入）明细 + * + * @param dcBusiTargetBillSub 指标数据采集（录入）明细 + * @return 结果 + */ + public int updateDcBusiTargetBillSub(DcBusiTargetBillSub dcBusiTargetBillSub); + + /** + * 删除指标数据采集（录入）明细 + * + * @param id 指标数据采集（录入）明细主键 + * @return 结果 + */ + public int deleteDcBusiTargetBillSubById(Long id); + + /** + * 批量删除指标数据采集（录入）明细 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDcBusiTargetBillSubByIds(Long[] ids); +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiParamBillMasterService.java b/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiParamBillMasterService.java index 8588576..89f1ff4 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiParamBillMasterService.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiParamBillMasterService.java @@ -72,11 +72,14 @@ public class DcBusiParamBillMasterService extends ServiceImpl implements IService +{ + + /** + * 查询指标数据采集（录入）明细 + * + * @param id 指标数据采集（录入）明细主键 + * @return 指标数据采集（录入）明细 + */ + public DcBusiTargetBillSub selectDcBusiTargetBillSubById(Long id) + { + return baseMapper.selectDcBusiTargetBillSubById(id); + } + + /** + * 查询指标数据采集（录入）明细列表 + * + * @param dcBusiTargetBillSub 指标数据采集（录入）明细 + * @return 指标数据采集（录入）明细 + */ + public List selectDcBusiTargetBillSubList(DcBusiTargetBillSub dcBusiTargetBillSub) + { + return baseMapper.selectDcBusiTargetBillSubList(dcBusiTargetBillSub); + } + + /** + * 新增指标数据采集（录入）明细 + * + * @param dcBusiTargetBillSub 指标数据采集（录入）明细 + * @return 结果 + */ + + public int insertDcBusiTargetBillSub(DcBusiTargetBillSub dcBusiTargetBillSub) + { + dcBusiTargetBillSub.setCreatedTime(DateUtils.getNowDate()); + return baseMapper.insertDcBusiTargetBillSub(dcBusiTargetBillSub); + } + + /** + * 修改指标数据采集（录入）明细 + * + * @param dcBusiTargetBillSub 指标数据采集（录入）明细 + * @return 结果 + */ + + public int updateDcBusiTargetBillSub(DcBusiTargetBillSub dcBusiTargetBillSub) + { + dcBusiTargetBillSub.setUpdatedTime(DateUtils.getNowDate()); + return baseMapper.updateDcBusiTargetBillSub(dcBusiTargetBillSub); + } + + /** + * 批量删除指标数据采集（录入）明细 + * + * @param ids 需要删除的指标数据采集（录入）明细主键 + * @return 结果 + */ + + public int deleteDcBusiTargetBillSubByIds(Long[] ids) + { + return baseMapper.deleteDcBusiTargetBillSubByIds(ids); + } + + /** + * 删除指标数据采集（录入）明细信息 + * + * @param id 指标数据采集（录入）明细主键 + * @return 结果 + */ + + public int deleteDcBusiTargetBillSubById(Long id) + { + return baseMapper.deleteDcBusiTargetBillSubById(id); + } +} 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 a715896..93a793e 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 @@ -83,6 +83,10 @@ public class DcBaseAssetTargetController extends BaseController @PostMapping public AjaxResult add(@RequestBody DcBaseAssetTarget dcBaseAssetTarget) { + dcBaseAssetTarget.setCreatedTime(DateUtils.getNowDate()); + dcBaseAssetTarget.setCreatedBy(String.valueOf(getUserId())); + dcBaseAssetTarget.setDeptId(getDeptId()); + dcBaseAssetTarget.setUserId(getUserId()); return toAjax(dcBaseAssetTargetService.insertDcBaseAssetTarget(dcBaseAssetTarget)); } @@ -94,6 +98,8 @@ public class DcBaseAssetTargetController extends BaseController @PutMapping public AjaxResult edit(@RequestBody DcBaseAssetTarget dcBaseAssetTarget) { + dcBaseAssetTarget.setUpdatedTime(DateUtils.getNowDate()); + dcBaseAssetTarget.setUpdatedBy(String.valueOf(getUserId())); return toAjax(dcBaseAssetTargetService.updateDcBaseAssetTarget(dcBaseAssetTarget)); } @@ -140,10 +146,9 @@ public class DcBaseAssetTargetController extends BaseController beanObject.remove("id"); DcBaseAssetTarget dcBaseAssetTarget = JSON.toJavaObject(beanObject, DcBaseAssetTarget.class); dcBaseAssetTarget.setCreatedTime(DateUtils.getNowDate()); + dcBaseAssetTarget.setCreatedBy(String.valueOf(getUserId())); dcBaseAssetTarget.setDeptId(getDeptId()); dcBaseAssetTarget.setUserId(getUserId()); - dcBaseAssetTarget.setCreatedBy(String.valueOf(getUserId())); - dcBaseAssetTarget.setCreatedTime(DateUtils.getNowDate()); beanList.add(dcBaseAssetTarget); } } catch (Exception e) { 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 c8a348e..047170f 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 @@ -101,9 +101,13 @@ public class DcBaseTargetModelController extends BaseController @PreAuthorize("@ss.hasPermi('target:targetModel:add')") @Log(title = "指标模版配置", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody DcBaseTargetModel DcBaseTargetModel) + public AjaxResult add(@RequestBody DcBaseTargetModel dcBaseTargetModel) { - return toAjax(dcBaseTargetModelService.insertDcBaseTargetModel(DcBaseTargetModel)); + dcBaseTargetModel.setCreatedTime(DateUtils.getNowDate()); + dcBaseTargetModel.setCreatedBy(String.valueOf(getUserId())); + dcBaseTargetModel.setDeptId(getDeptId()); + dcBaseTargetModel.setUserId(getUserId()); + return toAjax(dcBaseTargetModelService.insertDcBaseTargetModel(dcBaseTargetModel)); } /** @@ -117,9 +121,11 @@ public class DcBaseTargetModelController extends BaseController @PreAuthorize("@ss.hasPermi('target:targetModel:edit')") @Log(title = "指标模版配置", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody DcBaseTargetModel DcBaseTargetModel) + public AjaxResult edit(@RequestBody DcBaseTargetModel dcBaseTargetModel) { - return toAjax(dcBaseTargetModelService.updateDcBaseTargetModel(DcBaseTargetModel)); + dcBaseTargetModel.setUpdatedTime(DateUtils.getNowDate()); + dcBaseTargetModel.setUpdatedBy(String.valueOf(getUserId())); + return toAjax(dcBaseTargetModelService.updateDcBaseTargetModel(dcBaseTargetModel)); } /** @@ -157,10 +163,9 @@ public class DcBaseTargetModelController extends BaseController beanObject.remove("id"); DcBaseTargetModel dcBaseTargetModel = JSON.toJavaObject(beanObject, DcBaseTargetModel.class); dcBaseTargetModel.setCreatedTime(DateUtils.getNowDate()); + dcBaseTargetModel.setCreatedBy(String.valueOf(getUserId())); dcBaseTargetModel.setDeptId(getDeptId()); dcBaseTargetModel.setUserId(getUserId()); - dcBaseTargetModel.setCreatedBy(String.valueOf(getUserId())); - dcBaseTargetModel.setCreatedTime(DateUtils.getNowDate()); beanList.add(dcBaseTargetModel); } } catch (Exception e) { diff --git a/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTarget.java b/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTarget.java index 427f0e9..bb6acd2 100644 --- a/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTarget.java +++ b/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTarget.java @@ -2,8 +2,9 @@ package com.lzbi.targetFolder.domain; import java.math.BigDecimal; import java.util.Date; -import lombok.experimental.Accessors; import lombok.Data; +import io.swagger.annotations.ApiModelProperty; +import lombok.experimental.Accessors; import com.lzbi.common.annotation.Excel; import com.lzbi.module.base.BaseModuleEntity; @@ -11,7 +12,7 @@ import com.lzbi.module.base.BaseModuleEntity; * 资产指标配置对象 dc_base_asset_target * * @author Lu.JL - * @date 2023-12-14 + * @date 2023-12-19 */ @Data @Accessors(chain = true) @@ -21,70 +22,106 @@ public class DcBaseAssetTarget extends BaseModuleEntity /** 统计单元编码 */ @Excel(name = "统计单元编码") + @ApiModelProperty(name = "统计单元编码",notes = "assetCode") private String assetCode; /** 统计单元ID */ @Excel(name = "统计单元ID") + @ApiModelProperty(name = "统计单元ID",notes = "assetId") private Long assetId; /** 指标模型编码 */ @Excel(name = "指标模型编码") + @ApiModelProperty(name = "指标模型编码",notes = "targetModelCode") private String targetModelCode; /** 指标名称 */ @Excel(name = "指标名称") + @ApiModelProperty(name = "指标名称",notes = "targetName") private String targetName; /** 指标别名 */ @Excel(name = "指标别名") + @ApiModelProperty(name = "指标别名",notes = "targetNameAlias") private String targetNameAlias; /** 指标编码 */ @Excel(name = "指标编码") + @ApiModelProperty(name = "指标编码",notes = "targetCode") private String targetCode; /** 所属专业 */ @Excel(name = "所属专业") - private String targetField; + @ApiModelProperty(name = "所属专业",notes = "fieldCode") + private String fieldCode; /** 上限 */ @Excel(name = "上限") + @ApiModelProperty(name = "上限",notes = "limitUp") private BigDecimal limitUp; /** 下限 */ @Excel(name = "下限") + @ApiModelProperty(name = "下限",notes = "limitDown") private BigDecimal limitDown; /** 值 */ @Excel(name = "值") + @ApiModelProperty(name = "值",notes = "valueBase") private BigDecimal valueBase; /** 是否均值 */ @Excel(name = "是否均值") + @ApiModelProperty(name = "是否均值",notes = "flagAvg") private String flagAvg; /** 是否汇总 */ @Excel(name = "是否汇总") + @ApiModelProperty(name = "是否汇总",notes = "flagSum") private String flagSum; /** 是否积算 */ @Excel(name = "是否积算") + @ApiModelProperty(name = "是否积算",notes = "flagCompute") private String flagCompute; - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + /** */ + @Excel(name = "") + @ApiModelProperty(name = "",notes = "sort") private String sort; /** 所属专业名称 */ @Excel(name = "所属专业名称") - private String targetFieldName; + @ApiModelProperty(name = "所属专业名称",notes = "fieldName") + private String fieldName; /** T指标P参数 */ @Excel(name = "T指标P参数") + @ApiModelProperty(name = "T指标P参数",notes = "columnType") private String columnType; /** 单位 */ @Excel(name = "单位") + @ApiModelProperty(name = "单位",notes = "fieldUnit") private String fieldUnit; + /** 部门id */ + @Excel(name = "部门id") + @ApiModelProperty(name = "部门id",notes = "deptId") + private Long deptId; + + /** 用户id */ + @Excel(name = "用户id") + @ApiModelProperty(name = "用户id",notes = "userId") + private Long userId; + + public String getValue() { + return this.targetCode; + } + + + public String getLabel() { + return this.targetName; + } + } diff --git a/lzbi-module/src/main/resources/mapper/asset/DcBaseAssetInfoMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBaseAssetInfoMapper.xml index 62b0211..317cec1 100644 --- a/lzbi-module/src/main/resources/mapper/asset/DcBaseAssetInfoMapper.xml +++ b/lzbi-module/src/main/resources/mapper/asset/DcBaseAssetInfoMapper.xml @@ -4,64 +4,95 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - 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 + 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 - - + + + 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, @@ -71,7 +102,6 @@ status_asset, comany_id, dept_id, - user_id, #{tenantId}, @@ -91,21 +121,20 @@ #{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}, @@ -115,13 +144,14 @@ 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/asset/DcBaseParamModelMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBaseParamModelMapper.xml index 10c0f32..d29a335 100644 --- a/lzbi-module/src/main/resources/mapper/asset/DcBaseParamModelMapper.xml +++ b/lzbi-module/src/main/resources/mapper/asset/DcBaseParamModelMapper.xml @@ -74,6 +74,7 @@ and flag_status = #{flagStatus} + ORDER BY COALESCE(updated_time, created_time) DESC insert into dc_base_param_model diff --git a/lzbi-module/src/main/resources/mapper/asset/DcBaseWorkSpecialMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBaseWorkSpecialMapper.xml index 6fa61b2..14e469a 100644 --- a/lzbi-module/src/main/resources/mapper/asset/DcBaseWorkSpecialMapper.xml +++ b/lzbi-module/src/main/resources/mapper/asset/DcBaseWorkSpecialMapper.xml @@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + diff --git a/lzbi-module/src/main/resources/mapper/asset/DcBusiParamBillMasterMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBusiParamBillMasterMapper.xml index c1f9098..4c08cef 100644 --- a/lzbi-module/src/main/resources/mapper/asset/DcBusiParamBillMasterMapper.xml +++ b/lzbi-module/src/main/resources/mapper/asset/DcBusiParamBillMasterMapper.xml @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select TENANT_ID, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DELETE_BY, DELETE_TIME, id, bill_no, bill_income_date, bill_type, check_type, check_status from dc_busi_param_bill_master + select TENANT_ID, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DELETE_BY, DELETE_TIME, id, bill_no, bill_income_date, bill_type, check_type, check_status,company_id,company_name,organize_name,oragnize_id from dc_busi_param_bill_master @@ -135,7 +141,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + update dc_busi_param_bill_master + + TENANT_ID = #{tenantId}, + REVISION = #{revision}, + CREATED_BY = #{createdBy}, + CREATED_TIME = #{createdTime}, + UPDATED_BY = #{updatedBy}, + UPDATED_TIME = #{updatedTime}, + DELETE_BY = #{deleteBy}, + DELETE_TIME = #{deleteTime}, + bill_income_date = #{billIncomeDate}, + bill_type = #{billType}, + check_type = #{checkType}, + check_status = #{checkStatus}, + + where bill_no = #{billNo} + delete from dc_busi_param_bill_master where id = #{id} @@ -154,14 +177,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + delete from dc_busi_param_bill_sub where bill_no = #{billNo} - insert into dc_busi_param_bill_sub( TENANT_ID, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DELETE_BY, DELETE_TIME, id, bill_no, asset_code,asset_name, field_code, field_name, param_code, param_value,count_date,count_hour) values + insert into dc_busi_param_bill_sub( TENANT_ID, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DELETE_BY, DELETE_TIME, id, bill_no, asset_code,asset_name, field_code, field_name, param_code, param_value,count_date,count_hour,param_name) values - ( #{item.tenantId}, #{item.createdBy}, #{item.createdTime}, #{item.updatedBy}, #{item.updatedTime}, #{item.deleteBy}, #{item.deleteTime}, #{item.id}, #{item.billNo}, #{item.assetCode}, #{item.assetName}, #{item.fieldCode}, #{item.fieldName},#{item.paramCode}, #{item.paramValue}, #{item.countDate}, #{item.countHour}) + ( #{item.tenantId}, #{item.createdBy}, #{item.createdTime}, #{item.updatedBy}, #{item.updatedTime}, #{item.deleteBy}, #{item.deleteTime}, #{item.id}, #{item.billNo}, #{item.assetCode}, #{item.assetName}, #{item.fieldCode}, #{item.fieldName},#{item.paramCode}, #{item.paramValue}, #{item.countDate}, #{item.countHour},#{item.paramName}) \ No newline at end of file diff --git a/lzbi-module/src/main/resources/mapper/asset/DcBusiParamBillSubMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBusiParamBillSubMapper.xml index d4332c6..0a6c769 100644 --- a/lzbi-module/src/main/resources/mapper/asset/DcBusiParamBillSubMapper.xml +++ b/lzbi-module/src/main/resources/mapper/asset/DcBusiParamBillSubMapper.xml @@ -14,7 +14,8 @@ - + + @@ -50,7 +51,8 @@ bill_no, asset_code, asset_name, - field_type, + field_code, + field_name, param_name, param_code, param_uint, @@ -74,7 +76,8 @@ and bill_no = #{billNo} and asset_code = #{assetCode} and asset_name = #{assetName} - and field_type = #{fieldType} + and field_code = #{fieldCode} + and field_name = #{fieldName} and param_name = #{paramName} and param_code = #{paramCode} and param_uint = #{paramUint} @@ -99,7 +102,8 @@ bill_no, asset_code, asset_name, - field_type, + field_code, + field_name, param_name, param_code, param_uint, @@ -120,7 +124,8 @@ #{billNo}, #{assetCode}, #{assetName}, - #{fieldType}, + #{fieldCode}, + #{fieldName}, #{paramName}, #{paramCode}, #{paramUint}, diff --git a/lzbi-module/src/main/resources/mapper/draft/DcBusiBillModelMasterMapper.xml b/lzbi-module/src/main/resources/mapper/draft/DcBusiBillModelMasterMapper.xml index 4a4a3ed..923954b 100644 --- a/lzbi-module/src/main/resources/mapper/draft/DcBusiBillModelMasterMapper.xml +++ b/lzbi-module/src/main/resources/mapper/draft/DcBusiBillModelMasterMapper.xml @@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + and bill_no = #{billNo} + and target_name like concat('%', #{targetName}, '%') + and target_code = #{targetCode} + and target_uint = #{targetUint} + and target_value = #{targetValue} + and count_date = #{countDate} + and count_day = #{countDay} + and field_code = #{fieldCode} + and field_name like concat('%', #{fieldName}, '%') + and asset_code = #{assetCode} + and asset_name like concat('%', #{assetName}, '%') + + + + + + + insert into dc_busi_target_bill_sub + + 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, + + + #{billNo}, + #{targetName}, + #{targetCode}, + #{targetUint}, + #{targetValue}, + #{countDate}, + #{countDay}, + #{fieldCode}, + #{fieldName}, + #{assetCode}, + #{assetName}, + #{tenantId}, + #{revision}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + #{deleteBy}, + #{deleteTime}, + + + + + update dc_busi_target_bill_sub + + bill_no = #{billNo}, + target_name = #{targetName}, + target_code = #{targetCode}, + target_uint = #{targetUint}, + target_value = #{targetValue}, + count_date = #{countDate}, + count_day = #{countDay}, + field_code = #{fieldCode}, + field_name = #{fieldName}, + asset_code = #{assetCode}, + asset_name = #{assetName}, + tenant_id = #{tenantId}, + revision = #{revision}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + delete_by = #{deleteBy}, + delete_time = #{deleteTime}, + + where id = #{id} + + + + delete from dc_busi_target_bill_sub where id = #{id} + + + + delete from dc_busi_target_bill_sub where id in + + #{id} + + + \ No newline at end of file diff --git a/lzbi-module/src/main/resources/mapper/targetFolder/DcBaseAssetTargetMapper.xml b/lzbi-module/src/main/resources/mapper/targetFolder/DcBaseAssetTargetMapper.xml index cfc5b45..8efca09 100644 --- a/lzbi-module/src/main/resources/mapper/targetFolder/DcBaseAssetTargetMapper.xml +++ b/lzbi-module/src/main/resources/mapper/targetFolder/DcBaseAssetTargetMapper.xml @@ -1,7 +1,7 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> @@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -28,29 +28,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + - 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 + select id, asset_code, asset_id, target_model_code, target_name, target_name_alias, target_code, field_code, 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, field_name, column_type, field_unit, dept_id, user_id from dc_base_asset_target -