Skip to content

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

修改查询生成交接单数据

parent b5dd5406
Expand all Show whitespace changes
Inline Side-by-side
Showing with 148 additions and 8 deletions
src/main/java/com/yxproject/start/api/DeliveredApi.java
View file @ b933e36e
...@@ -211,6 +211,25 @@ public class DeliveredApi { ...@@ -211,6 +211,25 @@ public class DeliveredApi {
return mapList; return mapList;
} }
/**
* 库房确认接收妥投失败证件
* @param json 妥投失败证件号
* @return
*/
@RequestMapping("acceptDeliveredFailed")
// @RequiresPermissions("userInfo.add")//权限管理;
public boolean acceptDeliveredFailed(@RequestBody String json) {
JSONObject jsonObject = JSONObject.fromObject(json);
JSONArray jsonArray = (JSONArray) jsonObject.get("cardIdList");
List<String> list = (List<String>) jsonArray;
for (String cardId:list){
//todo 确认接收妥投失败证件
}
return true;
}
/** /**
* 删除导入妥投信息 * 删除导入妥投信息
......
src/main/java/com/yxproject/start/api/ExportExcelApi.java
View file @ b933e36e
...@@ -68,7 +68,7 @@ public class ExportExcelApi { ...@@ -68,7 +68,7 @@ public class ExportExcelApi {
String startDate = jsonObject.get("startDate").toString(); String startDate = jsonObject.get("startDate").toString();
String endDate = jsonObject.get("endDate").toString(); String endDate = jsonObject.get("endDate").toString();
String type = jsonObject.get("type").toString(); String type = jsonObject.get("type").toString();
Map<String, Object> map = receiptService.selectReceiptList(jsonArray, replaceDate(startDate),replaceDate(endDate), Long.valueOf(type)); Map<String, Object> map = receiptService.selectReceiptList(jsonArray, replaceDate(startDate), replaceDate(endDate), Long.valueOf(type));
// 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");
...@@ -113,7 +113,7 @@ public class ExportExcelApi { ...@@ -113,7 +113,7 @@ public class ExportExcelApi {
* @return * @return
*/ */
private String replaceDate(String str) { private String replaceDate(String str) {
return str.replace("-", "").replace(" ","").replace(":",""); return str.replace("-", "").replace(" ", "").replace(":", "");
} }
......
src/main/java/com/yxproject/start/api/FailedCardApi.java
View file @ b933e36e
...@@ -85,7 +85,7 @@ public class FailedCardApi { ...@@ -85,7 +85,7 @@ public class FailedCardApi {
idMap = failedCardService.selectCountIdByCardId(jsonObject.getString("cardId")); idMap = failedCardService.selectCountIdByCardId(jsonObject.getString("cardId"));
} }
int initiator = 5; int initiator = 5;
failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), idMap.get("ACCEPT_NO").toString(), idMap.get("TASK_ID").toString(), String.valueOf(initiator), jsonObject.getString("note"),idMap.get("WORK_GROUP").toString()); failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), idMap.get("ACCEPT_NO").toString(), idMap.get("TASK_ID").toString(), String.valueOf(initiator), jsonObject.getString("note"), idMap.get("WORK_GROUP").toString());
} }
return true; return true;
} }
...@@ -96,7 +96,6 @@ public class FailedCardApi { ...@@ -96,7 +96,6 @@ public class FailedCardApi {
* @param jsonStr * @param jsonStr
* @return * @return
*/ */
//TODO 多张余证可以生成一张任务单 判断是否是同一个countyCode
@RequestMapping("insertRemaining") @RequestMapping("insertRemaining")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean insertRemaining(@RequestBody String jsonStr) { public Boolean insertRemaining(@RequestBody String jsonStr) {
...@@ -115,10 +114,10 @@ public class FailedCardApi { ...@@ -115,10 +114,10 @@ public class FailedCardApi {
taskEntity.setCardType(cardType); taskEntity.setCardType(cardType);
taskEntity.setTaskStateId((long) 1); taskEntity.setTaskStateId((long) 1);
taskEntity.setSubmitName(name); taskEntity.setSubmitName(name);
if ("null".equals(resultMap.get("WORK_GROUP")+"")){ if ("null".equals(resultMap.get("WORK_GROUP") + "")) {
}else { } else {
taskEntity.setWorkGroup(Long.valueOf(resultMap.get("WORK_GROUP")+"")); taskEntity.setWorkGroup(Long.valueOf(resultMap.get("WORK_GROUP") + ""));
} }
/*特证数+1*/ /*特证数+1*/
failedCardService.specialCardAdd(acceptNo); failedCardService.specialCardAdd(acceptNo);
......
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @ b933e36e
...@@ -229,7 +229,7 @@ public interface ReceiptMapper { ...@@ -229,7 +229,7 @@ public interface ReceiptMapper {
@Update("update RECEIPT_LIST set IS_PRINT = 1,RECEIPT_DATE = sysdate where to_char(CHECK_DATE,'yyyyMMddhhmmss') BETWEEN ${startDate} and ${endDate} and RECEIPT_LIST.POLICE_CODE in (${string}) and CARD_TYPE_ID=${type} and receipt_date is null") @Update("update RECEIPT_LIST set IS_PRINT = 1,RECEIPT_DATE = sysdate where to_char(CHECK_DATE,'yyyyMMddhhmmss') BETWEEN ${startDate} and ${endDate} and RECEIPT_LIST.POLICE_CODE in (${string}) and CARD_TYPE_ID=${type} and receipt_date is null")
public boolean updateReceiptDate(@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("string") String string,@Param("type") long type); public boolean updateReceiptDate(@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("string") String string,@Param("type") long type);
@Select("select RECEIPT_LIST.POLICE_CODE,sum(RECEIPT_LIST.FINISH_COUNT),GAJG_DM.GAJG_MC from RECEIPT_LIST \n" + @Select("select RECEIPT_LIST.POLICE_CODE,sum(RECEIPT_LIST.FINISH_COUNT) FINISH_COUNT,GAJG_DM.GAJG_MC 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" +
"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 RECEIPT_LIST.POLICE_CODE, GAJG_DM.GAJG_MC")
......
src/main/resources/static/index.html
View file @ b933e36e
...@@ -184,5 +184,6 @@ ...@@ -184,5 +184,6 @@
<script src="views/tagPrint/tagPrint.js"></script> <script src="views/tagPrint/tagPrint.js"></script>
<script src="views/addTag/addTag.js"></script> <script src="views/addTag/addTag.js"></script>
<script src="views/autoCheck/autoCheck.js"></script> <script src="views/autoCheck/autoCheck.js"></script>
<script src="views/materialManagement/materialManagement.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/resources/static/js/app.js
View file @ b933e36e
...@@ -24,6 +24,7 @@ angular.module('AvatarCheck', [ ...@@ -24,6 +24,7 @@ angular.module('AvatarCheck', [
'AvatarCheck.analysisLog', 'AvatarCheck.analysisLog',
'AvatarCheck.packageLog', 'AvatarCheck.packageLog',
'AvatarCheck.tagPrint', 'AvatarCheck.tagPrint',
'AvatarCheck.materialManagement',
'tm.pagination', 'tm.pagination',
'AvatarCheck.addTag', 'AvatarCheck.addTag',
'AvatarCheck.autoCheck' 'AvatarCheck.autoCheck'
...@@ -155,6 +156,9 @@ angular.module('AvatarCheck', [ ...@@ -155,6 +156,9 @@ angular.module('AvatarCheck', [
if($location.path()=="/autoCheck"){ if($location.path()=="/autoCheck"){
$rootScope.tab = '/autoCheck'; $rootScope.tab = '/autoCheck';
} }
if($location.path()=="/materialManagement"){
$rootScope.tab = '/materialManagement';
}
......
src/main/resources/static/views/materialManagement/materialManagement.html 0 → 100644
View file @ b933e36e
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary" >
<div class="box-header">
<strong ng-if="state==2">膜打印数据报表</strong>
<strong ng-if="state==3">耗材管理</strong>
<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="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="choseDate2" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchReport()">查询</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body">
<div ng-if="reportData.length==1">
<h4>暂无数据</h4>
</div>
<div ng-if="reportData.length>1">
<div class="table-responsive mailbox-messages" >
<div class="mailbox-messages">
<table class="table table-hover postTable">
<thead>
<tr>
<th ng-if="2">打印日期</th>
<th ng-if="3">预定位日期</th>
<th>大批证</th>
<th>邮寄证</th>
<th>军人证</th>
<th>快证</th>
<th>废证</th>
</tr>
</thead>
<tbody ng-repeat="item in reportData">
<tr style="background-color: #eee">
<td>{{item.date}}</td>
<td style="color: #3c8dbc">{{item.pu}}</td>
<td>{{item.you}}</td>
<td>{{item.jun}}</td>
<td>{{item.kuai}}</td>
<td>{{item.fei}}</td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.table -->
</div>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
</div>
<!-- /. box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</div>
</div>
src/main/resources/static/views/materialManagement/materialManagement.js 0 → 100644
View file @ b933e36e
'use strict';
angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/materialManagement', {
templateUrl: 'views/materialManagement/materialManagement.html' + urlTimeStamp(),
controller: 'materialManagementCtrl',
cache: false
});
}])
.controller('materialManagementCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
$scope.state = 3;
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.choseDate2 = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.searchReport = function () {
var date1=$('#datepicker1').val();
var date2=$('#datepicker2').val();
if(date1==''){
date1= $filter("date")(new Date(), "yyyy-MM-dd");
}
if(date2==''){
date2= $filter("date")(new Date(), "yyyy-MM-dd");
}
HttpService.getReport(date1,date2,function(data){
$scope.reportData=data;
})
}
$scope.searchReport();
});
\ No newline at end of file
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