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

# Conflicts:
#	src/main/resources/static/views/analysisLog/analysisLog.html
#	src/main/resources/static/views/cardProdPackage/cardProdPackage.html
#	src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html
#	src/main/resources/static/views/packageLog/packageLog.html

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

@@ -51,6 +51,7 @@ public class ReadExcelApi {
     @Produces(MediaType.APPLICATION_JSON)
     @Transactional(rollbackFor = Exception.class)
     public boolean ReadPersonPost(HttpServletResponse resp, HttpServletRequest requ) {
+
         System.out.println("进入api");
         YXJSONResponse yxresp = new YXJSONResponse();
         DateFormat format = new SimpleDateFormat("yyyy-MM-dd");

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.service.SelectSerialNumberService;
+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.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *搜索框查询
+ */
+@RestController
+@RequestMapping("specialCardInfo")
+public class SelectApi {
+    /**
+     * 根据 组号、受理号、身份证号、任务单号查询
+     */
+    @Autowired
+    private SelectSerialNumberService selectSerialNumberService;
+
+    @RequestMapping(value = "selectByCard")
+    public String  selectByCard(@RequestParam("id") String id, HttpServletResponse resp){
+        resp.setCharacterEncoding("UTF-8");
+        List<String> list = new ArrayList<>();
+        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();
+            }
+
+        }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();
+                    }
+                    break;
+                case 10:
+                    try {
+                        SelectByAcceptedEntity specialCardInfo2 = selectSerialNumberService.selectByAccepted(id);
+                        map.put("searchResult", specialCardInfo2);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    break;
+                case 18:
+                    try {
+                        SelectByIdcardEntity specialCardInfo3 = selectSerialNumberService.selectByIdCard(id);
+                        map.put("searchResult", specialCardInfo3);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    break;
+            }
+        }
+        YXJSONResponse yxjsonResponse = new YXJSONResponse();
+        resp.setCharacterEncoding("UTF-8");
+        yxjsonResponse.outPutSuccess(map);
+        return yxjsonResponse.toJSONString();
+
+    }
+
+}

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

@@ -11,7 +11,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Administrator
@@ -78,68 +81,6 @@ public class TaskListApi {
         return true;
     }
 
-    /**
-     * 根据上传时间查询数据(用于生成任务单)
-     * @param date
-     * @return
-     */
-    @RequestMapping("selectByDate")
-    public String selectByDate(@Param("date") String date){
 
-        String result = "[\n" +
-                "    {\n" +
-                "        typeCode: '1',\n" +
-                "        typeName: '普通证',\n" +
-                "        typeSum: 300,\n" +
-                "        isActive: 'true',\n" +
-                "        countyList: [\n" +
-                "            {\n" +
-                "                taskId: '20190228001',\n" +
-                "                county: '西城区',\n" +
-                "                groupNo: '00234653-03687587',\n" +
-                "                valid: 240,\n" +
-                "                invalid: 0\n" +
-                "            },\n" +
-                "            {\n" +
-                "                taskId: '20190228001',\n" +
-                "                county: '东城区',\n" +
-                "                groupNo: '00234653-03687587',\n" +
-                "                valid: 240,\n" +
-                "                invalid: 0\n" +
-                "            },\n" +
-                "            {\n" +
-                "                taskId: '20190228001',\n" +
-                "                county: '海淀区',\n" +
-                "                groupNo: '00234653-03687587',\n" +
-                "                valid: 240,\n" +
-                "                invalid: 0\n" +
-                "            }\n" +
-                "        ]\n" +
-                "    },\n" +
-                "    {\n" +
-                "        typeCode: '9',\n" +
-                "        typeName: '邮寄证',\n" +
-                "        typeSum: 500,\n" +
-                "        isActive: 'false',\n" +
-                "        countyList: [\n" +
-                "            {\n" +
-                "                taskId: '20190228001',\n" +
-                "                county: '朝阳区',\n" +
-                "                groupNo: '00234653-03687587',\n" +
-                "                valid: 240,\n" +
-                "                invalid: 0\n" +
-                "            },\n" +
-                "            {\n" +
-                "                taskId: '20190228001',\n" +
-                "                county: '昌平区',\n" +
-                "                groupNo: '00234653-03687587',\n" +
-                "                valid: 240,\n" +
-                "                invalid: 0\n" +
-                "            }\n" +
-                "        ]\n" +
-                "    }\n" +
-                "]";
-        return result;
-    }
 
 }

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

+package com.yxproject.start.api.fakeApi;
+
+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.List;
+
+@RestController
+@RequestMapping("CreatePackageApi")
+public class CreatePackageApi {
+    /**
+     * 打包日志数据查询
+     * @param newPackageName 新包名
+     * @param idCard 身份证号
+     * @param createDate 生成时间
+     * @param readCounty 上传地区
+     * @return result
+     */
+    @RequestMapping("selectPackageData")
+    public String selectPackageData(@Param("newPackageName")String newPackageName,@Param("idCard")String idCard,@Param("createDate")String createDate,@Param("readCounty")String readCounty){
+
+        List<JSONObject> countyList = new ArrayList<>();
+        JSONObject jsonStr1 = new JSONObject();
+        jsonStr1.put("newPackageName","123420190302001");
+        jsonStr1.put("createDate","20190302");
+        jsonStr1.put("cardCount",300);
+        jsonStr1.put("readCountyCode","110012");
+        jsonStr1.put("readCountyName","朝阳区");
+        countyList.add(jsonStr1);
+
+        JSONObject jsonStr2 = new JSONObject();
+        jsonStr2.put("newPackageName","123420190302023");
+        jsonStr2.put("createDate","20190302");
+        jsonStr2.put("cardCount",260);
+        jsonStr2.put("readCountyCode","110013");
+        jsonStr2.put("readCountyName","海淀区");
+        countyList.add(jsonStr2);
+
+        JSONObject jsonStr3 = new JSONObject();
+        jsonStr3.put("newPackageName","123420190302003");
+        jsonStr3.put("createDate","20190302");
+        jsonStr3.put("cardCount",410);
+        jsonStr3.put("readCountyCode","110022");
+        jsonStr3.put("readCountyName","东城区");
+        countyList.add(jsonStr3);
+
+        JSONObject jsonStr4 = new JSONObject();
+        jsonStr4.put("newPackageName","123420190302007");
+        jsonStr4.put("createDate","20190302");
+        jsonStr4.put("cardCount",270);
+        jsonStr4.put("readCountyCode","110012");
+        jsonStr4.put("readCountyName","朝阳区");
+        countyList.add(jsonStr4);
+
+        JSONObject jsonStr5 = new JSONObject();
+        jsonStr5.put("newPackageName","123420190302016");
+        jsonStr5.put("createDate","20190302");
+        jsonStr5.put("cardCount",280);
+        jsonStr5.put("readCountyCode","110018");
+        jsonStr5.put("readCountyName","大兴区");
+        countyList.add(jsonStr5);
+
+        JSONObject jsonStr6 = new JSONObject();
+        jsonStr6.put("newPackageName","123420190302031");
+        jsonStr6.put("createDate","20190302");
+        jsonStr6.put("cardCount",600);
+        jsonStr6.put("readCountyCode","110011");
+        jsonStr6.put("readCountyName","西城区");
+        countyList.add(jsonStr6);
+
+        return countyList.toString();
+    }
+}

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

+package com.yxproject.start.api.fakeApi;
+
+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;
+import java.util.Map;
+
+@RestController
+@RequestMapping("FilmPrintingApi")
+public class FilmPrintingApi {
+    /**
+     *查询任务单信息
+     * @param date 时间
+     * @param gongxu 工序
+     * @return result
+     */
+    @RequestMapping("selectFilmPrinting")
+    public List<String> selectFilmPrinting(@Param("date")String date, @Param("gongxu")String gongxu){
+
+        List<String> result = new ArrayList<>();
+        Map<String,Object> map1 = new HashMap<>();
+        Map<String,Object> map2 = new HashMap<>();
+
+        List<JSONObject> list1 = new ArrayList();
+        List<JSONObject> list2 = new ArrayList();
+
+        JSONObject jsonStr1 = new JSONObject();
+        jsonStr1.put("taskId","20190228001");
+        jsonStr1.put("verificationDate","20190301");
+        jsonStr1.put("county","西城区");
+        jsonStr1.put("listCount ","160");
+        jsonStr1.put("groupNo","03687576-03687587");
+        jsonStr1.put("verificationCount ","160");
+        jsonStr1.put("readCount","160");
+        jsonStr1.put("invalid ","0");
+        list1.add(jsonStr1);
+
+        JSONObject jsonStr2 = new JSONObject();
+        jsonStr2.put("taskId","20190228001");
+        jsonStr2.put("verificationDate","20190301");
+        jsonStr2.put("county","东城区");
+        jsonStr2.put("listCount ","270");
+        jsonStr2.put("groupNo","03687576-03687587");
+        jsonStr2.put("verificationCount ","270");
+        jsonStr2.put("readCount","270");
+        jsonStr2.put("invalid ","0");
+        list1.add(jsonStr2);
+
+        JSONObject jsonStr3 = new JSONObject();
+        jsonStr3.put("taskId","20190228001");
+        jsonStr3.put("verificationDate","20190301");
+        jsonStr3.put("county","海淀区");
+        jsonStr3.put("listCount ","140");
+        jsonStr3.put("groupNo","03687576-03687587");
+        jsonStr3.put("verificationCount ","140");
+        jsonStr3.put("readCount","140");
+        jsonStr3.put("invalid ","0");
+        list1.add(jsonStr3);
+
+
+        JSONObject jsonStr4 = new JSONObject();
+        jsonStr4.put("taskId","20190228001");
+        jsonStr4.put("verificationDate","20190301");
+        jsonStr4.put("county","西城区");
+        jsonStr4.put("listCount ","160");
+        jsonStr4.put("groupNo","03687576-03687587");
+        jsonStr4.put("verificationCount ","160");
+        jsonStr4.put("readCount","160");
+        jsonStr4.put("invalid ","0");
+        list2.add(jsonStr4);
+
+        JSONObject jsonStr5 = new JSONObject();
+        jsonStr5.put("taskId","20190228001");
+        jsonStr5.put("verificationDate","20190301");
+        jsonStr5.put("county","东城区");
+        jsonStr5.put("listCount ","270");
+        jsonStr5.put("groupNo","03687576-03687587");
+        jsonStr5.put("verificationCount ","270");
+        jsonStr5.put("readCount","270");
+        jsonStr5.put("invalid ","0");
+        list2.add(jsonStr5);
+
+        JSONObject jsonStr6 = new JSONObject();
+        jsonStr6.put("taskId","20190228001");
+        jsonStr6.put("verificationDate","20190301");
+        jsonStr6.put("county","海淀区");
+        jsonStr6.put("listCount ","140");
+        jsonStr6.put("groupNo","03687576-03687587");
+        jsonStr6.put("verificationCount ","140");
+        jsonStr6.put("readCount","140");
+        jsonStr6.put("invalid ","0");
+        list2.add(jsonStr6);
+
+        map1.put("typeCode",1);
+        map1.put("typeName","普通证");
+        map1.put("typeSum",360);
+        map1.put("isActive","true");
+        map1.put("totalCount","true");
+        map1.put("remaining",3);
+        map1.put("list",list1);
+
+        map2.put("typeCode",9);
+        map2.put("typeName","邮寄证");
+        map2.put("typeSum",420);
+        map2.put("isActive","true");
+        map2.put("totalCount","true");
+        map2.put("remaining",3);
+        map2.put("list",list2);
+
+
+        result.add(map1.toString());
+        result.add(map2.toString());
+
+
+        return result;
+    }
+}

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

+package com.yxproject.start.api.fakeApi;
+
+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.List;
+
+@RestController
+@RequestMapping("groupListApi")
+public class GroupListApi {
+    /**
+     * 根据组号列表查询
+     * @Param group 组号
+     * @return
+     */
+    @RequestMapping("selectList")
+    public String selectList(@Param("group")String group){
+        List<JSONObject> postList = new ArrayList<>();
+
+        JSONObject jsonStr1 = new JSONObject();
+        jsonStr1.put("policeName","东城区派出所");
+        jsonStr1.put("verificationData","160");
+        jsonStr1.put("printCount","0");
+        jsonStr1.put("qualityTest ","0");
+        postList.add(jsonStr1);
+
+        JSONObject jsonStr2 = new JSONObject();
+        jsonStr2.put("policeName","东城区派出所");
+        jsonStr2.put("verificationData","160");
+        jsonStr2.put("printCount","0");
+        jsonStr2.put("qualityTest ","0");
+        postList.add(jsonStr2);
+
+        JSONObject jsonStr3 = new JSONObject();
+        jsonStr3.put("policeName","东城区派出所");
+        jsonStr3.put("verificationData","160");
+        jsonStr3.put("printCount","0");
+        jsonStr3.put("qualityTest ","0");
+        postList.add(jsonStr3);
+
+        return postList.toString();
+    }
+}

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

+package com.yxproject.start.api.fakeApi;
+
+import net.sf.json.JSONObject;
+import org.springframework.web.bind.annotation.RequestBody;
+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;
+import java.util.Map;
+
+@RestController
+@RequestMapping("PackageInformation")
+public class PackageInformationApi {
+
+    /**
+     * 查询制证信息用于制证信息打包
+     * @param requestStr
+     * @return
+     */
+    @RequestMapping("selectInformation")
+    public Map<String, Object> selectInformation(@RequestBody String requestStr){
+
+        Map<String,Object> map = new HashMap<>();
+        List<JSONObject> list = new ArrayList();
+
+        JSONObject jsonStr1 = new JSONObject();
+        jsonStr1.put("uploadNo","411032546565445");
+        jsonStr1.put("name","张三");
+        jsonStr1.put("cardId","130133195608240013");
+        jsonStr1.put("oldPackageNo ","1321454113");
+        jsonStr1.put("newPackageNo","1213134556");
+        jsonStr1.put("cardType ","普通证");
+        list.add(jsonStr1);
+
+        JSONObject jsonStr2 = new JSONObject();
+        jsonStr2.put("uploadNo","411032546565445");
+        jsonStr2.put("name","里斯");
+        jsonStr2.put("cardId","130133195608240013");
+        jsonStr2.put("oldPackageNo ","1321454113");
+        jsonStr2.put("newPackageNo","1213134556");
+        jsonStr2.put("cardType ","普通证");
+        list.add(jsonStr2);
+
+        JSONObject jsonStr3 = new JSONObject();
+        jsonStr3.put("uploadNo","411032546565445");
+        jsonStr3.put("name","王五");
+        jsonStr3.put("cardId","130133195608240013");
+        jsonStr3.put("oldPackageNo ","1321454113");
+        jsonStr3.put("newPackageNo","1213134556");
+        jsonStr3.put("cardType ","普通证");
+        list.add(jsonStr3);
+
+        JSONObject jsonStr4 = new JSONObject();
+        jsonStr4.put("uploadNo","411032546565445");
+        jsonStr4.put("name","张三");
+        jsonStr4.put("cardId","130133195608240013");
+        jsonStr4.put("oldPackageNo ","1321454113");
+        jsonStr4.put("newPackageNo","1213134556");
+        jsonStr4.put("cardType ","普通证");
+        list.add(jsonStr4);
+
+        JSONObject jsonStr5 = new JSONObject();
+        jsonStr5.put("uploadNo","411032546565445");
+        jsonStr5.put("name","张三");
+        jsonStr5.put("cardId","130133195608240013");
+        jsonStr5.put("oldPackageNo ","1321454113");
+        jsonStr5.put("newPackageNo","1213134556");
+        jsonStr5.put("cardType ","普通证");
+        list.add(jsonStr5);
+
+        JSONObject jsonStr6 = new JSONObject();
+        jsonStr6.put("uploadNo","411032546565445");
+        jsonStr6.put("name","里斯");
+        jsonStr6.put("cardId","130133195608240013");
+        jsonStr6.put("oldPackageNo ","1321454113");
+        jsonStr6.put("newPackageNo","1213134556");
+        jsonStr6.put("cardType ","普通证");
+        list.add(jsonStr6);
+
+        JSONObject jsonStr7 = new JSONObject();
+        jsonStr7.put("uploadNo","411032546565445");
+        jsonStr7.put("name","李四");
+        jsonStr7.put("cardId","130133195608240013");
+        jsonStr7.put("oldPackageNo ","1321454113");
+        jsonStr7.put("newPackageNo","1213134556");
+        jsonStr7.put("cardType ","普通证");
+        list.add(jsonStr7);
+
+
+        map.put("commonCardCount",2300);
+        map.put("postCardCount",1200);
+        map.put("forbiddenCount",2);
+        map.put("list",list);
+
+        return map;
+
+    }
+}

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

+package com.yxproject.start.api.fakeApi;
+
+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.List;
+
+@RestController
+@RequestMapping("ParsingLogApi")
+public class ParsingLogApi {
+
+    /**
+     * 解析日志
+     * @param date 时间
+     * @param oldPackageData 原包数据
+     * @return
+     */
+    @RequestMapping("selectParsingLog")
+    public String selectParsingLog(@Param("date")String date,@Param("oldPackageData")String oldPackageData){
+
+        List<JSONObject> countyList = new ArrayList<>();
+
+        JSONObject jsonStr1 = new JSONObject();
+        jsonStr1.put("oldPackageName","123420190302001");
+        jsonStr1.put("count",330);
+        jsonStr1.put("fileName","格口信息.xls");
+        jsonStr1.put("parsingDate","20190302");
+        jsonStr1.put("commonCardCount",200);
+        jsonStr1.put("postCardCount",100);
+        jsonStr1.put("formStateTime","20190302");
+        jsonStr1.put("formDeadline","20190402");
+
+
+        JSONObject jsonStr2 = new JSONObject();
+        jsonStr2.put("oldPackageName","123420190302002");
+        jsonStr2.put("count",260);
+        jsonStr2.put("fileName","格口信息.xls");
+        jsonStr2.put("parsingDate","20190302");
+        jsonStr2.put("commonCardCount",210);
+        jsonStr2.put("postCardCount",50);
+        jsonStr2.put("formStateTime","20190302");
+        jsonStr2.put("formDeadline","20190402");
+
+        JSONObject jsonStr3 = new JSONObject();
+        jsonStr3.put("oldPackageName","123420190302003");
+        jsonStr3.put("count",380);
+        jsonStr3.put("fileName","格口信息.xls");
+        jsonStr3.put("parsingDate","20190302");
+        jsonStr3.put("commonCardCount",120);
+        jsonStr3.put("postCardCount",260);
+        jsonStr3.put("formStateTime","20190302");
+        jsonStr3.put("formDeadline","20190402");
+
+        JSONObject jsonStr4 = new JSONObject();
+        jsonStr4.put("oldPackageName","123420190302004");
+        jsonStr4.put("count",330);
+        jsonStr4.put("fileName","格口信息.xls");
+        jsonStr4.put("parsingDate","20190302");
+        jsonStr4.put("commonCardCount",120);
+        jsonStr4.put("postCardCount",210);
+        jsonStr4.put("formStateTime","20190302");
+        jsonStr4.put("formDeadline","20190402");
+
+        JSONObject jsonStr5 = new JSONObject();
+        jsonStr5.put("oldPackageName","123420190302005");
+        jsonStr5.put("count",470);
+        jsonStr5.put("fileName","格口信息.xls");
+        jsonStr5.put("parsingDate","20190302");
+        jsonStr5.put("commonCardCount",220);
+        jsonStr5.put("postCardCount",250);
+        jsonStr5.put("formStateTime","20190302");
+        jsonStr5.put("formDeadline","20190402");
+
+        countyList.add(jsonStr1);
+        countyList.add(jsonStr2);
+        countyList.add(jsonStr3);
+        countyList.add(jsonStr4);
+        countyList.add(jsonStr5);
+
+        return countyList.toString();
+
+    }
+}

src/main/java/com/yxproject/start/api/fakeApi/readCardApi.java → src/main/java/com/yxproject/start/api/fakeApi/ReadCardApi.java

@@ -9,32 +9,30 @@ import java.util.ArrayList;
 import java.util.List;
 
 @RestController
-@RequestMapping("selectXMLApi")
-public class readCardApi {
+@RequestMapping("readCardApi")
+public class ReadCardApi {
 
     /**
      * 查询读卡信息详情
-     * @param idCard
-     * @param startDate
-     * @param endDate
+     * @param idCard 身份证号
+     * @param startDate 开始时间
+     * @param endDate 结束时间
      * @return countyList
      */
     @RequestMapping("selectPostData")
     public String selectPostData(@Param("idCard") String idCard,@Param("startDate") String startDate,@Param("endDate") String endDate){
 
         List<JSONObject> countyList = new ArrayList<>();
-
         JSONObject jsonStr1 = new JSONObject();
-        jsonStr1.put("name","周强");
+        jsonStr1.put("name","周**");
         jsonStr1.put("sex","男");
         jsonStr1.put("nation","汉族");
-        jsonStr1.put("birthday","19930207");
+        jsonStr1.put("birthday","19830207");
         jsonStr1.put("address","北京市海淀区马连洼学府路202号");
         jsonStr1.put("idNumber",idCard);
         jsonStr1.put("issuingAuthority","马连洼派出所");
         jsonStr1.put("beginData","20130916");
         jsonStr1.put("endData","20230916");
-
         countyList.add(jsonStr1);
 
         return countyList.toString();

src/main/java/com/yxproject/start/api/fakeApi/selectDetailedInformation.java → src/main/java/com/yxproject/start/api/fakeApi/SelectDetailedInformation.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("selectDetailedInformation")
-public class selectDetailedInformation {
+public class SelectDetailedInformation {
 
     /**
      * 制证信息查询

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

@@ -9,8 +9,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 @RestController
-@RequestMapping("selectXMLApi")
-public class selectExcelApi {
+@RequestMapping("selectExcelApi")
+public class SelectExcelApi {
 
     /**
      * 邮寄信息查询

src/main/java/com/yxproject/start/api/fakeApi/selectPostData.java → src/main/java/com/yxproject/start/api/fakeApi/SelectPostData.java

@@ -2,6 +2,7 @@ package com.yxproject.start.api.fakeApi;
 
 import net.sf.json.JSONObject;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -10,25 +11,18 @@ import java.util.List;
 
 @RestController
 @RequestMapping("selectPostData")
-public class selectPostData {
+public class SelectPostData {
     /**
      * 邮寄信息查询
-     * @param name
-     * @param formNo
-     * @param serialNo
-     * @param printState
-     * @param latticeMouth
-     * @param county
-     * @param readDate
+     * @param jsonStr
      * @return postList
      */
-    @RequestMapping("selectPost")
-    public String selectPost(@Param("name")String name,@Param("formNo")String formNo,@Param("serialNo")String serialNo,@Param("printState")String printState,@Param("latticeMouth")String latticeMouth,@Param("county")String county,@Param("readDate")String readDate){
 
+    @RequestMapping("selectPost")
+    public String selectPost(@RequestBody String jsonStr){
         List<JSONObject> postList = new ArrayList<>();
-
         JSONObject jsonStr1 = new JSONObject();
-        jsonStr1.put("formNo",formNo);
+        jsonStr1.put("formNo","6614038");
         jsonStr1.put("waybillNumber","2102968392945");
         jsonStr1.put("backWaybillNumber","2163968602938");
         jsonStr1.put("firstWhite","1100120172018121900012");
@@ -37,7 +31,6 @@ public class selectPostData {
         jsonStr1.put("issuingAuthority","马连洼派出所");
         jsonStr1.put("applicantName","杨家将");
         jsonStr1.put("printDate","20190302");
-
         postList.add(jsonStr1);
         return postList.toString();
     }

src/main/java/com/yxproject/start/api/fakeApi/selectXMLApi.java → src/main/java/com/yxproject/start/api/fakeApi/SelectXMLApi.java

@@ -4,19 +4,18 @@ 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.List;
 
 @RestController
 @RequestMapping("selectXMLApi")
-public class selectXMLApi {
+public class SelectXMLApi {
 
     /**
      * 制证信息查询
      * 按日期和状态查询制证信息数据，返回List集合
-     * @param date
-     * @param state
+     * @param date 时间
+     * @param state 状态
      * @return countyList
      */
     @RequestMapping("selectXml")

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

+package com.yxproject.start.api.fakeApi;
+
+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.List;
+
+@RestController
+@RequestMapping("sortingGroupListApi")
+public class SortingGroupListApi {
+    /**
+     * 分拣任务单中的组号查询
+     * @param readXMLDate  XML导入时间
+     * @param state 状态
+     * @return
+     */
+    @RequestMapping("sortingGroupList")
+    public String sortingGroupList(@Param("readXMLDate")String readXMLDate,@Param("state")String state){
+
+        List<JSONObject> countyList = new ArrayList<>();
+        JSONObject jsonStr1 = new JSONObject();
+        jsonStr1.put("readDate","20190301");
+        jsonStr1.put("packageCount",300);
+        jsonStr1.put("cardCount",28000);
+        jsonStr1.put("commonCardCount",16000);
+        jsonStr1.put("postCardCount",12000);
+        countyList.add(jsonStr1);
+
+        JSONObject jsonStr2 = new JSONObject();
+        jsonStr2.put("readDate","20190302");
+        jsonStr2.put("packageCount",260);
+        jsonStr2.put("cardCount",26500);
+        jsonStr2.put("commonCardCount",16500);
+        jsonStr2.put("postCardCount",10000);
+        countyList.add(jsonStr2);
+
+        JSONObject jsonStr3 = new JSONObject();
+        jsonStr3.put("readDate","20190302");
+        jsonStr3.put("packageCount",330);
+        jsonStr3.put("cardCount",22000);
+        jsonStr3.put("commonCardCount",11500);
+        jsonStr3.put("postCardCount",10500);
+        countyList.add(jsonStr3);
+
+        JSONObject jsonStr4 = new JSONObject();
+        jsonStr4.put("readDate","20190303");
+        jsonStr4.put("packageCount",300);
+        jsonStr4.put("cardCount",28000);
+        jsonStr4.put("commonCardCount",16000);
+        jsonStr4.put("postCardCount",12000);
+        countyList.add(jsonStr4);
+
+        JSONObject jsonStr5 = new JSONObject();
+        jsonStr5.put("readDate","20190303");
+        jsonStr5.put("packageCount",430);
+        jsonStr5.put("cardCount",56000);
+        jsonStr5.put("commonCardCount",33000);
+        jsonStr5.put("postCardCount",23000);
+        countyList.add(jsonStr5);
+
+        JSONObject jsonStr6 = new JSONObject();
+        jsonStr6.put("readDate","20190303");
+        jsonStr6.put("packageCount",310);
+        jsonStr6.put("cardCount",29000);
+        jsonStr6.put("commonCardCount",16000);
+        jsonStr6.put("postCardCount",13000);
+        countyList.add(jsonStr6);
+
+        return countyList.toString();
+
+    }
+}

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

+package com.yxproject.start.api.fakeApi;
+
+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;
+import java.util.Map;
+
+@RestController
+@RequestMapping("TaskListFakeApi")
+public class TaskListFakeApi {
+    /**
+     * 根据上传时间查询数据(用于生成任务单)
+     * @param date
+     * @return
+     */
+    @RequestMapping("selectByDate")
+    public String selectByDate(@Param("date") String date){
+
+        List<String> result = new ArrayList<>();
+        Map<String,Object> map1 = new HashMap<>();
+        Map<String,Object> map2 = new HashMap<>();
+
+        List<JSONObject> list1 = new ArrayList();
+        List<JSONObject> list2 = new ArrayList();
+
+
+        JSONObject jsonStr1 = new JSONObject();
+        jsonStr1.put("taskId","20190228001");
+        jsonStr1.put("county","西城区");
+        jsonStr1.put("groupNo","03687576-03687587");
+        jsonStr1.put("valid","160");
+        jsonStr1.put("invalid ","0");
+        list1.add(jsonStr1);
+
+        JSONObject jsonStr2 = new JSONObject();
+        jsonStr2.put("taskId","20190228001");
+        jsonStr2.put("county","东城区");
+        jsonStr2.put("groupNo","03687576-03687587");
+        jsonStr2.put("valid","270");
+        jsonStr2.put("invalid ","0");
+        list1.add(jsonStr2);
+
+        JSONObject jsonStr3 = new JSONObject();
+        jsonStr3.put("taskId","20190228001");
+        jsonStr3.put("county","海淀区");
+        jsonStr3.put("groupNo","03687576-03687587");
+        jsonStr3.put("valid","140");
+        jsonStr3.put("invalid ","0");
+        list1.add(jsonStr3);
+
+
+        JSONObject jsonStr4 = new JSONObject();
+        jsonStr4.put("taskId","20190228001");
+        jsonStr4.put("county","西城区");
+        jsonStr4.put("groupNo","03687576-03687587");
+        jsonStr4.put("valid","160");
+        jsonStr4.put("invalid ","0");
+        list2.add(jsonStr4);
+
+        JSONObject jsonStr5 = new JSONObject();
+        jsonStr5.put("taskId","20190228001");
+        jsonStr5.put("county","东城区");
+        jsonStr5.put("groupNo","03687576-03687587");
+        jsonStr5.put("valid","270");
+        jsonStr5.put("invalid ","0");
+        list2.add(jsonStr5);
+
+        JSONObject jsonStr6 = new JSONObject();
+        jsonStr6.put("taskId","20190228001");
+        jsonStr6.put("county","海淀区");
+        jsonStr6.put("groupNo","03687576-03687587");
+        jsonStr6.put("valid","140");
+        jsonStr6.put("invalid ","0");
+        list2.add(jsonStr6);
+
+        map1.put("typeCode",1);
+        map1.put("typeName","普通证");
+        map1.put("typeSum",360);
+        map1.put("isActive","true");
+        map1.put("list",list1);
+
+        map2.put("typeCode",9);
+        map2.put("typeName","邮寄证");
+        map2.put("typeSum",420);
+        map2.put("isActive","false");
+        map2.put("list",list2);
+
+
+        result.add(map1.toString());
+        result.add(map2.toString());
+
+
+
+        return result.toString();
+    }
+}

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

+package com.yxproject.start.entity.resp;
+
+import javax.xml.crypto.Data;
+
+public class SelectByAcceptedEntity {
+
+
+    private String cardType;
+    private String library;
+    private String accept_No;
+    private String name;
+    private String sex_No;
+    private String id_No;
+    private String birthday;
+    private String sign_Govt;
+    private String begin_Date;
+    private String expire_Date;
+    private String status_No;
+    private String taskState;
+    private String cityName;
+    private Data lastModifyTime;
+
+    public String getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(String cardType) {
+        this.cardType = cardType;
+    }
+
+    public String getLibrary() {
+        return library;
+    }
+
+    public void setLibrary(String library) {
+        this.library = library;
+    }
+
+    public String getAccept_No() {
+        return accept_No;
+    }
+
+    public void setAccept_No(String accept_No) {
+        this.accept_No = accept_No;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSex_No() {
+        return sex_No;
+    }
+
+    public void setSex_No(String sex_No) {
+        this.sex_No = sex_No;
+    }
+
+    public String getId_No() {
+        return id_No;
+    }
+
+    public void setId_No(String id_No) {
+        this.id_No = id_No;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getSign_Govt() {
+        return sign_Govt;
+    }
+
+    public void setSign_Govt(String sign_Govt) {
+        this.sign_Govt = sign_Govt;
+    }
+
+    public String getBegin_Date() {
+        return begin_Date;
+    }
+
+    public void setBegin_Date(String begin_Date) {
+        this.begin_Date = begin_Date;
+    }
+
+    public String getExpire_Date() {
+        return expire_Date;
+    }
+
+    public void setExpire_Date(String expire_Date) {
+        this.expire_Date = expire_Date;
+    }
+
+    public String getStatus_No() {
+        return status_No;
+    }
+
+    public void setStatus_No(String status_No) {
+        this.status_No = status_No;
+    }
+
+    public String getTaskState() {
+        return taskState;
+    }
+
+    public void setTaskState(String taskState) {
+        this.taskState = taskState;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public Data getLastModifyTime() {
+        return lastModifyTime;
+    }
+
+    public void setLastModifyTime(Data lastModifyTime) {
+        this.lastModifyTime = lastModifyTime;
+    }
+}

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

+package com.yxproject.start.entity.resp;
+
+import java.util.Date;
+
+public class SelectByGroupNumEntity {
+
+    private String library;
+    private String cityName;
+    private String cardType;
+    private String painterName;
+    private String taskId;
+    private String group_No;
+    private Date submit_Date;
+    private Date position_Date;
+    private String quality_People_Name;
+    private Date out_Storage_Date;
+    private Date in_Storage_Date;
+    private String exception_Information;
+
+
+    public String getLibrary() {
+        return library;
+    }
+
+    public void setLibrary(String library) {
+        this.library = library;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(String cardType) {
+        this.cardType = cardType;
+    }
+
+    public String getPainterName() {
+        return painterName;
+    }
+
+    public void setPainterName(String painterName) {
+        this.painterName = painterName;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getGroup_No() {
+        return group_No;
+    }
+
+    public void setGroup_No(String group_No) {
+        this.group_No = group_No;
+    }
+
+    public Date getSubmit_Date() {
+        return submit_Date;
+    }
+
+    public void setSubmit_Date(Date submit_Date) {
+        this.submit_Date = submit_Date;
+    }
+
+    public Date getPosition_Date() {
+        return position_Date;
+    }
+
+    public void setPosition_Date(Date position_Date) {
+        this.position_Date = position_Date;
+    }
+
+    public String getQuality_People_Name() {
+        return quality_People_Name;
+    }
+
+    public void setQuality_People_Name(String quality_People_Name) {
+        this.quality_People_Name = quality_People_Name;
+    }
+
+    public Date getOut_Storage_Date() {
+        return out_Storage_Date;
+    }
+
+    public void setOut_Storage_Date(Date out_Storage_Date) {
+        this.out_Storage_Date = out_Storage_Date;
+    }
+
+    public Date getIn_Storage_Date() {
+        return in_Storage_Date;
+    }
+
+    public void setIn_Storage_Date(Date in_Storage_Date) {
+        this.in_Storage_Date = in_Storage_Date;
+    }
+
+    public String getException_Information() {
+        return exception_Information;
+    }
+
+    public void setException_Information(String exception_Information) {
+        this.exception_Information = exception_Information;
+    }
+
+
+
+
+
+
+}

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

+package com.yxproject.start.entity.resp;
+
+import javax.xml.crypto.Data;
+
+public class SelectByIdcardEntity {
+    private String cardType;
+    private String library;
+    private String accept_No;
+    private String name;
+    private String sex_No;
+    private String id_No;
+    private String birthday;
+    private String sign_Govt;
+    private String begin_Date;
+    private String expire_Date;
+    private String status_No;
+    private String taskState;
+    private String cityName;
+    private Data lastModifyTime;
+
+    public String getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(String cardType) {
+        this.cardType = cardType;
+    }
+
+    public String getLibrary() {
+        return library;
+    }
+
+    public void setLibrary(String library) {
+        this.library = library;
+    }
+
+    public String getAccept_No() {
+        return accept_No;
+    }
+
+    public void setAccept_No(String accept_No) {
+        this.accept_No = accept_No;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSex_No() {
+        return sex_No;
+    }
+
+    public void setSex_No(String sex_No) {
+        this.sex_No = sex_No;
+    }
+
+    public String getId_No() {
+        return id_No;
+    }
+
+    public void setId_No(String id_No) {
+        this.id_No = id_No;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getSign_Govt() {
+        return sign_Govt;
+    }
+
+    public void setSign_Govt(String sign_Govt) {
+        this.sign_Govt = sign_Govt;
+    }
+
+    public String getBegin_Date() {
+        return begin_Date;
+    }
+
+    public void setBegin_Date(String begin_Date) {
+        this.begin_Date = begin_Date;
+    }
+
+    public String getExpire_Date() {
+        return expire_Date;
+    }
+
+    public void setExpire_Date(String expire_Date) {
+        this.expire_Date = expire_Date;
+    }
+
+    public String getStatus_No() {
+        return status_No;
+    }
+
+    public void setStatus_No(String status_No) {
+        this.status_No = status_No;
+    }
+
+    public String getTaskState() {
+        return taskState;
+    }
+
+    public void setTaskState(String taskState) {
+        this.taskState = taskState;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public Data getLastModifyTime() {
+        return lastModifyTime;
+    }
+
+    public void setLastModifyTime(Data lastModifyTime) {
+        this.lastModifyTime = lastModifyTime;
+    }
+}
\ No newline at end of file

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

+package com.yxproject.start.entity.resp;
+
+import java.util.Date;
+
+public class SelectByWorkOrderEntity {
+
+    private String library;
+    private String cityName;
+    private String cardType;
+    private String painterName;
+    private long task_Id;
+    private Date submit_Date;
+    private Date position_Date;
+    private String quality_People_Name;
+    private Date out_Storage_Date;
+    private Date in_Storage_Date;
+    private String exception_Information;
+
+    public String getLibrary() {
+        return library;
+    }
+
+    public void setLibrary(String library) {
+        this.library = library;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(String cardType) {
+        this.cardType = cardType;
+    }
+
+    public String getPainterName() {
+        return painterName;
+    }
+
+    public void setPainterName(String painterName) {
+        this.painterName = painterName;
+    }
+
+    public long getTask_Id() {
+        return task_Id;
+    }
+
+    public void setTask_Id(long task_Id) {
+        this.task_Id = task_Id;
+    }
+
+    public Date getSubmit_Date() {
+        return submit_Date;
+    }
+
+    public void setSubmit_Date(Date submit_Date) {
+        this.submit_Date = submit_Date;
+    }
+
+    public Date getPosition_Date() {
+        return position_Date;
+    }
+
+    public void setPosition_Date(Date position_Date) {
+        this.position_Date = position_Date;
+    }
+
+    public String getQuality_People_Name() {
+        return quality_People_Name;
+    }
+
+    public void setQuality_People_Name(String quality_People_Name) {
+        this.quality_People_Name = quality_People_Name;
+    }
+
+    public Date getOut_Storage_Date() {
+        return out_Storage_Date;
+    }
+
+    public void setOut_Storage_Date(Date out_Storage_Date) {
+        this.out_Storage_Date = out_Storage_Date;
+    }
+
+    public Date getIn_Storage_Date() {
+        return in_Storage_Date;
+    }
+
+    public void setIn_Storage_Date(Date in_Storage_Date) {
+        this.in_Storage_Date = in_Storage_Date;
+    }
+
+    public String getException_Information() {
+        return exception_Information;
+    }
+
+    public void setException_Information(String exception_Information) {
+        this.exception_Information = exception_Information;
+    }
+}

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

 package com.yxproject.start.mapper;
 
+import com.yxproject.start.entity.CardDetailedListEntity;
+import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * @auther zhangyusheng
@@ -8,4 +14,20 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface CardDetailedListMapper {
+
+    /**
+     * 生成身份证详单
+     */
+    @Insert("INSERT INTO CARD_DETAILED_LIST (UPLOAD_NO,POLICE_CODE,CARD_ID,NAME)VALUES(#{uploadNo},#{policeCode},#{cardId},#{name})")
+    public boolean saveCardDetailedList(@Param("uploadNo")String uploadNo,@Param("policeCode")String policeCode,@Param("cardId")String cardId,@Param("name")String name);
+
+    /**
+     *查询详单数据
+     */
+
+    @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);
+
 }

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

+package com.yxproject.start.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+public interface GroupNoMapper {
+
+    /**
+     * 特证表计数+1
+     */
+    @Update("UPDATE GROUP_NO SET SPECIAL_CARD_COUNT =SPECIAL_CARD_COUNT+1 WHERE TASK_ID = #{taskId}")
+    public boolean createFastCard (@Param("acceptNo")String accept);
+}

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

+package com.yxproject.start.mapper;
+
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Map;
+
+@Mapper
+public interface SelectSerialNumberMapper {
+
+    @Select("select\n" +
+            "        TASK.TASK_ID,\n" +
+            "        GROUP_NO.GROUP_NO,\n" +
+            "        CITY_DIC.CITYNAME,\n" +
+            "        CARD_TYPE_DIC.CARD_TYPE,\n" +
+            "        TASK.SUBMIT_DATE,\n" +
+            "        PRINTER_DIC.PRINTER_NAME,\n" +
+            "        TASK.POSITION_DATE,\n" +
+            "        TASK.QUALITY_PEOPLE_NAME,\n" +
+            "        TASK.OUT_STORAGE_DATE,\n" +
+            "        TASK.IN_STORAGE_DATE,\n" +
+            "        TASK.EXCEPTION_INFORMATION\n" +
+            "        from GROUP_NO\n" +
+            "        LEFT JOIN TASK ON (GROUP_NO.TASK_ID =TASK.TASK_ID)\n" +
+            "        LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)\n" +
+            "        LEFT JOIN CITY_DIC ON(TASK.CITYCODE = CITY_DIC.CITYCODE)\n" +
+            "        LEFT JOIN PRINTER_DIC ON (TASK.PRINTER_ID = PRINTER_DIC.PRINTER_ID)\n" +
+            "        LEFT JOIN CARD_TYPE_DIC ON  (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)\n" +
+            "        where GROUP_NO=#{id}")
+    public Map<String,Object> selectByGroupNumber(String id);
+
+    @Select("SELECT\n" +
+            "        ACC_CARD_T.ACCEPT_NO,\n" +
+            "        ACC_CARD_T.NAME,\n" +
+            "        ACC_CARD_T.ID_NO,\n" +
+            "        ACC_CARD_T.SEX_NO,\n" +
+            "        ACC_CARD_T.BIRTHDAY,\n" +
+            "        CARD_TYPE_DIC.CARD_TYPE,\n" +
+            "        ACC_CARD_T.SIGN_GOVT,\n" +
+            "        ACC_CARD_T.BEGIN_DATE,\n" +
+            "        ACC_CARD_T.EXPIRE_DATE,\n" +
+            "        ACC_CARD_T.STATUS_NO,\n" +
+            "        TASK_STATE_DIC.TASK_STATE,\n" +
+            "        CITY_DIC.CITYNAME,\n" +
+            "        decode(TASK.TASK_STATE_ID,2,TASK.submit_date,3,TASK.ISSUED_DATE,4,TASK.OUT_WORKSHOP_DATE,5,TASK.POSITION_DATE) lastModifyTime\n" +
+            "        FROM acc_card_t@accu_dblink\n" +
+            "        LEFT JOIN group_no ON (substr(accept_no,0,8) = group_no.GROUP_NO)\n" +
+            "        LEFT JOIN task ON (task.task_id = group_no.TASK_ID)\n" +
+            "        LEFT JOIN CITY_DIC ON (TASK.CITYCODE = CITY_DIC.CITYCODE)\n" +
+            "        LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)\n" +
+            "        LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)\n" +
+            "        where ACCEPT_NO=#{id}")
+    public Map<String,Object> selectByAccepted(String id);
+
+    @Select("SELECT\n" +
+            "        ACC_CARD_T.ACCEPT_NO,\n" +
+            "        ACC_CARD_T.NAME,\n" +
+            "        ACC_CARD_T.ID_NO,\n" +
+            "        ACC_CARD_T.SEX_NO,\n" +
+            "        ACC_CARD_T.BIRTHDAY,\n" +
+            "        CARD_TYPE_DIC.CARD_TYPE,\n" +
+            "        ACC_CARD_T.SIGN_GOVT,\n" +
+            "        ACC_CARD_T.BEGIN_DATE,\n" +
+            "        ACC_CARD_T.EXPIRE_DATE,\n" +
+            "        ACC_CARD_T.STATUS_NO,\n" +
+            "        TASK_STATE_DIC.TASK_STATE,\n" +
+            "        CITY_DIC.CITYNAME,\n" +
+            "        decode(TASK.TASK_STATE_ID,2,TASK.submit_date,3,TASK.ISSUED_DATE,4,TASK.OUT_WORKSHOP_DATE,5,TASK.POSITION_DATE) lastModifyTime\n" +
+            "        FROM acc_card_t@accu_dblink\n" +
+            "        LEFT JOIN group_no ON (substr(accept_no,0,8) = group_no.GROUP_NO)\n" +
+            "        LEFT JOIN task ON (task.task_id = group_no.TASK_ID)\n" +
+            "        LEFT JOIN CITY_DIC ON (TASK.CITYCODE = CITY_DIC.CITYCODE)\n" +
+            "        LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)\n" +
+            "        LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)\n" +
+            "        where ID_NO=#{id}")
+    public Map<String,Object> selectByIdCard(String id);
+
+    @Select("select\n" +
+            "        TASK.TASK_ID,\n" +
+            "        CITY_DIC.CITYNAME,\n" +
+            "        CARD_TYPE_DIC.CARD_TYPE,\n" +
+            "        TASK.SUBMIT_DATE,\n" +
+            "        PRINTER_DIC.PRINTER_NAME,\n" +
+            "        TASK.POSITION_DATE,\n" +
+            "        TASK.QUALITY_PEOPLE_NAME,\n" +
+            "        TASK.OUT_STORAGE_DATE,\n" +
+            "        TASK.IN_STORAGE_DATE,\n" +
+            "        TASK.EXCEPTION_INFORMATION\n" +
+            "        from TASK\n" +
+            "        LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)\n" +
+            "        LEFT JOIN CITY_DIC ON (TASK.CITYCODE = CITY_DIC.CITYCODE)\n" +
+            "        LEFT JOIN PRINTER_DIC ON (TASK.PRINTER_ID = PRINTER_DIC.PRINTER_ID)\n" +
+            "        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);
+}

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

@@ -69,7 +69,7 @@ public interface TaskListMapper {
      * @param taskListEntityMap
      * @return
      */
-    @Insert("INSERT INTO TASK (CARD_TYPE,OLD_CARD_TYPE,COUNTY_CODE,TASK_STATE_ID)VALUES(1,1,#{countyCode}),0")
+    @Insert("INSERT INTO TASK (CARD_TYPE,OLD_CARD_TYPE,COUNTY_CODE,TASK_STATE_ID)VALUES(1,1,#{countyCode},0)")
     public boolean createTaskList(List<TaskListEntity> taskListEntityMap);
 
     /**
@@ -91,11 +91,7 @@ public interface TaskListMapper {
     public List<CountCountyEntity> selectTaskByCounty(@Param("submitDate") String submitDate,@Param("taskState")String taskState);
 
 
-    /**
-     * 生成快证任务单
-     */
-    @Update("")
-    public boolean createFastCard (@Param("acceptNo")String accept);
+
 
 
 }

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

 package com.yxproject.start.service;
 
+import com.yxproject.start.entity.CardDetailedListEntity;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
  * @auther zhangyusheng
  * 2019/3/1   21:28
  */
 public interface CardDetailedListService {
+
+
+    public List<CardDetailedListEntity> selectCardDetiledListData(String taskId, String gajgId);
+
+    public boolean saveCardDetailedList(String uploadNo,String policeCode,String cardId,String name);
+
+
 }

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;
+
+
+public interface SelectSerialNumberService {
+    SelectByGroupNumEntity selectByGroupNumberFromYX(String id);
+    SelectByGroupNumEntity selectByGroupNumberFromACC(String id);
+    SelectByAcceptedEntity selectByAccepted(String id);
+    SelectByIdcardEntity selectByIdCard(String id);
+    SelectByWorkOrderEntity selectByWorkOrderNumber(String id);
+}
+

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

 package com.yxproject.start.service.impl;
 
+import com.yxproject.start.entity.CardDetailedListEntity;
 import com.yxproject.start.mapper.CardDetailedListMapper;
 import com.yxproject.start.service.CardDetailedListService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @auther zhangyusheng
  * 2019/3/1   21:28
@@ -13,4 +16,16 @@ import org.springframework.stereotype.Service;
 public class CardDetailedListServiceImpl implements CardDetailedListService {
     @Autowired
     private CardDetailedListMapper cardDetailedListMapper;
+
+    @Override
+    public List<CardDetailedListEntity> selectCardDetiledListData(String taskId, String gajgId) {
+        List<CardDetailedListEntity> list  = cardDetailedListMapper.selectCardDetiledListData(taskId,gajgId);
+        return list;
+    }
+
+    @Override
+    public boolean saveCardDetailedList(String uploadNo, String policeCode, String cardId, String name) {
+        cardDetailedListMapper.saveCardDetailedList(uploadNo,policeCode,cardId,name);
+        return true;
+    }
 }

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.mapper.SelectSerialNumberMapper;
+import com.yxproject.start.service.SelectSerialNumberService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.xml.crypto.Data;
+import java.util.Date;
+import java.util.Map;
+
+@Service
+public class SelectSerialNumberServiceImpl implements SelectSerialNumberService {
+
+    @Autowired
+    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;
+    }
+
+
+
+    @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 = "缺失";
+            }
+
+            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();
+        }
+        return selectByAcceptedEntity;
+    }
+    @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 = "缺失";
+            }
+
+            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();
+        }
+        return selectByIdcardEntity;
+    }
+
+    @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();
+        }
+        return selectByWorkOrderEntity;
+    }
+}

src/main/resources/static/js/app.js

@@ -110,6 +110,12 @@ angular.module('AvatarCheck', [
             $rootScope.tab = '/tagPrint';
             $("body").addClass("sidebar-collapse");
         }
+        if ($location.path() == "/analysisLog") {
+            $rootScope.tab = '/cardProdUpdate';
+        }
+        if ($location.path() == "/packageLog") {
+            $rootScope.tab = '/cardProdUpdate';
+        }
 
 
 

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

@@ -153,7 +153,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
-            uploadExcelFile:function(fd,success){
+            uploadExcelFile:function(startDate,endDate,fd,success){
                 $http({
                     method: 'POST',
                     url: "../ReadExcel/ReadPersonPost",
@@ -172,6 +172,101 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
 
+            },
+            selectXmlPackage:function(date,state,success){
+                $http({
+                    method: 'GET',
+                    url: "../selectXMLApi/selectXml"+urlTimeStamp(),
+                    params:{
+                        date:date,
+                        state:state
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+            selectPostPackage:function(fileName,state,success){
+                $http({
+                    method: 'GET',
+                    url: "../selectExcelApi/selectExcel"+urlTimeStamp(),
+                    params:{
+                        fileName:fileName,
+                        state:state
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+            selectXmlData:function(uploadNo,idCard,name,packageNo,importDate,
+                                    typeCode,packageType,orderStartDate,orderEndDate,success){
+                $http({
+                    method: 'GET',
+                    url: "../selectDetailedInformation/selectDetailedInfo"+urlTimeStamp(),
+                    params:{
+                        uploadNo:uploadNo,
+                        idCard:idCard,
+                        name:name,
+                        packageNo:packageNo,
+                        readDate:importDate,
+                        cardType:typeCode,
+                        packageType:packageType,
+                        startDate:orderStartDate,
+                        endDate:orderEndDate
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+            selectAnalyseLog:function(oldPackageName,date,success){
+                $http({
+                    method: 'GET',
+                    url: "../ParsingLogApi/selectParsingLog"+urlTimeStamp(),
+                    params:{
+                        date:date,
+                        oldPackageData:oldPackageName
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+            getPackageData:function(uploadNo,idCard,oldPackageNo,newPackageNo,sljg,
+                                    typeCode,packageType,date,success){
+                var json ={
+                    uploadNo:uploadNo,
+                    idCard:idCard,
+                    oldPackageNo:oldPackageNo,
+                    newPackageNo:newPackageNo,
+                    sljg:sljg,
+                    typeCode:typeCode,
+                    packageType:packageType,
+                    date:date
+                }
+                var arr = [];
+                arr.push(json);
+                var body = JSON.stringify(arr);
+                $http({
+                    method: 'POST',
+                    url: "../PackageInformation/selectInformation",
+                    data: body,
+                    headers: {'Content-Type': 'application/json'}
+                }).then(function successCallback(response) {
+                    console.log(response)
+                    success(response.data)
+                })
+            },
+            selectPackageLog:function(newPackageName,idCard,date,county,success){
+                $http({
+                    method: 'GET',
+                    url: "../CreatePackageApi/selectPackageData"+urlTimeStamp(),
+                    params:{
+                        newPackageName:newPackageName,
+                        idCard:idCard,
+                        createDate:date,
+                        readCounty:county
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
             }
         }
     });
\ No newline at end of file

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

@@ -37,7 +37,7 @@
                <tr>
                    <td>原始包名:</td>
                    <td>
-                       <input type="text" class="form-control" placeholder="原始包数据"/>
+                       <input type="text" class="form-control" placeholder="原包名" ng-model="oldPackageName"/>
                    </td>
                     <td>
                         解析时间
@@ -51,15 +51,17 @@
                          </div>
                     </td>
                     <td>
-                         <button class="btn btn-primary">查询</button>
+                         <button class="btn btn-primary" ng-click="getAnalyseLog()">查询</button>
                     </td>
               </tr>
            </table>
-            <table class="table table-bordered table-hover postTable">
+            <table class="table table-bordered table-hover postTable" ng-if="analyseLog">
                     <thead>
                     <tr>
                         <th>NO.</th>
                         <th>原包名</th>
+                        <th>订单起始日期</th>
+                        <th>订单截止日期</th>
                         <th>格口文件名</th>
                         <th>解析时间</th>
                         <th>记录数</th>
@@ -68,44 +70,21 @@
                     </tr>
                     </thead>
                     <tbody>
-                    <tr>
-                        <td>1</td>
-                        <td>123420190302001</td>
-                        <td>格口信息.xls</td>
-                        <td>20190302</td>
-                        <td>80</td>
-                        <td>60</td>
-                        <td>20</td>
-                    </tr>
-                    <tr>
-                        <td>2</td>
-                        <td>123420190302002</td>
-                        <td>格口信息.xls</td>
-                        <td>20190301</td>
-                        <td>70</td>
-                        <td>30</td>
-                        <td>40</td>
-                    </tr>
-                    <tr ng-repeat="item in postMsgDetail">
-                        <td>
-                            <input ng-if="$index==0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)" checked="checked">
-                            <input ng-if="$index!=0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)">
-                        </td>
-                        <td>{{item.id}}</td>
-                        <td>{{item.ddh}}</td>
-                        <td>{{item.yjh}}</td>
-                        <td>{{item.fxyjh}}</td>
-                        <td>{{item.sbsll}}</td>
-                        <td>{{item.sjrxm}}</td>
-                        <td>{{item.sjrlxfs}}</td>
-                        <td>{{item.sjrdz}}</td>
-                        <td>{{item.sqrxm}}</td>
-                        <td>{{item.printTime | date:'yyyy-MM-dd hh:mm:ss'}}</td>
+                    <tr ng-repeat="item in analyseLog">
+                        <td>{{$index+1}}</td>
+                        <td>{{item.oldPackageName}}</td>
+                        <td>{{item.formStateTime}}</td>
+                        <td>{{item.formDeadline}}</td>
+                        <td>{{item.fileName}}</td>
+                        <td>{{item.parsingDate}}</td>
+                        <td>{{item.count}}</td>
+                        <td>{{item.commonCardCount}}</td>
+                        <td>{{item.postCardCount}}</td>
                     </tr>
 
                     </tbody>
                 </table>
-                <div style="padding-left: 27%;">
+                <div style="padding-left: 27%;" ng-if="analyseLog">
                     <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
                 </div>
         </div>

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

@@ -30,6 +30,12 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
         };
         $scope.paginationConf.totalItems = 50;
 
+        $scope.getAnalyseLog = function(){
+            HttpService.selectAnalyseLog($scope.oldPackageName,$("#datepicker").val(),function(data){
+                $scope.analyseLog = data;
+                console.log($scope.analyseLog)
+            })
+        }
 
     });
 

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

@@ -39,17 +39,18 @@
            <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
                     <td>上传受理号:</td>
-                    <td><input type="text" class="form-control" ng-model="applicantName" placeholder="上传受理号"></td>
+                    <td><input type="text" class="form-control" ng-model="uploadNo" placeholder="上传受理号"></td>
                     <td>身份证号:</td>
-                    <td><input type="text" class="form-control" ng-model="orderNo" placeholder="身份证号"></td>
+                    <td><input type="text" class="form-control" ng-model="idCard" placeholder="身份证号"></td>
                     <td>原包号:</td>
-                    <td><input type="text" class="form-control"  ng-model="number" placeholder="原包号"></td>
+                    <td><input type="text" class="form-control"  ng-model="oldPackageNo" placeholder="原包号"></td>
                </tr>
                <tr>
                    <td>新包号:</td>
-                   <td><input type="text" class="form-control"  ng-model="number" placeholder="新包号"></td>
+                   <td><input type="text" class="form-control"  ng-model="newPackageNo" placeholder="新包号"></td>
                    <td>受理机关:</td>
-                   <td><input type="text" class="form-control" ng-model="gkxx" placeholder="受理机关"></td><td>制证类型:</td>
+                   <td><input type="text" class="form-control" ng-model="sljg" placeholder="受理机关"></td>
+                   <td>制证类型:</td>
                    <td style="text-align: left;">
                       <select class="form-control select2" id="county" multiple="multiple" data-placeholder="--请选择制证类型--"
                               style="width: 100%;" ng-model="typeCode">
@@ -73,7 +74,7 @@
                                <div class="input-group-addon">
                                  <i class="fa fa-calendar"></i>
                                </div>
-                               <input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker1"  readonly/>
+                               <input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker"  readonly/>
                          </div>
                     </td>
                    <td></td>
@@ -90,7 +91,7 @@
     <div class="box box-default">
             <strong class="box-header">制证信息详情</strong>
             <div class="box-info" style="padding: 10px;">
-                <table class="table table-bordered table-hover">
+                <table class="table table-bordered table-hover" ng-if="packageData">
                         <thead>
                         <tr>
                             <th>NO.</th>
@@ -104,7 +105,7 @@
                         </tr>
                         </thead>
                         <tbody>
-                        <tr>
+                        <tr ng-repeat="item in packageData">
                             <td>1</td>
                             <td>411032546565445</td>
                             <td>张三</td>
@@ -117,34 +118,10 @@
                                 <input type="radio" name="isPackage" value="2">否
                             </td>
                         </tr>
-                        <tr>
-                            <td>2</td>
-                            <td>411032546565445</td>
-                            <td>里斯</td>
-                            <td>130133195608240013</td>
-                            <td>1321454113</td>
-                            <td>1213134556</td>
-                            <td>邮寄证</td>
-                            <td>
-                                <input type="radio" name="isPackage1" value="1" checked>是
-                                <input type="radio" name="isPackage1" value="2">否
-                            </td>
-                        </tr>
-                        <tr ng-repeat="item in postData | orderBy:item.id" ng-click="showDetail(item)" style="cursor: pointer;">
-                            <td>{{item.id}}</td>
-                            <td>{{item.ddh}}</td>
-                            <td>{{item.yjh}}</td>
-                            <td>{{item.fxyjh}}</td>
-                            <td>{{item.sbsll}}</td>
-                            <td>{{item.sqrxm}}</td>
-                            <td>{{item.sjrlxfs}}</td>
-                            <td>{{item.sjrdz}}</td>
-                            <td>{{item.printTime | date:"yyyy-MM-dd hh:mm:ss"}}</td>
-                        </tr>
                         </tbody>
                     </table>
-                    <p style="color:#9f191f;"><span style="margin-right: 15px;">普通证：3000</span><span style="margin-right: 15px;">邮寄证：2000</span><span>禁用数：2</span></p>
-                    <div style="padding-left: 27%;">
+                    <p style="color:#9f191f;" ng-if="packageData"><span style="margin-right: 15px;">普通证：3000</span><span style="margin-right: 15px;">邮寄证：2000</span><span>禁用数：2</span></p>
+                    <div style="padding-left: 27%;" ng-if="packageData">
                         <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
                     </div>
                 <h3 ng-if="postData.length==0">暂无记录。</h3>

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

@@ -19,14 +19,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
         });
 
         //Date picker
-        $('#datepicker1').datetimepicker({
-            minView: "month", //选择日期后，不会再跳转去选择时分秒
-            language: 'zh-CN',
-            format: 'yyyy-mm-dd',
-            todayBtn: 1,
-            autoclose: 1
-        });
-        $('#datepicker2').datetimepicker({
+        $('#datepicker').datetimepicker({
             minView: "month", //选择日期后，不会再跳转去选择时分秒
             language: 'zh-CN',
             format: 'yyyy-mm-dd',
@@ -44,4 +37,12 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
         };
         $scope.paginationConf.totalItems = 50;
 
+        $scope.doPackageQuery=function(){
+            HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
+                $scope.typeCode,$scope.packageType,$("#datepicker").val(),function(data) {
+                    $scope.packageData = data;
+                    console.log(data)
+                })
+        }
+
     });
\ No newline at end of file

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

@@ -40,11 +40,11 @@
                <tr>
                    <td>新包号:</td>
                    <td>
-                       <input type="text" class="form-control"  ng-model="number" placeholder="起始包号">
+                       <input type="text" class="form-control"  ng-model="startPackageNo" placeholder="起始包号">
                    </td>
                    <td>-</td>
                    <td>
-                       <input type="text" class="form-control"  ng-model="number" placeholder="截至包号">
+                       <input type="text" class="form-control"  ng-model="endPackageNo" placeholder="截至包号">
 
                    </td>
                    <td>派出所名称：</td>
@@ -68,7 +68,7 @@
                               <div class="input-group-addon">
                                 <i class="fa fa-calendar"></i>
                               </div>
-                              <input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker1"  readonly/>
+                              <input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker2"  readonly/>
                         </div>
                    </td>
                    <td colspan="2">
@@ -85,7 +85,7 @@
     <div class="box box-default">
             <strong class="box-header">查询结果</strong>
             <div class="box-info" style="padding: 10px;">
-                <table class="table table-bordered table-hover">
+                <table class="table table-bordered table-hover" ng-if="xmlDatas">
                         <thead>
                         <tr>
                             <th>NO.</th>
@@ -134,7 +134,7 @@
                         </tr>
                         </tbody>
                     </table>
-                    <div style="padding-left: 27%;">
+                    <div style="padding-left: 27%;" ng-if="xmlDatas">
                         <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
                     </div>
                 <h3 ng-if="postData.length==0">暂无记录。</h3>

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

@@ -53,4 +53,13 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
         };
         $scope.paginationConf.totalItems = 50;
 
+        $scope.doXmlQuery = function() {
+            console.log($scope.uploadNo,$scope.idCard,$scope.name,$scope.packageNo,$("#datepicker1").val(),$scope.typeCode,$scope.packageType,$("#datepicker2").val(),$("#datepicker3").val())
+            HttpService.selectXmlData($scope.applicantName,$scope.orderNo,$scope.name,$scope.packageNo,$("#datepicker1").val(),
+                $scope.typeCode,$scope.packageType,$("#datepicker2").val(),$("#datepicker3").val(),function(data) {
+                $scope.xmlDatas = data;
+                console.log($scope.xmlDatas)
+            })
+        }
+
     });
\ No newline at end of file

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

@@ -101,11 +101,11 @@
                         </select>
                     </td>
                     <td>
-                         <button class="btn btn-primary">查询</button>
+                         <button class="btn btn-primary" ng-click="getPostPackage()">查询</button>
                     </td>
               </tr>
            </table>
-            <table class="table table-bordered table-hover postTable">
+            <table class="table table-bordered table-hover postTable" ng-if="postPackageData">
                     <thead>
                     <tr>
                         <th>NO.</th>
@@ -118,48 +118,20 @@
                     </tr>
                     </thead>
                     <tbody>
-                    <tr>
-                        <td>1</td>
-                        <td>20190221</td>
-                        <td>20190228</td>
-                        <td>格口导出.excel</td>
-                        <td>20190227</td>
-                        <td>未解析</td>
-                        <td>
-                            <button class="btn btn-danger">删除</button>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>2</td>
-                        <td>20190221</td>
-                        <td>20190228</td>
-                        <td>格口导出.excel</td>
-                        <td>20190227</td>
-                        <td>已解析</td>
+                    <tr ng-repeat="item in postPackageData">
+                        <td>{{$index+1}}</td>
+                        <td>{{item.beginDate}}</td>
+                        <td>{{item.deadline}}</td>
+                        <td>{{item.fileName}}</td>
+                        <td>{{item.uploadDate}}</td>
+                        <td>{{item.state}}</td>
                         <td>
                             <button class="btn btn-danger">删除</button>
                         </td>
                     </tr>
-                    <tr ng-repeat="item in postMsgDetail">
-                        <td>
-                            <input ng-if="$index==0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)" checked="checked">
-                            <input ng-if="$index!=0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)">
-                        </td>
-                        <td>{{item.id}}</td>
-                        <td>{{item.ddh}}</td>
-                        <td>{{item.yjh}}</td>
-                        <td>{{item.fxyjh}}</td>
-                        <td>{{item.sbsll}}</td>
-                        <td>{{item.sjrxm}}</td>
-                        <td>{{item.sjrlxfs}}</td>
-                        <td>{{item.sjrdz}}</td>
-                        <td>{{item.sqrxm}}</td>
-                        <td>{{item.printTime | date:'yyyy-MM-dd hh:mm:ss'}}</td>
-                    </tr>
-
                     </tbody>
                 </table>
-                <div style="padding-left: 27%;">
+                <div style="padding-left: 27%;" ng-if="postPackageData">
                     <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
                 </div>
                 <h3 ng-if="postMsgDetail.length==0">暂无记录。</h3>

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

@@ -48,6 +48,8 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
         $scope.uploadExcel = function () {
             var fd = new FormData();
             var files = document.querySelector('input#id_file_photo_for_check').files;
+            fd.append("formStartTime",$("#datepicker1").val());
+            fd.append("formDeadline",$("#datepicker2").val());
             for(var i in files){
                 fd.append('file', files[i]);
             }
@@ -56,11 +58,19 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
                 MessageService.showAlert("请选择上传的文件...")
             }else{
                 fd.append('file', files);
-                HttpService.uploadExcelFile(fd,function (data) {
+                HttpService.uploadExcelFile($("#datepicker1").val(),$("#datepicker2").val(),fd,function (data) {
                     console.log("导入项目的返回结果：",data)
                 })
             }
         }
 
+        $scope.getPostPackage = function(){
+            console.log($scope.fileName,$scope.state)
+            HttpService.selectPostPackage($scope.fileName,$scope.state,function(data){
+                $scope.postPackageData = data;
+                console.log($scope.postPackageData)
+            })
+        }
+
 
     });
\ No newline at end of file

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

@@ -37,12 +37,12 @@
                <tr>
                    <td>新包名:</td>
                    <td>
-                       <input type="text" class="form-control" placeholder="原始包数据"/>
+                       <input type="text" class="form-control" placeholder="新包名" ng-model="newPackageName"/>
                    </td>
                    <td>身份证:
                    </td>
                     <td>
-                      <input type="text" class="form-control" placeholder="身份证号"/>
+                      <input type="text" class="form-control" placeholder="身份证号" ng-model="idCard"/>
                     </td>
                    <td></td>
               </tr>
@@ -61,12 +61,14 @@
                     </td>
                     <td>上传地区:</td>
                     <td>
-                        <input type="text" class="form-control" placeholder="上传地区名称"/>
+                        <input type="text" class="form-control" placeholder="上传地区名称" ng-model="county"/>
                     </td>
-                    <td><button class="btn btn-primary">查询</button></td>
+                    <td><button class="btn btn-primary" ng-click="getPackageLog()">查询</button></td>
+                </tr>
+
               </tr>
            </table>
-            <table class="table table-bordered table-hover postTable">
+            <table class="table table-bordered table-hover postTable" ng-if="packageLogData">
                     <thead>
                     <tr>
                         <th>NO.</th>
@@ -78,43 +80,17 @@
                     </tr>
                     </thead>
                     <tbody>
-                    <tr>
-                        <td>1</td>
-                        <td>123420190302001</td>
-                        <td>20190302</td>
-                        <td>80</td>
-                        <td>110012</td>
-                        <td>朝阳区</td>
-                    </tr>
-                    <tr>
-                        <td>2</td>
-                        <td>123420190302002</td>
-                        <td>20190301</td>
-                        <td>79</td>
-                        <td>110013</td>
-                        <td>海淀区</td>
-
+                    <tr ng-repeat="item in packageLogData">
+                        <td>{{$index+1}}</td>
+                        <td>{{item.newPackageName}}</td>
+                        <td>{{item.createDate}}</td>
+                        <td>{{item.cardCount}}</td>
+                        <td>{{item.readCountyCode}}</td>
+                        <td>{{item.readCountyName}}</td>
                     </tr>
-                    <tr ng-repeat="item in postMsgDetail">
-                        <td>
-                            <input ng-if="$index==0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)" checked="checked">
-                            <input ng-if="$index!=0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)">
-                        </td>
-                        <td>{{item.id}}</td>
-                        <td>{{item.ddh}}</td>
-                        <td>{{item.yjh}}</td>
-                        <td>{{item.fxyjh}}</td>
-                        <td>{{item.sbsll}}</td>
-                        <td>{{item.sjrxm}}</td>
-                        <td>{{item.sjrlxfs}}</td>
-                        <td>{{item.sjrdz}}</td>
-                        <td>{{item.sqrxm}}</td>
-                        <td>{{item.printTime | date:'yyyy-MM-dd hh:mm:ss'}}</td>
-                    </tr>
-
                     </tbody>
                 </table>
-                <div style="padding-left: 27%;">
+                <div style="padding-left: 27%;" ng-if="packageLogData">
                     <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
                 </div>
         </div>

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

@@ -30,6 +30,13 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
         };
         $scope.paginationConf.totalItems = 50;
 
+        $scope.getPackageLog = function(){
+            HttpService.selectPackageLog($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,function(data){
+                $scope.packageLogData = data;
+                console.log($scope.packageLogData)
+            })
+        }
+
 
     });
 

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

 <section class="content-header" style="padding-top: 1px;">
     <h4>
-        <div style="text-align: left;cursor:pointer;"><a ng-click="goBack()"><i class="fa fa-backward"></i> 完成返回</a></div>
+        <div style="text-align: left;cursor:pointer;"><a ng-click="goBack()"><i class="fa fa-backward"></i> 返回</a></div>
     </h4>
 </section>
 <div style="padding: 15px;">
@@ -9,46 +9,83 @@
             查询结果
         </strong>
         <div class="box-info" style="padding: 10px;">
+
             <div class="panel panel-info">
                     <div class="panel-heading">
                         <h3 class="panel-title">
-                        证件信息
+                            任务单
+                        </h3>
+                    </div>
+                    <div class="panel-body">
+                        <table  class="table table-hover table-bordered">
+                            <thead>
+                            <th>任务单流水号</th>
+                            <th>区县</th>
+                            <th>制证类型</th>
+                            <th>日期</th>
+                            <th>数据核验</th>
+                            <th>膜打印</th>
+                            <th>预定位</th>
+                            <th>分拣</th>
+                            <th>质检</th>
+                            <th>仓库</th>
+                            </thead>
+                            <tbody>
+                            <tr>
+                                <td>20190228001</td>
+                                <td>海淀区</td>
+                                <td>普通证</td>
+                                <td>20190221</td>
+                                <td></td>
+                                <td></td>
+                                <td></td>
+                                <td></td>
+                                <td></td>
+                                <td></td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+
+            <div class="panel panel-info">
+                <div class="panel-heading">
+                    <h3 class="panel-title">
+                        受理库
                     </h3>
                 </div>
                 <div class="panel-body" style="padding-bottom: 0;">
-                    <table class="table table-hover">
+                    <table class="table table-hover table-bordered">
                         <thead>
                         <tr>
-                        <th>地区</th>
                         <th>受理号</th>
+                        <th>区县</th>
                         <th>姓名</th>
                         <th>制证类型</th>
                         <th>身份证号</th>
                         <th>性别</th>
-                        <th>出生日期</th>
                         <th>签发机关</th>
                         <th>起始有效期</th>
                         <th>终止有效期</th>
-                        <th>证件状态</th>
                         <th>上报受理单位</th>
-                        <th>证件状态</th>
+                        <th>数据状态</th>
+                        <th>时间</th>
                         </tr>
                         </thead>
                         <tbody>
                         <tr>
-                            <td>海淀区</td>
                             <td>02213546871</td>
+                            <td>海淀区</td>
                             <td>伯阳</td>
                             <td>普通证</td>
                             <td>130133199405250011</td>
                             <td>男</td>
-                            <td>19940525</td>
                             <td>赵县公安局</td>
                             <td>20090228</td>
                             <td>20190228</td>
-                            <td>已出库</td>
                             <td>赵县派出所</td>
                             <td>快证</td>
+                            <td>2019-03-03 13:58:30</td>
                         </tr>
                         </tbody>
                     </table>
@@ -62,47 +99,48 @@
             <div class="panel panel-info">
                 <div class="panel-heading">
                     <h3 class="panel-title">
-                        循环单信息
+                        制证库
                     </h3>
                 </div>
                 <div class="panel-body">
-                    <table  class="table table-hover">
+                    <table class="table table-hover table-bordered">
                         <thead>
-                        <th>编号</th>
-                        <th>地区</th>
+                        <tr>
+                        <th>受理号</th>
+                        <th>区县</th>
+                        <th>姓名</th>
                         <th>制证类型</th>
-                        <th>日期</th>
-                        <th>工序</th>
-                        <th>操作时间</th>
-                        <th>机器号</th>
-                        <th>出库时间</th>
-                        <th>入库时间</th>
+                        <th>身份证号</th>
+                        <th>性别</th>
+                        <th>签发机关</th>
+                        <th>起始有效期</th>
+                        <th>终止有效期</th>
+                        <th>上报受理单位</th>
+                        <th>数据状态</th>
+                        <th>时间</th>
+                        </tr>
                         </thead>
                         <tbody>
                         <tr>
-                            <td>20190228001</td>
+                            <td>02213546871</td>
                             <td>海淀区</td>
+                            <td>伯阳</td>
                             <td>普通证</td>
-                            <td>20190221</td>
-                            <td>仓库</td>
+                            <td>130133199405250011</td>
+                            <td>男</td>
+                            <td>赵县公安局</td>
+                            <td>20090228</td>
                             <td>20190228</td>
-                            <td>1</td>
-                            <td>20190226</td>
-                            <td>20190227</td>
+                            <td>赵县派出所</td>
+                            <td>快证</td>
+                            <td>2019-03-03 13:58:30</td>
                         </tr>
                         </tbody>
                     </table>
                 </div>
-            </div>
-
-            <div class="panel panel-info">
-                <div class="panel-heading">
-                    <h3 class="panel-title">
-                        组号信息
-                    </h3>
-                </div>
-                <div class="panel-body">
-
+                <div style="text-align:right;padding: 10px;padding-top: 0;">
+                    <button class="btn btn-info">添加快证</button>
+                    <button class="btn btn-danger">退证</button>
                 </div>
             </div>
 

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

@@ -77,11 +77,11 @@
                         </select>
                     </td>
                     <td>
-                         <button class="btn btn-primary">查询</button>
+                         <button class="btn btn-primary" ng-click="getXmlPackage()">查询</button>
                     </td>
               </tr>
            </table>
-            <table class="table table-bordered table-hover postTable">
+            <table class="table table-bordered table-hover postTable" ng-if="xmlPackageData">
                     <thead>
                     <tr>
                         <th>NO.</th>
@@ -94,50 +94,21 @@
                     </tr>
                     </thead>
                     <tbody>
-                    <tr>
-                        <td>1</td>
-                        <td>20190301</td>
-                        <td>300</td>
-                        <td>24000</td>
-                        <td></td>
-                        <td></td>
+                    <tr ng-repeat="item in xmlPackageData">
+                        <td>{{$index}}</td>
+                        <td>{{item.uploadDate}}</td>
+                        <td>{{item.packageCount}}</td>
+                        <td>{{item.cardCount}}</td>
+                        <td>{{item.commonCardCount}}</td>
+                        <td>{{item.postCardCount}}</td>
                         <td>
                             <button class="btn btn-primary" ng-click="analysis()">解析</button>
                             <button class="btn btn-danger">删除</button>
                         </td>
                     </tr>
-                    <tr>
-                        <td>2</td>
-                        <td>20190228</td>
-                        <td>100</td>
-                        <td>8000</td>
-                        <td>8000</td>
-                        <td>0</td>
-                        <td>
-                            <button class="btn btn-primary" ng-click="analysis()">解析</button>
-                            <button class="btn btn-danger">删除</button>
-                        </td>
-                    </tr>
-                    <tr ng-repeat="item in postMsgDetail">
-                        <td>
-                            <input ng-if="$index==0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)" checked="checked">
-                            <input ng-if="$index!=0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)">
-                        </td>
-                        <td>{{item.id}}</td>
-                        <td>{{item.ddh}}</td>
-                        <td>{{item.yjh}}</td>
-                        <td>{{item.fxyjh}}</td>
-                        <td>{{item.sbsll}}</td>
-                        <td>{{item.sjrxm}}</td>
-                        <td>{{item.sjrlxfs}}</td>
-                        <td>{{item.sjrdz}}</td>
-                        <td>{{item.sqrxm}}</td>
-                        <td>{{item.printTime | date:'yyyy-MM-dd hh:mm:ss'}}</td>
-                    </tr>
-
                     </tbody>
                 </table>
-                <div style="padding-left: 27%;">
+                <div style="padding-left: 27%;" ng-if="xmlPackageData">
                     <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
                 </div>
                 <h3 ng-if="postMsgDetail.length==0">暂无记录。</h3>

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

@@ -65,5 +65,13 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
             }
         }
 
+        $scope.getXmlPackage = function(){
+            console.log($("#datepicker").val(),$scope.state)
+            HttpService.selectXmlPackage($("#datepicker").val(),$scope.state,function(data){
+                $scope.xmlPackageData = data;
+                console.log($scope.xmlPackageData)
+            })
+        }
+
     });