Skip to content

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

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

parents 1c7d48a5 fc9b4435
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 38 deletions
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ 9f63d4a5
......@@ -274,7 +274,7 @@ public class TaskListApi {
boolean b = taskListService.saveTask(objects, name, 0 + "");
}
Map<String,Object> map = new LinkedHashMap<>();
map.put("msg","成功生成循环单");
map.put("msg","成功生成任务单");
return map;
}
......
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @ 9f63d4a5
......@@ -199,7 +199,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 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" +
" where to_char(CHECK_DATE,'yyyyMMdd') = #{date} and RECEIPT_LIST.id in (string) and CARD_TYPE_DIC.CARD_TYPE_ID=#{type} ")
" where to_char(CHECK_DATE,'yyyyMMdd') = #{date} and RECEIPT_LIST.POLICE_CODE in (#{string}) and CARD_TYPE_DIC.CARD_TYPE_ID=#{type} ")
public List<Map<String,Object>> selectReceiptDate(@Param("date") String date,@Param("string") String string,@Param("type") long type);
......
src/main/java/com/yxproject/start/service/ReceiptService.java
View file @ 9f63d4a5
......@@ -62,7 +62,7 @@ public interface ReceiptService {
public boolean updateDetail(@Param("acceptNo")String accept,@Param("note")String note);
public List<Map<String,Object>> selectReceiptList(List<String> stringList,String date,long typeCode);
public List<Map<String,Object>> selectReceiptList(List<Integer> stringList,String date,long typeCode);
public Map<String,Object>selectDetailedData2(String id);
......
src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java
View file @ 9f63d4a5
......@@ -155,11 +155,11 @@ public class ReceiptServiceImpl implements ReceiptService {
}
@Override
public List<Map<String, Object>> selectReceiptList(List<String> stringList, String date, long typeCode) {
String str = null;
public List<Map<String, Object>> selectReceiptList(List<Integer> stringList, String date, long typeCode) {
String str ="";
for (int i =0;i<stringList.size();i++){
if (i!=stringList.size()-1){
str+=stringList.get(i);
if (i==stringList.size()-1){
str+=stringList.get(i)+"";
}else {
str+=stringList.get(i)+",";
}
......@@ -210,14 +210,14 @@ public class ReceiptServiceImpl implements ReceiptService {
List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(type);
Map<String, Object> typemap = new LinkedHashMap<>();
for (Map<String, Object> o : mapList) {
if (typemap != null && typemap.containsKey(o.get("POLICE_CODE") + "")) {
List<Map<String, Object>> maplist_county = (List<Map<String, Object>>) typemap.get(o.get("POLICE_CODE") + "");
if (typemap != null && typemap.containsKey(o.get("COUNTYNAME") + "")) {
List<Map<String, Object>> maplist_county = (List<Map<String, Object>>) typemap.get(o.get("COUNTYNAME") + "");
maplist_county.add(o);
typemap.put(o.get("POLICE_CODE") + "", maplist_county);
typemap.put(o.get("COUNTYNAME") + "", maplist_county);
} else {
List<Map<String, Object>> maplist_county = new ArrayList<>();
maplist_county.add(o);
typemap.put(o.get("POLICE_CODE") + "", maplist_county);
typemap.put(o.get("COUNTYNAME") + "", maplist_county);
}
}
typeMap.put(type, typemap);
......@@ -264,7 +264,6 @@ public class ReceiptServiceImpl implements ReceiptService {
countyMapGroup.put("groupNum", createGroupNo(c, nsList));
}
countyMapGroup.put("countyCode", countyCode);
countyMapGroup.put("taskId", taskId);
countyMapGroup.put("policeList", countyMapList);
countyMapGroup.put("countyName", countyName);
countyMapGroup.put("countyValidCount", validCount);
......
src/main/java/com/yxproject/start/utils/ExportExcel.java
View file @ 9f63d4a5
......@@ -172,7 +172,7 @@ public class ExportExcel {
FileOutputStream fout = null;
try {
// fout = new FileOutputStream("E:\\Excel\\" + simpleDateFormat.format(new Date()) + countyInfoList.get(0).get("COUNTYNAME") + ".xls");
fout = new FileOutputStream("D:\\Excel\\" + simpleDateFormat.format(new Date())+ "公安网信息表" + ".xls");
fout = new FileOutputStream("F:\\Excel\\" + simpleDateFormat.format(new Date())+ "交接单" + ".xls");
wb.write(fout);
fout.close();
} catch (IOException e) {
......@@ -181,7 +181,7 @@ public class ExportExcel {
System.out.println("Excel文件生成成功..." + new Date());
// return "E:\\Excel\\" + simpleDateFormat.format(new Date()) +countyInfoList.get(0).get("COUNTYNAME") + ".xls";
return "D:\\Excel\\" + simpleDateFormat.format(new Date()) + "交接单" + ".xls";
return "F:\\Excel\\" + simpleDateFormat.format(new Date()) + "交接单" + ".xls";
}
......
src/main/resources/static/index.html
View file @ 9f63d4a5
......@@ -119,9 +119,6 @@
<span class="hidden-xs" ng-bind="loginData.name"></span>
</a>
</li>
<li class="dropdown user user-menu">
<a ng-click="logout()" class="btn btn-flat" style="background-color: #0c6ba2;border: 0">退出当前用户</a>
</li>
</ul>
</div>
......
src/main/resources/static/js/service.js
View file @ 9f63d4a5
......@@ -870,6 +870,19 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) {
success(response.data)
})
},
printReceitpData:function(data,success) {
var body = JSON.stringify(data);
$http({
method: 'POST',
url: "../exportExcel/printReceiptExcelData",
data: body,
headers: {'Content-Type': 'application/json'},
transformRequest: angular.identity,
responseType:'arraybuffer'
}).then(function successCallback(response) {
success(response.data)
})
}
}
});
\ No newline at end of file
src/main/resources/static/views/receitp/receitp.html
View file @ 9f63d4a5
......@@ -45,7 +45,7 @@
</thead>
<tbody ng-repeat="item in type.countyList">
<tr style="background-color: #eee">
<td><input type="checkbox" class="checkAllPolice" ng-click="checkAllPolice($event,item.countyCode)"></td>
<td><input type="checkbox" class="checkAllPolice" value="{{item.policeList}}" ng-click="checkAllPolice($event,item.countyCode)"></td>
<td></td>
<td>{{item.countyCode}}</td>
<td style="color: #3c8dbc">{{item.countyName}}</td>
......@@ -55,7 +55,7 @@
</tr>
<tr ng-repeat="police in item.policeList">
<td></td>
<td>{{$index+1}}</td>
<td>{{police.ID}}</td>
<td>{{police.GAJG_DM}}</td>
<td>{{police.GAJG_MC}}</td>
<td>{{police.FINISH_COUNT}}</td>
......@@ -67,9 +67,12 @@
<!-- /.table -->
</div>
<!-- /.table -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="goes()">下发任务单</button>
</div>
<div class="box-footer" ng-if="receitpData.length>0">
<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="downloadGAinfo()">下载公安网反馈信息</button>
</div>
</div>
</div>
</div>
<div ng-if="receitpData.length==0">
......
src/main/resources/static/views/receitp/receitp.js
View file @ 9f63d4a5
......@@ -74,16 +74,28 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
}
}
// $scope.checkAllPolice = function($event,countyCode) {
// var checkAllPolice = $event.target;
// var checkPolice =$(".checkPolice"+countyCode);
// for (var i=0;i<checkPolice.length;i++){
// if(checkAllPolice.checked) {
// checkPolice[i].checked = true;
// }else {
// checkPolice[i].checked = false;
// }
// }
// }
$scope.printReceitp = function(typeCode) {
var date = $('#datepicker').val();
var json={
type:typeCode,
date:date,
list:[]
}
var checks = $(".checkAllPolice:checked")
for (var i=0;i<checks.length;i++){
for(var j=0;j<JSON.parse(checks[i].value).length;j++){
json.list.push(JSON.parse(checks[i].value)[j].POLICE_CODE)
}
}
console.log(json)
HttpService.printReceitpData(json,function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var a = document.createElement("a");
document.body.appendChild(a);
a.href = URL.createObjectURL(blob);
// a.download = fileName;
a.click();
})
}
});
\ No newline at end of file
src/main/resources/static/views/tagPrint/tagPrint.html
View file @ 9f63d4a5
......@@ -116,12 +116,9 @@
</table>
<div class="box-footer clearfix" style="border: 0;">
<button class="btn btn-success pull-right" style="margin-right: 20px;" ng-click="checkSame(json.id)">复核一致</button>
<button class="btn btn-info pull-right" style="margin-right: 20px;" ng-click="PreviewMytableRotate()">打印标签</button>
<button class="btn btn-info pull-right" style="margin-right: 20px;" ng-click="PreviewMytableRotate()">打印封条</button>
</div>
</div>
<h4 class="col-md-7" ng-if="json.policeCardsList.length==0">
暂无数据
</h4>
</div>
</div>
</div>
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ 9f63d4a5
......@@ -54,6 +54,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
HttpService.selectTagPrintData($scope.idCard,function(data){
console.log(data)
if(data){
$scope.json.policeCardsList=[];
getPoliceListDataNotChecked();
}else{
MessageService.showAlert("生成交接单失败")
......@@ -67,7 +68,6 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
HttpService.updateReceiptList(id,function(data) {
if(data){
getPoliceListDataNotChecked();
json.policeCardsList=[];
}else {
MessageService.showAlert("复核失败")
}
......
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