Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 79923c56 authored by dahai's avatar dahai
Browse files
Options

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

parents 54c2caaf b3950453
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 43 deletions
src/main/java/com/yxproject/start/api/LogApi.java
View file @ 79923c56
......@@ -3,6 +3,7 @@ package com.yxproject.start.api;
import com.yxproject.start.entity.CountyDicEntity;
import com.yxproject.start.service.LogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
......@@ -61,6 +62,22 @@ public class LogApi {
return total;
}
/**
* 查询解析日志
* @param fileName
* @param analysisTime
* @return
*/
@RequestMapping("selectByAnalysisLog")
@Transactional(rollbackFor = Exception.class)
public List<Map<String,Object>> selectByAnalysisLog(@RequestParam("fileName")String fileName,@RequestParam("analysisTime")String analysisTime, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){
List<Map<String,Object>> resultList = logService.selectAnalysisLog(fileName,analysisTime,Long.valueOf(currPage),Long.valueOf(pageSize));
return resultList;
}
/**
* 去除字符串中中线
* @param str
......
src/main/java/com/yxproject/start/api/PersonPostApi.java
View file @ 79923c56
......@@ -98,7 +98,8 @@ public class PersonPostApi {
* @param printTime
* @return
*/
public boolean printPostList(@RequestParam("id") int id, @RequestParam("printTime") String printTime) {
@RequestMapping("updatePrintDate")
public boolean updatePrintDate(@RequestParam("id") int id, @RequestParam("printTime") String printTime) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
boolean flag=false;
try {
......
src/main/java/com/yxproject/start/mapper/LogMapper.java
View file @ 79923c56
......@@ -13,8 +13,7 @@ import java.util.Map;
public interface LogMapper {
@Insert("")
public boolean insertAnalysisLog();
@Select("<script> " +
"SELECT * FROM " +
......
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ 79923c56
......@@ -58,5 +58,5 @@ public interface PersonPostMapper {
public PersonPostEntity findPostInfoById(int id);
@Update("update PERSON_POST SET PRINT_DATE=#{printDateTime} where id=#{id}")
void updateIsPrint(int id, Date printDateTime);
void updateIsPrint(@Param("id") int id, @Param("printDateTime") Date printDateTime);
}
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ 79923c56
......@@ -176,8 +176,4 @@ public interface TaskListMapper {
public boolean updateState(@Param("taskId") String taskId);
}
src/main/java/com/yxproject/start/service/LogService.java
View file @ 79923c56
......@@ -12,6 +12,7 @@ public interface LogService {
public String selectNewFileLogCount(String newFileName,String cardId,String createDate,String uploadCountyCode);
public List<Map<String,Object>> selectAnalysisLog(String fileName,String analysisDate,long currPage,long pageSize);
public List<CountyDicEntity> getCountyList();
......
src/main/java/com/yxproject/start/service/impl/LogServiceImpl.java
View file @ 79923c56
......@@ -25,6 +25,12 @@ public class LogServiceImpl implements LogService {
return count;
}
@Override
public List<Map<String, Object>> selectAnalysisLog(String fileName, String analysisDate,long currPage, long pageSize) {
List<Map<String,Object>> resultList = logMapper.selectAnalysisLog(fileName,analysisDate,currPage * pageSize, (currPage - 1) * pageSize + 1);
return resultList;
}
@Override
public List<CountyDicEntity> getCountyList() {
......
src/main/resources/static/js/app.js
View file @ 79923c56
......@@ -47,7 +47,7 @@ angular.module('AvatarCheck', [
$location.path("/login");
}
if($rootScope.loginData.login == true){
$scope.icons = [
$rootScope.icons = [
"glyphicon glyphicon-list icon text-primary",
"fa fa-file icon text-info",
"glyphicon glyphicon-briefcase icon text-danger",
......
src/main/resources/static/js/service.js
View file @ 79923c56
......@@ -55,7 +55,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
console.log(id)
$http({
method: 'GET',
url: "../api/idCard/printPostList" + urlTimeStamp(),
url: "../personPostApi/updatePrintDate" + urlTimeStamp(),
params: {
id: id,
printTime: printTime
......@@ -260,13 +260,33 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
selectAnalyseLog:function(oldPackageName,date,success){
selectAnalyseLogCount:function (oldPackageName,date,success) {
if(angular.isUndefined(oldPackageName)){
oldPackageName='';
}
$http({
method: 'GET',
url: "../LogApi/selectByAnalysisLogCount"+urlTimeStamp(),
params:{
fileName:oldPackageName,
analysisTime:date
}
}).then(function successCallback(response) {
success(response.data)
})
},
selectAnalyseLog:function(oldPackageName,date,currentPage,itemsPerPage,success){
if(angular.isUndefined(oldPackageName)){
oldPackageName='';
}
$http({
method: 'GET',
url: "../ParsingLogApi/selectParsingLog"+urlTimeStamp(),
url: "../LogApi/selectByAnalysisLog"+urlTimeStamp(),
params:{
date:date,
oldPackageData:oldPackageName
fileName:oldPackageName,
analysisTime:date,
currPage:currentPage,
pageSize:itemsPerPage
}
}).then(function successCallback(response) {
success(response.data)
......
src/main/resources/static/views/analysisLog/analysisLog.html
View file @ 79923c56
......@@ -51,7 +51,7 @@
</td>
</tr>
</table>
<table class="table table-bordered table-hover postTable" ng-if="analyseLog">
<table class="table table-bordered table-hover postTable" ng-if="analyseLog.length>0">
<thead>
<tr>
<th>NO.</th>
......@@ -80,9 +80,12 @@
</tbody>
</table>
<div style="padding-left: 27%;" ng-if="analyseLog">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
<div ng-if="analyseLog.length==0" class="box-body">
<h4>暂无数据</h4>
</div>
<div style="padding-left: 27%;" ng-if="analyseLog.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
</div>
</div>
</div>
......
src/main/resources/static/views/analysisLog/analysisLog.js
View file @ 79923c56
......@@ -28,14 +28,20 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50]
};
$scope.paginationConf.totalItems = 50;
$scope.getAnalyseLog = function(){
HttpService.selectAnalyseLog($scope.oldPackageName,$("#datepicker").val(),function(data){
HttpService.selectAnalyseLogCount($scope.oldPackageName,$("#datepicker").val(),function (data) {
$scope.paginationConf.totalItems = data;
console.log($scope.paginationConf.totalItems)
})
HttpService.selectAnalyseLog($scope.oldPackageName,$("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.analyseLog = data;
console.log($scope.analyseLog)
})
}
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getAnalyseLog);
});
src/main/resources/static/views/login/login.js
View file @ 79923c56
......@@ -79,6 +79,26 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
localStorageService.set('loginData', resp.data.user);
$rootScope.menuList = $rootScope.loginData.roleList[0].permissions;
console.log($scope.menuList)
$rootScope.icons = [
"glyphicon glyphicon-list icon text-primary",
"fa fa-file icon text-info",
"glyphicon glyphicon-briefcase icon text-danger",
"glyphicon glyphicon-th-large icon text-success",
"glyphicon glyphicon-stats icon text-primary-dker",
"glyphicon glyphicon-list icon text-primary",
"fa fa-file icon text-info",
"glyphicon glyphicon-briefcase icon text-danger",
"glyphicon glyphicon-th-large icon text-success",
"glyphicon glyphicon-stats icon text-primary-dker",
"glyphicon glyphicon-list icon text-primary",
"fa fa-file icon text-info",
"glyphicon glyphicon-briefcase icon text-danger",
"glyphicon glyphicon-th-large icon text-success",
"glyphicon glyphicon-stats icon text-primary-dker",
"glyphicon glyphicon-briefcase icon text-danger",
"glyphicon glyphicon-th-large icon text-success",
"glyphicon glyphicon-stats icon text-primary-dker"
]
whereToGo($rootScope.loginData.roleList[0].process)
if(userAgent.indexOf('.NET')!=-1){
window.location.reload();
......
src/main/resources/static/views/packageLog/packageLog.js
View file @ 79923c56
......@@ -41,10 +41,13 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
})
HttpService.selectPackageLog($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.packageLogData = data;
console.log($scope.packageLogData,"?")
console.log($scope.packageLogData)
})
}
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getPackageLog);
......
src/main/resources/static/views/searchCardMsg/searchCardMsg.html
View file @ 79923c56
......@@ -83,7 +83,7 @@
<input ng-if="$index==0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)" checked="checked">
<input ng-if="$index!=0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)">
</td>
<td>{{$index+1}}</td>
<td>{{item.id}}</td>
<td>{{item.orderNumber}}</td>
<td>{{item.waybillNumber}}</td>
<td>{{item.backWaybillNumber}}</td>
......@@ -135,8 +135,8 @@
<table cellspacing="0" cellpadding="0" style="height:15mm;border-left:1px dashed #000;border-right:2px solid #000;">
<tr>
<td style="border-top:1px dashed #000;border-bottom:1px dashed #000;width:46mm;font-size: 3mm;">
<p style="position:absolute;top:19mm;left:1.5mm;">寄件：{{postMsgDetail[idx].sjrxm}}&nbsp;&nbsp;{{postMsgDetail[idx].sjrlxfs}}</p>
<span style="position:absolute;top:25mm;left:10mm;width:37mm;">{{postMsgDetail[idx].sjrdz}}</span>
<p style="position:absolute;top:19mm;left:1.5mm;">寄件：{{postMsgDetail[idx].recipientName}}&nbsp;&nbsp;{{postMsgDetail[idx].recipientPhone}}</p>
<span style="position:absolute;top:25mm;left:10mm;width:37mm;">{{postMsgDetail[idx].recipientAddress}}</span>
</td>
<td style="border:2px solid #000;border-right:0px;width:50mm;"></td>
</tr>
......@@ -148,8 +148,8 @@
<table cellspacing="0" cellpadding="0" style="border:1px dashed #000;border-top:none;border-collapse:collapse;height:17mm">
<tr>
<td style="border-right:1px dashed #000;border-left:1px dashed #000;border-bottom:1px dashed #000;width:96mm">
<p style="font-size: 3mm; position:absolute;top:33mm;left:1.5mm;">收件：<span style="font-size: 4mm;">{{postMsgDetail[idx].jjrxm}}&nbsp;&nbsp;{{postMsgDetail[idx].jjrlxfs}}</span></p>
<span style="position:absolute;top:40mm;left:10mm;width:85mm;font-size: 4mm;">{{postMsgDetail[idx].jjrdz}}</span></td>
<p style="font-size: 3mm; position:absolute;top:33mm;left:1.5mm;">收件：<span style="font-size: 4mm;">{{postMsgDetail[idx].senderName}}&nbsp;&nbsp;{{postMsgDetail[idx].senderPhone}}</span></p>
<span style="position:absolute;top:40mm;left:10mm;width:85mm;font-size: 4mm;">{{postMsgDetail[idx].senderAddress}}</span></td>
</td>
</tr>
</table>
......@@ -201,12 +201,12 @@
<table cellspacing="0" cellpadding="0" style="border:1px dashed #000;border-top:none;border-collapse:collapse;height:17mm;font-size: 3mm;">
<tr>
<td style="border-right:1px dashed #000;width:40mm">
<p style="position:absolute;top:105mm;left:1.5mm;">寄件：{{postMsgDetail[idx].sjrxm}}&nbsp;{{postMsgDetail[idx].sjrlxfs}}</p>
<span style="position:absolute;top:111mm;left:10mm;width:30mm;">{{postMsgDetail[idx].sjrdz}}</span>
<p style="position:absolute;top:105mm;left:1.5mm;">寄件：{{postMsgDetail[idx].recipientName}}&nbsp;{{postMsgDetail[idx].recipientPhone}}</p>
<span style="position:absolute;top:111mm;left:10mm;width:30mm;">{{postMsgDetail[idx].recipientAddress}}</span>
</td>
<td style="border:0px dashed #000;width:56mm">
<p style="position:absolute;top:105mm;left:42mm;">收件：{{postMsgDetail[idx].jjrxm}}&nbsp;&nbsp;{{postMsgDetail[idx].jjrlxfs}}</p>
<span style="position:absolute;top:112mm;left:50.5mm;width:40mm;">{{postMsgDetail[idx].jjrdz}}</span></td>
<p style="position:absolute;top:105mm;left:42mm;">收件：{{postMsgDetail[idx].senderName}}&nbsp;&nbsp;{{postMsgDetail[idx].senderPhone}}</p>
<span style="position:absolute;top:112mm;left:50.5mm;width:40mm;">{{postMsgDetail[idx].senderAddress}}</span></td>
</tr>
</table>
</td>
......@@ -264,13 +264,13 @@
<table cellspacing="0" cellpadding="0" style="height:15mm;border-left:1px dashed #000;border-right:2px solid #000;">
<tr>
<td style="border-top:1px dashed #000;border-bottom:1px dashed #000;width:46mm;font-size: 3mm;">
<p style="position:absolute;top:19mm;left:1.5mm;">寄件：{{postMsgDetail[idx].jjrxm}}</p>
<p style="position:absolute;top:22mm;left:10mm;">{{postMsgDetail[idx].jjrlxfs}}</p>
<span style="position:absolute;top:28mm;left:10mm;width:37mm;">{{postMsgDetail[idx].jjrdz}}</span>
<p style="position:absolute;top:19mm;left:1.5mm;">寄件：{{postMsgDetail[idx].senderName}}</p>
<p style="position:absolute;top:22mm;left:10mm;">{{postMsgDetail[idx].senderPhone}}</p>
<span style="position:absolute;top:28mm;left:10mm;width:37mm;">{{postMsgDetail[idx].senderAddress}}</span>
</td>
<td style="border:2px solid #000;border-right:0px;width:50mm;">
<span style="font-size: 6mm;width:50mm;position:absolute;top:22mm;left: 50mm">
{{postMsgDetail[idx].sqrxm}}
{{postMsgDetail[idx].applicantName}}
</span>
</td>
</tr>
......@@ -282,8 +282,8 @@
<table cellspacing="0" cellpadding="0" style="border:1px dashed #000;border-top:none;border-collapse:collapse;height:17mm">
<tr>
<td style="border-right:1px dashed #000;border-left:1px dashed #000;border-bottom:1px dashed #000;width:96mm">
<p style="font-size: 3mm; position:absolute;top:33mm;left:1.5mm;">收件：<span style="font-size: 4mm;">{{postMsgDetail[idx].sjrxm}}&nbsp;&nbsp;{{postMsgDetail[idx].sjrlxfs}}</span></p>
<span style="position:absolute;top:40mm;left:10mm;width:85mm;font-size: 4mm;">{{postMsgDetail[idx].sjrdz}}</span></td>
<p style="font-size: 3mm; position:absolute;top:33mm;left:1.5mm;">收件：<span style="font-size: 4mm;">{{postMsgDetail[idx].recipientName}}&nbsp;&nbsp;{{postMsgDetail[idx].recipientPhone}}</span></p>
<span style="position:absolute;top:40mm;left:10mm;width:85mm;font-size: 4mm;">{{postMsgDetail[idx].recipientAddress}}</span></td>
</td>
</tr>
</table>
......@@ -313,8 +313,7 @@
<tr>
<td style="border:1px dashed #000;border-top:0;width:96mm">
<span style="font-size:3mm; position:absolute;top:69mm;left:2mm;">订单号：</span>
<p style="font-size:3mm; position:absolute;top:72mm;left:2mm;">配货信息：<span style="font-size:7mm;margin-left: 30px">{{postMsgDetail[idx].gkxx}}</span></p>
<!--<p style="font-size:3mm; position:absolute;top:72mm;left:2mm;">配货信息：<span style="font-size: 7mm;">{{postMsgDetail[idx].sqrxm}}</span></p>-->
<p style="font-size:3mm; position:absolute;top:72mm;left:2mm;">配货信息：<span style="font-size:7mm;margin-left: 30px">{{postMsgDetail[idx].latticeMouthInformation}}</span></p>
</td>
</tr>
</table>
......@@ -338,13 +337,13 @@
border-top:none;border-collapse:collapse;height:17mm;font-size: 3mm;">
<tr>
<td style="border-right:1px dashed #000;width:40mm">
<p style="position:absolute;top:105mm;left:1.5mm;">寄件：{{postMsgDetail[idx].jjrxm}}</p>
<p style="position:absolute;top:108mm;left:10mm;">{{postMsgDetail[idx].jjrlxfs}}</p>
<span style="position:absolute;top:114mm;left:10mm;width:30mm;">{{postMsgDetail[idx].jjrdz}}</span>
<p style="position:absolute;top:105mm;left:1.5mm;">寄件：{{postMsgDetail[idx].senderName}}</p>
<p style="position:absolute;top:108mm;left:10mm;">{{postMsgDetail[idx].senderPhone}}</p>
<span style="position:absolute;top:114mm;left:10mm;width:30mm;">{{postMsgDetail[idx].senderAddress}}</span>
</td>
<td style="border:0px dashed #000;width:56mm">
<p style="position:absolute;top:105mm;left:43mm;">收件：{{postMsgDetail[idx].sjrxm}}&nbsp;{{postMsgDetail[idx].sjrlxfs}}</p>
<span style="position:absolute;top:111mm;left:52mm;width:40mm;">{{postMsgDetail[idx].sjrdz}}</span></td>
<p style="position:absolute;top:105mm;left:43mm;">收件：{{postMsgDetail[idx].recipientName}}&nbsp;{{postMsgDetail[idx].recipientPhone}}</p>
<span style="position:absolute;top:111mm;left:52mm;width:40mm;">{{postMsgDetail[idx].recipientAddress}}</span></td>
</tr>
</table>
</td>
......
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