Explorar el Código

2020/01/19 17:44

jzdsh hace 4 años
padre
commit
b93bf4e0a9

+ 2 - 2
src/main/java/com/yc/education/controller/admin/ProviderAdminController.java

@@ -152,8 +152,8 @@ public class ProviderAdminController extends BaseController {
             district = null;
         }
         /*根据经营类别筛选的数据处理*/
-        String paramTypeValue = "";//用来存放paramType数据
-        String pMainValue = "";//用来存放维修保养,美容洗车,电子与改装
+        String paramTypeValue ;//用来存放paramType数据
+        String pMainValue ;//用来存放维修保养,美容洗车,电子与改装
         if (StringUtils.isBlank(paramTypeStr)){         //值为空时
             paramTypeValue ="";
             pMainValue="";

+ 4 - 3
src/main/java/com/yc/education/controller/admin/ReportManageController.java

@@ -61,7 +61,7 @@ public class ReportManageController {
             @RequestParam(defaultValue = "")String recommenderName,
             @RequestParam(defaultValue = "")String cityName,
             @RequestParam(defaultValue = "1")Integer pageNum,
-            @RequestParam(defaultValue = "10")Integer pageSize){
+            @RequestParam(defaultValue = "")Integer pageSize){
         ModelAndView mav = new ModelAndView();
         List<Recommender> recommendersList  =  iRecommenderService.listAllRecommender();//查询推荐人信息
         mav.addObject("recommendersList",recommendersList);
@@ -98,7 +98,7 @@ public class ReportManageController {
         int proNum=0;//服务商数量
         int supNum=0;//经销商数量
         int allNum=0;//总和数量
-        List<RecommenderReport> listRecommenderReportInfo = iProviderService.listRecommenderReportInfo(sDateVal,eDateVal,monthVal,refferPhone,cityName,pageNum,pageSize);
+        List<RecommenderReport> listRecommenderReportInfo = iProviderService.listRecommenderReportInfo(sDateVal,eDateVal,monthVal,refferPhone,cityName,pageNum,Integer.MAX_VALUE);
 
         if (listRecommenderReportInfo != null && listRecommenderReportInfo.size()!= 0) {
             for (RecommenderReport r : listRecommenderReportInfo) {
@@ -111,7 +111,8 @@ public class ReportManageController {
             recommenderReport.setProviderNumber(proNum);
             recommenderReport.setSupplierNumber(supNum);
             recommenderReport.setSumNumber(allNum);
-            listRecommenderReportInfo.add(listRecommenderReportInfo.size(),recommenderReport);
+            /*listRecommenderReportInfo.add(listRecommenderReportInfo.size(),recommenderReport);*/
+            listRecommenderReportInfo.add(0,recommenderReport);
         }
 
         mav.addObject("pageInfo",new PageInfo<RecommenderReport>(listRecommenderReportInfo));

+ 7 - 1
src/main/java/com/yc/education/test/Java0110.java

@@ -20,8 +20,14 @@ public class Java0110 {
     }
 
     public static void main(String [] args){
+
         new Java0110();
+
+        Calendar calendar = Calendar.getInstance();
+        System.out.println(calendar.getTime() );
+
     }
 
 
-}
+    }
+

+ 5 - 5
src/main/webapp/WEB-INF/jsp/admin/recommenderReport.jsp

@@ -105,17 +105,17 @@
             <c:forEach items="${pageInfo.list }" var="report">
                 <tr class="text-c">
                     <td>${report.createDate}</td>
-                    <td class="text-l">${report.providerNumber}</td>
+                    <td align="center">${report.providerNumber}</td>
                     <%--<td><fmt:formatDate value="${item.createDate}" pattern="yyyy-MM-dd HH:mm:ss"></fmt:formatDate></td>--%>
-                    <td>${report.supplierNumber}</td>
-                    <td>${report.sumNumber}</td>
+                    <td align="center">${report.supplierNumber}</td>
+                    <td align="center">${report.sumNumber}</td>
                 </tr>
             </c:forEach>
             </tbody>
         </table>
     </div>
      <span style="color: red;">备注:默认查询今年当前月份</span>
-    <div id="PageNum">
+    <%--<div id="PageNum">
         <section>
             <div class="bd points-goods-list">
                 <ul class="pages">
@@ -150,7 +150,7 @@
                 </ul>
             </div>
         </section>
-    </div>
+    </div>--%>
 </div>
 </div>
 <%--<script type="text/javascript"

+ 1 - 1
src/main/webapp/WEB-INF/jsp/admin/supplierAdd.jsp

@@ -309,7 +309,7 @@
         <div class="row cl" id="SYCFive" hidden="hidden">
             <%--五级--%>
             <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>生产厂家:</label>
-            <div class="formControls col-xs-8 col-sm-9">
+            <div class="formControls  col-xs-8 col-sm-9">
                 <select name="SYCE" id="SYCE" class="input-text" onchange="SYCEChange(this.value)" >
                     <option value="">请选择</option>
                 </select>