From 89329db59b76ba67973a0a9f27767976f7fbe8f6 Mon Sep 17 00:00:00 2001 From: chenweiwei Date: Thu, 30 May 2024 13:37:07 +0800 Subject: [PATCH] 基础信息-金额 --- zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicMoneyController.java | 191 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McBasicMoney.java | 522 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicMoneyVo.java | 27 +++++++++++++++++++++++++++ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicMoneyMapper.java | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcBasicMoneyService.java | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicMoneyServiceImpl.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicMoneyMapper.xml | 259 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 1229 insertions(+), 0 deletions(-) create mode 100644 zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicMoneyController.java create mode 100644 zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McBasicMoney.java create mode 100644 zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicMoneyVo.java create mode 100644 zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicMoneyMapper.java create mode 100644 zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcBasicMoneyService.java create mode 100644 zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicMoneyServiceImpl.java create mode 100644 zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicMoneyMapper.xml diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicMoneyController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicMoneyController.java new file mode 100644 index 0000000..6283efc --- /dev/null +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicMoneyController.java @@ -0,0 +1,191 @@ +package com.chinagas.modules.schsf.controller; + +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.util.MapUtils; +import com.alibaba.fastjson2.JSON; +import com.alibaba.nacos.common.utils.CollectionUtils; +import com.chinagas.common.core.domain.AjaxResult; +import com.chinagas.common.core.web.controller.BaseController; +import com.chinagas.common.core.web.page.TableDataInfo; +import com.chinagas.common.log.annotation.Log; +import com.chinagas.common.log.enums.BusinessType; +import com.chinagas.common.security.annotation.RequirePermission; +import com.chinagas.modules.schsf.domain.McBasicMoney; +import com.chinagas.modules.schsf.domain.vo.McBasicMoneyVo; +import com.chinagas.modules.schsf.service.IMcBasicMoneyService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.net.URLEncoder; +import java.sql.SQLIntegrityConstraintViolationException; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + + +/** + * 基础数据-金额Controller + * + * @author lidwd + * @date 2024-05-23 + */ +@RestController +@RequestMapping("/mcBasicMoney") +public class McBasicMoneyController extends BaseController { + @Autowired + private IMcBasicMoneyService mcBasicMoneyService; + + /** + * 查询基础数据-金额列表 + */ + @RequirePermission("schsf:mcBasicMoney:list") + @GetMapping("/list") + public TableDataInfo list(McBasicMoneyVo mcBasicMoneyVo) { + startPage(); + List list = mcBasicMoneyService.selectMcBasicMoneyList(mcBasicMoneyVo); + return getDataTable(list); + } + + + /** + * 导入基础数据-金额数据 + * + * @param file + * @return + */ + @RequirePermission("schsf:mcBasicMoney:importData") + @PostMapping("/importData") + public AjaxResult importData(MultipartFile file) { + if (file.isEmpty()) { + throw new RuntimeException("文件不能为空"); + } + if (!"xls,xlsx".contains(file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1, file.getOriginalFilename().length()))) { + throw new RuntimeException("只支持excel文件上传"); + } + //限制文件5M + if (file.getSize() > 5000 * 1024) { + throw new RuntimeException("文件大小不得超过5M"); + } + try { + // 获取文件的输入流 + InputStream inputStream = file.getInputStream(); + List list = EasyExcel.read(inputStream) //调用read方法 + // 注册自定义监听器，字段校验可以在监听器内实现 + .head(McBasicMoney.class) // 对应导入的实体类 + .sheet(0) // 导入数据的sheet页编号，0代表第一个sheet页，如果不填，则会导入所有sheet页的数据 + .headRowNumber(4) // 列表头行数，1代表列表头有1行，第二行开始为数据行 + .doReadSync(); // 开始读Excel，返回一个List集合，继续后续入库操作 + + // 检验重复数据 + Map> collect = list.stream().collect(Collectors.groupingBy(o -> + o.getRegionName() + + o.getGroupName() + + o.getCompanyName() + + o.getCompanyCode() + )); + Set strings = collect.keySet(); + if (strings.size() < list.size()) { + throw new RuntimeException("表格中存在重复的数据"); + } + // 插入数据库 + if (CollectionUtils.isNotEmpty(list)) { + for (McBasicMoney mcBasicCmty : list) { + mcBasicMoneyService.insertMcBasicMoney(mcBasicCmty); + System.out.println(list); + } + } + } catch (Exception e) { + Throwable cause = e.getCause(); + if (cause instanceof SQLIntegrityConstraintViolationException) { + String errMsg = (cause).getMessage(); + if (StringUtils.isNotEmpty(errMsg) && errMsg.contains("uniq_address")) { + // 找到第一个引号的索引 + int startIndex = errMsg.indexOf("\'"); + // 找到第二个引号的索引 + int endIndex = errMsg.indexOf("\'", startIndex + 1); + // 提取引号之间的内容 + String content = errMsg.substring(startIndex + 1, endIndex); + throw new RuntimeException("系统中存在相同信息: " + content); + } + } + throw new RuntimeException(e); + } + return AjaxResult.success("数据导入成功"); + } + + + /** + * 导出基础数据-金额列表 + */ + @RequirePermission("schsf:mcBasicMoney:export") + @Log(title = "基础数据-金额", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, McBasicMoneyVo mcBasicMoneyVo) throws IOException { + List list = mcBasicMoneyService.selectMcBasicMoneyList(mcBasicMoneyVo); + try { + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 + String fileName = URLEncoder.encode("基础数据-金额", "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + // 这里需要设置不关闭流 + EasyExcel.write(response.getOutputStream(), McBasicMoney.class).autoCloseStream(Boolean.FALSE).sheet("客户信息列表") + .doWrite(list); + } catch (Exception e) { + // 重置response + e.printStackTrace(); + response.reset(); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + Map map = MapUtils.newHashMap(); + map.put("status", "failure"); + map.put("message", "下载文件失败" + e.getMessage()); + response.getWriter().println(JSON.toJSONString(map)); + } + } + + /** + * 获取基础数据-金额详细信息 + */ + @RequirePermission("schsf:mcBasicMoney:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(mcBasicMoneyService.selectMcBasicMoneyById(id)); + } + + /** + * 新增基础数据-金额 + */ + @RequirePermission("schsf:mcBasicMoney:add") + @Log(title = "基础数据-金额", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody McBasicMoney mcBasicMoney) { + return toAjax(mcBasicMoneyService.insertMcBasicMoney(mcBasicMoney)); + } + + /** + * 修改基础数据-金额 + */ + @RequirePermission("schsf:mcBasicMoney:edit") + @Log(title = "基础数据-金额", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody McBasicMoney mcBasicMoney) { + return toAjax(mcBasicMoneyService.updateMcBasicMoney(mcBasicMoney)); + } + + /** + * 删除基础数据-金额 + */ + @RequirePermission("schsf:mcBasicMoney:remove") + @Log(title = "基础数据-金额", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(mcBasicMoneyService.deleteMcBasicMoneyByIds(ids)); + } +} diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McBasicMoney.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McBasicMoney.java new file mode 100644 index 0000000..9421c44 --- /dev/null +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McBasicMoney.java @@ -0,0 +1,522 @@ +package com.chinagas.modules.schsf.domain; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.chinagas.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; + +/** + * 基础数据-金额对象 mc_basic_money + * + * @author lidwd + * @date 2024-05-23 + */ +@ExcelIgnoreUnannotated +public class McBasicMoney extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键id */ + private Long id; + + /** 财年 */ + @ExcelProperty(index = 0,value = "财年") + private Long fiscalYear; + + /** 区域名称 */ + @ExcelProperty(index = 1,value = "区域名称") + private String regionName; + + /** 集团名称 */ + @ExcelProperty(index = 2,value = "集团名称") + private String groupName; + + /** 公司名称 */ + @ExcelProperty(index = 3,value = "公司名称") + private String companyName; + + /** 公司代码 */ + @ExcelProperty(index = 4,value = "公司代码") + private String companyCode; + + /** 省 */ + @ExcelProperty(index = 5,value = "省") + private String province; + + /** 市 */ + @ExcelProperty(index = 6,value = "市") + private String city; + + /** 区 */ + @ExcelProperty(index = 7,value = "区") + private String district; + + /** 街道 */ + @ExcelProperty(index = 8,value = "街道") + private String street; + + /** 村(小区) */ + @ExcelProperty(index = 9,value = "村(小区)") + private String vlgOrCmty; + + /** 负责人 */ + @ExcelProperty(index = 10,value = "负责人") + private String respPerson; + + /** 城乡分类 */ + @ExcelProperty(index = 11,value = "城乡分类") + private String urbRurCls; + + /** 财务确认预算数-财年初财务确认往年应收 */ + @ExcelProperty(index = 12,value = "财务确认预算数-财年初财务确认往年应收") + private BigDecimal budgConfPrev; + + /** 财务确认预算数-本年新增 */ + @ExcelProperty(index = 13,value = "财务确认预算数-本年新增") + private BigDecimal budgConfNew; + + /** 财务确认预算数-总预算金额 */ + @ExcelProperty(index = 14,value = "财务确认预算数-总预算金额") + private BigDecimal budgTotal; + + /** 季度目标(到公司四个季度)已收费户数 */ + @ExcelProperty(index = 15,value = "季度目标(到公司四个季度)已收费户数") + private BigDecimal quarterlyTarget; + + /** 纳入政府补贴金额-已收费户数 */ + @ExcelProperty(index = 16,value = "纳入政府补贴金额-已收费户数") + private BigDecimal cnyGsgCharged; + + /** 纳入政府补贴金额-未收费户数 */ + @ExcelProperty(index = 17,value = "纳入政府补贴金额-未收费户数") + private BigDecimal cnyGsgUncharged; + + /** 纳入政府补贴金额-合计 */ + @ExcelProperty(index = 18,value = "纳入政府补贴金额-合计") + private BigDecimal cnyGsgTotal; + + /** 市场化收费金额 - 本年新增金额 - 全款户数 */ + @ExcelProperty(index = 19,value = "市场化收费金额 - 本年新增金额 - 全款户数") + private BigDecimal cnyYrFull; + + /** 市场化收费金额 - 本年新增金额 - 分期户数 */ + @ExcelProperty(index = 20,value = "市场化收费金额 - 本年新增金额 - 分期户数") + private BigDecimal cnyYrInstal; + + /** 往年应收金额-已收费户数-全款户数 */ + @ExcelProperty(index = 21,value = "往年应收金额-已收费户数-全款户数") + private BigDecimal cnyPrevFull; + + /** 往年应收金额-已收费户数-分期/定金户数 */ + @ExcelProperty(index = 22,value = "往年应收金额-已收费户数-分期/定金户数") + private BigDecimal cnyPrevInstall; + + /** 评价指标-市场化累计回款 */ + @ExcelProperty(index = 23,value = "评价指标-市场化累计回款") + private BigDecimal cnyMarketCumr; + + /** 评价指标-财年累计回款 */ + @ExcelProperty(index = 24,value = "评价指标-财年累计回款") + private BigDecimal cnyFyCumReturn; + + /** 评价指标-全款累计回款 */ + @ExcelProperty(index = 25,value = "评价指标-全款累计回款") + private BigDecimal cnyFpCumReturn; + + /** 评价指标-分期累计回款 */ + @ExcelProperty(index = 26,value = "评价指标-分期累计回款") + private BigDecimal cnyInstCumReturn; + + /** 评价指标-本年新增累计回款 */ + @ExcelProperty(index = 27,value = "评价指标-本年新增累计回款") + private BigDecimal cnyNewCumReturn; + + /** 评价指标-往年应收累计回款 */ + @ExcelProperty(index = 28,value = "评价指标-往年应收累计回款") + private BigDecimal cnyRcvblsCumReturn; + + /** 评价指标-预算完成率 */ + @ExcelProperty(index = 29,value = "评价指标-预算完成率") + private BigDecimal cnyBdgtCmplRate; + + /** 评价指标-应收账款完成率 */ + @ExcelProperty(index = 30,value = "评价指标-应收账款完成率") + private BigDecimal cnyRcvblsCmplRate; + + /** 评价指标-本年新增完成率 */ + @ExcelProperty(index = 31,value = "评价指标-本年新增完成率") + private BigDecimal cnyCynCmplRate; + + /** 评价指标-阶段性目标完成率 */ + @ExcelProperty(index = 32,value = "评价指标-阶段性目标完成率") + private BigDecimal cnyPtCmplRate; + + /** 删除标志（0：未删除，1：已删除） */ + @ExcelProperty(value = "删除标志") + private String defFlag; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setFiscalYear(Long fiscalYear) + { + this.fiscalYear = fiscalYear; + } + + public Long getFiscalYear() + { + return fiscalYear; + } + public void setRegionName(String regionName) + { + this.regionName = regionName; + } + + public String getRegionName() + { + return regionName; + } + public void setGroupName(String groupName) + { + this.groupName = groupName; + } + + public String getGroupName() + { + return groupName; + } + public void setCompanyName(String companyName) + { + this.companyName = companyName; + } + + public String getCompanyName() + { + return companyName; + } + public void setCompanyCode(String companyCode) + { + this.companyCode = companyCode; + } + + public String getCompanyCode() + { + return companyCode; + } + public void setProvince(String province) + { + this.province = province; + } + + public String getProvince() + { + return province; + } + public void setCity(String city) + { + this.city = city; + } + + public String getCity() + { + return city; + } + public void setDistrict(String district) + { + this.district = district; + } + + public String getDistrict() + { + return district; + } + public void setStreet(String street) + { + this.street = street; + } + + public String getStreet() + { + return street; + } + public void setVlgOrCmty(String vlgOrCmty) + { + this.vlgOrCmty = vlgOrCmty; + } + + public String getVlgOrCmty() + { + return vlgOrCmty; + } + public void setRespPerson(String respPerson) + { + this.respPerson = respPerson; + } + + public String getRespPerson() + { + return respPerson; + } + public void setUrbRurCls(String urbRurCls) + { + this.urbRurCls = urbRurCls; + } + + public String getUrbRurCls() + { + return urbRurCls; + } + public void setBudgConfPrev(BigDecimal budgConfPrev) + { + this.budgConfPrev = budgConfPrev; + } + + public BigDecimal getBudgConfPrev() + { + return budgConfPrev; + } + public void setBudgConfNew(BigDecimal budgConfNew) + { + this.budgConfNew = budgConfNew; + } + + public BigDecimal getBudgConfNew() + { + return budgConfNew; + } + public void setBudgTotal(BigDecimal budgTotal) + { + this.budgTotal = budgTotal; + } + + public BigDecimal getBudgTotal() + { + return budgTotal; + } + public void setQuarterlyTarget(BigDecimal quarterlyTarget) + { + this.quarterlyTarget = quarterlyTarget; + } + + public BigDecimal getQuarterlyTarget() + { + return quarterlyTarget; + } + public void setCnyGsgCharged(BigDecimal cnyGsgCharged) + { + this.cnyGsgCharged = cnyGsgCharged; + } + + public BigDecimal getCnyGsgCharged() + { + return cnyGsgCharged; + } + public void setCnyGsgUncharged(BigDecimal cnyGsgUncharged) + { + this.cnyGsgUncharged = cnyGsgUncharged; + } + + public BigDecimal getCnyGsgUncharged() + { + return cnyGsgUncharged; + } + public void setCnyGsgTotal(BigDecimal cnyGsgTotal) + { + this.cnyGsgTotal = cnyGsgTotal; + } + + public BigDecimal getCnyGsgTotal() + { + return cnyGsgTotal; + } + public void setCnyYrFull(BigDecimal cnyYrFull) + { + this.cnyYrFull = cnyYrFull; + } + + public BigDecimal getCnyYrFull() + { + return cnyYrFull; + } + public void setCnyYrInstal(BigDecimal cnyYrInstal) + { + this.cnyYrInstal = cnyYrInstal; + } + + public BigDecimal getCnyYrInstal() + { + return cnyYrInstal; + } + public void setCnyPrevFull(BigDecimal cnyPrevFull) + { + this.cnyPrevFull = cnyPrevFull; + } + + public BigDecimal getCnyPrevFull() + { + return cnyPrevFull; + } + public void setCnyPrevInstall(BigDecimal cnyPrevInstall) + { + this.cnyPrevInstall = cnyPrevInstall; + } + + public BigDecimal getCnyPrevInstall() + { + return cnyPrevInstall; + } + public void setCnyMarketCumr(BigDecimal cnyMarketCumr) + { + this.cnyMarketCumr = cnyMarketCumr; + } + + public BigDecimal getCnyMarketCumr() + { + return cnyMarketCumr; + } + public void setCnyFyCumReturn(BigDecimal cnyFyCumReturn) + { + this.cnyFyCumReturn = cnyFyCumReturn; + } + + public BigDecimal getCnyFyCumReturn() + { + return cnyFyCumReturn; + } + public void setCnyFpCumReturn(BigDecimal cnyFpCumReturn) + { + this.cnyFpCumReturn = cnyFpCumReturn; + } + + public BigDecimal getCnyFpCumReturn() + { + return cnyFpCumReturn; + } + public void setCnyInstCumReturn(BigDecimal cnyInstCumReturn) + { + this.cnyInstCumReturn = cnyInstCumReturn; + } + + public BigDecimal getCnyInstCumReturn() + { + return cnyInstCumReturn; + } + public void setCnyNewCumReturn(BigDecimal cnyNewCumReturn) + { + this.cnyNewCumReturn = cnyNewCumReturn; + } + + public BigDecimal getCnyNewCumReturn() + { + return cnyNewCumReturn; + } + public void setCnyRcvblsCumReturn(BigDecimal cnyRcvblsCumReturn) + { + this.cnyRcvblsCumReturn = cnyRcvblsCumReturn; + } + + public BigDecimal getCnyRcvblsCumReturn() + { + return cnyRcvblsCumReturn; + } + public void setCnyBdgtCmplRate(BigDecimal cnyBdgtCmplRate) + { + this.cnyBdgtCmplRate = cnyBdgtCmplRate; + } + + public BigDecimal getCnyBdgtCmplRate() + { + return cnyBdgtCmplRate; + } + public void setCnyRcvblsCmplRate(BigDecimal cnyRcvblsCmplRate) + { + this.cnyRcvblsCmplRate = cnyRcvblsCmplRate; + } + + public BigDecimal getCnyRcvblsCmplRate() + { + return cnyRcvblsCmplRate; + } + public void setCnyCynCmplRate(BigDecimal cnyCynCmplRate) + { + this.cnyCynCmplRate = cnyCynCmplRate; + } + + public BigDecimal getCnyCynCmplRate() + { + return cnyCynCmplRate; + } + public void setCnyPtCmplRate(BigDecimal cnyPtCmplRate) + { + this.cnyPtCmplRate = cnyPtCmplRate; + } + + public BigDecimal getCnyPtCmplRate() + { + return cnyPtCmplRate; + } + public void setDefFlag(String defFlag) + { + this.defFlag = defFlag; + } + + public String getDefFlag() + { + return defFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("fiscalYear", getFiscalYear()) + .append("regionName", getRegionName()) + .append("groupName", getGroupName()) + .append("companyName", getCompanyName()) + .append("companyCode", getCompanyCode()) + .append("province", getProvince()) + .append("city", getCity()) + .append("district", getDistrict()) + .append("street", getStreet()) + .append("vlgOrCmty", getVlgOrCmty()) + .append("respPerson", getRespPerson()) + .append("urbRurCls", getUrbRurCls()) + .append("budgConfPrev", getBudgConfPrev()) + .append("budgConfNew", getBudgConfNew()) + .append("budgTotal", getBudgTotal()) + .append("quarterlyTarget", getQuarterlyTarget()) + .append("cnyGsgCharged", getCnyGsgCharged()) + .append("cnyGsgUncharged", getCnyGsgUncharged()) + .append("cnyGsgTotal", getCnyGsgTotal()) + .append("cnyYrFull", getCnyYrFull()) + .append("cnyYrInstal", getCnyYrInstal()) + .append("cnyPrevFull", getCnyPrevFull()) + .append("cnyPrevInstall", getCnyPrevInstall()) + .append("cnyMarketCumr", getCnyMarketCumr()) + .append("cnyFyCumReturn", getCnyFyCumReturn()) + .append("cnyFpCumReturn", getCnyFpCumReturn()) + .append("cnyInstCumReturn", getCnyInstCumReturn()) + .append("cnyNewCumReturn", getCnyNewCumReturn()) + .append("cnyRcvblsCumReturn", getCnyRcvblsCumReturn()) + .append("cnyBdgtCmplRate", getCnyBdgtCmplRate()) + .append("cnyRcvblsCmplRate", getCnyRcvblsCmplRate()) + .append("cnyCynCmplRate", getCnyCynCmplRate()) + .append("cnyPtCmplRate", getCnyPtCmplRate()) + .append("remark", getRemark()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .append("updateTime", getUpdateTime()) + .append("updateBy", getUpdateBy()) + .append("defFlag", getDefFlag()) + .toString(); + } +} diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicMoneyVo.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicMoneyVo.java new file mode 100644 index 0000000..01c2d60 --- /dev/null +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicMoneyVo.java @@ -0,0 +1,27 @@ +package com.chinagas.modules.schsf.domain.vo; + +import com.chinagas.modules.schsf.domain.McBasicMoney; + +public class McBasicMoneyVo extends McBasicMoney { + /** 开始财年 */ + private Long startFiscalYear; + + /** 结束财年 */ + private Long finishFiscalYear; + + public Long getStartFiscalYear() { + return startFiscalYear; + } + + public void setStartFiscalYear(Long startFiscalYear) { + this.startFiscalYear = startFiscalYear; + } + + public Long getFinishFiscalYear() { + return finishFiscalYear; + } + + public void setFinishFiscalYear(Long finishFiscalYear) { + this.finishFiscalYear = finishFiscalYear; + } +} diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicMoneyMapper.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicMoneyMapper.java new file mode 100644 index 0000000..140fa2e --- /dev/null +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicMoneyMapper.java @@ -0,0 +1,63 @@ +package com.chinagas.modules.schsf.mapper; + +import com.chinagas.modules.schsf.domain.McBasicMoney; +import com.chinagas.modules.schsf.domain.vo.McBasicMoneyVo; + +import java.util.List; + +/** + * 基础数据-金额Mapper接口 + * + * @author lidwd + * @date 2024-05-23 + */ +public interface McBasicMoneyMapper +{ + /** + * 查询基础数据-金额 + * + * @param id 基础数据-金额主键 + * @return 基础数据-金额 + */ + public McBasicMoney selectMcBasicMoneyById(Long id); + + /** + * 查询基础数据-金额列表 + * + * @param mcBasicMoney 基础数据-金额 + * @return 基础数据-金额集合 + */ + public List selectMcBasicMoneyList(McBasicMoneyVo mcBasicMoney); + + /** + * 新增基础数据-金额 + * + * @param mcBasicMoney 基础数据-金额 + * @return 结果 + */ + public int insertMcBasicMoney(McBasicMoney mcBasicMoney); + + /** + * 修改基础数据-金额 + * + * @param mcBasicMoney 基础数据-金额 + * @return 结果 + */ + public int updateMcBasicMoney(McBasicMoney mcBasicMoney); + + /** + * 删除基础数据-金额 + * + * @param id 基础数据-金额主键 + * @return 结果 + */ + public int deleteMcBasicMoneyById(Long id); + + /** + * 批量删除基础数据-金额 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMcBasicMoneyByIds(Long[] ids); +} diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcBasicMoneyService.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcBasicMoneyService.java new file mode 100644 index 0000000..1efb44d --- /dev/null +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcBasicMoneyService.java @@ -0,0 +1,63 @@ +package com.chinagas.modules.schsf.service; + +import com.chinagas.modules.schsf.domain.McBasicMoney; +import com.chinagas.modules.schsf.domain.vo.McBasicMoneyVo; + +import java.util.List; + +/** + * 基础数据-金额Service接口 + * + * @author lidwd + * @date 2024-05-23 + */ +public interface IMcBasicMoneyService +{ + /** + * 查询基础数据-金额 + * + * @param id 基础数据-金额主键 + * @return 基础数据-金额 + */ + public McBasicMoney selectMcBasicMoneyById(Long id); + + /** + * 查询基础数据-金额列表 + * + * @param mcBasicMoneyVo 基础数据-金额 + * @return 基础数据-金额集合 + */ + public List selectMcBasicMoneyList(McBasicMoneyVo mcBasicMoneyVo); + + /** + * 新增基础数据-金额 + * + * @param mcBasicMoney 基础数据-金额 + * @return 结果 + */ + public int insertMcBasicMoney(McBasicMoney mcBasicMoney); + + /** + * 修改基础数据-金额 + * + * @param mcBasicMoney 基础数据-金额 + * @return 结果 + */ + public int updateMcBasicMoney(McBasicMoney mcBasicMoney); + + /** + * 批量删除基础数据-金额 + * + * @param ids 需要删除的基础数据-金额主键集合 + * @return 结果 + */ + public int deleteMcBasicMoneyByIds(Long[] ids); + + /** + * 删除基础数据-金额信息 + * + * @param id 基础数据-金额主键 + * @return 结果 + */ + public int deleteMcBasicMoneyById(Long id); +} diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicMoneyServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicMoneyServiceImpl.java new file mode 100644 index 0000000..f38858a --- /dev/null +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicMoneyServiceImpl.java @@ -0,0 +1,104 @@ +package com.chinagas.modules.schsf.service.impl; + +import com.chinagas.common.core.utils.DateUtils; +import com.chinagas.common.datascope.annotation.DataScope; +import com.chinagas.common.security.utils.SecurityUtils; +import com.chinagas.modules.schsf.domain.McBasicMoney; +import com.chinagas.modules.schsf.domain.vo.McBasicMoneyVo; +import com.chinagas.modules.schsf.mapper.McBasicMoneyMapper; +import com.chinagas.modules.schsf.service.IMcBasicMoneyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 基础数据-金额Service业务层处理 + * + * @author lidwd + * @date 2024-05-23 + */ +@Service +public class McBasicMoneyServiceImpl implements IMcBasicMoneyService +{ + @Autowired + private McBasicMoneyMapper mcBasicMoneyMapper; + + /** + * 查询基础数据-金额 + * + * @param id 基础数据-金额主键 + * @return 基础数据-金额 + */ + @Override + public McBasicMoney selectMcBasicMoneyById(Long id) + { + return mcBasicMoneyMapper.selectMcBasicMoneyById(id); + } + + /** + * 查询基础数据-金额列表 + * + * @param mcBasicMoneyVo 基础数据-金额 + * @return 基础数据-金额 + */ + @DataScope(deptAlias = "d", userAlias = "u") + @Override + public List selectMcBasicMoneyList(McBasicMoneyVo mcBasicMoneyVo) + { + return mcBasicMoneyMapper.selectMcBasicMoneyList(mcBasicMoneyVo); + } + + /** + * 新增基础数据-金额 + * + * @param mcBasicMoney 基础数据-金额 + * @return 结果 + */ + @Override + public int insertMcBasicMoney(McBasicMoney mcBasicMoney) + { + mcBasicMoney.setCreateTime(DateUtils.getNowLocal()); + mcBasicMoney.setCreateBy(SecurityUtils.getUserId().toString()); + mcBasicMoney.setUpdateTime(DateUtils.getNowLocal()); + mcBasicMoney.setUpdateBy(SecurityUtils.getUserId().toString()); + return mcBasicMoneyMapper.insertMcBasicMoney(mcBasicMoney); + } + + /** + * 修改基础数据-金额 + * + * @param mcBasicMoney 基础数据-金额 + * @return 结果 + */ + @Override + public int updateMcBasicMoney(McBasicMoney mcBasicMoney) + { + mcBasicMoney.setUpdateTime(DateUtils.getNowLocal()); + return mcBasicMoneyMapper.updateMcBasicMoney(mcBasicMoney); + } + + /** + * 批量删除基础数据-金额 + * + * @param ids 需要删除的基础数据-金额主键 + * @return 结果 + */ + @Override + public int deleteMcBasicMoneyByIds(Long[] ids) + { + return mcBasicMoneyMapper.deleteMcBasicMoneyByIds(ids); + } + + /** + * 删除基础数据-金额信息 + * + * @param id 基础数据-金额主键 + * @return 结果 + */ + @Override + public int deleteMcBasicMoneyById(Long id) + { + return mcBasicMoneyMapper.deleteMcBasicMoneyById(id); + } +} diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicMoneyMapper.xml b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicMoneyMapper.xml new file mode 100644 index 0000000..0427bb6 --- /dev/null +++ b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicMoneyMapper.xml @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select t.id, t.fiscal_year, t.region_name, t.group_name, t.company_name, t.company_code, t.province, + t.city, t.district, t.street, t.vlg_or_cmty, t.resp_person, t.urb_rur_cls, t.budg_conf_prev, + t.budg_conf_new, t.budg_total, t.quarterly_target, t.cny_gsg_charged, t.cny_gsg_uncharged, + t.cny_gsg_total, t.cny_yr_full, t.cny_yr_instal, t.cny_prev_full, + t.cny_prev_install, t.cny_market_cumr, t.cny_fy_cum_return, + t.cny_fp_cum_return, t.cny_inst_cum_return, t.cny_new_cum_return, + t.cny_rcvbls_cum_return, t.cny_bdgt_cmpl_rate, + t.cny_rcvbls_cmpl_rate, t.cny_cyn_cmpl_rate, + t.cny_pt_cmpl_rate, t.remark, t.create_time, t.create_by, + t.update_time, t.update_by, t.def_flag + from mc_basic_money t + left join sys_user u on u.user_id = t.create_by + left join sys_dept d on d.dept_id = t.company_code + + + + + + + + insert into mc_basic_money + + id, + fiscal_year, + region_name, + group_name, + company_name, + company_code, + province, + city, + district, + street, + vlg_or_cmty, + resp_person, + urb_rur_cls, + budg_conf_prev, + budg_conf_new, + budg_total, + quarterly_target, + cny_gsg_charged, + cny_gsg_uncharged, + cny_gsg_total, + cny_yr_full, + cny_yr_instal, + cny_prev_full, + cny_prev_install, + cny_market_cumr, + cny_fy_cum_return, + cny_fp_cum_return, + cny_inst_cum_return, + cny_new_cum_return, + cny_rcvbls_cum_return, + cny_bdgt_cmpl_rate, + cny_rcvbls_cmpl_rate, + cny_cyn_cmpl_rate, + cny_pt_cmpl_rate, + remark, + create_time, + create_by, + update_time, + update_by, + def_flag, + + + #{id}, + #{fiscalYear}, + #{regionName}, + #{groupName}, + #{companyName}, + #{companyCode}, + #{province}, + #{city}, + #{district}, + #{street}, + #{vlgOrCmty}, + #{respPerson}, + #{urbRurCls}, + #{budgConfPrev}, + #{budgConfNew}, + #{budgTotal}, + #{quarterlyTarget}, + #{cnyGsgCharged}, + #{cnyGsgUncharged}, + #{cnyGsgTotal}, + #{cnyYrFull}, + #{cnyYrInstal}, + #{cnyPrevFull}, + #{cnyPrevInstall}, + #{cnyMarketCumr}, + #{cnyFyCumReturn}, + #{cnyFpCumReturn}, + #{cnyInstCumReturn}, + #{cnyNewCumReturn}, + #{cnyRcvblsCumReturn}, + #{cnyBdgtCmplRate}, + #{cnyRcvblsCmplRate}, + #{cnyCynCmplRate}, + #{cnyPtCmplRate}, + #{remark}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + #{defFlag}, + + + + + update mc_basic_money + + fiscal_year = #{fiscalYear}, + region_name = #{regionName}, + group_name = #{groupName}, + company_name = #{companyName}, + company_code = #{companyCode}, + province = #{province}, + city = #{city}, + district = #{district}, + street = #{street}, + vlg_or_cmty = #{vlgOrCmty}, + resp_person = #{respPerson}, + urb_rur_cls = #{urbRurCls}, + budg_conf_prev = #{budgConfPrev}, + budg_conf_new = #{budgConfNew}, + budg_total = #{budgTotal}, + quarterly_target = #{quarterlyTarget}, + cny_gsg_charged = #{cnyGsgCharged}, + cny_gsg_uncharged = #{cnyGsgUncharged}, + cny_gsg_total = #{cnyGsgTotal}, + cny_yr_full = #{cnyYrFull}, + cny_yr_instal = #{cnyYrInstal}, + cny_prev_full = #{cnyPrevFull}, + cny_prev_install = #{cnyPrevInstall}, + cny_market_cumr = #{cnyMarketCumr}, + cny_fy_cum_return = #{cnyFyCumReturn}, + cny_fp_cum_return = #{cnyFpCumReturn}, + cny_inst_cum_return = #{cnyInstCumReturn}, + cny_new_cum_return = #{cnyNewCumReturn}, + cny_rcvbls_cum_return = #{cnyRcvblsCumReturn}, + cny_bdgt_cmpl_rate = #{cnyBdgtCmplRate}, + cny_rcvbls_cmpl_rate = #{cnyRcvblsCmplRate}, + cny_cyn_cmpl_rate = #{cnyCynCmplRate}, + cny_pt_cmpl_rate = #{cnyPtCmplRate}, + remark = #{remark}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + def_flag = #{defFlag}, + + where id = #{id} + + + + delete from mc_basic_money where id = #{id} + + + + delete from mc_basic_money where id in + + #{id} + + + -- libgit2 0.21.2