push

src/main/java/com/yxproject/start/api/DeliveredApi.java

@@ -246,8 +246,7 @@ public class DeliveredApi {
      * @return
      */
     private String replaceDate(String str) {
-        return str.replace("-", "");
+        return str.replace("-", "").replace(" ","").replace(":","");
     }
 
-
 }

src/main/java/com/yxproject/start/api/ExportExcelApi.java

@@ -112,7 +112,7 @@ public class ExportExcelApi {
      * @return
      */
     private String replaceDate(String str) {
-        return str.replace("-", "");
+        return str.replace("-", "").replace(" ","").replace(":","");
     }
 
 

src/main/java/com/yxproject/start/api/ExportXMLApi.java

@@ -306,9 +306,8 @@ public class ExportXMLApi {
      * @return
      */
     private String replaceDate(String str) {
-        return str.replace("-", "");
+        return str.replace("-", "").replace(" ","").replace(":","");
     }
-
     /**
      * 不够位数的在前面补0，保留code的长度位数字
      * @param code

src/main/java/com/yxproject/start/api/InfoManagementApi.java

@@ -69,12 +69,13 @@ public class InfoManagementApi {
     }
 
     /**
-     * 去除字符串中线
+     * 去除字符串中中线
+     *
      * @param str
      * @return
      */
-    private String replaceDate(String str){
-        return str.replace("-","");
+    private String replaceDate(String str) {
+        return str.replace("-", "").replace(" ","").replace(":","");
     }
 
 }

src/main/java/com/yxproject/start/api/LogApi.java

@@ -159,11 +159,11 @@ public class LogApi {
 
     /**
      * 去除字符串中中线
+     *
      * @param str
      * @return
      */
-    private String replaceDate(String str){
-        return str.replace("-","").replace(":","").replace(" ","");
+    private String replaceDate(String str) {
+        return str.replace("-", "").replace(" ","").replace(":","");
     }
-
 }

src/main/java/com/yxproject/start/api/MaterialManagementApi.java

@@ -113,12 +113,12 @@ public class MaterialManagementApi {
 
     /**
      * 去除字符串中中线
+     *
      * @param str
      * @return
      */
-    private String replaceDate(String str){
-        return str.replace("-","").replace(" ","");
+    private String replaceDate(String str) {
+        return str.replace("-", "").replace(" ","").replace(":","");
     }
 
-
 }

src/main/java/com/yxproject/start/api/PersonPostApi.java

@@ -195,11 +195,12 @@ public class PersonPostApi {
 
     /**
      * 去除字符串中中线
+     *
      * @param str
      * @return
      */
-    private String replaceDate(String str){
-        return str.replace("-","");
+    private String replaceDate(String str) {
+        return str.replace("-", "").replace(" ","").replace(":","");
     }
 
     /**

src/main/java/com/yxproject/start/api/ReadXmlApi.java

@@ -203,18 +203,14 @@ public class ReadXmlApi {
         return yxjsonResponse.toJSONString();
     }
 
-    private String replaceDate(String str){
-        return str.replace("-","");
-    }
-
     /**
-     * 字符串去除空格
-     * @param str 原始字符串
-     * @return 返回新的字符串
+     * 去除字符串中中线
+     *
+     * @param str
+     * @return
      */
-    private  String replaceNullString(String str) {
-        if (str == ""){
-            return null;
-        } else return str;
+    private String replaceDate(String str) {
+        return str.replace("-", "").replace(" ","").replace(":","");
     }
+
 }

src/main/java/com/yxproject/start/api/ReceiptApi.java

@@ -351,8 +351,6 @@ public class ReceiptApi {
      * @return
      */
     private String replaceDate(String str) {
-        return str.replace("-", "");
+        return str.replace("-", "").replace(" ","").replace(":","");
     }
-
-
 }

src/main/java/com/yxproject/start/api/ReportApi.java

@@ -101,9 +101,8 @@ public class ReportApi {
      * @return
      */
     private String replaceDate(String str) {
-        return str.replace("-", "");
+        return str.replace("-", "").replace(" ","").replace(":","");
     }
 
 
-
 }

src/main/java/com/yxproject/start/api/TaskListApi.java

@@ -425,8 +425,7 @@ public class TaskListApi {
      * @return
      */
     private String replaceDate(String str) {
-        return str.replace("-", "");
+        return str.replace("-", "").replace(" ","").replace(":","");
     }
 
-
 }

src/main/java/com/yxproject/start/api/queryPreproPerson.java

@@ -87,7 +87,7 @@ public class queryPreproPerson {
      * @return
      */
     private String replaceDate(String str) {
-        return str.replace("-", "");
+        return str.replace("-", "").replace(" ","").replace(":","");
     }
 
 

src/main/resources/static/views/report/report.html

@@ -7,7 +7,7 @@
                     <div class="box-header">
                         <strong>膜打印数据报表</strong>
                         <div class="box-tools pull-right">
-                            <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/>  ——
+                            <span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/>  <span>至</span>
                             <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate2" id="datepicker2" readonly/>
                             <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchReport()">查询</button>
                         </div>
@@ -48,12 +48,6 @@
                                     <!-- /.table -->
                                 </div>
                                 <!-- /.table -->
-                                <div class="box-footer" ng-if="receitpData.length>0">
-                                    <div class="pull-right" style="margin-left: 10px;">
-                                        <button class="btn btn-primary" ng-click="printReceitp(type.typeCode)">打印交接单</button>
-                                        <button class="btn btn-primary" ng-click="downloadGAinfo()">下载公安网反馈信息</button>
-                                    </div>
-                                </div>
                             </div>
                         </div>
                         <div ng-if="receitpData.length==0">

src/main/resources/static/views/report/report.js

@@ -26,30 +26,9 @@ angular.module('AvatarCheck.report', ['ngRoute', 'AvatarCheck.http'])
             todayBtn: 1,
             autoclose: 1
         });
-
         $scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-dd");
         $scope.choseDate2 = $filter("date")(new Date(), "yyyy-MM-dd");
 
-        // $scope.downloadGAinfo = function(){
-        //     var date = $("#datepicker1").val();
-        //     var url = "../exportExcel/printExcelData?date="+date;
-        //     var a = document.createElement("a");
-        //     document.body.appendChild(a);
-        //     a.href = encodeURI(url);
-        //     a.click();
-        // }
-        //
-        // $scope.currentTab = 0;
-        // $scope.func = function (index) {
-        //     for (var idx in $scope.cycleSheetData) {
-        //         if (index == idx) {
-        //             $scope.cycleSheetData[idx].isActive = true;
-        //         } else {
-        //             $scope.cycleSheetData[idx].isActive = false;
-        //         }
-        //     }
-        //     $scope.currentTab = index;
-        // }
 
         $scope.searchReport = function () {
             var date1=$('#datepicker1').val();
@@ -61,46 +40,10 @@ angular.module('AvatarCheck.report', ['ngRoute', 'AvatarCheck.http'])
                 date2= $filter("date")(new Date(), "yyyy-MM-dd");
             }
             HttpService.getReport(date1,date2,function(data){
-                console.log(data,"------------------------")
                 $scope.reportData=data;
             })
         }
         $scope.searchReport();
 
-        // $scope.checkAll = function ($event){
-        //     var checkAll = $event.target;
-        //     var checkbox =$("input[type=checkbox]");
-        //     for (var i=0;i<checkbox.length;i++){
-        //         if(checkAll.checked) {
-        //             checkbox[i].checked = true;
-        //         }else {
-        //             checkbox[i].checked = false;
-        //         }
-        //     }
-        // }
-        //
-        // $scope.printReceitp = function(typeCode) {
-        //     var date = $('#datepicker1').val();
-        //     var json={
-        //         type:typeCode,
-        //         date:date,
-        //         list:[]
-        //     }
-        //     var checks = $(".checkAllPolice:checked")
-        //     for (var i=0;i<checks.length;i++){
-        //         for(var j=0;j<JSON.parse(checks[i].value).length;j++){
-        //             json.list.push(JSON.parse(checks[i].value)[j].POLICE_CODE)
-        //         }
-        //     }
-        //     console.log(json)
-        //     HttpService.printReceitpData(json,function (data) {
-        //         var blob = new Blob([data], {type: "application/vnd.ms-excel"});
-        //         var a = document.createElement("a");
-        //         document.body.appendChild(a);
-        //         a.href = URL.createObjectURL(blob);
-        //         // a.download = fileName;
-        //         a.click();
-        //     })
-        // }
 
     });
\ No newline at end of file