Merge branch 'dev' of…

Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev

# Conflicts:
#	src/main/resources/application.yml

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

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;

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

@@ -6,7 +6,6 @@ import com.yxproject.start.entity.PreproPersonEntity;
 import com.yxproject.start.service.FilesService;
 import com.yxproject.start.service.NewFilesService;
 import com.yxproject.start.service.PreproPersonService;
-import com.yxproject.start.utils.QuerySequenceSercive;
 import com.yxproject.start.utils.ZipUtils;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;

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

@@ -36,16 +36,6 @@ public class LogApi {
         return result;
     }
 
-    /**
-     * 查询公安局列表
-     * @return list
-     */
-    @RequestMapping("selectCountyList")
-    public List<CountyDicEntity> selectCountyList(){
-        List<CountyDicEntity> list = logService.getCountyList();
-        return list;
-    }
-
     /**
      * 查询新包生成日志总数
      * @param newFileName 新包名称
@@ -61,6 +51,16 @@ public class LogApi {
        return total;
     }
 
+    /**
+     * 查询公安局列表
+     * @return list
+     */
+    @RequestMapping("selectCountyList")
+    public List<CountyDicEntity> selectCountyList(){
+        List<CountyDicEntity> list = logService.getCountyList();
+        return list;
+    }
+
 
     /**
      * 查询解析日志

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

@@ -39,8 +39,8 @@ public class MaterialManagementApi {
      * @return
      */
     @RequestMapping("insertCardBody")
-    public boolean insertCardBody(@Param("cardType")String cardType,@Param("totalCount")String totalCount,@Param("note")String note, @Param("name")String name){
-        boolean result = materialManagementService.insertCardBody(cardType, totalCount, note,name);
+    public boolean insertCardBody(@Param("cardType")String cardType,@Param("totalCount")String totalCount,@Param("note")String note, @Param("name")String name, @Param("cardBodyType")String cardBodyType){
+        boolean result = materialManagementService.insertCardBody(cardType, totalCount, note,name,cardBodyType);
         return result;
     }
 
@@ -76,9 +76,9 @@ public class MaterialManagementApi {
      * @return
      */
     @RequestMapping("selectCardBodyManagement")
-    public Map<String,Object> selectCardBodyManagement(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name){
+    public Map<String,Object> selectCardBodyManagement(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name,@Param("cardBodyType")String cardBodyType){
         Map<String,Object> resultMap = new HashMap<>();
-        List<CardBodyEntity> cardBodyEntities = materialManagementService.selectCardBody(replaceDate(beginDate),replaceDate(endDate),typeCode,name);
+        List<CardBodyEntity> cardBodyEntities = materialManagementService.selectCardBody(replaceDate(beginDate),replaceDate(endDate),typeCode,name,cardBodyType);
         String cardCount1 = materialManagementService.selectCardCount1(replaceDate(beginDate),replaceDate(endDate),typeCode,name);
         String cardCount2 = materialManagementService.selectCardCount2(replaceDate(beginDate),replaceDate(endDate),typeCode,name);
         resultMap.put("cardBody",cardBodyEntities);

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

@@ -8,8 +8,6 @@ import net.sf.json.JSONObject;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,7 +20,6 @@ import javax.transaction.Transactional;
 import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;

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

 package com.yxproject.start.api;
 
 import com.yxproject.start.entity.*;
-import com.yxproject.start.entity.TaskList.CountCountyEntity;
-import com.yxproject.start.entity.TaskList.CountGajgEntity;
-import com.yxproject.start.entity.TaskList.TaskListEntity;
-import com.yxproject.start.mapper.DataAuditingMapper;
 import com.yxproject.start.service.*;
 import com.yxproject.start.service.impl.DataAuditingServiceImpl;
 import net.sf.json.JSONArray;
@@ -273,8 +269,9 @@ public class TaskListApi {
                     dataAuditingEntity.setPoliceSubstation(map.get("POLICE_SUBSTATION")+"");
                     dataAuditingEntities.add(dataAuditingEntity);
                 }
-                boolean b = taskListService.saveTask(objects, name, 0 + "");
                 dataAuditingService.saveDataAuditingList(dataAuditingEntities);
+                boolean b = taskListService.saveTask(objects, name, 0 + "");
+
             }
         }
         Map<String, Object> map = new LinkedHashMap<>();

src/main/java/com/yxproject/start/entity/CardBodyEntity.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;
 
 /**
@@ -12,11 +13,12 @@ import java.util.Objects;
 @Table(name = "CARD_BODY", schema = "YINGXIN", catalog = "")
 public class CardBodyEntity {
     private long cardBodyId;
-    private Time saveDate;
+    private Date saveDate;
     private Long cardType;
     private Long totalCount;
     private String note;
     private String name;
+    private Long cardBodyType;
 
     @Id
     @Column(name = "CARD_BODY_ID")
@@ -30,11 +32,11 @@ public class CardBodyEntity {
 
     @Basic
     @Column(name = "SAVE_DATE")
-    public Time getSaveDate() {
+    public Date getSaveDate() {
         return saveDate;
     }
 
-    public void setSaveDate(Time saveDate) {
+    public void setSaveDate(Date saveDate) {
         this.saveDate = saveDate;
     }
 
@@ -88,11 +90,22 @@ public class CardBodyEntity {
                 Objects.equals(cardType, that.cardType) &&
                 Objects.equals(totalCount, that.totalCount) &&
                 Objects.equals(note, that.note) &&
+                Objects.equals(cardBodyType, that.cardBodyType) &&
                 Objects.equals(name, that.name);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(cardBodyId, saveDate, cardType, totalCount, note, name);
+        return Objects.hash(cardBodyId, saveDate, cardBodyType,cardType, totalCount, note, name);
+    }
+
+    @Basic
+    @Column(name = "CARD_BODY_TYPE")
+    public Long getCardBodyType() {
+        return cardBodyType;
+    }
+
+    public void setCardBodyType(Long cardBodyType) {
+        this.cardBodyType = cardBodyType;
     }
 }

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

@@ -12,7 +12,7 @@ import java.util.Objects;
 @Table(name = "PLASTIC_FILM", schema = "YINGXIN", catalog = "")
 public class PlasticFilmEntity {
     private long plasticFilmId;
-    private Time saveDate;
+    private String saveDate;
     private Long totalCount;
     private Long plasticFilmType;
     private String note;
@@ -30,11 +30,11 @@ public class PlasticFilmEntity {
 
     @Basic
     @Column(name = "SAVE_DATE")
-    public Time getSaveDate() {
+    public String getSaveDate() {
         return saveDate;
     }
 
-    public void setSaveDate(Time saveDate) {
+    public void setSaveDate(String saveDate) {
         this.saveDate = saveDate;
     }
 

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

@@ -85,8 +85,8 @@ public interface LogMapper {
             "            SELECT A.*, ROWNUM RN " +
             "            FROM (SELECT distinct 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 and PREPRO_PERSON.NEW_FILE_ID is not null " +
+            "            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>" +
@@ -112,8 +112,7 @@ public interface LogMapper {
     //新包日志总数
     @Select("<script> " +
             "SELECT COUNT(*) FILECOUNT FROM (SELECT distinct NEW_FILE_NAME,CREATE_DATE,RECORD_NUMBER,DWDM,DWMC FROM NEW_FILES \n" +
-            "RIGHT JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID where 1=1 \n" +
-            "and PREPRO_PERSON.NEW_FILE_ID is not null  " +
+            "left JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID where 1=1 \n" +
             "            <if test='newFileName !=\"\"' >" +
             "            and NEW_FILES.NEW_FILE_NAME=#{newFileName} " +
             "            </if>" +
@@ -168,7 +167,7 @@ public interface LogMapper {
 
 
     //查询身份数据
-    @Select("select PREPRO_PERSON.JMSFZSLH, PREPRO_PERSON.GMSFHM,PREPRO_PERSON.YXQQSRQ,PREPRO_PERSON.YXQJZRQ,PREPRO_PERSON.SSXQDM FROM PREPRO_PERSON " +
+    @Select("select distinct PREPRO_PERSON.JMSFZSLH, PREPRO_PERSON.GMSFHM,PREPRO_PERSON.YXQQSRQ,PREPRO_PERSON.YXQJZRQ,PREPRO_PERSON.SSXQDM FROM PREPRO_PERSON " +
             "LEFT JOIN ANALYSIS ON ANALYSIS.FILE_ID = PREPRO_PERSON.FILE_ID " +
             "LEFT JOIN PERSON_POST ON ANALYSIS.FILE_DIC_ID =PERSON_POST.FILE_ID " +
             "WHERE PERSON_POST.FILE_ID=#{fileId}")

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

@@ -50,8 +50,8 @@ public interface MaterialManagementMapper {
     public String selectFilmCount2(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name);
 
 
-    @Insert("INSERT INTO CARD_BODY (CARD_TYPE,TOTAL_COUNT,NOTE,name)VALUES(#{cardType},#{totalCount},#{note},#{name})")
-    public boolean insertCardBody(@Param("cardType") String cardType, @Param("totalCount") String totalCount, @Param("note") String note, @Param("name") String name);
+    @Insert("INSERT INTO CARD_BODY (CARD_TYPE,TOTAL_COUNT,NOTE,name,CARD_BODY_TYPE)VALUES(#{cardType},#{totalCount},#{note},#{name},#{cardBodyType})")
+    public boolean insertCardBody(@Param("cardType") String cardType, @Param("totalCount") String totalCount, @Param("note") String note, @Param("name") String name, @Param("cardBodyType") long cardBodyType);
 
 
     @Select("<script>" +
@@ -62,8 +62,11 @@ public interface MaterialManagementMapper {
             "<if test='typeCode != 0 '>" +
             " and card_type =#{typeCode} " +
             "</if>" +
+            "<if test='cardBodyType != 0 '>" +
+            " and card_Body_Type =#{cardBodyType} " +
+            "</if>" +
             "</script>")
-    public List<CardBodyEntity> selectCardBody(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name);
+    public List<CardBodyEntity> selectCardBody(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("typeCode") String typeCode, @Param("name") String name,@Param("cardBodyType")String cardBodyType);
 
     @Select("<script>" +
             "select sum(TOTAL_COUNT) cardType1 from CARD_BODY where to_char(save_date,'yyyyMMdd') BETWEEN #{beginDate} and #{endDate} and CARD_TYPE=1" +

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

@@ -199,7 +199,11 @@ public interface ReceiptMapper {
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID)\n" +
             "left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" +
             "left join COUNTY_DIC on substr(RECEIPT_LIST.POLICE_CODE,0,6) = COUNTY_DIC.COUNTY_CODE" +
-            " where receipt_date is null and to_char(CHECK_DATE,'yyyyMMddhhmmss')  BETWEEN  ${startDate} and ${endDate}  ")
+            " where receipt_date is null " +
+            "<if test ='startDate !=null'> " +
+            "and to_char(CHECK_DATE,'yyyyMMddhhmmss')  BETWEEN  ${startDate} and ${endDate}  " +
+            "</if> " +
+            "")
     public List<Map<String,Object>> selectReceiptDateByCheckDate(@Param("startDate") String startDate,@Param("endDate") String endDate);
 
 
@@ -221,7 +225,7 @@ public interface ReceiptMapper {
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID)\n" +
             "left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" +
             "left join COUNTY_DIC on substr(RECEIPT_LIST.POLICE_CODE,0,6) = COUNTY_DIC.COUNTY_CODE" +
-            " where to_char(CHECK_DATE,'yyyyMMddhhmmss')  BETWEEN  ${startDate} and ${endDate} and RECEIPT_LIST.POLICE_CODE in (${string}) and CARD_TYPE_DIC.CARD_TYPE_ID=${type} and receipt_date is null ")
+            " where RECEIPT_LIST.POLICE_CODE in (${string}) and CARD_TYPE_DIC.CARD_TYPE_ID=${type} and receipt_date is null and to_char(CHECK_DATE,'yyyyMMddhhmmss')  BETWEEN  ${startDate} and ${endDate}  ")
     public List<Map<String,Object>> selectReceiptDate(@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("string") String string,@Param("type") long type);
 
     @Select("select DETAIL_RECEIPT_LIST.* , GAJG_DM.GAJG_MC from DETAIL_RECEIPT_LIST  LEFT JOIN GAJG_DM ON GAJG_DM.GAJG_DM =DETAIL_RECEIPT_LIST.POLICE_CODE  where ACCEPT_NO=#{acceptNo} or card_id=#{acceptNo}")

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

@@ -14,9 +14,9 @@ public interface MaterialManagementService {
 
     public List<PlasticFilmEntity> selectFilm(@Param("beginDate") String beginDate, @Param("endDate")String endDate,String typeCode, String name);
 
-    public boolean insertCardBody(@Param("cardType")String cardType,@Param("totalCount")String totalCount,@Param("note")String note,String name);
+    public boolean insertCardBody(@Param("cardType")String cardType,@Param("totalCount")String totalCount,@Param("note")String note, String name,String cardBodyType);
 
-    public List<CardBodyEntity> selectCardBody(@Param("beginDate")String beginDate, @Param("endDate")String endDate,String typeCode, String name);
+    public List<CardBodyEntity> selectCardBody(@Param("beginDate")String beginDate, @Param("endDate")String endDate,String typeCode, String name,String cardBodyType);
 
     public String selectFilmCount1(@Param("beginDate") String beginDate,@Param("endDate")String endDate,String typeCode, String name);
 

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

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

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

@@ -28,14 +28,14 @@ public class MaterialManagementServiceImpl implements MaterialManagementService
     }
 
     @Override
-    public boolean insertCardBody( String cardType, String totalCount, String note,String name) {
-        materialManagementMapper.insertCardBody(cardType,totalCount,note,name);
+    public boolean insertCardBody( String cardType, String totalCount, String note,String name,String cardBodyType) {
+        materialManagementMapper.insertCardBody(cardType,totalCount,note,name,Long.valueOf(cardBodyType));
         return true;
     }
 
     @Override
-    public List<CardBodyEntity> selectCardBody(String beginDate, String endDate,String typeCode, String name) {
-        List<CardBodyEntity> resultList = materialManagementMapper.selectCardBody(beginDate, endDate, typeCode,  name);
+    public List<CardBodyEntity> selectCardBody(String beginDate, String endDate,String typeCode, String name,String cardBodyType) {
+        List<CardBodyEntity> resultList = materialManagementMapper.selectCardBody(beginDate, endDate, typeCode,  name,cardBodyType);
         return resultList;
     }
 

src/main/resources/static/index.html

@@ -191,5 +191,7 @@
 <script src="views/ReadDeliveredInfo/ReadDeliveredInfo.js"></script>
 <script src="views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.js"></script>
 <script src="views/queryDeliveredReport/queryDeliveredReport.js"></script>
+<script src="views/insertFilm/insertFilm.js"></script>
+<script src="views/insertCardBody/insertCardBody.js"></script>
 </body>
 </html>
\ No newline at end of file

src/main/resources/static/js/app.js

@@ -33,7 +33,9 @@ angular.module('AvatarCheck', [
     'AvatarCheck.queryQualityCheckReport',
     'AvatarCheck.ReadDeliveredInfo',
     'AvatarCheck.saveDeliveredFailedInfo',
-    'AvatarCheck.queryDeliveredReport'
+    'AvatarCheck.queryDeliveredReport',
+    'AvatarCheck.insertFilm',
+    'AvatarCheck.insertCardBody'
 ]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
         $locationProvider.hashPrefix('!');
     $routeProvider.otherwise({redirectTo: '/createTaskList'});
@@ -184,6 +186,12 @@ angular.module('AvatarCheck', [
         if($location.path()=="/queryDeliveredReport"){
             $rootScope.tab = '/queryDeliveredReport';
         }
+        if($location.path()=="/insertFilm"){
+            $rootScope.tab = '/insertFilm';
+        }
+        if($location.path()=="/insertCardBody"){
+            $rootScope.tab = '/insertCardBody';
+        }
 
 
 

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

@@ -1099,5 +1099,130 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 })
             },
 
+            queryDeliveredFailedType:function (success) {
+                $http({
+                    method: 'GET',
+                    url: "../DeliveredApi/queryDeliveredFailedType" + urlTimeStamp(),
+
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+
+            queryDeliveredByImportDate:function (date,success) {
+                $http({
+                    method: 'GET',
+                    url: "../DeliveredApi/queryDeliveredByImportDate" + urlTimeStamp(),
+                    params:{
+                        date:date
+                    }
+
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+
+            deleteDeliveredByFileId:function (fileid,success) {
+                $http({
+                    method: 'GET',
+                    url: "../DeliveredApi/deleteDeliveredByFileId" + urlTimeStamp(),
+                    params:{
+                        fileId:fileid
+                    }
+
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+            queryDeliveredFailedByRegisterDate:function (date,success) {
+                $http({
+                    method: 'GET',
+                    url: "../DeliveredApi/queryDeliveredFailedByRegisterDate" + urlTimeStamp(),
+                    params:{
+                        date:date
+                    }
+
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+
+            deleteDeliveredFailedById:function (id,success) {
+                $http({
+                    method: 'GET',
+                    url: "../DeliveredApi/deleteDeliveredFailedById" + urlTimeStamp(),
+                    params:{
+                        id:id
+                    }
+
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+            insertFilm:function (totalCount,plasticFilmType,note,name,success) {
+                $http({
+                    method: 'GET',
+                    url: "../MaterialManagementApi/insertFilm" + urlTimeStamp(),
+                    params:{
+                        totalCount :totalCount,
+                        plasticFilmType :plasticFilmType,
+                        note:note,
+                        name:name
+                    }
+
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+            selectPlasticFilmManagement:function (date1, date2, plasticFilmType, name,success) {
+                $http({
+                    method: 'GET',
+                    url: "../MaterialManagementApi/selectPlasticFilmManagement" + urlTimeStamp(),
+                    params:{
+                        beginDate :date1,
+                        endDate :date2,
+                        typeCode:plasticFilmType,
+                        name:name
+                    }
+
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+            // String cardType,@Param("totalCount")String totalCount,@Param("note")String note, @Param("name")String name
+            insertCardBody:function (cardType,totalCount,note,cardBodyType,name,success) {
+                $http({
+                    method: 'GET',
+                    url: "../MaterialManagementApi/insertCardBody" + urlTimeStamp(),
+                    params:{
+                        cardType :cardType,
+                        totalCount :totalCount,
+                        note:note,
+                        name:name,
+                        cardBodyType:cardBodyType
+                    }
+
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+            // @Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name
+            selectCardBodyManagement:function (date1, date2, cardType,cardBodyType,name,success) {
+                $http({
+                    method: 'GET',
+                    url: "../MaterialManagementApi/selectCardBodyManagement" + urlTimeStamp(),
+                    params:{
+                        beginDate :date1,
+                        endDate :date2,
+                        typeCode:cardType,
+                        name:name,
+                        cardBodyType:cardBodyType
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+
+
         }
     });
\ No newline at end of file

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

-<div class="box">
-    <strong class="box-header">导入妥投信息表</strong>
-    <div class="box-primary">
+
+
+<style>
+    .table th, .table td {
+        text-align: center;
+        vertical-align: middle!important;
+    }
+    .ul li{
+        cursor: pointer;
+    }
+    .page-list .pagination {float:left;}
+    .page-list .pagination span {cursor: pointer;}
+    .page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}
+    .page-list .pagination .separate span:hover {background: none;}
+    .page-list .page-total {float:left; margin: 25px 20px;}
+    .page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
+    .page-list .page-total input {width: 40px; padding-left:3px;}
+    .page-list .page-total select {width: 50px;}
+    .page-list:after {
+        display: block;
+        clear: both;
+        content: ""
+    }
+
+    .page-list{
+        zoom: 1
+    }
+</style>
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
+        <div class="box">
+            <strong class="box-header with-border">导入妥投信息表</strong>
+            <div class="box box-primary">
                 <table class="table table-bordered">
-            <tr>
-               <td>文件名称</td>
-                <td><input type="text" ng-model="importName"/></td>
-            </tr>
+                <!--<tr>-->
+                <!--<td>文件名称</td>-->
+                <!--<td><input type="text" ng-model="importName"/></td>-->
+                <!--</tr>-->
                 <tr>
                 <td>选择Excel文件：</td>
                 <td  colspan="2">
@@ -24,4 +54,50 @@
                 </tr>
                 </table>
             </div>
+        </div>
+        <div class="box box-default">
+
+            <div class="box-header with-border"><strong>查询导入妥投信息</strong>
+                <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="Date" id="datepicker" readonly/>
+                <button class="btn btn-primary" ng-click="queryDeliveredByImportDate()">查询</button>
+                <!--(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共-->
+            <!--{{paginationConf.totalItems}}条</span>)</div>-->
+                <div ng-if="deliveredByImportDate.length==0">
+                    <h4>暂无数据</h4>
+                </div>
+            <div class="box-info" style="padding: 7px;padding-top: 0px;">
+                <table class="table table-bordered table-hover postTable" ng-if="deliveredByImportDate.length>0">
+                    <thead>
+                    <tr>
+                        <th>流水号</th>
+                        <th>妥投文件名</th>
+                        <th>导入时间</th>
+                        <th>导入人姓名</th>
+                        <th>导入数量</th>
+                        <th>   </th>
+
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr ng-repeat="item in deliveredByImportDate">
+                        <td>{{item.id}}</td>
+                        <td>{{item.fileName}}</td>
+                        <td>{{item.importDate}}</td>
+                        <td>{{item.importName}}</td>
+                        <td>{{item.importCount}}</td>
+                        <td><button class="btn btn-primary"  ng-click="deleteDeliveredByFileId(item.id)">删除</button></td>
+
+                    </tr>
+                    </tbody>
+                </table>
+                <!--<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>
 </div>
+    </div>
\ No newline at end of file

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

@@ -10,7 +10,7 @@ angular.module("AvatarCheck.ReadDeliveredInfo",['ngRoute', 'AvatarCheck.http'])
     .controller('readDeliveredInfoContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
 
         $scope.ReadDeliveredInfo = function () {
-            var importName = $scope.importName;
+            var importName = $rootScope.loginData.name;
             var fd = new FormData();
             var files = document.querySelector('input#id_file_photo_for_check').files;
             if(files.length==0){
@@ -44,4 +44,44 @@ angular.module("AvatarCheck.ReadDeliveredInfo",['ngRoute', 'AvatarCheck.http'])
 
             }
         }
+        //Date picker
+        $('#datepicker').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyy-mm-dd',
+            todayBtn: 1,
+            autoclose: 1
+        });
+        $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
+        //清除的代码
+        $(".glyphicon-remove").click(function(){
+            $($($(this).parent()).prev()).val("");
+        })
+
+        $scope.queryDeliveredByImportDate=function () {
+            var date = $("#datepicker").val();
+            console.log(date)
+            HttpService.queryDeliveredByImportDate(date,function(data){
+                $scope.deliveredByImportDate = data;
+                console.log($scope.deliveredByImportDate)
+            })
+        }
+        
+        $scope.deleteDeliveredByFileId=function (fileid) {
+
+            console.log(fileid);
+            HttpService.deleteDeliveredByFileId(fileid,function(data){
+
+                if(data==true){
+                    MessageService.showAlert("删除成功")
+                }else{
+                    MessageService.showAlert("删除失败")
+                }
+                HttpService.queryDeliveredByImportDate($("#datepicker").val(),function(data){
+                    $scope.deliveredByImportDate = data;
+                    console.log($scope.deliveredByImportDate)
+                })
+
+            })
+        }
     })
\ No newline at end of file

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

+<style>
+    .table th, .table td {
+        text-align: center;
+        vertical-align: middle!important;
+    }
+    .select2-search__field {
+        height:30px;
+    }
+    .ul li{
+        cursor: pointer;
+    }
+    .table .colSpan{
+        column-span: 5;
+
+    }
+    .page-list .pagination {float:left;}
+    .page-list .pagination span {cursor: pointer;}
+    .page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}
+    .page-list .pagination .separate span:hover {background: none;}
+    .page-list .page-total {float:left; margin: 25px 20px;}
+    .page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
+    .page-list .page-total input {width: 40px; padding-left:3px;}
+    .page-list .page-total select {width: 50px;}
+    .page-list:after {
+        display: block;
+        clear: both;
+        content: ""
+    }
+
+    .page-list{
+        zoom: 1
+    }
+</style>
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
+        <div class="box">
+            <strong class="box-header">添加卡体耗材数据</strong>
+            <div class="box box-primary">
+                <table class="table table-bordered" style="margin-bottom: 0;">
+                    <tr>
+                        <td>数量:</td>
+                        <td><input type="number" class="form-control" ng-model="totalCount" placeholder="数量"></td>
+                        <td>卡体类型:</td>
+                        <td>
+                            <select class="form-control select2" id="cardBodyType">
+                                <option value="1">身份证卡体</option>
+                                <option  value="2">香港居住证卡体</option>
+                                <option  value="3">港澳居住证卡体</option>
+                            </select>
+                        </td>
+                        <td>操作:</td>
+                        <td>
+                            <input type="radio" ng-model="cardType" name="type" value="1" ng-checked="true">出库
+                            <input style="margin-left: 10px;" type="radio" ng-model="cardType" name="type" value="2">入库
+                        </td>
+                        <td>备注:</td>
+                        <td>
+                            <input type="text" class="form-control" ng-model="note" placeholder="备注">
+                        </td>
+                        <td>
+                            <div style="text-align: left;">
+                                <button class="btn btn-primary" ng-click="insertCardBody()">提交</button>
+                            </div>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+        <div class="box">
+            <div class="box-header">
+                <strong>查询卡体耗材统计数据</strong>
+            </div>
+            <div class="box box-primary">
+                <table class="table table-bordered" style="margin-bottom: 0;">
+                    <tr>
+                        <td> <span>起始日期:</span></td>
+                        <td>
+                            <input type="text" class="form-control" ng-model="choseDate" id="datepicker1" readonly/>
+                        </td>
+                        <td> <span>结束日期:</span></td>
+                        <td>
+                            <input type="text" class="form-control" ng-model="choseDate" id="datepicker2" readonly/>
+                        </td>
+                        <td>卡体类型:</td>
+                        <td>
+                            <select class="form-control select2" id="cardBodyType1">
+                                <option value="0">全部</option>
+                                <option value="1">身份证卡体</option>
+                                <option  value="2">香港居住证卡体</option>
+                                <option  value="3">港澳居住证卡体</option>
+                            </select>
+                        </td>
+                        <td>操作:</td>
+                        <td>
+                            <select class="form-control select2" id="cardType2">
+                                <option value="0">全部</option>
+                                <option  value="1">出库</option>
+                                <option  value="2">入库</option>
+                            </select>
+                        </td>
+                        <td><div style="text-align: left;">
+                            <button class="btn btn-primary" ng-click="selectCardBodyManagement()">查询</button>
+                        </div></td>
+                    </tr>
+                </table>
+                <div ng-if="cardBodyManagement.cardBody.length==0">
+                    <h4>暂无数据</h4>
+                </div>
+                <div class="box-info" style="padding: 7px;padding-top: 0px;">
+                    <table class="table table-bordered table-hover postTable" ng-if="cardBodyManagement.cardBody.length>0">
+                        <thead>
+                        <tr>
+                            <th>卡基统计信息表ID</th>
+                            <th>保存时间</th>
+                            <th>数量</th>
+                            <th>卡基类型</th>
+                            <th>备注</th>
+                            <th>提交人</th>
+                            <!--<th>出库总数</th>-->
+                            <!--<th>入库总数</th>-->
+
+                        </tr>
+                        </thead>
+
+                        <tbody>
+                        <tr ng-repeat="item in cardBodyManagement.cardBody">
+                            <td>{{item.cardBodyId}}</td>
+                            <td>{{item.saveDate}}</td>
+                            <td>{{item.totalCount}}</td>
+                            <!--<td>-->
+                                <!--({{item.cardType}}==1)?出库:入库-->
+                                <!---->
+                            <!--</td>-->
+                            <td ng-if="item.cardType==1">出库</td>
+                            <td ng-if="item.cardType==2">入库</td>
+                            <td>{{item.note}}</td>
+                            <td>{{item.name}}</td>
+                            <!--<td>{{item.plasticFilmCount1}}</td>-->
+                            <!--<td>{{item.plasticFilmCount2}}</td>-->
+                        </tr>
+
+                        <tr>
+                            <th>合计</th>
+                            <td  class="colSpan" colspan="2"  ng-if="cardType2==1" >{{cardBodyManagement.cardCount1}}</td>
+                            <td class="colSpan" colspan="2" ng-if="cardType2==2" >{{cardBodyManagement  .cardCount2}}</td>
+                        </tr>
+
+
+
+                        </tbody>
+                    </table>
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file

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

+'use strict';
+angular.module("AvatarCheck.insertCardBody",['ngRoute', 'AvatarCheck.http'])
+    .config(['$routeProvider', function ($routeProvider){
+        $routeProvider.when('/insertCardBody', {
+            templateUrl: 'views/insertCardBody/insertCardBody.html' + urlTimeStamp(),
+            controller: 'insertCardBodyContr',
+            cache: false
+        });
+    }])
+    .controller('insertCardBodyContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
+        //Date picker
+        $('#datepicker1').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyy-mm-dd',
+            todayBtn: 1,
+            autoclose: 1
+        });
+        $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
+
+        //Date picker
+        $('#datepicker2').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyy-mm-dd',
+            todayBtn: 1,
+            autoclose: 1
+        });
+        $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
+
+        $scope.insertCardBody = function () {
+            var totalCount = $scope.totalCount;
+            var note = $scope.note;
+            var cardType = $scope.cardType;
+            var cardBodyType = $("#cardBodyType").val();
+            var name = $rootScope.loginData.name;
+            if(angular.isUndefined(cardType)){
+                cardType="1";
+            }
+            console.log(totalCount,note,cardType,cardBodyType,name);
+            HttpService.insertCardBody(cardType,totalCount,note,cardBodyType,name, function (data) {
+                if(data==false){
+                    MessageService.showAlert("插入失败")
+                }else{
+                    MessageService.showAlert("插入成功")
+                }
+                console.log(data)
+            })
+        }
+
+        $scope.selectCardBodyManagement=function(){
+            var cardType = $("#cardType2").val();
+            var date1 = $("#datepicker1").val();
+            var date2 = $("#datepicker2").val();
+            var cardBodyType1 = $("#cardBodyType1").val();
+            if (date1==""){
+                date1=$scope.choseDate;
+            }
+            if (date2==""){
+                date2=$scope.choseDate;
+            }
+            var name = $rootScope.loginData.name;
+            console.log(date1, date2, cardType,cardBodyType1, name)
+            HttpService.selectCardBodyManagement(date1, date2, cardType,cardBodyType1,name, function (data) {
+                $scope.cardBodyManagement = data;
+                console.log(data)
+            })
+        }
+        $scope.selectCardBodyManagement();
+
+    })
\ No newline at end of file

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

+<style>
+    .table th, .table td {
+        text-align: center;
+        vertical-align: middle!important;
+    }
+    .select2-search__field {
+        height:30px;
+    }
+    .ul li{
+        cursor: pointer;
+    }
+
+    .page-list .pagination {float:left;}
+    .page-list .pagination span {cursor: pointer;}
+    .page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}
+    .page-list .pagination .separate span:hover {background: none;}
+    .page-list .page-total {float:left; margin: 25px 20px;}
+    .page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
+    .page-list .page-total input {width: 40px; padding-left:3px;}
+    .page-list .page-total select {width: 50px;}
+    .page-list:after {
+        display: block;
+        clear: both;
+        content: ""
+    }
+
+    .page-list{
+        zoom: 1
+    }
+</style>
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
+        <div class="box ">
+            <strong class="box-header">添加膜耗材数据</strong>
+            <div class="box box-primary">
+                <table class="table table-bordered" style="margin-bottom: 0;">
+                    <tr>
+                        <td>数量:</td>
+                        <td>
+                            <input  type="text" class="form-control" ng-model="totalCount" placeholder="数量" required>
+                        </td>
+                        <td>操作:</td>
+                        <td>
+                            <input type="radio" ng-model="plasticFilmType" name="type" value="1" ng-checked="true">出库
+                            <input style="margin-left: 10px;" type="radio" ng-model="plasticFilmType" name="type" value="2">入库
+                        </td>
+                        <td>备注:</td>
+                        <td><input type="text" class="form-control" ng-model="note" placeholder="备注"></td>
+                        <td>
+                            <div style="text-align: left;">
+                                <button class="btn btn-primary" ng-click="insertFilm()">提交</button>
+                            </div>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+        <div class="box box-default">
+            <div class="box-header">
+                <strong>查询膜耗材统计数据</strong>
+            </div>
+            <div class="box box-primary">
+                <table class="table table-bordered" style="margin-bottom: 0;">
+                    <tr>
+                        <td> <span>起始日期:</span></td>
+                        <td>
+                            <input type="text" class="form-control" ng-model="choseDate" id="datepicker1" readonly/>
+                        </td>
+                        <td> <span>结束日期:</span></td>
+                        <td>
+                            <input type="text" class="form-control" ng-model="choseDate" id="datepicker2" readonly/>
+                        </td>
+                        <td>操作:</td>
+                        <td>
+                            <select class="form-control select2" id="cardType2">
+                                <option value="0">全部</option>
+                                <option  value="1">出库</option>
+                                <option  value="2">入库</option>
+                            </select>
+                        </td>
+                        <td><div style="text-align: left;">
+                            <button class="btn btn-primary" ng-click="selectPlasticFilmManagement()">查询</button>
+                        </div></td>
+                    </tr>
+                </table>
+                <div ng-if="plasticFilmdata.plasticFilm.length==0">
+                    <h4>暂无数据</h4>
+                </div>
+                <div class="box-info" style="padding: 7px;padding-top: 0px;">
+                    <table class="table table-bordered table-hover postTable" ng-if="plasticFilmdata.plasticFilm.length>0">
+                        <thead>
+                        <tr>
+                            <th>塑料膜表流水号</th>
+                            <th>保存时间</th>
+                            <th>数量</th>
+                            <th>膜类型</th>
+                            <th>备注</th>
+                            <th>提交人</th>
+                            <!--<th>出库总数</th>-->
+                            <!--<th>入库总数</th>-->
+
+                        </tr>
+                        </thead>
+
+                        <tbody>
+                        <tr ng-repeat="item in plasticFilmdata.plasticFilm">
+                            <td>{{item.plasticFilmId}}</td>
+                            <td>{{item.saveDate}}</td>
+                            <td>{{item.totalCount}}</td>
+                            <td ng-if="item.plasticFilmType==1">出库</td>
+                            <td ng-if="item.plasticFilmType==2">入库</td>
+                            <td>{{item.note}}</td>
+                            <td>{{item.name}}</td>
+                            <!--<td>{{item.plasticFilmCount1}}</td>-->
+                            <!--<td>{{item.plasticFilmCount2}}</td>-->
+                        </tr>
+
+                        <tr>
+                            <th>合计</th>
+                            <td  colspan="2" ng-if="plasticFilmType2==1" >{{plasticFilmdata.plasticFilmCount1}}</td>
+                            <td  colspan="2" ng-if="plasticFilmType2==2" >{{plasticFilmdata.plasticFilmCount2}}</td>
+                        </tr>
+
+
+
+                        </tbody>
+                    </table>
+
+                </div>
+            </div>
+        </div>
+        </div>
+
+    </div>
+</div>
\ No newline at end of file

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

+'use strict';
+angular.module("AvatarCheck.insertFilm",['ngRoute', 'AvatarCheck.http'])
+    .config(['$routeProvider', function ($routeProvider){
+        $routeProvider.when('/insertFilm', {
+            templateUrl: 'views/insertFilm/insertFilm.html' + urlTimeStamp(),
+            controller: 'insertFilmContr',
+            cache: false
+        });
+    }])
+    .controller('insertFilmContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
+
+        //Date picker
+        $('#datepicker1').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyy-mm-dd',
+            todayBtn: 1,
+            autoclose: 1
+        });
+        $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
+
+        //Date picker
+        $('#datepicker2').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyy-mm-dd',
+            todayBtn: 1,
+            autoclose: 1
+        });
+        $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
+
+        $scope.insertFilm = function () {
+            var totalCount = $scope.totalCount;
+            var note = $scope.note;
+            var plasticFilmType = $scope.plasticFilmType;
+            var name = $rootScope.loginData.name;
+            if(angular.isUndefined(plasticFilmType)){
+                plasticFilmType="1";
+            }
+            console.log(totalCount, plasticFilmType, note, name)
+            HttpService.insertFilm(totalCount, plasticFilmType, note, name, function (data) {
+                    if(data==false){
+                        MessageService.showAlert("插入失败")
+                    }else{
+                        MessageService.showAlert("插入成功")
+                    }
+                console.log(data)
+            })
+        }
+
+        $scope.selectPlasticFilmManagement=function(){
+            var plasticFilmType = $("#cardType2").val();
+            var date1 = $("#datepicker1").val();
+            var date2 = $("#datepicker2").val();
+            if (date1==""){
+                date1=$scope.choseDate;
+            }
+            if (date2==""){
+                date2=$scope.choseDate;
+            }
+            var name = $rootScope.loginData.name;
+            console.log(date1, date2, plasticFilmType, name)
+            HttpService.selectPlasticFilmManagement(date1, date2, plasticFilmType, name, function (data) {
+                $scope.plasticFilmdata = data;
+                console.log(data)
+            })
+        }
+        $scope.selectPlasticFilmManagement();
+
+    })
\ No newline at end of file

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

@@ -18,12 +18,10 @@
                         <div ng-if="reportData.length==1">
                             <h4>暂无数据</h4>
                         </div>
-
                         <div ng-if="reportData.length>1">
-
                             <div  class="table-responsive mailbox-messages" >
                                 <div class="mailbox-messages">
-                                    <table class="table table-hover postTable">
+                                    <table class="table table-hover">
                                         <thead>
                                         <tr>
                                             <th>打印日期</th>
@@ -35,7 +33,7 @@
                                         </tr>
                                         </thead>
                                         <tbody ng-repeat="item in reportData">
-                                        <tr style="background-color: #eee">
+                                        <tr>
                                             <td>{{item.date}}</td>
                                             <td style="color: #3c8dbc">{{item.pu}}</td>
                                             <td>{{item.you}}</td>

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

@@ -43,7 +43,12 @@
                     </tr>
                     <tr>
                         <td>退回原因:</td>
-                        <td><input type="text" class="form-control"  ng-model="backReason" placeholder="退回原因"></td>
+                        <td>
+                            <select class="form-control select2" ng-model="backReason">
+                                <option value="">--请选择退回原因--</option>
+                                <option ng-repeat="item in backReasonList" value="{{item.id}}">{{item.reason}}</option>
+                            </select>
+                        </td>
                         <td>备注:</td>
                         <td><input type="text" class="form-control" ng-model="note" placeholder="备注"></td>
 
@@ -55,5 +60,52 @@
                 </table>
             </div>
         </div>
+        <div class="box box-default">
+
+            <div class="box-header with-border"><strong>查询登记妥投失败信息</strong>
+                <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="Date" id="datepicker" readonly/>
+                <button class="btn btn-primary" ng-click="queryDeliveredFailedByRegisterDate()">查询</button>
+                <!--(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共-->
+                <!--{{paginationConf.totalItems}}条</span>)</div>-->
+                <div ng-if="deliveredFailedByRegisterDate.length==0">
+                    <h4>暂无数据</h4>
+                </div>
+                <div class="box-info" style="padding: 7px;padding-top: 0px;">
+                    <table class="table table-bordered table-hover postTable" ng-if="deliveredFailedByRegisterDate.length>0">
+                        <thead>
+                        <tr>
+                            <th>流水号</th>
+                            <th>登记人姓名</th>
+                            <th>运单号</th>
+                            <th>备注</th>
+                            <th>退回原因</th>
+                            <th>身份证号码</th>
+                            <th></th>
+
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <!--REGISTER_NAME: "qwdqw", WAYBILL_NUMBER: "4", NOTE: "3", BACK_REASON: 1, CARD_ID: "adqwd",-->
+                        <tr ng-repeat="item in deliveredFailedByRegisterDate">
+                            <td>{{item.ID}}</td>
+                            <td>{{item.REGISTER_NAME}}</td>
+                            <td>{{item.WAYBILL_NUMBER}}</td>
+                            <td>{{item.NOTE}}</td>
+                            <td>{{item.REASON}}</td>
+                            <td>{{item.CARD_ID}}</td>
+                            <td><button class="btn btn-primary"  ng-click="deleteDeliveredFailedById(item.ID)">删除</button></td>
+
+                        </tr>
+                        </tbody>
+                    </table>
+                    <!--<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>
     </div>
 </div>
\ No newline at end of file

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

@@ -8,11 +8,32 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht
         });
     }])
     .controller('saveDeliveredFailedInfoContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
+        HttpService.queryDeliveredFailedType(function(data) {
+            console.log(data)
+            $scope.backReasonList = data;
+        })
+
+        //Date picker
+        $('#datepicker').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyy-mm-dd',
+            todayBtn: 1,
+            autoclose: 1
+        });
+        $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
+        //清除的代码
+        $(".glyphicon-remove").click(function(){
+            $($($(this).parent()).prev()).val("");
+        })
         $scope.saveDeliveredFailedInfo=function () {
             var waybillNumber = $scope.waybillNumber;
             var registerName = $scope.registerName;
             var cardId = $scope.cardId;
             var backReason = $scope.backReason;
+            if(backReason==null){
+                MessageService.showAlert("请选择退回原因")
+            }else{
             var note = $scope.note;
 
             var arr = [{"waybillNumber":waybillNumber,"registerName":registerName,"cardId":cardId,"backReason":backReason,"note":note}];
@@ -20,10 +41,37 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht
             HttpService.saveDeliveredFailedInfo(arr,function (data) {
 
                 if(data==true){
-                    confirm("提交成功");
+                    MessageService.showAlert("提交成功");
+                }else{
+                    MessageService.showAlert("提交失败!!")
+                }
+
+            })
+            }
+        }
+        $scope.queryDeliveredFailedByRegisterDate=function () {
+            var date = $("#datepicker").val();
+            console.log(date)
+            HttpService.queryDeliveredFailedByRegisterDate(date,function(data){
+                $scope.deliveredFailedByRegisterDate = data;
+                console.log($scope.deliveredFailedByRegisterDate)
+            })
+        }
+
+        $scope.deleteDeliveredFailedById=function (id) {
+
+            console.log(id);
+            HttpService.deleteDeliveredFailedById(id,function(data){
+
+                if(data==true){
+                    MessageService.showAlert("删除成功")
                 }else{
-                    alert("提交失败!!")
+                    MessageService.showAlert("删除失败")
                 }
+                HttpService.queryDeliveredFailedByRegisterDate($("#datepicker").val(),function(data){
+                    $scope.deliveredFailedByRegisterDate = data;
+                    console.log($scope.deliveredFailedByRegisterDate)
+                })
 
             })
         }

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

@@ -28,7 +28,6 @@
                         <th>下发日期</th>
                         <th>膜打印</th>
                         <th>预定位</th>
-                        <th>电写入</th>
                         <th>分拣</th>
                         <th>质检</th>
                         </thead>
@@ -41,7 +40,6 @@
                             <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>
                             <td>{{item.POSITION_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
-                            <td>{{item.SORT_OUT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                             <td>{{item.QUALITY_TEST_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                             <td>{{item.OUT_STORAGE_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                         </tr>

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

@@ -27,6 +27,7 @@
                     <td style="text-align: center;vertical-align: middle!important;">至</td>
                     <td><input class="form-control" name="yxqend" type="text" ng-model="endDate" placeholder="截至日期"></td>
                     <td style="text-align: left;">
+                        <button class="btn btn-primary" ng-click="doQueryByIdCard(idCard,startDate,endDate)">查询</button>
                         <button class="btn btn-primary" ng-click="startReading()">开始读卡</button>
                         <button class="btn btn-primary" ng-click="endReading()">停止读卡</button>
                     </td>
@@ -42,7 +43,7 @@
         </div>
         <div class="box-body col-md-12">
             <div class="col-md-5" style="padding:0" >
-                <table class="table table-bordered table-hover postTable" ng-if="tagPrintData.length>0">
+                <table class="table table-bordered postTable" ng-if="tagPrintData.length>0">
                         <thead>
                         <tr>
                             <th>NO.</th>
@@ -55,7 +56,7 @@
                         </tr>
                         </thead>
                         <tbody>
-                        <tr ng-click="showDetail(item)" ng-repeat="item in tagPrintData">
+                        <tr ng-click="showDetail(item)" ng-repeat="item in tagPrintData" class="{{item.styleClass}}">
                             <td>{{$index+1}}</td>
                             <td>{{item.POLICE_CODE}}</td>
                             <td>{{item.GAJG_MC}}</td>

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

@@ -14,16 +14,12 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
 
         $scope.acceptNo = 'ACCEPT_NO';
 
-        //Date picker
-        $('#datepicker').datetimepicker({
-            minView: "month", //选择日期后，不会再跳转去选择时分秒
-            language: 'zh-CN',
-            format: 'yyyy-mm-dd',
-            todayBtn: 1,
-            autoclose: 1
-        });
 
-        $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
+        var postParam={
+            idCard:'',
+            startDate:'',
+            endDate:''
+        }
 
         $scope.json={
             id:'',
@@ -35,12 +31,18 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
         }
 
         var getDetailListById = function (id) {
+            for(var i=0;i<$scope.tagPrintData.length;i++){
+                if($scope.tagPrintData[i].show===false){
+                    $scope.tagPrintData[i].styleClass = "";
+                }else{
+                    $scope.tagPrintData[i].styleClass = "bg-info";
+                }
+            }
             console.log(id)
             HttpService.getPoliceCardsList(id,function(data) {
                 $scope.json.policeCardsList = data;
-                console.log("---------",$scope.json.policeCardsList)
                 for (var i=0;i<$scope.json.policeCardsList.length;i++){
-                    if($scope.json.policeCardsList[i].CARD_ID==$scope.idCard){
+                    if($scope.json.policeCardsList[i].CARD_ID===postParam.idCard){
                         $scope.json.policeCardsList[i].styleClass = "bg-danger"
                     }
                 }
@@ -50,7 +52,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
         }
         $scope.showDetail = function(item){
             for(var i=0;i<$scope.tagPrintData.length;i++){
-                if($scope.tagPrintData[i].ID!=item.ID){
+                if($scope.tagPrintData[i].ID!==item.ID){
                     $scope.tagPrintData[i].show = false;
                 }
             }
@@ -61,7 +63,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
             $scope.json.count = item.FINISH_COUNT;
             $scope.json.isShow=item.show;
             getDetailListById(item.ID);
-        }
+        };
 
         var getPoliceListDataNotChecked = function () {
             HttpService.getPoliceListDataNotCheckedData(function(data){
@@ -71,57 +73,72 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                 }
                 console.log($scope.tagPrintData)
             })
-        }
+        };
         getPoliceListDataNotChecked();
 
-
-
         $scope.checkSame = function (id) {
             HttpService.updateReceiptList(id,function(data) {
                 if(data){
                     getPoliceListDataNotChecked();
                     $scope.json.isShow=false;
+                    $scope.json.policeCardsList=[];
                 }else {
                     MessageService.showAlert("复核失败")
                 }
             })
-        }
-
-        var postParam={
-            idCard:'',
-            startDate:'',
-            endDate:''
-        }
+        };
 
-        var doQueryByIdCard = function(idcard,startDate,endDate){
-            console.log(idcard,startDate,endDate)
+        var getCardDetailsByIdCardAndDate = function (idcard,startDate,endDate) {
             HttpService.selectTagPrintData(idcard,startDate,endDate,function(data){
-                console.log(data)
-                if(data.state==1){
+                console.log(data);
+                if(data.state===1){
                     $scope.json.isShow=true;
                     getPoliceListDataNotChecked();
                     getDetailListById(data.id)
-                }else if(data.state==2){
+                    for(var i=0;i<$scope.tagPrintData.length;i++){
+                        if($scope.tagPrintData[i].ID===data.id){
+                            $scope.tagPrintData[i].styleClass="bg-info";
+                        }
+                    }
+                }else if(data.state===2){
                     if(data.checkName===$rootScope.loginData.name){
                         $scope.json.isShow=true;
                         getDetailListById(data.id)
-                        for (var i=0;i<$scope.json.policeCardsList.length;i++){
-                            if($scope.json.policeCardsList[i].CARD_ID==idcard&&$scope.json.policeCardsList[i].styleClass==''){
-                                $scope.json.policeCardsList[i].styleClass = "bg-danger"
+                        for(var i=0;i<$scope.tagPrintData.length;i++){
+                            if($scope.tagPrintData[i].ID===data.id){
+                                $scope.tagPrintData[i].styleClass="bg-info";
                             }
                         }
                     }else{
                         $scope.json.isShow=false;
                         MessageService.showAlert($rootScope.loginData.name+"  已生成  "+data.policeName+"  的交接单")
                     }
-
                 }else{
-                    MessageService.showAlert("无该证件的制证记录")
+                    MessageService.showAlert("无该证件的制证记录");
                     $scope.json.isShow=false;
                 }
             })
         }
 
+        $scope.doQueryByIdCard = function(idcard,startDate,endDate){
+            console.log(idcard,startDate,endDate);
+            if($scope.json.policeCardsList.length>0&&$scope.json.isShow===true){
+                var count=0;
+                for (var i=0;i<$scope.json.policeCardsList.length;i++){
+                    if($scope.json.policeCardsList[i].CARD_ID===idcard){
+                        $scope.json.policeCardsList[i].styleClass="bg-danger";
+                    } else{
+                        count=count+1;
+                    }
+                    if(count===$scope.json.policeCardsList.length){
+                        MessageService.showAlert("身份证号:"+idcard+" 在本组中不存在");
+                    }
+                }
+            }else{
+                getCardDetailsByIdCardAndDate(idcard,startDate,endDate);
+            }
+        };
+
         var open = function () {
             var flag = 0;
             if (document.getElementById("aaa").OpenComm(1001) == 1) {
@@ -153,7 +170,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                                 postParam.idCard = myform.idCard.value;
                                 postParam.startDate = myform.yxqstart.value;
                                 postParam.endDate = myform.yxqend.value;
-                                doQueryByIdCard(postParam.idCard,postParam.startDate,postParam.endDate);
+                                $scope.doQueryByIdCard(postParam.idCard,postParam.startDate,postParam.endDate);
                             }
                         }
                     } else {