Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 0c618587 authored by dahai's avatar dahai
Browse files
Options

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

parents 2d6f7fff 5a3dd990
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 25 deletions
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ 0c618587
......@@ -105,7 +105,7 @@ public interface PersonPostMapper {
@Delete("DELETE FROM PERSON_POST WHERE FILE_ID = #{fileId} and PRINT_DATE IS NULL")
public void deleteNoPrintPersonPostByFileId(@Param("fileId")String fileId);
@Select("SELECT FILE_ID FROM FILE_NAME_DIC WHERE substr(UPLOAD_DATE,0,8)=#{date}")
@Select("SELECT distinct FILE_NAME_DIC.FILE_ID FROM FILE_NAME_DIC right join person_post on person_post.file_id =FILE_NAME_DIC.FILE_ID WHERE substr(UPLOAD_DATE,0,8)=#{date}")
public int selectFileIdByImportDate(@Param("date")String date);
@Select("SELECT count(*) FROM FILE_NAME_DIC a LEFT JOIN PERSON_POST b on a.FILE_ID=b.FILE_ID WHERE substr(a.UPLOAD_DATE,0,8)=#{date} AND b.PRINT_DATE IS NULL")
......
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ 0c618587
......@@ -1135,7 +1135,7 @@ public interface TaskListMapper {
"left join ACC_GROUP_T@ACCU_LINK on substr(acc_card_t.accept_no,0,8) = ACC_GROUP_T.group_no\n" +
"left join CARD_TYPE_DIC on PREPRO_PERSON.card_type_id = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
"left join county_dic on substr(PREPRO_PERSON.JMSFZSLH,0,6)= county_dic.COUNTY_CODE\n" +
"where county_dic.COUNTY_CODE is not null and ACC_GROUP_T.deal_flag =3\n" +
"where county_dic.COUNTY_CODE is not null and ACC_GROUP_T.deal_flag =3 and ACC_GROUP_T.group_no not in (select group_no from group_no) \n" +
"and ACC_GROUP_T.group_no =#{groupNo}")
public List<Map<String,Object>> selectFastCardAtACCU(@Param("groupNo") String groupNo);
......
src/main/resources/mapper/config/mybatis-config.xml
View file @ 0c618587
......@@ -6,6 +6,6 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
<settings>
<setting name="mapUnderscoreToCamelCase" value="true"/>
<setting name="callSettersOnNulls" value="true"/>
<setting name="logImpl" value="STDOUT_LOGGING" />
<!--<setting name="logImpl" value="STDOUT_LOGGING" />-->
</settings>
</configuration>
\ No newline at end of file
src/main/resources/static/dialogs/alert.html
View file @ 0c618587
......@@ -3,4 +3,5 @@
</div>
<div class="ui-dialog-content">
<div>{{msgText}}</div>
<p ng-if="wrongMsg!=-1" style="color: red;">{{wrongMsg}}</p>
</div>
src/main/resources/static/dialogs/analysisDialog.html
View file @ 0c618587
......@@ -30,5 +30,6 @@
</table>
</div>
<div style="text-align: center;">
<p ng-if="wrongMsg!=-1" style="color: red;">{{wrongMsg}}</p>
<button class="btn btn-success" style="width: 70%" ng-click="closeThisDialog()">关闭</button>
</div>
\ No newline at end of file
src/main/resources/static/dialogs/confirm.html
View file @ 0c618587
......@@ -5,6 +5,7 @@
<div>确认删除{{importDate}}导入的{{total}}条记录吗？</div>
</div>
<div class="ui-dialog-confirm">
<p ng-if="wrongMsg!=-1" style="color: red;">{{wrongMsg}}</p>
<button type="submit" class="btn btn-info" ng-click="confirmDelete()">确认删除</button>
<button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
</div>
......
src/main/resources/static/dialogs/confirmDeleteProdCards.html
View file @ 0c618587
......@@ -5,6 +5,7 @@
<div>确认删除<span ng-if="startDate">{{startDate}}到{{endDate}}导入的</span>{{total}}条记录吗？</div>
</div>
<div class="ui-dialog-confirm">
<p ng-if="wrongMsg!=-1">{{wrongMsg}}</p>
<button type="submit" class="btn btn-info" ng-click="confirmDelete()">确认删除</button>
<button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
</div>
......
src/main/resources/static/index.html
View file @ 0c618587
<!DOCTYPE html>
<!--[if lt IE 7]>
<html lang="zh" ng-app="AvatarCheck" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<html lang="zh" ng-app="AvatarCheck" class="no-js lt-ie9 lt-ie8 lt-ie7" ng-controller="appCtrl" style="height:100%;width: 100%;"> <![endif]-->
<!--[if IE 7]>
<html lang="zh" ng-app="AvatarCheck" class="no-js lt-ie9 lt-ie8"> <![endif]-->
<html lang="zh" ng-app="AvatarCheck" class="no-js lt-ie9 lt-ie8" ng-controller="appCtrl" style="height:100%;width: 100%;"> <![endif]-->
<!--[if IE 8]>
<html lang="zh" ng-app="AvatarCheck" class="no-js lt-ie9"> <![endif]-->
<html lang="zh" ng-app="AvatarCheck" class="no-js lt-ie9" ng-controller="appCtrl" style="height:100%;width: 100%;"> <![endif]-->
<!--[if gt IE 8]><!-->
<html lang="zh" ng-app="AvatarCheck" class="no-js" ng-controller="appCtrl" style="height:100%;width: 100%;">
<head>
......@@ -155,7 +155,7 @@
<strong>北京制证辅助平台</strong>
</footer>
</div>
<div ng-if="loginData.login == false" class="wrapper" style=background-image:url(newTheme/dist/img/download.jpg);background-repeat:repeat;height:100%;">
<div ng-if="loginData.login == false" class="wrapper" style="background-image:url(newTheme/dist/img/download.jpg);background-repeat:repeat;height:100%;">
<div style="min-height: 500px;" ng-view></div>
</div>
......
src/main/resources/static/views/addFailed/addFailed.js
View file @ 0c618587
......@@ -92,7 +92,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
$scope.confirmAdd = function(){
HttpService.addFailedCard(list,function(data){
$scope.closeThisDialog();
MessageService.showAlert("添加成功");
// MessageService.showAlert("添加成功");
cancelAdd();
console.log(data)
})
......
src/main/resources/static/views/addRest/addRest.js
View file @ 0c618587
......@@ -67,7 +67,7 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
$scope.confirmAdd = function(){
HttpService.addRestCard(json,function(data){
$scope.closeThisDialog();
MessageService.showAlert("添加成功");
// MessageService.showAlert("添加成功");
cancel();
console.log(data)
})
......
src/main/resources/static/views/addTag/addTag.js
View file @ 0c618587
......@@ -85,7 +85,7 @@ angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
$scope.confirmAdd = function(){
HttpService.addTagCard(list,function(data){
$scope.closeThisDialog();
MessageService.showAlert("添加成功");
// MessageService.showAlert("添加成功");
cancelAdd();
cancel();
})
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.js
View file @ 0c618587
......@@ -165,6 +165,8 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
})
}
$scope.downloadXml = function(){
$rootScope.count = 0;
var date = $("#datepicker").val();
ngDialog.open({
template: 'dialogs/confirmToDownload.html' + urlTimeStamp(),
width: 800,
......@@ -172,12 +174,14 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
closeByDocument:false,
controller: ['$scope',function ($scope) {
getDownloadCount();
$scope.importDate = date;
$scope.confirmDownload = function () {
var url = '../exportXML/printXmlData?';
var a = document.createElement("a");
document.body.appendChild(a);
a.href = encodeURI(getCountAndDownloadUrl(url));
a.click();
$scope.closeThisDialog();
}
}]
})
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.js
View file @ 0c618587
......@@ -118,6 +118,7 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.wrongMsg=-1;
$scope.startDate = startDate;
$scope.endDate = endDate;
HttpService.selectXmlDataCount(startId,endId,pcs_name,startDate,endDate,function(data){
......@@ -127,11 +128,11 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
$scope.confirmDelete = function () {
HttpService.deleteProdCards(startId,endId,pcs_name,startDate,endDate, function (data) {
if(data){
MessageService.showAlert("删除成功");
// MessageService.showAlert("删除成功");
$scope.closeThisDialog();
reGet();
}else{
MessageService.showAlert("删除失败")
$scope.wrongMsg="删除失败"
}
})
};
......
src/main/resources/static/views/excelAndSearch/excelAndSearch.html
View file @ 0c618587
......@@ -137,7 +137,7 @@
<td ng-if="item.state==0">未解析</td>
<td ng-if="item.state==1">已解析</td>
<td>
<button class="btn btn-danger" ng-click="deletePostData(item.fileId,item.uploadDate)">删除</button>
<button class="btn btn-danger" ng-disabled="item.state==1" ng-click="deletePostData(item.fileId,item.uploadDate)">删除</button>
</td>
</tr>
</tbody>
......
src/main/resources/static/views/excelAndSearch/excelAndSearch.js
View file @ 0c618587
......@@ -66,12 +66,15 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.wrongMsg =-1;
$scope.msgText = "上传中，请稍等..."
HttpService.uploadExcelFile($("#datepicker1").val(),$("#datepicker2").val(),fd,function (data) {
if(data){
$scope.closeThisDialog();
getData();
MessageService.showAlert("上传成功")
// MessageService.showAlert("上传成功")
}else{
$scope.wrongMsg = '上传失败';
}
})
}]
......@@ -111,13 +114,19 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.wrongMsg =-1;
$scope.total = 1;
$scope.importDate = $filter('myDateFilter')(importDate, 'yyyy-MM-dd');;
$scope.confirmDelete = function () {
HttpService.deleteByFileId(fileid, function (data) {
MessageService.showAlert(data.msg);
$scope.closeThisDialog();
reGetPostData();
// MessageService.showAlert(data.msg);
if(data.msg){
$scope.closeThisDialog();
reGetPostData();
}else{
$scope.wrongMsg ="删除失败";
}
})
};
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ 0c618587
......@@ -271,7 +271,6 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}
if (flag != 1) {
alert("打开端口失败");
}
}
}
......@@ -322,7 +321,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
$scope.confirmDelete = function () {
HttpService.deleteRecordsNotPrinted(importDate, function (data) {
$scope.closeThisDialog();
MessageService.showAlert("删除成功。")
// MessageService.showAlert("删除成功。")
getPost();
})
};
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ 0c618587
......@@ -58,6 +58,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
width: 876,
cache: false,
controller: ['$scope','HttpService', function ($scope,HttpService) {
$scope.wrongMsg = -1;
$scope.upDate =uploadDate;
$scope.upCount=packageCount;
HttpService.analyseData(uploadDate, function (data) {
......@@ -68,9 +69,12 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
console.log(uploadDate)
HttpService.analyseToUpdateIfPostCard(fileid,uploadDate,function(data){
if(data){
$scope.closeThisDialog();
MessageService.showAlert("解析完成")
$scope.wrongMsg = "解析完成"
// $scope.closeThisDialog();
// MessageService.showAlert("解析完成")
getData();
}else{
$scope.wrongMsg = "解析失败"
}
})
}
......@@ -94,12 +98,15 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.wrongMsg =-1;
$scope.msgText = "上传中，请稍等..."
HttpService.uploadPackage(fd,function (data) {
if(data){
$scope.closeThisDialog();
getData();
MessageService.showAlert("上传成功")
// MessageService.showAlert("上传成功")
}else{
$scope.wrongMsg = "上传失败"
}
})
}]
......@@ -121,15 +128,19 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.wrongMsg =-1;
$scope.total = packageCount;
$scope.importDate =uploadDate;
$scope.confirmDelete = function () {
HttpService.deleteProdDataByFileId(uploadDate, function (data) {
if(data){
MessageService.showAlert("删除成功");
// MessageService.showAlert("删除成功");
$scope.closeThisDialog();
reGet();
}else{
$scope.wrongMsg = "删除失败"
}
$scope.closeThisDialog();
reGet();
})
};
......
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