Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 75778185 authored by liboyang's avatar liboyang
Browse files
Options

新增页面

parent 5e3e05e9
Hide whitespace changes
Inline Side-by-side
Showing with 462 additions and 33 deletions
src/main/java/com/yxproject/start/api/PersonPostApi.java
View file @ 75778185
package com.yxproject.start.api;
import com.yxproject.start.dto.ReadCardDto;
import com.yxproject.start.entity.PersonPostEntity;
import com.yxproject.start.service.PersonPostService;
import net.sf.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
......@@ -20,6 +29,20 @@ public class PersonPostApi {
@Autowired
PersonPostService personPostService;
private Logger logger = LoggerFactory.getLogger(PersonPostEntity.class);
private SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
private Date getDateFromString(String gmtCreat, DateFormat dateFormat) {
if (gmtCreat != null) {
try {
return dateFormat.parse(gmtCreat);
} catch (ParseException e) {
logger.error(e.getMessage());
return null;
}
}
return null;
}
/**
* 按条件查询个人邮寄信息
* @param jsonStr
......@@ -59,4 +82,30 @@ public class PersonPostApi {
personPostService.deletePersonalData(applicantName,orderNumber,state,latticeMouthInformation,getToCounty,uploadDate);
return true;
}
/**
*刷身份证查询邮寄单信息详情
*/
@RequestMapping("getPostInfo")
public List<PersonPostEntity> findPersonalData(@RequestBody ReadCardDto readCardDto){
List<PersonPostEntity> list = personPostService.getPostInfo(readCardDto);
return list;
}
/**
* 更改打印状态
* @param id
* @param printTime
* @return
*/
public boolean printPostList(@RequestParam("id") int id, @RequestParam("printTime") String printTime) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
boolean flag=false;
try {
flag = personPostService.printPostList(id, sdf.parse(printTime));
} catch (ParseException e) {
e.printStackTrace();
}
return flag;
}
}
src/main/java/com/yxproject/start/dto/ReadCardDto.java 0 → 100644
View file @ 75778185
package com.yxproject.start.dto;
public class ReadCardDto {
private String idCard;
private String startDate;
private String endDate;
@Override
public String toString() {
return "ReadCardDto{" +
"idCard='" + idCard + '\'' +
", startDate='" + startDate + '\'' +
", endDate='" + endDate + '\'' +
'}';
}
public ReadCardDto() {
}
public ReadCardDto(String idCard, String startDate, String endDate) {
this.idCard = idCard;
this.startDate = startDate;
this.endDate = endDate;
}
public String getIdCard() {
return idCard;
}
public void setIdCard(String idCard) {
this.idCard = idCard;
}
public String getStartDate() {
return startDate;
}
public void setStartDate(String startDate) {
this.startDate = startDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
}
src/main/java/com/yxproject/start/entity/PersonPostEntity.java
View file @ 75778185
......@@ -2,6 +2,7 @@ package com.yxproject.start.entity;
import javax.persistence.*;
import java.sql.Time;
import java.util.Date;
import java.util.Objects;
@Entity
......@@ -31,16 +32,16 @@ public class PersonPostEntity {
private String natureOfTheInternal;
private String natureOfTheInformation;
private String firstWhite;
private Long idCard;
private String idCard;
private String acceptTheMatter;
private Time beginUsefulLife;
private Time validPeriodEnd;
private String beginUsefulLife;
private String validPeriodEnd;
private String note;
private Long state;
private Time uploadDate;
private Long fileId;
private Time analysisDate;
private Time printDate;
private Date printDate;
private Time formStartTime;
private Time formDeadline;
......@@ -286,11 +287,11 @@ public class PersonPostEntity {
@Basic
@Column(name = "ID_CARD")
public Long getIdCard() {
public String getIdCard() {
return idCard;
}
public void setIdCard(Long idCard) {
public void setIdCard(String idCard) {
this.idCard = idCard;
}
......@@ -304,24 +305,28 @@ public class PersonPostEntity {
this.acceptTheMatter = acceptTheMatter;
}
public void setValidPeriodEnd(String validPeriodEnd) {
this.validPeriodEnd = validPeriodEnd;
}
@Basic
@Column(name = "BEGIN_USEFUL_LIFE")
public Time getBeginUsefulLife() {
public String getBeginUsefulLife() {
return beginUsefulLife;
}
public void setBeginUsefulLife(Time beginUsefulLife) {
this.beginUsefulLife = beginUsefulLife;
}
@Basic
@Column(name = "VALID_PERIOD_END")
public Time getValidPeriodEnd() {
return validPeriodEnd;
public void setBeginUsefulLife(String beginUsefulLife) {
this.beginUsefulLife = beginUsefulLife;
}
public void setValidPeriodEnd(Time validPeriodEnd) {
this.validPeriodEnd = validPeriodEnd;
public String getValidPeriodEnd() {
return validPeriodEnd;
}
@Basic
......@@ -376,11 +381,11 @@ public class PersonPostEntity {
@Basic
@Column(name = "PRINT_DATE")
public Time getPrintDate() {
public Date getPrintDate() {
return printDate;
}
public void setPrintDate(Time printDate) {
public void setPrintDate(Date printDate) {
this.printDate = printDate;
}
......
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ 75778185
......@@ -3,6 +3,7 @@ package com.yxproject.start.mapper;
import com.yxproject.start.entity.PersonPostEntity;
import org.apache.ibatis.annotations.*;
import java.util.Date;
import java.util.List;
......@@ -22,8 +23,8 @@ public interface PersonPostMapper {
"where JMSFZSLH in(select FIRST_WHITE from person_post where FILE_ID=#{fileId}) and files.CREAT_TIME=#{creatTime} );")
public boolean updateIsPost(@Param("fileId")String fileId,@Param("creatTime") String creatTime);
@Select("SELECT * FROM PERSON_POST WHERE ID_CARD=idCard AND BEGIN_USEFUL_LIFE=to_date(#{startDate},'yyyyMMdd') AND VALID_PERIOD_END=to_date(#{endDate},'yyyyMMdd')")
public List<PersonPostEntity> findAllByIdCardAndStartDateAndEndDate(String idCard, String startDate, String endDate);
@Select("SELECT * FROM PERSON_POST WHERE ID_CARD=#{idCard} AND BEGIN_USEFUL_LIFE=#{startDate} AND VALID_PERIOD_END=#{endDate}")
public List<PersonPostEntity> findAllByIdCardAndStartDateAndEndDate(@Param("idCard") String idCard, @Param("startDate")String startDate, @Param("endDate")String endDate);
//TODO getToCounty是List
......@@ -52,4 +53,10 @@ public interface PersonPostMapper {
@Delete("DELETE FROM PERSON_POST WHERE FILE_ID = #{fileId}")
public void deletePersonPostByFileId(@Param("fileId")String fileId);
@Select("select * from PERSON_POST where id = #{id}")
public PersonPostEntity findPostInfoById(int id);
@Update("update PERSON_POST SET PRINT_DATE=#{printDateTime} where id=#{id}")
void updateIsPrint(int id, Date printDateTime);
}
src/main/java/com/yxproject/start/service/PersonPostService.java
View file @ 75778185
package com.yxproject.start.service;
import com.yxproject.start.dto.ReadCardDto;
import com.yxproject.start.entity.FileNameDicEntity;
import com.yxproject.start.entity.PersonPostEntity;
......@@ -26,4 +27,7 @@ public interface PersonPostService {
public boolean deletePersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate);
public List<PersonPostEntity> getPostInfo(ReadCardDto readCardDto);
public boolean printPostList(int id, Date printDateTime);
}
src/main/java/com/yxproject/start/service/impl/PersonPostServiceImpl.java
View file @ 75778185
package com.yxproject.start.service.impl;
import com.yxproject.start.dto.ReadCardDto;
import com.yxproject.start.entity.FileNameDicEntity;
import com.yxproject.start.entity.PersonPostEntity;
import com.yxproject.start.mapper.FileNameDicMapper;
......@@ -69,6 +70,20 @@ public class PersonPostServiceImpl implements PersonPostService {
return true;
}
@Override
public List<PersonPostEntity> getPostInfo(ReadCardDto readCardDto) {
String idCard = readCardDto.getIdCard();
String startDate = readCardDto.getStartDate();
String endDate = readCardDto.getEndDate();
return personPostMapper.findAllByIdCardAndStartDateAndEndDate(idCard, startDate, endDate);
}
@Override
public boolean printPostList(int id, Date printDateTime) {
personPostMapper.updateIsPrint(id,printDateTime);
return true;
}
// /**
// * 查询个人邮寄信息
// * @param fileName 文件名
......
src/main/resources/static/js/app.js
View file @ 75778185
......@@ -150,6 +150,9 @@ angular.module('AvatarCheck', [
if(index=='/tagPrint'){
$("body").addClass("sidebar-collapse");
}
if(index=='/searchCardMsg'){
location.reload('#!/searchCardMsg');
}
$rootScope.tab = index;
$rootScope.close = 0;
console.log($rootScope.tab)
......
src/main/resources/static/js/service.js
View file @ 75778185
......@@ -36,7 +36,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
var body = JSON.stringify(data);
$http({
method: 'POST',
url: "../api/idCard/getPostInfo",
url: "../personPostApi/getPostInfo",
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
......
src/main/resources/static/print-test.html 0 → 100644
View file @ 75778185
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>WEB打印控件LODOP的样例十五:打印有页头页尾的表格</title>
<script language="javascript" src="components/js/LodopFuncs.js"></script>
</head>
<body>
<div id="div1">
<table cellspacing="0" cellpadding="0" style="border-collapse:collapse;border:0px dashed #000;width:96mm">
<tr>
<td>
<table cellspacing="0" cellpadding="0" style="border:2px dashed #000;border-collapse:collapse;height:20mm">
<tr>
<td style="border-right:2px dashed #000;width:40mm">40*20</td>
<td style="border:0px dashed #000;width:56mm">56*20</td>
</tr>
</table>
</td>
</tr>
<tr>
<td>
<table cellspacing="0" cellpadding="0" style="border:2px dashed #000;border-top:none;border-collapse:collapse;height:15mm">
<tr>
<td style="border-right:2px dashed #000;width:46mm">46*15</td>
<td style="border:0px dashed #000;width:50mm">50*15</td>
</tr>
</table>
<td>
</tr>
<tr>
<td>
<table cellspacing="0" cellpadding="0" style="border:2px dashed #000;border-top:none;border-collapse:collapse;height:17mm">
<tr>
<td style="border-right:2px dashed #000;width:96mm">96*17</td>
</tr>
</table>
<td>
</tr>
<tr>
<td>
<table cellspacing="0" cellpadding="0" style="border:2px dashed #000;border-top:none;border-collapse:collapse;height:15mm">
<tr>
<td style="border-right:2px dashed #000;width:52mm">52*14</td>
<td style="border:0px dashed #000;width:44mm">44*14</td>
</tr>
</table>
</td>
</tr>
<tr>
<td>
<table cellspacing="0" cellpadding="0" style="border:2px dashed #000;border-top:none;border-collapse:collapse;height:20mm">
<tr>
<td style="border-right:2px dashed #000;width:96mm">96*20</td>
</tr>
</table>
<td>
</tr>
<tr>
<td style="height:4mm"></td>
</tr>
<tr>
<td>
<table cellspacing="0" cellpadding="0" style="border:2px dashed #000;border-collapse:collapse;height:15mm">
<tr>
<td style="border-right:2px dashed #000;width:96mm">96*15</td>
</tr>
</table>
<td>
</tr>
<tr>
<td>
<table cellspacing="0" cellpadding="0" style="border:2px dashed #000;border-top:none;border-collapse:collapse;height:17mm">
<tr>
<td style="border-right:2px dashed #000;width:40mm">40*17</td>
<td style="border:0px dashed #000;width:56mm">56*17</td>
</tr>
</table>
</td>
</tr>
<tr>
<td>
<table cellspacing="0" cellpadding="0" style="border:2px dashed #000;border-top:none;border-collapse:collapse;height:15mm">
<tr>
<td style="border-right:2px dashed #000;width:68mm">68*17</td>
<td style="border:0px dashed #000;width:28mm">28*17</td>
</tr>
</table>
</td>
</tr>
<tr>
<td>
<table cellspacing="0" cellpadding="0" style="border:2px dashed #000;border-top:none;border-collapse:collapse;height:7mm">
<tr>
<td style="border-right:2px dashed #000;width:68mm">68*7</td>
<td style="border:0px dashed #000;width:28mm">28*7</td>
</tr>
</table>
</td>
</tr>
</table>
</div>
<hr/>
<a href="javascript:PreviewMytable()">预览</a>, <a href="javascript:PreviewMytableRotate()">预览（翻转）</a>
<script language="javascript" type="text/javascript">
var LODOP; //声明为全局变量
var iRadioValue=1;
function PreviewMytable(){
LODOP=getLodop();
LODOP.PRINT_INIT("打印控件功能演示_Lodop功能_预览打印表格");
LODOP.SET_PRINT_PAGESIZE(1,"100mm","149mm","");
LODOP.ADD_PRINT_TABLE(13,2,960,1400,document.getElementById("div1").innerHTML);
LODOP.SET_PRINT_STYLEA(0,"TableHeightScope",iRadioValue);
//LODOP.SET_PRINT_STYLEA(0,"AngleOfPageInside",180);
LODOP.PREVIEW();
};
function PreviewMytableRotate(){
LODOP=getLodop();
LODOP.PRINT_INIT("打印控件功能演示_Lodop功能_预览打印表格");
LODOP.SET_PRINT_PAGESIZE(1,"100mm","149mm","");
LODOP.ADD_PRINT_TABLE(13,2,960,1400,document.getElementById("div1").innerHTML);
LODOP.SET_PRINT_STYLEA(0,"TableHeightScope",iRadioValue);
LODOP.SET_PRINT_STYLEA(0,"AngleOfPageInside",180);
LODOP.PREVIEW();
};
</script>
</body>
</html>
src/main/resources/static/test.html 0 → 100644
View file @ 75778185
<html>
<head>
<title>videoView</title>
<meta http-equiv="Content-Type" content="text/html; charset=gb2312">
</head>
<body>
<table border="1">
<tr>
<td>
<form name="myform">
<table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#D9D4B6">
<TR>
<TD colspan="2" align="center" valign="bottom" bgColor=#f7f2ff>
<input type="button" value="读取二代证卡" onclick="showvalue();"></a>
</TR>
<TR>
<TD colspan="2" align="left" valign="bottom" bgColor=#f7f2ff>个人基本信息</TD>
</TR>
<TR>
<TD bgColor=#f7f2ff align="right" style="width:25%">姓名：</TD>
<TD align="left" bgColor=#f7f2ff><input size="30" name="name" style="width:75%"></TD>
</TR>
<TR>
<TD bgColor=#f7f2ff align="right" style="width:25%">性别：</TD>
<TD align="left" bgColor=#f7f2ff><INPUT size="2" style="width:75%" name="sex"></TD>
</TR>
<TR>
<TD bgColor=#f7f2ff align="right">民族：</TD>
<TD align="left" bgColor=#f7f2ff><INPUT size="4" style="width:75%" name="national"></TD>
</TR>
<TR>
<TD bgColor=#f7f2ff align="right">出生日期：</TD>
<TD bgColor=#f7f2ff><INPUT size="16" name="birthday" style="width:75%" type=""></TD>
</TR>
<TR>
<TD bgColor=#f7f2ff align="right">住址：</TD>
<TD bgColor=#f7f2ff><INPUT size="70" name="address" style="width:75%" type=""></TD>
</TR>
<TR>
<TD bgColor=#f7f2ff align="right">公民身份号码：</TD>
<TD bgColor=#f7f2ff><INPUT size="36" name="id" style="width:75%" type=""></TD>
</TR>
<TR>
<TD bgColor=#f7f2ff align="right">签发机关：</TD>
<TD bgColor=#f7f2ff><INPUT size="30" name="qfjg" style="width:75%" type=""></TD>
</TR>
<TR>
<TD bgColor=#f7f2ff align="right">有效期起始日期：</TD>
<TD bgColor=#f7f2ff><INPUT size="16" name="yxqstart" style="width:75%" type=""></TD>
</TR>
<TR>
<TD bgColor=#f7f2ff align="right">有效期截止日期：</TD>
<TD bgColor=#f7f2ff><INPUT size="16" name="yxqend" style="width:75%" type=""></TD>
</TR>
<TR>
<TD bgColor=#f7f2ff align="right">最新住址：</TD>
<TD bgColor=#f7f2ff><INPUT size="70" name="newaddress" style="width:75%" type=""></TD>
</TR>
<TR>
<TD bgColor=#f7f2ff align="right">照片</TD>
<TD bgColor=#f7f2ff><INPUT size="70" name="Base64" style="width:75%" type=""></TD>
</TR>
<TR>
<TD bgColor=#f7f2ff align="right">是否含指纹信息</TD>
<TD bgColor=#f7f2ff><INPUT size="70" name="fp" style="width:75%" type=""></TD>
</TR>
</table>
</form>
</td>
<td>
<table>
<tr>
<td valign="top">
<OBJECT classid="clsid:18EE8930-6993-4ADA-B8BB-02BA5820AC94" id="aaa"
CODEBASE="Termb.cab#version=1,0,0,1" VIEWASTEXT></OBJECT>
<script language="javascript">
// aaa.visible=false;
function showvalue() {
i = 0;
flag = 0;
if (aaa.OpenComm(1001) == 1) {
flag = 1;
//alert(i);
}
else {
for (i = 1; i < 3; i++) {
if (aaa.OpenComm(i) == 1) {
flag = 1;
//alert(i);
break;
}
if (flag != 1) {
alert("打开端口失败");
}
}
}
if (flag == 1) {
if (aaa.Authen() == 1) {
ret = aaa.ReadCardPath("c:\\", 1);
if (ret == 1 || ret == 3) {
myform.name.value = aaa.sName;
myform.sex.value = aaa.sSex;
myform.national.value = aaa.sNation;
myform.birthday.value = aaa.sBornDate;
myform.address.value = aaa.sAddress;
myform.id.value = aaa.sIDNo;
myform.qfjg.value = aaa.sSignGov;
myform.yxqstart.value = aaa.sStartDate;
myform.yxqend.value = aaa.sEndDate;
aaa.ReadCard(3)
myform.newaddress.value = aaa.sNewAddress;
myform.Base64.value = aaa.PhotoBuffer;
myform.fp.value = aaa.sFpState;
}
else {
alert("读卡错误！" + aaa.ReadCardPath("", 1));
}
}
else {
alert("找卡错误,请重新放卡!");
}
}
aaa.EndComm();
}
</script>
</td>
</tr>
</table>
</td>
</tr>
</table>
<br>
</body>
</html>
src/main/resources/static/views/searchCardMsg/searchCardMsg.html
View file @ 75778185
......@@ -83,16 +83,16 @@
<input ng-if="$index==0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)" checked="checked">
<input ng-if="$index!=0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)">
</td>
<td>{{item.id}}</td>
<td>{{item.ddh}}</td>
<td>{{item.yjh}}</td>
<td>{{item.fxyjh}}</td>
<td>{{item.sbsll}}</td>
<td>{{item.sjrxm}}</td>
<td>{{item.sjrlxfs}}</td>
<td>{{item.sjrdz}}</td>
<td>{{item.sqrxm}}</td>
<td>{{item.printTime | date:'yyyy-MM-dd hh:mm:ss'}}</td>
<td>{{$index+1}}</td>
<td>{{item.orderNumber}}</td>
<td>{{item.waybillNumber}}</td>
<td>{{item.backWaybillNumber}}</td>
<td>{{item.firstWhite}}</td>
<td>{{item.recipientName}}</td>
<td>{{item.recipientPhone}}</td>
<td>{{item.recipientAddress}}</td>
<td>{{item.applicantName}}</td>
<td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td>
</tr>
</tbody>
......
src/main/resources/static/views/searchCardMsg/searchCardMsg.js
View file @ 75778185
......@@ -230,8 +230,8 @@ angular.module('AvatarCheck.searchCardMsg', ['ngRoute', 'AvatarCheck.http'])
LODOP1.SET_PRINT_STYLEA(3, "FontSize", 4);
LODOP1.SET_PRINT_STYLEA(0, "TableHeightScope", iRadioValue);
LODOP1.SET_PRINT_STYLEA(0, "AngleOfPageInside", 0);
// LODOP1.PREVIEW();
LODOP1.PRINT();
LODOP1.PREVIEW();
// LODOP1.PRINT();
var LODOP = getLodop();
LODOP.SET_LICENSES("", "15F0BE661E7F32F37491843CB2510905", "C94CEE276DB2187AE6B65D56B3FC2848", "");
......@@ -260,8 +260,8 @@ angular.module('AvatarCheck.searchCardMsg', ['ngRoute', 'AvatarCheck.http'])
LODOP.SET_PRINT_STYLEA(2, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "TableHeightScope", iRadioValue);
LODOP.SET_PRINT_STYLEA(0, "AngleOfPageInside", 0);
// LODOP.PREVIEW();
LODOP.PRINT();
LODOP.PREVIEW();
// LODOP.PRINT();
var id = document.getElementsByClassName("minimal")[$scope.idx].value;
console.log(id)
......
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