Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit e8ef54f4 authored by suichenguang's avatar suichenguang
Browse files
Options

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

parents 05afe5ef c8ab0cf1
Hide whitespace changes
Inline Side-by-side
Showing with 200 additions and 133 deletions
pom.xml
View file @ e8ef54f4
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.2.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.yxproject</groupId>
<artifactId>start</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>start</name>
<description>Demo project for Spring Boot</description>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.2.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.yxproject</groupId>
<artifactId>start</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>start</name>
<description>Demo project for Spring Boot</description>
<properties>
<java.version>1.8</java.version>
</properties>
<properties>
<java.version>1.8</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-core</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-core</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-web-starter</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-web-starter</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.0.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
<version>3.14</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.0.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
<version>3.14</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
<version>2.6.10</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
<version>2.6.10</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.3</version>
</dependency>
</dependencies>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ e8ef54f4
......@@ -136,7 +136,7 @@ public class ReadExcelApi {
personPostEntity.setLatticeMouthInformation((String) list2.get(19));
personPostEntity.setNatureOfTheInternal((String) list2.get(20));
personPostEntity.setNatureOfTheInformation((String) list2.get(21));
personPostEntity.setFirstWhite(list2.get(22).toString().substring(5,24) );
personPostEntity.setFirstWhite(list2.get(22).toString().substring(5,27) );
personPostEntity.setFileId(fileNameDicEntity.getFileId());
entityList.add(personPostEntity);
}
......
src/main/java/com/yxproject/start/mapper/LogMapper.java
View file @ e8ef54f4
......@@ -24,7 +24,7 @@ public interface LogMapper {
//TODO XML的时间+post的file_id
@Update("UPDATE PREPRO_PERSON SET CARD_TYPE_ID =9 \n" +
"WHERE JMSFZSLH = (\n" +
"WHERE JMSFZSLH in (\n" +
"SELECT PREPRO_PERSON.JMSFZSLH \n" +
"FROM PREPRO_PERSON \n" +
"LEFT JOIN PERSON_POST ON PERSON_POST.FIRST_WHITE = PREPRO_PERSON.JMSFZSLH\n" +
......
src/main/resources/static/dialogs/confirmFailedCards.html
View file @ e8ef54f4
......@@ -17,6 +17,10 @@
<td ng-if="item.SEX_NO==1">男</td>
<td ng-if="item.SEX_NO==2">女</td>
<td ng-if="item.SEX_NO==-1">错误</td>
<td ng-if="item.SPECIAL_TYPE==2">快证</td>
<td ng-if="item.SPECIAL_TYPE==1">余证</td>
<td ng-if="item.SPECIAL_TYPE==0">废证</td>
<td ng-if="item.SPECIAL_TYPE==3">退证</td>
</tr>
</tbody>
</table>
......
src/main/resources/static/dialogs/confirmRestCards.html
View file @ e8ef54f4
......@@ -8,6 +8,7 @@
<th>身份证号</th>
<th>姓名</th>
<th>性别</th>
<th>类型</th>
</thead>
<tbody>
<tr ng-repeat="item in personInfo">
......@@ -17,6 +18,10 @@
<td ng-if="item.SEX_NO==1">男</td>
<td ng-if="item.SEX_NO==2">女</td>
<td ng-if="item.SEX_NO==-1">错误</td>
<td ng-if="item.SPECIAL_TYPE==2">快证</td>
<td ng-if="item.SPECIAL_TYPE==1">余证</td>
<td ng-if="item.SPECIAL_TYPE==0">废证</td>
<td ng-if="item.SPECIAL_TYPE==3">退证</td>
</tr>
</tbody>
</table>
......
src/main/resources/static/dialogs/confirmTagCards.html
View file @ e8ef54f4
......@@ -17,6 +17,10 @@
<td ng-if="item.SEX_NO==1">男</td>
<td ng-if="item.SEX_NO==2">女</td>
<td ng-if="item.SEX_NO==-1">错误</td>
<td ng-if="item.SPECIAL_TYPE==2">快证</td>
<td ng-if="item.SPECIAL_TYPE==1">余证</td>
<td ng-if="item.SPECIAL_TYPE==0">废证</td>
<td ng-if="item.SPECIAL_TYPE==3">退证</td>
</tr>
</tbody>
</table>
......
src/main/resources/static/js/app.js
View file @ e8ef54f4
......@@ -32,7 +32,7 @@ angular.module('AvatarCheck', [
$qProvider.errorOnUnhandledRejections(false)
}])
.controller('appCtrl', function ($scope, $location, $rootScope, HttpService, localStorageService, DebugService) {
.controller('appCtrl', function ($scope, $location, $rootScope, HttpService, localStorageService, DebugService,MessageService) {
DebugService.debug("appCtrl:" + "AvatarCheck initial.")
......@@ -172,6 +172,7 @@ angular.module('AvatarCheck', [
}else{
HttpService.searchCards(searchInput, function (data) {
if(data==''){
$scope.msg="";
$scope.alertMsg = "暂无数据";
}else{
$scope.searchResult = data;
......@@ -203,33 +204,79 @@ angular.module('AvatarCheck', [
}
$scope.addQuickCardAccu = function(){
var idx = $(".accu:checked").val();
var check = idx.split("+");
var json={};
json.acceptNo=check[0];
json.cardType=check[2];
json.countyCode=check[1];
json.name=$rootScope.loginData.name;
console.log(json)
HttpService.addSpecialCard(json,function (data) {
console.log($scope.searchInput)
$scope.doSearch($scope.searchInput)
})
if($(".accu:checked").length>0){
var idx = $(".accu:checked").val();
var check = idx.split("+");
var json={};
json.acceptNo=check[0];
json.cardType=check[2];
json.countyCode=check[1];
json.name=$rootScope.loginData.name;
console.log(json)
HttpService.addSpecialCard(json,function (data) {
MessageService.showAlert(data.msg)
$scope.doSearch($scope.searchInput)
})
}else{
MessageService.showAlert("请选择要添加的信息")
}
}
$scope.addQuickCardProd = function(){
var idx = $(".prod:checked").val();
var check = idx.split("+");
console.log(idx,check)
var json={};
json.acceptNo=check[0];
json.cardType=check[2];
json.countyCode=check[1];
json.name=$rootScope.loginData.name;
console.log(json)
HttpService.addSpecialCard(json,function (data) {
console.log($scope.searchInput)
$scope.doSearch($scope.searchInput)
})
if($(".prod:checked").length>0){
var idx = $(".prod:checked").val();
var check = idx.split("+");
console.log(idx,check)
var json={};
json.acceptNo=check[0];
json.cardType=check[2];
json.countyCode=check[1];
json.name=$rootScope.loginData.name;
console.log(json)
HttpService.addSpecialCard(json,function (data) {
MessageService.showAlert(data.msg)
$scope.doSearch($scope.searchInput)
})
}else{
MessageService.showAlert("请选择要添加快证的信息")
}
}
$scope.giveBackCardAccu = function () {
if($(".accu:checked").length>0){
var idx = $(".accu:checked").val();
var check = idx.split("+");
var json={};
json.acceptNo=check[0];
json.taskId=$scope.searchResult.workOrderDate[0].TASK_ID;
json.name=$rootScope.loginData.name;
console.log(json)
HttpService.giveBackCard(json,function (data) {
console.log(data)
MessageService.showAlert(data.msg)
$scope.doSearch($scope.searchInput)
})
}else{
MessageService.showAlert("请选择要退证的信息")
}
}
$scope.giveBackCardProd = function () {
if($(".prod:checked").length>0){
var idx = $(".prod:checked").val();
var check = idx.split("+");
var json={};
json.acceptNo=check[0];
json.taskId=$scope.searchResult.workOrderDate[0].TASK_ID;
json.name=$rootScope.loginData.name;
console.log(json)
HttpService.giveBackCard(json,function (data) {
console.log(data)
MessageService.showAlert(data.msg)
$scope.doSearch($scope.searchInput)
})
}else{
MessageService.showAlert("请选择要退证的信息")
}
}
......
src/main/resources/static/js/service.js
View file @ e8ef54f4
......@@ -827,6 +827,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) {
success(response.data)
})
},
giveBackCard:function(data,success) {
var body = JSON.stringify(data);
$http({
method: 'POST',
url: "../TaskList/addBackCard",
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
}
}
});
\ No newline at end of file
src/main/resources/static/views/addFailed/addFailed.js
View file @ e8ef54f4
......@@ -82,7 +82,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
$scope.personInfo = data;
$scope.can = false;
for(var i=0;i<$scope.personInfo.length;i++){
if($scope.personInfo[i].SEX_NO==-1){
if($scope.personInfo[i].SEX_NO==-1||$scope.personInfo[i].SPECIAL_TYPE==0||$scope.personInfo[i].SPECIAL_TYPE==1||$scope.personInfo[i].SPECIAL_TYPE==2||$scope.personInfo[i].SPECIAL_TYPE==3){
$scope.can = true;
}
}
......
src/main/resources/static/views/addRest/addRest.js
View file @ e8ef54f4
......@@ -58,7 +58,7 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
$scope.personInfo = data;
$scope.can = false;
for(var i=0;i<$scope.personInfo.length;i++){
if($scope.personInfo[i].SEX_NO==-1){
if($scope.personInfo[i].SEX_NO==-1||$scope.personInfo[i].SPECIAL_TYPE==0||$scope.personInfo[i].SPECIAL_TYPE==1||$scope.personInfo[i].SPECIAL_TYPE==2||$scope.personInfo[i].SPECIAL_TYPE==3){
$scope.can = true;
}
}
......
src/main/resources/static/views/addTag/addTag.js
View file @ e8ef54f4
......@@ -75,7 +75,7 @@ angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
$scope.personInfo = data;
$scope.can = false;
for(var i=0;i<$scope.personInfo.length;i++){
if($scope.personInfo[i].SEX_NO==-1){
if($scope.personInfo[i].SEX_NO==-1||$scope.personInfo[i].SPECIAL_TYPE==0||$scope.personInfo[i].SPECIAL_TYPE==1||$scope.personInfo[i].SPECIAL_TYPE==2||$scope.personInfo[i].SPECIAL_TYPE==3){
$scope.can = true;
}
}
......
src/main/resources/static/views/searchCard/searchCard.html
View file @ e8ef54f4
......@@ -76,7 +76,7 @@
</thead>
<tbody>
<tr ng-repeat="item in searchResult.ACCdata">
<td><input type="checkbox" value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}" class="accu"></td>
<td><input ng-checked="searchResult.ACCdata.length==1" type="checkbox" value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}" class="accu"></td>
<td>{{item.ACCEPT_NO}}</td>
<td>{{item.COUNTYNAME}}</td>
<td>{{item.NAME}}</td>
......@@ -96,7 +96,7 @@
</div>
<div style="text-align:right;padding: 10px;padding-top: 0;">
<button class="btn btn-info" ng-click="addQuickCardAccu()">添加快证</button>
<button class="btn btn-danger">退证</button>
<button class="btn btn-danger" ng-click="giveBackCardAccu()">退证</button>
</div>
</div>
<!--制证库-->
......@@ -127,7 +127,7 @@
</thead>
<tbody>
<tr ng-repeat="item in searchResult.PRODData">
<td><input type="checkbox" value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}" class="prod"></td>
<td><input ng-checked="searchResult.PRODData.length==1" type="checkbox" value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}" class="prod"></td>
<td>{{item.ACCEPT_NO}}</td>
<td>{{item.COUNTYNAME}}</td>
<td>{{item.NAME}}</td>
......@@ -147,14 +147,9 @@
</div>
<div style="text-align:right;padding: 10px;padding-top: 0;">
<button class="btn btn-info" ng-click="addQuickCardProd()">添加快证</button>
<button class="btn btn-danger">退证</button>
<button class="btn btn-danger" ng-click="giveBackCardAccu()">退证</button>
</div>
</div>
<h4>{{searchResult.workOrderDate}}</h4>
<h4>{{searchResult.workOrderDate.length}}</h4>
<h4>{{searchResult.ACCdata.length}}</h4>
<h4>{{searchResult.PRODData.length}}</h4>
<div ng-if="searchResult.workOrderDate.length==0&&searchResult.ACCdata.length==0&&searchResult.PRODData.length==0">
<h4>没有查询到相关信息</h4>
</div>
......
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