1.同比/环比率,分子为零则默认增长率为100%

2.增加配置信心(处理工艺)

src/main/java/com/tofly/nb/sew/mapper/SysChildCodeMapper.java

@@ -0,0 +1,16 @@
+package com.tofly.nb.sew.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tofly.nb.sew.model.po.SysChildCode;
+
+/**
+ * <p>
+ * 子集编码表 Mapper 接口
+ * </p>
+ *
+ * @author Zev
+ * @since 2020-12-29
+ */
+public interface SysChildCodeMapper extends BaseMapper<SysChildCode> {
+
+}

src/main/java/com/tofly/nb/sew/model/po/SysChildCode.java

@@ -0,0 +1,57 @@
+package com.tofly.nb.sew.model.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 子集编码表
+ * </p>
+ *
+ * @author Zev
+ * @since 2020-12-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("sys_child_code")
+@ApiModel(value="SysChildCode对象", description="子集编码表")
+public class SysChildCode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键编号")
+    @TableId("CCID")
+    private Long ccid;
+
+    @ApiModelProperty(value = "编码")
+    @TableField("CCCODE")
+    private String cccode;
+
+    @ApiModelProperty(value = "名称")
+    @TableField("CCNAME")
+    private String ccname;
+
+    @ApiModelProperty(value = "注释")
+    @TableField("CCCONTENT")
+    private String cccontent;
+
+    @ApiModelProperty(value = "是否禁用(0=禁用,1=启用)")
+    @TableField("CCDISABLE")
+    private String ccdisable;
+
+    @ApiModelProperty(value = "父级编号")
+    @TableField("PCID")
+    private Long pcid;
+
+    @ApiModelProperty(value = "父级名称")
+    @TableField("PCNAME")
+    private String pcname;
+
+
+}

src/main/java/com/tofly/nb/sew/service/ISysChildCodeService.java

@@ -0,0 +1,16 @@
+package com.tofly.nb.sew.service;
+
+import com.tofly.nb.sew.model.po.SysChildCode;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 子集编码表 服务类
+ * </p>
+ *
+ * @author Zev
+ * @since 2020-12-29
+ */
+public interface ISysChildCodeService extends IService<SysChildCode> {
+
+}

src/main/java/com/tofly/nb/sew/service/impl/SsBbMonthServiceImpl.java

@@ -158,7 +158,10 @@ public class SsBbMonthServiceImpl extends ServiceImpl<SsBbMonthMapper, SsBbMonth
         if (!BigDecimal.ZERO.equals(begin)) {
             decimal = (lost.subtract(begin)).divide(begin, 4, BigDecimal.ROUND_HALF_UP);
         }
-
+        if(BigDecimal.ZERO.equals(decimal)){
+            // 分子为零则增长率威100%
+            return new BigDecimal(100);
+        }
 
         return decimal.multiply(BigDecimal.valueOf(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
     }

src/main/java/com/tofly/nb/sew/service/impl/StpOverviewServiceImpl.java

@@ -46,7 +46,7 @@ public class StpOverviewServiceImpl implements IStpOverviewService {
         // 污水处理统计 同比数据 环比数据
         CompareRatesVo compareRatesVo = new CompareRatesVo();
         compareRatesVo.setSameRate(iSsBbMonthService.comparedAndSequentialData(yearDetail, beginDate, lostDate));
-        compareRatesVo.setLoopRate(iSsBbMonthService.comparedAndSequentialData(yearDetail, beginDate, onLostDate));
+        compareRatesVo.setLoopRate(iSsBbMonthService.comparedAndSequentialData(yearDetail, onLostDate, lostDate));
 
         // Top10月生产排名统计
         List<MonthRankingVo> rankingVos = iSsBbMonthService.monthRanking(yearDetail);

src/main/java/com/tofly/nb/sew/service/impl/SysChildCodeServiceImpl.java

@@ -0,0 +1,42 @@
+package com.tofly.nb.sew.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.tofly.nb.sew.mapper.SysChildCodeMapper;
+import com.tofly.nb.sew.model.po.SysChildCode;
+import com.tofly.nb.sew.service.ISysChildCodeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 子集编码表 服务实现类
+ * </p>
+ *
+ * @author Zev
+ * @since 2020-12-29
+ */
+@Service
+public class SysChildCodeServiceImpl extends ServiceImpl<SysChildCodeMapper, SysChildCode> implements ISysChildCodeService {
+
+    @Autowired
+    private SysChildCodeMapper sysChildCodeMapper;
+
+    private List<SysChildCode> t(String cccode, String ccdisable, Long pcid){
+        QueryWrapper<SysChildCode> queryWrapper = new QueryWrapper<>();
+        // 根据 父级编号 编码 是否禁用(0=禁用,1=启用) 获取对应属性值列表
+        if(!StringUtils.isEmpty(cccode)){
+            queryWrapper.eq("cccode",cccode);
+        }
+        if(!StringUtils.isEmpty(ccdisable)){
+            queryWrapper.eq("ccdisable",ccdisable);
+        }
+        if(!StringUtils.isEmpty(pcid)){
+            queryWrapper.eq("pcid",pcid);
+        }
+        return sysChildCodeMapper.selectList(queryWrapper);
+    }
+}

src/main/resources/mapper/SysChildCodeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tofly.nb.sew.mapper.SysChildCodeMapper">
+
+</mapper>