页面修改2

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

@@ -21,7 +21,8 @@ public class selectApi {
      */
     @Autowired
     private SelectSerialNumberService selectSerialNumberService;
-    @RequestMapping(value = "selectByCard", method = RequestMethod.GET)
+
+    @RequestMapping(value = "selectByCard")
     public Map<String,Object> selectByCard(@RequestParam("id") String id, HttpServletResponse resp){
         resp.setCharacterEncoding("UTF-8");
         Map<String, Object> map = new HashMap<>();
@@ -44,7 +45,6 @@ public class selectApi {
                  break;
           }
           JSONObject resultJson = JSONObject.fromObject(map);
-          System.out.println("api111111111111"+resultJson);
           return resultJson;
     }
 }

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">
-
-
+    <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
-        where ACCEPT_NO=#{id}
+    <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
+    <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

@@ -625,6 +625,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,23 +28,40 @@
         <!-- / 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>
                 </div>
             </div>
         </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 {
@@ -21,4 +21,24 @@ app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filte
         $scope.menuList = $rootScope.loginData.roleList[0].permissions;
     }
 
+    $scope.doSearch = function(){
+        $rootScope.searchInput=$("#searchInput").val();
+        HttpService.querySpecialCardInfo($rootScope.searchInput,function(data) {
+            console.log(data,"----layout.searchSpecialCard--")
+            if(data != null){
+                $rootScope.specialCardInfo = data.respData;
+                console.log("搜索结果")
+                console.log("$rootScope.specialCardInfo",$rootScope.specialCardInfo)
+            }
+
+        })
+        $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[]){
+
+    }
+}