Skip to content

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

Merge branch 'dev' of… 

Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev
parents 5e11320e 19e0f001
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 49 deletions
src/main/java/com/yxproject/start/api/FailedCardApi.java
View file @ df58442a
......@@ -87,28 +87,34 @@ public class FailedCardApi {
* @param jsonStr
* @return
*/
//TODO 多张余证可以生成一张任务单 判断是否是同一个countyCode
@RequestMapping("insertRemaining")
@Transactional(rollbackFor = Exception.class)
public Boolean insertRemaining(@RequestBody String jsonStr){
JSONArray jsonarray = JSONArray.fromObject(jsonStr);
JSONObject jsonObject = JSONObject.fromObject(jsonStr);
JSONArray jsonarray = JSONArray.fromObject(jsonObject.get("list"));
System.out.println("1111111111111"+jsonarray);
TaskEntity taskEntity = new TaskEntity();
List<Object> taskEntityList = new ArrayList<>();
//TODO 多张余证可以生成一张任务单 判断是否是同一个countyCode
for (Object o:jsonarray) {
JSONObject jsonObject =(JSONObject)o;
for (int i=0;i<jsonarray.size();i++) {
/*查询生成任务单需要的数据*/
Map<String,Object> resultMap= failedCardService.selectTaskListDate(jsonObject.getString("ACCEPT_NO"));
String countyCode = resultMap.get("COUNTY_CODE").toString();
Long cardType = (Long) resultMap.get("CARD_TYPE_ID");
taskEntity.setCountyCode(countyCode);
taskEntity.setCardType(cardType);
taskEntity.setTaskStateId((long) 1);
taskEntityList.add(taskEntity);
// JSONObject jsonObject2 =(JSONObject)o;
Map<String,Object> resultMap= failedCardService.selectTaskListDate((String) jsonarray.get(i));
try {
String countyCode = resultMap.get("COUNTY_CODE").toString();
Long cardType = (Long) resultMap.get("CARD_TYPE_ID");
taskEntity.setCountyCode(countyCode);
taskEntity.setCardType(cardType);
taskEntity.setTaskStateId((long) 1);
}catch (NullPointerException e){
}
System.out.println("333333333333333333333333过");
taskListService.saveTask(taskEntity);
/*特证表添加特证*/
failedCardService.addSpecialCard(jsonObject.getString("ACCEPT_NO"));
failedCardService.addSpecialCard((String) jsonarray.get(i));
/*特证数+1*/
failedCardService.specialCardAdd(jsonObject.getString("ACCEPT_NO"));
failedCardService.specialCardAdd((String) jsonarray.get(i));
}
return true;
}
......
src/main/java/com/yxproject/start/mapper/SelectSerialNumberMapper.java
View file @ df58442a
......@@ -12,7 +12,7 @@ import java.util.Map;
@Mapper
public interface SelectSerialNumberMapper {
@Select("select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,CARD_TYPE_DIC.CARD_TYPE,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
@Select("select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
" from TASK \n" +
" LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
" LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
......@@ -20,7 +20,7 @@ public interface SelectSerialNumberMapper {
public List<Map<String,Object>> selectByWorkOrder(String id);
@Select("select GROUP_NO.TASK_ID,COUNTY_DIC.COUNTYNAME,CARD_TYPE_DIC.CARD_TYPE,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
@Select("select GROUP_NO.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
"from TASK\n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
......@@ -28,7 +28,7 @@ public interface SelectSerialNumberMapper {
"WHERE GROUP_NO =#{id}")
public List<Map<String,Object>> selectByGroupNo(String id);
@Select("select GROUP_NO.TASK_ID,COUNTY_DIC.COUNTYNAME,CARD_TYPE_DIC.CARD_TYPE,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
@Select("select GROUP_NO.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
"from TASK\n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
......@@ -38,7 +38,7 @@ public interface SelectSerialNumberMapper {
"WHERE PREPRO_PERSON.GMSFHM =#{id} OR PROD_CARD_T.ACCEPT_NO=#{id}")
public List<Map<String,Object>> selectByAcceptNoOrCardIdFromTaskList(String id);
@Select("SELECT ACC_CARD_T.ACCEPT_NO,COUNTY_DIC.COUNTYNAME,ACC_CARD_T.NAME,CARD_TYPE_DIC.CARD_TYPE,ACC_CARD_T.ID_NO,ACC_CARD_T.SEX_NO,\n" +
@Select("SELECT ACC_CARD_T.ACCEPT_NO,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,ACC_CARD_T.NAME,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,ACC_CARD_T.ID_NO,ACC_CARD_T.SEX_NO,\n" +
"GAJG_DM.GAJG_MC AS GAJG1,ACC_CARD_T.BEGIN_DATE,ACC_CARD_T.EXPIRE_DATE,ACC_CARD_T.SIGN_GOVT\n" +
"FROM ACC_CARD_T@ACCU_LINK\n" +
"LEFT JOIN COUNTY_DIC ON subStr(ACC_CARD_T.UPLOAD_NO,0,6)=COUNTY_DIC.COUNTY_CODE\n" +
......@@ -56,7 +56,7 @@ public interface SelectSerialNumberMapper {
// "PROD_TRACE_T.ELECTRIC_WRITE_DATE,\n" +
// "PROD_TRACE_T.CHECK_DATE,\n" +
// "PROD_TRACE_T.MOVE_DATE\n" +
@Select("SELECT PROD_CARD_T.ACCEPT_NO,COUNTY_DIC.COUNTYNAME,PROD_CARD_T.NAME,CARD_TYPE_DIC.CARD_TYPE,PROD_CARD_T.ID_NO,PROD_CARD_T.SEX_NO,\n" +
@Select("SELECT PROD_CARD_T.ACCEPT_NO,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,PROD_CARD_T.NAME,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,PROD_CARD_T.ID_NO,PROD_CARD_T.SEX_NO,\n" +
"GAJG_DM.GAJG_MC AS GAJG1,PROD_CARD_T.BEGIN_DATE,PROD_CARD_T.EXPIRE_DATE,PROD_CARD_T.SIGN_GOVT\n" +
"FROM PROD_CARD_T@PROD_LINK\n" +
"LEFT JOIN COUNTY_DIC ON subStr(PROD_CARD_T.UPLOAD_NO,0,6)=COUNTY_DIC.COUNTY_CODE\n" +
......
src/main/resources/static/js/app.js
View file @ df58442a
......@@ -198,8 +198,34 @@ angular.module('AvatarCheck', [
$location.path("/createTaskList");
}
$scope.addQuickCard = function(){
$scope.addQuickCardAccu = function(){
var idx = $(".accu:checked").val();
var check = idx.split("+");
var json={};
json.acceptNo=check[0];
json.cardType=check[2];
json.countyCode=check[1];
json.name=$rootScope.loginData.name;
console.log(json)
HttpService.addSpecialCard(json,function (data) {
console.log($scope.searchInput)
$scope.doSearch($scope.searchInput)
})
}
$scope.addQuickCardProd = function(){
var idx = $(".prod:checked").val();
var check = idx.split("+");
console.log(idx,check)
var json={};
json.acceptNo=check[0];
json.cardType=check[2];
json.countyCode=check[1];
json.name=$rootScope.loginData.name;
console.log(json)
HttpService.addSpecialCard(json,function (data) {
console.log($scope.searchInput)
$scope.doSearch($scope.searchInput)
})
}
......
src/main/resources/static/js/service.js
View file @ df58442a
......@@ -527,6 +527,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) {
success(response.data)
})
},
addSpecialCard:function(data,success){
var body = JSON.stringify(data);
$http({
method: 'POST',
url: "../TaskList/createFastTask",
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
}
}
});
\ No newline at end of file
src/main/resources/static/views/searchCard/searchCard.html
View file @ df58442a
......@@ -59,6 +59,7 @@
<table class="table table-hover table-bordered">
<thead>
<tr>
<th></th>
<th>受理号</th>
<th>区县</th>
<th>姓名</th>
......@@ -74,25 +75,27 @@
</tr>
</thead>
<tbody>
<tr>
<td>02213546871</td>
<td>海淀区</td>
<td>伯阳</td>
<td>普通证</td>
<td>130133199405250011</td>
<td>男</td>
<td>赵县公安局</td>
<td>20090228</td>
<td>20190228</td>
<td>赵县派出所</td>
<td>快证</td>
<td>2019-03-03 13:58:30</td>
<tr ng-repeat="item in searchResult.ACCdata">
<td><input type="checkbox" value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}" class="accu"></td>
<td>{{item.ACCEPT_NO}}</td>
<td>{{item.COUNTYNAME}}</td>
<td>{{item.NAME}}</td>
<td>{{item.CARD_TYPE}}</td>
<td>{{item.ID_NO}}</td>
<td ng-if="item.SEX_NO==1">男</td>
<td ng-if="item.SEX_NO==2">女</td>
<td>{{item.GAJG1}}</td>
<td>{{item.BEGIN_DATE | myDateFilter}}</td>
<td>{{item.EXPIRE_DATE | myDateFilter}}</td>
<td>{{item.SIGN_GOVT}}</td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
</div>
<div style="text-align:right;padding: 10px;padding-top: 0;">
<button class="btn btn-info" ng-click="addQuickCard()">添加快证</button>
<button class="btn btn-info" ng-click="addQuickCardAccu()">添加快证</button>
<button class="btn btn-danger">退证</button>
</div>
</div>
......@@ -107,6 +110,7 @@
<table class="table table-hover table-bordered">
<thead>
<tr>
<th></th>
<th>受理号</th>
<th>区县</th>
<th>姓名</th>
......@@ -122,25 +126,27 @@
</tr>
</thead>
<tbody>
<tr>
<td>02213546871</td>
<td>海淀区</td>
<td>伯阳</td>
<td>普通证</td>
<td>130133199405250011</td>
<td>男</td>
<td>赵县公安局</td>
<td>20090228</td>
<td>20190228</td>
<td>赵县派出所</td>
<td>快证</td>
<td>2019-03-03 13:58:30</td>
<tr ng-repeat="item in searchResult.PRODData">
<td><input type="checkbox" value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}" class="prod"></td>
<td>{{item.ACCEPT_NO}}</td>
<td>{{item.COUNTYNAME}}</td>
<td>{{item.NAME}}</td>
<td>{{item.CARD_TYPE}}</td>
<td>{{item.ID_NO}}</td>
<td ng-if="item.SEX_NO==1">男</td>
<td ng-if="item.SEX_NO==2">女</td>
<td>{{item.GAJG1}}</td>
<td>{{item.BEGIN_DATE | myDateFilter}}</td>
<td>{{item.EXPIRE_DATE | myDateFilter}}</td>
<td>{{item.SIGN_GOVT}}</td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
</div>
<div style="text-align:right;padding: 10px;padding-top: 0;">
<button class="btn btn-info">添加快证</button>
<button class="btn btn-info" ng-click="addQuickCardProd()">添加快证</button>
<button class="btn btn-danger">退证</button>
</div>
</div>
......
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