Skip to content

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

EMS订单管理添加受理单位字段； 

更新快递单样式
parent 77eb2efc
Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 90 deletions
src/main/java/com/yxproject/start/api/PersonPostApi.java
View file @ 6c28011b
...@@ -202,6 +202,7 @@ public class PersonPostApi { ...@@ -202,6 +202,7 @@ public class PersonPostApi {
String applicantName = jsonObject.getString("applicantName"); String applicantName = jsonObject.getString("applicantName");
String orderNumber = jsonObject.getString("orderNumber"); String orderNumber = jsonObject.getString("orderNumber");
String state = jsonObject.getString("state"); String state = jsonObject.getString("state");
String district = jsonObject.getString("district");
String latticeMouthInformation = jsonObject.getString("latticeMouthInformation"); String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
JSONArray jsonArray = (JSONArray) jsonObject.get("getToCounty"); JSONArray jsonArray = (JSONArray) jsonObject.get("getToCounty");
String startDate = replaceDate(jsonObject.getString("startDate")); String startDate = replaceDate(jsonObject.getString("startDate"));
...@@ -209,7 +210,7 @@ public class PersonPostApi { ...@@ -209,7 +210,7 @@ public class PersonPostApi {
String emailNo = jsonObject.getString("emailNo"); String emailNo = jsonObject.getString("emailNo");
String notNull = jsonObject.getString("notNull"); String notNull = jsonObject.getString("notNull");
String printDate = stripNonDigits(jsonObject.getString("printDate")); String printDate = stripNonDigits(jsonObject.getString("printDate"));
count = personPostService.findPersonalDataCount(applicantName, orderNumber, state, latticeMouthInformation, jsonArray, startDate,endDate, emailNo, notNull,printDate); count = personPostService.findPersonalDataCount(applicantName, orderNumber, state, district,latticeMouthInformation, jsonArray, startDate,endDate, emailNo, notNull,printDate);
} catch (Exception e) { } catch (Exception e) {
logger.error("个人邮寄信息：" + jsonObject); logger.error("个人邮寄信息：" + jsonObject);
logger.error("Exception 按条件查询个人邮寄信息异常", e); logger.error("Exception 按条件查询个人邮寄信息异常", e);
...@@ -235,6 +236,7 @@ public class PersonPostApi { ...@@ -235,6 +236,7 @@ public class PersonPostApi {
String applicantName = jsonObject.getString("applicantName"); String applicantName = jsonObject.getString("applicantName");
String orderNumber = jsonObject.getString("orderNumber"); String orderNumber = jsonObject.getString("orderNumber");
String state = jsonObject.getString("state"); String state = jsonObject.getString("state");
String district = jsonObject.getString("district");
String latticeMouthInformation = jsonObject.getString("latticeMouthInformation"); String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
JSONArray jsonArray = (JSONArray) jsonObject.get("getToCounty"); JSONArray jsonArray = (JSONArray) jsonObject.get("getToCounty");
String startDate = replaceDate(jsonObject.getString("startDate")); String startDate = replaceDate(jsonObject.getString("startDate"));
...@@ -244,7 +246,7 @@ public class PersonPostApi { ...@@ -244,7 +246,7 @@ public class PersonPostApi {
String emailNo = jsonObject.getString("emailNo"); String emailNo = jsonObject.getString("emailNo");
int notNull = Integer.parseInt((jsonObject.getString("notNull"))); int notNull = Integer.parseInt((jsonObject.getString("notNull")));
String printDate = stripNonDigits(jsonObject.getString("printDate")); String printDate = stripNonDigits(jsonObject.getString("printDate"));
list = personPostService.findPersonalData(applicantName, orderNumber, state, latticeMouthInformation, jsonArray, startDate, endDate, firstIndex, pageSize, emailNo, notNull,printDate); list = personPostService.findPersonalData(applicantName, orderNumber, state,district, latticeMouthInformation, jsonArray, startDate, endDate, firstIndex, pageSize, emailNo, notNull,printDate);
} catch (Exception e) { } catch (Exception e) {
logger.error("个人邮寄信息：" + jsonObject); logger.error("个人邮寄信息：" + jsonObject);
logger.error("Exception 按条件查询个人邮寄信息异常", e); logger.error("Exception 按条件查询个人邮寄信息异常", e);
...@@ -320,7 +322,7 @@ public class PersonPostApi { ...@@ -320,7 +322,7 @@ public class PersonPostApi {
@RequestMapping("download") @RequestMapping("download")
public void exportExcel(HttpServletRequest request, HttpServletResponse response, public void exportExcel(HttpServletRequest request, HttpServletResponse response,
@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate, @RequestParam("hasPrinted") String hasPrinted, @RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate, @RequestParam("hasPrinted") String hasPrinted,@RequestParam("district") String district,
@RequestParam("djx") List<String> djx, @RequestParam("gkxx") String gkxx, @RequestParam("ddh") String ddh, @RequestParam("notNull") String notNull, @RequestParam("djx") List<String> djx, @RequestParam("gkxx") String gkxx, @RequestParam("ddh") String ddh, @RequestParam("notNull") String notNull,
@RequestParam("sequence") String sequence, @RequestParam("sqrxm") String sqrxm, @RequestParam("emailNo") String emailNo,@RequestParam("printDate") String printDate) throws Exception { @RequestParam("sequence") String sequence, @RequestParam("sqrxm") String sqrxm, @RequestParam("emailNo") String emailNo,@RequestParam("printDate") String printDate) throws Exception {
String remoteAddr = request.getRemoteAddr(); String remoteAddr = request.getRemoteAddr();
...@@ -328,7 +330,7 @@ public class PersonPostApi { ...@@ -328,7 +330,7 @@ public class PersonPostApi {
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
try { try {
jsonArray = JSONArray.fromObject(djx); jsonArray = JSONArray.fromObject(djx);
List<PersonPostEntity> list = personPostService.downLoadReportForm(request, response, sqrxm, ddh, hasPrinted, gkxx, jsonArray, replaceDate(startDate),replaceDate(endDate), emailNo,stripNonDigits(printDate),notNull); List<PersonPostEntity> list = personPostService.downLoadReportForm(request, response, sqrxm, ddh, hasPrinted,district, gkxx, jsonArray, replaceDate(startDate),replaceDate(endDate), emailNo,stripNonDigits(printDate),notNull);
exportExcel(request, response, list); exportExcel(request, response, list);
} catch (Exception e) { } catch (Exception e) {
logger.error("上传时间：" + startDate + endDate + "类型普证-0，邮寄-9：" + hasPrinted + "格口信息：" + gkxx + "订单号：" + ddh + "申请人姓名：" + sqrxm + "运单号码：" + emailNo); logger.error("上传时间：" + startDate + endDate + "类型普证-0，邮寄-9：" + hasPrinted + "格口信息：" + gkxx + "订单号：" + ddh + "申请人姓名：" + sqrxm + "运单号码：" + emailNo);
......
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ 6c28011b
...@@ -44,6 +44,8 @@ public interface PersonPostMapper { ...@@ -44,6 +44,8 @@ public interface PersonPostMapper {
" <when test='orderNumber!=\"\"'> and PERSON_POST.ORDER_NUMBER=${orderNumber} </when>" + " <when test='orderNumber!=\"\"'> and PERSON_POST.ORDER_NUMBER=${orderNumber} </when>" +
" <if test='state== 0 '> and PERSON_POST.print_date is null </if>" + " <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>" + " <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>" +
" <when test='district== 0 '> and SUBSTR(PERSON_POST.FIRST_WHITE,0,6) != '110018' </when>" +
" <if test='notNull== 1 '> and PERSON_POST.state1=1 </if>" + " <if test='notNull== 1 '> and PERSON_POST.state1=1 </if>" +
" <if test='notNull== 0 '> and PERSON_POST.state1=0 </if>" + " <if test='notNull== 0 '> and PERSON_POST.state1=0 </if>" +
" <if test='notNull== 3 '> and PERSON_POST.state1=3 </if>" + " <if test='notNull== 3 '> and PERSON_POST.state1=3 </if>" +
...@@ -57,7 +59,7 @@ public interface PersonPostMapper { ...@@ -57,7 +59,7 @@ public interface PersonPostMapper {
"WHERE RN BETWEEN ${pageSize} AND ${firstIndex}" + "WHERE RN BETWEEN ${pageSize} AND ${firstIndex}" +
" order by rn " + " order by rn " +
"</script>") "</script>")
public List <PersonPostEntity> findAllPersonalData( @Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("state") String state, @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); 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);
@Select("select ID,FIRST_WHITE,APPLICANT_NAME,NOTE from person_post where FIRST_WHITE=#{uploadId}") @Select("select ID,FIRST_WHITE,APPLICANT_NAME,NOTE from person_post where FIRST_WHITE=#{uploadId}")
...@@ -77,6 +79,8 @@ public interface PersonPostMapper { ...@@ -77,6 +79,8 @@ public interface PersonPostMapper {
" <when test='orderNumber!=\"\"'> and PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" + " <when test='orderNumber!=\"\"'> and PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
" <when test='state== 0 '> and PERSON_POST.print_date is null </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='state== 1 '> and PERSON_POST.print_date is not null </when>" +
" <when test='district== 1 '> and PERSON_POST.FIRST_WHITE like '110018%' </when>" +
" <when test='district== 0 '> and SUBSTR(PERSON_POST.FIRST_WHITE,0,6) != '110018' </when>" +
" <if test='notNull== 1 '> and PERSON_POST.state1=1 </if>" + " <if test='notNull== 1 '> and PERSON_POST.state1=1 </if>" +
" <if test='notNull== 0 '> and PERSON_POST.state1=0 </if>" + " <if test='notNull== 0 '> and PERSON_POST.state1=0 </if>" +
" <if test='notNull== 3 '> and PERSON_POST.state1=3 </if>" + " <if test='notNull== 3 '> and PERSON_POST.state1=3 </if>" +
...@@ -86,7 +90,7 @@ public interface PersonPostMapper { ...@@ -86,7 +90,7 @@ public interface PersonPostMapper {
" <when test='printDate!=\"\"'> and to_char(PERSON_POST.print_Date,'yyyyMMdd')=${printDate} </when>" + " <when test='printDate!=\"\"'> and to_char(PERSON_POST.print_Date,'yyyyMMdd')=${printDate} </when>" +
" order by PERSON_POST.id " + " order by PERSON_POST.id " +
"</script>") "</script>")
public int findPersonalDataCount( @Param("applicantName")String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@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); 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);
...@@ -132,6 +136,8 @@ public interface PersonPostMapper { ...@@ -132,6 +136,8 @@ public interface PersonPostMapper {
// " <when test='hasPrinted!=\"\"'> and PERSON_POST.STATE=#{hasPrinted} </when>" + // " <when test='hasPrinted!=\"\"'> and PERSON_POST.STATE=#{hasPrinted} </when>" +
" <when test='hasPrinted== 0 '> and PERSON_POST.print_date is null </when>" + " <when test='hasPrinted== 0 '> and PERSON_POST.print_date is null </when>" +
" <when test='hasPrinted== 1 '> and PERSON_POST.print_date is not null </when>" + " <when test='hasPrinted== 1 '> and PERSON_POST.print_date is not null </when>" +
" <when test='district== 1 '> and PERSON_POST.FIRST_WHITE like '110018%' </when>" +
" <when test='district== 0 '> and SUBSTR(PERSON_POST.FIRST_WHITE,0,6) != '110018' </when>" +
" <when test='gkxx!=\"\"'> and PERSON_POST.LATTICE_MOUTH_INFORMATION=#{gkxx} </when>" + " <when test='gkxx!=\"\"'> and PERSON_POST.LATTICE_MOUTH_INFORMATION=#{gkxx} </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='str!=\"\"'> and PERSON_POST.GET_TO_COUNTY in ( ${str} ) </when>" + " <when test='str!=\"\"'> and PERSON_POST.GET_TO_COUNTY in ( ${str} ) </when>" +
...@@ -140,7 +146,7 @@ public interface PersonPostMapper { ...@@ -140,7 +146,7 @@ public interface PersonPostMapper {
" <when test='notNull!=\"\"'> and PERSON_POST.state1=${notNull} </when>" + " <when test='notNull!=\"\"'> and PERSON_POST.state1=${notNull} </when>" +
" order by PERSON_POST.id " + " order by PERSON_POST.id " +
"</script>") "</script>")
public List <PersonPostEntity> findAllPersonalDataNoPage( @Param("sqrxm") String sqrxm, @Param("ddh") String ddh, @Param("hasPrinted") String hasPrinted, 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("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 );
@Select("SELECT distinct first_White,applicant_Name,recipient_Name,nature_Of_The_Information,ACCEPT_THE_MATTER " + @Select("SELECT distinct first_White,applicant_Name,recipient_Name,nature_Of_The_Information,ACCEPT_THE_MATTER " +
...@@ -167,7 +173,7 @@ public interface PersonPostMapper { ...@@ -167,7 +173,7 @@ public interface PersonPostMapper {
"on pp.FILE_ID=fi.id \n" + "on pp.FILE_ID=fi.id \n" +
"left join COUNTY_DIC cd\n" + "left join COUNTY_DIC cd\n" +
"on substr(dwdm,0,6）=cd.COUNTY_CODE\n" + "on substr(dwdm,0,6）=cd.COUNTY_CODE\n" +
"where TO_CHAR(fi.UPLOAD_DATE,'yyyyMMdd') BETWEEN #{strDate} AND #{endDate}\n" + "where pp.YXQQSRQ BETWEEN #{strDate} AND #{endDate}\n" +
"and pp.CARD_TYPE_ID=0\n" + "and pp.CARD_TYPE_ID=0\n" +
"group by cd.COUNTYNAME,fi.DWDM,fi.dwmc,pp.CARD_TYPE_ID " + "group by cd.COUNTYNAME,fi.DWDM,fi.dwmc,pp.CARD_TYPE_ID " +
"order by fi.DWDM \n" + "order by fi.DWDM \n" +
...@@ -180,7 +186,7 @@ public interface PersonPostMapper { ...@@ -180,7 +186,7 @@ public interface PersonPostMapper {
"on pp.FILE_ID=fi.id \n" + "on pp.FILE_ID=fi.id \n" +
"left join COUNTY_DIC cd\n" + "left join COUNTY_DIC cd\n" +
"on substr(dwdm,0,6）=cd.COUNTY_CODE\n" + "on substr(dwdm,0,6）=cd.COUNTY_CODE\n" +
"where TO_CHAR(fi.UPLOAD_DATE,'yyyyMMdd') BETWEEN #{strDate} AND #{endDate}\n" + "where pp.YXQQSRQ BETWEEN #{strDate} AND #{endDate}\n" +
"and pp.CARD_TYPE_ID=9\n" + "and pp.CARD_TYPE_ID=9\n" +
"group by cd.COUNTYNAME,fi.DWDM,fi.dwmc,pp.CARD_TYPE_ID ) datab\n" + "group by cd.COUNTYNAME,fi.DWDM,fi.dwmc,pp.CARD_TYPE_ID ) datab\n" +
"on dataa.DWDM=datab.DWDM") "on dataa.DWDM=datab.DWDM")
......
src/main/java/com/yxproject/start/service/PersonPostService.java
View file @ 6c28011b
...@@ -27,7 +27,7 @@ public interface PersonPostService { ...@@ -27,7 +27,7 @@ public interface PersonPostService {
public boolean savePersonPost(List<PersonPostEntity> personPostEntities); public boolean savePersonPost(List<PersonPostEntity> personPostEntities);
public List<PersonPostEntity> findPersonalData(@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,@Param("firstIndex") String firstIndex,@Param("pageSize") String pageSize, String emailNo,int notNull,String printDate); 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);
public boolean deletePersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String starDate,String endDate); public boolean deletePersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String starDate,String endDate);
...@@ -37,11 +37,11 @@ public interface PersonPostService { ...@@ -37,11 +37,11 @@ public interface PersonPostService {
public boolean printPostList(int id, Date printDateTime); public boolean printPostList(int id, Date printDateTime);
public int findPersonalDataCount(String applicantName, String orderNumber, String state, String latticeMouthInformation, List<String> getToCounty, String startDate,String endDate, String emailNo,String notNull,String printDate); 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);
public int findPersonalDataCountByImportDate(String starDate,String endDate); public int findPersonalDataCountByImportDate(String starDate,String endDate);
public List<PersonPostEntity> downLoadReportForm(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 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);
public Map<String,Object> selectNote(@Param("uploadId")String uploadId); public Map<String,Object> selectNote(@Param("uploadId")String uploadId);
......
src/main/java/com/yxproject/start/service/impl/PersonPostServiceImpl.java
View file @ 6c28011b
...@@ -52,7 +52,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -52,7 +52,7 @@ public class PersonPostServiceImpl implements PersonPostService {
return true; return true;
} }
@Override @Override
public List<PersonPostEntity> findPersonalData(String applicantName, String orderNumber, String state, String latticeMouthInformation, List<String> getToCounty, String startDate, String endDate, String firstIndex, String pageSize, String emailNo, int notNull, String printDate) { 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) {
String str = ""; String str = "";
long firstIndexLong = Long.valueOf(firstIndex); long firstIndexLong = Long.valueOf(firstIndex);
long pageSizeLong = Long.valueOf(pageSize); long pageSizeLong = Long.valueOf(pageSize);
...@@ -63,7 +63,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -63,7 +63,7 @@ public class PersonPostServiceImpl implements PersonPostService {
str += "'" + getToCounty.get(i) + "',"; str += "'" + getToCounty.get(i) + "',";
} }
} }
List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName, orderNumber, state, latticeMouthInformation, str, startDate, endDate, firstIndexLong * pageSizeLong, (firstIndexLong - 1) * pageSizeLong + 1, emailNo, notNull, printDate); List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName, orderNumber, state,district, latticeMouthInformation, str, startDate, endDate, firstIndexLong * pageSizeLong, (firstIndexLong - 1) * pageSizeLong + 1, emailNo, notNull, printDate);
return list; return list;
} }
...@@ -96,7 +96,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -96,7 +96,7 @@ public class PersonPostServiceImpl implements PersonPostService {
} }
@Override @Override
public int findPersonalDataCount(@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, String emailNo, String notNull, String printDate) { 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) {
String str = ""; String str = "";
for (int i = 0; i < getToCounty.size(); i++) { for (int i = 0; i < getToCounty.size(); i++) {
if (i == getToCounty.size() - 1) { if (i == getToCounty.size() - 1) {
...@@ -105,7 +105,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -105,7 +105,7 @@ public class PersonPostServiceImpl implements PersonPostService {
str += "'" + getToCounty.get(i) + "',"; str += "'" + getToCounty.get(i) + "',";
} }
} }
int count = personPostMapper.findPersonalDataCount(applicantName, orderNumber, state, latticeMouthInformation, str, startDate, endDate, emailNo, notNull, printDate); int count = personPostMapper.findPersonalDataCount(applicantName, orderNumber, state, district,latticeMouthInformation, str, startDate, endDate, emailNo, notNull, printDate);
return count; return count;
} }
...@@ -116,7 +116,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -116,7 +116,7 @@ public class PersonPostServiceImpl implements PersonPostService {
} }
@Override @Override
public List<PersonPostEntity> downLoadReportForm(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 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) {
String str = ""; String str = "";
for (int i = 0; i < jsonArray.size(); i++) { for (int i = 0; i < jsonArray.size(); i++) {
if (i == jsonArray.size() - 1) { if (i == jsonArray.size() - 1) {
...@@ -125,7 +125,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -125,7 +125,7 @@ public class PersonPostServiceImpl implements PersonPostService {
str += "'" + jsonArray.get(i) + "',"; str += "'" + jsonArray.get(i) + "',";
} }
} }
List<PersonPostEntity> list = personPostMapper.findAllPersonalDataNoPage(sqrxm, ddh, hasPrinted, gkxx, str, starDate, endDate, emailNo, printDate, notNull); List<PersonPostEntity> list = personPostMapper.findAllPersonalDataNoPage(sqrxm, ddh, hasPrinted,district, gkxx, str, starDate, endDate, emailNo, printDate, notNull);
return list; return list;
} }
......
src/main/resources/static/views/receitp/receitp.js
View file @ 6c28011b
...@@ -175,69 +175,69 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http']) ...@@ -175,69 +175,69 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
if(json.list.length==0){ if(json.list.length==0){
MessageService.showAlert("请选择要打印的分局或派出所") MessageService.showAlert("请选择要打印的分局或派出所")
}else{ }else{
HttpService.printReceitpData(json,function (data) { if( $scope.priterNum==100){
if($scope.isHistory==0){ $scope.priterNum=LODOP.SELECT_PRINTER();
$scope.doSearchReceitp(); }else {
}else if($scope.isHistory==1){ HttpService.printReceitpData(json,function (data) {
$scope.searchHistory(); if($scope.isHistory==0){
}else{ $scope.doSearchReceitp();
getData(); }else if($scope.isHistory==1){
} $scope.searchHistory();
$scope.receitpDataToPrint = data; }else{
for(var i=0;i<$scope.receitpDataToPrint.list[0].countyList.length;i++){ getData();
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;
} }
} $scope.receitpDataToPrint = data;
$scope.result = []; for(var i=0;i<$scope.receitpDataToPrint.list[0].countyList.length;i++){
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++){
for (var j=0;j<$scope.receitpDataToPrint.list[0].countyList[i].policeList.length;j+=34){ $scope.receitpDataToPrint.list[0].countyList[i].policeList[j].id=j+1;
var json = {};
if(($scope.receitpDataToPrint.list[0].countyList[i].policeList.length-j)>34){
json.value = 1
}else{
json.value = 0;
} }
json.county = $scope.receitpDataToPrint.list[0].countyList[i].countyName;
json.total = $scope.receitpDataToPrint.list[0].countyList[i].countyValidCount;
json.policeList = $scope.receitpDataToPrint.list[0].countyList[i].policeList.slice(j,j+34);
$scope.result.push(json);
} }
} $scope.result = [];
for(var i=0;i<$scope.receitpDataToPrint.list[0].countyList.length;i++){
$timeout(function () { for (var j=0;j<$scope.receitpDataToPrint.list[0].countyList[i].policeList.length;j+=34){
for (var i=0;i<$scope.result.length;i++){ var json = {};
var LODOP = getLodop(); if(($scope.receitpDataToPrint.list[0].countyList[i].policeList.length-j)>34){
LODOP.SET_LICENSES("", "15F0BE661E7F32F37491843CB2510905", "C94CEE276DB2187AE6B65D56B3FC2848", ""); json.value = 1
//初始化 }else{
LODOP.PRINT_INIT("打印交接单"); json.value = 0;
LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); }
LODOP.ADD_PRINT_TEXT(10, 0, "100%", 20, "北京市公安局证件制作管理中心交接岗位"); json.county = $scope.receitpDataToPrint.list[0].countyList[i].countyName;
// LODOP.SET_PRINT_STYLEA(1, "Bold", 1); json.total = $scope.receitpDataToPrint.list[0].countyList[i].countyValidCount;
LODOP.SET_PRINT_STYLEA(1, "Alignment", 2); json.policeList = $scope.receitpDataToPrint.list[0].countyList[i].policeList.slice(j,j+34);
LODOP.SET_PRINT_STYLEA(1, "FontSize", 16); $scope.result.push(json);
LODOP.ADD_PRINT_TEXT(35, 0, "100%", 20, $scope.result[i].county +"证件交接单"); }
// LODOP.SET_PRINT_STYLEA(2, "Bold", 1); }
LODOP.SET_PRINT_STYLEA(2, "Alignment", 2); $timeout(function () {
LODOP.SET_PRINT_STYLEA(2, "FontSize", 16); for (var i=0;i<$scope.result.length;i++){
LODOP.ADD_PRINT_TEXT(70, 20, "100%", 20, "交接日期："+$scope.receitpDataToPrint.date); var LODOP = getLodop();
LODOP.SET_PRINT_STYLEA(3, "FontSize", 12); LODOP.SET_LICENSES("", "15F0BE661E7F32F37491843CB2510905", "C94CEE276DB2187AE6B65D56B3FC2848", "");
LODOP.ADD_PRINT_TEXT(90, 20, "100%", 20, "送至："); //初始化
LODOP.SET_PRINT_STYLEA(4, "FontSize", 10); LODOP.PRINT_INIT("打印交接单");
LODOP.ADD_PRINT_TABLE(110, "2mm",740, "100%", document.getElementById("divPrint"+i).innerHTML); LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4");
LODOP.ADD_PRINT_TEXT(10, 0, "100%", 20, "北京市公安局证件制作管理中心交接岗位");
// LODOP.SET_PRINT_STYLEA(5, "Bold", 0); // LODOP.SET_PRINT_STYLEA(1, "Bold", 1);
LODOP.SET_PRINT_STYLEA(5, "HOrient", 2); LODOP.SET_PRINT_STYLEA(1, "Alignment", 2);
LODOP.SET_PRINT_STYLEA(5, "Vorient", 3); LODOP.SET_PRINT_STYLEA(1, "FontSize", 16);
if( $scope.priterNum==100){ LODOP.ADD_PRINT_TEXT(35, 0, "100%", 20, $scope.result[i].county +"证件交接单");
$scope.priterNum=LODOP.SELECT_PRINTER(); // LODOP.SET_PRINT_STYLEA(2, "Bold", 1);
}else { LODOP.SET_PRINT_STYLEA(2, "Alignment", 2);
LODOP.SET_PRINT_STYLEA(2, "FontSize", 16);
LODOP.ADD_PRINT_TEXT(70, 20, "100%", 20, "交接日期："+$scope.receitpDataToPrint.date);
LODOP.SET_PRINT_STYLEA(3, "FontSize", 12);
LODOP.ADD_PRINT_TEXT(90, 20, "100%", 20, "送至：");
LODOP.SET_PRINT_STYLEA(4, "FontSize", 10);
LODOP.ADD_PRINT_TABLE(110, "2mm",740, "100%", document.getElementById("divPrint"+i).innerHTML);
// LODOP.SET_PRINT_STYLEA(5, "Bold", 0);
LODOP.SET_PRINT_STYLEA(5, "HOrient", 2);
LODOP.SET_PRINT_STYLEA(5, "Vorient", 3);
// LODOP.PREVIEW(); // LODOP.PREVIEW();
LODOP.PRINT(); LODOP.PRINT();
} }
} })
}) })
}) }
} }
......
src/main/resources/static/views/searchCardMsg/searchCardMsg.html
View file @ 6c28011b
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<div class="box-footer" style="text-align: right;"> <div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="startReading()">开始读卡</button> <button class="btn btn-primary" ng-click="startReading()">开始读卡</button>
<button class="btn btn-info" ng-click="endReading()">停止读卡</button> <button class="btn btn-info" ng-click="endReading()">停止读卡</button>
<!--<button class="btn btn-info" ng-click="test()">打印测试</button>--> <!-- <button class="btn btn-info" ng-click="test()">打印测试</button>-->
</div> </div>
</div> </div>
<div class="box box-default"> <div class="box box-default">
...@@ -70,10 +70,10 @@ ...@@ -70,10 +70,10 @@
<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>申请人姓名</th>
<th>打印时间</th> <th>打印时间</th>
</tr> </tr>
...@@ -88,10 +88,14 @@ ...@@ -88,10 +88,14 @@
<td>{{item.orderNumber}}</td> <td>{{item.orderNumber}}</td>
<td>{{item.waybillNumber}}</td> <td>{{item.waybillNumber}}</td>
<td>{{item.backWaybillNumber}}</td> <td>{{item.backWaybillNumber}}</td>
<td>{{item.firstWhite}}</td>
<td>{{item.recipientName}}</td> <td>{{item.recipientName}}</td>
<td>{{item.recipientPhone}}</td> <td>{{item.recipientPhone}}</td>
<td>{{item.recipientAddress}}</td> <td>{{item.recipientAddress}}</td>
<td>
-<span ng-if="(item.firstWhite|limitTo:6)==110018">
密云区
</span>-
</td>
<td>{{item.applicantName}}</td> <td>{{item.applicantName}}</td>
<td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td> <td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td>
</tr> </tr>
...@@ -332,7 +336,7 @@ ...@@ -332,7 +336,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<table cellspacing="0" cellpadding="0" style="border:1px dashed #000; <table cellspacing="0" cellpadding="0" style="border:1px dashed #000;border-bottom:none;
border-top:none;border-collapse:collapse;height:17mm;font-size: 3mm;"> border-top:none;border-collapse:collapse;height:17mm;font-size: 3mm;">
<tr> <tr>
<td style="border-right:1px dashed #000;width:40mm"> <td style="border-right:1px dashed #000;width:40mm">
...@@ -349,25 +353,41 @@ ...@@ -349,25 +353,41 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<table cellspacing="0" cellpadding="0" style="border:1px dashed #000;border-top:none;border-collapse:collapse;height:15mm"> <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;border-left:1px dashed #000;height:15mm">
<tr> <tr>
<td style="border-right:1px dashed #000;width:68mm"> <td style="border-bottom:1px dashed #000;border-top:1px dashed #000;width:60mm">
<span style="position:absolute;top:124mm;left:1.5mm;font-size:3mm;">备注：</span> <span style="position:absolute;top:124mm;left:1.5mm;font-size:3mm;">备注：</span>
</td> </td>
<td style="border:0px dashed #000;width:28mm"></td> <td style="width:7mm;border: 2px solid #000;border-bottom: 2px solid #000; text-align: center;">
<p><span style="font-size:3mm;">已<br/>检</span><strong>京</strong></p>
</td>
<td style="border:2px solid #000;width:29mm;height: 15mm;">
<div style="width:29mm;height:8mm;padding-top: 2mm;">
<span style="padding-left: 1mm;" >丰台分公司</span>
</div>
<div style="width:29mm;;height:7mm;border-top: 2px solid #000;">
<p style="padding-left: 1mm;font-size: 3mm;">
检验人：马超
</p>
</div>
</td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<table cellspacing="0" cellpadding="0" style="border:1px dashed #000;border-top:none;border-collapse:collapse;height:7mm"> <table cellspacing="0" cellpadding="0" style="border:1px dashed #000;border-top:none;border-collapse:collapse;height:6mm">
<tr> <tr>
<td style="border-right:1px dashed #000;width:68mm"> <td style="border-right:1px dashed #000;width:68mm">
<span style="font-size: 3mm; margin-left: 3mm;">网址：www.ems.com.cn</span> <span style="font-size: 3mm; margin-left: 3mm;">网址：www.ems.com.cn</span>
<span style="font-size: 3mm; margin-left: 3mm;">客服电话：11183</span> <span style="font-size: 3mm; margin-left: 3mm;">客服电话：11183</span>
</td> </td>
<td style="border:0px dashed #000;width:28mm"></td> <td style="border:0px dashed #000;width:28mm">
<span>
{{postMsgDetail[idx].UploadDistrict}}
</span>
</td>
</tr> </tr>
</table> </table>
</td> </td>
......
src/main/resources/static/views/searchCardMsg/searchCardMsg.js
View file @ 6c28011b
...@@ -56,6 +56,9 @@ angular.module('AvatarCheck.searchCardMsg', ['ngRoute', 'AvatarCheck.http']) ...@@ -56,6 +56,9 @@ angular.module('AvatarCheck.searchCardMsg', ['ngRoute', 'AvatarCheck.http'])
$scope.postMsgDetail = []; $scope.postMsgDetail = [];
HttpService.doPostAndGetData(postData, function (data) { HttpService.doPostAndGetData(postData, function (data) {
$scope.postMsgDetail = data; $scope.postMsgDetail = data;
if($scope.postMsgDetail[$scope.idx].firstWhite.substr(0,6)==110018){
$scope.postMsgDetail[$scope.idx].UploadDistrict="密云区";
}
$timeout(function () { $timeout(function () {
if ($scope.postMsgDetail.length == 1&&$scope.postMsgDetail[$scope.idx].printDate == null&&flag == true&&$scope.postMsgDetail[0].idCard==postData.idCard){ if ($scope.postMsgDetail.length == 1&&$scope.postMsgDetail[$scope.idx].printDate == null&&flag == true&&$scope.postMsgDetail[0].idCard==postData.idCard){
$scope.PreviewMytableRotate(); $scope.PreviewMytableRotate();
...@@ -66,16 +69,15 @@ angular.module('AvatarCheck.searchCardMsg', ['ngRoute', 'AvatarCheck.http']) ...@@ -66,16 +69,15 @@ angular.module('AvatarCheck.searchCardMsg', ['ngRoute', 'AvatarCheck.http'])
//测试打印快递单 //测试打印快递单
// $scope.test=function () { // $scope.test=function () {
// var ss = { // var ss = {
// idCard: '360124199610210611', // idCard: '220181199312140025',
// startDate: '20160212', // startDate: '20210625',
// endDate: '20260212' // endDate: '20410625'
// } // }
// HttpService.doPostAndGetData(ss, function (data) { // HttpService.doPostAndGetData(ss, function (data) {
// $scope.postMsgDetail = data; // $scope.postMsgDetail = data;
// console.log("$scope.postMsgDetail:",ss, $scope.postMsgDetail); // console.log("$scope.postMsgDetail:",ss, $scope.postMsgDetail);
// var flag=true; // var flag=true;
// $timeout(function () { // $timeout(function () {
// console.log($scope.postMsgDetail.length == 1,flag == true, $scope.postMsgDetail[$scope.idx].printDate == null,$scope.postMsgDetail[$scope.idx].idCard==ss.idCard)
// if ($scope.postMsgDetail.length == 1&&flag == true && $scope.postMsgDetail[$scope.idx].printDate == null&&$scope.postMsgDetail[$scope.idx].idCard==ss.idCard) { // if ($scope.postMsgDetail.length == 1&&flag == true && $scope.postMsgDetail[$scope.idx].printDate == null&&$scope.postMsgDetail[$scope.idx].idCard==ss.idCard) {
// $scope.PreviewMytableRotate(); // $scope.PreviewMytableRotate();
// } // }
......
src/main/resources/static/views/task/taskListSorting.html
View file @ 6c28011b
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<tbody ng-repeat="task in type.countyList"> <tbody ng-repeat="task in type.countyList">
<tr> <tr>
<td > <td >
<input ng-if="type.typeCode=='100'||(task.faileCount==0&&task.countyValidCount==task.eWriteCount)" <input ng-if="type.typeCode=='100'||(task.faileCount==0)"
type="checkbox" class="checkOneBox" type="checkbox" class="checkOneBox"
ng-checked="isSelected(task)" value="{{task.taskId}}" ng-checked="isSelected(task)" value="{{task.taskId}}"
ng-click="updateSelection($event,task)"> ng-click="updateSelection($event,task)">
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ 6c28011b
...@@ -123,8 +123,15 @@ ...@@ -123,8 +123,15 @@
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span> <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div> </div>
</td> </td>
<td></td> <td>受理区县:</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 colspan="2"> <td colspan="2">
<div style="float: left"> <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="doQuery()">查询</button>
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ 6c28011b
...@@ -87,6 +87,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -87,6 +87,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else { }else {
json.state=$("#print").val(); json.state=$("#print").val();
} }
if ($("#district").val() == '') {
json.district=-1;
}else {
json.district=$("#district").val() ;
}
if(angular.isUndefined($scope.emailNo)){ if(angular.isUndefined($scope.emailNo)){
json.emailNo = '' json.emailNo = ''
}else{ }else{
...@@ -146,6 +151,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -146,6 +151,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else { }else {
json.state=$("#print").val(); json.state=$("#print").val();
} }
if ($("#district").val() == '') {
json.district=-1;
}else {
json.district=$("#district").val() ;
}
if(angular.isUndefined($scope.emailNo)){ if(angular.isUndefined($scope.emailNo)){
json.emailNo = '' json.emailNo = ''
}else{ }else{
...@@ -235,6 +245,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -235,6 +245,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else{ }else{
url = url + 'djx=&'; url = url + 'djx=&';
} }
if ($("#district").val() != '') {
url = url + 'district=' + $("#district").val() + '&';
}else {
url = url + 'district=-1&';
}
if(angular.isUndefined($scope.emailNo)){ if(angular.isUndefined($scope.emailNo)){
url = url + 'emailNo=&'; url = url + 'emailNo=&';
}else{ }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