Merge remote-tracking branch 'origin/dev' into dev

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

@@ -37,7 +37,7 @@ public class LogApi {
      */
     @RequestMapping("selectNewFilesLog")
     public List<Map<String,Object>> selectNewFilesLog (@RequestParam("newFileName")String newFileName, @RequestParam("cardId")String cardId, @RequestParam("createDate")String createDate, @RequestParam("uploadCountyCode")String uploadCountyCode, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){
-        List<Map<String,Object>> result = logService.selectNewFilesLog(newFileName,cardId,createDate,uploadCountyCode, Long.valueOf(currPage),Long.valueOf(pageSize));
+        List<Map<String,Object>> result = logService.selectNewFilesLog(newFileName,cardId,replaceDate(createDate),uploadCountyCode, Long.valueOf(currPage),Long.valueOf(pageSize));
         return result;
     }
 
@@ -47,4 +47,27 @@ public class LogApi {
         return list;
     }
 
+    /**
+     * 查询新包生成日志总数
+     * @param newFileName
+     * @param cardId
+     * @param createDate
+     * @param uploadCountyCode
+     * @return
+     */
+    @RequestMapping("selectNewFileLogCount")
+    public String selectNewFileLogCount(@RequestParam("newFileName")String newFileName, @RequestParam("cardId")String cardId,@RequestParam("createDate")String createDate,@RequestParam("uploadCountyCode")String uploadCountyCode){
+        String total = logService.selectNewFileLogCount(newFileName,cardId,replaceDate(createDate),uploadCountyCode);
+       return total;
+    }
+
+    /**
+     * 去除字符串中中线
+     * @param str
+     * @return
+     */
+    private String replaceDate(String str){
+        return str.replace("-","");
+    }
+
 }

src/main/java/com/yxproject/start/mapper/LogMapper.java

@@ -47,4 +47,24 @@ public interface LogMapper {
 
     @Select("select * from COUNTY_DIC")
     public List<CountyDicEntity> getCountyListData();
+
+    @Select("<script> " +
+            "SELECT COUNT(*)  FROM NEW_FILES \n" +
+            "LEFT JOIN  PREPRO_PERSON ON  NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID " +
+            "            where 1=1 " +
+            "            <if test='newFileName !=\"\"' >" +
+            "            and NEW_FILES.NEW_FILE_NAME=#{newFileName} " +
+            "            </if>" +
+            "            <if test='uploadCountyCode != -1' >" +
+            "            and NEW_FILES.DWDM=#{uploadCountyCode}" +
+            "            </if>" +
+            "            <if test='createDate !=\"\"' >" +
+            "            and substr(NEW_FILES.CREATE_DATE,0,8)=#{createDate}" +
+            "            </if>" +
+            "            <if test='cardId !=\"\"' >" +
+            "            and PREPRO_PERSON.GMSFHM=#{cardId} " +
+            "            </if>" +
+            "</script>")
+    public String selectNewFileLogCount(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate,@Param("uploadCountyCode") String uploadCountyName);
+
 }

src/main/java/com/yxproject/start/service/LogService.java

@@ -10,5 +10,9 @@ public interface LogService {
 
     public List<Map<String,Object>> selectNewFilesLog(String newFileName,String cardId,String createDate,String uploadCountyCode,long currPage,long pageSize);
 
+    public String selectNewFileLogCount(String newFileName,String cardId,String createDate,String uploadCountyCode);
+
+
+
     public List<CountyDicEntity> getCountyList();
 }

src/main/java/com/yxproject/start/service/impl/LogServiceImpl.java

@@ -19,6 +19,12 @@ public class LogServiceImpl implements LogService {
         return resultMap;
     }
 
+    @Override
+    public String selectNewFileLogCount(String newFileName, String cardId, String createDate, String uploadCountyCode) {
+        String count= logMapper.selectNewFileLogCount(newFileName,cardId,createDate,uploadCountyCode);
+        return count;
+    }
+
     @Override
     public List<CountyDicEntity> getCountyList() {
 

src/main/resources/static/js/service.js

@@ -297,7 +297,30 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
-            // selectPackageLogCount:
+            selectPackageLogCount:function (newPackageName,idCard,date,county,success) {
+                if(angular.isUndefined(newPackageName)){
+                    newPackageName='';
+                }
+                if(angular.isUndefined(idCard)){
+                    idCard='';
+                }
+                if(angular.isUndefined(county)){
+                    county = -1;
+                }
+                console.log(newPackageName,idCard,date,county)
+                $http({
+                    method: 'GET',
+                    url: "../LogApi/selectNewFileLogCount"+urlTimeStamp(),
+                    params:{
+                        newFileName:newPackageName,
+                        cardId:idCard,
+                        createDate:date,
+                        uploadCountyCode:county
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
             selectPackageLog:function(newPackageName,idCard,date,county,currentPage,itemsPerPage,success){
                 if(angular.isUndefined(newPackageName)){
                     newPackageName='';

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

@@ -30,7 +30,7 @@
 <div class="content row">
     <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
-        <strong class="box-header">制证信息打包</strong>
+        <strong class="box-header">制证信息管理</strong>
         <div class="box-info">
            <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
@@ -133,7 +133,7 @@
                     <div style="padding-left: 27%;" ng-if="xmlDatas">
                         <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
                     </div>
-                <h3 ng-if="postData.length==0">暂无记录。</h3>
+                <h4 ng-if="postData.length==0">暂无记录。</h4>
             </div>
         </div>
 </div>

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

@@ -53,7 +53,7 @@
                 <td class="mailbox-attachment">{{task.valid}}</td>
                 <td class="mailbox-date">{{task.invalid}}</td>
                 <td class="mailbox-date text-danger">{{task.state}}</td>
-                <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
+                <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
               </tr>
 
               </tbody>

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

@@ -143,7 +143,7 @@
             <div style="padding-left: 27%;" >
                 <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
             </div>
-            <h3 ng-if="postPackageData.length==0">暂无记录。</h3>
+            <div class="box-body" ng-if="postPackageData.length==0"><h4>暂无记录</h4></div>
             <div class="row" style="padding:0 25px;" ng-if="postMsgDetail.length>0">
                 <div class="col-md-11"></div>
                 <div class="col-md-1" style="text-align: right;">

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

@@ -66,7 +66,7 @@
 
               </tr>
            </table>
-            <table class="table table-bordered table-hover postTable" ng-if="packageLogData">
+            <table class="table table-bordered table-hover postTable" ng-if="packageLogData.length>0">
                     <thead>
                     <tr>
                         <th>NO.</th>
@@ -80,17 +80,20 @@
                     <tbody>
                     <tr ng-repeat="item in packageLogData">
                         <td>{{$index+1}}</td>
-                        <td>{{item.newPackageName}}</td>
-                        <td>{{item.createDate}}</td>
-                        <td>{{item.cardCount}}</td>
-                        <td>{{item.readCountyCode}}</td>
-                        <td>{{item.readCountyName}}</td>
+                        <td>{{item.NEW_FILE_NAME}}</td>
+                        <td>{{item.CREATE_DATE  | myDateFilter}}</td>
+                        <td>{{item.RECORD_NUMBER}}</td>
+                        <td>{{item.DWDM}}</td>
+                        <td>{{item.DWMC}}</td>
                     </tr>
                     </tbody>
                 </table>
-                <div style="padding-left: 27%;" ng-if="packageLogData">
-                    <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
-                </div>
+            <div ng-if="packageLogData.length==0" class="box-body">
+                 <h4>暂无数据</h4>
+            </div>
+            <div style="padding-left: 27%;" ng-if="packageLogData.length>0">
+                <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
+            </div>
         </div>
     </div>
 </div>

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

@@ -35,7 +35,8 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
 
         $scope.getPackageLog = function(){
             HttpService.selectPackageLogCount($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,function (data) {
-                $scope.paginationConf.totalItems = data.totalCount;
+                console.log(data)
+                $scope.paginationConf.totalItems = data;
                 console.log($scope.paginationConf.totalItems)
             })
             HttpService.selectPackageLog($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){

src/main/resources/static/views/task/taskListPreLocating.html

@@ -69,7 +69,7 @@
         </div>
         <!-- /.box-body -->
         <div class="box-footer" style="text-align: right;">
-            <button class="btn btn-primary" ng-click="goes()">下发任务单</button>
+            <button class="btn btn-primary" ng-click="goes()">转出任务单</button>
         </div>
       </div>
       <!-- /. box -->

src/main/resources/static/views/task/taskListPrint.html

@@ -60,7 +60,7 @@
                 <td class="mailbox-attachment">{{task.electricCount}}</td>
                 <td ng-if="task.failedCount!=0" class="mailbox-subject" style="color: red;">{{task.failedCount}}</td>
                 <td ng-if="task.failedCount==0" class="mailbox-subject">{{task.failedCount}}</td>
-                <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
+                <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
               </tr>
               </tbody>
             </table>
@@ -72,7 +72,7 @@
         <div class="box-footer">
 
             <div class="pull-right" style="margin-left: 10px;">
-                <button class="btn btn-primary" ng-click="goes()">下发任务单</button>
+                <button class="btn btn-primary" ng-click="goes()">转出任务单</button>
             </div>
             <div class="pull-right">
                 <select class="form-control select2" id="print" style="border-radius:5px">

src/main/resources/static/views/task/taskListQualityCheck.html

@@ -60,7 +60,7 @@
                 <td class="mailbox-attachment">{{task.outStoreCount}}</td>
                 <td class="mailbox-subject">{{task.enterStoreCount}}</td>
                 <td><button class="btn btn-primary">完成</button></td>
-                <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
+                <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
               </tr>
               </tbody>
             </table>

src/main/resources/static/views/task/taskListSorting.html

@@ -67,9 +67,6 @@
           <!-- /.mail-box-messages -->
         </div>
         <!-- /.box-body -->
-        <div class="box-footer" style="text-align: right;">
-            <button class="btn btn-primary" ng-click="goes()">下发任务单</button>
-        </div>
       </div>
       <!-- /. box -->
 </div>

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

@@ -119,7 +119,7 @@
                     <div style="padding-left: 27%;">
                         <tm-pagination ng-if="show" conf="paginationConf" class="ul"></tm-pagination>
                     </div>
-                <h3 ng-if="postData.length==0">暂无记录。</h3>
+                <h4 ng-if="postData.length==0">暂无记录。</h4>
             </div>
         </div>
 </div>

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

@@ -97,7 +97,9 @@
                 <div style="padding-left: 27%;">
                     <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
                 </div>
-                <h3 ng-if="xmlPackageData.length==0">暂无记录。</h3>
+                <div class="box-body" ng-if="xmlPackageData.length==0">
+                    <h4>暂无记录。</h4>
+                </div>
                 <div class="row" style="padding:0 25px;" ng-if="postMsgDetail.length>0">
                     <div class="col-md-11"></div>
                     <div class="col-md-1" style="text-align: right;">