Skip to content

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

更新交接单查询分局表连接关系； 

更新交接单数据展示；
更新批量提交不合格订单；
parent 30042f5e
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 29 deletions
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ fda45ffc
......@@ -9,7 +9,7 @@ import java.util.Map;
/**
* @auther zhangyusheng
* zhangyusheng
* 2019/2/19 15:00
*/
@Mapper
......@@ -150,7 +150,7 @@ public interface PersonPostMapper {
@Insert("INSERT INTO AUDLIT_FAILURE (UPLOAD_NO,UP_TIUME,REMARKS,NAME) VALUES (#{uploadNo},SYSDATE,#{remarks},#{name})")
public boolean cancelPostByAcceptNo(@Param("uploadNo")String uploadNo, @Param("remarks")String remarks, @Param("name")String name);
@Select("SELECT af.*,pp.APPLICANT_NAME,pp.NATURE_OF_THE_INFORMATION,pp.RECIPIENT_NAME,pp.RECIPIENT_ADDRESS,pp.RECIPIENT_PHONE,pp.ORDER_NUMBER FROM AUDLIT_FAILURE af\n" +
@Select("SELECT af.*,pp.APPLICANT_NAME,pp.NATURE_OF_THE_INFORMATION,pp.RECIPIENT_NAME,pp.RECIPIENT_ADDRESS,pp.RECIPIENT_PHONE,pp.ORDER_NUMBER,pp.BIRTH_DATE FROM AUDLIT_FAILURE af\n" +
"left join PERSON_POST pp \n" +
"on af.UPLOAD_NO=pp.FIRST_WHITE " +
"WHERE TO_CHAR(UP_TIUME,'yyyyMMdd') BETWEEN #{beginDate} AND #{endDate}")
......
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @ fda45ffc
......@@ -249,13 +249,13 @@ public interface ReceiptMapper {
public List<Map<String,Object>> selectReceiptDateByReceiptDate(@Param("startDate") String startDate,@Param("endDate") String endDate);
//修改表链接
@Select("<script>" +
"select RECEIPT_LIST.id,RECEIPT_LIST.QR_CODE,to_char(RECEIPT_LIST.RECEIPT_DATE,'yyyy-MM-dd') RECEIPT_DATE,RECEIPT_LIST.POLICE_CODE,decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID) CARD_TYPE_ID,\n" +
"RECEIPT_LIST.FINISH_COUNT,subStr(DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,0,9) GAJG_DM,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,to_char(CHECK_DATE,'yyyyMMdd') CHECK_DATE,RECEIPT_LIST.CHECK_NAME\n" +
"RECEIPT_LIST.FINISH_COUNT,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO GAJG_DM,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,to_char(CHECK_DATE,'yyyyMMdd') CHECK_DATE,RECEIPT_LIST.CHECK_NAME\n" +
",CARD_TYPE_DIC.CARD_TYPE,COUNTY_DIC.COUNTY_CODE ,COUNTY_DIC.COUNTYNAME from RECEIPT_LIST \n" +
"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 PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on subStr(DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,0,9) = RECEIPT_LIST.POLICE_CODE\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 COUNTY_DIC on substr(RECEIPT_LIST.POLICE_CODE,0,6) = COUNTY_DIC.COUNTY_CODE" +
" where RECEIPT_LIST.id in (${string}) order by RECEIPT_LIST.id " +
"</script>")
......@@ -271,7 +271,7 @@ public interface ReceiptMapper {
/**
* 更新交接单是否已打印
* @param string 查询派出所代码
* @return
*
*/
@Update("update RECEIPT_LIST set IS_PRINT = 1,RECEIPT_DATE = sysdate where RECEIPT_LIST.id in (${string}) and receipt_date is null")
public boolean updateReceiptDate(@Param("string") String string);
......
src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java
View file @ fda45ffc
......@@ -141,9 +141,6 @@ public class ReceiptServiceImpl implements ReceiptService {
@Override
public Map<String, Object> selectTimes(String groupNo) {
Map<String, Object> maps = receiptMapper.selectTimes(groupNo);
if(maps==null){
return null;
}
return maps;
}
......@@ -221,8 +218,7 @@ public class ReceiptServiceImpl implements ReceiptService {
@Override
public List<Map<String, Object>> selectReceiptListDate2(String groupNo) {
List<Map<String, Object>> mapList = new ArrayList<>();
if (groupNo ==null){
}else {
if (groupNo !=null){
groupNo=groupNo+'%';
mapList= receiptMapper.selectReceiptListDate2(groupNo);
}
......@@ -280,7 +276,7 @@ public class ReceiptServiceImpl implements ReceiptService {
* 查询是否存在交接单详单
*
* @param acceptNo 受理号
* @return
*
*/
@Override
public List<DetailReceiptListEntity> queryReceipt( String acceptNo) {
......@@ -429,7 +425,21 @@ public class ReceiptServiceImpl implements ReceiptService {
List<Map<String, Object>> countyMapList = mapList.get(taskId);
for (Map<String, Object> countyMap : countyMapList) {
countyCode = countyMap.get("COUNTY_CODE") + "";
countyName = countyMap.get("COUNTYNAME") + "";
//按照制证类型修改分局名称
String card_type_id=countyMap.get("CARD_TYPE_ID")+"";
switch(card_type_id) {
case "9":
countyName = "异地个人邮寄";
break;
case "7":
countyName = countyMap.get("COUNTYNAME") + "(台湾)";
break;
case "5":
countyName = countyMap.get("COUNTYNAME") + "(港澳)";
break;
default:
countyName = "" + countyMap.get("COUNTYNAME");
}
typeName = countyMap.get("CARD_TYPE_ID") + "";
receiptDate = countyMap.get("RECEIPT_DATE")+"";
typeSum += Integer.valueOf(countyMap.get("FINISH_COUNT") + "");
......@@ -515,7 +525,7 @@ public class ReceiptServiceImpl implements ReceiptService {
* @return 返回新的字符串
*/
private String replaceNullString(String str) {
if (str == "") {
if ("".equals(str)) {
return null;
} else return str;
}
......
src/main/resources/static/js/service.js
View file @ fda45ffc
......@@ -926,7 +926,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
analyseToUpdateIfPostCard:function(uploadDate,success) {
$http({
method: 'GET',
url: "../LogApi/analysis"+urlTimeStamp(),
url: "../printReceitpDataLogApi/analysis"+urlTimeStamp(),
params:{
printDate:uploadDate
}
......
src/main/resources/static/views/addAuditFailure/addAuditFailure.html
View file @ fda45ffc
......@@ -82,7 +82,7 @@
上传受理号:
</td>
<td>
<input type="text" placeholder="请填写上传受理号" ng-model="audit[$index].acceptNo"style="height: 34px;width: 100%;">
<input type="text" placeholder="请填写上传受理号" ng-model="audit[$index].acceptNo" style="height: 34px;width: 100%;">
</td>
<td>
取消原因:
......@@ -144,14 +144,15 @@
<th>NO.</th>
<th>订单号</th>
<th>上传受理号</th>
<th>提交人</th>
<th>提交时间</th>
<th>取消原因</th>
<th>申请人姓名</th>
<th>收件人姓名</th>
<th>申请人</th>
<th>出生日期</th>
<th>收件人</th>
<th>收件人电话</th>
<th>收件地址</th>
<th>内件信息</th>
<th>提交人</th>
<th>提交时间</th>
</tr>
</thead>
......@@ -160,14 +161,15 @@
<td>{{$index+1}}</td>
<td>{{item.ORDER_NUMBER}}</td>
<td>{{item.UPLOAD_NO}}</td>
<td>{{item.NAME}}</td>
<td>{{item.UP_TIUME | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.REMARKS}}</td>
<td>{{item.APPLICANT_NAME}}</td>
<td>{{item.BIRTH_DATE}}</td>
<td>{{item.RECIPIENT_NAME}}</td>
<td>{{item.RECIPIENT_PHONE}}</td>
<td>{{item.RECIPIENT_ADDRESS}}</td>
<td>{{item.NATURE_OF_THE_INFORMATION}}</td>
<td>{{item.NAME}}</td>
<td>{{item.UP_TIUME | date:'yyyy-MM-dd HH:mm:ss'}}</td>
</tr>
</tbody>
</table>
......
src/main/resources/static/views/addAuditFailure/addAuditFailure.js
View file @ fda45ffc
......@@ -116,6 +116,7 @@ angular.module('AvatarCheck.addAuditFailure', ['ngRoute', 'AvatarCheck.http'])
};
$scope.checkThis=false;
//上传审核不通过文件
var aselectAF= $scope.aselectAF();
$scope.uploadFile = function () {
$scope.checkThis=true;
var importName = $rootScope.loginData.name;
......@@ -140,8 +141,7 @@ angular.module('AvatarCheck.addAuditFailure', ['ngRoute', 'AvatarCheck.http'])
if(data[0].stats){
$scope.msgText = data[0].msg;
//重新加载数据
$scope.aselectAF();
console.log("------")
aselectAF();
}else{
$scope.wrongMsg =data[0].msg;
}
......
src/main/resources/static/views/receitp/receitp.html
View file @ fda45ffc
......@@ -121,8 +121,8 @@
<thead>
<tr>
<th><input type="checkbox" ng-model="all"></th>
<th>派出所代码</th>
<th>派出所名称</th>
<th>分局代码</th>
<th>分局名称</th>
<th>证件数量</th>
<th>操作</th>
<th>交接单打印时间</th>
......@@ -200,7 +200,7 @@
<!--身份证交接单</div>-->
<!--<div>交接日期：{{receitpDataToPrint.date}}</div>-->
<!--<div>送至：</div>-->
<table cellpadding="0" cellspacing="0" width="740px" style="text-align: center;" border="1px" ng-show="false" >
<table cellpadding="0" cellspacing="0" width="740px" style="text-align: center;" border="1px" ng-show="true" >
<thead>
<tr>
<th width="60">
......@@ -229,7 +229,7 @@
{{item.QR_CODE}}
</td>
<td colspan="2" style="text-align: left;">
{{item.COUNTYNAME}}{{item.GAJG_MC}}
{{item.GAJG_MC}}
</td>
<td width="80" style="text-align: center;">
{{item.FINISH_COUNT}}
......
src/main/resources/static/views/receitp/receitp.js
View file @ fda45ffc
......@@ -190,6 +190,7 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
getData();
}
$scope.receitpDataToPrint = data;
console.log($scope.receitpDataToPrint)
for(var i=0;i<$scope.receitpDataToPrint.list[0].countyList.length;i++){
for (var j=0;j<$scope.receitpDataToPrint.list[0].countyList[i].policeList.length;j++){
$scope.receitpDataToPrint.list[0].countyList[i].policeList[j].id=j+1;
......@@ -222,7 +223,7 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
// LODOP.SET_PRINT_STYLEA(1, "Bold", 1);
LODOP.SET_PRINT_STYLEA(1, "Alignment", 2);
LODOP.SET_PRINT_STYLEA(1, "FontSize", 16);
LODOP.ADD_PRINT_TEXT(35, 0, "100%", 20, "异地身份证交接单");
LODOP.ADD_PRINT_TEXT(35, 0, "100%", 20, $scope.result[0].county +" 证件交接单");
// LODOP.SET_PRINT_STYLEA(2, "Bold", 1);
LODOP.SET_PRINT_STYLEA(2, "Alignment", 2);
LODOP.SET_PRINT_STYLEA(2, "FontSize", 16);
......
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