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

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

 package com.yxproject.start.api;
 
 import com.yxproject.start.entity.SpecialCardInfoEntity;
+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 net.sf.json.JSONObject;
@@ -21,30 +25,36 @@ public class selectApi {
      */
     @Autowired
     private SelectSerialNumberService selectSerialNumberService;
-    @RequestMapping(value = "selectByCard", method = RequestMethod.GET)
-    public Map<String,Object> selectByCard(@RequestParam("id") String id, HttpServletResponse resp){
+
+    @RequestMapping(value = "selectByCard")
+    public String  selectByCard(@RequestParam("id") String id, HttpServletResponse resp){
         resp.setCharacterEncoding("UTF-8");
         Map<String, Object> map = new HashMap<>();
           switch (id.length()){
               case 8:
-                  SpecialCardInfoEntity specialCardInfo= selectSerialNumberService.selectByGroupNumber(id);
+                  System.out.println("id"+id);
+                  SelectByGroupNumEntity specialCardInfo= selectSerialNumberService.selectByGroupNumber(id);
                   map.put("searchResult",specialCardInfo);
                   break;
               case 10:
-                  SpecialCardInfoEntity specialCardInfo2 = selectSerialNumberService.selectByIDCardOrAccepted(id);
+                  SelectByAcceptedEntity specialCardInfo2 = selectSerialNumberService.selectByAccepted(id);
                   map.put("searchResult",specialCardInfo2);
                   break;
               case 18:
-                  SpecialCardInfoEntity specialCardInfo3 = selectSerialNumberService.selectByIDCardOrAccepted(id);
+                  SelectByIdcardEntity specialCardInfo3 = selectSerialNumberService.selectByIdCard(id);
                   map.put("searchResult",specialCardInfo3);
                  break;
               case 11:
-                  SpecialCardInfoEntity specialCardInfo4 = selectSerialNumberService.selectByWorkOrderNumber(id);
+                  SelectByWorkOrderEntity specialCardInfo4 = selectSerialNumberService.selectByWorkOrderNumber(id);
                   map.put("searchResult",specialCardInfo4);
                  break;
           }
-          JSONObject resultJson = JSONObject.fromObject(map);
-          System.out.println("api111111111111"+resultJson);
-          return resultJson;
+        YXJSONResponse yxjsonResponse = new YXJSONResponse();
+        resp.setCharacterEncoding("UTF-8");
+        yxjsonResponse.outPutSuccess(map);
+
+        System.out.println("222222222"+ yxjsonResponse.toJSONString());
+        return yxjsonResponse.toJSONString();
+
     }
 }

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

@@ -8,7 +8,7 @@ import java.util.Objects;
  */
 @Entity
 @Table(name = "GROUP_NO", schema = "DAHAI")
-public class GroupNoEntity {
+public class GroupNoEntity{
     private long task_Id;
     private String group_No;
     private long valid_Count;
@@ -21,7 +21,7 @@ public class GroupNoEntity {
         return task_Id;
     }
 
-    public void setTask_Id(long task_Id) {
+    public void setTask_Id(Long task_Id) {
         this.task_Id = task_Id;
     }
     @Id

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

 package com.yxproject.start.entity;
 
-import javax.persistence.Entity;
 import javax.xml.crypto.Data;
 
 public class SpecialCardInfoEntity {
-
     private TaskEntity taskEntity;
     private GroupNoEntity groupNoEntity;
     private AccCardTEntity accCardTEntity;
@@ -75,7 +73,7 @@ public class SpecialCardInfoEntity {
         return cityName;
     }
 
-    public void setCityName(String cityName) {
+    public void     setCityName(String cityName) {
         this.cityName = cityName;
     }
 

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;
+import java.util.Date;
+
+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/SelectSerialNumberMapper.java

@@ -8,6 +8,7 @@ import java.util.Map;
 @Mapper
 public interface SelectSerialNumberMapper {
     public Map<String,Object> selectByGroupNumber(String id);
-    public Map<String,Object> selectByIDCardOrAccepted(String id);
+    public Map<String,Object> selectByAccepted(String id);
+    public Map<String,Object> selectByIdCard(String id);
     public Map<String,Object> selectByWorkOrderNumber(String id);
 }

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

 package com.yxproject.start.service;
 
-import com.yxproject.start.entity.SpecialCardInfoEntity;
+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 {
-    SpecialCardInfoEntity selectByGroupNumber(String id);
-
-    SpecialCardInfoEntity selectByIDCardOrAccepted(String id);
-
-    SpecialCardInfoEntity selectByWorkOrderNumber(String id);
+    SelectByGroupNumEntity selectByGroupNumber(String id);
+    SelectByAcceptedEntity selectByAccepted(String id);
+    SelectByIdcardEntity selectByIdCard(String id);
+    SelectByWorkOrderEntity selectByWorkOrderNumber(String id);
 }
 

src/main/resources/mapper/SelectSerialNumberMapper.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.yxproject.start.mapper.ProdCardTMapper">
-    <resultMap id="SelectSerialNumberMapper" type="com.yxproject.start.entity.SpecialCardInfoEntity">
-
-
+<mapper namespace="com.yxproject.start.mapper.SelectSerialNumberMapper">
+    <resultMap id="SelectSerialNumberMapper" type="java.util.HashMap">
 
     </resultMap>
     <!--根据组号查询-->
-    <select id="selectByGroupNumber" parameterType="String" resultType="com.yxproject.start.entity.SpecialCardInfoEntity">
-        select * from GROUP_NO
-        INNER JOIN TASK ON (GROUP_NO.TASK_ID =TASK.TASK_ID)
-        INNER JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)
-        INNER JOIN CITY_DIC ON(TASK.CITYCODE = CITY_DIC.CITYCODE)
+    <select id="selectByGroupNumber" resultType="java.util.HashMap" parameterType="String">
+        select
+        TASK.TASK_ID,
+        GROUP_NO.GROUP_NO,
+        CITY_DIC.CITYNAME,
+        CARD_TYPE_DIC.CARD_TYPE,
+        TASK.SUBMIT_DATE,
+        PRINTER_DIC.PRINTER_NAME,
+        TASK.POSITION_DATE,
+        TASK.QUALITY_PEOPLE_NAME,
+        TASK.OUT_STORAGE_DATE,
+        TASK.IN_STORAGE_DATE,
+        TASK.EXCEPTION_INFORMATION
+        from GROUP_NO
+        LEFT JOIN TASK ON (GROUP_NO.TASK_ID =TASK.TASK_ID)
+        LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)
+        LEFT JOIN CITY_DIC ON(TASK.CITYCODE = CITY_DIC.CITYCODE)
+        LEFT JOIN PRINTER_DIC ON (TASK.PRINTER_ID = PRINTER_DIC.PRINTER_ID)
+        LEFT JOIN CARD_TYPE_DIC ON  (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)
         where GROUP_NO=#{id}
     </select>
 
     <!--根据受理号查询-->
-    <select id="selectByAccepted" parameterType="String" resultType="com.yxproject.start.entity.SpecialCardInfoEntity">
-        select * from acc_card_t@accu_dblink
+    <select id="selectByAccepted" parameterType="String" resultType="java.util.HashMap">
+        SELECT
+        ACC_CARD_T.ACCEPT_NO,
+        ACC_CARD_T.NAME,
+        ACC_CARD_T.ID_NO,
+        ACC_CARD_T.SEX_NO,
+        ACC_CARD_T.BIRTHDAY,
+        CARD_TYPE_DIC.CARD_TYPE,
+        ACC_CARD_T.SIGN_GOVT,
+        ACC_CARD_T.BEGIN_DATE,
+        ACC_CARD_T.EXPIRE_DATE,
+        ACC_CARD_T.STATUS_NO,
+        TASK_STATE_DIC.TASK_STATE,
+        CITY_DIC.CITYNAME,
+        decode(TASK.TASK_STATE_ID,2,TASK.submit_date,3,TASK.ISSUED_DATE,4,TASK.OUT_WORKSHOP_DATE,5,TASK.POSITION_DATE) lastModifyTime
+        FROM acc_card_t@accu_dblink
+        LEFT JOIN group_no ON (substr(accept_no,0,8) = group_no.GROUP_NO)
+        LEFT JOIN task ON (task.task_id = group_no.TASK_ID)
+        LEFT JOIN CITY_DIC ON (TASK.CITYCODE = CITY_DIC.CITYCODE)
+        LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)
+        LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)
         where ACCEPT_NO=#{id}
     </select>
 
     <!--根据身份证号查询-->
-    <select id="selectByIdCard" parameterType="String" resultType="com.yxproject.start.entity.SpecialCardInfoEntity">
-        select * from PROD_CARD_T@PROD_LINK
-        where ID_NO =#{id}
+    <select id="selectByIdCard" parameterType="String" resultType="java.util.HashMap">
+        SELECT
+        ACC_CARD_T.ACCEPT_NO,
+        ACC_CARD_T.NAME,
+        ACC_CARD_T.ID_NO,
+        ACC_CARD_T.SEX_NO,
+        ACC_CARD_T.BIRTHDAY,
+        CARD_TYPE_DIC.CARD_TYPE,
+        ACC_CARD_T.SIGN_GOVT,
+        ACC_CARD_T.BEGIN_DATE,
+        ACC_CARD_T.EXPIRE_DATE,
+        ACC_CARD_T.STATUS_NO,
+        TASK_STATE_DIC.TASK_STATE,
+        CITY_DIC.CITYNAME,
+        decode(TASK.TASK_STATE_ID,2,TASK.submit_date,3,TASK.ISSUED_DATE,4,TASK.OUT_WORKSHOP_DATE,5,TASK.POSITION_DATE) lastModifyTime
+        FROM acc_card_t@accu_dblink
+        LEFT JOIN group_no ON (substr(accept_no,0,8) = group_no.GROUP_NO)
+        LEFT JOIN task ON (task.task_id = group_no.TASK_ID)
+        LEFT JOIN CITY_DIC ON (TASK.CITYCODE = CITY_DIC.CITYCODE)
+        LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)
+        LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)
+        where ID_NO=#{id}
     </select>
 
     <!--根据任务单查询-->
-    <select id="selectByWorkOrderNumber" parameterType="String" resultType="com.yxproject.start.entity.SpecialCardInfoEntity">
-        select * from PROD_CARD_T@PROD_LINK
-        where ACCEPT_NO=#{id} or ID_NO =#{id}
+    <select id="selectByWorkOrderNumber" parameterType="String" resultType="java.util.HashMap">
+        select
+        TASK.TASK_ID,
+        CITY_DIC.CITYNAME,
+        CARD_TYPE_DIC.CARD_TYPE,
+        TASK.SUBMIT_DATE,
+        PRINTER_DIC.PRINTER_NAME,
+        TASK.POSITION_DATE,
+        TASK.QUALITY_PEOPLE_NAME,
+        TASK.OUT_STORAGE_DATE,
+        TASK.IN_STORAGE_DATE,
+        TASK.EXCEPTION_INFORMATION
+        from TASK
+        LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)
+        LEFT JOIN CITY_DIC ON (TASK.CITYCODE = CITY_DIC.CITYCODE)
+        LEFT JOIN PRINTER_DIC ON (TASK.PRINTER_ID = PRINTER_DIC.PRINTER_ID)
+        LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)
+        where  TASK_ID =#{id}
     </select>
 
-
 </mapper>
\ No newline at end of file

src/main/resources/static/index.html

@@ -17,7 +17,16 @@
   <link rel="stylesheet" href="vendor/modules/ngDialog/css/myth/ngDialog-theme-default.css" type="text/css" />
 </head>
 <body ng-controller="AppCtrl">
-  <div class="app" id="app" ng-class="{'app-header-fixed':app.settings.headerFixed, 'app-aside-fixed':app.settings.asideFixed, 'app-aside-folded':app.settings.asideFolded, 'app-aside-dock':app.settings.asideDock, 'container':app.settings.container}" ui-view></div>
+  <div class="app" id="app" ng-class="{'app-header-fixed':app.settings.headerFixed, 'app-aside-fixed':app.settings.asideFixed, 'app-aside-folded':app.settings.asideFolded, 'app-aside-dock':app.settings.asideDock, 'container':app.settings.container}" ui-view>
+    <!--<span>hahhahahhahah</span>-->
+
+    <!--<div class="input-group">-->
+      <!--<input type="text" id="searchInput" style="height: 40px;line-height: 40px;font-size: 1.2em;color:#000;font-weight:bolder;"  class="form-control no-padding" ng-model="search.text" ng-keyup="enterEvent($event)" placeholder="单证或组号查询...">-->
+      <!--<span class="input-group-btn" >-->
+                            <!--<button name="search" style="height: 40px;" id="search-btn" class="btn btn-flat" ng-click="doSearch()" ><i class="glyphicon glyphicon-search" ></i></button>-->
+                        <!--</span>-->
+    <!--</div>-->
+  </div>
 
 
   <!-- jQuery -->

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

@@ -16,6 +16,34 @@ angular.module('app', [
     'ui.validate',
     'oc.lazyLoad',
     'pascalprecht.translate'
-]);
+])
 /* App Module */
-var fs = angular.module('fs', ['fs.services', 'fs.controllers', 'fs.directives', 'ui.bootstrap','blueimp.fileupload']);
+// var fs = angular.module('fs', ['fs.services', 'fs.controllers', 'fs.directives', 'ui.bootstrap','blueimp.fileupload']);
+
+.controller('appCtrl', function ($scope,$location,$rootScope, HttpService) {
+    $scope.logoutWithUI = function() {
+        localStorage.clear();
+        $rootScope.loginData = {userid:'用户未登录', login:false};
+    }
+
+});
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/main/resources/static/js/controllers/bootstrap.js

@@ -216,27 +216,29 @@
     $scope.htmlTooltip = 'I\'ve been made <b>bold</b>!';
   }])
   ; 
-  app.controller('TypeaheadDemoCtrl', ['$scope', '$http', function($scope, $http) {
+
+app.controller('TypeaheadDemoCtrl', ['$scope', '$http', function($scope, $http) {
     $scope.selected = undefined;
     $scope.states = ['Alabama', 'Alaska', 'Arizona', 'Arkansas', 'California', 'Colorado', 'Connecticut', 'Delaware', 'Florida', 'Georgia', 'Hawaii', 'Idaho', 'Illinois', 'Indiana', 'Iowa', 'Kansas', 'Kentucky', 'Louisiana', 'Maine', 'Maryland', 'Massachusetts', 'Michigan', 'Minnesota', 'Mississippi', 'Missouri', 'Montana', 'Nebraska', 'Nevada', 'New Hampshire', 'New Jersey', 'New Mexico', 'New York', 'North Dakota', 'North Carolina', 'Ohio', 'Oklahoma', 'Oregon', 'Pennsylvania', 'Rhode Island', 'South Carolina', 'South Dakota', 'Tennessee', 'Texas', 'Utah', 'Vermont', 'Virginia', 'Washington', 'West Virginia', 'Wisconsin', 'Wyoming'];
     // Any function returning a promise object can be used to load values asynchronously
     $scope.getLocation = function(val) {
-      return $http.get('http://maps.googleapis.com/maps/api/geocode/json', {
-        params: {
-          address: val,
-          sensor: false
-        }
-      }).then(function(res){
-        var addresses = [];
-        angular.forEach(res.data.results, function(item){
-          addresses.push(item.formatted_address);
+        return $http.get('http://maps.googleapis.com/maps/api/geocode/json', {
+            params: {
+                address: val,
+                sensor: false
+            }
+        }).then(function(res){
+            var addresses = [];
+            angular.forEach(res.data.results, function(item){
+                addresses.push(item.formatted_address);
+            });
+            return addresses;
         });
-        return addresses;
-      });
     };
-  }])
-  ; 
-  app.controller('DatepickerDemoCtrl', ['$scope', function($scope) {
+}])
+;
+
+app.controller('DatepickerDemoCtrl', ['$scope', function($scope) {
     $scope.today = function() {
       $scope.dt = new Date();
     };
@@ -273,7 +275,7 @@
     $scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
     $scope.format = $scope.formats[0];
   }])
-  ; 
+  ;
   app.controller('TimepickerDemoCtrl', ['$scope', function($scope) {
     $scope.mytime = new Date();
 

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

@@ -382,6 +382,7 @@ app.service('MessageService', function (ngDialog) {
                 })
             },
             getTypeListByTaskStateId:function(userState,success){
+			    console.log('----测试查询代码----',userState)
                 $http({
                     method: 'GET',
                     url: "../user/getTypeListByTaskStateId" + urlTimeStamp(),
@@ -711,6 +712,24 @@ app.service('MessageService', function (ngDialog) {
                     MessageService.httpRequestFailed(JSON.stringify(errA))
                 })
             },
+            querySpecialCardInfo:function(cardid,success) {
+                console.log(cardid,"----------cardid---------")
+                $http({
+                    method: 'GET',
+                    url: "../specialCardInfo/selectByCard" + urlTimeStamp(),
+                    params:{
+                        id:cardid
+                    }
+                }).then(function successCallback(response) {
 
+                    console.log(response.data,"-------------response.data------")
+                    success(response.data)
+                },function(err){
+                    // DebugService.debug("$http error:", err)
+                    // DebugService.debug("----------------------------------------------")
+                    var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
+                    MessageService.httpRequestFailed(JSON.stringify(errA))
+                })
+            }
 		}
 	}])
\ No newline at end of file

src/main/resources/static/tpl/layout/layout.html

@@ -28,16 +28,34 @@
         <!-- / buttons -->
 
         <!-- search form -->
+        <!--<form class="navbar-form navbar-form-sm navbar-left shift" ui-shift="prependTo" target=".navbar-collapse"-->
+              <!--role="search" ng-controller="layOutCtrl" >-->
+            <!--<div class="form-group">-->
+                <!--<div class="input-group">-->
+                    <!--<input type="text" ng-model="selected" id="searchInput"-->
+                           <!--typeahead="state for state in states | filter:$viewValue"-->
+                           <!--class="form-control input-sm bg-light no-border rounded padder"-->
+                           <!--placeholder="单证或组号查询...">-->
+                    <!--<span class="input-group-btn">-->
+                        <!--<button type="submit" name="serach" class="btn btn-sm bg-light rounded" ng-click="doSearch()">-->
+                            <!--<i class="fa fa-search"></i>-->
+                        <!--</button>-->
+                    <!--</span>-->
+                <!--</div>-->
+            <!--</div>-->
+        <!--</form>-->
+        <!-- / search form -->
+
         <form class="navbar-form navbar-form-sm navbar-left shift" ui-shift="prependTo" target=".navbar-collapse"
-              role="search" ng-controller="TypeaheadDemoCtrl">
+              role="search" ng-controller="layOutCtrl">
             <div class="form-group">
                 <div class="input-group">
-                    <input type="text" ng-model="selected"
+                    <input type="text" ng-model="selected" id="searchInput"
                            typeahead="state for state in states | filter:$viewValue | limitTo:8"
                            class="form-control input-sm bg-light no-border rounded padder"
                            placeholder="Search projects...">
                     <span class="input-group-btn">
-                        <button type="submit" class="btn btn-sm bg-light rounded">
+                        <button type="submit" class="btn btn-sm bg-light rounded" ng-click="doSearch()">
                             <i class="fa fa-search"></i>
                         </button>
                     </span>
@@ -48,7 +66,6 @@
                 未完成数量：<span>{{}}</span>
             </span>
         </form>
-        <!-- / search form -->
 
         <!-- nabar right -->
         <ul class="nav navbar-nav navbar-right">

src/main/resources/static/tpl/layout/layout.js

-app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService) {
+app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService,$location) {
     if ($rootScope.loginData.login == false) {
         $state.go("signin")
     } else {
@@ -33,4 +33,21 @@ app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filte
 
 
 
+    $scope.doSearch = function(){
+        $rootScope.searchInput=$("#searchInput").val();
+        HttpService.querySpecialCardInfo($rootScope.searchInput,function(data) {
+            if(data != null){
+                $rootScope.specialCardInfo = data.respData.searchResult;
+            }
+
+        })
+        $state.go("layout.searchSpecialCard")
+    }
+    $scope.enterEvent = function(e) {
+        var keycode = window.event?e.keyCode:e.which;
+        if(keycode==13){
+            $scope.doSearch();
+        }
+    }
+
 }])
\ No newline at end of file

src/test/java/com/yxproject/start/service/impl/selectTest.java

+package com.yxproject.start.service.impl;
+
+public class selectTest {
+    public static void main(String args[]){
+
+        Object c = 1111;
+        Long b=Long.valueOf(String.valueOf(c));
+        System.out.println(b);
+        System.out.println(c.getClass());
+
+    }
+}