Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 3f78886b authored by liuxinben's avatar liuxinben
Browse files
Options

Merge branch 'dev' of… 

Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_beijing_auxiliary_YD into dev
parents f1d2ae06 571b5508
Expand all Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 30 deletions
src/main/java/com/yxproject/start/api/FailedCardApi.java
View file @ 3f78886b
...@@ -77,6 +77,8 @@ public class FailedCardApi { ...@@ -77,6 +77,8 @@ public class FailedCardApi {
map.put("ID_NO", o.toString()); map.put("ID_NO", o.toString());
map.put("NAME", "查无此人"); map.put("NAME", "查无此人");
map.put("SEX_NO", "-1"); map.put("SEX_NO", "-1");
map.put("SEX_NO", "-1");
map.put("ACCEPT_NO", "");
resultMap.add(map); resultMap.add(map);
} }
resultList.addAll(resultMap); resultList.addAll(resultMap);
......
src/main/java/com/yxproject/start/mapper/DataAuditingMapper.java
View file @ 3f78886b
...@@ -33,8 +33,8 @@ public interface DataAuditingMapper { ...@@ -33,8 +33,8 @@ public interface DataAuditingMapper {
public List<Map<String, Object>> selectDataAuditingEntity(@Param("groupNo") String groupNo); public List<Map<String, Object>> selectDataAuditingEntity(@Param("groupNo") String groupNo);
@Select("<script>" + @Select("<script>" +
"select nvl(DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,'000000000') GAJG_MC,DATA_AUDITING.POLICE_SUBSTATION,sum(DATA_AUDITING.VALID_COUNT) VALID_COUNT,\n" + "select nvl(DIC_UPLOAD_UNIT_T.UNIT_NAME,'000000000') GAJG_MC,DATA_AUDITING.POLICE_SUBSTATION,sum(DATA_AUDITING.VALID_COUNT) VALID_COUNT,\n" +
"sum(DATA_AUDITING.INVALID_COUNT) inVALID_COUNT,to_char(DATA_AUDITING.SUBMIT_DATE,'yyyyMMdd') SUBMIT_DATE,CARD_TYPE_DIC.CARD_TYPE,\n" + "sum(DATA_AUDITING.INVALID_COUNT) inVALID_COUNT,CARD_TYPE_DIC.CARD_TYPE,\n" +
"CARD_TYPE_DIC.CARD_TYPE_ID,1-(sum(DATA_AUDITING.VALID_COUNT)/(sum(DATA_AUDITING.VALID_COUNT)+sum(DATA_AUDITING.inVALID_COUNT))) Failure_rate from DATA_AUDITING \n" + "CARD_TYPE_DIC.CARD_TYPE_ID,1-(sum(DATA_AUDITING.VALID_COUNT)/(sum(DATA_AUDITING.VALID_COUNT)+sum(DATA_AUDITING.inVALID_COUNT))) Failure_rate from DATA_AUDITING \n" +
"left join TASK on TASK.TASK_ID = DATA_AUDITING.TASK_ID\n" + "left join TASK on TASK.TASK_ID = DATA_AUDITING.TASK_ID\n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = TASK.CARD_TYPE " + "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = TASK.CARD_TYPE " +
...@@ -50,7 +50,7 @@ public interface DataAuditingMapper { ...@@ -50,7 +50,7 @@ public interface DataAuditingMapper {
" and TASK.CARD_TYPE = ${typeCode}"+ " and TASK.CARD_TYPE = ${typeCode}"+
"</if> " + "</if> " +
" and to_char(DATA_AUDITING.SUBMIT_DATE,'yyyyMMdd') BETWEEN ${startDate} and ${endDate} \n" + " and to_char(DATA_AUDITING.SUBMIT_DATE,'yyyyMMdd') BETWEEN ${startDate} and ${endDate} \n" +
"group by nvl(DIC_UPLOAD_UNIT_T.UNIT_NAME,'000000000'),DATA_AUDITING.POLICE_SUBSTATION, to_char(DATA_AUDITING.SUBMIT_DATE,'yyyyMMdd'), CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID\n" + "group by nvl(DIC_UPLOAD_UNIT_T.UNIT_NAME,'000000000'),DATA_AUDITING.POLICE_SUBSTATION, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID\n" +
"order by DATA_AUDITING.POLICE_SUBSTATION" + "order by DATA_AUDITING.POLICE_SUBSTATION" +
"</script>") "</script>")
public List<Map<String, Object>> selectDataAuditingReport(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("policeName") String policeName, @Param("policeCode") String policeCode,@Param("typeCode")String typeCode); public List<Map<String, Object>> selectDataAuditingReport(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("policeName") String policeName, @Param("policeCode") String policeCode,@Param("typeCode")String typeCode);
......
src/main/java/com/yxproject/start/mapper/FailedCardMapper.java
View file @ 3f78886b
...@@ -32,7 +32,8 @@ public interface FailedCardMapper { ...@@ -32,7 +32,8 @@ public interface FailedCardMapper {
"PROD_CARD_T.SEX_NO,\n" + "PROD_CARD_T.SEX_NO,\n" +
"PROD_CARD_T.ID_NO,\n" + "PROD_CARD_T.ID_NO,\n" +
"SPECIAL_CARD.SPECIAL_TYPE, " + "SPECIAL_CARD.SPECIAL_TYPE, " +
"FAILED_CARD_REASON_DIC.FAILED_CARD_REASON \n " + "FAILED_CARD_REASON_DIC.FAILED_CARD_REASON " +
",PROD_CARD_T.ACCEPT_NO ACCEPT_NO ,PROD_CARD_T.begin_date " +
"FROM PRODYD_DBA.PROD_CARD_T@PRODYD_LINK\n" + "FROM PRODYD_DBA.PROD_CARD_T@PRODYD_LINK\n" +
"left join SPECIAL_CARD on PROD_CARD_T.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO " + "left join SPECIAL_CARD on PROD_CARD_T.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO " +
"left join failed_card on PROD_CARD_T.ACCEPT_NO = failed_card.ACCEPT_NO " + "left join failed_card on PROD_CARD_T.ACCEPT_NO = failed_card.ACCEPT_NO " +
......
src/main/java/com/yxproject/start/mapper/GroupNoMapper.java
View file @ 3f78886b
...@@ -70,12 +70,12 @@ public interface GroupNoMapper { ...@@ -70,12 +70,12 @@ public interface GroupNoMapper {
"PROD_GROUP_T.valid_count,\n" + "PROD_GROUP_T.valid_count,\n" +
"PROD_GROUP_T.invalid_count, \n" + "PROD_GROUP_T.invalid_count, \n" +
"'000000' county_code\n" + "'000000' county_code\n" +
"from PRODYD_DBA.PROD_CARD_T@PROD_LINK \n" + "from PRODYD_DBA.PROD_CARD_T@PRODYD_LINK \n" +
"left join PREPRO_PERSON \n" + "left join PREPRO_PERSON \n" +
"on PREPRO_PERSON.JMSFZSLH = PROD_CARD_T.upload_no\n" + "on PREPRO_PERSON.JMSFZSLH = PROD_CARD_T.upload_no\n" +
"left join PRODYD_DBA.PROD_GROUP_T@PROD_LINK\n" + "left join PRODYD_DBA.PROD_GROUP_T@PRODYD_LINK\n" +
"on substr(PROD_CARD_T.accept_no,0,8) = PROD_GROUP_T.group_no \n" + "on substr(PROD_CARD_T.accept_no,0,8) = PROD_GROUP_T.group_no \n" +
"left join PRODYD_DBA.PROD_GROUP_RELATION_T@PROD_LINK \n" + "left join PRODYD_DBA.PROD_GROUP_RELATION_T@PRODYD_LINK \n" +
"on PROD_GROUP_RELATION_T.group_no =PROD_GROUP_T.group_no \n" + "on PROD_GROUP_RELATION_T.group_no =PROD_GROUP_T.group_no \n" +
"left join CARD_TYPE_DIC \n" + "left join CARD_TYPE_DIC \n" +
"on decode(substr(ORIGINAL_NO,3,2),'99',6,substr(ORIGINAL_NO,21,1)) = CARD_TYPE_DIC.CARD_TYPE_ID \n" + "on decode(substr(ORIGINAL_NO,3,2),'99',6,substr(ORIGINAL_NO,21,1)) = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
......
src/main/resources/application.yml
View file @ 3f78886b
server: server:
port: 8082 port: 8082
#spring相关 #spring相关+
spring: spring:
datasource: datasource:
driver-class-name: oracle.jdbc.driver.OracleDriver driver-class-name: oracle.jdbc.driver.OracleDriver
url: jdbc:oracle:thin:@192.168.10.65:1521:yingxin url: jdbc:oracle:thin:@192.168.1.16:1521:yingxin
username: yingxinyd username: yingxinyd
password: yingxinyd password: yingxinyd
servlet: servlet:
......
src/main/resources/static/dialogs/confirmFailedCards.html
View file @ 3f78886b
...@@ -5,20 +5,24 @@ ...@@ -5,20 +5,24 @@
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<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>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in personInfo"> <tr ng-repeat="item in personInfo">
<td>{{$index + 1}}</td> <td>{{$index + 1}}</td>
<td>{{item.ACCEPT_NO}}</td>
<td>{{item.ID_NO}}</td> <td>{{item.ID_NO}}</td>
<td ng-if="item.NAME=='查无此人'" style="color: red;">{{item.NAME}}</td> <td ng-if="item.NAME=='查无此人'" style="color: red;">{{item.NAME}}</td>
<td ng-if="item.NAME!='查无此人'">{{item.NAME}}</td> <td ng-if="item.NAME!='查无此人'">{{item.NAME}}</td>
<td ng-if="item.SEX_NO==1">男</td> <td ng-if="item.SEX_NO==1">男</td>
<td ng-if="item.SEX_NO==2">女</td> <td ng-if="item.SEX_NO==2">女</td>
<td ng-if="item.SEX_NO==-1">错误</td> <td ng-if="item.SEX_NO==-1">错误</td>
<td>{{item.BEGIN_DATE}}</td>
<td ng-if="item.SPECIAL_TYPE==2" class="text-danger">快证</td> <td ng-if="item.SPECIAL_TYPE==2" class="text-danger">快证</td>
<td ng-if="item.SPECIAL_TYPE==1" class="text-danger">余证</td> <td ng-if="item.SPECIAL_TYPE==1" class="text-danger">余证</td>
<td ng-if="item.FAILED_CARD_REASON!=null" class="text-danger">废证</td> <td ng-if="item.FAILED_CARD_REASON!=null" class="text-danger">废证</td>
......
src/main/resources/static/js/service.js
View file @ 3f78886b
...@@ -561,14 +561,11 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -561,14 +561,11 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
getTaskListToCreate:function(groupNo1,groupNo2,date,success){ getTaskListToCreate:function(date,success){
console.log($rootScope.loginData.roleList[0].process,groupNo1,groupNo2,date);
$http({ $http({
method: 'GET', method: 'GET',
url: "../TaskList/queryByCountyAtACCU"+urlTimeStamp(), url: "../TaskList/queryByCountyAtACCU"+urlTimeStamp(),
params:{ params:{
groupNo1:groupNo1,
groupNo2:groupNo2,
process:$rootScope.loginData.roleList[0].process, process:$rootScope.loginData.roleList[0].process,
date:date date:date
} }
...@@ -577,7 +574,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -577,7 +574,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}) })
}, },
getCreateHistoryTask:function(date,success){ getCreateHistoryTask:function(date,success){
console.log(date)
$http({ $http({
method: 'GET', method: 'GET',
url: "../TaskList/queryHistoryTaskAtAuxiliary"+urlTimeStamp(), url: "../TaskList/queryHistoryTaskAtAuxiliary"+urlTimeStamp(),
......
src/main/resources/static/views/addFailed/addFailed.html
View file @ 3f78886b
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
身份证号: 身份证号:
</td> </td>
<td> <td>
<input type="text" placeholder="请填写身份证号" class="{{$index}}" style="height: 34px;"> <input type="text" placeholder="请填写身份证号" class="{{$index}}" style="height: 34px;width: 100%;">
</td> </td>
<td> <td>
废证原因: 废证原因:
......
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ 3f78886b
...@@ -29,7 +29,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -29,7 +29,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
$scope.totalCardProd = 0; $scope.totalCardProd = 0;
$scope.isHistory=0; $scope.isHistory=0;
//用于区分制证库保存或者受理库保存数据 //用于区分制证库保存或者受理库保存数据
$scope.type="ACCU";
//查询制证库 //查询制证库
$scope.searchCurrentFromProd = function () { $scope.searchCurrentFromProd = function () {
if(angular.isUndefined($scope.groupNo1)||angular.isUndefined($scope.groupNo2)){ if(angular.isUndefined($scope.groupNo1)||angular.isUndefined($scope.groupNo2)){
...@@ -50,7 +50,9 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -50,7 +50,9 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
$scope.type="PRODU"; $scope.type="PRODU";
} }
}; };
//查询受理库
$scope.searchCurrent = function(){ $scope.searchCurrent = function(){
$scope.type="ACCU";
$scope.totalCardProd = 0; $scope.totalCardProd = 0;
$scope.selected = []; $scope.selected = [];
$scope.isHistory=0; $scope.isHistory=0;
...@@ -58,7 +60,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -58,7 +60,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
if(date=='{{choseDate}}'){ if(date=='{{choseDate}}'){
date=$scope.choseDate; date=$scope.choseDate;
} }
HttpService.getTaskListToCreate($scope.groupNo1,$scope.groupNo2,date,function(data){ HttpService.getTaskListToCreate(date,function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){ for(var i=0;i<$scope.cycleSheetData.length;i++){
$scope.totalCardProd = $scope.totalCardProd+$scope.cycleSheetData[i].typeSum; $scope.totalCardProd = $scope.totalCardProd+$scope.cycleSheetData[i].typeSum;
...@@ -71,7 +73,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -71,7 +73,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
console.log("当天：",$scope.cycleSheetData) console.log("当天：",$scope.cycleSheetData)
}) })
$scope.type="PRODU";
}; };
if($rootScope.loginData.login==true){ if($rootScope.loginData.login==true){
$scope.searchCurrent(); $scope.searchCurrent();
......
src/main/resources/static/views/queryQualityCheckReport/queryQualityCheckReport.html
View file @ 3f78886b
...@@ -46,16 +46,6 @@ ...@@ -46,16 +46,6 @@
<td class="text-danger">废品</td> <td class="text-danger">废品</td>
<td>成品</td> <td>成品</td>
<td class="text-danger">废品</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>数量</td>
</tr> </tr>
</thead> </thead>
......
src/main/resources/static/views/task/taskListSorting.html
View file @ 3f78886b
...@@ -56,8 +56,9 @@ ...@@ -56,8 +56,9 @@
</thead> </thead>
<tbody ng-repeat="task in type.countyList"> <tbody ng-repeat="task in type.countyList">
<tr> <tr>
<td ng-show="type.typeCode=='100'||(task.faileCount==0&&(task.countyValidCount-task.specialCount)==task.eWriteCount&&task.eWriteCount==task.recheckCount)"> <td >
<input type="checkbox" class="checkOneBox" <input ng-if="type.typeCode=='100'||(task.faileCount==0&&task.countyValidCount==task.eWriteCount)"
type="checkbox" class="checkOneBox"
ng-checked="isSelected(task)" value="{{task.taskId}}" ng-checked="isSelected(task)" value="{{task.taskId}}"
ng-click="updateSelection($event,task)"> ng-click="updateSelection($event,task)">
</td> </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