Skip to content

Y
YX_IDENT_REFACTORING
Commit 94123564 authored by suichenguang's avatar suichenguang
Browse files
Options

页面修改2

parent 902d5eb0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 210 additions and 44 deletions
src/main/java/com/yxproject/start/api/selectApi.java
View file @ 94123564
...@@ -21,7 +21,8 @@ public class selectApi { ...@@ -21,7 +21,8 @@ public class selectApi {
*/ */
@Autowired @Autowired
private SelectSerialNumberService selectSerialNumberService; private SelectSerialNumberService selectSerialNumberService;
@RequestMapping(value = "selectByCard", method = RequestMethod.GET)
@RequestMapping(value = "selectByCard")
public Map<String,Object> selectByCard(@RequestParam("id") String id, HttpServletResponse resp){ public Map<String,Object> selectByCard(@RequestParam("id") String id, HttpServletResponse resp){
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
...@@ -44,7 +45,6 @@ public class selectApi { ...@@ -44,7 +45,6 @@ public class selectApi {
break; break;
} }
JSONObject resultJson = JSONObject.fromObject(map); JSONObject resultJson = JSONObject.fromObject(map);
System.out.println("api111111111111"+resultJson);
return resultJson; return resultJson;
} }
} }
src/main/resources/mapper/SelectSerialNumberMapper.xml
View file @ 94123564
<?xml version="1.0" encoding="UTF-8" ?> <?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" > <!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"> <mapper namespace="com.yxproject.start.mapper.ProdCardTMapper">
<resultMap id="SelectSerialNumberMapper" type="com.yxproject.start.entity.SpecialCardInfoEntity"> <resultMap id="SelectSerialNumberMapper" type="java.util.HashMap">
</resultMap> </resultMap>
<!--根据组号查询--> <!--根据组号查询-->
<select id="selectByGroupNumber" parameterType="String" resultType="com.yxproject.start.entity.SpecialCardInfoEntity"> <select id="selectByGroupNumber" resultType="java.util.HashMap" parameterType="String">
select * from GROUP_NO select
INNER JOIN TASK ON (GROUP_NO.TASK_ID =TASK.TASK_ID) TASK.TASK_ID,
INNER JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID) GROUP_NO.GROUP_NO,
INNER JOIN CITY_DIC ON(TASK.CITYCODE = CITY_DIC.CITYCODE) 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} where GROUP_NO=#{id}
</select> </select>
<!--根据受理号查询--> <!--根据受理号查询-->
<select id="selectByAccepted" parameterType="String" resultType="com.yxproject.start.entity.SpecialCardInfoEntity"> <select id="selectByAccepted" parameterType="String" resultType="java.util.HashMap">
select * from acc_card_t@accu_dblink SELECT
where ACCEPT_NO=#{id} 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>
<!--根据身份证号查询--> <!--根据身份证号查询-->
<select id="selectByIdCard" parameterType="String" resultType="com.yxproject.start.entity.SpecialCardInfoEntity"> <select id="selectByIdCard" parameterType="String" resultType="java.util.HashMap">
select * from PROD_CARD_T@PROD_LINK 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} where ID_NO =#{id}
</select> </select>
<!--根据任务单查询--> <!--根据任务单查询-->
<select id="selectByWorkOrderNumber" parameterType="String" resultType="com.yxproject.start.entity.SpecialCardInfoEntity"> <select id="selectByWorkOrderNumber" parameterType="String" resultType="java.util.HashMap">
select * from PROD_CARD_T@PROD_LINK select
where ACCEPT_NO=#{id} or ID_NO =#{id} 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> </select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/static/index.html
View file @ 94123564
...@@ -17,7 +17,16 @@ ...@@ -17,7 +17,16 @@
<link rel="stylesheet" href="vendor/modules/ngDialog/css/myth/ngDialog-theme-default.css" type="text/css" /> <link rel="stylesheet" href="vendor/modules/ngDialog/css/myth/ngDialog-theme-default.css" type="text/css" />
</head> </head>
<body ng-controller="AppCtrl"> <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 --> <!-- jQuery -->
......
src/main/resources/static/js/app.js
View file @ 94123564
...@@ -16,6 +16,34 @@ angular.module('app', [ ...@@ -16,6 +16,34 @@ angular.module('app', [
'ui.validate', 'ui.validate',
'oc.lazyLoad', 'oc.lazyLoad',
'pascalprecht.translate' 'pascalprecht.translate'
]); ])
/* App Module */ /* 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
View file @ 94123564
...@@ -216,27 +216,29 @@ ...@@ -216,27 +216,29 @@
$scope.htmlTooltip = 'I\'ve been made <b>bold</b>!'; $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.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']; $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 // Any function returning a promise object can be used to load values asynchronously
$scope.getLocation = function(val) { $scope.getLocation = function(val) {
return $http.get('http://maps.googleapis.com/maps/api/geocode/json', { return $http.get('http://maps.googleapis.com/maps/api/geocode/json', {
params: { params: {
address: val, address: val,
sensor: false sensor: false
} }
}).then(function(res){ }).then(function(res){
var addresses = []; var addresses = [];
angular.forEach(res.data.results, function(item){ angular.forEach(res.data.results, function(item){
addresses.push(item.formatted_address); 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.today = function() {
$scope.dt = new Date(); $scope.dt = new Date();
}; };
...@@ -273,7 +275,7 @@ ...@@ -273,7 +275,7 @@
$scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate']; $scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
$scope.format = $scope.formats[0]; $scope.format = $scope.formats[0];
}]) }])
; ;
app.controller('TimepickerDemoCtrl', ['$scope', function($scope) { app.controller('TimepickerDemoCtrl', ['$scope', function($scope) {
$scope.mytime = new Date(); $scope.mytime = new Date();
......
src/main/resources/static/js/services/service.js
View file @ 94123564
...@@ -625,6 +625,24 @@ app.service('MessageService', function (ngDialog) { ...@@ -625,6 +625,24 @@ app.service('MessageService', function (ngDialog) {
MessageService.httpRequestFailed(JSON.stringify(errA)) 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
View file @ 94123564
...@@ -28,23 +28,40 @@ ...@@ -28,23 +28,40 @@
<!-- / buttons --> <!-- / buttons -->
<!-- search form --> <!-- 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" <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="form-group">
<div class="input-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" typeahead="state for state in states | filter:$viewValue | limitTo:8"
class="form-control input-sm bg-light no-border rounded padder" class="form-control input-sm bg-light no-border rounded padder"
placeholder="Search projects..."> placeholder="Search projects...">
<span class="input-group-btn"> <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> <i class="fa fa-search"></i>
</button> </button>
</span> </span>
</div> </div>
</div> </div>
</form> </form>
<!-- / search form -->
<!-- nabar right --> <!-- nabar right -->
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
......
src/main/resources/static/tpl/layout/layout.js
View file @ 94123564
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) { if ($rootScope.loginData.login == false) {
$state.go("signin") $state.go("signin")
} else { } else {
...@@ -21,4 +21,24 @@ app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filte ...@@ -21,4 +21,24 @@ app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filte
$scope.menuList = $rootScope.loginData.roleList[0].permissions; $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 0 → 100644
View file @ 94123564
package com.yxproject.start.service.impl;
public class selectTest {
public static void main(String args[]){
}
}
制证项目E-R图.pdb 0 → 100644
View file @ 94123564
This diff is collapsed.
制证项目E-R图.pdm
View file @ 94123564
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment