Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/doumu/StatisticsController.java

@@ -78,7 +78,7 @@ public class StatisticsController {
     }
 
     /**
-     * app首页销售额统计
+     * app首页作品数量统计
      */
     @PreAuthorize("@ss.hasPermi('system:statistics:numberWorks')")
     @GetMapping(value = "/app/numberWorks")

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -113,7 +113,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 .antMatchers("/login", "/register", "/captchaImage").permitAll()
                 .antMatchers("/new/news/**", "/wx/pay/**", "/ali/pay/**","/sf/**","/china/area/fractionation/**","/common/upload","/system/info/**").permitAll()
-                .antMatchers("/system/dict/data/type/**","/system/evaluate/**","/banner/banner/listNoPage","/system/notice/list","system/notice/**").permitAll()
+                .antMatchers("/system/dict/data/type/**","/system/evaluate/**","/banner/banner/listNoPage","/system/notice/**").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DoumuEvaluateServiceImpl.java

@@ -42,7 +42,7 @@ public class DoumuEvaluateServiceImpl implements IDoumuEvaluateService
         List<DoumuProductFj> fjList = doumuProductFjMapper.selectDoumuProductFjList(doumuProductFj);
         doumuEvaluate.setFjList(fjList);
 
-        return doumuEvaluateMapper.selectDoumuEvaluateByEvaluateId(evaluateId);
+        return doumuEvaluate;
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DoumuProductInfoServiceImpl.java

@@ -272,7 +272,7 @@ public class DoumuProductInfoServiceImpl implements IDoumuProductInfoService
             mapL.put("bfb","0%");
             if(num != 0){
                 BigDecimal num2 = new BigDecimal(num);
-                double result = Double.parseDouble(((num1.divide(num2,2,BigDecimal.ROUND_HALF_UP))).toString());
+                double result = Double.parseDouble(((num2.divide(num1,2,BigDecimal.ROUND_HALF_UP))).toString());
                 // 创建DecimalFormat对象并设置格式化模式为"0%"
                 DecimalFormat decimalFormat = new DecimalFormat("0%");
                 // 使用DecimalFormat对象进行格式化操作
@@ -483,7 +483,8 @@ public class DoumuProductInfoServiceImpl implements IDoumuProductInfoService
             map.put("sales",listy);
             return AjaxResult.success(map);
         }
-
+        String nowMonth = DateUtils.dateTimeNow("yyyy-MM");
+        map.put("nowMonth","0");
         for (int i = 1; i < 13; i++) {
             StringBuilder sb = new StringBuilder();
             sb.append(i).append("月");
@@ -504,6 +505,9 @@ public class DoumuProductInfoServiceImpl implements IDoumuProductInfoService
                     y3 = subNum1.doubleValue();
                 }
             }
+            if(nowMonth.equals(month)){
+                map.put("nowMonth",String.valueOf(y3));
+            }
             listy.add(String.valueOf(y3));
 
         }

ruoyi-system/src/main/resources/mapper/system/DoumuProductInfoMapper.xml

@@ -45,7 +45,7 @@
     <select id="selectDoumuProductInfoList" parameterType="DoumuProductInfo" resultMap="DoumuProductInfoResult">
         <include refid="selectDoumuProductInfoVo"/>
         <where>
-            <if test="orderNumber != null  and orderNumber != ''"> and order_number = #{orderNumber}</if>
+            <if test="orderNumber != null  and orderNumber != ''"> and order_number like concat('%', #{orderNumber}, '%')</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="deliveryType != null  and deliveryType != ''"> and delivery_type = #{deliveryType}</if>
             <if test="phonenumber != null  and phonenumber != ''"> and phonenumber = #{phonenumber}</if>