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

# Conflicts:
#	src/main/java/com/yxproject/start/api/LogApi.java
#	src/main/java/com/yxproject/start/mapper/LogMapper.java
#	src/main/java/com/yxproject/start/service/LogService.java
#	src/main/java/com/yxproject/start/service/impl/LogServiceImpl.java

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

 package com.yxproject.start.api;
 
+import com.yxproject.start.entity.CountyDicEntity;
 import com.yxproject.start.service.LogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,6 +40,13 @@ public class LogApi {
         List<Map<String,Object>> result = logService.selectNewFilesLog(newFileName,cardId,createDate,uploadCountyCode, Long.valueOf(currPage),Long.valueOf(pageSize));
         return result;
     }
+
+    @RequestMapping("selectCountyList")
+    public List<CountyDicEntity> selectCountyList(){
+        List<CountyDicEntity> list = logService.getCountyList();
+        return list;
+    }
+
     @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,createDate,uploadCountyCode);

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

@@ -98,22 +98,44 @@ public class TaskListApi {
 
     }
 
+
     /**
-     * 查询派出所列表详情
+     * 生成任务单
+     *
+     * @param process 工序
      * @param date 查询时间
-     * @param typeCode 制证类型
-     * @param countyCode  区县代码
+     * @param groupList 组号列表
+     * @param countyList 区县列表 {typeCode:1,countyCode:'123456'}
      * @param resp
      * @return
      */
-    @RequestMapping("queryByPoliceAtACCU")
-    public List<Object> queryByPoliceAtACCU(@RequestParam("state") String date,@RequestParam("typeCode") String typeCode,@RequestParam("countyCode") String countyCode, HttpServletResponse resp){
-        List<Object> objects = taskListService.selectByPoliceAtACCU(date, typeCode, countyCode);
-        return objects;
+    @RequestMapping("createTask")
+    public String queryByCountyAtACCU(@RequestParam("process") String process,@RequestParam("date") String date,@RequestParam("groupList") List<String> groupList,@RequestParam("countyList") String countyList, HttpServletResponse resp){
+//        taskListService.selectGrouoAtACCU()
+        return null;
 
     }
 
 
+
+
+
+//    /**
+//     * 查询派出所列表详情
+//     * @param date 查询时间
+//     * @param typeCode 制证类型
+//     * @param countyCode  区县代码
+//     * @param resp
+//     * @return
+//     */
+//    @RequestMapping("queryByPoliceAtACCU")
+//    public List<Object> queryByPoliceAtACCU(@RequestParam("state") String date,@RequestParam("typeCode") String typeCode,@RequestParam("countyCode") String countyCode, HttpServletResponse resp){
+//        List<Object> objects = taskListService.selectByPoliceAtACCU(date, typeCode, countyCode);
+//        return objects;
+//
+//    }
+
+
     /**
      * 字符串去除空格
      * @param str 原始字符串

src/main/java/com/yxproject/start/entity/TaskEntity.java

@@ -2,6 +2,7 @@ package com.yxproject.start.entity;
 
 import javax.persistence.*;
 import java.sql.Time;
+import java.util.Date;
 import java.util.Objects;
 
 @Entity
@@ -12,30 +13,31 @@ public class TaskEntity {
     private Long cardType;
     private Long oldCardType;
     private String countyCode;
-    private Time submitDate;
+    private Date submitDate;
     private String submitName;
-    private Time issuedDate;
+    private Date issuedDate;
     private String issuedName;
-    private Time downloadDate;
+    private Date downloadDate;
     private String downloadName;
-    private Time printOutDate;
+    private Date printOutDate;
     private String printOutName;
-    private Time positionDate;
+    private Date positionDate;
     private String positionName;
-    private Time outWorkshopDate;
+    private Date outWorkshopDate;
     private String outWorkshopName;
     private String qualityTestName;
-    private Time qualityTestDate;
+    private Date qualityTestDate;
     private String exceptionInformation;
-    private Time outStorageDate;
+    private Date outStorageDate;
     private String outStorageName;
-    private Time inStorageDate;
+    private Date inStorageDate;
     private String inStorageName;
     private Long taskStateId;
     private Long isException;
     private Long printerId;
     private Long beginPageNumber;
     private Long finishPageNumber;
+    private Date sortOntDate;
 
     @Id
     @Column(name = "TASK_ID")
@@ -79,11 +81,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "SUBMIT_DATE")
-    public Time getSubmitDate() {
+    public Date getSubmitDate() {
         return submitDate;
     }
 
-    public void setSubmitDate(Time submitDate) {
+    public void setSubmitDate(Date submitDate) {
         this.submitDate = submitDate;
     }
 
@@ -99,11 +101,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "ISSUED_DATE")
-    public Time getIssuedDate() {
+    public Date getIssuedDate() {
         return issuedDate;
     }
 
-    public void setIssuedDate(Time issuedDate) {
+    public void setIssuedDate(Date issuedDate) {
         this.issuedDate = issuedDate;
     }
 
@@ -119,11 +121,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "DOWNLOAD_DATE")
-    public Time getDownloadDate() {
+    public Date getDownloadDate() {
         return downloadDate;
     }
 
-    public void setDownloadDate(Time downloadDate) {
+    public void setDownloadDate(Date downloadDate) {
         this.downloadDate = downloadDate;
     }
 
@@ -139,11 +141,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "PRINT_OUT_DATE")
-    public Time getPrintOutDate() {
+    public Date getPrintOutDate() {
         return printOutDate;
     }
 
-    public void setPrintOutDate(Time printOutDate) {
+    public void setPrintOutDate(Date printOutDate) {
         this.printOutDate = printOutDate;
     }
 
@@ -159,11 +161,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "POSITION_DATE")
-    public Time getPositionDate() {
+    public Date getPositionDate() {
         return positionDate;
     }
 
-    public void setPositionDate(Time positionDate) {
+    public void setPositionDate(Date positionDate) {
         this.positionDate = positionDate;
     }
 
@@ -179,11 +181,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "OUT_WORKSHOP_DATE")
-    public Time getOutWorkshopDate() {
+    public Date getOutWorkshopDate() {
         return outWorkshopDate;
     }
 
-    public void setOutWorkshopDate(Time outWorkshopDate) {
+    public void setOutWorkshopDate(Date outWorkshopDate) {
         this.outWorkshopDate = outWorkshopDate;
     }
 
@@ -209,11 +211,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "QUALITY_TEST_DATE")
-    public Time getQualityTestDate() {
+    public Date getQualityTestDate() {
         return qualityTestDate;
     }
 
-    public void setQualityTestDate(Time qualityTestDate) {
+    public void setQualityTestDate(Date qualityTestDate) {
         this.qualityTestDate = qualityTestDate;
     }
 
@@ -229,11 +231,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "OUT_STORAGE_DATE")
-    public Time getOutStorageDate() {
+    public Date getOutStorageDate() {
         return outStorageDate;
     }
 
-    public void setOutStorageDate(Time outStorageDate) {
+    public void setOutStorageDate(Date outStorageDate) {
         this.outStorageDate = outStorageDate;
     }
 
@@ -249,11 +251,11 @@ public class TaskEntity {
 
     @Basic
     @Column(name = "IN_STORAGE_DATE")
-    public Time getInStorageDate() {
+    public Date getInStorageDate() {
         return inStorageDate;
     }
 
-    public void setInStorageDate(Time inStorageDate) {
+    public void setInStorageDate(Date inStorageDate) {
         this.inStorageDate = inStorageDate;
     }
 
@@ -316,6 +318,14 @@ public class TaskEntity {
     public void setFinishPageNumber(Long finishPageNumber) {
         this.finishPageNumber = finishPageNumber;
     }
+    @Basic
+    @Column(name = "SORT_OUT_DATE")
+    public Date getSortOntDate() {
+        return sortOntDate;
+    }
+    public void setSortOntDate(Date sortOntDate) {
+        this.sortOntDate = sortOntDate;
+    }
 
     @Override
     public boolean equals(Object o) {
@@ -349,11 +359,12 @@ public class TaskEntity {
                 Objects.equals(isException, that.isException) &&
                 Objects.equals(printerId, that.printerId) &&
                 Objects.equals(beginPageNumber, that.beginPageNumber) &&
+                Objects.equals(sortOntDate, that.sortOntDate) &&
                 Objects.equals(finishPageNumber, that.finishPageNumber);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(taskId, cardType, oldCardType, countyCode, submitDate, submitName, issuedDate, issuedName, downloadDate, downloadName, printOutDate, printOutName, positionDate, positionName, outWorkshopDate, outWorkshopName, qualityTestName, qualityTestDate, exceptionInformation, outStorageDate, outStorageName, inStorageDate, inStorageName, taskStateId, isException, printerId, beginPageNumber, finishPageNumber);
+        return Objects.hash(taskId, cardType, oldCardType, countyCode, submitDate, submitName, issuedDate, issuedName, downloadDate, downloadName, printOutDate, printOutName, positionDate, positionName, outWorkshopDate, outWorkshopName, qualityTestName, qualityTestDate, exceptionInformation, outStorageDate, outStorageName, sortOntDate,inStorageDate, inStorageName, taskStateId, isException, printerId, beginPageNumber, finishPageNumber);
     }
 }

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

 package com.yxproject.start.mapper;
 
+import com.yxproject.start.entity.GroupNoEntity;
+import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
@@ -12,4 +14,13 @@ public interface GroupNoMapper {
      */
     @Update("UPDATE GROUP_NO SET SPECIAL_CARD_COUNT =SPECIAL_CARD_COUNT+1 WHERE TASK_ID = #{taskId}")
     public boolean createFastCard (@Param("acceptNo")String accept);
+
+    /**
+     * 保存组号列表
+     * @param groupNoEntity 组号信息
+     * @return
+     */
+    @Insert("insert into group_no (GROUP_NO,TASK_ID,VALID_COUNT,INVALID_COUNT,SPECIAL_CARD_COUNT) " +
+            "values(#{groupNo},#{taskId},#{validCount},#{invalidCount},#{specialCardCount})")
+    public boolean saveGroupNo (GroupNoEntity groupNoEntity);
 }

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

 package com.yxproject.start.mapper;
 
+import com.yxproject.start.entity.CountyDicEntity;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -44,6 +45,8 @@ public interface LogMapper {
             "</script>")
     public List<Map<String,Object>> selectNewFilesLog(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate,@Param("uploadCountyCode") String uploadCountyName, @Param("begin") long begin, @Param("end") long end);
 
+    @Select("select * from COUNTY_DIC")
+    public List<CountyDicEntity> getCountyListData();
 
     @Select("<script> " +
             "SELECT COUNT(*)  FROM NEW_FILES \n" +

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

 package com.yxproject.start.mapper;
 
+import com.yxproject.start.entity.TaskEntity;
 import com.yxproject.start.entity.TaskList.CountCountyEntity;
 import com.yxproject.start.entity.TaskList.CountGajgEntity;
 import com.yxproject.start.entity.TaskList.TaskListEntity;
@@ -29,7 +30,7 @@ public interface TaskListMapper {
     public List<CountCountyEntity> selectByCounty(@Param("submitDate") String submitDate);
 
     /**
-     * 循环单查询
+     * 任务单查询
      * 受理库
      * @param submitDate
      * @return
@@ -44,14 +45,44 @@ public interface TaskListMapper {
 
 
     /**
-     * 查询派出所列表
+     * 查询组号列表
      * 受理库
-     * @param submitDate
-     * @param countyCount
+     * @param date 查询时间
+     * @param typeCode 制证类型
+     * @param countyCode 区县代码
+     * @return
+     */
+    @Select("select DISTINCT CARD_TYPE_DIC.card_type_id, ACC_GROUP_T.group_no ,ACC_GROUP_T.valid_count,ACC_GROUP_T.invalid_count, county_dic.county_code\n" +
+            "from ACC_CARD_T@ACCU_LINK \n" +
+            "left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH = acc_card_t.upload_no \n" +
+            "left join ACC_GROUP_T@ACCU_LINK on substr(acc_card_t.accept_no,0,8) = ACC_GROUP_T.group_no\n" +
+            "left join CARD_TYPE_DIC on PREPRO_PERSON.card_type_id =  CARD_TYPE_DIC.CARD_TYPE_ID\n" +
+            "left join county_dic on substr(PREPRO_PERSON.JMSFZSLH,0,6)=  county_dic.COUNTY_CODE\n" +
+            "where county_dic.COUNTY_CODE is not null and ACC_GROUP_T.deal_flag =3 and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')= #{date}\n" +
+            "and PREPRO_PERSON.card_type_id =#{typeCode} and substr(PREPRO_PERSON.JMSFZSLH,0,6) =#{countyCode}")
+    public List<Map<String,Object>> selectGrouoAtACCU(@Param("date") String date,@Param("typeCode") String typeCode,@Param("countyCode") String countyCode);
+
+    /**
+     * 生成任务单
+     * @param taskEntity 任务单
+     * @return
+     */
+    @Insert("insert into task (CARD_TYPE,COUNTY_CODE,SUBMIT_DATE,SUBMIT_NAME) values(#{cardType},#{countyCode},#{submitDate},#{submitName})")
+    @Options(useGeneratedKeys=true, keyProperty="taskId", keyColumn="TASK_ID")
+    public boolean saveTask(TaskEntity taskEntity);
+
+
+
+    /**
+     * 循环单查询
+     *  辅助库
+     * @param date 查询时间
+     * @param process 工序
      * @return
      */
     @Select("")
-    public List<CountGajgEntity> selectByGajg(@Param("submitDate") String submitDate,@Param("countyCode") String countyCount);
+    public List<Map<String,Object>> selectByCountyAtAuxiliary(@Param("date") String date,@Param("process") String process);
+
 
 
     /**

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

+package com.yxproject.start.service;
+
+import com.yxproject.start.entity.GroupNoEntity;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/6   21:12
+ */
+public interface GroupNoService {
+    public boolean saveGroupNo(GroupNoEntity groupNoEntity);
+}

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

 package com.yxproject.start.service;
 
 
+import com.yxproject.start.entity.CountyDicEntity;
+
 import java.util.List;
 import java.util.Map;
 
@@ -11,4 +13,6 @@ public interface LogService {
     public String selectNewFileLogCount(String newFileName,String cardId,String createDate,String uploadCountyCode);
 
 
+
+    public List<CountyDicEntity> getCountyList();
 }

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

 package com.yxproject.start.service;
 
+import com.yxproject.start.entity.TaskEntity;
 import com.yxproject.start.entity.TaskList.CountCountyEntity;
 import com.yxproject.start.entity.TaskList.CountGajgEntity;
 import com.yxproject.start.entity.TaskList.TaskListEntity;
@@ -21,5 +22,7 @@ public interface TaskListService {
 
     public List<Object> selectByCountyAtACCU(String date);
 
-    public List<Object> selectByPoliceAtACCU(String date,String typeCode,String countyCode);
+    public List<Object> selectGrouoAtACCU(String date,String typeCode,String countyCode);
+
+    public boolean saveTask(TaskEntity taskEntity);
 }

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

+package com.yxproject.start.service.impl;
+
+import com.yxproject.start.entity.GroupNoEntity;
+import com.yxproject.start.mapper.GroupNoMapper;
+import com.yxproject.start.service.GroupNoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/6   21:12
+ */
+@Service
+public class GroupNoServiceImpl implements GroupNoService {
+    @Autowired
+    private GroupNoMapper groupNoMapper;
+    /**
+     * 保存组号详情
+     * @param groupNoEntity
+     * @return
+     */
+    @Override
+    public boolean saveGroupNo(GroupNoEntity groupNoEntity) {
+        return groupNoMapper.saveGroupNo(groupNoEntity);
+    }
+}

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

 package com.yxproject.start.service.impl;
 
+import com.yxproject.start.entity.CountyDicEntity;
 import com.yxproject.start.mapper.LogMapper;
 import com.yxproject.start.service.LogService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,4 +24,10 @@ public class LogServiceImpl implements LogService {
         String count= logMapper.selectNewFileLogCount(newFileName,cardId,createDate,uploadCountyCode);
         return count;
     }
+
+    @Override
+    public List<CountyDicEntity> getCountyList() {
+
+        return logMapper.getCountyListData();
+    }
 }

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

 package com.yxproject.start.service.impl;
 
+import com.yxproject.start.entity.TaskEntity;
 import com.yxproject.start.entity.TaskList.CountCountyEntity;
 import com.yxproject.start.entity.TaskList.CountGajgEntity;
 import com.yxproject.start.entity.TaskList.TaskListEntity;
@@ -28,8 +29,9 @@ public class TaskListServiceImpl implements TaskListService {
 
     @Override
     public List<CountGajgEntity> selectByGajg(String submitDate, String countyCode) {
-        List <CountGajgEntity> resultList= taskListMapper.selectByGajg(submitDate,countyCode);
-        return resultList;
+//        List <CountGajgEntity> resultList= taskListMapper.selectByGajg(submitDate,countyCode);
+//        return resultList;
+        return null;
     }
 
     @Override
@@ -50,6 +52,12 @@ public class TaskListServiceImpl implements TaskListService {
         return true;
     }
 
+    /**
+     * 查询任务单详情
+     * 受理库
+     * @param date
+     * @return
+     */
     @Override
     public List<Object> selectByCountyAtACCU(String date) {
         List<Map<String, Object>> maps = taskListMapper.selectByCountyAtACCU(date);
@@ -125,7 +133,7 @@ public class TaskListServiceImpl implements TaskListService {
                     }
                     countyMap.put("groupNum",createGroupNo(c, nsList));
                 }
-                countyMap.remove("groupList");
+//                countyMap.remove("groupList");
                 typeList.add(countyMap);
             }
             typeMapList.put("typeName",type);
@@ -137,12 +145,28 @@ public class TaskListServiceImpl implements TaskListService {
         return list;
     }
 
+    /**
+     * 查询组号信息
+     * 受理库
+     * @param date
+     * @param typeCode
+     * @param countyCode
+     * @return
+     */
     @Override
-    public List<Object> selectByPoliceAtACCU(String date,String typeCode,String countyCode) {
-//        taskListMapper.;
-        return  null;
+    public List selectGrouoAtACCU(String date,String typeCode,String countyCode) {
+        return  taskListMapper.selectGrouoAtACCU(date,typeCode,countyCode);
     }
 
+    /**
+     * 保存任务单详情
+     * @param taskEntity
+     * @return
+     */
+    @Override
+    public boolean saveTask(TaskEntity taskEntity) {
+        return taskListMapper.saveTask(taskEntity);
+    }
 
     private String createGroupNo(List<Integer> c, List<Integer> nsList) {
         try {

src/main/resources/static/index.html

@@ -113,85 +113,6 @@
             <!--导航右边-->
             <div class="navbar-custom-menu">
                 <ul class="nav navbar-nav">
-                    <!-- Messages: style can be found in dropdown.less-->
-                    <li class="dropdown messages-menu">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                      <i class="fa fa-envelope-o"></i>
-                      <span class="label label-success">4</span>
-                    </a>
-                    <ul class="dropdown-menu">
-                      <li class="header">You have 4 messages</li>
-                      <li>
-                        <!-- inner menu: contains the actual data -->
-                        <ul class="menu">
-                          <li><!-- start message -->
-                            <a href="#">
-                              <p>Why not buy a new awesome theme?</p>
-                            </a>
-                          </li>
-                          <li><!-- start message -->
-                            <a href="#">
-                            <p>Why not buy a new awesome theme?</p>
-                            </a>
-                          </li>
-                          <li><!-- start message -->
-                              <a href="#">
-                              <p>Why not buy a new awesome theme?</p>
-                              </a>
-                            </li>
-                          <li><!-- start message -->
-                                <a href="#">
-                                <p>Why not buy a new awesome theme?</p>
-                                </a>
-                              </li>
-                        </ul>
-                      </li>
-                      <li class="footer"><a href="#">See All Messages</a></li>
-                    </ul>
-                  </li>
-                    <!-- Notifications: style can be found in dropdown.less -->
-                    <li class="dropdown notifications-menu">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                      <i class="fa fa-bell-o"></i>
-                      <span class="label label-warning">10</span>
-                    </a>
-                    <ul class="dropdown-menu">
-                      <li class="header">You have 10 notifications</li>
-                      <li>
-                        <!-- inner menu: contains the actual data -->
-                        <ul class="menu">
-                          <li>
-                            <a href="#">
-                              <i class="fa fa-users text-aqua"></i> 5 new members joined today
-                            </a>
-                          </li>
-                          <li>
-                            <a href="#">
-                              <i class="fa fa-warning text-yellow"></i> Very long description here that may not fit into the
-                              page and may cause design problems
-                            </a>
-                          </li>
-                          <li>
-                            <a href="#">
-                              <i class="fa fa-users text-red"></i> 5 new members joined
-                            </a>
-                          </li>
-                          <li>
-                            <a href="#">
-                              <i class="fa fa-shopping-cart text-green"></i> 25 sales made
-                            </a>
-                          </li>
-                          <li>
-                            <a href="#">
-                              <i class="fa fa-user text-red"></i> You changed your username
-                            </a>
-                          </li>
-                        </ul>
-                      </li>
-                      <li class="footer"><a href="#">View all</a></li>
-                    </ul>
-                  </li>
-
                     <li class="dropdown user">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                           <i class="glyphicon glyphicon-user"></i>

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

@@ -83,7 +83,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
             getCountyListData: function (success) {
                 $http({
                     method: 'GET',
-                    url: "../api/idCard/districts" + urlTimeStamp()
+                    url: "../LogApi/selectCountyList" + urlTimeStamp()
                 }).then(function successCallback(response) {
                     success(response.data)
                 })
@@ -297,15 +297,28 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
-            selectPackageLog:function(newPackageName,idCard,date,county,success){
+            // selectPackageLogCount:
+            selectPackageLog:function(newPackageName,idCard,date,county,currentPage,itemsPerPage,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: "../CreatePackageApi/selectPackageData"+urlTimeStamp(),
+                    url: "../LogApi/selectNewFilesLog"+urlTimeStamp(),
                     params:{
-                        newPackageName:newPackageName,
-                        idCard:idCard,
+                        newFileName:newPackageName,
+                        cardId:idCard,
                         createDate:date,
-                        readCounty:county
+                        uploadCountyCode:county,
+                        currPage:currentPage,
+                        pageSize:itemsPerPage
                     }
                 }).then(function successCallback(response) {
                     success(response.data)

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/packageLog/packageLog.html

@@ -57,7 +57,9 @@
                     </td>
                     <td>上传地区:</td>
                     <td>
-                        <input type="text" class="form-control" placeholder="上传地区名称" ng-model="county"/>
+                        <select class="form-control select2" id="print" ng-model="county">
+                                <option ng-repeat="item in countyList" value="item.countycode">{{item.countyname}}</option>
+                            </select>
                     </td>
                     <td><button class="btn btn-primary" ng-click="getPackageLog()">查询</button></td>
                 </tr>

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

@@ -12,6 +12,10 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
     .controller('packageLogCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) {
 
 
+        HttpService.getCountyListData(function(data) {
+            $scope.countyList = data;
+            console.log($scope.countyList)
+        })
         //Date picker
         $('#datepicker').datetimepicker({
             minView: "month", //选择日期后，不会再跳转去选择时分秒
@@ -28,15 +32,20 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
             itemsPerPage: 10,
             perPageOptions: [10, 20, 30, 40, 50]
         };
-        $scope.paginationConf.totalItems = 50;
 
         $scope.getPackageLog = function(){
-            HttpService.selectPackageLog($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,function(data){
+            HttpService.selectPackageLogCount($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,function (data) {
+                $scope.paginationConf.totalItems = data.totalCount;
+                console.log($scope.paginationConf.totalItems)
+            })
+            HttpService.selectPackageLog($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
                 $scope.packageLogData = data;
-                console.log($scope.packageLogData)
+                console.log($scope.packageLogData,"?")
             })
         }
 
 
+
+
     });
 

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>