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

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

@@ -2,6 +2,7 @@ package com.yxproject.start.api;
 
 //import com.yxproject.start.service.FindCbCountByDealdateViewService;
 import com.yxproject.start.service.CardBodyService;
+import com.yxproject.start.service.FindFinancialReportByViewService;
 import com.yxproject.start.service.FindStationCountService;
 import com.yxproject.start.service.FindTaskByDealdateViewService;
 import com.yxproject.start.utils.YXJSONResponse;
@@ -24,39 +25,73 @@ public class YingxinApi {
     @Autowired
     private FindTaskByDealdateViewService findTaskByDealdateViewService;
 
-//    private FindCbCountByDealdateViewService findCbCountByDealdateViewService;
     @Autowired
     private CardBodyService cardBodyService;
     @Autowired
     private FindStationCountService findStationCountService;
-
+    @Autowired
+    private FindFinancialReportByViewService findFinancialReportByViewService;
+    /**
+     * 查询在受理库查询任务单详情 根据处理时间查询;
+     *
+     *
+     */
     @RequestMapping("getGroupInfo")
-    public List<Map<String, Object>> getGroupInfo() {
-        List<Map<String, Object>> list = findTaskByDealdateViewService.getAccGroupData();
-        return list;
+    public String getGroupInfo(@RequestParam("startTime") String startTime,@RequestParam("endTime") String endTime, HttpServletResponse resp) {
+        List<Map<String, Object>> list = findTaskByDealdateViewService.getAccGroupData(startTime, endTime);
+        YXJSONResponse yxjsonResponse = new YXJSONResponse();
+        resp.setCharacterEncoding("UTF-8");
+        yxjsonResponse.outPutSuccess(list);
+        Map map = new HashMap();
+        return yxjsonResponse.toJSONString();
     }
+    /**
+     * 查询卡基统计报表 用视图查询 根据起止时间查询
+     *
+     *
+     */
     @RequestMapping("getCbCountInfo")
-    public  List<Map<String,Object>> getCbCountInfo() {
-        List<Map<String, Object>> list=cardBodyService.getCbCount();
-        return list;
+    public  String getCbCountInfo(@RequestParam("startTime")String startTime ,@RequestParam("endTime")String endTime,HttpServletResponse resp) {
+        List<Map<String, Object>> list=cardBodyService.getCbCount(startTime, endTime);
+        YXJSONResponse yxjsonResponse = new YXJSONResponse();
+        resp.setCharacterEncoding("UTF-8");
+        yxjsonResponse.outPutSuccess(list);
+        Map map = new HashMap();
+        return yxjsonResponse.toJSONString();
     }
     @RequestMapping("getCbBodyCountInfo")
     public List<Map<String,Object>> getCbBodyCountInfo() {
         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);
+    /**
+     * 查询各个工位的已经完成的数量和当天要完成的数量 根据当前日期 当前状态查询
+     *
+     *
+     */
+    @RequestMapping("getStateCountInfo")
+    public String getStateCountInfo(@RequestParam("submitDate") String submitDate,@RequestParam("state") String state,HttpServletResponse resp){
+        List<Map<String,Object>> list=findStationCountService.getStationCountData(submitDate,state);
+        YXJSONResponse yxjsonResponse = new YXJSONResponse();
+        resp.setCharacterEncoding("UTF-8");
+        yxjsonResponse.outPutSuccess(list);
+        Map map = new HashMap();
+        return yxjsonResponse.toJSONString();
+    }
+    /**
+     * 查询财务报表 查询派出所申领表 用视图查询  根据起止时间  类型  地市  区县 派出所查询
+     *
+     *
+     */
+    @RequestMapping("getFinancialReportInfo")
+    public String getFinancialReportInfo(@RequestParam("startTime") String startTime,@RequestParam("endTime") String endTime,@RequestParam("cardType") String cardType,@RequestParam("cityCode")String cityCode,HttpServletResponse resp){
+        List<Map<String,Object>> list=findFinancialReportByViewService.getFinancialReportData(startTime,endTime,cardType,cityCode);
         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/FindFinancialReportByViewEntity.java

+package com.yxproject.start.entity;
+
+import org.springframework.data.annotation.Id;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * Created by Administrator on 2018/12/19.
+ */
+@Entity
+@Table(name = "FIND_FINANCIAL_REPORT_BY_VIEW", schema = "DAHAI", catalog = "")
+public class FindFinancialReportByViewEntity {
+    private String gajg_Mc;
+    private Long putongzheng;
+    private Long kuaizheng;
+    private Long yidiksyou;
+    private Long yidikspu;
+    private Long yidiyou;
+    private Long yidipu;
+    private Long junrenzheng;
+    private Long kspu;
+    private Long ksyou;
+    private Long youjizheng;
+    private Long quanguozheng;
+
+    @Id
+    @Column(name = "GAJG_MC", nullable = true, length = 40)
+    public String getGajgMc() {
+        return gajg_Mc;
+    }
+
+    public void setGajgMc(String gajgMc) {
+        this.gajg_Mc = gajgMc;
+    }
+
+    @Basic
+    @Column(name = "PUTONGZHENG", nullable = true, precision = 0)
+    public Long getPutongzheng() {
+        return putongzheng;
+    }
+
+    public void setPutongzheng(Long putongzheng) {
+        this.putongzheng = putongzheng;
+    }
+
+    @Basic
+    @Column(name = "KUAIZHENG", nullable = true, precision = 0)
+    public Long getKuaizheng() {
+        return kuaizheng;
+    }
+
+    public void setKuaizheng(Long kuaizheng) {
+        this.kuaizheng = kuaizheng;
+    }
+
+    @Basic
+    @Column(name = "YIDIKSYOU", nullable = true, precision = 0)
+    public Long getYidiksyou() {
+        return yidiksyou;
+    }
+
+    public void setYidiksyou(Long yidiksyou) {
+        this.yidiksyou = yidiksyou;
+    }
+
+    @Basic
+    @Column(name = "YIDIKSPU", nullable = true, precision = 0)
+    public Long getYidikspu() {
+        return yidikspu;
+    }
+
+    public void setYidikspu(Long yidikspu) {
+        this.yidikspu = yidikspu;
+    }
+
+    @Basic
+    @Column(name = "YIDIYOU", nullable = true, precision = 0)
+    public Long getYidiyou() {
+        return yidiyou;
+    }
+
+    public void setYidiyou(Long yidiyou) {
+        this.yidiyou = yidiyou;
+    }
+
+    @Basic
+    @Column(name = "YIDIPU", nullable = true, precision = 0)
+    public Long getYidipu() {
+        return yidipu;
+    }
+
+    public void setYidipu(Long yidipu) {
+        this.yidipu = yidipu;
+    }
+
+    @Basic
+    @Column(name = "JUNRENZHENG", nullable = true, precision = 0)
+    public Long getJunrenzheng() {
+        return junrenzheng;
+    }
+
+    public void setJunrenzheng(Long junrenzheng) {
+        this.junrenzheng = junrenzheng;
+    }
+
+    @Basic
+    @Column(name = "KSPU", nullable = true, precision = 0)
+    public Long getKspu() {
+        return kspu;
+    }
+
+    public void setKspu(Long kspu) {
+        this.kspu = kspu;
+    }
+
+    @Basic
+    @Column(name = "KSYOU", nullable = true, precision = 0)
+    public Long getKsyou() {
+        return ksyou;
+    }
+
+    public void setKsyou(Long ksyou) {
+        this.ksyou = ksyou;
+    }
+
+    @Basic
+    @Column(name = "YOUJIZHENG", nullable = true, precision = 0)
+    public Long getYoujizheng() {
+        return youjizheng;
+    }
+
+    public void setYoujizheng(Long youjizheng) {
+        this.youjizheng = youjizheng;
+    }
+
+    @Basic
+    @Column(name = "QUANGUOZHENG", nullable = true, precision = 0)
+    public Long getQuanguozheng() {
+        return quanguozheng;
+    }
+
+    public void setQuanguozheng(Long quanguozheng) {
+        this.quanguozheng = quanguozheng;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        FindFinancialReportByViewEntity that = (FindFinancialReportByViewEntity) o;
+
+        if (gajg_Mc != null ? !gajg_Mc.equals(that.gajg_Mc) : that.gajg_Mc != null) return false;
+        if (putongzheng != null ? !putongzheng.equals(that.putongzheng) : that.putongzheng != null) return false;
+        if (kuaizheng != null ? !kuaizheng.equals(that.kuaizheng) : that.kuaizheng != null) return false;
+        if (yidiksyou != null ? !yidiksyou.equals(that.yidiksyou) : that.yidiksyou != null) return false;
+        if (yidikspu != null ? !yidikspu.equals(that.yidikspu) : that.yidikspu != null) return false;
+        if (yidiyou != null ? !yidiyou.equals(that.yidiyou) : that.yidiyou != null) return false;
+        if (yidipu != null ? !yidipu.equals(that.yidipu) : that.yidipu != null) return false;
+        if (junrenzheng != null ? !junrenzheng.equals(that.junrenzheng) : that.junrenzheng != null) return false;
+        if (kspu != null ? !kspu.equals(that.kspu) : that.kspu != null) return false;
+        if (ksyou != null ? !ksyou.equals(that.ksyou) : that.ksyou != null) return false;
+        if (youjizheng != null ? !youjizheng.equals(that.youjizheng) : that.youjizheng != null) return false;
+        if (quanguozheng != null ? !quanguozheng.equals(that.quanguozheng) : that.quanguozheng != null) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = gajg_Mc != null ? gajg_Mc.hashCode() : 0;
+        result = 31 * result + (putongzheng != null ? putongzheng.hashCode() : 0);
+        result = 31 * result + (kuaizheng != null ? kuaizheng.hashCode() : 0);
+        result = 31 * result + (yidiksyou != null ? yidiksyou.hashCode() : 0);
+        result = 31 * result + (yidikspu != null ? yidikspu.hashCode() : 0);
+        result = 31 * result + (yidiyou != null ? yidiyou.hashCode() : 0);
+        result = 31 * result + (yidipu != null ? yidipu.hashCode() : 0);
+        result = 31 * result + (junrenzheng != null ? junrenzheng.hashCode() : 0);
+        result = 31 * result + (kspu != null ? kspu.hashCode() : 0);
+        result = 31 * result + (ksyou != null ? ksyou.hashCode() : 0);
+        result = 31 * result + (youjizheng != null ? youjizheng.hashCode() : 0);
+        result = 31 * result + (quanguozheng != null ? quanguozheng.hashCode() : 0);
+        return result;
+    }
+
+    private String id;
+
+    @javax.persistence.Id
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}

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

@@ -2,6 +2,7 @@ package com.yxproject.start.mapper;
 
 import com.yxproject.start.entity.CardBodyEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -14,6 +15,6 @@ import java.util.Map;
 public interface CardBodyMapper {
     public List <CardBodyEntity> insertCardBody(String cardBodyId);
 //    public  int updateCardBody(CardBodyEntity map);
-    public List<Map<String,Object>> findCbCountByDealdateViewData();
+    public List<Map<String,Object>> findCbCountByDealdateViewData(@Param("startTime")String startTime,@Param("endTime")String endTime );
     public List<Map<String,Object>> findCbCountByDealdate();
 }
\ No newline at end of file

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

+package com.yxproject.start.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Administrator on 2018/12/19.
+ */
+@Mapper
+public interface FindFinancialReportByViewMapper {
+    public List<Map<String,Object>>findFinancialReportByView(@Param("startTime") String startTime,@Param("endTime")String endTime,@Param("cardType")String cardType,@Param("cityCode")String cityCode);
+}
+

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

 package com.yxproject.start.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -10,5 +11,5 @@ import java.util.Map;
  */
 @Mapper
 public interface FindStationCountMapper {
-    public List<Map<String,Object>>findStationCountByDealDate(String submitDate);
+    public List<Map<String,Object>>findStationCountByDealDate(@Param("submitDate") String submitDate,@Param("state") String state);
 }

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

@@ -3,6 +3,7 @@ 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 org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -14,5 +15,5 @@ import java.util.Map;
 @Mapper
 public interface FindTaskByDealdateViewMapper {
 
-    public List<Map<String,Object>> findTaskByDealdateViewData();
+    public List<Map<String,Object>> findTaskByDealdateViewData(@Param("startTime") String startTime,@Param("endTime")  String endTime);
 }

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

@@ -12,7 +12,7 @@ import java.util.Map;
 public interface CardBodyService {
     public List<CardBodyEntity> insertCardBody(String cardBodyId);
 
-    public List<Map<String,Object>> getCbCount();
+    public List<Map<String,Object>> getCbCount(String startTime,String endTime);
 
 //    public int updateCardBody(CardBodyEntity map);
 

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

+package com.yxproject.start.service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Administrator on 2018/12/19.
+ */
+public interface FindFinancialReportByViewService {
+    public List<Map<String,Object>> getFinancialReportData(String startTime, String endTime,String cardType,String cityCode);
+}

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

@@ -7,5 +7,5 @@ import java.util.Map;
  * Created by Administrator on 2018/11/29.
  */
 public interface FindStationCountService {
-    public List<Map<String,Object>>getStationCountData(String submitDate);
+    public List<Map<String,Object>>getStationCountData(String submitDate,String state);
 }

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

@@ -9,5 +9,5 @@ import java.util.Map;
  * Created by Administrator on 2018/11/21.
  */
 public interface FindTaskByDealdateViewService {
-    public List<Map<String,Object>> getAccGroupData();
+    public List<Map<String,Object>> getAccGroupData(String startTime,String endTime);
 }

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

@@ -24,8 +24,8 @@ public class CardBodyServiceImpl implements CardBodyService {
     private CardBodyMapper cardBodyMapper;
 
     @Override
-    public List<Map<String,Object>> getCbCount(){
-        List<Map<String,Object>> list=cardBodyMapper.findCbCountByDealdateViewData();
+    public List<Map<String,Object>> getCbCount(String startTime,String endTime){
+        List<Map<String,Object>> list=cardBodyMapper.findCbCountByDealdateViewData(startTime,endTime);
         return list;
     }
 

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

+package com.yxproject.start.service.impl;
+
+import com.yxproject.start.mapper.FindFinancialReportByViewMapper;
+import com.yxproject.start.service.FindFinancialReportByViewService;
+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/12/19.
+ */
+
+@Service
+public class FindFinancialReportByViewImpl implements FindFinancialReportByViewService {
+    @Autowired
+    private FindFinancialReportByViewMapper findFinancialReportByViewMapper;
+
+    @Override
+    public List<Map<String,Object>> getFinancialReportData(String startTime, String endTime,String cardType,String cityCode) {
+        List<Map<String,Object>> list=findFinancialReportByViewMapper.findFinancialReportByView(startTime, endTime, cardType, cityCode);
+        return list;
+
+    }
+
+}

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

@@ -17,8 +17,8 @@ public class FindStationCountServiceImpl implements FindStationCountService {
     private FindStationCountMapper findStationCountMapper;
 
     @Override
-    public List<Map<String,Object>>getStationCountData(String submitDate) {
-        List<Map<String,Object>> list=findStationCountMapper.findStationCountByDealDate(submitDate);
+    public List<Map<String,Object>>getStationCountData(String submitDate,String state) {
+        List<Map<String,Object>> list=findStationCountMapper.findStationCountByDealDate(submitDate,state);
         return list;
 
     }

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

@@ -19,9 +19,9 @@ public class FindTaskByDealdateViewServiceImpl implements FindTaskByDealdateView
 
 
     @Override
-    public List<Map<String,Object>> getAccGroupData() {
+    public List<Map<String,Object>> getAccGroupData(String startTime, String endTime) {
 
-        List<Map<String,Object>> list = findTaskByDealdateViewMapper.findTaskByDealdateViewData();
+        List<Map<String,Object>> list = findTaskByDealdateViewMapper.findTaskByDealdateViewData(startTime, endTime);
        return list;
     }
 }

src/main/resources/mapper/CardBodyMapper.xml

@@ -28,9 +28,9 @@
 
     </update>
 
-    <select id="findCbCountByDealdateViewData" resultType="java.util.HashMap">
-           select * from FINDCBCOUNTBYDEALDATE_VIEW
-    </select>
+    <select id="findCbCountByDealdateViewData" resultType="java.util.HashMap" parameterType="String">
+           SELECT * FROM FINDCBCOUNTBYDEALDATE_VIEW WHERE FIND_CBCOUNT_LIST.SET_STARTTIME_PARAM(#{startTime})=#{startTime} AND FIND_CBCOUNT_LIST.SET_ENDTIME_PARAM(#{endTime})=#{endTime}
+</select>
 
     <select id="findCbCountByDealdate" resultType="java.util.HashMap">
           WITH

src/main/resources/mapper/FindFinancialReportByViewMapper.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.FindFinancialReportByViewMapper">
+    <resultMap id="FindFinancialReportByViewMapper" type="com.yxproject.start.entity.FindFinancialReportByViewEntity">
+        <id column="GAJG_MC" property="gajg_Mc"  jdbcType="VARCHAR"/>
+        <result column="PUTONGZHENG" property="putongzheng" jdbcType="NUMERIC"/>
+        <result column="KUAIZHENG" property="kuaizheng"  jdbcType="NUMERIC"/>
+        <result column="YIDIKSYOU" property="yidiksyou" jdbcType="NUMERIC"/>
+        <result column="YIDIKSPU" property="yidikspu" jdbcType="NUMERIC"/>
+        <result column="YIDIYOU" property="yidiyou" jdbcType="NUMERIC"/>
+        <result column="YIDIPU" property="yidipu" jdbcType="NUMERIC"/>
+        <result column="JUNRENZHENG" property="junrenzheng" jdbcType="NUMERIC"/>
+        <result column="KSPU" property="kspu" jdbcType="NUMERIC"/>
+        <result column="KSYOU" property="ksyou" jdbcType="NUMERIC"/>
+        <result column="YOUJIZHENG" property="youjizheng" jdbcType="NUMERIC"/>
+        <result column="QUANGUOZHENG" property="quanguozheng" jdbcType="NUMERIC"/>
+
+    </resultMap>
+
+    <select id="findFinancialReportByView" resultType="java.util.HashMap" parameterType="String">
+        SELECT * FROM FIND_FINANCIAL_REPORT_BY_VIEW WHERE FIND_FINANCIAL_REPORT_LIST.SET_STARTTIME_PARAM(#{startTime})=#{startTime}   AND  FIND_FINANCIAL_REPORT_LIST.SET_ENDTIME_PARAM(#{endTime})=#{endTime} AND FIND_FINANCIAL_REPORT_LIST.SET_CARDTYPE_PARAM(#{cardType})=#{cardType} AND FIND_FINANCIAL_REPORT_LIST.SET_CITYCODE_PARAM(SUBSTR(#{cityCode},1,4))=SUBSTR(#{cityCode},1,4) AND FIND_FINANCIAL_REPORT_LIST.SET_COUNTYCODE_PARAM(SUBSTR(#{cityCode},1,6))=SUBSTR(#{cityCode},1,6) AND FIND_FINANCIAL_REPORT_LIST.SET_GAJGDM_PARAM(SUBSTR(#{cityCode},1,8))=SUBSTR(#{cityCode},1,8)
+    </select>
+</mapper>
\ No newline at end of file

src/main/resources/mapper/FindStationCountMapper.xml

@@ -15,8 +15,8 @@
         <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 id="findStationCountByDealDate" resultType="java.util.HashMap" parameterType="String">
+       SELECT * FROM FIND_STATE_COUNT_VIEW WHERE FIND_STATE_COUNT_LIST.SET_SUBMITDATE_PARAM(#{submitDate})=#{submitDate}  AND FIND_STATE_COUNT_LIST.SET_STATE_PARAM(#{state})=#{state}
     </select>
 
 </mapper>
\ No newline at end of file

src/main/resources/mapper/FindTaskByDealdateViewMapper.xml

@@ -12,8 +12,8 @@
         <result column="IMPORT_TIME" property="importTime" jdbcType="VARCHAR"/>
     </resultMap>
 
-    <select id="findTaskByDealdateViewData" resultType="java.util.HashMap">
-        select * from FIND_TASK_BY_DEALDATE_VIEW
+    <select id="findTaskByDealdateViewData" resultType="java.util.HashMap" parameterType="String">
+        SELECT * FROM FIND_TASK_BY_DEALDATE_VIEW WHERE  FIND_TASK_BY_DEALDATE_LIST.SET_STARTTIME_PARAM(#{startTime})=#{startTime} AND FIND_TASK_BY_DEALDATE_LIST.SET_ENDTIME_PARAM(#{endTime})=#{endTime}
     </select>