Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 9cc19e4a authored by dahai's avatar dahai
Browse files
Options

push

parent 3a47ec68
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 27 deletions
src/main/java/com/yxproject/start/api/PersonPostApi.java
View file @ 9cc19e4a
...@@ -65,7 +65,8 @@ public class PersonPostApi { ...@@ -65,7 +65,8 @@ public class PersonPostApi {
String latticeMouthInformation = jsonObject.getString("latticeMouthInformation"); String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
JSONArray jsonArray =(JSONArray)jsonObject.get("getToCounty"); JSONArray jsonArray =(JSONArray)jsonObject.get("getToCounty");
String uploadDate = replaceDate(jsonObject.getString("uploadDate")); String uploadDate = replaceDate(jsonObject.getString("uploadDate"));
int count = personPostService.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate); String emailNo = jsonObject.getString("emailNo");
int count = personPostService.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate,emailNo);
return count; return count;
} }
...@@ -85,7 +86,8 @@ public class PersonPostApi { ...@@ -85,7 +86,8 @@ public class PersonPostApi {
String uploadDate =replaceDate(jsonObject.getString("uploadDate")); String uploadDate =replaceDate(jsonObject.getString("uploadDate"));
String firstIndex = jsonObject.getString("firstIndex"); String firstIndex = jsonObject.getString("firstIndex");
String pageSize = jsonObject.getString("pageSize"); String pageSize = jsonObject.getString("pageSize");
List<PersonPostEntity> list = personPostService.findPersonalData(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate,firstIndex,pageSize); String emailNo = jsonObject.getString("emailNo");
List<PersonPostEntity> list = personPostService.findPersonalData(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate,firstIndex,pageSize,emailNo);
return list; return list;
} }
...@@ -134,9 +136,9 @@ public class PersonPostApi { ...@@ -134,9 +136,9 @@ public class PersonPostApi {
public void exportExcel(HttpServletRequest request,HttpServletResponse response, public void exportExcel(HttpServletRequest request,HttpServletResponse response,
@RequestParam("uploadDate") String uploadDate, @RequestParam("hasPrinted") String hasPrinted, @RequestParam("uploadDate") String uploadDate, @RequestParam("hasPrinted") String hasPrinted,
@RequestParam("djx") List<String> djx, @RequestParam("gkxx") String gkxx, @RequestParam("ddh") String ddh, @RequestParam("djx") List<String> djx, @RequestParam("gkxx") String gkxx, @RequestParam("ddh") String ddh,
@RequestParam("sequence")String sequence, @RequestParam("sqrxm") String sqrxm) throws Exception { @RequestParam("sequence")String sequence, @RequestParam("sqrxm") String sqrxm,@RequestParam("emailNo") String emailNo) throws Exception {
JSONArray jsonArray = JSONArray.fromObject(djx); JSONArray jsonArray = JSONArray.fromObject(djx);
List<PersonPostEntity> list = personPostService.downLoadReportForm(request,response,sqrxm,ddh,hasPrinted,gkxx,jsonArray,replaceDate(uploadDate)); List<PersonPostEntity> list = personPostService.downLoadReportForm(request,response,sqrxm,ddh,hasPrinted,gkxx,jsonArray,replaceDate(uploadDate),emailNo);
exportExcel(request, response, list); exportExcel(request, response, list);
} }
......
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ 9cc19e4a
...@@ -39,6 +39,7 @@ public interface PersonPostMapper { ...@@ -39,6 +39,7 @@ public interface PersonPostMapper {
" LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID " + " LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID " +
" WHERE 1=1" + " WHERE 1=1" +
" <when test='applicantName!=\"\"'> and PERSON_POST.APPLICANT_NAME = #{applicantName} </when>" + " <when test='applicantName!=\"\"'> and PERSON_POST.APPLICANT_NAME = #{applicantName} </when>" +
"<when test='emailNo!=\"\"'> and PERSON_POST.WAYBILL_NUMBER = #{emailNo} </when>" +
" <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>" +
...@@ -50,7 +51,7 @@ public interface PersonPostMapper { ...@@ -50,7 +51,7 @@ public interface PersonPostMapper {
")" + ")" +
"WHERE RN BETWEEN #{pageSize} AND #{firstIndex}" + "WHERE RN BETWEEN #{pageSize} AND #{firstIndex}" +
"</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("uploadDate")String uploadDate,@Param("firstIndex")long firstIndex,@Param("pageSize")long pageSize); 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("uploadDate")String uploadDate,@Param("firstIndex")long firstIndex,@Param("pageSize")long pageSize,@Param("emailNo")String emailNo);
@Select("<script> " + @Select("<script> " +
...@@ -58,6 +59,7 @@ public interface PersonPostMapper { ...@@ -58,6 +59,7 @@ public interface PersonPostMapper {
" LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID " + " LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID " +
" where 1=1 " + " where 1=1 " +
" <when test='applicantName!=\"\"'> and PERSON_POST.APPLICANT_NAME = #{applicantName} </when>" + " <when test='applicantName!=\"\"'> and PERSON_POST.APPLICANT_NAME = #{applicantName} </when>" +
" <when test='emailNo!=\"\"'> and PERSON_POST.WAYBILL_NUMBER = #{emailNo} </when>" +
" <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>" +
...@@ -65,7 +67,7 @@ public interface PersonPostMapper { ...@@ -65,7 +67,7 @@ public interface PersonPostMapper {
" <when test='getToCounty!=null'> and PERSON_POST.GET_TO_COUNTY in ( #{getToCounty} ) </when>" + " <when test='getToCounty!=null'> and PERSON_POST.GET_TO_COUNTY in ( #{getToCounty} ) </when>" +
" <when test='uploadDate!=\"\"'> and subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8)=#{uploadDate} </when>" + " <when test='uploadDate!=\"\"'> and subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8)=#{uploadDate} </when>" +
"</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("uploadDate") String uploadDate); public int findPersonalDataCount( @Param("applicantName")String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") String getToCounty,@Param("uploadDate") String uploadDate,@Param("emailNo")String emailNo);
...@@ -74,6 +76,7 @@ public interface PersonPostMapper { ...@@ -74,6 +76,7 @@ public interface PersonPostMapper {
" <when test='applicantName!=null'> and PERSON_POST.APPLICANT_NAME = #{applicantName} </when>" + " <when test='applicantName!=null'> and PERSON_POST.APPLICANT_NAME = #{applicantName} </when>" +
" <when test='orderNumber!=null'> and PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" + " <when test='orderNumber!=null'> and PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
" <when test='state!= null '> and PERSON_POST.STATE=#{state} </when>" + " <when test='state!= null '> and PERSON_POST.STATE=#{state} </when>" +
" <when test='emailNo!=\"\"'> and PERSON_POST.WAYBILL_NUMBER = #{emailNo} </when>" +
" <when test='latticeMouthInformation!=null'> and PERSON_POST.LATTICE_MOUTH_INFORMATION=#{latticeMouthInformation} </when>" + " <when test='latticeMouthInformation!=null'> and PERSON_POST.LATTICE_MOUTH_INFORMATION=#{latticeMouthInformation} </when>" +
" <when test='getToCounty!=null'> and PERSON_POST.GET_TO_COUNTY in ( #{getToCounty}) </when>" + " <when test='getToCounty!=null'> and PERSON_POST.GET_TO_COUNTY in ( #{getToCounty}) </when>" +
" <when test='uploadDate!=null'> and FILE_NAME_DIC.UPLOAD_DATE=#{uploadDate} </when>") " <when test='uploadDate!=null'> and FILE_NAME_DIC.UPLOAD_DATE=#{uploadDate} </when>")
...@@ -109,9 +112,10 @@ public interface PersonPostMapper { ...@@ -109,9 +112,10 @@ public interface PersonPostMapper {
" <when test='ddh!=\"\"'> and PERSON_POST.ORDER_NUMBER=#{ddh} </when>" + " <when test='ddh!=\"\"'> and PERSON_POST.ORDER_NUMBER=#{ddh} </when>" +
" <when test='hasPrinted!=\"\"'> and PERSON_POST.STATE=#{hasPrinted} </when>" + " <when test='hasPrinted!=\"\"'> and PERSON_POST.STATE=#{hasPrinted} </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=#{emailNo} </when>" +
" <when test='str!=null'> and PERSON_POST.GET_TO_COUNTY in ( #{str} ) </when>" + " <when test='str!=null'> and PERSON_POST.GET_TO_COUNTY in ( #{str} ) </when>" +
" <when test='uploadDate!=\"\"'> and subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8)=#{uploadDate} </when>"+ " <when test='uploadDate!=\"\"'> and subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8)=#{uploadDate} </when>"+
"</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("gkxx")String gkxx, @Param("str")String str, @Param("uploadDate")String uploadDate); @Param("gkxx")String gkxx, @Param("str")String str, @Param("uploadDate")String uploadDate,@Param("emailNo")String emailNo);
} }
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ 9cc19e4a
...@@ -231,7 +231,7 @@ public interface TaskListMapper { ...@@ -231,7 +231,7 @@ public interface TaskListMapper {
"from group_no left join task on group_no.task_id= task.TASK_ID\n" + "from group_no left join task on group_no.task_id= task.TASK_ID\n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" + "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" + "left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"left join (select task_id, nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" + "left join (select accept_no, nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR group by accept_no ) fc on substr(fc.accept_no,0,8) = group_no.group_no \n" +
"where task.TASK_STATE_ID = #{process} order by group_no.GROUP_NO") "where task.TASK_STATE_ID = #{process} order by group_no.GROUP_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_common(@Param("process") long process,@Param("process2") long process2); public List<Map<String,Object>> selectByCountyAtAuxiliary_common(@Param("process") long process,@Param("process2") long process2);
...@@ -418,9 +418,8 @@ public interface TaskListMapper { ...@@ -418,9 +418,8 @@ public interface TaskListMapper {
"from group_no left join task on group_no.task_id= task.TASK_ID\n" + "from group_no left join task on group_no.task_id= task.TASK_ID\n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" + "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" + "left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"left join (select task_id, nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR \n" + "left join (select accept_no, nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR \n" +
"group by task_id ) fc \n" + "group by accept_no ) fc on substr(fc.accept_no,0,8) = group_no.group_no \n" +
"on fc.TASK_ID = task.TASK_ID\n" +
"left join prod_trace_t@PROD_LINK on SUBSTR(prod_trace_t.ACCEPT_NO,0,8) = group_no.GROUP_NO\n" + "left join prod_trace_t@PROD_LINK on SUBSTR(prod_trace_t.ACCEPT_NO,0,8) = group_no.GROUP_NO\n" +
"left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" + "left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
"left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)\n" + "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)\n" +
...@@ -722,7 +721,7 @@ public interface TaskListMapper { ...@@ -722,7 +721,7 @@ public interface TaskListMapper {
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE " + "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE " +
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" + " left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 " + "where SPECIAL_CARD.SPECIAL_TYPE =1 " +
" and POSITION_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO") " and to_char(POSITION_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind3(@Param("date") String date); public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind3(@Param("date") String date);
...@@ -756,7 +755,7 @@ public interface TaskListMapper { ...@@ -756,7 +755,7 @@ public interface TaskListMapper {
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE " + "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE " +
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" + " left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 " + "where SPECIAL_CARD.SPECIAL_TYPE =1 " +
" and CONCORA_CRUSH_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO") " and to_char(CONCORA_CRUSH_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind4(@Param("date") String date); public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind4(@Param("date") String date);
...@@ -793,6 +792,23 @@ public interface TaskListMapper { ...@@ -793,6 +792,23 @@ public interface TaskListMapper {
" and to_char(PUNCHING_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO") " and to_char(PUNCHING_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind5(@Param("date") String date); public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind5(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 废证
* @return
*/
@Select("select FAILED_CARD.FAILED_CARD_ID task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"FAILED_CARD.PRINT_DATE PRINT_OUT_DATE,'' PRINT_OUT_NAME,FAILED_CARD.POSITION_DATE POSITION_DATE,'' POSITION_NAME," +
" FAILED_CARD.ALLOT_DATE CONCORA_CRUSH_DATE ,FAILED_CARD.FINISH_DATE CONCORA_CRUSH_NAME,'' PUNCHING_DATE,'' PUNCHING_NAME" +
",'废证' CARD_TYPE ,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, \n" +
"1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,FAILED_CARD.ACCEPT_NO GROUP_NO from FAILED_CARD \n" +
"left join task on FAILED_CARD.task_id= task.TASK_ID \n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE \n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where to_char(FAILED_CARD.FINISH_DATE,'yyyyMMdd') = #{date} order by FAILED_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed5(@Param("date") String date);
/** /**
* 任务单查询历史 * 任务单查询历史
* 辅助库 余证 * 辅助库 余证
......
src/main/java/com/yxproject/start/service/PersonPostService.java
View file @ 9cc19e4a
...@@ -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("uploadDate") String uploadDate,@Param("firstIndex") String firstIndex,@Param("pageSize") String pageSize); 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("uploadDate") String uploadDate,@Param("firstIndex") String firstIndex,@Param("pageSize") String pageSize, String emailNo);
public boolean deletePersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate); public boolean deletePersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate);
...@@ -37,9 +37,9 @@ public interface PersonPostService { ...@@ -37,9 +37,9 @@ 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 uploadDate); public int findPersonalDataCount(String applicantName, String orderNumber, String state, String latticeMouthInformation, List<String> getToCounty, String uploadDate, String emailNo);
public int findPersonalDataCountByImportDate(String importDate); public int findPersonalDataCountByImportDate(String importDate);
public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request,HttpServletResponse response,String sqrxm, String ddh, String hasPrinted, String gkxx, JSONArray jsonArray, String uploadDate); public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request,HttpServletResponse response,String sqrxm, String ddh, String hasPrinted, String gkxx, JSONArray jsonArray, String uploadDate,String emailNo);
} }
src/main/java/com/yxproject/start/service/impl/PersonPostServiceImpl.java
View file @ 9cc19e4a
...@@ -54,7 +54,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -54,7 +54,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 uploadDate,String firstIndex,String pageSize){ public List<PersonPostEntity> findPersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate,String firstIndex,String pageSize,String emailNo){
String str = null; String str = null;
long firstIndexLong= Long.valueOf(firstIndex); long firstIndexLong= Long.valueOf(firstIndex);
long pageSizeLong = Long.valueOf(pageSize); long pageSizeLong = Long.valueOf(pageSize);
...@@ -65,7 +65,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -65,7 +65,7 @@ public class PersonPostServiceImpl implements PersonPostService {
str+="'"+getToCounty.get(i)+"',"; str+="'"+getToCounty.get(i)+"',";
} }
} }
List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate,firstIndexLong * pageSizeLong,(firstIndexLong - 1) * pageSizeLong + 1); List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate,firstIndexLong * pageSizeLong,(firstIndexLong - 1) * pageSizeLong + 1,emailNo);
System.out.println("数据："+list); System.out.println("数据："+list);
return list; return list;
} }
...@@ -99,7 +99,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -99,7 +99,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("uploadDate") String uploadDate) { 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("uploadDate") String uploadDate,String emailNo) {
String str = null; String str = null;
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){
...@@ -108,7 +108,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -108,7 +108,7 @@ public class PersonPostServiceImpl implements PersonPostService {
str+="'"+getToCounty.get(i)+"',"; str+="'"+getToCounty.get(i)+"',";
} }
} }
int count=personPostMapper.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate); int count=personPostMapper.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate,emailNo);
return count; return count;
} }
...@@ -119,7 +119,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -119,7 +119,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 uploadDate) { public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request,HttpServletResponse response,String sqrxm, String ddh, String hasPrinted, String gkxx, JSONArray jsonArray, String uploadDate,String emailNo) {
String str = null; String str = null;
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){
...@@ -128,7 +128,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -128,7 +128,7 @@ public class PersonPostServiceImpl implements PersonPostService {
str+="'"+jsonArray.get(i)+"',"; str+="'"+jsonArray.get(i)+"',";
} }
} }
List<PersonPostEntity> list = personPostMapper.findAllPersonalDataNoPage(sqrxm,ddh,hasPrinted,gkxx,str,uploadDate); List<PersonPostEntity> list = personPostMapper.findAllPersonalDataNoPage(sqrxm,ddh,hasPrinted,gkxx,str,uploadDate,emailNo);
return list; return list;
} }
......
src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java
View file @ 9cc19e4a
...@@ -329,13 +329,13 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -329,13 +329,13 @@ public class TaskListServiceImpl implements TaskListService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public List selectByCountyAtAuxiliary3(long process) { public List selectByCountyAtAuxiliary3(long process) {
//查询普通组号列表 在辅助库、制证库中 //查询普通组号列表 在辅助库、制证库中
List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common2(process,process-2); List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common2(process,process-1);
//查询快证组号列表 在辅助库、制证库中 //查询快证组号列表 在辅助库、制证库中
List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast2(process,process-2); List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast2(process,process-1);
//查询余证组号列表 在辅助库、制证库中 //查询余证组号列表 在辅助库、制证库中
List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind2(process,process-2); List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind2(process,process-1);
//查询余证组号列表 在辅助库、制证库中 //查询余证组号列表 在辅助库、制证库中
List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process-2); List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process-1);
List<Map<String, Object>> list = new ArrayList<>(); List<Map<String, Object>> list = new ArrayList<>();
list = formateMap2(mapList_common); list = formateMap2(mapList_common);
list.addAll(formateMap2(mapList_fast)); list.addAll(formateMap2(mapList_fast));
...@@ -350,7 +350,7 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -350,7 +350,7 @@ public class TaskListServiceImpl implements TaskListService {
/** /**
* 查询历史任务单详情 * 查询历史任务单详情
* （辅助库） * （辅助库）
* （下发、数据核验、预订位、平压、冲切） * （下发、数据核验、预订位、平压、电写入）
* *
* @param process 工序 * @param process 工序
* @param date 查询时间 * @param date 查询时间
...@@ -415,6 +415,8 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -415,6 +415,8 @@ public class TaskListServiceImpl implements TaskListService {
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast5(date)); mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast5(date));
//查询历史任务单 余证 //查询历史任务单 余证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind5(date)); mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind5(date));
//查询历史任务单 废证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_failed5(date));
break; break;
default: default:
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment