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

@@ -38,7 +38,7 @@ public class ExportXMLApi {
         response.setContentType("application/x-download");
         response.setCharacterEncoding("UTF-8");
         String dateTime = DateFormatUtils.format(new Date(), "yyyyMMddHH");
-//        //使用Servlet实现文件下载的时候，避免浏览器自动打开文件
+        //使用Servlet实现文件下载的时候，避免浏览器自动打开文件
         String fout = null;
         List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, uploadDate);
         FilesEntity filesEntity = new FilesEntity();

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

@@ -70,7 +70,7 @@ public class ReadXmlApi {
             //将当前上下文初始化给  CommonsMutipartResolver （多部分解析器）
             CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
                     requ.getSession().getServletContext());
-// 判断是否是多数据段提交格式
+            // 判断是否是多数据段提交格式
             if (multipartResolver.isMultipart(requ)) {
                 MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ;
                 Iterator<String> iter = multiRequest.getFileNames();
@@ -79,7 +79,7 @@ public class ReadXmlApi {
                     try {
                         // 如果fileitem中封装的是普通输入项的数据
                         // 如果fileitem中封装的是上传文件
-                        // 得到上传的文件名称，
+                        // 得到上传的文件名称
                         filename = item.getName();
                         if (filename == null || filename.trim().equals("")) {
                             continue;

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

 package com.yxproject.start.api;
 
-import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
-import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
-import com.yxproject.start.entity.resp.SelectByIdcardEntity;
-import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
+import com.yxproject.start.entity.resp.*;
 import com.yxproject.start.service.SelectSerialNumberService;
 import com.yxproject.start.utils.YXJSONResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +21,8 @@ import java.util.Map;
 @RequestMapping("specialCardInfo")
 public class SelectApi {
     /**
-     * 根据 组号、受理号、身份证号、任务单号查询
+     * 根据 组号8、受理号10、身份证号18、任务单号查询11
+     *
      */
     @Autowired
     private SelectSerialNumberService selectSerialNumberService;
@@ -32,54 +30,65 @@ public class SelectApi {
     @RequestMapping(value = "selectByCard")
     public String  selectByCard(@RequestParam("id") String id, HttpServletResponse resp){
         resp.setCharacterEncoding("UTF-8");
-        List<String> list = new ArrayList<>();
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        /*任务单*/
+        Map<String,Object> taskListMap = new HashMap<>();
+        /*受理库*/
+        Map<String,Object> acceptMap = new HashMap<>();
+        /*制证库*/
+        Map<String,Object> accreditationMap = new HashMap<>();
+
         Map<String, Object> map = new HashMap<>();
 
         if (id.length() ==11){
-            try {
-                SelectByWorkOrderEntity specialCardInfo4 = selectSerialNumberService.selectByWorkOrderNumber(id);
-                map.put("searchResult",specialCardInfo4);
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-
+            SelectFromTaskListEntity specialCardInfo4 = selectSerialNumberService.selectByWorkOrderFromYX(id);
+                taskListMap.put("workOrderDate",specialCardInfo4);
+                resultList.add(taskListMap);
+                resultList.add(acceptMap);
+                resultList.add(accreditationMap);
         }else {
             switch (id.length()) {
                 case 8:
-                    try {
-                        SelectByGroupNumEntity specialCardInfo = selectSerialNumberService.selectByGroupNumberFromACC(id);
-                        if (specialCardInfo.getGroup_No()!=null&specialCardInfo.getGroup_No()!=""){
-                            map.put("searchResult", specialCardInfo);
-                        }else {
-                            SelectByGroupNumEntity selectResulr = selectSerialNumberService.selectByGroupNumberFromYX(id);
-
-                        }
-
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
+                    SelectFromTaskListEntity specialCardInfo = selectSerialNumberService.selectByGroupNoFromYX(id);
+                    SelectFromProdEntity selectResult = selectSerialNumberService.selectByGroupNoFromProd(id);
+                    SelectFromAccEntity specialCardInfo4 = selectSerialNumberService.selectByGroupNoFromAcc(id);
+                    taskListMap.put("yxData",specialCardInfo);
+                    accreditationMap.put("prodData",selectResult);
+                    acceptMap.put("accData",specialCardInfo4);
+                    resultList.add(taskListMap);
+                    resultList.add(accreditationMap);
+                    resultList.add(acceptMap);
                     break;
                 case 10:
-                    try {
-                        SelectByAcceptedEntity specialCardInfo2 = selectSerialNumberService.selectByAccepted(id);
-                        map.put("searchResult", specialCardInfo2);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
+                    SelectFromTaskListEntity specialCardInfo2 = selectSerialNumberService.selectByAcceptFromYX(id);
+                    SelectFromProdEntity selectResult2 = selectSerialNumberService.selectByAcceptFromProd(id);
+                    SelectFromAccEntity specialCardInfo5 = selectSerialNumberService.selectByAcceptFromAcc(id);
+                    taskListMap.put("yxData",specialCardInfo2);
+                    accreditationMap.put("prodData",selectResult2);
+                    acceptMap.put("accData",specialCardInfo5);
+                    resultList.add(taskListMap);
+                    resultList.add(accreditationMap);
+                    resultList.add(acceptMap);
+
                     break;
                 case 18:
-                    try {
-                        SelectByIdcardEntity specialCardInfo3 = selectSerialNumberService.selectByIdCard(id);
-                        map.put("searchResult", specialCardInfo3);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
+
+                    SelectFromTaskListEntity specialCardInfo3 = selectSerialNumberService.selectByCardIdFromYX(id);
+                    SelectFromProdEntity selectResult3 = selectSerialNumberService.selectByCardIdFromProd(id);
+                    SelectFromAccEntity specialCardInfo6 = selectSerialNumberService.selectByCardIdFromAcc(id);
+                    taskListMap.put("yxData",specialCardInfo3);
+                    accreditationMap.put("prodData",selectResult3);
+                    acceptMap.put("accData",specialCardInfo6);
+                    resultList.add(taskListMap);
+                    resultList.add(accreditationMap);
+                    resultList.add(acceptMap);
+
                     break;
             }
         }
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
-        yxjsonResponse.outPutSuccess(map);
+        yxjsonResponse.outPutSuccess(resultList);
         return yxjsonResponse.toJSONString();
 
     }

src/main/java/com/yxproject/start/api/fakeApi/PackageInformationApi.java

@@ -88,7 +88,6 @@ public class PackageInformationApi {
         jsonStr7.put("cardType ","普通证");
         list.add(jsonStr7);
 
-
         map.put("commonCardCount",2300);
         map.put("postCardCount",1200);
         map.put("forbiddenCount",2);

src/main/java/com/yxproject/start/api/fakeApi/SelectExcelApi.java

@@ -117,8 +117,6 @@ public class SelectExcelApi {
         countyList.add(jsonStr10);
         countyList.add(jsonStr11);
 
-
-
         return countyList.toString();
 
     }

src/main/java/com/yxproject/start/api/fakeApi/SortingGroupListApi.java

@@ -18,7 +18,7 @@ public class SortingGroupListApi {
      * @return
      */
     @RequestMapping("sortingGroupList")
-    public String sortingGroupList(@Param("readXMLDate")String readXMLDate,@Param("state")String state){
+    public List<JSONObject> sortingGroupList(@Param("readXMLDate")String readXMLDate,@Param("state")String state){
 
         List<JSONObject> countyList = new ArrayList<>();
         JSONObject jsonStr1 = new JSONObject();
@@ -69,7 +69,7 @@ public class SortingGroupListApi {
         jsonStr6.put("postCardCount",13000);
         countyList.add(jsonStr6);
 
-        return countyList.toString();
+        return countyList;
 
     }
 }

src/main/java/com/yxproject/start/api/fakeApi/TaskListFakeApi.java

@@ -4,7 +4,6 @@ import net.sf.json.JSONObject;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -19,9 +18,9 @@ public class TaskListFakeApi {
      * @return
      */
     @RequestMapping("selectByDate")
-    public String selectByDate(@Param("date") String date){
+    public List<Map> selectByDate(@Param("date") String date){
 
-        List<String> result = new ArrayList<>();
+        List<Map> result = new ArrayList<>();
         Map<String,Object> map1 = new HashMap<>();
         Map<String,Object> map2 = new HashMap<>();
 
@@ -91,11 +90,11 @@ public class TaskListFakeApi {
         map2.put("list",list2);
 
 
-        result.add(map1.toString());
-        result.add(map2.toString());
+        result.add(map1);
+        result.add(map2);
 
 
 
-        return result.toString();
+        return result;
     }
 }

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

+package com.yxproject.start.entity;
+
+import javax.persistence.Entity;
+
+public class CountDataEntity {
+    private String uploadDate;
+    private Integer packageCount;
+    private Integer cardCount;
+    private Integer commonCardCount;
+    private Integer postCardCount;
+
+    public String getUploadDate() {
+        return uploadDate;
+    }
+
+    public void setUploadDate(String uploadDate) {
+        this.uploadDate = uploadDate;
+    }
+
+    public Integer getPackageCount() {
+        return packageCount;
+    }
+
+    public void setPackageCount(Integer packageCount) {
+        this.packageCount = packageCount;
+    }
+
+    public Integer getCardCount() {
+        return cardCount;
+    }
+
+    public void setCardCount(Integer cardCount) {
+        this.cardCount = cardCount;
+    }
+
+    public Integer getCommonCardCount() {
+        return commonCardCount;
+    }
+
+    public void setCommonCardCount(Integer commonCardCount) {
+        this.commonCardCount = commonCardCount;
+    }
+
+    public Integer getPostCardCount() {
+        return postCardCount;
+    }
+
+    public void setPostCardCount(Integer postCardCount) {
+        this.postCardCount = postCardCount;
+    }
+}

src/main/java/com/yxproject/start/entity/resp/SelectFromAccEntity.java

+package com.yxproject.start.entity.resp;
+
+public class SelectFromAccEntity {
+    private String acceptNo;
+    private String county;
+    private String name;
+    private String cardType;
+    private String cardId;
+    private String sex;
+    private String signGovt;
+    private String beginDate;
+    private String endDate;
+    private String policeStation;
+    private String dataState;
+    private String time;
+
+    public String getAcceptNo() {
+        return acceptNo;
+    }
+
+    public void setAcceptNo(String acceptNo) {
+        this.acceptNo = acceptNo;
+    }
+
+    public String getCounty() {
+        return county;
+    }
+
+    public void setCounty(String county) {
+        this.county = county;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(String cardType) {
+        this.cardType = cardType;
+    }
+
+    public String getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(String cardId) {
+        this.cardId = cardId;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getSignGovt() {
+        return signGovt;
+    }
+
+    public void setSignGovt(String signGovt) {
+        this.signGovt = signGovt;
+    }
+
+    public String getBeginDate() {
+        return beginDate;
+    }
+
+    public void setBeginDate(String beginDate) {
+        this.beginDate = beginDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getPoliceStation() {
+        return policeStation;
+    }
+
+    public void setPoliceStation(String policeStation) {
+        this.policeStation = policeStation;
+    }
+
+    public String getDataState() {
+        return dataState;
+    }
+
+    public void setDataState(String dataState) {
+        this.dataState = dataState;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+}

src/main/java/com/yxproject/start/entity/resp/SelectFromProdEntity.java

+package com.yxproject.start.entity.resp;
+
+public class SelectFromProdEntity {
+    private String acceptNo;
+    private String county;
+    private String name;
+    private String cardType;
+    private String cardId;
+    private String sex;
+    private String signGovt;
+    private String beginDate;
+    private String endDate;
+    private String policeStation;
+    private String dataState;
+    private String time;
+
+    public String getAcceptNo() {
+        return acceptNo;
+    }
+
+    public void setAcceptNo(String acceptNo) {
+        this.acceptNo = acceptNo;
+    }
+
+    public String getCounty() {
+        return county;
+    }
+
+    public void setCounty(String county) {
+        this.county = county;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(String cardType) {
+        this.cardType = cardType;
+    }
+
+    public String getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(String cardId) {
+        this.cardId = cardId;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getSignGovt() {
+        return signGovt;
+    }
+
+    public void setSignGovt(String signGovt) {
+        this.signGovt = signGovt;
+    }
+
+    public String getBeginDate() {
+        return beginDate;
+    }
+
+    public void setBeginDate(String beginDate) {
+        this.beginDate = beginDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getPoliceStation() {
+        return policeStation;
+    }
+
+    public void setPoliceStation(String policeStation) {
+        this.policeStation = policeStation;
+    }
+
+    public String getDataState() {
+        return dataState;
+    }
+
+    public void setDataState(String dataState) {
+        this.dataState = dataState;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+}

src/main/java/com/yxproject/start/entity/resp/SelectFromTaskListEntity.java

+package com.yxproject.start.entity.resp;
+
+import java.util.Date;
+
+/**
+ * 根据任务单查询结果实体
+ * 任务单流水号	 区县	制证类型	日期	数据核验	膜打印	预定位	分拣	质检	仓库
+ */
+public class SelectFromTaskListEntity {
+
+    private String taskId;
+    private String county;
+    private Long cardType;
+    private Date issuedDate;
+    private Date dataCheckDate;
+    private Date printOutDate;
+    private Date positionDate;
+    private Date sortOutDate;
+    private Date qualityTestDate;
+    private Date outStorageDate;
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getCounty() {
+        return county;
+    }
+
+    public void setCounty(String county) {
+        this.county = county;
+    }
+
+    public Long getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(Long cardType) {
+        this.cardType = cardType;
+    }
+
+    public Date getIssuedDate() {
+        return issuedDate;
+    }
+
+    public void setIssuedDate(Date issuedDate) {
+        this.issuedDate = issuedDate;
+    }
+
+    public Date getDataCheckDate() {
+        return dataCheckDate;
+    }
+
+    public void setDataCheckDate(Date dataCheckDate) {
+        this.dataCheckDate = dataCheckDate;
+    }
+
+    public Date getPrintOutDate() {
+        return printOutDate;
+    }
+
+    public void setPrintOutDate(Date printOutDate) {
+        this.printOutDate = printOutDate;
+    }
+
+    public Date getPositionDate() {
+        return positionDate;
+    }
+
+    public void setPositionDate(Date positionDate) {
+        this.positionDate = positionDate;
+    }
+
+    public Date getSortOutDate() {
+        return sortOutDate;
+    }
+
+    public void setSortOutDate(Date sortOutDate) {
+        this.sortOutDate = sortOutDate;
+    }
+
+    public Date getQualityTestDate() {
+        return qualityTestDate;
+    }
+
+    public void setQualityTestDate(Date qualityTestDate) {
+        this.qualityTestDate = qualityTestDate;
+    }
+
+    public Date getOutStorageDate() {
+        return outStorageDate;
+    }
+
+    public void setOutStorageDate(Date outStorageDate) {
+        this.outStorageDate = outStorageDate;
+    }
+}

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

-package com.yxproject.start.mapper;
-
-public interface Analysis {
-}

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

@@ -28,6 +28,6 @@ public interface CardDetailedListMapper {
     @Select("SELECT upload_no,subStr(UPLOAD_NO,0,9),ID_NO,NAME FROM PROD_CARD_T@PROD_LINK WHERE subStr(ACCEPT_NO,0,8) \n" +
             "IN (SELECT GROUP_NO FROM GROUP_NO WHERE TASK_ID=#{taskId} \n" +
             "AND (subStr(UPLOAD_NO,0,9)=#{gajgId}));")
-    public List<CardDetailedListEntity> selectCardDetiledListData(@Param("taskId")String taskId,@Param("gajgId")String gajgId);
+    public List<CardDetailedListEntity> selectCardDetailedListData(@Param("taskId")String taskId,@Param("gajgId")String gajgId);
 
 }

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

 package com.yxproject.start.mapper;
 
+import com.yxproject.start.entity.CountDataEntity;
 import com.yxproject.start.entity.FilesEntity;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @Mapper
 public interface FilesMapper {
@@ -10,4 +14,9 @@ public interface FilesMapper {
     @Insert("INSERT INTO FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREAT_TIME,SOURCE_FILE_NAME)" +
             "VALUES(#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{creatTime},#{sourceFileName})")
     public boolean insertFiles(FilesEntity filesEntity);
+
+
+    @Select("")
+    public List<CountDataEntity> selectFilesCount();
+
 }

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

 package com.yxproject.start.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
+@Mapper
 public interface GroupNoMapper {
 
     /**

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

 package com.yxproject.start.mapper;
 
 
+import com.yxproject.start.entity.resp.SelectFromAccEntity;
+import com.yxproject.start.entity.resp.SelectFromProdEntity;
+import com.yxproject.start.entity.resp.SelectFromTaskListEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
@@ -94,4 +97,34 @@ public interface SelectSerialNumberMapper {
             "        LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)\n" +
             "        where  TASK_ID =#{id}")
     public Map<String,Object> selectByWorkOrderNumber(String id);
+
+
+    @Select("")
+    public Map<String,SelectFromTaskListEntity> selectByWorkOrderFromYX();
+    @Select("")
+    public Map<String, SelectFromAccEntity> selectByWorkOrderFromACC();
+    @Select("")
+    public Map<String,SelectFromTaskListEntity> selectByAcceptFromYX();
+    @Select("")
+    public Map<String,SelectFromAccEntity> selectByAcceptFromAcc();
+    @Select("")
+    public Map<String, SelectFromProdEntity>selectByAcceptFromProd();
+    @Select("")
+    public Map<String,SelectFromTaskListEntity> selectByGroupNoFromYX();
+    @Select("")
+    public Map<String,SelectFromProdEntity> selectByGroupNoFromProd();
+    @Select("")
+    public Map<String,SelectFromAccEntity> selectByGroupNoFromAcc();
+    @Select("")
+    public Map<String,SelectFromTaskListEntity>selectByCardIdFromYX();
+    @Select("")
+    public Map<String,SelectFromAccEntity> selectByCardIdFromAcc();
+    @Select("")
+    public Map<String,SelectFromProdEntity> selectByCardIdFromProd();
+
+
+
+
+
+
 }

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

@@ -12,7 +12,7 @@ import java.util.List;
 public interface CardDetailedListService {
 
 
-    public List<CardDetailedListEntity> selectCardDetiledListData(String taskId, String gajgId);
+    public List<CardDetailedListEntity> selectCardDetailedListData(String taskId, String gajgId);
 
     public boolean saveCardDetailedList(String uploadNo,String policeCode,String cardId,String name);
 

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

@@ -12,5 +12,6 @@ public interface PreproPersonService {
 
     public boolean uploadState(String acceptNo,String state);
 
+
     public List<PreproPersonEntity> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate);
 }

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

 package com.yxproject.start.service;
 
-import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
-import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
-import com.yxproject.start.entity.resp.SelectByIdcardEntity;
-import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
+import com.yxproject.start.entity.resp.*;
 
 
 public interface SelectSerialNumberService {
-    SelectByGroupNumEntity selectByGroupNumberFromYX(String id);
-    SelectByGroupNumEntity selectByGroupNumberFromACC(String id);
-    SelectByAcceptedEntity selectByAccepted(String id);
-    SelectByIdcardEntity selectByIdCard(String id);
-    SelectByWorkOrderEntity selectByWorkOrderNumber(String id);
+    /*根据任务单查询辅助库*/
+    SelectFromTaskListEntity selectByWorkOrderFromYX(String id);
+
+    /*根据受理号查询*/
+    SelectFromTaskListEntity selectByAcceptFromYX(String id);
+    SelectFromAccEntity selectByAcceptFromAcc(String id);
+    SelectFromProdEntity selectByAcceptFromProd(String id);
+
+    /*根据组号查询*/
+    SelectFromTaskListEntity selectByGroupNoFromYX(String id);
+    SelectFromProdEntity selectByGroupNoFromProd(String id);
+    SelectFromAccEntity selectByGroupNoFromAcc(String id);
+
+    /*根据身份证号查询*/
+    SelectFromTaskListEntity selectByCardIdFromYX(String id);
+    SelectFromAccEntity selectByCardIdFromAcc(String id);
+    SelectFromProdEntity selectByCardIdFromProd(String id);
+
+
+
 }
 

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

@@ -18,8 +18,8 @@ public class CardDetailedListServiceImpl implements CardDetailedListService {
     private CardDetailedListMapper cardDetailedListMapper;
 
     @Override
-    public List<CardDetailedListEntity> selectCardDetiledListData(String taskId, String gajgId) {
-        List<CardDetailedListEntity> list  = cardDetailedListMapper.selectCardDetiledListData(taskId,gajgId);
+    public List<CardDetailedListEntity> selectCardDetailedListData(String taskId, String gajgId) {
+        List<CardDetailedListEntity> list  = cardDetailedListMapper.selectCardDetailedListData(taskId,gajgId);
         return list;
     }
 

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

 package com.yxproject.start.service.impl;
 
-import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
-import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
-import com.yxproject.start.entity.resp.SelectByIdcardEntity;
-import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
+import com.yxproject.start.entity.resp.*;
 import com.yxproject.start.mapper.SelectSerialNumberMapper;
 import com.yxproject.start.service.SelectSerialNumberService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,144 +17,56 @@ public class SelectSerialNumberServiceImpl implements SelectSerialNumberService
     public SelectSerialNumberMapper selectSerialNumberMapper;
 
 
-    @Override
-    public SelectByGroupNumEntity selectByGroupNumberFromYX(String id){
-
-            Map<String, Object> map = selectSerialNumberMapper.selectByGroupNumber(id);
-            SelectByGroupNumEntity selectByGroupNumEntity = new SelectByGroupNumEntity();
-            try {
-                selectByGroupNumEntity.setLibrary("盈信库");
-                selectByGroupNumEntity.setCityName(String.valueOf(map.get("CITYNAME")));
-                selectByGroupNumEntity.setCardType((String) map.get("CARD_TYPE"));
-                selectByGroupNumEntity.setPainterName((String) map.get("PRINTER_NAME"));
-                selectByGroupNumEntity.setTaskId(String.valueOf(map.get("TASK_ID")));
-                selectByGroupNumEntity.setGroup_No(String.valueOf(map.get("GROUP_NO")));
-                selectByGroupNumEntity.setSubmit_Date((Date) map.get("SUBMIT_DATE"));
-                selectByGroupNumEntity.setPosition_Date((Date) map.get("POSITION_DATE"));
-                selectByGroupNumEntity.setQuality_People_Name((String) map.get("QUALITY_PEOPLE_NAME"));
-                selectByGroupNumEntity.setOut_Storage_Date((Date) map.get("OUT_STORAGE_DATE"));
-                selectByGroupNumEntity.setIn_Storage_Date((Date) map.get("IN_STORAGE_DATE"));
-                selectByGroupNumEntity.setException_Information((String) map.get("EXCEPTION_INFORMATION"));
-            }catch (NullPointerException e){
-                e.printStackTrace();
-            }
-            return selectByGroupNumEntity;
-    }
 
     @Override
-    public SelectByGroupNumEntity selectByGroupNumberFromACC(String id){
-
-        Map<String, Object> map = selectSerialNumberMapper.selectByGroupNumber(id);
-        SelectByGroupNumEntity selectByGroupNumEntity = new SelectByGroupNumEntity();
-        try {
-            selectByGroupNumEntity.setLibrary("受理库");
-            selectByGroupNumEntity.setCityName(String.valueOf(map.get("CITYNAME")));
-            selectByGroupNumEntity.setCardType((String) map.get("CARD_TYPE"));
-            selectByGroupNumEntity.setPainterName((String) map.get("PRINTER_NAME"));
-            selectByGroupNumEntity.setTaskId(String.valueOf(map.get("TASK_ID")));
-            selectByGroupNumEntity.setGroup_No(String.valueOf(map.get("GROUP_NO")));
-            selectByGroupNumEntity.setSubmit_Date((Date) map.get("SUBMIT_DATE"));
-            selectByGroupNumEntity.setPosition_Date((Date) map.get("POSITION_DATE"));
-            selectByGroupNumEntity.setQuality_People_Name((String) map.get("QUALITY_PEOPLE_NAME"));
-            selectByGroupNumEntity.setOut_Storage_Date((Date) map.get("OUT_STORAGE_DATE"));
-            selectByGroupNumEntity.setIn_Storage_Date((Date) map.get("IN_STORAGE_DATE"));
-            selectByGroupNumEntity.setException_Information((String) map.get("EXCEPTION_INFORMATION"));
-        }catch (NullPointerException e){
-            e.printStackTrace();
-        }
-        return selectByGroupNumEntity;
+    public SelectFromTaskListEntity selectByWorkOrderFromYX(String id) {
+
+        return null;
     }
 
 
+    @Override
+    public SelectFromTaskListEntity selectByAcceptFromYX(String id) {
+        return null;
+    }
 
     @Override
-    public SelectByAcceptedEntity selectByAccepted(String id){
-        Map<String,Object> map = selectSerialNumberMapper.selectByAccepted(id);
-        SelectByAcceptedEntity selectByAcceptedEntity = new SelectByAcceptedEntity();
-        String sex ;
-        try {
-            if (Integer.parseInt((String) map.get("SEX_NO")) ==1){
-                sex = "男";
-            }else if (Integer.parseInt((String) map.get("SEX_NO"))==2){
-                sex = "女";
-            }else {
-                sex = "缺失";
+    public SelectFromAccEntity selectByAcceptFromAcc(String id) {
+        return null;
     }
 
-            selectByAcceptedEntity.setCardType((String) map.get("CARD_TYPE"));
-            selectByAcceptedEntity.setLibrary("受理库");
-            selectByAcceptedEntity.setAccept_No((String) map.get("ACCEPT_NO"));
-            selectByAcceptedEntity.setName((String) map.get("NAME"));
-            selectByAcceptedEntity.setSex_No(sex);
-            selectByAcceptedEntity.setId_No((String) map.get("ID_NO"));
-            selectByAcceptedEntity.setBirthday((String) map.get("BIRTHDAY"));
-            selectByAcceptedEntity.setSign_Govt((String) map.get("SIGN_GOVT"));
-            selectByAcceptedEntity.setBegin_Date((String) map.get("BEGIN_DATE"));
-            selectByAcceptedEntity.setExpire_Date((String) map.get("EXPIRE_DATE"));
-            selectByAcceptedEntity.setStatus_No((String) map.get("STATUS_NO"));
-            selectByAcceptedEntity.setTaskState((String) map.get("TASK_STATE"));
-            selectByAcceptedEntity.setCityName((String) map.get("CITYNAME"));
-            selectByAcceptedEntity.setLastModifyTime((Data) map.get("lastModifyTime;"));
-
-        }catch (NullPointerException e){
-            e.printStackTrace();
+    @Override
+    public SelectFromProdEntity selectByAcceptFromProd(String id) {
+        return null;
     }
-        return selectByAcceptedEntity;
+
+    @Override
+    public SelectFromTaskListEntity selectByGroupNoFromYX(String id) {
+        return null;
     }
+
     @Override
-    public SelectByIdcardEntity selectByIdCard(String id){
-        Map<String,Object> map = selectSerialNumberMapper.selectByIdCard(id);
-        SelectByIdcardEntity selectByIdcardEntity = new SelectByIdcardEntity();
-        String sex ;
-        try {
-            if (Integer.parseInt((String) map.get("SEX_NO")) ==1){
-                sex = "男";
-            }else if (Integer.parseInt((String) map.get("SEX_NO"))==2){
-                sex = "女";
-            }else {
-                sex = "缺失";
+    public SelectFromProdEntity selectByGroupNoFromProd(String id) {
+        return null;
     }
 
-            selectByIdcardEntity.setCardType((String) map.get("CARD_TYPE"));
-            selectByIdcardEntity.setLibrary("受理库");
-            selectByIdcardEntity.setAccept_No((String) map.get("ACCEPT_NO"));
-            selectByIdcardEntity.setName((String) map.get("NAME"));
-            selectByIdcardEntity.setSex_No(sex);
-            selectByIdcardEntity.setId_No((String) map.get("ID_NO"));
-            selectByIdcardEntity.setBirthday((String) map.get("BIRTHDAY"));
-            selectByIdcardEntity.setSign_Govt((String) map.get("SIGN_GOVT"));
-            selectByIdcardEntity.setBegin_Date((String) map.get("BEGIN_DATE"));
-            selectByIdcardEntity.setExpire_Date((String) map.get("EXPIRE_DATE"));
-            selectByIdcardEntity.setStatus_No((String) map.get("STATUS_NO"));
-            selectByIdcardEntity.setTaskState((String) map.get("TASK_STATE"));
-            selectByIdcardEntity.setCityName((String) map.get("CITYNAME"));
-            selectByIdcardEntity.setLastModifyTime((Data) map.get("lastModifyTime;"));
-        }catch (NullPointerException e){
-            e.printStackTrace();
+    @Override
+    public SelectFromAccEntity selectByGroupNoFromAcc(String id) {
+        return null;
     }
-        return selectByIdcardEntity;
+
+    @Override
+    public SelectFromTaskListEntity selectByCardIdFromYX(String id) {
+        return null;
     }
 
     @Override
-    public SelectByWorkOrderEntity selectByWorkOrderNumber(String id){
-        Map<String,Object> map = selectSerialNumberMapper.selectByWorkOrderNumber(id);
-        SelectByWorkOrderEntity selectByWorkOrderEntity = new SelectByWorkOrderEntity();
-
-        try {
-            selectByWorkOrderEntity.setLibrary("盈信库");
-            selectByWorkOrderEntity.setCityName((String) map.get("CITYNAME"));
-            selectByWorkOrderEntity.setCardType((String) map.get("CARD_TYPE"));
-            selectByWorkOrderEntity.setPainterName((String) map.get("PRINTER_NAME"));
-            selectByWorkOrderEntity.setTask_Id(Long.valueOf(String.valueOf( map.get("TASK_ID"))));
-            selectByWorkOrderEntity.setSubmit_Date((Date) map.get("SUBMIT_DATE"));
-            selectByWorkOrderEntity.setPosition_Date((Date) map.get("POSITION_DATE"));
-            selectByWorkOrderEntity.setQuality_People_Name((String) map.get("QUALITY_PEOPLE_NAME"));
-            selectByWorkOrderEntity.setOut_Storage_Date((Date) map.get("OUT_STORAGE_DATE"));
-            selectByWorkOrderEntity.setIn_Storage_Date((Date) map.get("IN_STORAGE_DATE"));
-            selectByWorkOrderEntity.setException_Information((String) map.get("EXCEPTION_INFORMATION"));
-        } catch (NullPointerException e){
-            e.printStackTrace();
+    public SelectFromAccEntity selectByCardIdFromAcc(String id) {
+        return null;
     }
-        return selectByWorkOrderEntity;
+
+    @Override
+    public SelectFromProdEntity selectByCardIdFromProd(String id) {
+        return null;
     }
 }