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

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

@@ -2,11 +2,16 @@ package com.yxproject.start.api;
 
 //import com.yxproject.start.service.FindCbCountByDealdateViewService;
 import com.yxproject.start.service.CardBodyService;
+import com.yxproject.start.service.FindStationCountService;
 import com.yxproject.start.service.FindTaskByDealdateViewService;
+import com.yxproject.start.utils.YXJSONResponse;
 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 javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -22,6 +27,8 @@ public class YingxinApi {
 //    private FindCbCountByDealdateViewService findCbCountByDealdateViewService;
     @Autowired
     private CardBodyService cardBodyService;
+    @Autowired
+    private FindStationCountService findStationCountService;
 
     @RequestMapping("getGroupInfo")
     public List<Map<String, Object>> getGroupInfo() {
@@ -30,7 +37,7 @@ public class YingxinApi {
     }
     @RequestMapping("getCbCountInfo")
     public  List<Map<String,Object>> getCbCountInfo() {
-        List<Map<String, Object>> list =cardBodyService.getCbCount();
+        List<Map<String, Object>> list=cardBodyService.getCbCount();
         return list;
     }
     @RequestMapping("getCbBodyCountInfo")
@@ -38,5 +45,18 @@ public class YingxinApi {
         List<Map<String,Object>> list=cardBodyService.getCbBodyCount();
         return list;
     }
+
+    @RequestMapping("getStationCountInfo")
+    public String getStationCountInfo(@RequestParam("submitDate") String submitDate, HttpServletResponse resp){
+        List<Map<String,Object>> list=findStationCountService.getStationCountData(submitDate);
+        YXJSONResponse yxjsonResponse = new YXJSONResponse();
+        resp.setCharacterEncoding("UTF-8");
+        yxjsonResponse.outPutSuccess(list);
+        Map map = new HashMap();
+//      map.put("MakeType",productionTaskListEntity);
+        return yxjsonResponse.toJSONString();
     }
 
+
+}
+

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

+package com.yxproject.start.entity;
+
+import javax.persistence.*;
+
+/**
+ * Created by Administrator on 2018/11/21.
+ */
+@Entity
+@Table(name = "ACC_GROUP_RELATION_T", schema = "ACC_DBA", catalog = "")
+public class AccGroupRelationTEntity {
+    private String groupNo;
+    private String originalNo;
+    private String dealStatus;
+    private String dealDate;
+    private String uploadUnitNo;
+
+    @Id
+    @Column(name = "GROUP_NO", nullable = false, length = 10)
+    public String getGroupNo() {
+        return groupNo;
+    }
+
+    public void setGroupNo(String groupNo) {
+        this.groupNo = groupNo;
+    }
+
+    @Basic
+    @Column(name = "ORIGINAL_NO", nullable = false, length = 25)
+    public String getOriginalNo() {
+        return originalNo;
+    }
+
+    public void setOriginalNo(String originalNo) {
+        this.originalNo = originalNo;
+    }
+
+    @Basic
+    @Column(name = "DEAL_STATUS", nullable = true, length = 1)
+    public String getDealStatus() {
+        return dealStatus;
+    }
+
+    public void setDealStatus(String dealStatus) {
+        this.dealStatus = dealStatus;
+    }
+
+    @Basic
+    @Column(name = "DEAL_DATE", nullable = false, length = 8)
+    public String getDealDate() {
+        return dealDate;
+    }
+
+    public void setDealDate(String dealDate) {
+        this.dealDate = dealDate;
+    }
+
+    @Basic
+    @Column(name = "UPLOAD_UNIT_NO", nullable = false, length = 12)
+    public String getUploadUnitNo() {
+        return uploadUnitNo;
+    }
+
+    public void setUploadUnitNo(String uploadUnitNo) {
+        this.uploadUnitNo = uploadUnitNo;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        AccGroupRelationTEntity that = (AccGroupRelationTEntity) o;
+
+        if (groupNo != null ? !groupNo.equals(that.groupNo) : that.groupNo != null) return false;
+        if (originalNo != null ? !originalNo.equals(that.originalNo) : that.originalNo != null) return false;
+        if (dealStatus != null ? !dealStatus.equals(that.dealStatus) : that.dealStatus != null) return false;
+        if (dealDate != null ? !dealDate.equals(that.dealDate) : that.dealDate != null) return false;
+        if (uploadUnitNo != null ? !uploadUnitNo.equals(that.uploadUnitNo) : that.uploadUnitNo != null) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = groupNo != null ? groupNo.hashCode() : 0;
+        result = 31 * result + (originalNo != null ? originalNo.hashCode() : 0);
+        result = 31 * result + (dealStatus != null ? dealStatus.hashCode() : 0);
+        result = 31 * result + (dealDate != null ? dealDate.hashCode() : 0);
+        result = 31 * result + (uploadUnitNo != null ? uploadUnitNo.hashCode() : 0);
+        return result;
+    }
+}

src/main/java/com/yxproject/start/entity/AccGroupRelationTEntity.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
+        version="2.0">
+
+    <entity class="com.yxproject.start.entity.AccGroupRelationTEntity">
+        <table name="ACC_GROUP_RELATION_T" schema="ACC_DBA" catalog=""/>
+        <attributes>
+            <id name="groupNo">
+                <column name="GROUP_NO" length="10"/>
+            </id>
+            <basic name="originalNo">
+                <column name="ORIGINAL_NO" length="25"/>
+            </basic>
+            <basic name="dealStatus">
+                <column name="DEAL_STATUS" nullable="false" length="1"/>
+            </basic>
+            <basic name="dealDate">
+                <column name="DEAL_DATE" length="8"/>
+            </basic>
+            <basic name="uploadUnitNo">
+                <column name="UPLOAD_UNIT_NO" length="12"/>
+            </basic>
+        </attributes>
+    </entity>
+</entity-mappings>

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

+package com.yxproject.start.entity;
+
+import javax.persistence.*;
+
+/**
+ * Created by Administrator on 2018/11/30.
+ */
+@Entity
+@Table(name = "FIND_STATION_COUNT_BY_VIEW", schema = "DAHAI", catalog = "")
+public class FindStationCountByViewEntity {
+    private String submit_Date;
+    private Long shujuheyan;
+    private Long dayinfenpei;
+    private Long xiezaidayin;
+    private Long chejianyudingwei;
+    private Long chejianzhuanchu;
+    private Long rengongzhijina;
+    private Long cangkuguanli;
+    private Long caiwuguanli;
+    private Long applyCount;
+
+    @Id
+    @Column(name = "SUBMIT_DATE", nullable = true, length = 10)
+    public String getSubmitDate() {
+        return submit_Date;
+    }
+
+    public void setSubmitDate(String submitDate) {
+        this.submit_Date = submitDate;
+    }
+
+    @Basic
+    @Column(name = "SHUJUHEYAN", nullable = true, precision = 0)
+    public Long getShujuheyan() {
+        return shujuheyan;
+    }
+
+    public void setShujuheyan(Long shujuheyan) {
+        this.shujuheyan = shujuheyan;
+    }
+
+    @Basic
+    @Column(name = "DAYINFENPEI", nullable = true, precision = 0)
+    public Long getDayinfenpei() {
+        return dayinfenpei;
+    }
+
+    public void setDayinfenpei(Long dayinfenpei) {
+        this.dayinfenpei = dayinfenpei;
+    }
+
+    @Basic
+    @Column(name = "XIEZAIDAYIN", nullable = true, precision = 0)
+    public Long getXiezaidayin() {
+        return xiezaidayin;
+    }
+
+    public void setXiezaidayin(Long xiezaidayin) {
+        this.xiezaidayin = xiezaidayin;
+    }
+
+    @Basic
+    @Column(name = "CHEJIANYUDINGWEI", nullable = true, precision = 0)
+    public Long getChejianyudingwei() {
+        return chejianyudingwei;
+    }
+
+    public void setChejianyudingwei(Long chejianyudingwei) {
+        this.chejianyudingwei = chejianyudingwei;
+    }
+
+    @Basic
+    @Column(name = "CHEJIANZHUANCHU", nullable = true, precision = 0)
+    public Long getChejianzhuanchu() {
+        return chejianzhuanchu;
+    }
+
+    public void setChejianzhuanchu(Long chejianzhuanchu) {
+        this.chejianzhuanchu = chejianzhuanchu;
+    }
+
+    @Basic
+    @Column(name = "RENGONGZHIJINA", nullable = true, precision = 0)
+    public Long getRengongzhijina() {
+        return rengongzhijina;
+    }
+
+    public void setRengongzhijina(Long rengongzhijina) {
+        this.rengongzhijina = rengongzhijina;
+    }
+
+    @Basic
+    @Column(name = "CANGKUGUANLI", nullable = true, precision = 0)
+    public Long getCangkuguanli() {
+        return cangkuguanli;
+    }
+
+    public void setCangkuguanli(Long cangkuguanli) {
+        this.cangkuguanli = cangkuguanli;
+    }
+
+    @Basic
+    @Column(name = "CAIWUGUANLI", nullable = true, precision = 0)
+    public Long getCaiwuguanli() {
+        return caiwuguanli;
+    }
+
+    public void setCaiwuguanli(Long caiwuguanli) {
+        this.caiwuguanli = caiwuguanli;
+    }
+
+    @Basic
+    @Column(name = "APPLY_COUNT", nullable = true, precision = 0)
+    public Long getApplyCount() {
+        return applyCount;
+    }
+
+    public void setApplyCount(Long applyCount) {
+        this.applyCount = applyCount;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        FindStationCountByViewEntity that = (FindStationCountByViewEntity) o;
+
+        if (submit_Date != null ? !submit_Date.equals(that.submit_Date) : that.submit_Date != null) return false;
+        if (shujuheyan != null ? !shujuheyan.equals(that.shujuheyan) : that.shujuheyan != null) return false;
+        if (dayinfenpei != null ? !dayinfenpei.equals(that.dayinfenpei) : that.dayinfenpei != null) return false;
+        if (xiezaidayin != null ? !xiezaidayin.equals(that.xiezaidayin) : that.xiezaidayin != null) return false;
+        if (chejianyudingwei != null ? !chejianyudingwei.equals(that.chejianyudingwei) : that.chejianyudingwei != null)
+            return false;
+        if (chejianzhuanchu != null ? !chejianzhuanchu.equals(that.chejianzhuanchu) : that.chejianzhuanchu != null)
+            return false;
+        if (rengongzhijina != null ? !rengongzhijina.equals(that.rengongzhijina) : that.rengongzhijina != null)
+            return false;
+        if (cangkuguanli != null ? !cangkuguanli.equals(that.cangkuguanli) : that.cangkuguanli != null) return false;
+        if (caiwuguanli != null ? !caiwuguanli.equals(that.caiwuguanli) : that.caiwuguanli != null) return false;
+        if (applyCount != null ? !applyCount.equals(that.applyCount) : that.applyCount != null) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = submit_Date != null ? submit_Date.hashCode() : 0;
+        result = 31 * result + (shujuheyan != null ? shujuheyan.hashCode() : 0);
+        result = 31 * result + (dayinfenpei != null ? dayinfenpei.hashCode() : 0);
+        result = 31 * result + (xiezaidayin != null ? xiezaidayin.hashCode() : 0);
+        result = 31 * result + (chejianyudingwei != null ? chejianyudingwei.hashCode() : 0);
+        result = 31 * result + (chejianzhuanchu != null ? chejianzhuanchu.hashCode() : 0);
+        result = 31 * result + (rengongzhijina != null ? rengongzhijina.hashCode() : 0);
+        result = 31 * result + (cangkuguanli != null ? cangkuguanli.hashCode() : 0);
+        result = 31 * result + (caiwuguanli != null ? caiwuguanli.hashCode() : 0);
+        result = 31 * result + (applyCount != null ? applyCount.hashCode() : 0);
+        return result;
+    }
+}

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

+package com.yxproject.start.entity;
+
+import javax.persistence.*;
+
+/**
+ * Created by Administrator on 2018/11/21.
+ */
+@Entity
+@Table(name = "FIND_TASK_BY_DEALDATE_VIEW", schema = "DAHAI", catalog = "")
+public class FindTaskByDealdateViewEntity {
+    private String groupNo;
+    private Byte validCount;
+    private Byte invalidCount;
+    private String dealFlag;
+    private String submitDate;
+    private String submitCode;
+    private String originalNo;
+    private String importTime;
+
+    @Id
+    @Column(name = "GROUP_NO", nullable = false, length = 20)
+    public String getGroupNo() {
+        return groupNo;
+    }
+
+    public void setGroupNo(String groupNo) {
+        this.groupNo = groupNo;
+    }
+
+    @Basic
+    @Column(name = "VALID_COUNT", nullable = true, precision = 0)
+    public Byte getValidCount() {
+        return validCount;
+    }
+
+    public void setValidCount(Byte validCount) {
+        this.validCount = validCount;
+    }
+
+    @Basic
+    @Column(name = "INVALID_COUNT", nullable = true, precision = 0)
+    public Byte getInvalidCount() {
+        return invalidCount;
+    }
+
+    public void setInvalidCount(Byte invalidCount) {
+        this.invalidCount = invalidCount;
+    }
+
+    @Basic
+    @Column(name = "DEAL_FLAG", nullable = false, length = 2)
+    public String getDealFlag() {
+        return dealFlag;
+    }
+
+    public void setDealFlag(String dealFlag) {
+        this.dealFlag = dealFlag;
+    }
+
+    @Basic
+    @Column(name = "SUBMIT_DATE", nullable = true, length = 8)
+    public String getSubmitDate() {
+        return submitDate;
+    }
+
+    public void setSubmitDate(String submitDate) {
+        this.submitDate = submitDate;
+    }
+
+    @Basic
+    @Column(name = "SUBMIT_CODE", nullable = true, length = 16)
+    public String getSubmitCode() {
+        return submitCode;
+    }
+
+    public void setSubmitCode(String submitCode) {
+        this.submitCode = submitCode;
+    }
+
+    @Basic
+    @Column(name = "ORIGINAL_NO", nullable = false, length = 50)
+    public String getOriginalNo() {
+        return originalNo;
+    }
+
+    public void setOriginalNo(String originalNo) {
+        this.originalNo = originalNo;
+    }
+
+    @Basic
+    @Column(name = "IMPORT_TIME", nullable = true, length = 8)
+    public String getImportTime() {
+        return importTime;
+    }
+
+    public void setImportTime(String importTime) {
+        this.importTime = importTime;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        FindTaskByDealdateViewEntity that = (FindTaskByDealdateViewEntity) o;
+
+        if (groupNo != null ? !groupNo.equals(that.groupNo) : that.groupNo != null) return false;
+        if (validCount != null ? !validCount.equals(that.validCount) : that.validCount != null) return false;
+        if (invalidCount != null ? !invalidCount.equals(that.invalidCount) : that.invalidCount != null) return false;
+        if (dealFlag != null ? !dealFlag.equals(that.dealFlag) : that.dealFlag != null) return false;
+        if (submitDate != null ? !submitDate.equals(that.submitDate) : that.submitDate != null) return false;
+        if (submitCode != null ? !submitCode.equals(that.submitCode) : that.submitCode != null) return false;
+        if (originalNo != null ? !originalNo.equals(that.originalNo) : that.originalNo != null) return false;
+        if (importTime != null ? !importTime.equals(that.importTime) : that.importTime != null) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = groupNo != null ? groupNo.hashCode() : 0;
+        result = 31 * result + (validCount != null ? validCount.hashCode() : 0);
+        result = 31 * result + (invalidCount != null ? invalidCount.hashCode() : 0);
+        result = 31 * result + (dealFlag != null ? dealFlag.hashCode() : 0);
+        result = 31 * result + (submitDate != null ? submitDate.hashCode() : 0);
+        result = 31 * result + (submitCode != null ? submitCode.hashCode() : 0);
+        result = 31 * result + (originalNo != null ? originalNo.hashCode() : 0);
+        result = 31 * result + (importTime != null ? importTime.hashCode() : 0);
+        return result;
+    }
+}

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

@@ -14,4 +14,6 @@ public interface AccCardTMapper {
     public List<AccCardTEntity> findAccCardTEntityByCardIdOrAcceptNo(String acceptNo);
     public List<Map<String,Object>> findAccGroupTEntityByCardIdOrAcceptNo(String acceptNo);
     public List<Map<String,Object>> findAccGroupTEntityByCardIdOrDealDate(String dealDate);
+    public List<Map<String,Object>> findCbCountByDealdateViewData(String dealDate);
+
 }

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

@@ -4,6 +4,7 @@ import com.yxproject.start.entity.CardBodyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by liuxinben on 2018/11/6.10:26
@@ -12,6 +13,7 @@ import java.util.List;
 @Mapper
 public interface CardBodyMapper {
     public List <CardBodyEntity> insertCardBody(String cardBodyId);
-    public  int updateCardBodyInfo(CardBodyEntity cardBodyEntity);
-
+//    public  int updateCardBody(CardBodyEntity map);
+    public List<Map<String,Object>> findCbCountByDealdateViewData();
+    public List<Map<String,Object>> findCbCountByDealdate();
 }
\ No newline at end of file

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

+package com.yxproject.start.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Administrator on 2018/11/29.
+ */
+@Mapper
+public interface FindStationCountMapper {
+    public List<Map<String,Object>>findStationCountByDealDate(String submitDate);
+}

src/main/java/com/yxproject/start/mapper/AccGroupTMapper.java → src/main/java/com/yxproject/start/mapper/FindTaskByDealdateViewMapper.java

 package com.yxproject.start.mapper;
 
+import com.yxproject.start.entity.FindTaskByDealdateViewEntity;
+import com.yxproject.start.entity.accu.AccGroupTEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
+
 /**
  * Created by zhangyusheng on 2018/10/23 10:36
  */
 @Mapper
-public interface AccGroupTMapper {
+public interface FindTaskByDealdateViewMapper {
+
+    public List<Map<String,Object>> findTaskByDealdateViewData();
 }

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

@@ -4,6 +4,7 @@ import com.yxproject.start.entity.CardBodyEntity;
 import com.yxproject.start.entity.GroupNoEntity;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by Administrator on 2018/11/7.
@@ -11,6 +12,10 @@ import java.util.List;
 public interface CardBodyService {
     public List<CardBodyEntity> insertCardBody(String cardBodyId);
 
-    public int updateCardBody(CardBodyEntity map);
+    public List<Map<String,Object>> getCbCount();
+
+//    public int updateCardBody(CardBodyEntity map);
+
+    public List<Map<String,Object>> getCbBodyCount();
 
 }

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

+package com.yxproject.start.service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Administrator on 2018/11/29.
+ */
+public interface FindStationCountService {
+    public List<Map<String,Object>>getStationCountData(String submitDate);
+}

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

+package com.yxproject.start.service;
+
+import com.yxproject.start.entity.FindTaskByDealdateViewEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Administrator on 2018/11/21.
+ */
+public interface FindTaskByDealdateViewService {
+    public List<Map<String,Object>> getAccGroupData();
+}

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

@@ -12,6 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by Administrator on 2018/11/7.
@@ -20,16 +21,30 @@ import java.util.List;
 @Service
 public class CardBodyServiceImpl implements CardBodyService {
     @Autowired
-    public CardBodyMapper cardBodyMapper;
+    private CardBodyMapper cardBodyMapper;
 
+    @Override
+    public List<Map<String,Object>> getCbCount(){
+        List<Map<String,Object>> list=cardBodyMapper.findCbCountByDealdateViewData();
+        return list;
+    }
 
     @Override
-    public int updateCardBody(CardBodyEntity cardBodyEntity) {
-        //todo  状态更新时间
+    public List<Map<String,Object>> getCbBodyCount(){
 
-        return cardBodyMapper.updateCardBodyInfo(cardBodyEntity);
+        List<Map<String,Object>> list=cardBodyMapper.findCbCountByDealdate();
+        return list;
     }
 
+//    @Override
+//    public int updateCardBody(CardBodyEntity map) {
+//        //todo  状态更新时间
+//
+//        return cardBodyMapper.updateCardBody(map);
+//    }
+
+
+
 
     @Override
     public List<CardBodyEntity> insertCardBody(String cardBodyId) {

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

+package com.yxproject.start.service.impl;
+
+import com.yxproject.start.mapper.FindStationCountMapper;
+import com.yxproject.start.service.FindStationCountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Administrator on 2018/11/29.
+ */
+@Service
+public class FindStationCountServiceImpl implements FindStationCountService {
+    @Autowired
+    private FindStationCountMapper findStationCountMapper;
+
+    @Override
+    public List<Map<String,Object>>getStationCountData(String submitDate) {
+        List<Map<String,Object>> list=findStationCountMapper.findStationCountByDealDate(submitDate);
+        return list;
+
+    }
+}

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

+package com.yxproject.start.service.impl;
+
+import com.yxproject.start.mapper.FindTaskByDealdateViewMapper;
+import com.yxproject.start.service.FindTaskByDealdateViewService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Administrator on 2018/11/21.
+ */
+@Service
+public class FindTaskByDealdateViewServiceImpl implements FindTaskByDealdateViewService {
+
+    @Autowired
+    private FindTaskByDealdateViewMapper findTaskByDealdateViewMapper;
+
+
+    @Override
+    public List<Map<String,Object>> getAccGroupData() {
+
+        List<Map<String,Object>> list = findTaskByDealdateViewMapper.findTaskByDealdateViewData();
+       return list;
+    }
+}

src/main/resources/mapper/CardBodyMapper.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yxproject.start.mapper.CardBodyMapper">
-    <resultMap id="CardBodyInfoMapper" type="com.yxproject.start.entity.CardBodyEntity">
+    <resultMap id="CardBodyMapper" type="com.yxproject.start.entity.CardBodyEntity">
         <id column="CARD_BODY_ID" property="card_Body_Id" jdbcType="NUMERIC"/>
         <result column="SAVE_DATE" property="save_Date" jdbcType="DATE"/>
         <result column="CARD_TYPE_ID" property="card_Type_Id" jdbcType="NUMERIC"/>
@@ -10,9 +10,9 @@
         <result column="TOTAL_COUNT" property="total_Count" jdbcType="NUMERIC"/>
     </resultMap>
 
-    <select id="insertCardBody" resultType="com.yxproject.start.entity.CardBodyEntity" parameterType="String">
-    SELECT  * FROM  CARD_BODY where card_Body_Id=#{card_Body_Id}
-    </select>
+    <select id="insertCardBodyEntity" resultType="com.yxproject.start.entity.CardBodyEntity" parameterType="String">
+    select * from CARD_BODY where CARD_BODY_ID=#{card_Body_Id}
+</select>
 
     <update id="updateCardBody" parameterType="com.yxproject.start.entity.CardBodyEntity">
         update CARD_BODY
@@ -28,4 +28,42 @@
 
     </update>
 
+    <select id="findCbCountByDealdateViewData" resultType="java.util.HashMap">
+           select * from FINDCBCOUNTBYDEALDATE_VIEW
+    </select>
+
+    <select id="findCbCountByDealdate" resultType="java.util.HashMap">
+          WITH
+t_body_card
+AS(
+	SELECT TO_CHAR(SAVE_DATE,'YYYY-MM-DD')SAVE_DATE,CTD.CARD_TYPE,CB.TOTAL_COUNT,DECODE(CB.IS_ACTIVE,1,TOTAL_COUNT,0)IS_ACTIVE
+	FROM CARD_BODY CB,CARD_TYPE_DIC CTD
+	WHERE CB.CARD_TYPE_ID=CTD.CARD_TYPE_ID
+),
+t_total_count
+AS(
+	SELECT * FROM (SELECT SAVE_DATE,CARD_TYPE,TOTAL_COUNT FROM t_body_card) PIVOT(SUM(TOTAL_COUNT) FOR CARD_TYPE IN ('普通证' AS PUTONGZHENG,'快证' AS KUAIZHENG,'省内异地快速通道邮' AS YIDIKSYOU,'省内异地快速通道
+普' AS YIDIKSPU,'省内异地邮' AS YIDIYOU,'省内异地普' AS YIDIPU,'军人证' AS JUNRENZHENG,'快速通道普' AS KSPU,'快速通道邮' AS KSYOU,'邮寄证' AS YOUJIZHENG,'全国证' AS QUANGUOZHENG))),
+t_active_count
+AS(
+	SELECT SAVE_DATE,SUM(IS_ACTIVE)ACTIVE_COUNT FROM t_body_card GROUP BY SAVE_DATE
+)
+
+SELECT DECODE(GROUPING(t_total_count.SAVE_DATE),1,'总计',t_total_count.SAVE_DATE)SAVE_DATE,
+	SUM(PUTONGZHENG)PUTONGZHENG,
+  SUM(KUAIZHENG)KUAIZHENG,
+  SUM(YIDIKSYOU)YIDIKSYOU,
+  SUM(YIDIKSPU)YIDIKSPU,
+  SUM(YIDIYOU)YIDIYOU,
+  SUM(YIDIPU)YIDIPU,
+  SUM(JUNRENZHENG)JUNRENZHENG,
+  SUM(KSPU)KSPU,
+  SUM(KSYOU)KSYOU,
+  SUM(YOUJIZHENG)YOUJIZHENG,
+  SUM(QUANGUOZHENG)QUANGUOZHENG,
+	SUM(ACTIVE_COUNT)ACTIVE_COUNT
+	FROM t_total_count,t_active_count WHERE t_total_count.save_date = t_active_count.save_date
+	GROUP BY ROLLUP(t_total_count.SAVE_DATE)
+    </select>
+
 </mapper>
\ No newline at end of file

src/main/resources/mapper/FindStationCountMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxproject.start.mapper.FindStationCountMapper">
+    <resultMap id="FindStationCountMapper" type="com.yxproject.start.entity.FindStationCountByViewEntity">
+        <id column="SUBMIT_DATE" property="submit_Date"  jdbcType="VARCHAR"/>
+        <result column="SHUJUHEYAN" property="shujuheyan" jdbcType="NUMERIC"/>
+        <result column="DAYINFENPEI" property="dayinfenpei"  jdbcType="NUMERIC"/>
+        <result column="XIEZAIDAYIN" property="xiezaidayin" jdbcType="NUMERIC"/>
+        <result column="CHEJIANYUDINGWEI" property="chejianyudingwei" jdbcType="NUMERIC"/>
+        <result column="CHEJIANZHUANCHU" property="chejianzhuanchu" jdbcType="NUMERIC"/>
+        <result column="RENGONGZHIJINA" property="rengongzhijina" jdbcType="NUMERIC"/>
+        <result column="CANGKUGUANLI" property="cangkuguanli" jdbcType="NUMERIC"/>
+        <result column="CAIWUGUANLI" property="caiwuguanli" jdbcType="NUMERIC"/>
+        <result column="APPLY_COUNT" property="applyCount" jdbcType="NUMERIC"/>
+
+    </resultMap>
+    <select id="findStationCountByDealDate" resultType="java.util.HashMap">
+       SELECT * FROM FIND_STATION_COUNT_BY_VIEW WHERE SUBMIT_DATE=#{submit_Date}
+    </select>
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/FindTaskByDealdateViewMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yxproject.start.mapper.FindTaskByDealdateViewMapper">
+    <resultMap id="AccCardTMapper" type="com.yxproject.start.entity.FindTaskByDealdateViewEntity">
+        <id column="GROUP_NO" property="groupNo"  jdbcType="VARCHAR"/>
+        <result column="VALID_COUNT" property="validCount" jdbcType="NUMERIC"/>
+        <result column="INVALID_COUNT" property="invalidCount" jdbcType="NUMERIC"/>
+        <result column="DEAL_FLAG" property="dealFlag" jdbcType="CHAR"/>
+        <result column="SUBMIT_DATE" property="submitDate" jdbcType="VARCHAR"/>
+        <result column="SUBMIT_CODE" property="submitCode" jdbcType="VARCHAR"/>
+        <result column="ORIGINAL_NO" property="originalNo" jdbcType="VARCHAR"/>
+        <result column="IMPORT_TIME" property="importTime" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <select id="findTaskByDealdateViewData" resultType="java.util.HashMap">
+        select * from FIND_TASK_BY_DEALDATE_VIEW
+    </select>
+
+
+
+
+
+
+</mapper>
\ No newline at end of file