Merge branch 'dev' of…

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

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

@@ -6,6 +6,7 @@ import com.yxproject.start.service.MaterialManagementService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
@@ -26,8 +27,8 @@ public class MaterialManagementApi {
      * @return
      */
     @RequestMapping("insertFilm")
-    public boolean insertFilm(@Param("totalCount")String totalCount, @Param("plasticFilmType")String plasticFilmType, @Param("note")String note, @Param("name")String name){
-        boolean result = materialManagementService.insertFilm(totalCount, plasticFilmType, note,name);
+    public boolean insertFilm(@Param("totalCount")String totalCount, @Param("plasticFilmType")String plasticFilmType, @Param("note")String note, @Param("name")String name,@Param("state")String state){
+        boolean result = materialManagementService.insertFilm(totalCount, plasticFilmType, note,name,Long.valueOf(state));
         return result;
     }
 
@@ -39,8 +40,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,@Param("state")String state){
+        boolean result = materialManagementService.insertCardBody(cardType, totalCount, note,name,cardBodyType,Long.valueOf(state));
         return result;
     }
 
@@ -76,9 +77,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);
@@ -108,8 +109,127 @@ public class MaterialManagementApi {
 
     }
 
+    /**
+     * 更新卡体详情状态
+     * @param id cardBodyID
+     * @return
+     */
+    @RequestMapping("updateCardBody")
+    public boolean updateCardBody(@Param("id")String id){
+        return materialManagementService.updateCardBodyState(Long.valueOf(id));
+
+    }
 
+    /**
+     * 查询未审核卡体详情
+     */
+    @RequestMapping("selectCardBody")
+    public List<CardBodyEntity> selectCardBody(){
+        return materialManagementService.selectCardBody();
 
+    }
+
+
+    /**
+     * 更新膜详情状态
+     * @param id cardBodyID
+     * @return
+     */
+    @RequestMapping("updatePlasticFilm")
+    public boolean updatePlasticFilm(@Param("id")String id){
+        return materialManagementService.updatePlasticFilm(Long.valueOf(id));
+
+    }
+
+    /**
+     * 查询未审核膜详情
+     */
+    @RequestMapping("selectPlasticFilm")
+    public List<PlasticFilmEntity> selectPlasticFilm(){
+        return materialManagementService.selectPlasticFilm();
+
+    }
+
+
+    /**
+     * 查询卡基报表统计数据
+     * @param beginDate 开始时间
+     * @param endDate 结束时间
+     * @param operateType 出入库类型
+     * @param name 操作人
+     * @param cardBodyType 卡体类型
+     * @return
+     */
+    @RequestMapping("queryCardBodyReport")
+    public Map<String,Object> queryCardBodyReport(@Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("operateType")String operateType, @Param("name")String name, @Param("cardBodyType")String cardBodyType, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){
+        Map<String, Object> map = materialManagementService.selectCardBodyReport(replaceDate(beginDate), replaceDate(endDate), operateType, replaceNullString(name), cardBodyType,(Long.valueOf(currPage)-1)*Long.valueOf(pageSize)+1,Long.valueOf(currPage)*Long.valueOf(pageSize));
+        return map;
+
+    }
+
+    /**
+     * 查询卡基报表统计数量
+     * @param beginDate 开始时间
+     * @param endDate 结束时间
+     * @param operateType 出入库类型
+     * @param name 操作人
+     * @param cardBodyType 卡体类型
+     * @return
+     */
+    @RequestMapping("queryCardBodyReportCount")
+    public int queryCardBodyReportCount(@Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("operateType")String operateType, @Param("name")String name, @Param("cardBodyType")String cardBodyType){
+        int i = materialManagementService.selectCardBodyReportCount(replaceDate(beginDate), replaceDate(endDate), operateType, replaceNullString(name), cardBodyType);
+        return i;
+
+    }
+    /**
+     * 查询卡基操作人
+     */
+    @RequestMapping("queryCardBodyOperation")
+    public List<Map<String,Object>> queryCardBodyOperation(){
+        List<Map<String, Object>> maps = materialManagementService.selectCardBodyOperation();
+        return maps;
+
+    }
+
+    /**
+     * 查询膜报表统计数据
+     * @param beginDate 开始时间
+     * @param endDate 结束时间
+     * @param operateType 出入库类型
+     * @param name 操作人
+     * @return
+     */
+    @RequestMapping("queryPlasticFilmReport")
+    public Map<String,Object> queryPlasticFilmReport(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("operateType")String operateType,@Param("name")String name, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){
+        Map<String, Object> map = materialManagementService.selectPlasticFilmReport(replaceDate(beginDate), replaceDate(endDate), operateType,replaceNullString(name),(Long.valueOf(currPage)-1)*Long.valueOf(pageSize)+1,Long.valueOf(currPage)*Long.valueOf(pageSize));
+        return map;
+    }
+
+    /**
+     * 查询膜报表统计数量
+     * @param beginDate 开始时间
+     * @param endDate 结束时间
+     * @param operateType 出入库类型
+     * @param name 操作人
+     * @return
+     */
+    @RequestMapping("queryPlasticFilmReportCount")
+    public int queryPlasticFilmReportCount(@Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("operateType")String operateType, @Param("name")String name){
+        int i = materialManagementService.selectPlasticFilmReportCount(replaceDate(beginDate), replaceDate(endDate), operateType, replaceNullString(name));
+        return i;
+
+    }
+
+    /**
+     * 查询膜操作人
+     */
+    @RequestMapping("queryPlasticFilmOperation")
+    public List<Map<String,Object>> queryPlasticFilmOperation(){
+        List<Map<String, Object>> maps = materialManagementService.selectPlasticFilmOperation();
+        return maps;
+
+    }
 
     /**
      * 去除字符串中中线
@@ -121,4 +241,15 @@ public class MaterialManagementApi {
         return str.replace("-", "").replace(" ","").replace(":","");
     }
 
+    /**
+     * 字符串去除空格
+     *
+     * @param str 原始字符串
+     * @return 返回新的字符串
+     */
+    private String replaceNullString(String str) {
+        if (str == "") {
+            return null;
+        } else return str;
+    }
 }

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/ReceiptApi.java

@@ -307,7 +307,7 @@ public class ReceiptApi {
      */
     @RequestMapping("queryReceiptDateByCheckDate")
     public List<Map<String, Object>> queryReceiptDateByCheckDate(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate) {
-        return receiptService.selectReceiptDateByCheckDate(replaceDate(startDate.replaceAll(" ", "").replaceAll(":", "")),replaceDate(endDate.replaceAll(" ", "").replaceAll(":", "")));
+        return receiptService.selectReceiptDateByCheckDate(replaceNullString(replaceDate(startDate.replaceAll(" ", "").replaceAll(":", ""))),replaceNullString(replaceDate(endDate.replaceAll(" ", "").replaceAll(":", ""))));
     }
 
 

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;
@@ -245,7 +241,6 @@ public class TaskListApi {
     @RequestMapping("createTask")
     @Transactional
     public Map<String, Object> queryByCountyAtACCU(@RequestBody String str, HttpServletResponse resp) {
-        System.out.println(str);
         JSONObject jsonObject = JSONObject.fromObject(str);
         String name = jsonObject.getString("name");
         JSONArray jsonGroup = jsonObject.getJSONArray("groupList");
@@ -273,8 +268,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

@@ -6,7 +6,7 @@ import java.util.Objects;
 
 /**
  * @auther zhangyusheng
- * 2019/4/1   15:03
+ * 2019/4/28   15:12
  */
 @Entity
 @Table(name = "CARD_BODY", schema = "YINGXIN", catalog = "")
@@ -16,7 +16,9 @@ public class CardBodyEntity {
     private Long cardType;
     private Long totalCount;
     private String note;
+    private Long cardBodyType;
     private String name;
+    private long state;
 
     @Id
     @Column(name = "CARD_BODY_ID")
@@ -68,6 +70,16 @@ public class CardBodyEntity {
         this.note = note;
     }
 
+    @Basic
+    @Column(name = "CARD_BODY_TYPE")
+    public Long getCardBodyType() {
+        return cardBodyType;
+    }
+
+    public void setCardBodyType(Long cardBodyType) {
+        this.cardBodyType = cardBodyType;
+    }
+
     @Basic
     @Column(name = "NAME")
     public String getName() {
@@ -78,21 +90,33 @@ public class CardBodyEntity {
         this.name = name;
     }
 
+    @Basic
+    @Column(name = "STATE")
+    public long getState() {
+        return state;
+    }
+
+    public void setState(long state) {
+        this.state = state;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         CardBodyEntity that = (CardBodyEntity) o;
         return cardBodyId == that.cardBodyId &&
+                state == that.state &&
                 Objects.equals(saveDate, that.saveDate) &&
                 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, cardType, totalCount, note, cardBodyType, name, state);
     }
 }

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

@@ -6,7 +6,7 @@ import java.util.Objects;
 
 /**
  * @auther zhangyusheng
- * 2019/4/1   15:04
+ * 2019/4/28   15:12
  */
 @Entity
 @Table(name = "PLASTIC_FILM", schema = "YINGXIN", catalog = "")
@@ -17,6 +17,7 @@ public class PlasticFilmEntity {
     private Long plasticFilmType;
     private String note;
     private String name;
+    private long state;
 
     @Id
     @Column(name = "PLASTIC_FILM_ID")
@@ -78,12 +79,23 @@ public class PlasticFilmEntity {
         this.name = name;
     }
 
+    @Basic
+    @Column(name = "STATE")
+    public long getState() {
+        return state;
+    }
+
+    public void setState(long state) {
+        this.state = state;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         PlasticFilmEntity that = (PlasticFilmEntity) o;
         return plasticFilmId == that.plasticFilmId &&
+                state == that.state &&
                 Objects.equals(saveDate, that.saveDate) &&
                 Objects.equals(totalCount, that.totalCount) &&
                 Objects.equals(plasticFilmType, that.plasticFilmType) &&
@@ -93,6 +105,6 @@ public class PlasticFilmEntity {
 
     @Override
     public int hashCode() {
-        return Objects.hash(plasticFilmId, saveDate, totalCount, plasticFilmType, note, name);
+        return Objects.hash(plasticFilmId, saveDate, totalCount, plasticFilmType, note, name, state);
     }
 }

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

@@ -18,9 +18,9 @@ public interface DataAuditingMapper {
     public boolean saveDataAuditingEntity(DataAuditingEntity dataAuditingEntity);
 
 
-    @Select("select substr(UPLOAD_NO,0,6)||'000' POLICE_SUBSTATION ,count(UPLOAD_NO) count from ACC_CARD_T@ACCU_LINK \n" +
+    @Select("select substr(UPLOAD_NO,0,9)  POLICE_SUBSTATION ,count(UPLOAD_NO) count from ACC_CARD_T@ACCU_LINK \n" +
             "where ACCEPT_NO not in (select ACCEPT_NO from ACC_ERROR_INFO_T@ACCU_LINK) and substr(ACCEPT_NO,0,8) in (#{groupNo})\n" +
-            "group by substr(UPLOAD_NO,0,6)")
+            "group by substr(UPLOAD_NO,0,9)")
     public List<Map<String,Object>> selectDataAuditingEntity(@Param("groupNo")String groupNo);
 
     @Select("select DATA_AUDITING.POLICE_SUBSTATION,sum(count),GAJG_DM.GAJG_MC from DATA_AUDITING  \n" +

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/ReceiptMapper.java

@@ -155,7 +155,7 @@ public interface ReceiptMapper {
     public boolean updateReceiptDateByReceiptId(@Param("receiptId") String receiptId);
 
     //根据输入id查询交接单是否生成
-    @Select("select id,CHECK_NAME ,GAJG_DM.GAJG_MC from receipt_list left join GAJG_DM on GAJG_DM.GAJG_DM = receipt_list.POLICE_CODE where QR_CODE=(select accept_no from prod_card_t@prod_link where id_no=#{id} and BEGIN_DATE= #{beginDate}  and  EXPIRE_DATE = #{expireDate} ) ")
+    @Select("select id,CHECK_NAME ,GAJG_DM.GAJG_MC from receipt_list left join GAJG_DM on GAJG_DM.GAJG_DM = receipt_list.POLICE_CODE where QR_CODE=(select accept_no from prod_card_t@prod_link where id_no=#{id} and BEGIN_DATE= #{beginDate}  and  EXPIRE_DATE = #{expireDate} and receipt_date is  null ) ")
     public List<Map<String,Object>> selectCountById(@Param("id") String id,@Param("beginDate") String beginDate,@Param("expireDate") String expireDate);
 
     //根据输入id查询是否生成详单
@@ -193,13 +193,19 @@ public interface ReceiptMapper {
             "WHERE  ACCEPT_NO=#{groupNo}")
     public Map<String,Object> selectTimes(@Param("groupNo") String groupNo);
 
-    @Select("select RECEIPT_LIST.id,RECEIPT_LIST.QR_CODE,RECEIPT_LIST.RECEIPT_DATE,RECEIPT_LIST.POLICE_CODE,decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID) CARD_TYPE_ID,\n" +
+    @Select("<script>" +
+            "select RECEIPT_LIST.id,RECEIPT_LIST.QR_CODE,RECEIPT_LIST.RECEIPT_DATE,RECEIPT_LIST.POLICE_CODE,decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID) CARD_TYPE_ID,\n" +
             "RECEIPT_LIST.FINISH_COUNT,GAJG_DM.GAJG_DM,GAJG_DM.GAJG_MC,RECEIPT_LIST.CHECK_DATE,RECEIPT_LIST.CHECK_NAME\n" +
             ",CARD_TYPE_DIC.CARD_TYPE,COUNTY_DIC.COUNTY_CODE ,COUNTY_DIC.COUNTYNAME,RECEIPT_LIST.state,RECEIPT_LIST.IS_PRINT from RECEIPT_LIST  \n" +
             "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>" +
+            "</script> " +
+            "")
     public List<Map<String,Object>> selectReceiptDateByCheckDate(@Param("startDate") String startDate,@Param("endDate") String endDate);
 
 
@@ -221,7 +227,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

@@ -4,19 +4,18 @@ import com.yxproject.start.entity.CardBodyEntity;
 import com.yxproject.start.entity.PlasticFilmEntity;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 public interface MaterialManagementService {
 
-    public boolean insertFilm( @Param("totalCount")String totalCount, @Param("plasticFilmType")String plasticFilmType, @Param("note")String note,String name);
+    public boolean insertFilm( @Param("totalCount")String totalCount, @Param("plasticFilmType")String plasticFilmType, @Param("note")String note,String name,long state);
 
-    public List<PlasticFilmEntity> selectFilm(@Param("beginDate") String beginDate, @Param("endDate")String endDate,String typeCode, String name);
+    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,long state);
 
-    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);
 
@@ -26,5 +25,23 @@ public interface MaterialManagementService {
 
     public String selectCardCount2(@Param("beginDate")String beginDate,@Param("endDate")String endDate,String typeCode, String name);
 
+    public boolean updateCardBodyState(long id);
 
+    public List<CardBodyEntity> selectCardBody();
+
+    public boolean updatePlasticFilm(long id);
+
+    public List<PlasticFilmEntity> selectPlasticFilm();
+
+    public Map<String,Object> selectCardBodyReport(String beginDate, String endDate, String typeCode, String name, String cardBodyType,long start,long end);
+
+    public int selectCardBodyReportCount(String beginDate, String endDate, String typeCode, String name, String cardBodyType);
+
+    public Map<String,Object> selectPlasticFilmReport(String beginDate, String endDate, String typeCode, String name,long start,long end);
+
+    public int selectPlasticFilmReportCount(String beginDate, String endDate, String typeCode, String name);
+
+    public List<Map<String,Object>> selectCardBodyOperation();
+
+    public List<Map<String,Object>> selectPlasticFilmOperation();
 }

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

@@ -7,7 +7,7 @@ import com.yxproject.start.service.MaterialManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -16,26 +16,26 @@ public class MaterialManagementServiceImpl implements MaterialManagementService
     @Autowired
     private MaterialManagementMapper materialManagementMapper;
     @Override
-    public boolean insertFilm( String totalCount, String plasticFilmType, String note,String name) {
-        materialManagementMapper.insertFilm(totalCount,plasticFilmType,note,name);
+    public boolean insertFilm( String totalCount, String plasticFilmType, String note,String name,long state) {
+        materialManagementMapper.insertFilm(totalCount,plasticFilmType,note,name,state);
         return true;
     }
 
     @Override
-    public List<PlasticFilmEntity> selectFilm(String beginDate, String endDate,String typeCode, String name) {
+    public List<PlasticFilmEntity> selectFilm(String beginDate, String endDate, String typeCode, String name) {
         List<PlasticFilmEntity> resultList = materialManagementMapper.selectFilm(beginDate, endDate,typeCode,name);
         return resultList;
     }
 
     @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,long state) {
+        materialManagementMapper.insertCardBody(cardType,totalCount,note,name,Long.valueOf(cardBodyType),state);
         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;
     }
 
@@ -64,4 +64,97 @@ public class MaterialManagementServiceImpl implements MaterialManagementService
     }
 
 
+    @Override
+    public boolean updateCardBodyState(long id) {
+
+        return materialManagementMapper.updateCardBodyState(id);
+    }
+
+    @Override
+    public List<CardBodyEntity> selectCardBody() {
+        return materialManagementMapper.selectCardBodyByState();
+    }
+
+    @Override
+    public boolean updatePlasticFilm(long id) {
+        return materialManagementMapper.updatePlasticFilmState(id);
+    }
+
+    @Override
+    public List<PlasticFilmEntity> selectPlasticFilm() {
+        return materialManagementMapper.selectPlasticFilmByState();
+    }
+
+    @Override
+    public Map<String, Object> selectCardBodyReport(String beginDate, String endDate, String typeCode, String name, String cardBodyType,long start,long end) {
+        List<Map<String, Object>> maps = materialManagementMapper.selectCardBodyReport(beginDate, endDate, typeCode, name, Long.valueOf(cardBodyType),start, end);
+        Map<String,Object> sumMap = new LinkedHashMap<>();
+        int count1 = 0;
+        int count2 = 0;
+        for (Map<String,Object> map:maps){
+            count1+= Integer.valueOf(map.get("COUNT1")+"");
+            count2+= Integer.valueOf(map.get("COUNT2")+"");
+
+        }
+        sumMap.put("SAVE_DATE","合计");
+        sumMap.put("CARD_BODY_TYPE",0);
+        sumMap.put("COUNT1",count1);
+        sumMap.put("COUNT2",count2);
+        maps.add(sumMap);
+        Map<String,Object> reportMap= new LinkedHashMap<>();
+        List<Map<String, Object>> maps1 = materialManagementMapper.selectCardBodyReportTotalCount();
+        reportMap.put("list",maps);
+        reportMap.put("total1",maps1.get(0).get("COUNT1"));
+        reportMap.put("total2",maps1.get(0).get("COUNT2"));
+
+        return reportMap;
+    }
+
+    @Override
+    public int selectCardBodyReportCount(String beginDate, String endDate, String typeCode, String name, String cardBodyType) {
+        List<Map<String, Object>> maps = materialManagementMapper.selectCardBodyReportCount(beginDate, endDate, typeCode, name, Long.valueOf(cardBodyType));
+        return maps.size();
+    }
+
+    @Override
+    public Map<String, Object> selectPlasticFilmReport(String beginDate, String endDate, String typeCode, String name,long start,long end) {
+        List<Map<String, Object>> maps = materialManagementMapper.selectPlasticFilmReport(beginDate, endDate, typeCode, name,start, end);
+        Map<String,Object> sumMap = new LinkedHashMap<>();
+        int count1 = 0;
+        int count2 = 0;
+        for (Map<String,Object> map:maps){
+            count1+= Integer.valueOf(map.get("COUNT1")+"");
+            count2+= Integer.valueOf(map.get("COUNT2")+"");
+
+        }
+        sumMap.put("SAVE_DATE","合计");
+        sumMap.put("CARD_BODY_TYPE",0);
+        sumMap.put("COUNT1",count1);
+        sumMap.put("COUNT2",count2);
+        maps.add(sumMap);
+        Map<String,Object> reportMap= new LinkedHashMap<>();
+        List<Map<String, Object>> maps1 = materialManagementMapper.selectPlasticFilmTotalCount();
+        reportMap.put("list",maps);
+        reportMap.put("total1",maps1.get(0).get("COUNT1"));
+        reportMap.put("total2",maps1.get(0).get("COUNT2"));
+
+        return reportMap;
+    }
+
+    @Override
+    public int selectPlasticFilmReportCount(String beginDate, String endDate, String typeCode, String name) {
+        List<Map<String, Object>> maps = materialManagementMapper.selectPlasticFilmReportCount(beginDate, endDate, typeCode, name);
+        return maps.size();
+    }
+
+    @Override
+    public List<Map<String, Object>> selectCardBodyOperation() {
+        List<Map<String, Object>> maps = materialManagementMapper.selectCardBodyOperation();
+        return maps;
+    }
+    @Override
+    public List<Map<String, Object>> selectPlasticFilmOperation() {
+        List<Map<String, Object>> maps = materialManagementMapper.selectPlasticFilmOperation();
+        return maps;
+    }
 }

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

@@ -152,7 +152,7 @@ public class ReceiptServiceImpl implements ReceiptService {
 
     @Override
     public List<Map<String, Object>> selectReceiptDateByCheckDate(String stratDate,String endDate) {
-        List<Map<String, Object>> mapList = receiptMapper.selectReceiptDateByCheckDate(stratDate, endDate);
+        List<Map<String, Object>> mapList = receiptMapper.selectReceiptDateByCheckDate((stratDate), (endDate));
         List<Map<String, Object>> mapList1 = formateMap(mapList);
         return  mapList1;
     }
@@ -389,4 +389,16 @@ public class ReceiptServiceImpl implements ReceiptService {
         return "";
     }
 
+    /**
+     * 字符串去除空格
+     *
+     * @param str 原始字符串
+     * @return 返回新的字符串
+     */
+    private String replaceNullString(String str) {
+        if (str == "") {
+            return null;
+        } else return str;
+    }
+
 }

src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: oracle.jdbc.driver.OracleDriver
-    url: jdbc:oracle:thin:@192.168.1.102:1521:yingxin
+    url: jdbc:oracle:thin:@192.168.1.16:1521:yingxin
     username: yingxin
     password: yingxin
   servlet:

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

@@ -19,6 +19,12 @@
         </tbody>
     </table>
 </div>
-<div class="ui-dialog-confirm">
-    <button type="submit" class="btn btn-info" ng-click="updateNoteData()">更新</button>
+<div class="ui-dialog-confirm clearfix">
+    <div class="pull-left" ng-if="consoleMsg" style="color: red;margin-left: 69px;">
+        {{consoleMsg}}
+    </div>
+    <div class="pull-right">
+        <button type="submit" class="btn btn-info" ng-click="updateNoteData()">更新</button>
+        <button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">关闭</button>
+    </div>
 </div>
\ No newline at end of file

src/main/resources/static/index.html

@@ -191,5 +191,10 @@
 <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>
+<script src="views/filmManagement/filmManagement.js"></script>
+<script src="views/cardReport/cardReport.js"></script>
+<script src="views/filmReport/filmReport.js"></script>
 </body>
 </html>
\ No newline at end of file

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

@@ -33,11 +33,16 @@ angular.module('AvatarCheck', [
     'AvatarCheck.queryQualityCheckReport',
     'AvatarCheck.ReadDeliveredInfo',
     'AvatarCheck.saveDeliveredFailedInfo',
-    'AvatarCheck.queryDeliveredReport'
+    'AvatarCheck.queryDeliveredReport',
+    'AvatarCheck.insertFilm',
+    'AvatarCheck.insertCardBody',
+    'AvatarCheck.filmManagement',
+    'AvatarCheck.filmReport',
+    'AvatarCheck.cardReport'
 ]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
         $locationProvider.hashPrefix('!');
     $routeProvider.otherwise({redirectTo: '/createTaskList'});
-        localStorageServiceProvider.setPrefix('AvatarCheck')
+        localStorageServiceProvider.setPrefix('AvatarCheck');
     $qProvider.errorOnUnhandledRejections(false)
 }])
 
@@ -184,6 +189,23 @@ angular.module('AvatarCheck', [
         if($location.path()=="/queryDeliveredReport"){
             $rootScope.tab = '/queryDeliveredReport';
         }
+        if($location.path()=="/insertFilm"){
+            $rootScope.tab = '/insertFilm';
+        }
+        if($location.path()=="/insertCardBody"){
+            $rootScope.tab = '/insertCardBody';
+        }
+        if($location.path()=="/filmManagement"){
+            $rootScope.tab = '/filmManagement';
+        }
+        if($location.path()=="/cardReport"){
+            $rootScope.tab = '/cardReport';
+        }
+        if($location.path()=="/filmReport"){
+            $rootScope.tab = '/filmReport';
+        }
+
+
 
 
 
@@ -236,9 +258,9 @@ angular.module('AvatarCheck', [
 
         $scope.logout = function(){
             HttpService.logout(function(data) {
-                $location.path('/login')
                 $rootScope.loginData = {userid:'用户未登录', login:false};
                 localStorage.clear();
+                $location.path("/login");
             });
         }
         $scope.enterEvent = function(e,search) {
@@ -280,6 +302,8 @@ angular.module('AvatarCheck', [
             if($(".prod:checked").length>0){
                 if(angular.isUndefined($scope.searchResult.workOrderData[0].CARD_TYPE_ID)){
                     MessageService.showAlert("无制证类型记录，请创建任务单后再添加快证")
+                }else if($scope.searchResult.workOrderData[0].POSITION_DATE!=null){
+                    MessageService.showAlert("该证件正在分拣，不能添加快证")
                 }else{
                     var idx = $(".prod:checked").val();
                     var check = idx.split("+");

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

-<div class="box">
-    <strong class="box-header">导入妥投信息表</strong>
-    <div class="box-primary">
-        <table class="table table-bordered">
-            <tr>
-               <td>文件名称</td>
-                <td><input type="text" ng-model="importName"/></td>
-            </tr>
-            <tr>
+
+
+<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>选择Excel文件：</td>
                 <td  colspan="2">
-                    <input type="file"
-                           id="id_file_photo_for_check"
-                           class="file"
-                           data-show-preview="false"
-                           data-allowed-file-extensions='["XLS","xls","XLSX","xlsx"]'
-                           multiple/>
+                <input type="file"
+                id="id_file_photo_for_check"
+                class="file"
+                data-show-preview="false"
+                data-allowed-file-extensions='["XLS","xls","XLSX","xlsx"]'
+                multiple/>
                 </td>
                 <td>
-                    <div style="float: left">
-                        <button class="btn btn-primary" ng-click="ReadDeliveredInfo()">导入</button>
-                    </div>
+                <div style="float: left">
+                <button class="btn btn-primary" ng-click="ReadDeliveredInfo()">导入</button>
+                </div>
                 </td>
-            </tr>
-        </table>
+                </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
+    </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/cardReport/cardReport.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 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="cardBodyType1">
+                                <option value="0">全部</option>
+                                <option value="1">身份证卡体</option>
+                                <option  value="2">香港居住证卡体</option>
+                                <option  value="3">港澳居住证卡体</option>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td> <span>操作人:</span></td>
+                        <td>
+                            <select class="form-control select2" id="operator">
+                                <option value="">全部</option>
+                                <option value="{{item.NAME}}" ng-repeat="item in operator">{{item.NAME}}</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 colspan="2"><div style="text-align: left;">
+                            <button class="btn btn-primary" ng-click="selectCardBodyCount()">查询</button>
+                        </div></td>
+                    </tr>
+                </table>
+                <!--<div ng-if="cardBodyCountData.list.length==0">
+                    <h4 style="padding-left: 10px;">暂无数据</h4>
+                </div>-->
+                <div class="box-info" style="padding: 7px;padding-top: 0px;">
+                    <table class="table table-bordered table-hover postTable" ng-if="cardBodyCountData.list.length>1">
+                        <thead>
+                        <tr>
+                            <th>保存时间</th>
+                            <th>出库数</th>
+                            <th>入库数</th>
+                            <th>卡体类型</th>
+                            <th>提交人</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr ng-repeat="item in cardBodyCountData.list">
+                            <td>{{item.SAVE_DATE}}</td>
+                            <td>{{item.COUNT1}}</td>
+                            <td>{{item.COUNT2}}</td>
+                            <td ng-if="item.CARD_BODY_TYPE==0"></td>
+                            <td ng-if="item.CARD_BODY_TYPE==1">身份证卡体</td>
+                            <td ng-if="item.CARD_BODY_TYPE==2">香港居住证卡体</td>
+                            <td ng-if="item.CARD_BODY_TYPE==3">港澳居住证卡体</td>
+                            <td>{{item.NAME}}</td>
+                        </tr>
+                        </tbody>
+                    </table>
+                    <table class="table table-bordered bg-info">
+                        <th>总计</th>
+                        <th>
+                            出库数:
+                            <span ng-if="cardBodyCountData.total1==null">0</span>
+                            <span ng-if="cardBodyCountData.total1!=null">{{cardBodyCountData.total1}}</span>
+                        </th>
+                        <th>
+                            入库数
+                            <span ng-if="cardBodyCountData.total2==null">0</span>
+                            <span ng-if="cardBodyCountData.total2!=null">{{cardBodyCountData.total2}}</span>
+                        </th>
+                        <th colspan="2">
+                            库存：{{cardBodyCountData.total2-cardBodyCountData.total1}}
+                        </th>
+                    </table>
+                    <div style="padding-left: 27%;" ng-if="cardBodyCountData.list.length>1">
+                        <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
+                    </div>
+                </div>
+            </div>
+        </div>
+        </div>
+
+    </div>
+</div>
\ No newline at end of file

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

+'use strict';
+
+angular.module('AvatarCheck.cardReport', ['ngRoute', 'AvatarCheck.http', 'tm.pagination'])
+    .config(['$routeProvider', function ($routeProvider) {
+        $routeProvider.when('/cardReport', {
+            templateUrl: 'views/cardReport/cardReport.html' + urlTimeStamp(),
+            controller: 'cardReportCtrl',
+            cache: false
+        });
+    }])
+
+    .controller('cardReportCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
+        //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.paginationConf = {
+            currentPage: 1,
+            itemsPerPage: 10,
+            perPageOptions: [10, 20, 30, 40, 50]
+        };
+
+        HttpService.getCardBodyOperator(function(data) {
+            $scope.operator = data;
+            console.log($scope.operator)
+        })
+
+        $scope.selectCardBodyCount=function(){
+            if($scope.paginationConf.currentPage!=1){
+                $scope.paginationConf.currentPage=1;
+                $scope.paginationConf.itemsPerPage=10;
+            }else{
+                $scope.selectCardBodyCountPage();
+            }
+        }
+
+        $scope.selectCardBodyCountPage = function() {
+            var cardType = $("#cardType2").val();
+            var operator = $("#operator").val();
+            var cardBodyType1 = $("#cardBodyType1").val();
+            var date1 = $("#datepicker1").val();
+            var date2 = $("#datepicker2").val();
+            if (date1==""){
+                date1=$scope.choseDate;
+            }
+            if (date2==""){
+                date2=$scope.choseDate;
+            }
+            HttpService.selectCardBodyCountData(date1, date2,operator,cardBodyType1,cardType,function(data) {
+                $scope.paginationConf.totalItems = data;
+                console.log($scope.paginationConf.totalItems)
+            });
+            HttpService.selectCardBodyData(date1, date2,operator,cardBodyType1,cardType,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
+                $scope.cardBodyCountData = data;
+                console.log(data)
+            })
+        };
+
+        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.selectCardBodyCountPage);
+
+    });
\ No newline at end of file

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

@@ -62,14 +62,14 @@
                             <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
                             <th>保存日期</th>
                             <th>组数</th>
-                            <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
+                            <th>受理组号</th>
                             <th>合格数量</th>
                             <th>不合格数量</th>
                             <th>状态</th>
                             <th></th>
                         </tr>
                       </thead>
-                      <tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc">
+                      <tbody ng-repeat="task in type.countyList">
                       <tr>
                         <td ng-if="task.dealFlag==3"><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.valid}}" ng-click="updateSelection($event,task)"></td>
                         <td ng-if="task.dealFlag!=3"></td>

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

@@ -38,9 +38,9 @@
               <thead>
                 <tr>
                     <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
-                    <th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
+                    <th>任务单编号</th>
                     <th>组数</th>
-                    <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
+                    <th>受理组号</th>
                     <th>证件数量</th>
                     <th>合格数量</th>
                     <th>不合格数量</th>
@@ -48,7 +48,7 @@
                     <th></th>
                 </tr>
               </thead>
-              <tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc">
+              <tbody ng-repeat="task in type.countyList">
               <tr>
                 <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
                 <td class="mailbox-star"><b>{{task.taskId}}</b></td>

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

+'use strict';
+
+angular.module('AvatarCheck.filmManagement', ['ngRoute', 'AvatarCheck.http'])
+    .config(['$routeProvider', function ($routeProvider) {
+        $routeProvider.when('/filmManagement', {
+            templateUrl: 'views/filmManagement/filmManagement.html' + urlTimeStamp(),
+            controller: 'filmManagementCtrl',
+            cache: false
+        });
+    }])
+
+    .controller('filmManagementCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
+
+        $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,1,function (data) {
+                $scope.totalCount="";
+                $scope.note=""
+                if(data==false){
+                    MessageService.showAlert("添加失败")
+                }else{
+                    MessageService.showAlert("添加成功")
+                }
+            })
+        }
+
+        $scope.selectFilmManagement=function(){
+            HttpService.selectFilmManagement(function (data) {
+                $scope.filmManagement = data;
+                console.log($scope.filmManagement,"$scope.filmManagement")
+            })
+        }
+        $scope.selectFilmManagement();
+
+        $scope.updateFilmState = function(item) {
+            HttpService.updateFilmStateData(item.plasticFilmId,function(data) {
+                $scope.selectFilmManagement();
+            })
+        }
+
+    });
\ No newline at end of file

src/main/resources/static/views/filmReport/filmReport.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 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> <span>提交人:</span></td>
+                        <td>
+                            <select class="form-control select2" id="operator">
+                                <option value="">全部</option>
+                                <option value="{{item.NAME}}" ng-repeat="item in operator">{{item.NAME}}</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="selectFilmCount()">查询</button>
+                        </div></td>
+                    </tr>
+                </table>
+                <div class="box-info" style="padding: 7px;padding-top: 0px;">
+                    <table class="table table-bordered table-hover postTable" ng-if="filmCountData.list.length>1">
+                        <thead>
+                        <tr>
+                            <th>保存时间</th>
+                            <th>出库数</th>
+                            <th>入库数</th>
+                            <th>提交人</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr ng-repeat="item in filmCountData.list">
+                            <td>{{item.SAVE_DATE}}</td>
+                            <td>{{item.COUNT1}}</td>
+                            <td>{{item.COUNT2}}</td>
+                            <td>{{item.NAME}}</td>
+                        </tr>
+                        </tbody>
+                    </table>
+                    <table class="table table-bordered bg-info">
+                        <th>总计</th>
+                        <th>
+                            出库数:
+                            <span ng-if="filmCountData.total1==null">0</span>
+                            <span ng-if="filmCountData.total1!=null">{{filmCountData.total1}}</span>
+                        </th>
+                        <th>
+                            入库数
+                            <span ng-if="filmCountData.total2==null">0</span>
+                            <span ng-if="filmCountData.total2!=null">{{filmCountData.total2}}</span>
+                        </th>
+                        <th>
+                            库存：{{filmCountData.total2-filmCountData.total1}}
+                        </th>
+                    </table>
+                    <div style="padding-left: 27%;" ng-if="filmCountData.list.length>1">
+                        <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
+                    </div>
+                </div>
+            </div>
+        </div>
+        </div>
+
+    </div>
+</div>
\ No newline at end of file

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

+'use strict';
+
+angular.module('AvatarCheck.filmReport', ['ngRoute', 'AvatarCheck.http','tm.pagination'])
+    .config(['$routeProvider', function ($routeProvider) {
+        $routeProvider.when('/filmReport', {
+            templateUrl: 'views/filmReport/filmReport.html' + urlTimeStamp(),
+            controller: 'filmReportCtrl',
+            cache: false
+        });
+    }])
+
+    .controller('filmReportCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
+        //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
+        });
+
+        HttpService.getOperator(function(data) {
+            $scope.operator = data;
+            console.log($scope.operator)
+        })
+
+        $scope.paginationConf = {
+            currentPage: 1,
+            itemsPerPage: 10,
+            perPageOptions: [10, 20, 30, 40, 50]
+        };
+
+        $scope.selectFilmCount=function(){
+            if($scope.paginationConf.currentPage!=1){
+                $scope.paginationConf.currentPage=1;
+                $scope.paginationConf.itemsPerPage=10;
+            }else{
+                $scope.selectFilmCountPage();
+            }
+        }
+
+        $scope.selectFilmCountPage = function() {
+            var cardType = $("#cardType2").val();
+            var operator = $("#operator").val();
+            var date1 = $("#datepicker1").val();
+            var date2 = $("#datepicker2").val();
+            if (date1==""){
+                date1=$scope.choseDate;
+            }
+            if (date2==""){
+                date2=$scope.choseDate;
+            }
+            HttpService.selectFilmCountData(date1, date2,operator,cardType,function(data) {
+                $scope.paginationConf.totalItems = data;
+                console.log($scope.paginationConf.totalItems)
+            });
+
+            HttpService.selectFilmData(date1, date2,operator, cardType,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function (data) {
+                $scope.filmCountData = data;
+                console.log(data)
+            })
+        }
+
+        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.selectFilmCountPage);
+
+    });
\ 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 style="padding-left: 10px;">暂无数据</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>NO.</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 ng-if="item.cardType==1">出库</td>
+                            <td ng-if="item.cardType==2">入库</td>
+                            <td>{{item.note}}</td>
+                            <td>{{item.name}}</td>
+                            <td ng-if="item.state==0" class="text-danger">未审核</td>
+                            <td ng-if="item.state==1" class="text-success">已审核</td>
+                        </tr>
+
+                        <tr class="bg-info">
+                            <th>合计</th>
+                            <th colspan="2">出库数：</th>
+                            <th ng-if="cardBodyManagement.cardCount1==null">0</th>
+                            <th ng-if="cardBodyManagement.cardCount1!=null">{{cardBodyManagement.cardCount1}}</th>
+                            <th colspan="2">入库数：</th>
+                            <th ng-if="cardBodyManagement.cardCount2==null">0</th>
+                            <th ng-if="cardBodyManagement.cardCount2!=null">{{cardBodyManagement.cardCount2}}</th>
+                        </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,0,function (data) {
+                $scope.totalCount="";
+                $scope.note=""
+                if(data==false){
+                    MessageService.showAlert("添加失败")
+                }else{
+                    MessageService.showAlert("添加成功，请等待审核")
+                }
+            })
+        }
+
+        $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 width="30%">
+                            <input type="text" class="form-control" ng-model="choseDate" id="datepicker" 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 style="padding-left: 10px;">暂无数据</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>NO.</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 ng-if="item.state==0" class="text-danger">未审核</td>
+                            <td ng-if="item.state==1" class="text-success">已审核</td>
+                        </tr>
+
+                        <tr class="bg-info">
+                            <th>合计</th>
+                            <th colspan="2">出库数：</th>
+                            <th ng-if="plasticFilmdata.plasticFilmCount1==null">0</th>
+                            <th ng-if="plasticFilmdata.plasticFilmCount1!=null">{{plasticFilmdata.plasticFilmCount1}}</th>
+                            <th colspan="2">入库数：</th>
+                            <th ng-if="plasticFilmdata.plasticFilmCount2==null">0</th>
+                            <th ng-if="plasticFilmdata.plasticFilmCount2!=null">{{plasticFilmdata.plasticFilmCount2}}</th>
+                        </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
+        $('#datepicker').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, 0,function (data) {
+                $scope.totalCount="";
+                $scope.note="";
+                if(data==false){
+                    MessageService.showAlert("添加失败")
+                }else{
+                    MessageService.showAlert("添加成功，请等待审核")
+                }
+            })
+        }
+
+        $scope.selectPlasticFilmManagement=function(){
+            var plasticFilmType = $("#cardType2").val();
+            var date1 = $("#datepicker").val();
+            if (date1==""){
+                date1=$scope.choseDate;
+            }
+            var date2 = date1;
+            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/login/login.js

@@ -48,8 +48,8 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
                     $rootScope.tab = '/uploadExcelAndSearch';
                     break;
                 case 9:
-                    $location.path("/createTaskList");
-                    $rootScope.tab = '/createTaskList';
+                    $location.path("/filmReport");
+                    $rootScope.tab = '/filmReport';
                     break;
             }
         }

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

-<div class="content row">
-    <div class="col-md-12" style="margin-top:20px;">
-        <div class="row">
-            <!-- /.col -->
-            <div class="col-md-12">
-                <div class="box box-primary" >
-                    <div class="box-header">
-                        <strong ng-if="state==2">膜打印数据报表</strong>
-                        <strong ng-if="state==3">耗材管理</strong>
-                        <div class="box-tools pull-right">
-                            <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="choseDate1" id="datepicker1" readonly/>  <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="choseDate2" id="datepicker2" readonly/>
-                            <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchReport()">查询</button>
-                        </div>
-                        <!-- /.box-tools -->
-                    </div>
-                    <!-- /.box-header -->
-                    <div class="box-body">
-                        <div ng-if="reportData.length==1">
-                            <h4>暂无数据</h4>
-                        </div>
+<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;
 
-                        <div ng-if="reportData.length>1">
+    }
+    .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: ""
+    }
 
-                            <div  class="table-responsive mailbox-messages" >
-                                <div class="mailbox-messages">
-                                    <table class="table table-hover postTable">
-                                        <thead>
-                                        <tr>
-                                            <th ng-if="2">打印日期</th>
-                                            <th ng-if="3">预定位日期</th>
-                                            <th>大批证</th>
-                                            <th>邮寄证</th>
-                                            <th>军人证</th>
-                                            <th>快证</th>
-                                            <th>废证</th>
-                                        </tr>
-                                        </thead>
-                                        <tbody ng-repeat="item in reportData">
-                                        <tr style="background-color: #eee">
-                                            <td>{{item.date}}</td>
-                                            <td style="color: #3c8dbc">{{item.pu}}</td>
-                                            <td>{{item.you}}</td>
-                                            <td>{{item.jun}}</td>
-                                            <td>{{item.kuai}}</td>
-                                            <td>{{item.fei}}</td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                    <!-- /.table -->
-                                </div>
-                                <!-- /.table -->
+    .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>
-                        </div>
-                        <!-- /.mail-box-messages -->
-                    </div>
-                    <!-- /.box-body -->
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+        <div class="box">
+            <div class="box-header">
+                <strong>查询未审核卡体耗材统计数据</strong>
+            </div>
+            <div class="box box-primary">
+                <div ng-if="materialManagement.length==0">
+                    <h4 style="padding-left: 10px;">暂无数据</h4>
+                </div>
+                <div class="box-info" style="padding: 7px;padding-top: 0px;">
+                    <table class="table table-bordered table-hover postTable" ng-if="materialManagement.length>0">
+                        <thead>
+                        <tr>
+                            <th>NO.</th>
+                            <th>保存时间</th>
+                            <th>数量</th>
+                            <th>卡基类型</th>
+                            <th>备注</th>
+                            <th>提交人</th>
+                            <th>操作</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr ng-repeat="item in materialManagement">
+                            <td>{{item.cardBodyId}}</td>
+                            <td>{{item.saveDate}}</td>
+                            <td>{{item.totalCount}}</td>
+                            <td ng-if="item.cardType==1">出库</td>
+                            <td ng-if="item.cardType==2">入库</td>
+                            <td>{{item.note}}</td>
+                            <td>{{item.name}}</td>
+                            <td><a ng-click="updateApplyState(item)">确认</a></td>
+                        </tr>
+                        </tbody>
+                    </table>
+
                 </div>
-                <!-- /. box -->
             </div>
-            <!-- /.col -->
         </div>
-        <!-- /.row -->
     </div>
-</div>
-
+</div>
\ No newline at end of file

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

@@ -10,40 +10,40 @@ angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http']
     }])
 
     .controller('materialManagementCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
-        $scope.state = 3;
-        //Date picker
-        $('#datepicker1').datetimepicker({
-            minView: "month", //选择日期后，不会再跳转去选择时分秒
-            language: 'zh-CN',
-            format: 'yyyy-mm-dd',
-            todayBtn: 1,
-            autoclose: 1
-        });
-        $('#datepicker2').datetimepicker({
-            minView: "month", //选择日期后，不会再跳转去选择时分秒
-            language: 'zh-CN',
-            format: 'yyyy-mm-dd',
-            todayBtn: 1,
-            autoclose: 1
-        });
-        $scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-dd");
-        $scope.choseDate2 = $filter("date")(new Date(), "yyyy-MM-dd");
-
 
-        $scope.searchReport = function () {
-            var date1=$('#datepicker1').val();
-            var date2=$('#datepicker2').val();
-            if(date1==''){
-                date1= $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";
             }
-            if(date2==''){
-                date2= $filter("date")(new Date(), "yyyy-MM-dd");
-            }
-            HttpService.getReport(date1,date2,function(data){
-                $scope.reportData=data;
+            console.log(totalCount,note,cardType,cardBodyType,name);
+            HttpService.insertCardBody(cardType,totalCount,note,cardBodyType,name,1,function (data) {
+                $scope.totalCount="";
+                $scope.note=""
+                if(data==false){
+                    MessageService.showAlert("添加失败")
+                }else{
+                    MessageService.showAlert("添加成功")
+                }
             })
         }
-        $scope.searchReport();
 
+        $scope.selectMaterialManagement=function(){
+            HttpService.selectMaterialManagement(function (data) {
+                $scope.materialManagement = data;
+                console.log($scope.materialManagement,"$scope.materialManagement")
+            })
+        }
+        $scope.selectMaterialManagement();
+
+        $scope.updateApplyState = function(item) {
+            HttpService.updateApplyStateData(item.cardBodyId,function(data) {
+                $scope.selectMaterialManagement();
+            })
+        }
 
     });
\ No newline at end of file

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

@@ -62,12 +62,6 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
             $scope.isHistory = 0;
             var startDate=$('#datepicker1').val();
             var endDate=$('#datepicker2').val();
-            if(startDate==''){
-                startDate= $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
-            }
-            if(endDate==''){
-                endDate= $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
-            }
             HttpService.getReceitp(startDate,endDate,function(data){
                 $scope.receitpData=data;
                 for(var i=0;i<$scope.receitpData.length;i++){
@@ -86,12 +80,6 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
             $scope.isHistory = 1;
             var startDate=$('#datepicker1').val();
             var endDate=$('#datepicker2').val();
-            if(startDate==''){
-                startDate= $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
-            }
-            if(endDate==''){
-                endDate= $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
-            }
             HttpService.getHistoryReceitp(startDate,endDate,function(data){
                 $scope.receitpHistoryData=data;
                 for(var i=0;i<$scope.receitpHistoryData.length;i++){

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

@@ -9,21 +9,31 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
         });
     }])
 
-    .controller('tagPrintCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) {
+    .controller('tagPrintCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog,$location) {
 
+        var getPoliceListDataNotChecked = function () {
+            HttpService.getPoliceListDataNotCheckedData(function(data){
+                $scope.tagPrintData = data;
+                for(var i=0;i<$scope.tagPrintData.length;i++){
+                    $scope.tagPrintData[i].show = false;
+                }
+                console.log($scope.tagPrintData)
+            })
+        };
 
-        $scope.acceptNo = 'ACCEPT_NO';
+        if($rootScope.loginData.login === false){
+            $location.path("/login");
+        }else{
+            getPoliceListDataNotChecked();
+        }
 
-        //Date picker
-        $('#datepicker').datetimepicker({
-            minView: "month", //选择日期后，不会再跳转去选择时分秒
-            language: 'zh-CN',
-            format: 'yyyy-mm-dd',
-            todayBtn: 1,
-            autoclose: 1
-        });
+        $scope.acceptNo = 'ACCEPT_NO';
 
-        $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
+        var postParam={
+            idCard:'',
+            startDate:'',
+            endDate:''
+        }
 
         $scope.json={
             id:'',
@@ -35,12 +45,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 +66,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,18 +77,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){
-                $scope.tagPrintData = data;
-                for(var i=0;i<$scope.tagPrintData.length;i++){
-                    $scope.tagPrintData[i].show = false;
-                }
-                console.log($scope.tagPrintData)
-            })
-        }
-        getPoliceListDataNotChecked();
+        };
 
 
 
@@ -81,47 +86,64 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                 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 +175,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 {

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

@@ -630,7 +630,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
                 console.log($scope.cycleSheetData)
             })
         }
-        $scope.searchTaskList();
+        if($rootScope.loginData.login==true){
+            $scope.searchTaskList();
+        }
 
         $scope.searchHistory = function(){
             $scope.isHistory=1;
@@ -717,57 +719,57 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
         }
 
         $scope.goes = function(){
-            $rootScope.selectCount = 0;
-            for (var i = 0; i < $scope.selected.length; i++) {
-                $rootScope.selectCount =$rootScope.selectCount + parseInt($scope.selected[i].countyValidCount-$scope.selected[i].specialCount);
-            }
-            console.log("for",$rootScope.selectCount)
-            var go = function () {
-                $rootScope.closeBtn();
-                var checks = $(".checkOneBox:checked");
-                if(checks.length>0){
-                    var arr = [];
-                    var failedArr=[];
-                    for (var i=0;i<checks.length;i++){
-                        if(checks[i].value.length<11){
-                            failedArr.push(checks[i].value)
-                        }else{
-                            arr.push(checks[i].value)
+            var checks = $(".checkOneBox:checked");
+            if(checks.length>0){
+                var go = function () {
+                    $rootScope.closeBtn();
+                        $rootScope.selectCount = 0;
+                        for (var i = 0; i < $scope.selected.length; i++) {
+                            $rootScope.selectCount =$rootScope.selectCount + parseInt($scope.selected[i].countyValidCount-$scope.selected[i].specialCount);
                         }
-                    }
-                    var json={
-                        process:$rootScope.loginData.roleList[0].process,
-                        name:$rootScope.loginData.name,
-                        taskIdList:arr,
-                        failedList:failedArr
-                    }
-                    console.log(json)
-                    HttpService.updateTaskListProcess(json,function(data){
-                        $scope.searchTaskList();
-                        $scope.selected=[];
-                        $rootScope.ableBtn();
-                        $rootScope.closeThis();
-                    })
-                }else{
-                    MessageService.showAlert("请选择转出的任务单");
+                        console.log("for",$rootScope.selectCount)
+                        var arr = [];
+                        var failedArr=[];
+                        for (var i=0;i<checks.length;i++){
+                            if(checks[i].value.length<11){
+                                failedArr.push(checks[i].value)
+                            }else{
+                                arr.push(checks[i].value)
+                            }
+                        }
+                        var json={
+                            process:$rootScope.loginData.roleList[0].process,
+                            name:$rootScope.loginData.name,
+                            taskIdList:arr,
+                            failedList:failedArr
+                        }
+                        console.log(json)
+                        HttpService.updateTaskListProcess(json,function(data){
+                            $scope.searchTaskList();
+                            $scope.selected=[];
+                            $rootScope.ableBtn();
+                            $rootScope.closeThis();
+                        })
                 }
+                ngDialog.open({
+                    template: 'dialogs/gotoDistribute.html' + urlTimeStamp(),
+                    width: 800,
+                    cache: false,
+                    closeByDocument:false,
+                    controller: ['$scope', 'HttpService',function ($scope) {
+                        $rootScope.closeThis=$scope.closeThisDialog;
+                        $rootScope.ableBtn = function(){
+                            $(".create").prop("disabled","false");
+                        }
+                        $rootScope.closeBtn = function(){
+                            $(".create").prop("disabled","true");
+                        }
+                        $scope.confirmGoTo = go;
+                    }]
+                })
+            }else{
+                MessageService.showAlert("请选择转出的任务单");
             }
-            ngDialog.open({
-                template: 'dialogs/gotoDistribute.html' + urlTimeStamp(),
-                width: 800,
-                cache: false,
-                closeByDocument:false,
-                controller: ['$scope', 'HttpService',function ($scope) {
-                    $rootScope.closeThis=$scope.closeThisDialog;
-                    $rootScope.ableBtn = function(){
-                        $(".create").prop("disabled","false");
-                    }
-                    $rootScope.closeBtn = function(){
-                        $(".create").prop("disabled","true");
-                    }
-                    $scope.confirmGoTo = go;
-                }]
-            })
 
 
         }

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

@@ -34,10 +34,10 @@
                <thead>
                  <tr>
                      <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
-                     <th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
+                     <th>任务单编号</th>
                      <th>核验日期</th>
                      <th>组数</th>
-                     <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
+                     <th>受理组号</th>
                      <th>证件数量</th>
                      <th>电写入数量</th>
                      <th>电质检数量</th>
@@ -46,7 +46,7 @@
                      <th></th>
                  </tr>
                </thead>
-               <tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc">
+               <tbody ng-repeat="task in type.countyList">
                      <tr>
                        <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
                        <td class="mailbox-star"><b>{{task.taskId}}</b></td>

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

@@ -38,10 +38,10 @@
                   <thead>
                     <tr>
                         <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
-                        <th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
+                        <th>任务单编号</th>
                         <th>核验日期</th>
                         <th>组数</th>
-                        <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
+                        <th>受理组号</th>
                         <th>核验数量</th>
                         <th>卸载数量</th>
                         <th>证件数量</th>
@@ -51,7 +51,7 @@
                         <th></th>
                     </tr>
                   </thead>
-                  <tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc">
+                  <tbody ng-repeat="task in type.countyList">
                   <tr>
                     <td><input type="checkbox" id="checkOneBox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" name="{{task.countyValidCount-task.specialCount}}"  ng-click="updateSelection($event,task)"></td>
                     <td class="mailbox-star"><b>{{task.taskId}}</b></td>

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

@@ -40,10 +40,10 @@
                             <tr>
                                 <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)"
                                            ng-checked="isSelectedAll($index)"></th>
-                                <th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
+                                <th>任务单编号</th>
                                 <th>核验日期</th>
                                 <th>组数</th>
-                                <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
+                                <th>受理组号</th>
                                 <th>证件数量</th>
                                 <th>电写入数量</th>
                                 <th>电质检数量</th>
@@ -54,7 +54,7 @@
                                 <!--<th></th>-->
                             </tr>
                             </thead>
-                            <tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc">
+                            <tbody ng-repeat="task in type.countyList">
                             <tr>
                                 <td ng-if="type.typeCode=='100'||(task.faileCount==0&&(task.countyValidCount-task.specialCount)==task.eWriteCount&&task.eWriteCount==task.recheckCount)">
                                     <input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}"

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

@@ -109,10 +109,11 @@
                             <th>联系方式</th>
                             <th>地址</th>
                             <th>打印时间</th>
+                            <th>操作</th>
                         </tr>
                         </thead>
                         <tbody>
-                        <tr ng-repeat="item in postData | orderBy:item.id" ng-click="showDetail(item)" style="cursor: pointer;">
+                        <tr ng-repeat="item in postData | orderBy:item.id">
                             <td>{{item.id}}</td>
                             <td>{{item.orderNumber}}</td>
                             <td>{{item.waybillNumber}}</td>
@@ -120,14 +121,15 @@
                             <td>{{item.firstWhite}}</td>
                             <td>{{item.applicantName}}</td>
                             <td>{{item.recipientPhone}}</td>
-                            <td>{{item.recipientAddress}}</td>
+                            <td ng-click="showDetail(item)"><a>{{item.recipientAddress}}</a></td>
                             <td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td>
+                            <td ng-click="addNote(item.id)"><a>备注</a></td>
                         </tr>
                         </tbody>
                     </table>
-                    <div class="box-footer" ng-if="postData.length>0">
+                    <!--<div class="box-footer" ng-if="postData.length>0">
                         <button class="pull-right btn btn-primary" ng-click="addNote()">添加备注</button>
-                    </div>
+                    </div>-->
                     <div style="padding-left: 27%;" ng-if="postData.length>0">
                         <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
                     </div>

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

@@ -339,11 +339,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
 
         }
         
-        $scope.addNote = function () {
+        $scope.addNote = function (id) {
             var arr = [];
-            for (var i=0;i<$scope.postData.length;i++){
-                arr.push($scope.postData[i].id)
-            }
+            arr.push(id);
             ngDialog.open({
                 template: 'dialogs/updateNote.html' + urlTimeStamp(),
                 width: 800,
@@ -353,7 +351,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
                     console.log(arr)
                     HttpService.getNoteToUpdate(arr,function(data) {
                         $scope.idAndNote = data;
-                        console.log( $scope.idAndNote)
+                        console.log($scope.idAndNote)
                     })
                     
                     $scope.updateNoteData = function(){
@@ -367,8 +365,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
                         }
                         HttpService.updateTheseNote(arr,function(data) {
                             if(data){
-                                $scope.closeThisDialog();
-                                MessageService.showAlert("更新成功")
+                                $scope.consoleMsg = "更新成功";
                             }
                         })
                     }