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

@@ -175,7 +175,6 @@ public class FailedCardApi {
                 JSONObject jsonObject = (JSONObject) jsonarray.get(i);
                 //查询生成任务单需要的数据
                 Map<String, Object> dataMap = failedCardService.selectTaskListById(jsonObject.getString("idCard"));
-//                TODO 会报空指针异常
                 String countyCode = dataMap.get("COUNTY_CODE").toString();
                 Long cardType = (Long) dataMap.get("CARD_TYPE_ID");
                 taskEntity.setCountyCode(countyCode);

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

@@ -38,7 +38,7 @@ public class ReceiptApi {
     @Transactional(rollbackFor = Exception.class)
     public Map<String,Object> createReceiptList(String id,String name,String beginDate,String expireDate) {
         //判断是否是特证
-        if (receiptService.selectSpecialCardByAcceptNo(id) == 1) {
+        if (receiptService.selectSpecialCardByAcceptNo(id,beginDate,expireDate) == 1) {
             //查询这个受理号是否生成了交接单
             List<Map<String, Object>> mapList = receiptService.selectCountById(id,beginDate,expireDate);
             //判断是否生成了交接单
@@ -208,6 +208,27 @@ public class ReceiptApi {
         return resultList;
     }
 
+    /**
+     * 根据任务单查询详细信息
+     *
+     * @param receiptId 交接单ID
+     * @return
+     */
+    @RequestMapping("selectDetailListByReceiptId")
+    public Map<String, Object> selectDetailListByReceiptId( String receiptId) {
+        Map<String,Object> mapList = new HashMap<>();
+        List<Map<String, Object>> resultList = receiptService.selectDetailList(receiptId);
+        if (resultList.size()>0){
+            mapList.put("policeName",resultList.get(0).get("GAJG_MC"));
+            mapList.put("groupNo",resultList.get(0).get("ACCEPT_NO").toString().substring(0,8));
+            mapList.put("checkDate",resultList.get(0).get("RECEIPT_DATE"));
+            mapList.put("count",resultList.get(0).get("FINISH_COUNT"));
+        }
+        mapList.put("list",resultList);
+
+        return mapList;
+    }
+
     /**
      * 数据核验--更改交接单状态
      *

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

+package com.yxproject.start.entity;
+
+import javax.persistence.*;
+import java.sql.Time;
+import java.util.Objects;
+
+/**
+ * @auther zhangyusheng
+ * 2019/4/17   9:42
+ */
+@Entity
+@Table(name = "DELIVERED_FAILED_INFO", schema = "YINGXIN", catalog = "")
+public class DeliveredFailedInfoEntity {
+    private long id;
+    private String waybillNumber;
+    private Time backDate;
+    private long backReason;
+    private String note;
+    private String registerName;
+    private String cardId;
+
+    @Id
+    @Column(name = "ID")
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @Basic
+    @Column(name = "WAYBILL_NUMBER")
+    public String getWaybillNumber() {
+        return waybillNumber;
+    }
+
+    public void setWaybillNumber(String waybillNumber) {
+        this.waybillNumber = waybillNumber;
+    }
+
+    @Basic
+    @Column(name = "BACK_DATE")
+    public Time getBackDate() {
+        return backDate;
+    }
+
+    public void setBackDate(Time backDate) {
+        this.backDate = backDate;
+    }
+
+    @Basic
+    @Column(name = "NOTE")
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    @Basic
+    @Column(name = "REGISTER_NAME")
+    public String getRegisterName() {
+        return registerName;
+    }
+
+    public void setRegisterName(String registerName) {
+        this.registerName = registerName;
+    }
+
+    @Basic
+    @Column(name = "BACK_REASON")
+    public long getBackReason() {
+        return backReason;
+    }
+
+    public void setBackReason(long backReason) {
+        this.backReason = backReason;
+    }
+    @Basic
+    @Column(name = "CARD_ID")
+    public String getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(String cardId) {
+        this.cardId = cardId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DeliveredFailedInfoEntity that = (DeliveredFailedInfoEntity) o;
+        return id == that.id &&
+                Objects.equals(waybillNumber, that.waybillNumber) &&
+                Objects.equals(backDate, that.backDate) &&
+                Objects.equals(note, that.note) &&
+                Objects.equals(backReason, that.backReason) &&
+                Objects.equals(cardId, that.cardId) &&
+                Objects.equals(registerName, that.registerName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, cardId,backReason,waybillNumber, backDate, note, registerName);
+    }
+}

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

+package com.yxproject.start.entity;
+
+import javax.persistence.*;
+import java.util.Objects;
+
+/**
+ * @auther zhangyusheng
+ * 2019/4/17   9:42
+ */
+@Entity
+@Table(name = "DELIVERED_FAILED_REASON", schema = "YINGXIN", catalog = "")
+public class DeliveredFailedReasonEntity {
+    private long id;
+    private String reason;
+
+    @Id
+    @Column(name = "ID")
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @Basic
+    @Column(name = "REASON")
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DeliveredFailedReasonEntity that = (DeliveredFailedReasonEntity) o;
+        return id == that.id &&
+                Objects.equals(reason, that.reason);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, reason);
+    }
+}

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

+package com.yxproject.start.entity;
+
+import javax.persistence.*;
+import java.sql.Time;
+import java.util.Objects;
+
+/**
+ * @auther zhangyusheng
+ * 2019/4/17   9:42
+ */
+@Entity
+@Table(name = "DELIVERED_IMPORT_DIC", schema = "YINGXIN", catalog = "")
+public class DeliveredImportDicEntity {
+    private long id;
+    private String fileName;
+    private Time importDate;
+    private String importName;
+    private Long importCount;
+
+    @Id
+    @Column(name = "ID")
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @Basic
+    @Column(name = "FILE_NAME")
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    @Basic
+    @Column(name = "IMPORT_DATE")
+    public Time getImportDate() {
+        return importDate;
+    }
+
+    public void setImportDate(Time importDate) {
+        this.importDate = importDate;
+    }
+
+    @Basic
+    @Column(name = "IMPORT_NAME")
+    public String getImportName() {
+        return importName;
+    }
+
+    public void setImportName(String importName) {
+        this.importName = importName;
+    }
+
+    @Basic
+    @Column(name = "IMPORT_COUNT")
+    public Long getImportCount() {
+        return importCount;
+    }
+
+    public void setImportCount(Long importCount) {
+        this.importCount = importCount;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DeliveredImportDicEntity that = (DeliveredImportDicEntity) o;
+        return id == that.id &&
+                Objects.equals(fileName, that.fileName) &&
+                Objects.equals(importDate, that.importDate) &&
+                Objects.equals(importName, that.importName) &&
+                Objects.equals(importCount, that.importCount);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, fileName, importDate, importName, importCount);
+    }
+}

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

+package com.yxproject.start.entity;
+
+import javax.persistence.*;
+import java.sql.Time;
+import java.util.Objects;
+
+/**
+ * @auther zhangyusheng
+ * 2019/4/17   9:42
+ */
+@Entity
+@Table(name = "DELIVERED_INFO", schema = "YINGXIN", catalog = "")
+public class DeliveredInfoEntity {
+    private long id;
+    private String waybillNumber;
+    private Time dealDate;
+    private Long dealState;
+    private long fileId;
+
+    @Id
+    @Column(name = "ID")
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @Basic
+    @Column(name = "WAYBILL_NUMBER")
+    public String getWaybillNumber() {
+        return waybillNumber;
+    }
+
+    public void setWaybillNumber(String waybillNumber) {
+        this.waybillNumber = waybillNumber;
+    }
+
+    @Basic
+    @Column(name = "DEAL_DATE")
+    public Time getDealDate() {
+        return dealDate;
+    }
+
+    public void setDealDate(Time dealDate) {
+        this.dealDate = dealDate;
+    }
+
+    @Basic
+    @Column(name = "DEAL_STATE")
+    public Long getDealState() {
+        return dealState;
+    }
+
+    public void setDealState(Long dealState) {
+        this.dealState = dealState;
+    }
+
+    @Basic
+    @Column(name = "FILE_ID")
+    public long getFileId() {
+        return fileId;
+    }
+
+    public void setFileId(long fileId) {
+        this.fileId = fileId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DeliveredInfoEntity that = (DeliveredInfoEntity) o;
+        return id == that.id &&
+                Objects.equals(waybillNumber, that.waybillNumber) &&
+                Objects.equals(dealDate, that.dealDate) &&
+                Objects.equals(fileId, that.fileId) &&
+                Objects.equals(dealState, that.dealState);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, fileId,waybillNumber, dealDate, dealState);
+    }
+}

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

+package com.yxproject.start.mapper;
+
+import com.yxproject.start.entity.DeliveredFailedInfoEntity;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+
+/**
+ * @auther zhangyusheng
+ * 2019/4/17   10:24
+ */
+@Mapper
+public interface DeliveredFailedInfoMapper {
+    @Insert("insert into DELIVERED_FAILED_INFO (WAYBILL_NUMBER,BACK_DATE,BACK_REASON,note,REGISTER_NAME,CARD_ID) \n" +
+            "VALUES (#{waybillNumber},sysdate,#{backReason},#{note},#{registerName},#{cardId})")
+    @Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
+    public boolean saveDeliveredFailedInfo(DeliveredFailedInfoEntity deliveredFailedInfoEntity);
+}

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

+package com.yxproject.start.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @auther zhangyusheng
+ * 2019/4/17   10:25
+ */
+@Mapper
+public interface DeliveredFailedReasonMapper {
+}

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

+package com.yxproject.start.mapper;
+
+import com.yxproject.start.entity.DeliveredImportDicEntity;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+
+/**
+ * @auther zhangyusheng
+ * 2019/4/17   10:25
+ */
+@Mapper
+public interface DeliveredImportDicMapper {
+    @Insert("insert into DELIVERED_IMPORT_DIC (FILE_NAME,IMPORT_DATE,import_name,import_count) \n" +
+            "VALUES (#{fileName},sysdate,#{importName},#{importCount})")
+    @Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
+    public boolean saveDeliveredImportDic(DeliveredImportDicEntity deliveredImportDicEntity);
+}

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

+package com.yxproject.start.mapper;
+
+import com.yxproject.start.entity.DeliveredImportDicEntity;
+import com.yxproject.start.entity.DeliveredInfoEntity;
+import org.apache.ibatis.annotations.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @auther zhangyusheng
+ * 2019/4/17   10:26
+ */
+@Mapper
+public interface DeliveredInfoMapper {
+
+    @Insert("insert into DELIVERED_INFO (WAYBILL_NUMBER,DEAL_DATE,DEAL_STATE,FILE_ID) \n" +
+            "VALUES (#{waybillNumber},sysdate,#{dealState},#{fileId})")
+    @Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
+    public  boolean saveDeliveredInfo(DeliveredInfoEntity deliveredInfoEntity);
+
+    @Select("select to_char(PRINT_DATE,'yyyyMMdd') PRINT_DATE ,count(PERSON_POST.WAYBILL_NUMBER) post_Count,\n" +
+            "sum(decode(DELIVERED_INFO.WAYBILL_NUMBER,null,0,1)) DELIVERED_count,\n" +
+            "sum(decode(DELIVERED_FAILED_INFO.WAYBILL_NUMBER,null,0,1)) DELIVERED_FAILED_count from PERSON_POST \n" +
+            "left join DELIVERED_INFO on PERSON_POST.WAYBILL_NUMBER = DELIVERED_INFO.WAYBILL_NUMBER\n" +
+            "left join DELIVERED_FAILED_INFO on PERSON_POST.WAYBILL_NUMBER = DELIVERED_FAILED_INFO.WAYBILL_NUMBER\n" +
+            "where to_char(PRINT_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} \n" +
+            "group by to_char(PRINT_DATE,'yyyyMMdd')")
+    public List<Map<String,Object>> selectReport(@Param("startDate")String startDate,@Param("endDate") String endDate);
+
+    @Select("select * from DELIVERED_IMPORT_DIC where TO_CHAR(IMPORT_DATE,'yyyyMMdd') = #{date} ")
+    public List<DeliveredImportDicEntity> selectDeliveredByImportDate(@Param("date")String date);
+
+
+    @Select("select DELIVERED_FAILED_INFO.*,DELIVERED_FAILED_REASON.REASON from DELIVERED_FAILED_INFO\n" +
+            "left join DELIVERED_FAILED_REASON on DELIVERED_FAILED_REASON.ID = DELIVERED_FAILED_INFO.BACK_REASON\n" +
+            "where to_char(back_date,'yyyyMMdd') = #{date}")
+    public List<Map<String,Object>> selectDeliveredFailedByRegisterDate(@Param("date")String date);
+
+    @Delete("delete from DELIVERED_INFO where FILE_ID = #{fileId}")
+    public boolean deleteDeliveredByFileId(@Param("fileId")long fileId);
+
+    @Delete("delete from DELIVERED_IMPORT_DIC where id = #{fileId}")
+    public boolean deleteDeliveredImportDicByFileId(@Param("fileId")long fileId);
+
+    @Delete("delete from DELIVERED_FAILED_INFO where id = #{id}")
+    public boolean deleteDeliveredFailedById(@Param("id")long id);
+}

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

@@ -36,7 +36,7 @@ public interface ReceiptMapper {
             "left join group_no on group_no.group_no = prod_group_t.group_no \n" +
             "left join task on task.task_id =group_no.task_id \n" +
             "left join GAJG_DM on subStr(prod_card_t.UPLOAD_NO,0,9)= GAJG_DM.GAJG_DM \n" +
-            "where prod_group_t.group_no=#{groupNo} and prod_card_t.accept_no not  in (select accept_no from SPECIAL_CARD ) \n" +
+            "where substr(prod_card_t.accept_no,0,8) =#{groupNo} and prod_card_t.accept_no not  in (select accept_no from SPECIAL_CARD ) \n" +
             "group by prod_group_t.group_no, prod_card_t.accept_no, subStr(prod_card_t.UPLOAD_NO,0,9), GAJG_DM.GAJG_MC, task.CARD_TYPE, \n" +
             "task.OLD_CARD_TYPE,prod_card_t.id_no,prod_card_t.sex_no,prod_card_t.upload_no ")
     public List<Map<String,Object>> selectReceiptListDate2(String groupNo);
@@ -105,8 +105,8 @@ public interface ReceiptMapper {
     //根据身份证号查询特证表count
     @Select("select count(*) from SPECIAL_CARD \n" +
             "left join prod_card_t@prod_link on special_card.accept_no = prod_card_t.accept_no\n" +
-            "where prod_card_t.id_no = #{id}")
-    public int selectSpecialCardByAcceptNo(@Param("id") String id);
+            "where prod_card_t.id_no = #{id} and prod_card_t.BEGIN_DATE= #{beginDate}  and  prod_card_t.EXPIRE_DATE = #{expireDate}")
+    public int selectSpecialCardByAcceptNo(@Param("id")String id,@Param("beginDate")String beginDate,@Param("expireDate")String expireDate);
 
     //查询未复核交接单
     @Select("SELECT RECEIPT_LIST.* ,GAJG_DM.GAJG_MC FROM RECEIPT_LIST LEFT JOIN GAJG_DM ON RECEIPT_LIST.POLICE_CODE=GAJG_DM.GAJG_DM where state=0 and check_name =#{name} \n")
@@ -119,7 +119,12 @@ public interface ReceiptMapper {
     public Map<String,Object> selectReceiptList(@Param("id") String id);
 
     //根据交接单号查详单信息
-    @Select("select *  from detail_receipt_list where receipt_id=#{receiptId}")
+    @Select("select detail_receipt_list.UPLOAD_NO,detail_receipt_list.ACCEPT_NO,detail_receipt_list.NAME,detail_receipt_list.POLICE_CODE,detail_receipt_list.CARD_ID\n" +
+            ",detail_receipt_list.NOTE,detail_receipt_list.SIGN_GOVT,detail_receipt_list.RECEIPT_ID,detail_receipt_list.SEX,\n" +
+            "RECEIPT_LIST.QR_CODE,RECEIPT_LIST.RECEIPT_DATE,RECEIPT_LIST.FINISH_COUNT,GAJG_DM.GAJG_MC\n" +
+            "from detail_receipt_list left join RECEIPT_LIST on detail_receipt_list.RECEIPT_ID = RECEIPT_LIST.id\n" +
+            "left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" +
+            "where receipt_id= #{receiptId}")
     public List<Map<String,Object>> selectDetailList(@Param("receiptId") String receiptId);
 
     //根据传入的交接单ID和复核人ID插入复核人、复核时间、更改状态

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

@@ -467,7 +467,7 @@ public interface TaskListMapper {
             "sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count, task.submit_date, task.task_id,\n" +
             "CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, \n" +
             "group_no.VALID_COUNT,group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO, \n" +
-            "fc.faileCount faileCount from group_no \n" +
+            "nvl(fc.faileCount,0) faileCount from group_no \n" +
             "left join task on group_no.task_id= task.TASK_ID \n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE \n" +
             "left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE \n" +
@@ -1172,7 +1172,7 @@ public interface TaskListMapper {
             "sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,\n" +
             "task.submit_date,FAILED_CARD.failed_card_id task_id,'废证' CARD_TYPE,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
-            "FAILED_CARD.ACCEPT_NO group_No, 0 faileCount\n" +
+            "FAILED_CARD.ACCEPT_NO group_No, '0' faileCount\n" +
             "from FAILED_CARD left join task on FAILED_CARD.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +

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

+package com.yxproject.start.service;
+
+import com.yxproject.start.entity.DeliveredFailedInfoEntity;
+import com.yxproject.start.entity.DeliveredImportDicEntity;
+import com.yxproject.start.entity.DeliveredInfoEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @auther zhangyusheng
+ * 2019/4/17   10:27
+ */
+public interface DeliveredService {
+    public boolean saveDeliveredImportDic(DeliveredImportDicEntity deliveredImportDicEntity);
+    public  boolean saveDeliveredInfoList(List<DeliveredInfoEntity> deliveredInfoEntityList);
+    public  boolean saveDeliveredFailedInfoList(List<DeliveredFailedInfoEntity> deliveredFailedInfoEntities);
+    public List<Map<String,Object>> selectDeliveredReport(String startDate,String endDate);
+    public List<DeliveredImportDicEntity> selectDeliveredByImportDate(String date);
+    public List<Map<String,Object>> selectDeliveredFailedByRegisterDate(String date);
+    public boolean deleteDeliveredByFileId(long filedID);
+    public boolean deleteDeliveredFailedById(long id);
+}

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

@@ -21,7 +21,7 @@ public interface ReceiptService {
 
     public List<Map<String,Object>> selectByGroupNo(String groupNo);
 
-    public int selectSpecialCardByAcceptNo(String id);
+    public int selectSpecialCardByAcceptNo(String id,String beginDate,String expireDate);
 
     public List<Map<String,Object>>selectReceiptListOfSpecialCard (String name);
 

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

+package com.yxproject.start.service.impl;
+
+import com.yxproject.start.entity.DeliveredFailedInfoEntity;
+import com.yxproject.start.entity.DeliveredImportDicEntity;
+import com.yxproject.start.entity.DeliveredInfoEntity;
+import com.yxproject.start.mapper.DeliveredFailedInfoMapper;
+import com.yxproject.start.mapper.DeliveredFailedReasonMapper;
+import com.yxproject.start.mapper.DeliveredImportDicMapper;
+import com.yxproject.start.mapper.DeliveredInfoMapper;
+import com.yxproject.start.service.DeliveredService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @auther zhangyusheng
+ * 2019/4/17   10:27
+ */
+@Service
+public class DeliveredServiceImpl implements DeliveredService {
+    @Autowired
+    private DeliveredFailedInfoMapper deliveredFailedInfoMapper;
+    @Autowired
+    private DeliveredFailedReasonMapper deliveredFailedReasonMapper;
+    @Autowired
+    private DeliveredImportDicMapper deliveredImportDicMapper;
+    @Autowired
+    private DeliveredInfoMapper deliveredInfoMapper;
+
+    @Override
+    public boolean saveDeliveredImportDic(DeliveredImportDicEntity deliveredImportDicEntity) {
+        return deliveredImportDicMapper.saveDeliveredImportDic(deliveredImportDicEntity);
+    }
+
+    @Override
+    public boolean saveDeliveredInfoList(List<DeliveredInfoEntity> deliveredInfoEntityList) {
+        for (DeliveredInfoEntity deliveredInfoEntity: deliveredInfoEntityList) {
+            deliveredInfoMapper.saveDeliveredInfo(deliveredInfoEntity);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean saveDeliveredFailedInfoList(List<DeliveredFailedInfoEntity> deliveredFailedInfoEntities) {
+        for (DeliveredFailedInfoEntity deliveredFailedInfoEntity :deliveredFailedInfoEntities){
+            deliveredFailedInfoMapper.saveDeliveredFailedInfo(deliveredFailedInfoEntity);
+        }
+        return false;
+    }
+
+    @Override
+    public List<Map<String, Object>> selectDeliveredReport(String startDate, String endDate) {
+        List<Map<String, Object>> mapList = deliveredInfoMapper.selectReport(startDate, endDate);
+        return mapList;
+    }
+
+    @Override
+    public List<DeliveredImportDicEntity> selectDeliveredByImportDate(String date) {
+        return deliveredInfoMapper.selectDeliveredByImportDate(date);
+    }
+
+    @Override
+    public List<Map<String, Object>> selectDeliveredFailedByRegisterDate(String date) {
+        return deliveredInfoMapper.selectDeliveredFailedByRegisterDate(date);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean deleteDeliveredByFileId(long filedID) {
+        deliveredInfoMapper.deleteDeliveredByFileId(filedID);
+        deliveredInfoMapper.deleteDeliveredImportDicByFileId(filedID);
+        return true;
+    }
+
+    @Override
+    public boolean deleteDeliveredFailedById(long id) {
+        return deliveredInfoMapper.deleteDeliveredFailedById(id);
+    }
+}

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

@@ -53,8 +53,8 @@ public class ReceiptServiceImpl implements ReceiptService {
     }
 
     @Override
-    public int selectSpecialCardByAcceptNo(String id) {
-        int countSpecial =receiptMapper.selectSpecialCardByAcceptNo(id);
+    public int selectSpecialCardByAcceptNo(String id,String beginDate,String expireDate) {
+        int countSpecial =receiptMapper.selectSpecialCardByAcceptNo(id,beginDate,expireDate);
         return countSpecial;
     }
 
@@ -283,11 +283,13 @@ public class ReceiptServiceImpl implements ReceiptService {
                 int validCount = 0;
                 String countyName = null;
                 String countyCode = null;
+                String receiptDate= null;
                 List<Map<String, Object>> countyMapList = mapList.get(taskId);
                 for (Map<String, Object> countyMap : countyMapList) {
                     countyCode = countyMap.get("COUNTY_CODE") + "";
                     countyName = countyMap.get("COUNTYNAME") + "";
                     typeName = countyMap.get("CARD_TYPE_ID") + "";
+                    receiptDate = countyMap.get("RECEIPT_DATE")+"";
                     typeSum += Integer.valueOf(countyMap.get("FINISH_COUNT") + "");
                     validCount += Integer.valueOf(countyMap.get("FINISH_COUNT") + "");
                 }
@@ -316,6 +318,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                 countyMapGroup.put("policeList", countyMapList);
                 countyMapGroup.put("countyName", countyName);
                 countyMapGroup.put("countyValidCount", validCount);
+                countyMapGroup.put("receiptDate",receiptDate);
                 countyList.add(countyMapGroup);
             }
             mapType.put("typeCode", typeName);

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

@@ -1151,11 +1151,11 @@ public class TaskListServiceImpl implements TaskListService {
                     typeSum += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     typeSum -= Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
                     //工位类型总数减去废证数
-                    typeSum -= Integer.valueOf(countyMap.get("FAILECOUNT") + "");
+                    typeSum -= Integer.valueOf((("null".equals(countyMap.get("FAILECOUNT")+"")?"0":countyMap.get("FAILECOUNT")+"")));
                     validCount += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     invalidCount += Integer.valueOf(countyMap.get("INVALID_COUNT") + "");
                     specialCount += Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
-                    faileCount += Integer.valueOf(countyMap.get("FAILECOUNT") + "");
+                    faileCount += Integer.valueOf((("null".equals(countyMap.get("FAILECOUNT")+"")?"0":countyMap.get("FAILECOUNT")+"")));
                     eWriteCount += Integer.valueOf(countyMap.get("E_WRITER_COUNT") + "");
                     recheckCount += Integer.valueOf(countyMap.get("FINISH_COUNT") + "");
                     checkCount += Integer.valueOf(countyMap.get("CHECK_COUNT") + "");

src/main/resources/mapper/config/mybatis-config.xml

@@ -6,6 +6,6 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
     <settings>
         <setting name="mapUnderscoreToCamelCase" value="true"/>
         <setting name="callSettersOnNulls" value="true"/>
-        <setting name="logImpl" value="STDOUT_LOGGING" />
+        <!--<setting name="logImpl" value="STDOUT_LOGGING" />-->
     </settings>
 </configuration>
\ No newline at end of file

src/main/resources/static/index.html

@@ -79,7 +79,6 @@
         <!-- Logo -->
         <a href="index.html" class="logo" style="line-height: 50px;">
             <!-- mini logo for sidebar mini 50x50 pixels -->
-            <span class="logo-mini"><span><img src="newTheme/dist/img/logo.jpg" style="width:25px;height:25px;"></span></span>
             <!-- logo for regular state and mobile devices -->
             <span class="logo-lg">
                 <img src="newTheme/dist/img/logo.jpg" style="width:25px;height:25px;">

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

@@ -504,13 +504,15 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
-            selectTagPrintData:function(idCard,success){
+            selectTagPrintData:function(idCard,startDate,endDate,success){
                 $http({
                     method: 'GET',
                     url: "../ReceiptApi/createReceiptList"+urlTimeStamp(),
                     params:{
                         id:idCard,
-                        name:$rootScope.loginData.name
+                        name:$rootScope.loginData.name,
+                        beginDate:startDate,
+                        expireDate:endDate
                     }
                 }).then(function successCallback(response) {
                     success(response.data)

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

@@ -17,6 +17,9 @@
                    <td width="10%" style="text-align: center;vertical-align: middle!important;">身份证号:</td>
                    <td colspan="2" width="35%">
                        <input type="text" class="form-control" placeholder="身份证号" ng-model="idCard"/>
+                   </td>
+                   <td colspan="1">
+                       有效期: <input style="width:9%;" name="yxqstart" type="text"   ng-model="startDate"> 至 <input style="width:9%;"   name="yxqend" type="text" ng-model="endDate">
                    </td>
                     <td style="text-align: left;">
                         <button class="btn btn-primary search" ng-click="searchTagPrintData()">查询</button>

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

@@ -82,8 +82,8 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
             idCard:''
         }
 
-        var doQueryByIdCard = function(idcard){
-            HttpService.selectTagPrintData(idcard,function(data){
+        var doQueryByIdCard = function(idcard,startDate,endDate){
+            HttpService.selectTagPrintData(idcard,startDate,endDate,function(data){
                 $(".search").removeAttr("disabled");
                 console.log(data)
                 if(data.state==1){
@@ -141,7 +141,9 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                     var ret = document.getElementById("aaa").ReadCardPath("c:\\", 1);
                     if (ret == 1 || ret == 3) {
                         postParam.idCard = document.getElementById("aaa").sIDNo;
-                        doQueryByIdCard(postParam.idCard)
+                        postParam.startDate = document.getElementById("aaa").sStartDate;;
+                        postParam.endDate = document.getElementById("aaa").sEndDate;
+                        doQueryByIdCard(postParam.idCard,postParam.startDate,postParam.endDate)
                     }
                 }
                 else {
@@ -207,7 +209,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                     var LODOP = getLodop();
                     LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
                     if (!LODOP) { alert("请先安装控件！"); return; }
-                    // LODOP.SET_LICENSES("民软网(www.minsoft.cn)", "158703810611011350109107113120", "", "");
+                    LODOP.SET_LICENSES("", "15F0BE661E7F32F37491843CB2510905", "C94CEE276DB2187AE6B65D56B3FC2848", "");
                     //初始化
                     LODOP.PRINT_INIT("打印封口签");
                     //设置纸张大小
@@ -215,7 +217,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                     LODOP.SET_PRINT_PAGESIZE(1, "80mm", "50mm", "");
                     // LODOP.SET_PRINT_STYLE("FontName", "黑体");
                     //设定该条形码在纸张内的位置和大小【Top, Left,Width, Height, CodeType, CodeValue】
-                    LODOP.ADD_PRINT_BARCODE(15,9, "78mm", "20mm", "128A", $scope.json.policeCardsList[0].ACCEPT_NO.substring(0,8));
+                    LODOP.ADD_PRINT_BARCODE(15,9, "78mm", "20mm", "128A", $scope.json.policeCardsList[0].ACCEPT_NO.toString());
                     LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
                     LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);