Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 6367295e authored by wuzhilong's avatar wuzhilong
Browse files
Options

添加个人邮寄出生日期字段提示，封条打印取消刷三张证自动打印，交接单生成快证类型改为个人邮寄

parent 9359537c
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 21 deletions
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ 6367295e
......@@ -79,6 +79,8 @@ public class ReadExcelApi {
List<FileItem> list = null;
int post=0;
int backPost=0;
int birthDate=0;
String birthStr="";
try {
//将当前上下文初始化给 CommonsMutipartResolver （多部分解析器）
CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
......@@ -139,6 +141,10 @@ public class ReadExcelApi {
personPostEntity.setPlayState((String) list2.get(6));
personPostEntity.setOrderState((String) list2.get(7));
personPostEntity.setApplicantName((String) list2.get(8));
if ("".equals(replaceDate((String)list2.get(9)))){
birthStr=birthStr+list2.get(2).toString()+"、";
birthDate++;
}
personPostEntity.setBirthDate(replaceDate((String)list2.get(9)));
personPostEntity.setSenderName((String) list2.get(10));
personPostEntity.setSenderPhone((String) list2.get(11));
......@@ -164,7 +170,7 @@ public class ReadExcelApi {
backPost= personPostService.findBackWaybillNumber(fileNameDicEntity.getFileId()+"");
} catch (Exception e) {
e.printStackTrace();
logger.error("上传文件名" + filename + "起始时间" + startDate + "截止时间" + endDate);
logger.error("上传文件名：" + filename + "起始时间" + startDate + "截止时间" + endDate);
logger.error("", e);
yxresp.outPutError("Exception", "上传文件时发生错误,非法EXCEL文件:" + filename);
map.put("result","false");
......@@ -173,7 +179,7 @@ public class ReadExcelApi {
}
} catch (Exception e) {
e.printStackTrace();
logger.error("上传文件名" + filename + "起始时间" + startDate + "截止时间" + endDate);
logger.error("上传文件名：" + filename + "起始时间" + startDate + "截止时间" + endDate);
logger.error("", e);
yxresp.outPutError("FileUploadException", "文件上载发生异常:" + e.getMessage());
map.put("result","false");
......@@ -184,15 +190,20 @@ public class ReadExcelApi {
}
}
} catch (Exception e) {
logger.error("上传文件名" + filename + "起始时间" + startDate + "截止时间" + endDate);
logger.error("上传文件名：" + filename + "起始时间" + startDate + "截止时间" + endDate);
logger.error("Exception 导入个人邮寄信息表异常", e);
map.put("result","false");
map.put("msg","导入个人邮寄信息表异常");
return map;
}
if (post+backPost>0){
map.put("msg","邮寄订单导入成功，邮件号异常正向邮件号重复 "+post+" 条，反向邮件号重复 "+backPost+"条");
map.put("result","false");
map.put("msg","导入个人邮寄信息表异常，邮件号异常正向邮件号重复 "+post+" 条，反向邮件号重复 "+backPost+"条");
}else if (birthDate>0){
map.put("result","false");
map.put("msg","导入个人邮寄信息表异常，出生日期不能为空！订单号："+birthStr);
}else {
map.put("result","true");
map.put("msg","上传成功!");
}
return map;
......
src/main/java/com/yxproject/start/api/ReceiptApi.java
View file @ 6367295e
......@@ -310,7 +310,7 @@ public class ReceiptApi {
receiptListEntity.setQrCode(acceptNo);//条形码（受理组号或受理号）
receiptListEntity.setPoliceCode("110000000000");//公安机关代码
receiptListEntity.setFinishCount((long)1);//复核数量
receiptListEntity.setCardTypeId((long)0);//制证类型
receiptListEntity.setCardTypeId((long)9);//制证类型
receiptListEntity.setOldCardTypeId((long)0);// 原制证类型
receiptListEntity.setFjdm("110000");//分局代码
receiptListEntity.setCheckName(name);//复核姓名
......
src/main/java/com/yxproject/start/mapper/DetailReceiptListMapper.java
View file @ 6367295e
......@@ -64,6 +64,7 @@ public interface DetailReceiptListMapper {
"POLICE_CODE,FINISH_COUNT,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,'异地速递' CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID\n" +
"from RECEIPT_LIST \n" +
"left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO = RECEIPT_LIST.POLICE_CODE\n" +
"left join CARD_TYPE_DIC on RECEIPT_LIST.CARD_TYPE_ID = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
"where RECEIPT_LIST.QR_CODE = #{groupNo} order by receipt_date")
public Map<String, Object> selectPoliceDataById0(@Param("groupNo") String groupNo);
......
src/main/java/com/yxproject/start/mapper/FileNameDicMapper.java
View file @ 6367295e
......@@ -51,7 +51,7 @@ public interface FileNameDicMapper {
" and FILE_NAME =#{fileName}" +
"</if>" +
" </where>" +
" ) where rn BETWEEN #{minNum} and #{maxNum} " +
" order by FILE_NAME_DIC.FILE_ID ) where rn BETWEEN #{minNum} and #{maxNum} " +
"</script>")
public List<FileNameDicEntity> queryFileNameDic(@Param("uploadDate") String uploadDate, @Param("fileName") String fileName, @Param("analysisState") long analysisState, @Param("maxNum") long maxNum, @Param("minNum") long minNum);
......
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @ 6367295e
......@@ -367,7 +367,7 @@ public interface ReceiptMapper {
"LEFT JOIN PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on PROD_GROUP_RELATION_T.UPLOAD_UNIT_NO=DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO \n" +
"LEFT JOIN POLICE_DIC ON substr(PROD_GROUP_RELATION_T.upload_unit_no,0,6)= POLICE_DIC.POLICE_CODE \n" +
"LEFT JOIN group_no on PROD_GROUP_RELATION_T.GROUP_NO=GROUP_NO.GROUP_NO \n" +
"LEFT JOIN SPECIAL_CARD on substr(SPECIAL_CARD.GROUP_NO,0,8)=substr(prod_card_t.accept_no,0,8) \n" +
"LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.ACCEPT_NO=prod_card_t.accept_no \n" +
"LEFT JOIN TASK ON GROUP_NO.TASK_ID=TASK.TASK_ID\n" +
"LEFT JOIN detail_receipt_list ON prod_card_t.accept_no=detail_receipt_list.accept_no\n" +
"LEFT JOIN RECEIPT_LIST ON detail_receipt_list.RECEIPT_ID=RECEIPT_LIST.ID\n" +
......
src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java
View file @ 6367295e
......@@ -91,7 +91,9 @@ public class ReceiptServiceImpl implements ReceiptService {
public boolean updateReceiptList(String receiptId, String checkName, Date date) {
receiptMapper.updateReceiptList(receiptId, checkName, date);
String taskId = receiptMapper.selectTaskId(receiptId);
receiptMapper.updateTaskListWithZJSJ(taskId,checkName,date);
if (taskId!=null){
receiptMapper.updateTaskListWithZJSJ(taskId,checkName,date);
}
return true;
}
@Override
......
src/main/resources/static/dialogs/confirm.html
View file @ 6367295e
......@@ -2,7 +2,7 @@
提示
</div>
<div class="ui-dialog-content">
<div>确认删除{{importStartDate}}到{{importEndDate}}时间段内导入的{{total}}条记录吗？</div>
<div>确认删除文件 ID：{{fileid}} ,上传时间：{{importDate}} 导入的{{total}}条记录吗？</div>
</div>
<div class="ui-dialog-confirm">
<p ng-if="wrongMsg!=-1" style="color: red;">{{wrongMsg}}</p>
......
src/main/resources/static/views/excelAndSearch/excelAndSearch.html
View file @ 6367295e
......@@ -150,6 +150,7 @@
<thead>
<tr>
<th>NO.</th>
<th>文件ID</th>
<th>订单起始日期</th>
<th>订单截至日期</th>
<th>文件名</th>
......@@ -161,6 +162,7 @@
<tbody>
<tr ng-repeat="item in postPackageData">
<td>{{$index+1}}</td>
<td>{{item.fileId}}</td>
<td>{{item.formStartTime | myDateFilter}}</td>
<td>{{item.formDeadline| myDateFilter}}</td>
<td>{{item.fileName}}</td>
......
src/main/resources/static/views/excelAndSearch/excelAndSearch.js
View file @ 6367295e
......@@ -95,13 +95,8 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
$scope.wrongMsg =-1;
$scope.msgText = "上传中，请稍等..."
HttpService.uploadExcelFile($("#datepicker1").val(),$("#datepicker2").val(),fd,function (data) {
if(data.result=="true"){
$scope.closeThisDialog();
getData();
MessageService.showAlert(data.msg);
}else{
$scope.msgText =data.msg;
}
$scope.msgText =data.msg;
getData();
})
}]
});
......@@ -149,7 +144,8 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
controller: ['$scope', function ($scope) {
$scope.wrongMsg =-1;
$scope.total = 1;
$scope.importDate = $filter('myDateFilter')(importDate, 'yyyy-MM-dd');;
$scope.importDate = $filter('myDateFilter')(importDate, 'yyyy-MM-dd');
$scope.fileid=fileid;
$scope.confirmDelete = function () {
HttpService.deleteByFileId(fileid, function (data) {
// MessageService.showAlert(data.msg);
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ 6367295e
......@@ -104,6 +104,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
$scope.checkPrint=0;
//复核一致
$scope.checkSame = function (id) {
console.log($scope.json)
if($scope.checkPrint==id||$scope.json.CARD_TYPE==9){
HttpService.updateReceiptList(id,function(data) {
if(data){
......@@ -158,10 +159,10 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
if(count===$scope.json.policeCardsList.length){
MessageService.showAlert("身份证号:"+idcard+" 在本组中不存在");
}
if(bgCount==2&&$scope.json.policeCardsList.length>=2){
$scope.PreviewMytableRotate();
break;
}
// if(bgCount==2&&$scope.json.policeCardsList.length>=2){
// $scope.PreviewMytableRotate();
// break;
// }
if($scope.json.policeCardsList.length==1){
$scope.PreviewMytableRotate();
break;
......
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