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

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

@@ -37,16 +37,16 @@ public class InfoManagementApi {
 
     /**
      * 查询制证信息数据条数
-     * @param beginFileName
-     * @param endFileName
-     * @param gajgMc
+     * @param beginFileId 开始包号
+     * @param endFileId 结束包号
+     * @param gajgMc 派出所代码
      * @param beginDate
      * @param endDate
      * @return
      */
     @RequestMapping("selectCount")
-    public long selectCount(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate){
-      long count=  infoManagementService.count(beginFileName,endFileName,gajgMc,replaceDate(beginDate),replaceDate(endDate));
+    public long selectCount(@Param("beginFileId")String beginFileId, @Param("endFileId")String endFileId, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate){
+      long count=  infoManagementService.count(beginFileId,endFileId,gajgMc,replaceDate(beginDate),replaceDate(endDate));
       return count;
     }
 

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

@@ -18,10 +18,10 @@ public interface InfoManagementMapper {
             "FROM (select * from new_files \n" +
             "where 1=1\n" +
             "<if test='beginFileName != \"\" '>" +
-            "and (NEW_FILE_NAME between(#{beginFileName})and (#{endFileName}))\n" +
+            "and (id  between #{beginFileName} and #{endFileName} )\n" +
             "</if>" +
             "<if test='gajgMc != \"\" '>" +
-            "and DWMC=#{gajgMc}\n" +
+            "and DWMC like #{gajgMc} \n" +
             "</if>" +
             "<if test='beginDate != \"\" '>" +
             "and (subStr(CREATE_DATE,0,8) between(#{beginDate})and(#{endDate}))"+
@@ -38,10 +38,10 @@ public interface InfoManagementMapper {
             "SELECT COUNT(*)  FROM NEW_FILES \n" +
             "where 1=1\n" +
             "<if test='beginFileName != \"\" '>" +
-            "and (NEW_FILE_NAME between(#{beginFileName})and (#{endFileName}))\n" +
+            "and (id between #{beginFileName})and  #{endFileName}))\n" +
             "</if>" +
             "<if test='gajgMc != \"\" '>" +
-            "and DWMC=#{gajgMc}\n" +
+            "and DWMC like #{gajgMc}\n" +
             "</if>" +
             "<if test='beginDate != \"\" '>" +
             "and (subStr(CREATE_DATE,0,8) between(#{beginDate})and(#{endDate}))"+

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

@@ -78,7 +78,7 @@ public interface LogMapper {
             "            FROM (SELECT NEW_FILE_NAME,CREATE_DATE,RECORD_NUMBER,DWDM,DWMC " +
             "            FROM NEW_FILES " +
             "            RIGHT JOIN  PREPRO_PERSON ON  NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID" +
-            "            where 1=1 " +
+            "            where 1=1 and PREPRO_PERSON.NEW_FILE_ID is not null " +
             "            <if test='newFileName !=\"\"' >" +
             "            and NEW_FILES.NEW_FILE_NAME=#{newFileName} " +
             "            </if>" +
@@ -89,7 +89,7 @@ public interface LogMapper {
             "            and substr(NEW_FILES.CREATE_DATE,0,8)=#{createDate}" +
             "            </if>" +
             "            <if test='cardId !=\"\"' >" +
-            "            and PREPRO_PERSON.GMSFHM=#{cardId} " +
+            "            and PREPRO_PERSON.GMSFHM=#{cardId} ORDER by CREATE_DATE " +
             "            </if>" +
             "            ) " +
             "            A" +
@@ -102,9 +102,7 @@ public interface LogMapper {
     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 " +
+            "SELECT COUNT(*) fileCount, PREPRO_PERSON.NEW_FILE_ID FROM NEW_FILES LEFT JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID where 1=1 and PREPRO_PERSON.NEW_FILE_ID is not null  " +
             "            <if test='newFileName !=\"\"' >" +
             "            and NEW_FILES.NEW_FILE_NAME=#{newFileName} " +
             "            </if>" +
@@ -117,8 +115,9 @@ public interface LogMapper {
             "            <if test='cardId !=\"\"' >" +
             "            and PREPRO_PERSON.GMSFHM=#{cardId} " +
             "            </if>" +
+            " group by PREPRO_PERSON.NEW_FILE_ID" +
             "</script>")
-    public int selectNewFileLogCount(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate, @Param("uploadCountyCode") String uploadCountyName);
+    public List<Map<String,Object>> selectNewFileLogCount(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate, @Param("uploadCountyCode") String uploadCountyName);
 
 
     // TODO  解析日志总数
@@ -126,7 +125,7 @@ public interface LogMapper {
             "SELECT COUNT(*)  FROM FILES \n" +
             "LEFT JOIN ANALYSIS ON ANALYSIS.FILE_ID =FILES.ID "+
             "LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=ANALYSIS.FILE_DIC_ID " +
-            "where 1=1 " +
+            "where 1=1 and PREPRO_PERSON.NEW_FILE_ID is not null " +
             "<if test='fileName !=\"\"' >" +
             "and FILES.SOURCE_FILE_NAME=#{fileName} " +
             "</if>" +

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

@@ -15,16 +15,16 @@ public class InfoManagementServiceImpl implements InfoManagementService {
 
 
     @Override
-    public List<NewFilesEntity> selectInfoManagement(String beginFileName, String endFileName, String gajgMc, String beginDate, String endDate,long currPage,long pageSize) {
+    public List<NewFilesEntity> selectInfoManagement(String beginId, String endId, String gajgMc, String beginDate, String endDate,long currPage,long pageSize) {
 
-        List<NewFilesEntity> newFilesEntities = infoManagementMapper.selectInfoManagement(beginFileName, endFileName, gajgMc, beginDate, endDate,currPage * pageSize,(currPage - 1) * pageSize + 1);
+        List<NewFilesEntity> newFilesEntities = infoManagementMapper.selectInfoManagement(beginId, endId, "%"+gajgMc+"%", beginDate, endDate,currPage * pageSize,(currPage - 1) * pageSize + 1);
 
         return newFilesEntities;
     }
 
     @Override
-    public long count(String beginFileName, String endFileName, String gajgMc, String beginDate, String endDate) {
-       long  count= infoManagementMapper.count(beginFileName,endFileName,gajgMc,beginDate,endDate);
+    public long count(String beginId, String endId, String gajgMc, String beginDate, String endDate) {
+       long  count= infoManagementMapper.count(beginId,endId,"%"+gajgMc+"%",beginDate,endDate);
         return count;
     }
 

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

@@ -24,8 +24,11 @@ public class LogServiceImpl implements LogService {
 
     @Override
     public int selectNewFileLogCount(String newFileName, String cardId, String createDate, String uploadCountyCode) {
-        int count= logMapper.selectNewFileLogCount(newFileName,cardId,createDate,uploadCountyCode);
-        return count;
+        List<Map<String, Object>> mapList = logMapper.selectNewFileLogCount(newFileName, cardId, createDate, uploadCountyCode);
+        if (mapList.size()>0){
+            return Integer.valueOf(mapList.get(0).get("FILECOUNT")+"");
+        }
+        return 0;
     }
 
     @Override

src/main/resources/static/dialogs/confirmFailedCards.html

@@ -13,7 +13,8 @@
         <tr ng-repeat="item in personInfo">
             <td>{{$index + 1}}</td>
             <td>{{item.ID_NO}}</td>
-            <td>{{item.NAME}}</td>
+            <td ng-if="item.NAME=='查无此人'" style="color: red;">{{item.NAME}}</td>
+            <td ng-if="item.NAME!='查无此人'">{{item.NAME}}</td>
             <td ng-if="item.SEX_NO==1">男</td>
             <td ng-if="item.SEX_NO==2">女</td>
             <td ng-if="item.SEX_NO==-1">错误</td>

src/main/resources/static/dialogs/confirmRestCards.html

@@ -14,7 +14,8 @@
         <tr ng-repeat="item in personInfo">
             <td>{{$index + 1}}</td>
             <td>{{item.ID_NO}}</td>
-            <td>{{item.NAME}}</td>
+            <td ng-if="item.NAME=='查无此人'" style="color: red;">{{item.NAME}}</td>
+            <td ng-if="item.NAME!='查无此人'">{{item.NAME}}</td>
             <td ng-if="item.SEX_NO==1">男</td>
             <td ng-if="item.SEX_NO==2">女</td>
             <td ng-if="item.SEX_NO==-1">错误</td>

src/main/resources/static/dialogs/confirmTagCards.html

@@ -13,7 +13,8 @@
         <tr ng-repeat="item in personInfo">
             <td>{{$index + 1}}</td>
             <td>{{item.ID_NO}}</td>
-            <td>{{item.NAME}}</td>
+            <td ng-if="item.NAME=='查无此人'" style="color: red;">{{item.NAME}}</td>
+            <td ng-if="item.NAME!='查无此人'">{{item.NAME}}</td>
             <td ng-if="item.SEX_NO==1">男</td>
             <td ng-if="item.SEX_NO==2">女</td>
             <td ng-if="item.SEX_NO==-1">错误</td>

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

@@ -235,9 +235,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 if(angular.isUndefined(state)){
                     state=-1;
                 }
-                if(date==''){
-                    date=$filter("date")(new Date(), "yyyy-MM-dd");
-                }
                 console.log(fileName,state,date)
                 $http({
                     method: 'GET',
@@ -258,9 +255,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 if(angular.isUndefined(state)){
                     state=-1;
                 }
-                if(date==''){
-                    date=$filter("date")(new Date(), "yyyy-MM-dd");
-                }
                 console.log(fileName,state,currentPage,itemsPerPage,date)
                 $http({
                     method: 'GET',

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

@@ -38,6 +38,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
         }
 
 
+        var cancelAdd = $scope.cancelAdd;
         $scope.addFailed = function(){
             var array = [];
             for(var i=0;i<$scope.arr.length;i++){
@@ -92,6 +93,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
                             HttpService.addFailedCard(list,function(data){
                                 $scope.closeThisDialog();
                                 MessageService.showAlert("添加成功");
+                                cancelAdd();
                                 console.log(data)
                             })
                         }

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

@@ -30,7 +30,7 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
         $scope.cancelAddRest =function(){
             $scope.arr = [];
         }
-
+        var cancel=$scope.cancelAddRest;
         $scope.addRest = function(){
             var array = [];
             var count = 0;
@@ -68,6 +68,7 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
                             HttpService.addRestCard(json,function(data){
                                 $scope.closeThisDialog();
                                 MessageService.showAlert("添加成功");
+                                cancel();
                                 console.log(data)
                             })
                         }

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

@@ -32,6 +32,7 @@ angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
         }
 
 
+        var cancelAdd = $scope.cancelAdd
         $scope.addTags = function(){
             var array = [];
             for(var i=0;i<$scope.arr.length;i++){
@@ -85,6 +86,7 @@ angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
                             HttpService.addTagCard(list,function(data){
                                 $scope.closeThisDialog();
                                 MessageService.showAlert("添加成功");
+                                cancelAdd();
                                 cancel();
                             })
                         }

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

@@ -26,9 +26,9 @@
 </style>
 <div class="content row">
     <div class="col-md-12" style="margin-top:20px;">
-    <div class="box box-primary">
+    <div class="box">
         <strong class="box-header with-border">解析日志</strong>
-        <div class="box-primary" style="padding: 15px;padding-top: 0;">
+        <div class="box box-primary">
             <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
                    <td>原始包名:</td>

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

@@ -90,8 +90,8 @@
                           </div>
                           <input type="text"
                                  class="form-control pull-right"
-                                 ng-model="choseDate"
                                  id="datepicker3"  readonly/>
+                          <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
                       </div>
                     </td>
                    <td>文件名称:</td>

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

@@ -28,6 +28,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
             todayBtn: 1,
             autoclose: 1
         });
+
         $('#datepicker2').datetimepicker({
             minView: "month", //选择日期后，不会再跳转去选择时分秒
             language: 'zh-CN',
@@ -42,11 +43,13 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
             todayBtn: 1,
             autoclose: 1
         });
+        //清除的代码
+        $(".glyphicon-remove").click(function(){
+            $($($(this).parent()).prev()).val("");
+        })
 
         $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
 
-
-
         $scope.uploadExcel = function () {
             var fd = new FormData();
             var files = document.querySelector('input#id_file_photo_for_check').files;

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

@@ -23,19 +23,20 @@
                             <th>任务单流水号</th>
                             <th>区县</th>
                             <th>制证类型</th>
-                            <th>日期</th>
-                            <th>数据核验</th>
+                            <th>数量</th>
+                            <th>下发日期</th>
                             <th>膜打印</th>
                             <th>预定位</th>
+                            <th>电写入</th>
                             <th>分拣</th>
                             <th>质检</th>
-                            <th>仓库</th>
                             </thead>
                             <tbody>
                             <tr ng-repeat="item in searchResult.workOrderData">
                                 <td>{{item.TASK_ID}}</td>
                                 <td>{{item.COUNTYNAME}}</td>
                                 <td>{{item.CARD_TYPE}}</td>
+                                <td>{{item.VALID_COUNT}}</td>
                                 <td>{{item.SUBMIT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                                 <td>{{item.ISSUED_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                                 <td>{{item.PRINT_OUT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>

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

@@ -106,6 +106,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             }else{
                 json.uploadDate = $("#datepicker").val();
             }
+            if($scope.paginationConf.currentPage==0){
+                $scope.paginationConf.currentPage=1
+            }
             json.firstIndex=$scope.paginationConf.currentPage;
             json.pageSize=$scope.paginationConf.itemsPerPage;
             return json;
@@ -120,8 +123,6 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
                 console.log(data)
             })
         }
-
-
         // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
         $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doQuery);