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

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

@@ -51,7 +51,7 @@ public class ExportXMLApi {
         String dateTime = DateFormatUtils.format(new Date(), "yyyyMMddHH");
         //使用Servlet实现文件下载的时候，避免浏览器自动打开文件
         String fout = null;
-        List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectAllPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, uploadDate);
+        List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectAllPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate));
 
         if (preproPersonEntities.size()>0){
            //todo 查询制证数据包信息
@@ -273,4 +273,15 @@ public class ExportXMLApi {
         if (str == null) return "";
         else return str;
     }
+
+    /**
+     * 去除字符串中中线
+     *
+     * @param str
+     * @return
+     */
+    private String replaceDate(String str) {
+        return str.replace("-", "");
+    }
+
 }

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

@@ -176,7 +176,7 @@ public class TaskListApi {
     /**
      * 查询任务单详情
      * (辅助库)
-     *（预订位、平压、冲切）
+     *（预订位、平压）
      * @param process 工序
      * @param resp
      * @return
@@ -190,7 +190,7 @@ public class TaskListApi {
     /**
      * 查询任务单详情
      * (辅助库、制证库)
-     *（分拣）
+     *（电写入、分拣）
      * @param process 工序
      * @param resp
      * @return
@@ -202,6 +202,7 @@ public class TaskListApi {
     }
 
 
+
     /**
      * 查询任务单详情（历史）
      * (辅助库)
@@ -216,6 +217,7 @@ public class TaskListApi {
         return objects;
     }
 
+
     /**
      * 查询任务单详情（历史）
      * (辅助库)
@@ -230,10 +232,6 @@ public class TaskListApi {
     }
 
 
-
-
-
-
     /**
      * 生成任务单
      * <p>

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

@@ -28,10 +28,28 @@ public class queryPreproPerson {
     @RequestMapping("queryPreproPerson")
 //    @RequiresPermissions("userInfo.add")//权限管理;
     public Map<String,Object> printXmlData(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard")String IDCard,@RequestParam("oldFile") String oldFile, @RequestParam("newFile")String newFile, @RequestParam("SSXQDM")String SSXQDM, @RequestParam("cardType")String cardType, @RequestParam("state")String state, @RequestParam("uploadDate")String uploadDate,@RequestParam("currPage")String currPage,@RequestParam("pageSize")String pageSize, HttpServletResponse response){
-        List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, uploadDate,currPage,pageSize);
+        List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),currPage,pageSize);
         Map<String,Object> map = new LinkedHashMap<>();
-        map.put("tatal",preproPersonService.selectPreproPersonCount(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, uploadDate).size());
+        List<PreproPersonEntity> preproPersonEntityList = preproPersonService.selectPreproPersonCount(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate));
+        map.put("total",preproPersonEntityList.size());
+        int youSum =0;
+        int puSum=0;
+        int invaildCount = 0;
+        for (PreproPersonEntity preproPersonEntity :preproPersonEntityList){
+            if (preproPersonEntity.getCardTypeId()==9){
+                youSum++;
+            }else if (preproPersonEntity.getCardTypeId()==0){
+                puSum++;
+            }
+            if (preproPersonEntity.getIsValid()==0){
+                invaildCount++;
+            }
+
+        }
         map.put("list",preproPersonEntities);
+        map.put("youSum",youSum);
+        map.put("puSum",puSum);
+        map.put("invaildCount",invaildCount);
         return map;
     }
 
@@ -50,4 +68,16 @@ public class queryPreproPerson {
         map.put("msg","成功更新制证数据是否有效");
         return map;
     }
+
+    /**
+     * 去除字符串中中线
+     *
+     * @param str
+     * @return
+     */
+    private String replaceDate(String str) {
+        return str.replace("-", "");
+    }
+
+
 }

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

@@ -25,8 +25,8 @@ public interface PreproPersonMapper {
 
 
       /*按条件查询制证数据*/
-    @Select("select * from (select a.*,rownum rn from(select * from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID " +
-            "where " +
+    @Select({"<script> select * from (select a.*,rownum rn from(select * from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID " +
+            "<where> " +
             " 1=1" +
             "<if test='uploadNo != null '>" +
             "and PREPRO_PERSON.JMSFZSLH = #{uploadNo}" +
@@ -37,7 +37,7 @@ public interface PreproPersonMapper {
             " <if test='oldFile != null '> "+
             "and files.SOURCE_FILE_NAME =#{oldFile} "+
             " </if> "+
-            " <if test='newFile != null'> "+
+            " <if test='newFile != null '> "+
             "and  NEW_FILES.NEW_FILE_NAME = #{newFile}"+
             " </if> "+
             " <if test='SSXQDM != null '> "+
@@ -46,13 +46,13 @@ public interface PreproPersonMapper {
             " <if test='cardType != null  '>"+
             " and PREPRO_PERSON.CARD_TYPE_ID =#{cardType}"+
             " </if> "+
-            " <if test='state != null'>"+
+            " <if test='state != null '>"+
             " and  PREPRO_PERSON.state = #{state}"+
             " </if>  "+
             " <if test='uploadDate != null '>"+
-            " and files.CREAT_TIME = #{uploadDate}"+
-            " </if> "+
-                    ") a ) where rn between #{minNum} and #{maxNum} ")
+            " and substr(files.CREATE_TIME,0,8) = #{uploadDate}"+
+            " </if>  </where>"+
+                    ") a ) where rn between #{minNum} and #{maxNum} </script>"})
     public List<PreproPersonEntity> selectPreproPerson(@Param("uploadNo") String uploadNo, @Param("IDCard") String IDCard, @Param("oldFile") String oldFile, @Param("newFile") String newFile, @Param("SSXQDM") String SSXQDM, @Param("cardType") String cardType, @Param("state") String state, @Param("uploadDate") String uploadDate, @Param("minNum") long minNum, @Param("maxNum") long maxNum);
     /*按条件查询制证数据*/
     @Select({"<script>" +
@@ -68,7 +68,7 @@ public interface PreproPersonMapper {
             " <if test='oldFile != null '> ",
             "and files.SOURCE_FILE_NAME =#{oldFile} ",
             " </if> ",
-            " <if test='newFile != null'> ",
+            " <if test='newFile != null '> ",
             "and  NEW_FILES.NEW_FILE_NAME = #{newFile}",
             " </if> ",
             " <if test='SSXQDM != null '> ",
@@ -77,11 +77,11 @@ public interface PreproPersonMapper {
             " <if test='cardType != null  '>",
             " and PREPRO_PERSON.CARD_TYPE_ID =#{cardType}",
             " </if> ",
-            " <if test='state != null'>",
+            " <if test='state != null '>",
             " and  PREPRO_PERSON.state = #{state}",
             " </if>  ",
             " <if test='uploadDate != null '>",
-            " and files.CREAT_TIME = #{uploadDate}",
+            " and substr(files.CREATE_TIME,0,8) = #{uploadDate}",
             " </if> ",
             "</where>" +
                     " </script>"})

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

@@ -295,6 +295,32 @@ public interface TaskListMapper {
             "order by group_no.GROUP_NO")
     public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_common6(@Param("date")String date );
 
+    /**
+     * 任务单查询历史
+     *  辅助库 大批证
+     *  （电写入）
+     * @param date 查询时间
+     * @return
+     */
+    @Select("select nvl(sum(FINISH_COUNT),0) FINISH_COUNT, SORTING_DATE,SORTING_NAME, task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
+            "task.ISSUED_DATE,task.ISSUED_NAME,\n" +
+            "task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
+            "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
+            "CARD_TYPE_DIC.CARD_TYPE  ,\n" +
+            "CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,\n" +
+            "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO from group_no left join task on group_no.task_id= task.TASK_ID\n" +
+            "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE" +
+            " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
+            " left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE=GROUP_NO.GROUP_NO " +
+            "where  1= 1 and to_char(PUNCHING_DATE,'yyyyMMdd')= #{date} " +
+            " group by SORTING_DATE, SORTING_NAME, task.task_id, task.COUNTY_CODE, task.SUBMIT_DATE, \n" +
+            "task.SUBMIT_NAME, task.ISSUED_DATE, task.ISSUED_NAME, task.PRINT_OUT_DATE, task.PRINT_OUT_NAME, \n" +
+            "task.POSITION_DATE, task.POSITION_NAME, task.CONCORA_CRUSH_DATE, task.CONCORA_CRUSH_NAME, TASK.PUNCHING_DATE, \n" +
+            "TASK.PUNCHING_NAME, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT, \n" +
+            "group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO\n" +
+            "order by group_no.GROUP_NO")
+    public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_common7(@Param("date")String date );
+
 
 
     /**

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

@@ -33,6 +33,7 @@ public interface TaskListService {
 
     public List selectHistoryTaskAtAuxiliary2(String date);
 
+
     public Map selectByCountyAtAuxiliary2(long process);
 
     public List<Object> selectByCountyAtAuxiliary3(long process);

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

@@ -297,6 +297,8 @@ public class TaskListServiceImpl implements TaskListService {
         return list;
     }
 
+
+
     /**
      * 查询历史任务单详情
      * （辅助库）
@@ -389,6 +391,7 @@ public class TaskListServiceImpl implements TaskListService {
         return mapList1;
     }
 
+
     /**
      * 查询组号信息
      * 受理库

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

@@ -337,27 +337,36 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 })
             },
             getPackageData:function(uploadNo,idCard,oldPackageNo,newPackageNo,sljg,
-                                    typeCode,packageType,date,success){
-                var json ={
+                                    typeCode,packageType,date,currentPage,itemsPerPage,success){
+                // var json ={
+                //     uploadNo:uploadNo,
+                //     IDCard:idCard,
+                //     oldFile:oldPackageNo,
+                //     newFile:newPackageNo,
+                //     SSXQDM:sljg,
+                //     cardType:typeCode,
+                //     state:packageType,
+                //     uploadDate:date
+                // }
+                // var arr = [];
+                // arr.push(json);
+                // var body = JSON.stringify(arr);
+                $http({
+                    method: 'GET',
+                    url: "../queryPreproPerson/queryPreproPerson",
+                    params:{
                         uploadNo:uploadNo,
-                    idCard:idCard,
-                    oldPackageNo:oldPackageNo,
-                    newPackageNo:newPackageNo,
-                    sljg:sljg,
-                    typeCode:typeCode,
-                    packageType:packageType,
-                    date:date
+                        IDCard:idCard,
+                        oldFile:oldPackageNo,
+                        newFile:newPackageNo,
+                        SSXQDM:sljg,
+                        cardType:typeCode,
+                        state:packageType,
+                        uploadDate:date,
+                        currPage:currentPage,
+                        pageSize:itemsPerPage
                     }
-                var arr = [];
-                arr.push(json);
-                var body = JSON.stringify(arr);
-                $http({
-                    method: 'POST',
-                    url: "../PackageInformation/selectInformation",
-                    data: body,
-                    headers: {'Content-Type': 'application/json'}
                 }).then(function successCallback(response) {
-                    console.log(response)
                     success(response.data)
                 })
             },

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

@@ -48,9 +48,9 @@
                    <td><input type="text" class="form-control" ng-model="sljg" placeholder="受理机关"></td>
                    <td>制证类型:</td>
                    <td style="text-align: left;">
-                      <select class="form-control select2" id="county" multiple="multiple" data-placeholder="--请选择制证类型--"
+                      <select class="form-control select2" id="county"  data-placeholder="--请选择制证类型--"
                               style="width: 100%;" ng-model="typeCode">
-                              <option value="{{county}}" ng-repeat="county in countyList track by $index">{{county}}</option>
+                              <option value="{{type.typeCode}}" ng-repeat="type in typeList">{{type.typeName}}</option>
                       </select>
                    </td>
                </tr>

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

@@ -38,9 +38,35 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
         $scope.paginationConf.totalItems = 50;
 
         $scope.doPackageQuery=function(){
+            if(angular.isUndefined($scope.uploadNo)){
+                $scope.uploadNo='';
+            }
+            if(angular.isUndefined($scope.idCard)){
+                $scope.idCard='';
+            }
+            if(angular.isUndefined($scope.oldPackageNo)){
+                $scope.oldPackageNo='';
+            }
+            if(angular.isUndefined($scope.newPackageNo)){
+                $scope.newPackageNo='';
+            }
+            if(angular.isUndefined($scope.sljg)){
+                $scope.sljg='';
+            }
+            if(angular.isUndefined($scope.typeCode)){
+                $scope.typeCode='';
+            }
+            if(angular.isUndefined($scope.packageType)){
+                $scope.packageType='';
+            }
+            var date = $("#datepicker").val();
+            if (date==''){
+                date=$filter("date")(new Date(), "yyyy-MM-dd");
+            }
             HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
-                $scope.typeCode,$scope.packageType,$("#datepicker").val(),function(data) {
-                    $scope.packageData = data;
+                $scope.typeCode,$scope.packageType,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
+                    $scope.paginationConf.totalItems=data.total;
+                    $scope.packageData = data.list;
                     console.log(data)
                 })
         }