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

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

@@ -31,9 +31,11 @@ public class YingxinApi {
     @Autowired
     private FindFinancialReportByViewService findFinancialReportByViewService;
     @Autowired
-    private AddTuiZhengService addTuiZhengService;
+    private AddBackCardService addBackCardService;
     @Autowired
     private AddRemainingCardService addRemainingCardService;
+    @Autowired
+    private FindCardService findCardService;
     /**
      * 查询在受理库查询任务单详情 根据处理时间查询;
      *
@@ -96,13 +98,15 @@ public class YingxinApi {
         return yxjsonResponse.toJSONString();
     }
 
-   /*
-   *添加退证
-   *
-   * */
+    /**
+     * 添加退证
+     * @param acceptNumber 受理号
+     * @param resp
+     * @return
+     */
     @RequestMapping("addInValidCardInfo")
-    public String addTuiZhengInfo(@RequestParam("acceptNo")String acceptNumber,HttpServletResponse resp){
-        List<SpecialCardEntity> list=addTuiZhengService.getTuiZhengData(acceptNumber);
+    public String addTuiZhengInfo(@RequestParam("acceptNo")List acceptNumber,HttpServletResponse resp){
+        List<SpecialCardEntity> list= addBackCardService.getTuiZhengData(acceptNumber);
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
         yxjsonResponse.outPutSuccess(list);
@@ -122,5 +126,17 @@ public class YingxinApi {
         Map map=new HashMap();
         return yxjsonResponse.toJSONString();
     }
+    /*
+    *查询证件
+    * */
+    @RequestMapping("findCardInfo")
+    public String findCardInfo(@RequestParam("find_No")String find_No,HttpServletResponse resp){
+        List<Map<String,Object>> list=findCardService.getCardData(find_No);
+        YXJSONResponse yxjsonResponse =new YXJSONResponse();
+        resp.setCharacterEncoding("UTF-8");
+        yxjsonResponse.outPutSuccess(list);
+        Map map=new HashMap();
+        return yxjsonResponse.toJSONString();
+    }
 }
 

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

+package com.yxproject.start.entity;
+
+import javax.persistence.*;
+
+/**
+ * Created by Administrator on 2018/12/25.
+ */
+@Entity
+@Table(name = "ACC_CARD_T", schema = "ACC_DBA", catalog = "")
+public class AccCardTEntity {
+    private String upload_No;
+    private String accept_No;
+    private String photo_No;
+    private String name;
+    private String sex_No;
+    private String nation_No;
+    private String birthday;
+    private String id_No;
+    private String addr1;
+    private String addr2;
+    private String addr3;
+    private String address1;
+    private String sign_Govt;
+    private String expire_Date;
+    private String begin_Date;
+    private String apply_Reason;
+    private String status_No;
+
+    @Basic
+    @Column(name = "UPLOAD_NO", nullable = false, length = 22)
+    public String getUploadNo() {
+        return upload_No;
+    }
+
+    public void setUploadNo(String uploadNo) {
+        this.upload_No = uploadNo;
+    }
+
+    @Id
+    @Column(name = "ACCEPT_NO", nullable = false, length = 12)
+    public String getAcceptNo() {
+        return accept_No;
+    }
+
+    public void setAcceptNo(String acceptNo) {
+        this.accept_No = acceptNo;
+    }
+
+    @Basic
+    @Column(name = "PHOTO_NO", nullable = true, length = 12)
+    public String getPhotoNo() {
+        return photo_No;
+    }
+
+    public void setPhotoNo(String photoNo) {
+        this.photo_No = photoNo;
+    }
+
+    @Basic
+    @Column(name = "NAME", nullable = false, length = 45)
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Basic
+    @Column(name = "SEX_NO", nullable = false, length = 1)
+    public String getSexNo() {
+        return sex_No;
+    }
+
+    public void setSexNo(String sexNo) {
+        this.sex_No = sexNo;
+    }
+
+    @Basic
+    @Column(name = "NATION_NO", nullable = false, length = 2)
+    public String getNationNo() {
+        return nation_No;
+    }
+
+    public void setNationNo(String nationNo) {
+        this.nation_No = nationNo;
+    }
+
+    @Basic
+    @Column(name = "BIRTHDAY", nullable = false, length = 8)
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    @Basic
+    @Column(name = "ID_NO", nullable = false, length = 18)
+    public String getIdNo() {
+        return id_No;
+    }
+
+    public void setIdNo(String idNo) {
+        this.id_No = idNo;
+    }
+
+    @Basic
+    @Column(name = "ADDR1", nullable = false, length = 36)
+    public String getAddr1() {
+        return addr1;
+    }
+
+    public void setAddr1(String addr1) {
+        this.addr1 = addr1;
+    }
+
+    @Basic
+    @Column(name = "ADDR2", nullable = true, length = 36)
+    public String getAddr2() {
+        return addr2;
+    }
+
+    public void setAddr2(String addr2) {
+        this.addr2 = addr2;
+    }
+
+    @Basic
+    @Column(name = "ADDR3", nullable = true, length = 36)
+    public String getAddr3() {
+        return addr3;
+    }
+
+    public void setAddr3(String addr3) {
+        this.addr3 = addr3;
+    }
+
+    @Basic
+    @Column(name = "ADDRESS1", nullable = true, length = 105)
+    public String getAddress1() {
+        return address1;
+    }
+
+    public void setAddress1(String address1) {
+        this.address1 = address1;
+    }
+
+    @Basic
+    @Column(name = "SIGN_GOVT", nullable = false, length = 45)
+    public String getSignGovt() {
+        return sign_Govt;
+    }
+
+    public void setSignGovt(String signGovt) {
+        this.sign_Govt = signGovt;
+    }
+
+    @Basic
+    @Column(name = "EXPIRE_DATE", nullable = false, length = 8)
+    public String getExpireDate() {
+        return expire_Date;
+    }
+
+    public void setExpireDate(String expireDate) {
+        this.expire_Date = expireDate;
+    }
+
+    @Basic
+    @Column(name = "BEGIN_DATE", nullable = false, length = 8)
+    public String getBeginDate() {
+        return begin_Date;
+    }
+
+    public void setBeginDate(String beginDate) {
+        this.begin_Date = beginDate;
+    }
+
+    @Basic
+    @Column(name = "APPLY_REASON", nullable = false, length = 2)
+    public String getApplyReason() {
+        return apply_Reason;
+    }
+
+    public void setApplyReason(String applyReason) {
+        this.apply_Reason = applyReason;
+    }
+
+    @Basic
+    @Column(name = "STATUS_NO", nullable = true, length = 1)
+    public String getStatusNo() {
+        return status_No;
+    }
+
+    public void setStatusNo(String statusNo) {
+        this.status_No = statusNo;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        AccCardTEntity that = (AccCardTEntity) o;
+
+        if (upload_No != null ? !upload_No.equals(that.upload_No) : that.upload_No != null) return false;
+        if (accept_No != null ? !accept_No.equals(that.accept_No) : that.accept_No != null) return false;
+        if (photo_No != null ? !photo_No.equals(that.photo_No) : that.photo_No != null) return false;
+        if (name != null ? !name.equals(that.name) : that.name != null) return false;
+        if (sex_No != null ? !sex_No.equals(that.sex_No) : that.sex_No != null) return false;
+        if (nation_No != null ? !nation_No.equals(that.nation_No) : that.nation_No != null) return false;
+        if (birthday != null ? !birthday.equals(that.birthday) : that.birthday != null) return false;
+        if (id_No != null ? !id_No.equals(that.id_No) : that.id_No != null) return false;
+        if (addr1 != null ? !addr1.equals(that.addr1) : that.addr1 != null) return false;
+        if (addr2 != null ? !addr2.equals(that.addr2) : that.addr2 != null) return false;
+        if (addr3 != null ? !addr3.equals(that.addr3) : that.addr3 != null) return false;
+        if (address1 != null ? !address1.equals(that.address1) : that.address1 != null) return false;
+        if (sign_Govt != null ? !sign_Govt.equals(that.sign_Govt) : that.sign_Govt != null) return false;
+        if (expire_Date != null ? !expire_Date.equals(that.expire_Date) : that.expire_Date != null) return false;
+        if (begin_Date != null ? !begin_Date.equals(that.begin_Date) : that.begin_Date != null) return false;
+        if (apply_Reason != null ? !apply_Reason.equals(that.apply_Reason) : that.apply_Reason != null) return false;
+        if (status_No != null ? !status_No.equals(that.status_No) : that.status_No != null) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = upload_No != null ? upload_No.hashCode() : 0;
+        result = 31 * result + (accept_No != null ? accept_No.hashCode() : 0);
+        result = 31 * result + (photo_No != null ? photo_No.hashCode() : 0);
+        result = 31 * result + (name != null ? name.hashCode() : 0);
+        result = 31 * result + (sex_No != null ? sex_No.hashCode() : 0);
+        result = 31 * result + (nation_No != null ? nation_No.hashCode() : 0);
+        result = 31 * result + (birthday != null ? birthday.hashCode() : 0);
+        result = 31 * result + (id_No != null ? id_No.hashCode() : 0);
+        result = 31 * result + (addr1 != null ? addr1.hashCode() : 0);
+        result = 31 * result + (addr2 != null ? addr2.hashCode() : 0);
+        result = 31 * result + (addr3 != null ? addr3.hashCode() : 0);
+        result = 31 * result + (address1 != null ? address1.hashCode() : 0);
+        result = 31 * result + (sign_Govt != null ? sign_Govt.hashCode() : 0);
+        result = 31 * result + (expire_Date != null ? expire_Date.hashCode() : 0);
+        result = 31 * result + (begin_Date != null ? begin_Date.hashCode() : 0);
+        result = 31 * result + (apply_Reason != null ? apply_Reason.hashCode() : 0);
+        result = 31 * result + (status_No != null ? status_No.hashCode() : 0);
+        return result;
+    }
+}

src/main/java/com/yxproject/start/mapper/FindCardMapper.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/25.
+ */
+@Mapper
+public interface FindCardMapper {
+    public List<Map<String,Object>>findCardByGroupNo(@Param("find_No")String find_No);
+}

src/main/java/com/yxproject/start/service/AddTuiZhengService.java → src/main/java/com/yxproject/start/service/AddBackCardService.java

@@ -7,6 +7,6 @@ import java.util.List;
 /**
  * Created by Administrator on 2018/12/20.
  */
-public interface AddTuiZhengService {
-    public List<SpecialCardEntity>getTuiZhengData(String acceptNumber);
+public interface AddBackCardService {
+    public List<SpecialCardEntity>getTuiZhengData(List acceptNumber);
 }

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

+package com.yxproject.start.service;
+
+import com.yxproject.start.entity.AccCardTEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Administrator on 2018/12/25.
+ */
+public interface FindCardService {
+    public List<Map<String,Object>>getCardData(String find_No);
+}

src/main/java/com/yxproject/start/service/impl/AddTuiZhengServiceImpl.java → src/main/java/com/yxproject/start/service/impl/AddBackCardServiceImpl.java

@@ -2,25 +2,26 @@ package com.yxproject.start.service.impl;
 
 import com.yxproject.start.entity.SpecialCardEntity;
 import com.yxproject.start.mapper.SpecialCardMapper;
-import com.yxproject.start.service.AddTuiZhengService;
-import org.omg.CORBA.Object;
+import com.yxproject.start.service.AddBackCardService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by Administrator on 2018/12/20.
  */
 @Service
-public class AddTuiZhengServiceImpl implements AddTuiZhengService {
+public class AddBackCardServiceImpl implements AddBackCardService {
     @Autowired
     private SpecialCardMapper specialCardMapper;
-
     @Override
-    public List<SpecialCardEntity>getTuiZhengData(String acceptNumber){
-        List<SpecialCardEntity>List=specialCardMapper.addTuiZheng(acceptNumber);
-        return List;
+    public List<SpecialCardEntity> getTuiZhengData(List acceptNumber){
+        List list=new ArrayList();
+        for (int i=0; i <acceptNumber.size() ; i++) {
+            list.add(specialCardMapper.addTuiZheng((String) acceptNumber.get(i)));
+        }
+        return list;
     }
 }

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

+package com.yxproject.start.service.impl;
+
+import com.yxproject.start.mapper.AccCardTMapper;
+import com.yxproject.start.mapper.FindCardMapper;
+import com.yxproject.start.service.FindCardService;
+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/25.
+ */
+@Service
+public class FindCardServiceImpl implements FindCardService {
+    @Autowired
+    private FindCardMapper findCardMapper;
+    @Override
+    public List<Map<String,Object>>getCardData(String find_No){
+        List<Map<String,Object>>List=findCardMapper.findCardByGroupNo(find_No);
+        return List;
+    }
+}

src/main/resources/mapper/FindCardMapper.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.FindCardMapper">
+    <resultMap id="FindCardMapper" type="com.yxproject.start.entity.AccCardTEntity">
+        <id column="ACCEPT_NO" property="accept_No"  jdbcType="VARCHAR"/>
+        <result column="UPLOAD_NO" property="upload_No" jdbcType="CHAR"/>
+        <result column="PHOTO_NO" property="photo_No" jdbcType="VARCHAR"/>
+        <result column="NAME" property="name" jdbcType="VARCHAR"/>
+        <result column="SEX_NO" property="sex_No" jdbcType="CHAR"/>
+        <result column="NATION_NO" property="nation_No" jdbcType="CHAR"/>
+        <result column="BIRTHDAY" property="birthday" jdbcType="CHAR"/>
+        <result column="ID_NO" property="id_No" jdbcType="VARCHAR"/>
+        <result column="ADDR1" property="addr1" jdbcType="VARCHAR"/>
+        <result column="ADDR2" property="addr2" jdbcType="VARCHAR"/>
+        <result column="ADDR3" property="addr3" jdbcType="VARCHAR"/>
+        <result column="ADDRESS1" property="address1" jdbcType="VARCHAR"/>
+        <result column="SIGN_GOVT" property="sign_Govt" jdbcType="VARCHAR"/>
+        <result column="EXPIRE_DATE" property="expire_Date" jdbcType="CHAR"/>
+        <result column="BEGIN_DATE" property="begin_Date" jdbcType="CHAR"/>
+        <result column="APPLY_REASON" property="apply_Reason" jdbcType="CHAR"/>
+        <result column="STATUS_NO" property="status_No" jdbcType="CHAR"/>
+
+    </resultMap>
+
+    <select id="findCardByGroupNo" resultType="java.util.HashMap" parameterType="String">
+        SELECT * FROM TASK WHERE TASK_ID=#{find_No}
+    </select>
+</mapper>
\ No newline at end of file