Skip to content

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

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

parents 82853292 79923c56
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 31 deletions
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ 9dbf41e9
......@@ -101,12 +101,27 @@ public class TaskListApi {
return objects;
}
/**
* 查询组号列表详情
* 受理库
* @param date 查询时间
* @param typeCode 制证类型
* @param countyCode 区县代码
* @param resp
* @return
*/
@RequestMapping("queryByGroupNoAtACCU")
public Map<String ,Object> queryByPoliceAtACCU(@RequestParam("date") String date,@RequestParam("typeCode") String typeCode,@RequestParam("countyCode") String countyCode,@RequestParam("currPage") String currPage,@RequestParam("pageSize") String pageSize, HttpServletResponse resp){
Map<String ,Object> objects = taskListService.selectByGroupNoAtACCU(replaceDate(date), typeCode, countyCode,Long.valueOf(currPage),Long.valueOf(pageSize));
return objects;
}
/**
* 查询任务单详情
* (辅助库)
* @param process 工序
* @param date 查询时间
* @param resp
* @return
*/
......@@ -169,20 +184,7 @@ public class TaskListApi {
// /**
// * 查询派出所列表详情
// * @param date 查询时间
// * @param typeCode 制证类型
// * @param countyCode 区县代码
// * @param resp
// * @return
// */
// @RequestMapping("queryByPoliceAtACCU")
// public List<Object> queryByPoliceAtACCU(@RequestParam("state") String date,@RequestParam("typeCode") String typeCode,@RequestParam("countyCode") String countyCode, HttpServletResponse resp){
// List<Object> objects = taskListService.selectByPoliceAtACCU(date, typeCode, countyCode);
// return objects;
//
// }
/**
......
src/main/java/com/yxproject/start/entity/PreproPersonEntity.java
View file @ 9dbf41e9
......@@ -38,8 +38,18 @@ public class PreproPersonEntity {
private Long cardTypeId;
private Long newFileId;
private Long state;
private long id;
@Id
@Column(name = "ID")
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
@Basic
@Column(name = "JMSFZSLH")
public String getJmsfzslh() {
return jmsfzslh;
......@@ -351,11 +361,12 @@ public class PreproPersonEntity {
Objects.equals(fileId, that.fileId) &&
Objects.equals(cardTypeId, that.cardTypeId) &&
Objects.equals(newFileId, that.newFileId) &&
Objects.equals(id, that.id) &&
Objects.equals(state, that.state);
}
@Override
public int hashCode() {
return Objects.hash(jmsfzslh, gmsfhm, xm, xbdm, mzdm, csrq, ssxqdm, dzmc, sdxp, zwyZwtxsj, zwyZwtzsj, zweZwtxsj, zweZwtzsj, qfjgGajgmc, yxqqsrq, yxqjzrq, jmsfzslyydm, jmsfzzzlxdm, jmsfzlzfsdm, sjrXm, sjrLxdh, sjrYzbm, sjrTxdz, sid, fileId, cardTypeId, newFileId, state);
return Objects.hash(id,jmsfzslh, gmsfhm, xm, xbdm, mzdm, csrq, ssxqdm, dzmc, sdxp, zwyZwtxsj, zwyZwtzsj, zweZwtxsj, zweZwtzsj, qfjgGajgmc, yxqqsrq, yxqjzrq, jmsfzslyydm, jmsfzzzlxdm, jmsfzlzfsdm, sjrXm, sjrLxdh, sjrYzbm, sjrTxdz, sid, fileId, cardTypeId, newFileId, state);
}
}
src/main/java/com/yxproject/start/mapper/FilesMapper.java
View file @ 9dbf41e9
......@@ -9,8 +9,8 @@ import java.util.List;
@Mapper
public interface FilesMapper {
@Insert("INSERT INTO FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREATE_TIME,SOURCE_FILE_NAME,UPLOAD_DATE)" +
"VALUES(#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{createTime},#{sourceFileName},#{upload_date})")
@Insert("INSERT INTO FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREATE_TIME,SOURCE_FILE_NAME)" +
"VALUES(#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{createTime},#{sourceFileName})")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="id")
public long insertFiles(FilesEntity filesEntity);
......
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ 9dbf41e9
......@@ -43,6 +43,44 @@ public interface TaskListMapper {
"where county_dic.COUNTY_CODE is not null and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{submitDate}")
public List<Map<String,Object>> selectByCountyAtACCU(@Param("submitDate") String submitDate);
/**
* 组号列表查询
* 受理库
* @param date 查询时间
* @param typeCode 制证类型
* @param countyCode 区县代码
* @param maxNum
* @param minNum
* @return
*/
@Select("select * from (select a.*,rownum rn from (select DISTINCT ACC_GROUP_T.* from ACC_CARD_T@ACCU_LINK \n" +
"left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH = acc_card_t.upload_no \n" +
"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 = #{countyCode} and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{date}" +
" and PREPRO_PERSON.card_type_id = #{typeCode}" +
") a ) where rn BETWEEN #{minNum} and #{maxNum}")
public List<Map<String,Object>> selectByGroupNoAtACCU(@Param("date") String date,@Param("typeCode")String typeCode,@Param("countyCode")String countyCode,@Param("maxNum")long maxNum,@Param("minNum")long minNum );
/**
* 组号列表查询总数量
* 受理库
* @param date 查询时间
* @param typeCode 制证类型
* @param countyCode 区县代码
* @return
*/
@Select("select DISTINCT ACC_GROUP_T.* from ACC_CARD_T@ACCU_LINK \n" +
"left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH = acc_card_t.upload_no \n" +
"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 = #{countyCode} and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{date}" +
" and PREPRO_PERSON.card_type_id = #{typeCode}")
public List<Map<String,Object>> selectByGroupNoAtACCUCount(@Param("date") String date,@Param("typeCode")String typeCode,@Param("countyCode")String countyCode );
/**
* 查询组号列表
......
src/main/java/com/yxproject/start/service/TaskListService.java
View file @ 9dbf41e9
......@@ -22,6 +22,8 @@ public interface TaskListService {
public List<Object> selectByCountyAtACCU(String date);
public Map<String ,Object> selectByGroupNoAtACCU(String date, String typeCode, String countyCode,long currPage, long pageSize);
public List<Object> selectByCountyAtAuxiliary(String process);
public List<Object> selectGroupAtACCU(String date,String typeCode,String countyCode);
......
src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java
View file @ 9dbf41e9
......@@ -149,6 +149,25 @@ public class TaskListServiceImpl implements TaskListService {
return list;
}
/**
* 查询组号列表详情
* 受理库
* @param date 查询时间
* @param typeCode 制证类型
* @param countyCode 区县代码
* @param currPage 当前页
* @param pageSize 页面数量
* @return
*/
@Override
public Map<String ,Object> selectByGroupNoAtACCU(String date, String typeCode, String countyCode, long currPage, long pageSize) {
List<Map<String, Object>> mapList = taskListMapper.selectByGroupNoAtACCU(date, typeCode, countyCode, currPage * pageSize, (currPage - 1) * pageSize + 1);
List<Map<String, Object>> mapList1 = taskListMapper.selectByGroupNoAtACCUCount(date, typeCode, countyCode);
Map<String,Object> map = new LinkedHashMap<>();
map.put("count",mapList1.size());
map.put("groupList",mapList);
return map;
}
/**
* 查询任务单详情
......@@ -159,6 +178,7 @@ public class TaskListServiceImpl implements TaskListService {
@Override
public List<Object> selectByCountyAtAuxiliary(String process) {
// taskListMapper
//todo 写逻辑0.0........
return null;
}
......
src/main/resources/static/js/app.js
View file @ 9dbf41e9
......@@ -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 @ 9dbf41e9
......@@ -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 @ 9dbf41e9
......@@ -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 @ 9dbf41e9
......@@ -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 @ 9dbf41e9
......@@ -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 @ 9dbf41e9
......@@ -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);
......
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