Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 869b9229 authored by dahai's avatar dahai
Browse files
Options

push

parent 91d9bf70
Hide whitespace changes
Inline Side-by-side
Showing with 378 additions and 143 deletions
src/main/java/com/yxproject/start/api/DeliveredApi.java
View file @ 869b9229
...@@ -116,7 +116,12 @@ public class DeliveredApi { ...@@ -116,7 +116,12 @@ public class DeliveredApi {
} }
deliveredInfoEntity.setWaybillNumber((String) list2.get(0)); deliveredInfoEntity.setWaybillNumber((String) list2.get(0));
deliveredInfoEntity.setFileId(deliveredImportDicEntity.getId()); deliveredInfoEntity.setFileId(deliveredImportDicEntity.getId());
deliveredInfoEntity.setDealState(Long.valueOf(list2.get(2).toString())); deliveredInfoEntity.setFileId(deliveredImportDicEntity.getId());
if ("妥投".equals(list2.get(2).toString())){
deliveredInfoEntity.setDealState((long)1);
}else {
deliveredInfoEntity.setDealState((long)0);
}
entityList.add(deliveredInfoEntity); entityList.add(deliveredInfoEntity);
} }
deliveredService.saveDeliveredInfoList(entityList); deliveredService.saveDeliveredInfoList(entityList);
......
src/main/java/com/yxproject/start/api/ExportExcelApi.java
View file @ 869b9229
...@@ -40,9 +40,9 @@ public class ExportExcelApi { ...@@ -40,9 +40,9 @@ public class ExportExcelApi {
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
JSONObject jsonObject = JSONObject.fromObject(list); JSONObject jsonObject = JSONObject.fromObject(list);
JSONArray jsonArray = JSONArray.fromObject(jsonObject.get("list")); JSONArray jsonArray = JSONArray.fromObject(jsonObject.get("list"));
String type = jsonObject.get("type").toString(); // String type = jsonObject.get("type").toString();
String name = jsonObject.get("name").toString(); String name = jsonObject.get("name").toString();
List<Map<String, Object>> mapList = detailReceiptListService.selectPostDetails(jsonArray, Long.valueOf(type),name); List<Map<String, Object>> mapList = detailReceiptListService.selectPostDetails(jsonArray,name);
response.setContentType("application/x-download"); response.setContentType("application/x-download");
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
String dateTime = DateFormatUtils.format(new Date(), "yyyy-MM-dd"); String dateTime = DateFormatUtils.format(new Date(), "yyyy-MM-dd");
......
src/main/java/com/yxproject/start/api/MaterialManagementApi.java
View file @ 869b9229
...@@ -46,6 +46,30 @@ public class MaterialManagementApi { ...@@ -46,6 +46,30 @@ public class MaterialManagementApi {
} }
// /**
// * 删除膜耗材数据
// * @param id
// * @return
// */
// @RequestMapping("deleteFilm")
// public boolean deleteFilm(@Param("id")String id){
// boolean result = materialManagementService.insertFilm(totalCount, plasticFilmType, note,name,Long.valueOf(state));
// return result;
// }
//
// /**
// * 删除卡体耗材数据
// * @param cardType
// * @param totalCount
// * @param note
// * @return
// */
// @RequestMapping("deleteCardBody")
// public boolean deleteCardBody(@Param("cardType")String cardType,@Param("totalCount")String totalCount,@Param("note")String note, @Param("name")String name, @Param("cardBodyType")String cardBodyType,@Param("state")String state){
// boolean result = materialManagementService.insertCardBody(cardType, totalCount, note,name,cardBodyType,Long.valueOf(state));
// return result;
// }
/** /**
* 查询卡机统计数据 * 查询卡机统计数据
* @param beginDate * @param beginDate
......
src/main/java/com/yxproject/start/mapper/DetailReceiptListMapper.java
View file @ 869b9229
...@@ -25,9 +25,9 @@ public interface DetailReceiptListMapper { ...@@ -25,9 +25,9 @@ public interface DetailReceiptListMapper {
"from DETAIL_RECEIPT_LIST left join RECEIPT_LIST on DETAIL_RECEIPT_LIST.RECEIPT_ID = RECEIPT_LIST.ID\n" + "from DETAIL_RECEIPT_LIST left join RECEIPT_LIST on DETAIL_RECEIPT_LIST.RECEIPT_ID = RECEIPT_LIST.ID\n" +
"left join PERSON_POST on PERSON_POST.FIRST_WHITE = DETAIL_RECEIPT_LIST.UPLOAD_NO\n" + "left join PERSON_POST on PERSON_POST.FIRST_WHITE = DETAIL_RECEIPT_LIST.UPLOAD_NO\n" +
"where RECEIPT_LIST.id in (${str}) " + "where RECEIPT_LIST.id in (${str}) " +
" and RECEIPT_LIST.CARD_TYPE_ID = ${typeCode} order by DETAIL_RECEIPT_LIST.ACCEPT_NO " + " order by DETAIL_RECEIPT_LIST.ACCEPT_NO " +
"") "")
public List<Map<String,Object>> selectPostDetails(@Param("str")String str, @Param("typeCode")long typeCode); public List<Map<String,Object>> selectPostDetails(@Param("str")String str);
/** /**
......
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @ 869b9229
...@@ -227,7 +227,7 @@ public interface ReceiptMapper { ...@@ -227,7 +227,7 @@ public interface ReceiptMapper {
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID)\n" + "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID)\n" +
"left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" + "left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" +
"left join COUNTY_DIC on substr(RECEIPT_LIST.POLICE_CODE,0,6) = COUNTY_DIC.COUNTY_CODE" + "left join COUNTY_DIC on substr(RECEIPT_LIST.POLICE_CODE,0,6) = COUNTY_DIC.COUNTY_CODE" +
" where RECEIPT_LIST.id in (${string}) and CARD_TYPE_DIC.CARD_TYPE_ID=${type} and receipt_date is null ") " where RECEIPT_LIST.id in (${string}) order by RECEIPT_LIST.QR_CODE ")
public List<Map<String,Object>> selectReceiptDate(@Param("string") String string,@Param("type") long type); public List<Map<String,Object>> selectReceiptDate(@Param("string") String string,@Param("type") long type);
@Select("select DETAIL_RECEIPT_LIST.* , GAJG_DM.GAJG_MC from DETAIL_RECEIPT_LIST LEFT JOIN GAJG_DM ON GAJG_DM.GAJG_DM =DETAIL_RECEIPT_LIST.POLICE_CODE where ACCEPT_NO=#{acceptNo} or card_id=#{acceptNo}") @Select("select DETAIL_RECEIPT_LIST.* , GAJG_DM.GAJG_MC from DETAIL_RECEIPT_LIST LEFT JOIN GAJG_DM ON GAJG_DM.GAJG_DM =DETAIL_RECEIPT_LIST.POLICE_CODE where ACCEPT_NO=#{acceptNo} or card_id=#{acceptNo}")
...@@ -246,10 +246,10 @@ public interface ReceiptMapper { ...@@ -246,10 +246,10 @@ public interface ReceiptMapper {
@Update("update RECEIPT_LIST set IS_PRINT = 1,RECEIPT_DATE = sysdate where RECEIPT_LIST.id in (${string}) and CARD_TYPE_ID=${type} and receipt_date is null") @Update("update RECEIPT_LIST set IS_PRINT = 1,RECEIPT_DATE = sysdate where RECEIPT_LIST.id in (${string}) and CARD_TYPE_ID=${type} and receipt_date is null")
public boolean updateReceiptDate(@Param("string") String string,@Param("type") long type); public boolean updateReceiptDate(@Param("string") String string,@Param("type") long type);
@Select("select RECEIPT_LIST.POLICE_CODE,sum(RECEIPT_LIST.FINISH_COUNT) FINISH_COUNT,GAJG_DM.GAJG_MC from RECEIPT_LIST \n" + @Select("select sum(RECEIPT_LIST.FINISH_COUNT) FINISH_COUNT,to_char(CHECK_DATE,'yyyyMMdd') CHECK_DATE from RECEIPT_LIST \n" +
"left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" + "\n" +
"where CHECK_NAME = #{name} and to_char(CHECK_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} \n" + "where CHECK_NAME = #{name} and to_char(CHECK_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} \n" +
"group by RECEIPT_LIST.POLICE_CODE, GAJG_DM.GAJG_MC") "group by to_char(CHECK_DATE,'yyyyMMdd')")
public List<Map<String,Object>> selectReceiptReport(@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("name") String name); public List<Map<String,Object>> selectReceiptReport(@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("name") String name);
...@@ -261,7 +261,7 @@ public interface ReceiptMapper { ...@@ -261,7 +261,7 @@ public interface ReceiptMapper {
"from RECEIPT_LIST \n" + "from RECEIPT_LIST \n" +
"left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" + "left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" +
"left join CARD_TYPE_DIC on RECEIPT_LIST.CARD_TYPE_ID = CARD_TYPE_DIC.CARD_TYPE_ID\n" + "left join CARD_TYPE_DIC on RECEIPT_LIST.CARD_TYPE_ID = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
"where DOWNLOAD_DATE is null and to_char(receipt_date,'yyyyMMddhh24') BETWEEN #{startDate} and #{endDate}") "where DOWNLOAD_DATE is null and to_char(receipt_date,'yyyyMMdd') BETWEEN #{startDate} and #{endDate}")
public List<Map<String, Object>> selectPoliceData(@Param("startDate") String startDate,@Param("endDate") String endDate); public List<Map<String, Object>> selectPoliceData(@Param("startDate") String startDate,@Param("endDate") String endDate);
@Select("select RECEIPT_LIST.id,QR_CODE,to_char(DOWNLOAD_DATE,'yyyyMMddHH24') receipt_date ,\n" + @Select("select RECEIPT_LIST.id,QR_CODE,to_char(DOWNLOAD_DATE,'yyyyMMddHH24') receipt_date ,\n" +
...@@ -269,7 +269,7 @@ public interface ReceiptMapper { ...@@ -269,7 +269,7 @@ public interface ReceiptMapper {
"from RECEIPT_LIST \n" + "from RECEIPT_LIST \n" +
"left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" + "left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" +
"left join CARD_TYPE_DIC on RECEIPT_LIST.CARD_TYPE_ID = CARD_TYPE_DIC.CARD_TYPE_ID\n" + "left join CARD_TYPE_DIC on RECEIPT_LIST.CARD_TYPE_ID = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
"where to_char(DOWNLOAD_DATE,'yyyyMMddhh24') BETWEEN #{startDate} and #{endDate}") "where to_char(DOWNLOAD_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate}")
public List<Map<String, Object>> selectPoliceDataByDownLoadDate(@Param("startDate") String startDate,@Param("endDate") String endDate); public List<Map<String, Object>> selectPoliceDataByDownLoadDate(@Param("startDate") String startDate,@Param("endDate") String endDate);
......
src/main/java/com/yxproject/start/service/DetailReceiptListService.java
View file @ 869b9229
...@@ -10,7 +10,7 @@ import java.util.Map; ...@@ -10,7 +10,7 @@ import java.util.Map;
* 2019/3/9 14:55 * 2019/3/9 14:55
*/ */
public interface DetailReceiptListService { public interface DetailReceiptListService {
public List<Map<String,Object>> selectPostDetails(List<Integer> stringList,long typeCode,String name); public List<Map<String,Object>> selectPostDetails(List<Integer> stringList,String name);
public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardID); public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardID);
......
src/main/java/com/yxproject/start/service/impl/DetailReceiptListServiceImpl.java
View file @ 869b9229
...@@ -19,7 +19,7 @@ public class DetailReceiptListServiceImpl implements DetailReceiptListService { ...@@ -19,7 +19,7 @@ public class DetailReceiptListServiceImpl implements DetailReceiptListService {
private DetailReceiptListMapper detailReceiptListMapper; private DetailReceiptListMapper detailReceiptListMapper;
@Override @Override
public List<Map<String, Object>> selectPostDetails(List<Integer> stringList,long typeCode,String name) { public List<Map<String, Object>> selectPostDetails(List<Integer> stringList,String name) {
String str =""; String str ="";
for (int i =0;i<stringList.size();i++){ for (int i =0;i<stringList.size();i++){
if (i==stringList.size()-1){ if (i==stringList.size()-1){
...@@ -31,7 +31,7 @@ public class DetailReceiptListServiceImpl implements DetailReceiptListService { ...@@ -31,7 +31,7 @@ public class DetailReceiptListServiceImpl implements DetailReceiptListService {
// str+=")"; // str+=")";
detailReceiptListMapper.updateReceiptListEntityByCardId(str,name); detailReceiptListMapper.updateReceiptListEntityByCardId(str,name);
return detailReceiptListMapper.selectPostDetails(str,typeCode); return detailReceiptListMapper.selectPostDetails(str);
} }
@Override @Override
public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardID) { public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardID) {
......
src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java
View file @ 869b9229
...@@ -243,11 +243,21 @@ public class ReceiptServiceImpl implements ReceiptService { ...@@ -243,11 +243,21 @@ public class ReceiptServiceImpl implements ReceiptService {
@Override @Override
public List<Map<String, Object>> selectReceiptReport(String startDate, String endDate, String name) { public List<Map<String, Object>> selectReceiptReport(String startDate, String endDate, String name) {
return receiptMapper.selectReceiptReport(startDate, endDate, name); List<Map<String, Object>> list = receiptMapper.selectReceiptReport(startDate, endDate, name);
int count = 0;
for (Map<String,Object> map :list){
count+= Integer.valueOf(map.get("FINISH_COUNT")+"");
}
Map<String,Object> sumMap = new LinkedHashMap<>();
sumMap.put("FINISH_COUNT",count);
sumMap.put("CHECK_DATE","合计");
list.add(sumMap);
return list;
} }
/** /**
* 查询是否存在交接单详单 * 查询是否存在交接单详单
* *
......
src/main/resources/static/index.html
View file @ 869b9229
<!DOCTYPE html> <!DOCTYPE html>
<!--[if lt IE 7]> <!--[if lt IE 7]>
<html lang="zh" ng-app="AvatarCheck" class="no-js lt-ie9 lt-ie8 lt-ie7" ng-controller="appCtrl" style="height:100%;width: 100%;"> <![endif]--> <html lang="zh" ng-app="AvatarCheck" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]> <!--[if IE 7]>
<html lang="zh" ng-app="AvatarCheck" class="no-js lt-ie9 lt-ie8" ng-controller="appCtrl" style="height:100%;width: 100%;"> <![endif]--> <html lang="zh" ng-app="AvatarCheck" class="no-js lt-ie9 lt-ie8"> <![endif]-->
<!--[if IE 8]> <!--[if IE 8]>
<html lang="zh" ng-app="AvatarCheck" class="no-js lt-ie9" ng-controller="appCtrl" style="height:100%;width: 100%;"> <![endif]--> <html lang="zh" ng-app="AvatarCheck" class="no-js lt-ie9"> <![endif]-->
<!--[if gt IE 8]><!--> <!--[if gt IE 8]><!-->
<html lang="zh" ng-app="AvatarCheck" class="no-js" ng-controller="appCtrl" style="height:100%;width: 100%;"> <html lang="zh" ng-app="AvatarCheck" class="no-js" ng-controller="appCtrl" style="height:100%;width: 100%;">
<head> <head>
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
<script src="components/angularjs/angular.js"></script> <script src="components/angularjs/angular.js"></script>
<script src="components/angularjs/angular-local-storage.js"></script> <script src="components/angularjs/angular-local-storage.js"></script>
<script src="components/angularjs/angular-route.js"></script> <script src="components/angularjs/angular-route.js"></script>
<!-- echarts文件务-->
<script src="newTheme/echarts/echarts.js"></script>
<!-- jQuery文件务必在bootstrap.min.js 之前引入 --> <!-- jQuery文件务必在bootstrap.min.js 之前引入 -->
<script src="components/jquery/jquery-1.11.1.js"></script> <script src="components/jquery/jquery-1.11.1.js"></script>
<!-- jQuery UI 1.11.4 --> <!-- jQuery UI 1.11.4 -->
...@@ -150,6 +153,12 @@ ...@@ -150,6 +153,12 @@
<span ng-bind="menu.name"></span> <span ng-bind="menu.name"></span>
</a> </a>
</li> </li>
<li ng-if="loginData.roleList[0].process==1">
<a ng-click="gotoUser()">
<i class="fa fa-step-backward icon text-info"></i>
<span>用户权限管理</span>
</a>
</li>
</ul> </ul>
</section> </section>
<!-- /.sidebar --> <!-- /.sidebar -->
...@@ -208,5 +217,6 @@ ...@@ -208,5 +217,6 @@
<script src="views/blank/blank.js"></script> <script src="views/blank/blank.js"></script>
<script src="views/addBackCard/addBackCard.js"></script> <script src="views/addBackCard/addBackCard.js"></script>
<script src="views/updatePass/updatePass.js"></script> <script src="views/updatePass/updatePass.js"></script>
<script src="views/downloadGongan/downloadGongan.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/resources/static/js/app.js
View file @ 869b9229
...@@ -42,6 +42,7 @@ angular.module('AvatarCheck', [ ...@@ -42,6 +42,7 @@ angular.module('AvatarCheck', [
'AvatarCheck.cardReport', 'AvatarCheck.cardReport',
'AvatarCheck.addBackCard', 'AvatarCheck.addBackCard',
'AvatarCheck.updatePass', 'AvatarCheck.updatePass',
'AvatarCheck.downloadGongan',
'AvatarCheck.blank' 'AvatarCheck.blank'
]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) { ]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
$locationProvider.hashPrefix('!'); $locationProvider.hashPrefix('!');
...@@ -54,13 +55,7 @@ angular.module('AvatarCheck', [ ...@@ -54,13 +55,7 @@ angular.module('AvatarCheck', [
DebugService.debug("appCtrl:" + "AvatarCheck initial.") DebugService.debug("appCtrl:" + "AvatarCheck initial.")
$scope.jumpToPolice = function () { $rootScope.loginData = localStorageService.get('loginData');
window.open("http://localhost:8081/#!searchCardMsg/zhangsan/10010001/2",'_blank');
};
$rootScope.loginData = localStorageService.get('loginData')
$scope.id = 'id'; $scope.id = 'id';
...@@ -92,10 +87,14 @@ angular.module('AvatarCheck', [ ...@@ -92,10 +87,14 @@ angular.module('AvatarCheck', [
"glyphicon glyphicon-stats icon text-primary-dker" "glyphicon glyphicon-stats icon text-primary-dker"
] ]
$rootScope.menuList = $rootScope.loginData.roleList[0].permissions; $rootScope.menuList = $rootScope.loginData.roleList[0].permissions;
console.log($scope.menuList) // console.log($scope.menuList)
} }
$scope.gotoUser = function () {
var url = 'http://192.168.1.15:8088';
window.open(url);
};
if ($location.path() == "/excelAndSearch") { if ($location.path() == "/excelAndSearch") {
$rootScope.tab = '/excelAndSearch'; $rootScope.tab = '/excelAndSearch';
...@@ -218,6 +217,9 @@ angular.module('AvatarCheck', [ ...@@ -218,6 +217,9 @@ angular.module('AvatarCheck', [
if($location.path()=="/addBackCard"){ if($location.path()=="/addBackCard"){
$rootScope.tab = '/addBackCard'; $rootScope.tab = '/addBackCard';
} }
if($location.path()=="/downloadGongan"){
$rootScope.tab = '/downloadGongan';
}
...@@ -432,5 +434,24 @@ angular.module('AvatarCheck', [ ...@@ -432,5 +434,24 @@ angular.module('AvatarCheck', [
fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length))); fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
return fmt; return fmt;
} }
}).filter('myDateFilterByHour', function() { //可以注入依赖
return function(permanentPositionDate) {
if(permanentPositionDate!=null){
var yyyy = permanentPositionDate.substring(0,4);
var MM = permanentPositionDate.substring(4,6);
var dd = permanentPositionDate.substring(6,8);
var hh = permanentPositionDate.substring(8,10);
var yyyyMMddhh = yyyy+"-"+MM+"-"+dd+" "+hh+"时";
var yyyyMMdd = yyyy+"-"+MM+"-"+dd;
if(permanentPositionDate.length == 8){
return yyyyMMdd;
}else{
return yyyyMMddhh;
}
}else{
return permanentPositionDate;
}
}
}); });
src/main/resources/static/js/service.js
View file @ 869b9229
...@@ -927,6 +927,32 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -927,6 +927,32 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
getGongan:function(startDate,endDate,success){
console.log(startDate,endDate);
$http({
method: 'GET',
url: "../ReceiptApi/queryPoliceData"+urlTimeStamp(),
params:{
startDate:startDate,
endDate:endDate
}
}).then(function successCallback(response) {
success(response.data)
})
},
getHistoryGongan:function(startDate,endDate,success){
console.log(startDate,endDate);
$http({
method: 'GET',
url: "../ReceiptApi/queryPoliceDataByDownLoadDate"+urlTimeStamp(),
params:{
startDate:startDate,
endDate:endDate
}
}).then(function successCallback(response) {
success(response.data)
})
},
printExcelData:function(data,success){ printExcelData:function(data,success){
var body = JSON.stringify(data); var body = JSON.stringify(data);
$http({ $http({
...@@ -1141,11 +1167,12 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -1141,11 +1167,12 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}, },
queryWorkGroupReport:function (date1,date2,success) { queryWorkGroupReport:function (date1,date2,success) {
if(date1==""){ if(date1==""){
date1 = $filter("date")(new Date(), "yyyy-MM-dd"); date1 = $filter("date")(new Date(), "yyyy-MM-01");
} }
if(date2==""){ if(date2==""){
date1 = $filter("date")(new Date(), "yyyy-MM-dd"); date2 = $filter("date")(new Date(), "yyyy-MM-dd");
} }
console.log(date1,date2);
$http({ $http({
method: 'GET', method: 'GET',
url: "../ReportApi/queryWorkGroupReport" + urlTimeStamp(), url: "../ReportApi/queryWorkGroupReport" + urlTimeStamp(),
...@@ -1161,11 +1188,12 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -1161,11 +1188,12 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
querySortingReport:function (date1,date2,name,success) { querySortingReport:function (date1,date2,name,success) {
if(date1==""){ if(date1==""){
date1 = $filter("date")(new Date(), "yyyy-MM-dd"); date1 = $filter("date")(new Date(), "yyyy-MM-01");
} }
if(date2==""){ if(date2==""){
date2 = $filter("date")(new Date(), "yyyy-MM-dd"); date2 = $filter("date")(new Date(), "yyyy-MM-dd");
} }
console.log(date1,date2,name);
$http({ $http({
method: 'GET', method: 'GET',
url: "../ReportApi/querySortingReport" + urlTimeStamp(), url: "../ReportApi/querySortingReport" + urlTimeStamp(),
...@@ -1180,11 +1208,12 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -1180,11 +1208,12 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}, },
queryQualityCheckReport:function (date1,date2,success) { queryQualityCheckReport:function (date1,date2,success) {
if(date1==""){ if(date1==""){
date1 = $filter("date")(new Date(), "yyyy-MM-dd"); date1 = $filter("date")(new Date(), "yyyy-MM-01");
} }
if(date2==""){ if(date2==""){
date1 = $filter("date")(new Date(), "yyyy-MM-dd"); date2 = $filter("date")(new Date(), "yyyy-MM-dd");
} }
console.log(date1,date2);
$http({ $http({
method: 'GET', method: 'GET',
url: "../ReportApi/queryQualityCheckReport" + urlTimeStamp(), url: "../ReportApi/queryQualityCheckReport" + urlTimeStamp(),
...@@ -1551,6 +1580,21 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -1551,6 +1580,21 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
} },
loadCertificationDiagram: function (success, failed) {
$http({method: 'GET',
url: "../Cartogram/findCardDetailedList"+urlTimeStamp()
}).then(function (resp) {
return success(resp.data);
},
function (err) {
var err = {err: true, errorDesc: "数据报表查询错误"};
DebugService.debug("$http error:", err)
DebugService.debug("----------------------------------------------")
var str = JSON.stringify(err)
// MessageService.httpRequestFailed(str)
return failed(err)
});
},
} }
}); });
\ No newline at end of file
src/main/resources/static/js/utils.js
View file @ 869b9229
...@@ -269,7 +269,7 @@ var style_pie_blank = { ...@@ -269,7 +269,7 @@ var style_pie_blank = {
color: 'rgba(0,0,0,0)' color: 'rgba(0,0,0,0)'
} }
}; };
//扇形统计图 建立
var getPreReportData = function (title, data, dataw, color1, color2) { var getPreReportData = function (title, data, dataw, color1, color2) {
var body = { var body = {
...@@ -311,41 +311,73 @@ var getPreReportData = function (title, data, dataw, color1, color2) { ...@@ -311,41 +311,73 @@ var getPreReportData = function (title, data, dataw, color1, color2) {
}; };
return body; return body;
} }
//条形统计图 建立
var buildDiagramDataCheckItemRatioProv = function (labelprov, data) { var buildDiagramDataCheckItemRatioProv = function (labelprov, data) {
var body = { var body = {
color: ['#003366', '#006699', '#4cabce', '#e5323e'],
title : {
text: ' 北京市公安局 2019 年本地证制证生产情况',
subtext: '人次数量'
},
//提示框组件
tooltip: { tooltip: {
trigger: 'axis' trigger: 'axis'
}, },
//图例组件
legend: { legend: {
data: [labelprov] type: 'scroll',
orient: 'horizontal',
x: 'right',
data: ['普通证','邮寄证','军人证','废证']
}, },
//拖拽时，是否实时更新。
calculable: true, calculable: true,
//X轴
xAxis: [ xAxis: [
{ {
type: 'category', type: 'category',
data: ['顶部', '脸左', '脸右', '高光', '尺寸', '眼睛', '脸宽', '阴阳脸', '肩部', '边线', 'DPI', 'KB', '背景', '曝光', '色彩'] axisTick: {show: false},
data: ['一月', '二月', '三月', '四月', '五月','六月','七月','八月','九月','十月','十一月','十二月']
} }
], ],
//y轴
yAxis: [ yAxis: [
{ {//数值轴，适用于连续数据。
type: 'value', type: 'value',
name: '检测项结果统计', name: '',
min: 0, // min: 0,
max: 100, // max: 100,
axisLabel: { axisLabel: {
formatter: '{value} %' formatter: '{value}'
} }
} }
], ],
//数值
series: [ series: [
{ {
name: labelprov, name: '普通证',
type: 'bar', type: 'bar',
data: [data.chk_top, data.chk_left, data.chk_right, data.chk_facelinght, data.chk_size, data.chk_eye, data.chk_facew, data.chk_faceyyl, data.chk_shoulder, data.chk_lineside, data.chk_dpi, data.chk_kb, data.chk_backgroupd, data.chk_faceld, data.chk_facesc], barGap: 0,
itemStyle: { label: labelprov,
normal: {color: '#336699'} data: data.pz
} },
{
name: '邮寄证',
type: 'bar',
label: labelprov,
data: data.yj
},
{
name: '军人证',
type: 'bar',
label: labelprov,
data: data.jr
},
{
name: '废证',
type: 'bar',
label: labelprov,
data: data.fz
} }
], ],
} }
...@@ -2085,4 +2117,5 @@ var getFirstTaskData = function (listX,a1,a2,a3,a4,a5,a6,a7,a8,a9) { ...@@ -2085,4 +2117,5 @@ var getFirstTaskData = function (listX,a1,a2,a3,a4,a5,a6,a7,a8,a9) {
] ]
} }
return body; return body;
} }
\ No newline at end of file
src/main/resources/static/views/cardReport/cardReport.html
View file @ 869b9229
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<tr> <tr>
<td> <span>起始日期:</span></td> <td> <span>起始日期:</span></td>
<td> <td>
<input type="text" class="form-control" ng-model="choseDate" id="datepicker1" readonly/> <input type="text" class="form-control" ng-model="choseDate1" id="datepicker1" readonly/>
</td> </td>
<td> <span>结束日期:</span></td> <td> <span>结束日期:</span></td>
<td> <td>
......
src/main/resources/static/views/cardReport/cardReport.js
View file @ 869b9229
...@@ -19,7 +19,7 @@ angular.module('AvatarCheck.cardReport', ['ngRoute', 'AvatarCheck.http', 'tm.pag ...@@ -19,7 +19,7 @@ angular.module('AvatarCheck.cardReport', ['ngRoute', 'AvatarCheck.http', 'tm.pag
autoclose: 1 autoclose: 1
}); });
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-01");
var getCardTypeList = function () { var getCardTypeList = function () {
HttpService.getCardBodyTypeList(function(data) { HttpService.getCardBodyTypeList(function(data) {
$scope.cardBodyTypeList = data; $scope.cardBodyTypeList = data;
...@@ -63,10 +63,10 @@ angular.module('AvatarCheck.cardReport', ['ngRoute', 'AvatarCheck.http', 'tm.pag ...@@ -63,10 +63,10 @@ angular.module('AvatarCheck.cardReport', ['ngRoute', 'AvatarCheck.http', 'tm.pag
var date1 = $("#datepicker1").val(); var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val(); var date2 = $("#datepicker2").val();
if (date1==""){ if (date1==""){
date1=$scope.choseDate; date1=$filter("date")(new Date(), "yyyy-MM-01");
} }
if (date2==""){ if (date2==""){
date2=$scope.choseDate; date2=$filter("date")(new Date(), "yyyy-MM-dd");
} }
HttpService.selectCardBodyCountData(date1, date2,operator,cardBodyType1,cardType,function(data) { HttpService.selectCardBodyCountData(date1, date2,operator,cardBodyType1,cardType,function(data) {
$scope.paginationConf.totalItems = data; $scope.paginationConf.totalItems = data;
......
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ 869b9229
...@@ -45,8 +45,10 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -45,8 +45,10 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
console.log("当天：",$scope.cycleSheetData) console.log("当天：",$scope.cycleSheetData)
}) })
};
if($rootScope.loginData.login==true){
$scope.searchCurrent();
} }
$scope.searchCurrent();
$scope.searchHistory = function(){ $scope.searchHistory = function(){
$scope.totalCardProd = 0; $scope.totalCardProd = 0;
......
src/main/resources/static/views/dispatchTask/dispatchTask.js
View file @ 869b9229
...@@ -43,7 +43,9 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -43,7 +43,9 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
console.log("当天：",$scope.cycleSheetData) console.log("当天：",$scope.cycleSheetData)
}) })
} }
$scope.searchTaskList(); if($rootScope.loginData.login==true){
$scope.searchTaskList();
}
$scope.searchHistory = function(){ $scope.searchHistory = function(){
$scope.totalCardProd = 0; $scope.totalCardProd = 0;
......
src/main/resources/static/views/filmReport/filmReport.html
View file @ 869b9229
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<tr> <tr>
<td> <span>起始日期:</span></td> <td> <span>起始日期:</span></td>
<td> <td>
<input type="text" class="form-control" ng-model="choseDate" id="datepicker1" readonly/> <input type="text" class="form-control" ng-model="choseDate1" id="datepicker1" readonly/>
</td> </td>
<td> <span>结束日期:</span></td> <td> <span>结束日期:</span></td>
<td> <td>
......
src/main/resources/static/views/filmReport/filmReport.js
View file @ 869b9229
...@@ -19,7 +19,7 @@ angular.module('AvatarCheck.filmReport', ['ngRoute', 'AvatarCheck.http','tm.pagi ...@@ -19,7 +19,7 @@ angular.module('AvatarCheck.filmReport', ['ngRoute', 'AvatarCheck.http','tm.pagi
autoclose: 1 autoclose: 1
}); });
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-01");
//Date picker //Date picker
$('#datepicker2').datetimepicker({ $('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
...@@ -55,10 +55,10 @@ angular.module('AvatarCheck.filmReport', ['ngRoute', 'AvatarCheck.http','tm.pagi ...@@ -55,10 +55,10 @@ angular.module('AvatarCheck.filmReport', ['ngRoute', 'AvatarCheck.http','tm.pagi
var date1 = $("#datepicker1").val(); var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val(); var date2 = $("#datepicker2").val();
if (date1==""){ if (date1==""){
date1=$scope.choseDate; date1=$filter("date")(new Date(), "yyyy-MM-01");
} }
if (date2==""){ if (date2==""){
date2=$scope.choseDate; date2=$filter("date")(new Date(), "yyyy-MM-dd");
} }
HttpService.selectFilmCountData(date1, date2,operator,cardType,function(data) { HttpService.selectFilmCountData(date1, date2,operator,cardType,function(data) {
$scope.paginationConf.totalItems = data; $scope.paginationConf.totalItems = data;
......
src/main/resources/static/views/login/login.js
View file @ 869b9229
...@@ -88,33 +88,39 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http']) ...@@ -88,33 +88,39 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
$rootScope.loginData = resp.data.user; $rootScope.loginData = resp.data.user;
$rootScope.loginData.login =true; $rootScope.loginData.login =true;
localStorageService.set('loginData', resp.data.user); localStorageService.set('loginData', resp.data.user);
$rootScope.menuList = $rootScope.loginData.roleList[0].permissions; if($rootScope.loginData.id !=1){
console.log($scope.menuList) $rootScope.menuList = $rootScope.loginData.roleList[0].permissions;
$rootScope.icons = [ console.log($scope.menuList)
"glyphicon glyphicon-list icon text-primary", $rootScope.icons = [
"fa fa-file icon text-info", "glyphicon glyphicon-list icon text-primary",
"glyphicon glyphicon-briefcase icon text-danger", "fa fa-file icon text-info",
"glyphicon glyphicon-th-large icon text-success", "glyphicon glyphicon-briefcase icon text-danger",
"glyphicon glyphicon-stats icon text-primary-dker", "glyphicon glyphicon-th-large icon text-success",
"glyphicon glyphicon-list icon text-primary", "glyphicon glyphicon-stats icon text-primary-dker",
"fa fa-file icon text-info", "glyphicon glyphicon-list icon text-primary",
"glyphicon glyphicon-briefcase icon text-danger", "fa fa-file icon text-info",
"glyphicon glyphicon-th-large icon text-success", "glyphicon glyphicon-briefcase icon text-danger",
"glyphicon glyphicon-stats icon text-primary-dker", "glyphicon glyphicon-th-large icon text-success",
"glyphicon glyphicon-list icon text-primary", "glyphicon glyphicon-stats icon text-primary-dker",
"fa fa-file icon text-info", "glyphicon glyphicon-list icon text-primary",
"glyphicon glyphicon-briefcase icon text-danger", "fa fa-file icon text-info",
"glyphicon glyphicon-th-large icon text-success", "glyphicon glyphicon-briefcase icon text-danger",
"glyphicon glyphicon-stats icon text-primary-dker", "glyphicon glyphicon-th-large icon text-success",
"glyphicon glyphicon-briefcase icon text-danger", "glyphicon glyphicon-stats icon text-primary-dker",
"glyphicon glyphicon-th-large icon text-success", "glyphicon glyphicon-briefcase icon text-danger",
"glyphicon glyphicon-stats icon text-primary-dker" "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){ whereToGo($rootScope.loginData.roleList[0].process)
window.location.reload(); if(userAgent.indexOf('.NET')!=-1){
window.location.reload();
}else{
browserName(userAgent)
}
}else{ }else{
browserName(userAgent) $rootScope.loginData.login =false;
var url = 'http://192.168.1.15:8088';
window.open(url);
} }
}else{ }else{
$scope.authError = resp.data.message; $scope.authError = resp.data.message;
......
src/main/resources/static/views/queryQualityCheckReport/queryQualityCheckReport.html
View file @ 869b9229
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="box-header"> <div class="box-header">
<strong >报表</strong> <strong >报表</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker1" readonly/> <span>至</span> <span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="queryQualityCheckReport()">查询</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="queryQualityCheckReport()">查询</button>
</div> </div>
...@@ -16,26 +16,69 @@ ...@@ -16,26 +16,69 @@
<!-- /.box-header --> <!-- /.box-header -->
<div class="box box-primary"> <div class="box box-primary">
<div class="box-body"> <div class="box-body">
<div ng-if="qualityCheckReportList.length==0"> <div ng-if="qualityCheckReportList.length==1">
<h4>暂无数据</h4> <h4>暂无数据</h4>
</div> </div>
<div ng-if="qualityCheckReportList.length>0"> <div ng-if="qualityCheckReportList.length>1">
<div class="table-responsive mailbox-messages" > <div class="table-responsive mailbox-messages" >
<div class="mailbox-messages"> <div class="mailbox-messages">
<table class="table table-hover"> <table class="table table-hover postTable table-bordered">
<thead> <thead>
<tr> <tr>
<th>分局代码</th> <th style="text-align: center;">日期</th>
<th>数量</th> <th style="text-align: center;" colspan="2">快证</th>
<th>公安机关名称</th> <th style="text-align: center;" colspan="2">重做登记</th>
<th style="text-align: center;" colspan="2">港澳证</th>
<th style="text-align: center;" colspan="2">台湾证</th>
<th style="text-align: center;" colspan="2">异地证</th>
<th style="text-align: center;" colspan="2">补证</th>
</tr>
<tr class="tr">
<td></td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>数量</td>
</tr> </tr>
</thead> </thead>
<tbody ng-repeat="item in qualityCheckReportList"> <tbody ng-repeat="item in qualityCheckReportList | orderBy:date" style="border-top: 1px solid #f4f4f4;">
<tr style="background-color: #eee"> <tr ng-if="item.date!='合计'">
<td>{{item.DATA_AUDITING.POLICE_SUBSTATION}}</td> <td>{{item.date | myDateFilter}}</td>
<td>{{item.sum(count)}}</td> <td>{{item.list[1].VALID_COUNT}}</td>
<td>{{item.GAJG_DM.GAJG_MC}}</td> <td>{{item.list[1].FAILED_COUNT}}</td>
<td>{{item.list[2].VALID_COUNT}}</td>
<td>{{item.list[2].FAILED_COUNT}}</td>
<td>{{item.list[3].VALID_COUNT}}</td>
<td>{{item.list[3].FAILED_COUNT}}</td>
<td>{{item.list[5].VALID_COUNT}}</td>
<td>{{item.list[5].FAILED_COUNT}}</td>
<td>{{item.list[6].VALID_COUNT}}</td>
<td>{{item.list[6].FAILED_COUNT}}</td>
<td>{{item.list[8].FAILED_COUNT}}</td>
</tr>
<tr ng-if="item.date=='合计'" class="bg-gray">
<td>{{item.date}}：</td>
<td colspan="4">成品证：{{item.list.validCount}}</td>
<td colspan="4">废品证：{{item.list.failedCount}}</td>
<td colspan="3">补证：{{item.list.buCount}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
src/main/resources/static/views/queryQualityCheckReport/queryQualityCheckReport.js
View file @ 869b9229
...@@ -8,6 +8,9 @@ angular.module("AvatarCheck.queryQualityCheckReport",['ngRoute', 'AvatarCheck.ht ...@@ -8,6 +8,9 @@ angular.module("AvatarCheck.queryQualityCheckReport",['ngRoute', 'AvatarCheck.ht
}); });
}]) }])
.controller('queryQualityCheckReportContro', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) { .controller('queryQualityCheckReportContro', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
$scope.date = 'date';
//Date picker //Date picker
$('#datepicker1').datetimepicker({ $('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
...@@ -16,7 +19,7 @@ angular.module("AvatarCheck.queryQualityCheckReport",['ngRoute', 'AvatarCheck.ht ...@@ -16,7 +19,7 @@ angular.module("AvatarCheck.queryQualityCheckReport",['ngRoute', 'AvatarCheck.ht
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-01");
//清除的代码 //清除的代码
$(".glyphicon-remove").click(function(){ $(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val(""); $($($(this).parent()).prev()).val("");
......
src/main/resources/static/views/querySortingReport/querySortingReport.html
View file @ 869b9229
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="box-header"> <div class="box-header">
<strong >分拣报表</strong> <strong >分拣报表</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker1" readonly/> <span>至</span> <span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="querySortingReport()">查询</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="querySortingReport()">查询</button>
</div> </div>
...@@ -16,34 +16,31 @@ ...@@ -16,34 +16,31 @@
<!-- /.box-header --> <!-- /.box-header -->
<div class="box box-primary"> <div class="box box-primary">
<div class="box-body"> <div class="box-body">
<div ng-if="sortingReportList.length==0"> <div ng-if="sortingReportList.length==1">
<h4>暂无数据</h4> <h4>暂无数据</h4>
</div> </div>
<div ng-if="sortingReportList.length>0"> <div ng-if="sortingReportList.length>1">
<div class="table-responsive mailbox-messages" > <div class="table-responsive mailbox-messages" >
<div class="mailbox-messages"> <div class="mailbox-messages">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th>公安机关名称</th> <th>复核日期</th>
<th>公安机关代码</th> <th>复核数量</th>
<th>数量</th> </tr>
</tr> </thead>
</thead> <tbody>
<tbody ng-repeat="item in sortingReportList"> <tr ng-repeat="item in sortingReportList" ng-class="{true: 'bg-gray', false: ''}[item.CHECK_DATE=='合计']">
<tr> <td>{{item.CHECK_DATE}}</td>
<td>{{item.GAJG_MC}}</td> <td>{{item.FINISH_COUNT}}</td>
<td>{{item.POLICE_CODE}}</td> </tr>
<td>{{item.FINISH_COUNT}}</td> </tbody>
</tr> </table>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.table --> <!-- /.table -->
</div> </div>
<!-- /.table -->
</div> </div>
</div>
</div> </div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
......
src/main/resources/static/views/querySortingReport/querySortingReport.js
View file @ 869b9229
...@@ -25,6 +25,7 @@ angular.module("AvatarCheck.querySortingReport",['ngRoute', 'AvatarCheck.http']) ...@@ -25,6 +25,7 @@ angular.module("AvatarCheck.querySortingReport",['ngRoute', 'AvatarCheck.http'])
autoclose: 1 autoclose: 1
}); });
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-01");
$scope.querySortingReport=function () { $scope.querySortingReport=function () {
......
src/main/resources/static/views/queryWorkGroupReport/queryWorkGroupReport.html
View file @ 869b9229
<style>
.postTable .tr td{
text-align: center;
}
</style>
<div class="content row"> <div class="content row">
<div class="col-md-12" style="margin-top:20px;"> <div class="col-md-12" style="margin-top:20px;">
<div class="row"> <div class="row">
...@@ -7,7 +12,7 @@ ...@@ -7,7 +12,7 @@
<div class="box-header"> <div class="box-header">
<strong >工作组报表</strong> <strong >工作组报表</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker1" readonly/> <span>至</span> <span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="queryWorkGroupReport()">查询</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="queryWorkGroupReport()">查询</button>
</div> </div>
...@@ -21,25 +26,52 @@ ...@@ -21,25 +26,52 @@
</div> </div>
<div ng-if="groupReportList.length>1"> <div ng-if="groupReportList.length>1">
<div class="mailbox-messages"> <div class="mailbox-messages">
<table class="table table-hover postTable" > <table class="table table-hover postTable table-bordered">
<thead> <thead>
<tr> <tr>
<th>日期</th> <th style="text-align: center;">日期</th>
<th>邮寄证</th> <th style="text-align: center;" colspan="2">普通证</th>
<th>军人证</th> <th style="text-align: center;" colspan="2">快证</th>
<th>快证</th> <th style="text-align: center;" colspan="2">重做登记</th>
<th>普通证</th> <th style="text-align: center;" colspan="2">军人证</th>
<th>废证</th> <th style="text-align: center;" colspan="2">邮寄证</th>
<th style="text-align: center;" colspan="2">补证</th>
</tr>
<tr class="tr">
<td></td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>数量</td>
</tr> </tr>
</thead> </thead>
<tbody ng-repeat="item in groupReportList | orderBy:date" ng-class="{true: 'bg-gray', false: ''}[item.date=='合计']"> <tbody ng-repeat="item in groupReportList | orderBy:date" style="border-top: 1px solid #f4f4f4;">
<tr> <tr ng-if="item.date!='合计'">
<td>{{item.date}}</td> <td>{{item.date | myDateFilter}}</td>
<td>{{item.you}}</td> <td>{{item.list[0].VALID_COUNT}}</td>
<td>{{item.jun}}</td> <td>{{item.list[0].FAILED_COUNT}}</td>
<td>{{item.kuai}}</td> <td>{{item.list[1].VALID_COUNT}}</td>
<td>{{item.pu}}</td> <td>{{item.list[1].FAILED_COUNT}}</td>
<td>{{item.fei}}</td> <td>{{item.list[2].VALID_COUNT}}</td>
<td>{{item.list[2].FAILED_COUNT}}</td>
<td>{{item.list[4].VALID_COUNT}}</td>
<td>{{item.list[4].FAILED_COUNT}}</td>
<td>{{item.list[7].VALID_COUNT}}</td>
<td>{{item.list[7].FAILED_COUNT}}</td>
<td>{{item.list[8].FAILED_COUNT}}</td>
</tr>
<tr ng-if="item.date=='合计'" class="bg-gray">
<td>{{item.date}}：</td>
<td colspan="4">成品证：{{item.list.validCount}}</td>
<td colspan="4">废品证：{{item.list.failedCount}}</td>
<td colspan="3">补证：{{item.list.buCount}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
src/main/resources/static/views/queryWorkGroupReport/queryWorkGroupReport.js
View file @ 869b9229
...@@ -20,6 +20,7 @@ angular.module("AvatarCheck.queryWorkGroupReport",['ngRoute', 'AvatarCheck.http' ...@@ -20,6 +20,7 @@ angular.module("AvatarCheck.queryWorkGroupReport",['ngRoute', 'AvatarCheck.http'
autoclose: 1 autoclose: 1
}); });
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-01");
//清除的代码 //清除的代码
$(".glyphicon-remove").click(function(){ $(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val(""); $($($(this).parent()).prev()).val("");
......
src/main/resources/static/views/receitp/receitp.html
View file @ 869b9229
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="box-header" style="border-bottom: 1px solid #e0e0e0;"> <div class="box-header" style="border-bottom: 1px solid #e0e0e0;">
<strong>交接单</strong> <strong>交接单</strong>
<div class="box-tools pull-right" > <div class="box-tools pull-right" >
<span>查询时间:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker1" readonly/> <span>至</span> <span>复核时间：</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchHistory()">查询历史</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchHistory()">查询历史</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="doSearchReceitp()">查询</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="doSearchReceitp()">查询</button>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<th>NO.</th> <th>NO.</th>
<th>派出所代码</th> <th>派出所代码</th>
<th>派出所名称</th> <th>派出所名称</th>
<th>受理组号</th> <th>封签编号</th>
<th>证件数量</th> <th>证件数量</th>
<th>复核时间</th> <th>复核时间</th>
<th>复核人姓名</th> <th>复核人姓名</th>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<div class="box-footer" ng-if="receitpData.length>0"> <div class="box-footer" ng-if="receitpData.length>0">
<div class="pull-right" style="margin-left: 10px;"> <div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="printReceitp()">打印交接单</button> <button class="btn btn-primary" ng-click="printReceitp()">打印交接单</button>
<button class="btn btn-primary" ng-click="downloadGAinfo()">下载公安网反馈信息</button> <!--<button class="btn btn-primary" ng-click="downloadGAinfo()">下载公安网反馈信息</button>-->
</div> </div>
</div> </div>
</div> </div>
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<th>NO.</th> <th>NO.</th>
<th>派出所代码</th> <th>派出所代码</th>
<th>派出所名称</th> <th>派出所名称</th>
<th>受理组号</th> <th>封签编号</th>
<th>证件数量</th> <th>证件数量</th>
<th>复核时间</th> <th>复核时间</th>
<th>复核人姓名</th> <th>复核人姓名</th>
...@@ -170,8 +170,8 @@ ...@@ -170,8 +170,8 @@
<!-- /.table --> <!-- /.table -->
<div class="box-footer" ng-if="receitpHistoryData.length>0"> <div class="box-footer" ng-if="receitpHistoryData.length>0">
<div class="pull-right" style="margin-left: 10px;"> <div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="printReceitp(type.typeCode)">打印交接单</button> <button class="btn btn-primary" ng-click="printReceitp(type.typeCode)">出库&打印交接单</button>
<button class="btn btn-primary" ng-click="downloadGAinfo(type.typeCode)">下载公安网反馈信息</button> <!--<button class="btn btn-primary" ng-click="downloadGAinfo()">下载公安网反馈信息</button>-->
</div> </div>
</div> </div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
......
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