Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit f2644444 authored by xiachenqi's avatar xiachenqi
Browse files
Options

修改库房打签 去掉北京市公安局 

修改xml解析 适配包头中添加的北京市公安局-异地首申由本地系统生成xml，但是在异地辅助系统中解析生成制证包，并且在异地系统中制证
parent 73bc9418
Hide whitespace changes
Inline Side-by-side
Showing with 440 additions and 382 deletions
src/main/java/com/yxproject/start/api/ExportXMLApi.java
View file @ f2644444
......@@ -225,7 +225,8 @@ public class ExportXMLApi {
Element DWDM = PACKAGEHEAD.addElement("DWDM");
DWDM.setText(filesEntity.getDwdm());
Element DWMC = PACKAGEHEAD.addElement("DWMC");
if (preproPersonEntities.get(0).getCardTypeId() == 10) {
// 判断是否为异地首申普和异地首申邮 如果是则需要在单位名称上添加【北京市公安局】
if (preproPersonEntities.get(0).getCardTypeId() == 10 || preproPersonEntities.get(0).getCardTypeId() == 11) {
DWMC.setText("北京市公安局" + filesEntity.getDwmc());
} else {
DWMC.setText(filesEntity.getDwmc());
......
src/main/java/com/yxproject/start/api/PersonPostApi.java
View file @ f2644444
......@@ -204,6 +204,8 @@ public class PersonPostApi {
jsonObject = JSONObject.fromObject(jsonStr);
String applicantName = jsonObject.getString("applicantName");
String orderNumber = jsonObject.getString("orderNumber");
String jmsfzslh = jsonObject.getString("jmsfzslh");
String idCard = jsonObject.getString("idCard");
String state = jsonObject.getString("state");
String district = jsonObject.getString("district");
String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
......@@ -214,7 +216,7 @@ public class PersonPostApi {
String notNull = jsonObject.getString("notNull");
String printDate = stripNonDigits(jsonObject.getString("printDate"));
Long gk = jsonObject.getLong("gk");
count = personPostService.findPersonalDataCount(applicantName, orderNumber, state, district,latticeMouthInformation, jsonArray, startDate,endDate, emailNo, notNull,printDate, gk);
count = personPostService.findPersonalDataCount(applicantName, orderNumber, jmsfzslh, idCard, state, district,latticeMouthInformation, jsonArray, startDate,endDate, emailNo, notNull,printDate, gk);
} catch (Exception e) {
logger.error("个人邮寄信息：" + jsonObject);
logger.error("Exception 按条件查询个人邮寄信息异常", e);
......@@ -239,6 +241,8 @@ public class PersonPostApi {
jsonObject = JSONObject.fromObject(jsonStr);
String applicantName = jsonObject.getString("applicantName");
String orderNumber = jsonObject.getString("orderNumber");
String jmsfzslh = jsonObject.getString("jmsfzslh");
String idCard = jsonObject.getString("idCard");
String state = jsonObject.getString("state");
String district = jsonObject.getString("district");
String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
......@@ -251,7 +255,7 @@ public class PersonPostApi {
int notNull = Integer.parseInt((jsonObject.getString("notNull")));
String printDate = stripNonDigits(jsonObject.getString("printDate"));
Long gk = jsonObject.getLong("gk");
list = personPostService.findPersonalData(applicantName, orderNumber, state,district, latticeMouthInformation, jsonArray, startDate, endDate, firstIndex, pageSize, emailNo, notNull,printDate, gk);
list = personPostService.findPersonalData(applicantName, orderNumber, jmsfzslh, idCard, state, district, latticeMouthInformation, jsonArray, startDate, endDate, firstIndex, pageSize, emailNo, notNull,printDate, gk);
} catch (Exception e) {
logger.error("个人邮寄信息：" + jsonObject);
logger.error("Exception 按条件查询个人邮寄信息异常", e);
......
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ f2644444
......@@ -21,14 +21,14 @@ public interface PersonPostMapper {
"values " +
"(#{waybillNumber},#{backWaybillNumber},#{orderNumber},#{createDate},#{openid},#{wcPlayOrderNumber},#{playState},#{orderState},#{applicantName},#{senderName},#{senderPhone},#{senderAddress},#{recipientName},#{recipientPhone},#{recipientAddress},#{orderBlankNumber},#{getToProvince},#{getToCity},#{getToCounty},#{businessType},#{latticeMouthInformation},#{natureOfTheInternal},#{natureOfTheInformation},#{firstWhite},#{fileId},3,#{birthDate},#{gk})")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="id")
public boolean savePersonPost(PersonPostEntity personPostEntity);
boolean savePersonPost(PersonPostEntity personPostEntity);
@Update("update prepro_person p set IS_POST=9 where p.JMSFZSLH in ( select p.JMSFZSLH from prepro_person p left join files files on p.file_id=files.ID \n" +
"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);
boolean updateIsPost(@Param("fileId") String fileId, @Param("creatTime") String creatTime);
@Select("SELECT * FROM PERSON_POST WHERE ID_CARD=#{idCard} AND BEGIN_USEFUL_LIFE=#{startDate} AND VALID_PERIOD_END=#{endDate} AND STATE1=0")
public List<PersonPostEntity> findAllByIdCardAndStartDateAndEndDate(@Param("idCard") String idCard, @Param("startDate")String startDate, @Param("endDate")String endDate);
List<PersonPostEntity> findAllByIdCardAndStartDateAndEndDate(@Param("idCard") String idCard, @Param("startDate") String startDate, @Param("endDate") String endDate);
......@@ -42,8 +42,10 @@ public interface PersonPostMapper {
" left join PREPRO_PERSON on PERSON_POST.first_white = prepro_person.jmsfzslh " +
" WHERE 1=1" +
" <when test='applicantName!=\"\"'> and PERSON_POST.APPLICANT_NAME = #{applicantName} </when>" +
"<when test='emailNo!=\"\"'> and PERSON_POST.WAYBILL_NUMBER = TO_NUMBER(${emailNo}) </when>" +
" <when test='emailNo!=\"\"'> and PERSON_POST.WAYBILL_NUMBER = TO_NUMBER(${emailNo}) </when>" +
" <when test='orderNumber!=\"\"'> and PERSON_POST.ORDER_NUMBER=${orderNumber} </when>" +
" <when test='jmsfzslh!=\"\"'> and PERSON_POST.FIRST_WHITE=#{jmsfzslh} </when>" +
" <when test='idCard!=\"\"'> and PERSON_POST.ID_CARD=#{idCard} </when>" +
" <if test='state== 0 '> and PERSON_POST.print_date is null </if>" +
" <if test='state== 1 '> and PERSON_POST.print_date is not null </if>" +
" <when test='district== 1 '> and PERSON_POST.FIRST_WHITE like '110018%' </when>" +
......@@ -64,15 +66,15 @@ public interface PersonPostMapper {
"WHERE RN BETWEEN ${pageSize} AND ${firstIndex}" +
" order by rn " +
"</script>")
public List <PersonPostEntity> findAllPersonalData( @Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("state") String state,@Param("district") String district, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") String getToCounty, @Param("startDate") String startDate,@Param("endDate") String endDate, @Param("firstIndex") long firstIndex, @Param("pageSize") long pageSize, @Param("emailNo") String emailNo, @Param("notNull") int notNull , @Param("printDate") String printDate, @Param("GK") Long gk);
List <PersonPostEntity> findAllPersonalData(@Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("jmsfzslh") String jmsfzslh, @Param("idCard") String idCard, @Param("state") String state, @Param("district") String district, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") String getToCounty, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("firstIndex") long firstIndex, @Param("pageSize") long pageSize, @Param("emailNo") String emailNo, @Param("notNull") int notNull, @Param("printDate") String printDate, @Param("GK") Long gk);
@Select("select ID,FIRST_WHITE,APPLICANT_NAME,NOTE from person_post where FIRST_WHITE=#{uploadId}")
public List<Map<String,Object>> selectNote(@Param("uploadId")String uploadId);
List<Map<String,Object>> selectNote(@Param("uploadId") String uploadId);
@Update("UPDATE PERSON_POST SET NOTE = #{note},STATE1 = 1 where FIRST_WHITE = #{uploadNo}")
public boolean addNote(@Param("uploadNo")String uploadNo,@Param("note")String note);
boolean addNote(@Param("uploadNo") String uploadNo, @Param("note") String note);
@Select("<script> " +
"SELECT COUNT(*) FROM PERSON_POST \n" +
......@@ -82,6 +84,8 @@ public interface PersonPostMapper {
" <when test='applicantName!=\"\"'> and PERSON_POST.APPLICANT_NAME = #{applicantName} </when>" +
" <when test='emailNo!=\"\" '> and PERSON_POST.WAYBILL_NUMBER =TO_NUMBER(#{emailNo}) </when>" +
" <when test='orderNumber!=\"\"'> and PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
" <when test='jmsfzslh!=\"\"'> and PERSON_POST.FIRST_WHITE=#{jmsfzslh} </when>" +
" <when test='idCard!=\"\"'> and PERSON_POST.ID_CARD=#{idCard} </when>" +
" <when test='state== 0 '> and PERSON_POST.print_date is null </when>" +
" <when test='state== 1 '> and PERSON_POST.print_date is not null </when>" +
" <when test='district== 1 '> and PERSON_POST.FIRST_WHITE like '110018%' </when>" +
......@@ -98,7 +102,7 @@ public interface PersonPostMapper {
" <when test='printDate!=\"\"'> and to_char(PERSON_POST.print_Date,'yyyyMMdd')=${printDate} </when>" +
" order by PERSON_POST.id " +
"</script>")
public int findPersonalDataCount( @Param("applicantName")String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state, @Param("district") String district,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") String getToCounty,@Param("startDate") String startDate,@Param("endDate") String endDate, @Param("emailNo")String emailNo,@Param("notNull")String notNull,@Param("printDate") String printDate, @Param("GK") Long gk);
int findPersonalDataCount(@Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("jmsfzslh") String jmsfzslh, @Param("idCard") String idCard, @Param("state") String state, @Param("district") String district, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") String getToCounty, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("emailNo") String emailNo, @Param("notNull") String notNull, @Param("printDate") String printDate, @Param("GK") Long gk);
......@@ -111,27 +115,27 @@ public interface PersonPostMapper {
" <when test='latticeMouthInformation!=null'> and PERSON_POST.LATTICE_MOUTH_INFORMATION=#{latticeMouthInformation} </when>" +
" <when test='getToCounty!=\"\"'> and PERSON_POST.GET_TO_COUNTY in ( #{getToCounty}) </when>" +
" <when test='startDate!=null'> and FILE_NAME_DIC.UPLOAD_DATE between #{startDate} and #{endDate} </when>")
public boolean deleteAllPersonalData( @Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("state") String state, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") List <String> getToCounty, @Param("startDate") String startDate,@Param("endDate") String endDate );
boolean deleteAllPersonalData(@Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("state") String state, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") List<String> getToCounty, @Param("startDate") String startDate, @Param("endDate") String endDate);
@Delete("DELETE FROM PERSON_POST WHERE FILE_ID = #{fileId}")
public void deletePersonPostByFileId(@Param("fileId")String fileId);
void deletePersonPostByFileId(@Param("fileId") String fileId);
@Select("select * from PERSON_POST where id = #{id}")
public PersonPostEntity findPostInfoById(int id);
PersonPostEntity findPostInfoById(int id);
@Update("update PERSON_POST SET PRINT_DATE=#{printDateTime}, STATUS = 1 where id=#{id}")
void updateIsPrint(@Param("id") int id, @Param("printDateTime") Date printDateTime);
@Delete("DELETE FROM PERSON_POST WHERE FILE_ID = #{fileId} and PRINT_DATE IS NULL")
public void deleteNoPrintPersonPostByFileId(@Param("fileId")String fileId);
void deleteNoPrintPersonPostByFileId(@Param("fileId") String fileId);
@Select("SELECT distinct FILE_NAME_DIC.FILE_ID FROM FILE_NAME_DIC right join person_post on person_post.file_id =FILE_NAME_DIC.FILE_ID WHERE substr(UPLOAD_DATE,0,8) between ${startDate} and ${endDate}")
public int selectFileIdByImportDate( @Param("startDate") String startDate,@Param("endDate") String endDate );
int selectFileIdByImportDate(@Param("startDate") String startDate, @Param("endDate") String endDate);
@Select("SELECT count(*) FROM FILE_NAME_DIC a LEFT JOIN PERSON_POST b on a.FILE_ID=b.FILE_ID WHERE b.PRINT_DATE IS NULL AND substr(a.UPLOAD_DATE,0,8) between ${startDate} and ${endDate} ")
public int selectPersonalDataCountByImportDate( @Param("startDate") String startDate,@Param("endDate") String endDate );
int selectPersonalDataCountByImportDate(@Param("startDate") String startDate, @Param("endDate") String endDate);
@Select("<script> " +
......@@ -157,25 +161,25 @@ public interface PersonPostMapper {
" <when test='notNull!=\"\"'> and PERSON_POST.state1=${notNull} </when>" +
" order by PERSON_POST.id " +
"</script>")
public List <PersonPostEntity> findAllPersonalDataNoPage( @Param("sqrxm") String sqrxm, @Param("ddh") String ddh, @Param("hasPrinted") String hasPrinted,@Param("district") String district,
@Param("gkxx") String gkxx, @Param("str") String str, @Param("startDate") String startDate,@Param("endDate") String endDate, @Param("emailNo") String emailNo,@Param("printDate") String printDate,@Param("notNull") String notNull, @Param("GK") Long gk);
List <PersonPostEntity> findAllPersonalDataNoPage(@Param("sqrxm") String sqrxm, @Param("ddh") String ddh, @Param("hasPrinted") String hasPrinted, @Param("district") String district,
@Param("gkxx") String gkxx, @Param("str") String str, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("emailNo") String emailNo, @Param("printDate") String printDate, @Param("notNull") String notNull, @Param("GK") Long gk);
@Select("SELECT distinct first_White,applicant_Name,recipient_Name,nature_Of_The_Information,ACCEPT_THE_MATTER " +
" FROM PERSON_POST WHERE STATE1 = 3 AND FIRST_WHITE IN (${uploadNo}) ")
public List<Map<String, Object>> checkPersonalPost(@Param("uploadNo") String uploadNo);
List<Map<String, Object>> checkPersonalPost(@Param("uploadNo") String uploadNo);
@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);
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,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}" +
" order by af.ID")
public List<Map<String, Object>> selectCancelPost(@Param("beginDate")String beginDate,@Param("endDate") String endDate);
List<Map<String, Object>> selectCancelPost(@Param("beginDate") String beginDate, @Param("endDate") String endDate);
@Select("SELECT * FROM PERSON_POST WHERE FIRST_WHITE = #{acceptNo}")
public PersonPostEntity findPersonalDataByAcceptNo(String acceptNo);
PersonPostEntity findPersonalDataByAcceptNo(String acceptNo);
@Select("select dataa.*,datab.typeid,datab.cstr from(\n" +
"select cd.COUNTYNAME,fi.DWDM DWDM,fi.dwmc,pp.CARD_TYPE_ID aa,count(pp.CARD_TYPE_ID) dd \n" +
......@@ -201,7 +205,7 @@ public interface PersonPostMapper {
"and pp.CARD_TYPE_ID=9\n" +
"group by cd.COUNTYNAME,fi.DWDM,fi.dwmc,pp.CARD_TYPE_ID ) datab\n" +
"on dataa.DWDM=datab.DWDM")
public List<Map<String,Object>> downloadUploadInfo(@Param("strDate")String strDate, @Param("endDate")String endDate);
List<Map<String,Object>> downloadUploadInfo(@Param("strDate") String strDate, @Param("endDate") String endDate);
// @Select("SELECT "
// + "dataa.*, "
......@@ -270,14 +274,14 @@ public interface PersonPostMapper {
" and WAYBILL_NUMBER in \n" +
" (select WAYBILL_NUMBER from PERSON_POST\n" +
" where FILE_ID=#{fileID})")
public int findWaybillNumber( @Param("fileID") String fileID);
int findWaybillNumber(@Param("fileID") String fileID);
@Select("select count(*) from PERSON_POST\n" +
" where FILE_ID <>#{fileID}\n" +
" and BACK_WAYBILL_NUMBER in \n" +
" (select BACK_WAYBILL_NUMBER from PERSON_POST\n" +
" where FILE_ID=#{fileID})")
public int findBackWaybillNumber( @Param("fileID") String fileID);
int findBackWaybillNumber(@Param("fileID") String fileID);
@Select("<script> " +
"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\n" +
......@@ -298,21 +302,21 @@ public interface PersonPostMapper {
" <when test='notNull!=\"\"'> and pp.state1=${notNull} </when>" +
" order by pp.ORDER_NUMBER " +
"</script>")
public List<Map<String,Object>> findAllPoarInvalidOrder( @Param("sqrxm") String sqrxm, @Param("ddh") String ddh, @Param("hasPrinted") String hasPrinted,
@Param("gkxx") String gkxx, @Param("str") String str, @Param("startDate") String startDate,@Param("endDate") String endDate, @Param("emailNo") String emailNo,@Param("printDate") String printDate,@Param("notNull") String notNull );
List<Map<String,Object>> findAllPoarInvalidOrder(@Param("sqrxm") String sqrxm, @Param("ddh") String ddh, @Param("hasPrinted") String hasPrinted,
@Param("gkxx") String gkxx, @Param("str") String str, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("emailNo") String emailNo, @Param("printDate") String printDate, @Param("notNull") String notNull);
@Insert("insert into GAT_TRACK " +
"(NO,UPLOAD_NO,ID_CARD,ID_NO,NAME,UPLOAD_UNIT,DATA_HOME_UNIT,DATA_HOME_UNIT_NAME,APPLY_REASON,STATUS,ERROR_TYPE,UPLOAD_TIME,CARD_ACCEPT_TIME,PHONE,FILE_ID) " +
"values " +
"(#{NO},#{UPLOAD_NO},#{ID_CARD},#{ID_NO},#{NAME},#{UPLOAD_UNIT},#{DATA_HOME_UNIT},#{DATA_HOME_UNIT_NAME},#{APPLY_REASON},#{STATUS},#{ERROR_TYPE},#{UPLOAD_TIME},#{CARD_ACCEPT_TIME},#{PHONE},#{FILE_ID})")
public boolean saveGATtr(GATTrackEntity gatTr);
boolean saveGATtr(GATTrackEntity gatTr);
@Select("SELECT ID,WAYBILL_NUMBER,BACK_WAYBILL_NUMBER,ORDER_NUMBER,RECIPIENT_NAME,RECIPIENT_PHONE," +
"RECIPIENT_ADDRESS,APPLICANT_NAME,PRINT_DATE,SENDER_NAME,SENDER_PHONE,SENDER_ADDRESS," +
"GET_TO_PROVINCE,GET_TO_CITY,GET_TO_COUNTY,BUSINESS_TYPE," +
"LATTICE_MOUTH_INFORMATION,NATURE_OF_THE_INTERNAL,NATURE_OF_THE_INFORMATION," +
"STATE FROM PERSON_POST WHERE ID_CARD=#{idCard} AND BEGIN_USEFUL_LIFE=#{startDate} AND VALID_PERIOD_END=#{endDate} AND STATE1=0")
public List<PersonPostDto> getPostInfoAtMachine(@Param("idCard") String idCard, @Param("startDate") String startDate, @Param("endDate") String endDate );
List<PersonPostDto> getPostInfoAtMachine(@Param("idCard") String idCard, @Param("startDate") String startDate, @Param("endDate") String endDate);
@Update("update PERSON_POST SET PRINT_DATE=#{printDateTime}, STATUS = 0 where id=#{id}")
void updatePrintDateAtMachine( @Param("id") int id, @Param("printDateTime") Date printDateTime );
......
src/main/java/com/yxproject/start/service/PersonPostService.java
View file @ f2644444
......@@ -25,49 +25,49 @@ public interface PersonPostService {
* @param creatTime
* @return
*/
public boolean updateIsPost(String fileId,String creatTime);
boolean updateIsPost(String fileId, String creatTime);
public boolean savePersonPost(List<PersonPostEntity> personPostEntities);
boolean savePersonPost(List<PersonPostEntity> personPostEntities);
public List<PersonPostEntity> findPersonalData(@Param("applicantName") String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("district") String district,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") List<String> getToCounty,@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("firstIndex") String firstIndex,@Param("pageSize") String pageSize, String emailNo,int notNull,String printDate, Long gk);
List<PersonPostEntity> findPersonalData(@Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("jmsfzslh") String jmsfzslh, @Param("idCard") String idCard, String state, @Param("district") String district, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") List<String> getToCounty, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("firstIndex") String firstIndex, @Param("pageSize") String pageSize, String emailNo, int notNull, String printDate, Long gk);
public boolean deletePersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String starDate,String endDate);
boolean deletePersonalData(String applicantName, String orderNumber, String state, String latticeMouthInformation, List<String> getToCounty, String starDate, String endDate);
public boolean deletePersonalDataByImportDate(String startDate, String endDate);
boolean deletePersonalDataByImportDate(String startDate, String endDate);
public List<PersonPostEntity> getPostInfo(ReadCardDto readCardDto);
List<PersonPostEntity> getPostInfo(ReadCardDto readCardDto);
public boolean printPostList(int id, Date printDateTime);
boolean printPostList(int id, Date printDateTime);
public int findPersonalDataCount(String applicantName, String orderNumber, String state,String district, String latticeMouthInformation, List<String> getToCounty, String startDate,String endDate, String emailNo,String notNull,String printDate, Long gk);
int findPersonalDataCount(String applicantName, String orderNumber, String jmsfzslh, String idCard, String state, String district, String latticeMouthInformation, List<String> getToCounty, String startDate, String endDate, String emailNo, String notNull, String printDate, Long gk);
public int findPersonalDataCountByImportDate(String starDate,String endDate);
int findPersonalDataCountByImportDate(String starDate, String endDate);
public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request,HttpServletResponse response,String sqrxm, String ddh, String hasPrinted,String district, String gkxx, JSONArray jsonArray,String starDate,String endDate,String emailNo,String printDate,String notNull, Long gk);
List<PersonPostEntity> downLoadReportForm(HttpServletRequest request, HttpServletResponse response, String sqrxm, String ddh, String hasPrinted, String district, String gkxx, JSONArray jsonArray, String starDate, String endDate, String emailNo, String printDate, String notNull, Long gk);
public Map<String,Object> selectNote(@Param("uploadId")String uploadId);
Map<String,Object> selectNote(@Param("uploadId") String uploadId);
public boolean addNote(@Param("uploadNo")String uploadNo,@Param("note")String note);
boolean addNote(@Param("uploadNo") String uploadNo, @Param("note") String note);
public List<Map<String, Object>> checkPersonalPost(String uploadNo);
List<Map<String, Object>> checkPersonalPost(String uploadNo);
public boolean cancelPostByAcceptNo(String uploadNo,String remarks,String name);
boolean cancelPostByAcceptNo(String uploadNo, String remarks, String name);
public List<Map<String,Object>> selectCancelPost(String beginDate,String endDate);
List<Map<String,Object>> selectCancelPost(String beginDate, String endDate);
public PersonPostEntity findPersonalDataByAcceptNo(String acceptNo);
PersonPostEntity findPersonalDataByAcceptNo(String acceptNo);
public List<Map<String, Object>> downloadUploadInfo(HttpServletRequest request,HttpServletResponse response,String startDate,String endDate);
List<Map<String, Object>> downloadUploadInfo(HttpServletRequest request, HttpServletResponse response, String startDate, String endDate);
public int findWaybillNumber( @Param("fileID") String fileID);
int findWaybillNumber(@Param("fileID") String fileID);
public int findBackWaybillNumber( @Param("fileID") String fileID);
int findBackWaybillNumber(@Param("fileID") String fileID);
public List<Map<String,Object>> downLoadInvalidOrder(HttpServletRequest request,HttpServletResponse response,String sqrxm, String ddh, String hasPrinted, String gkxx, JSONArray jsonArray,String starDate,String endDate,String emailNo,String printDate,String notNull);
List<Map<String,Object>> downLoadInvalidOrder(HttpServletRequest request, HttpServletResponse response, String sqrxm, String ddh, String hasPrinted, String gkxx, JSONArray jsonArray, String starDate, String endDate, String emailNo, String printDate, String notNull);
public boolean saveGATTrack(List<GATTrackEntity> gatTR);
boolean saveGATTrack(List<GATTrackEntity> gatTR);
public List<PersonPostDto> getPostInfoAtMachine(ReadCardDto readCardDto);
List<PersonPostDto> getPostInfoAtMachine(ReadCardDto readCardDto);
public boolean updatePrintDateAtMachine(int id, Date printDateTime);
boolean updatePrintDateAtMachine(int id, Date printDateTime);
}
src/main/java/com/yxproject/start/service/impl/PersonPostServiceImpl.java
View file @ f2644444
......@@ -54,7 +54,7 @@ public class PersonPostServiceImpl implements PersonPostService {
return true;
}
@Override
public List<PersonPostEntity> findPersonalData(String applicantName, String orderNumber, String state,String district, String latticeMouthInformation, List<String> getToCounty, String startDate, String endDate, String firstIndex, String pageSize, String emailNo, int notNull, String printDate, Long gk) {
public List<PersonPostEntity> findPersonalData(String applicantName, String orderNumber, String jmsfzslh, String idCard, String state,String district, String latticeMouthInformation, List<String> getToCounty, String startDate, String endDate, String firstIndex, String pageSize, String emailNo, int notNull, String printDate, Long gk) {
StringBuilder str = new StringBuilder();
long firstIndexLong = Long.parseLong(firstIndex);
long pageSizeLong = Long.parseLong(pageSize);
......@@ -65,7 +65,7 @@ public class PersonPostServiceImpl implements PersonPostService {
str.append("'").append(getToCounty.get(i)).append("',");
}
}
return personPostMapper.findAllPersonalData(applicantName, orderNumber, state,district, latticeMouthInformation, str.toString(), startDate, endDate, firstIndexLong * pageSizeLong, (firstIndexLong - 1) * pageSizeLong + 1, emailNo, notNull, printDate, gk);
return personPostMapper.findAllPersonalData(applicantName, orderNumber, jmsfzslh, idCard, state,district, latticeMouthInformation, str.toString(), startDate, endDate, firstIndexLong * pageSizeLong, (firstIndexLong - 1) * pageSizeLong + 1, emailNo, notNull, printDate, gk);
}
@Override
......@@ -97,7 +97,7 @@ public class PersonPostServiceImpl implements PersonPostService {
}
@Override
public int findPersonalDataCount(@Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("state") String state,@Param("district") String district, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") List<String> getToCounty, @Param("startDate") String startDate, @Param("endDate") String endDate, String emailNo, String notNull, String printDate, Long gk) {
public int findPersonalDataCount(@Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("jmsfzslh") String jmsfzslh, @Param("idCard") String idCard, @Param("state") String state,@Param("district") String district, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") List<String> getToCounty, @Param("startDate") String startDate, @Param("endDate") String endDate, String emailNo, String notNull, String printDate, Long gk) {
StringBuilder str = new StringBuilder();
for (int i = 0; i < getToCounty.size(); i++) {
if (i == getToCounty.size() - 1) {
......@@ -106,7 +106,7 @@ public class PersonPostServiceImpl implements PersonPostService {
str.append("'").append(getToCounty.get(i)).append("',");
}
}
return personPostMapper.findPersonalDataCount(applicantName, orderNumber, state, district,latticeMouthInformation, str.toString(), startDate, endDate, emailNo, notNull, printDate, gk);
return personPostMapper.findPersonalDataCount(applicantName, orderNumber, jmsfzslh, idCard, state, district,latticeMouthInformation, str.toString(), startDate, endDate, emailNo, notNull, printDate, gk);
}
@Override
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ f2644444
<style>
.table th,
.table td {
text-align: center;
vertical-align: middle !important;
}
.select2-search__field {
height: 30px;
}
.ul li {
cursor: pointer;
}
.page-list .pagination {
float: left;
}
.page-list .pagination span {
cursor: pointer;
}
.page-list .pagination .separate span {
cursor: default;
border-top: none;
border-bottom: none;
}
.page-list .pagination .separate span:hover {
background: none;
}
.page-list .page-total {
float: left;
margin: 25px 20px;
}
.page-list .page-total input,
.page-list .page-total select {
height: 26px;
border: 1px solid #ddd;
}
.page-list .page-total input {
width: 40px;
padding-left: 3px;
}
.page-list .page-total select {
width: 50px;
}
.page-list:after {
display: block;
clear: both;
content: "";
}
.table th,
.table td {
text-align: center;
vertical-align: middle !important;
}
.page-list {
zoom: 1;
}
.select2-search__field {
height: 30px;
}
.ul li {
cursor: pointer;
}
.page-list .pagination {
float: left;
}
.page-list .pagination span {
cursor: pointer;
}
.page-list .pagination .separate span {
cursor: default;
border-top: none;
border-bottom: none;
}
.page-list .pagination .separate span:hover {
background: none;
}
.page-list .page-total {
float: left;
margin: 25px 20px;
}
.page-list .page-total input,
.page-list .page-total select {
height: 26px;
border: 1px solid #ddd;
}
.page-list .page-total input {
width: 40px;
padding-left: 3px;
}
.page-list .page-total select {
width: 50px;
}
.page-list:after {
display: block;
clear: both;
content: "";
}
.page-list {
zoom: 1;
}
</style>
<div class="content row">
<div class="col-md-12" style="margin-top: 17px">
<div class="box">
<strong class="box-header">快递单信息管理</strong>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0">
<tr>
<td>申请人姓名:</td>
<td>
<input
type="text"
class="form-control"
ng-model="applicantName"
placeholder="申请人姓名"
/>
</td>
<td>订单号:</td>
<td>
<input
type="text"
class="form-control"
ng-model="orderNo"
placeholder="订单号"
/>
</td>
<td>正向邮件号:</td>
<td>
<input
type="text"
class="form-control"
ng-model="emailNo"
placeholder="邮件号"
/>
</td>
</tr>
<tr>
<td>数据状态:</td>
<td style="text-align: left">
<select
class="form-control select2"
id="notNull"
ng-model="isValid"
>
<option value="">--请选择数据状态--</option>
<option value="1">取消邮寄</option>
<option value="0">有效订单</option>
<option value="3">待定订单</option>
</select>
</td>
<td>格口:</td>
<td>
<input
type="text"
class="form-control"
ng-model="gkxx"
placeholder="格口"
/>
</td>
<td>区县:</td>
<td style="text-align: left">
<select
class="form-control select2"
id="county"
multiple="multiple"
data-placeholder="--请选择区县--"
style="width: 100%"
ng-model="currentCounty"
>
<option value="东城区">东城区</option>
<option value="西城区">西城区</option>
<option value="朝阳区">朝阳区</option>
<option value="海淀区">海淀区</option>
<option value="丰台区">丰台区</option>
<option value="石景山区">石景山区</option>
<option value="房山区">房山区</option>
<option value="门头沟区">门头沟区</option>
<option value="顺义区">顺义区</option>
<option value="平谷区">平谷区</option>
<option value="怀柔区">怀柔区</option>
<option value="密云区">密云区</option>
<option value="昌平区">昌平区</option>
<option value="延庆区">延庆区</option>
<option value="大兴区">大兴区</option>
<option value="通州区">通州区</option>
<option value="中关村科技园区">中关村科技园区</option>
</select>
</td>
</tr>
<tr>
<td>Excel导入起始日期:</td>
<td>
<div class="input-group date">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input
type="text"
class="form-control pull-right"
value="{{choseDate}}"
id="datepicker"
readonly
/>
<span class="input-group-addon"
><span class="glyphicon glyphicon-remove"></span
></span>
</div>
</td>
<td>Excel导入截止日期:</td>
<td>
<div class="input-group date">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input
type="text"
class="form-control pull-right"
value="{{choseDate}}"
id="datepicker1"
readonly
/>
<span class="input-group-addon"
><span class="glyphicon glyphicon-remove"></span
></span>
</div>
</td>
<td>打印状态:</td>
<td style="text-align: left">
<select
class="form-control select2"
id="print"
ng-model="isPrint"
>
<option value="">--请选择打印状态--</option>
<option value="1">已打印</option>
<option value="0">未打印</option>
</select>
</td>
</tr>
<tr>
<td>打印时间:</td>
<td>
<div class="input-group date">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input
type="text"
class="form-control pull-right"
value=""
id="printDate"
readonly
/>
<span class="input-group-addon"
><span class="glyphicon glyphicon-remove"></span
></span>
</div>
</td>
<td>受理区县:</td>
<td style="text-align: left">
<select
class="form-control select2"
id="district"
ng-model="district"
>
<option value="">--请选择受理区县--</option>
<option value="1">密云</option>
<option value="0">其他（除密云外所有区县）</option>
</select>
</td>
<td>分拣信息:</td>
<td style="text-align: left">
<select
class="form-control select2"
id="gk"
style="width: 100%"
ng-model="gk"
>
<option value="">--请选择分拣信息--</option>
<option value="1">城区</option>
<option value="5">远郊</option>
<option value="0">其他</option>
</select>
</td>
</tr>
<tr>
<td colspan="2">
<div style="float: left">
<button
class="btn btn-primary"
style="margin-right: 7px"
ng-click="doQuery()"
>
查询
</button>
<button
class="btn btn-primary"
style="margin-right: 7px"
ng-click="subSomething()"
>
读卡查询
</button>
<button
type="submit"
class="btn btn-info"
style="margin-right: 7px"
ng-click="downloadExcel()"
>
下载Excel
</button>
<button
type="submit"
class="btn btn-danger"
ng-click="deleteRecords()"
>
删除
</button>
</div>
</td>
</tr>
</table>
</div>
</div>
<div class="box box-default">
<div class="box-header with-border">
<strong>邮寄单详情</strong> (<span style="color: #0b93d5"
>每页显示{{paginationConf.itemsPerPage}}条/共
<div class="col-md-12" style="margin-top: 17px">
<div class="box">
<strong class="box-header">快递单信息管理</strong>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0">
<tr>
<td>申请人姓名:</td>
<td>
<input
type="text"
class="form-control"
ng-model="applicantName"
placeholder="申请人姓名"
/>
</td>
<td>订单号:</td>
<td>
<input
type="text"
class="form-control"
ng-model="orderNo"
placeholder="订单号"
/>
</td>
<td>正向邮件号:</td>
<td>
<input
type="text"
class="form-control"
ng-model="emailNo"
placeholder="邮件号"
/>
</td>
</tr>
<tr>
<td>数据状态:</td>
<td style="text-align: left">
<select
class="form-control select2"
id="notNull"
ng-model="isValid"
>
<option value="">--请选择数据状态--</option>
<option value="1">取消邮寄</option>
<option value="0">有效订单</option>
<option value="3">待定订单</option>
</select>
</td>
<td>格口:</td>
<td>
<input
type="text"
class="form-control"
ng-model="gkxx"
placeholder="格口"
/>
</td>
<td>区县:</td>
<td style="text-align: left">
<select
class="form-control select2"
id="county"
multiple="multiple"
data-placeholder="--请选择区县--"
style="width: 100%"
ng-model="currentCounty"
>
<option value="东城区">东城区</option>
<option value="西城区">西城区</option>
<option value="朝阳区">朝阳区</option>
<option value="海淀区">海淀区</option>
<option value="丰台区">丰台区</option>
<option value="石景山区">石景山区</option>
<option value="房山区">房山区</option>
<option value="门头沟区">门头沟区</option>
<option value="顺义区">顺义区</option>
<option value="平谷区">平谷区</option>
<option value="怀柔区">怀柔区</option>
<option value="密云区">密云区</option>
<option value="昌平区">昌平区</option>
<option value="延庆区">延庆区</option>
<option value="大兴区">大兴区</option>
<option value="通州区">通州区</option>
<option value="中关村科技园区">中关村科技园区</option>
</select>
</td>
</tr>
<tr>
<td>Excel导入起始日期:</td>
<td>
<div class="input-group date">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input
type="text"
class="form-control pull-right"
value="{{choseDate}}"
id="datepicker"
readonly
/>
<span class="input-group-addon"
><span class="glyphicon glyphicon-remove"></span
></span>
</div>
</td>
<td>Excel导入截止日期:</td>
<td>
<div class="input-group date">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input
type="text"
class="form-control pull-right"
value="{{choseDate}}"
id="datepicker1"
readonly
/>
<span class="input-group-addon"
><span class="glyphicon glyphicon-remove"></span
></span>
</div>
</td>
<td>打印状态:</td>
<td style="text-align: left">
<select
class="form-control select2"
id="print"
ng-model="isPrint"
>
<option value="">--请选择打印状态--</option>
<option value="1">已打印</option>
<option value="0">未打印</option>
</select>
</td>
</tr>
<tr>
<td>打印时间:</td>
<td>
<div class="input-group date">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input
type="text"
class="form-control pull-right"
value=""
id="printDate"
readonly
/>
<span class="input-group-addon"
><span class="glyphicon glyphicon-remove"></span
></span>
</div>
</td>
<td>受理区县:</td>
<td style="text-align: left">
<select
class="form-control select2"
id="district"
ng-model="district"
>
<option value="">--请选择受理区县--</option>
<option value="1">密云</option>
<option value="0">其他（除密云外所有区县）</option>
</select>
</td>
<td>分拣信息:</td>
<td style="text-align: left">
<select
class="form-control select2"
id="gk"
style="width: 100%"
ng-model="gk"
>
<option value="">--请选择分拣信息--</option>
<option value="1">城区</option>
<option value="5">远郊</option>
<option value="0">其他</option>
</select>
</td>
</tr>
<tr>
<td>受理号:</td>
<td>
<input
type="text"
class="form-control"
ng-model="jmsfzslh"
placeholder="居民身份证受理号"
/>
</td>
<td>身份证号:</td>
<td>
<input
type="text"
class="form-control"
ng-model="idCard"
placeholder="身份证号"
/>
</td>
<td colspan="2">
<div style="float: left">
<button
class="btn btn-primary"
style="margin-right: 7px"
ng-click="doQuery()"
>
查询
</button>
<button
class="btn btn-primary"
style="margin-right: 7px"
ng-click="subSomething()"
>
读卡查询
</button>
<button
type="submit"
class="btn btn-info"
style="margin-right: 7px"
ng-click="downloadExcel()"
>
下载Excel
</button>
<button
type="submit"
class="btn btn-danger"
ng-click="deleteRecords()"
>
删除
</button>
</div>
</td>
</tr>
</table>
</div>
</div>
<div class="box box-default">
<div class="box-header with-border">
<strong>邮寄单详情</strong> (<span style="color: #0b93d5"
>每页显示{{paginationConf.itemsPerPage}}条/共
{{paginationConf.totalItems}}条</span
>)
</div>
<div class="box-info" style="padding: 7px; padding-top: 0px">
<table
class="table table-bordered table-hover"
ng-if="postData.length>0"
>
<thead>
<tr>
<th>NO.</th>
<th>订单号</th>
<th>正-反向邮件号</th>
<th>受理号</th>
<th>申请人姓名</th>
<!--<th>身份证号</th>-->
<th>收件人姓名</th>
<th>收件人联系电话</th>
<th>地址</th>
<th>打印时间</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in postData">
<td>{{$index+1}}</td>
<td>{{item.orderNumber}}</td>
<td>{{item.waybillNumber}} - {{item.backWaybillNumber}}</td>
<td>{{item.firstWhite}}</td>
<td>{{item.applicantName}}</td>
<!--<td>{{item.idCard}}</td>-->
<td>{{item.recipientName}}</td>
<td>{{item.recipientPhone}}</td>
<td ng-click="showDetail(item)">
<a>{{item.recipientAddress}}</a>
</td>
<td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td>
<td ng-click="addNote(item.firstWhite)">
<a style="color: black">{{item.note}}</a>
<a ng-if="item.note==null">更新</a>
</td>
</tr>
</tbody>
</table>
<!--<div class="box-footer" ng-if="postData.length>0">
<button class="pull-right btn btn-primary" ng-click="addNote()">添加备注</button>
</div>-->
<div style="padding-left: 27%" ng-if="postData.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
>)
</div>
<div class="box-info" style="padding: 7px; padding-top: 0px">
<table
class="table table-bordered table-hover"
ng-if="postData.length>0"
>
<thead>
<tr>
<th>NO.</th>
<th>订单号</th>
<th>正-反向邮件号</th>
<th>受理号</th>
<th>申请人姓名</th>
<!--<th>身份证号</th>-->
<th>收件人姓名</th>
<th>收件人联系电话</th>
<th>地址</th>
<th>打印时间</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in postData">
<td>{{$index + 1}}</td>
<td>{{item.orderNumber}}</td>
<td>{{item.waybillNumber}} - {{item.backWaybillNumber}}</td>
<td>{{item.firstWhite}}</td>
<td>{{item.applicantName}}</td>
<!--<td>{{item.idCard}}</td>-->
<td>{{item.recipientName}}</td>
<td>{{item.recipientPhone}}</td>
<td ng-click="showDetail(item)">
<a>{{item.recipientAddress}}</a>
</td>
<td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td>
<td ng-click="addNote(item.firstWhite)">
<a style="color: black">{{item.note}}</a>
<a ng-if="item.note==null">更新</a>
</td>
</tr>
</tbody>
</table>
<!--<div class="box-footer" ng-if="postData.length>0">
<button class="pull-right btn btn-primary" ng-click="addNote()">添加备注</button>
</div>-->
<div style="padding-left: 27%" ng-if="postData.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
<h4 ng-if="postData.length==0">暂无记录。</h4>
</div>
</div>
<h4 ng-if="postData.length==0">暂无记录。</h4>
</div>
</div>
</div>
</div>
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ f2644444
......@@ -82,6 +82,16 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else{
json.orderNumber='';
}
if (angular.isDefined($scope.jmsfzslh)) {
json.jmsfzslh = $scope.jmsfzslh
}else {
json.jmsfzslh = '';
}
if (angular.isDefined($scope.idCard)) {
json.idCard = $scope.idCard
}else {
json.idCard = '';
}
if ($("#print").val() == '') {
json.state=-1;
}else {
......@@ -152,6 +162,16 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else{
json.orderNumber='';
}
if (angular.isDefined($scope.jmsfzslh)) {
json.jmsfzslh = $scope.jmsfzslh
}else {
json.jmsfzslh = '';
}
if (angular.isDefined($scope.idCard)) {
json.idCard = $scope.idCard
}else {
json.idCard = '';
}
if ($("#print").val() == '') {
json.state=-1;
}else {
......
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