Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java

@@ -350,10 +350,10 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
         if (denominator == NumConstant.ZERO){
             return "0.00%";
         }
-        BigDecimal bigDecimalMolecule = new BigDecimal(molecule);
+        BigDecimal bigDecimalMolecule = new BigDecimal(molecule * NumConstant.ONE_HUNDRED);
         BigDecimal bigDecimalDenominator = new BigDecimal(denominator);
         BigDecimal divide = bigDecimalMolecule.divide(bigDecimalDenominator, NumConstant.TWO, BigDecimal.ROUND_HALF_UP);
-        return divide.multiply(NumConstant.ONE_HUNDRED_DECIMAL)+"%";
+        return divide+"%";
     }
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml

@@ -208,7 +208,7 @@
                 AND (cd.EPMET_CATEGORY_CODE IS NULL OR cd.EPMET_CATEGORY_CODE = '')
             </if>
             AND cd.EPMET_CATEGORY_CODE != ''
-            AND pd.PROJECT_STATUS_CODE = 'closed'
+            AND pd.PROJECT_STATUS_CODE IN ('closed','closed_case')
             AND pd.ALL_PARENT_IDS LIKE CONCAT('%',(SELECT AGENCY_ID FROM screen_customer_agency WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} AND PID = '0'),'%')
             AND DATE_FORMAT(pd.project_create_time,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
             GROUP BY categoryCode