ljx：修改效益评测bug和增加分类筛选

enteprise-admin/src/main/java/com/enteprise/benefit_monitor_assess/service/impl/BusinessMonitorAssessService.java

@@ -35,6 +35,7 @@ public class BusinessMonitorAssessService implements IBusinessMonitorAssessServi
         String season = businessMonitorAssess.getSeason();
         String code = businessMonitorAssess.getCode();
         String enterpriseName = businessMonitorAssess.getEnterpriseName();
+        String typeNum = businessMonitorAssess.getTypeNum();
         //若有企业、行业过滤直接赋值进行筛选
         if (code != null && !code.isEmpty()) {
             dataTotal.setCode(code);
@@ -43,6 +44,10 @@ public class BusinessMonitorAssessService implements IBusinessMonitorAssessServi
         if (enterpriseName != null && !enterpriseName.isEmpty()) {
             dataTotal.setEnterpriseName(enterpriseName);
         }
+        if (typeNum != null && !typeNum.isEmpty()) {
+            dataTotal.setTypeNum(typeNum);
+            _dataTotal.setTypeNum(typeNum);
+        }
         //if趋势分析,获取上一个季度的工业产值、电力消耗、实缴税金、本季度实缴税金
         if (year !=null && !year.isEmpty()) {
             //精确到年份
@@ -61,10 +66,13 @@ public class BusinessMonitorAssessService implements IBusinessMonitorAssessServi
                 }
                 return list;
             }
-            // 无季度值，根据当前日期获取当前季度
+            // 无季度值，根据当前日期获取当前季度和今年的其他季度
             Calendar now = Calendar.getInstance();
             int currentMonth = now.get(Calendar.MONTH) + 1; // 月份从0开始，所以加1
-            int currentQuarter = (currentMonth - 1) / 3 + 1; // 计算当前季度
+            int currentQuarter = 4;
+            if (now.get(Calendar.YEAR ) == Integer.parseInt(year)) {
+                currentQuarter = (currentMonth - 1) / 3 + 1; // 计算当前季度
+            }
             for (int i = currentQuarter; i > 0; i--) {
                 dataTotal.setYear(year);
                 dataTotal.setSeason(String.valueOf(i));
@@ -183,6 +191,7 @@ public class BusinessMonitorAssessService implements IBusinessMonitorAssessServi
                     assess.setSeason(currentData.getSeason());
                     assess.setEnterpriseName(enterpriseName);
                     assess.setCode(currentData.getCode());
+                    assess.setTypeNum(currentData.getTypeNum());
                     // 当前季度和上个季度交税值比较并填充返回的list（指标解耦）
                     if (currentQuarterTaxSum > previousQuarterTaxSum) {
                         //交税大于上季度

enteprise-admin/src/main/java/com/enteprise/industry_run/domain/EnterpriseBaseDataTotal.java

@@ -90,6 +90,16 @@ public class EnterpriseBaseDataTotal extends BaseEntity
     @Excel(name = "月份")
     private String month;
 
+    private String typeNum;
+
+    public String getTypeNum() {
+        return typeNum;
+    }
+
+    public void setTypeNum(String typeNum) {
+        this.typeNum = typeNum;
+    }
+
     public void setId(Double id)
     {
         this.id = id;
@@ -304,6 +314,7 @@ public class EnterpriseBaseDataTotal extends BaseEntity
             .append("year", getYear())
             .append("season", getSeason())
             .append("month", getMonth())
+                .append("typeNum", getTypeNum())
             .toString();
     }
 }

enteprise-admin/src/main/resources/mapper/industry_run/EnterpriseBaseDataTotalMapper.xml

@@ -102,6 +102,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             enterprise_base_data_total a
         left join enterprise b
             on a.enterprise_name = b.enterprise_name
+        <where>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and a.enterprise_name = #{enterpriseName}</if>
+            <if test="location != null  and location != ''"> and a.location = #{location}</if>
+            <if test="code != null  and code != ''"> and a.code = #{code}</if>
+            <if test="totalIndustrialValue != null "> and a.total_industrial_value = #{totalIndustrialValue}</if>
+            <if test="taxableIncome != null "> and a.taxable_income = #{taxableIncome}</if>
+            <if test="paidTax != null "> and a.paid_tax = #{paidTax}</if>
+            <if test="funding != null "> and a.funding = #{funding}</if>
+            <if test="energyConsume != null "> and a.energy_consume = #{energyConsume}</if>
+            <if test="powerConsume != null "> and a.power_consume = #{powerConsume}</if>
+            <if test="year != null  and year != ''"> and a.year = #{year}</if>
+            <if test="season != null  and season != ''"> and a.season = #{season}</if>
+            <if test="month != null  and month != ''"> and a.month = #{month}</if>
+            <if test="typeNum != null  and typeNum != ''"> and b.type_num = #{typeNum}</if>
+        </where>
     </select>
 
     <insert id="insertEnterpriseBaseDataTotal" parameterType="EnterpriseBaseDataTotal">