Skip to content

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

Merge remote-tracking branch 'origin/dev' into dev

parents 29bb6299 17c17c81
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 40 deletions
src/main/java/com/yxproject/start/api/ExportXMLApi.java
View file @ b4e3a0fc
...@@ -46,9 +46,10 @@ public class ExportXMLApi { ...@@ -46,9 +46,10 @@ public class ExportXMLApi {
*/ */
@RequestMapping("printXmlData") @RequestMapping("printXmlData")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public byte[] printXmlData(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard")String IDCard,@RequestParam("oldFile") String oldFile, @RequestParam("newFile")String newFile, @RequestParam("SSXQDM")String SSXQDM, @RequestParam("cardType")String cardType, @RequestParam("state")String state, @RequestParam("uploadDate")String uploadDate, HttpServletResponse response) { public byte[] printXmlData(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard")String IDCard,@RequestParam("oldFile") String oldFile, @RequestParam("newFile")String newFile, @RequestParam("SSXQDM")String SSXQDM, @RequestParam("cardType")String cardType, @RequestParam("state")String state, @RequestParam("uploadDate")String uploadDate, @RequestParam("isDownload")String isDownload,HttpServletResponse response) {
//使用Servlet实现文件下载的时候，避免浏览器自动打开文件 //使用Servlet实现文件下载的时候，避免浏览器自动打开文件
List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectAllPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate)); List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectAllPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),isDownload);
// List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectAllPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate));
if (preproPersonEntities.size()>0){ if (preproPersonEntities.size()>0){
//将制证详情详细划分 //将制证详情详细划分
Map<Long,Object> map = new LinkedHashMap<>(); Map<Long,Object> map = new LinkedHashMap<>();
...@@ -122,7 +123,17 @@ public class ExportXMLApi { ...@@ -122,7 +123,17 @@ public class ExportXMLApi {
for (List list1 :listList) { for (List list1 :listList) {
List<PreproPersonEntity> preproPersonEntityList1 = (List<PreproPersonEntity>)list1; List<PreproPersonEntity> preproPersonEntityList1 = (List<PreproPersonEntity>)list1;
List<FilesEntity> filesEntities = filesService.selectFilesEntityById(preproPersonEntityList1.get(0).getFileId().toString()); List<FilesEntity> filesEntities = filesService.selectFilesEntityById(preproPersonEntityList1.get(0).getFileId().toString());
FilesEntity filesEntity =filesEntities.get(0); FilesEntity filesEntity = new FilesEntity();
if(preproPersonEntityList1.get(0).getCardTypeId()==9){
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
filesEntity.setVersionCode("3.00");
filesEntity.setCreateTime(simpleDateFormat.format(new Date()));
filesEntity.setDwmc("北京市公安局人口管理总队证件管理大队");
filesEntity.setDwdm("110001580800");
}else {
filesEntity =filesEntities.get(0);
}
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
filesEntity.setCreateTime(simpleDateFormat.format(new Date())); filesEntity.setCreateTime(simpleDateFormat.format(new Date()));
String xml = null; String xml = null;
......
src/main/java/com/yxproject/start/api/PersonPostApi.java
View file @ b4e3a0fc
...@@ -87,7 +87,8 @@ public class PersonPostApi { ...@@ -87,7 +87,8 @@ public class PersonPostApi {
JSONArray jsonArray =(JSONArray)jsonObject.get("getToCounty"); JSONArray jsonArray =(JSONArray)jsonObject.get("getToCounty");
String uploadDate = replaceDate(jsonObject.getString("uploadDate")); String uploadDate = replaceDate(jsonObject.getString("uploadDate"));
String emailNo = jsonObject.getString("emailNo"); String emailNo = jsonObject.getString("emailNo");
int count = personPostService.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate,emailNo); String notNull = jsonObject.getString("notNull");
int count = personPostService.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate,emailNo,notNull);
return count; return count;
} }
......
src/main/java/com/yxproject/start/api/queryPreproPerson.java
View file @ b4e3a0fc
...@@ -26,11 +26,11 @@ public class queryPreproPerson { ...@@ -26,11 +26,11 @@ public class queryPreproPerson {
*/ */
@RequestMapping("queryPreproPerson") @RequestMapping("queryPreproPerson")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public Map<String,Object> printXmlData(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard")String IDCard,@RequestParam("oldFile") String oldFile, @RequestParam("newFile")String newFile, @RequestParam("SSXQDM")String SSXQDM, @RequestParam("cardType")String cardType, @RequestParam("state")String state,@RequestParam("uploadDate")String uploadDate,@RequestParam("currPage")String currPage,@RequestParam("pageSize")String pageSize, HttpServletResponse response){ public Map<String,Object> printXmlData(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard")String IDCard,@RequestParam("oldFile") String oldFile, @RequestParam("newFile")String newFile, @RequestParam("SSXQDM")String SSXQDM, @RequestParam("cardType")String cardType, @RequestParam("state")String state,@RequestParam("uploadDate")String uploadDate,@RequestParam("currPage")String currPage,@RequestParam("pageSize")String pageSize,@RequestParam("downloadState")String downloadState, HttpServletResponse response){
List<Map<String, Object>> preproPersonEntities = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),currPage,pageSize); List<Map<String, Object>> preproPersonEntities = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),currPage,pageSize,downloadState);
Map<String,Object> map = new LinkedHashMap<>(); Map<String,Object> map = new LinkedHashMap<>();
//todo //todo
List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate)); List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),downloadState);
map.put("total",preproPersonEntityList.size()); map.put("total",preproPersonEntityList.size());
int youSum =0; int youSum =0;
int puSum=0; int puSum=0;
...@@ -72,10 +72,10 @@ public class queryPreproPerson { ...@@ -72,10 +72,10 @@ public class queryPreproPerson {
*/ */
@RequestMapping("queryPreproPersonCount") @RequestMapping("queryPreproPersonCount")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public Map<String,Object> queryPreproPersonCount(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard")String IDCard,@RequestParam("oldFile") String oldFile, @RequestParam("newFile")String newFile, @RequestParam("SSXQDM")String SSXQDM, @RequestParam("cardType")String cardType, @RequestParam("state")String state,@RequestParam("uploadDate")String uploadDate, HttpServletResponse response){ public Map<String,Object> queryPreproPersonCount(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard")String IDCard,@RequestParam("oldFile") String oldFile, @RequestParam("newFile")String newFile, @RequestParam("SSXQDM")String SSXQDM, @RequestParam("cardType")String cardType, @RequestParam("state")String state,@RequestParam("uploadDate")String uploadDate,@RequestParam("downloadState")String downloadState, HttpServletResponse response){
Map<String,Object> map = new LinkedHashMap<>(); Map<String,Object> map = new LinkedHashMap<>();
//todo //todo
List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate)); List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),downloadState);
map.put("total",preproPersonEntityList.size()); map.put("total",preproPersonEntityList.size());
return map; return map;
} }
......
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ b4e3a0fc
...@@ -36,24 +36,25 @@ public interface PersonPostMapper { ...@@ -36,24 +36,25 @@ public interface PersonPostMapper {
"SELECT A.*, ROWNUM RN " + "SELECT A.*, ROWNUM RN " +
" from (SELECT PERSON_POST.*" + " from (SELECT PERSON_POST.*" +
" FROM PERSON_POST " + " FROM PERSON_POST " +
" 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 " +
" left join PREPRO_PERSON on PERSON_POST.first_white = prepro_person.jmsfzslh " +
" 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 = 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='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>" +
// " <if test='notNull== 1 '> and (PERSON_POST.ID_CARD is not null ) or (PERSON_POST.ACCEPT_THE_MATTER is not null ) or (PERSON_POST.BEGIN_USEFUL_LIFE is not null ) or (PERSON_POST.VALID_PERIOD_END is not null ) </if>" + // " <if test='notNull== 1 '> and (PERSON_POST.ID_CARD is not null ) or (PERSON_POST.ACCEPT_THE_MATTER is not null ) or (PERSON_POST.BEGIN_USEFUL_LIFE is not null ) or (PERSON_POST.VALID_PERIOD_END is not null ) </if>" +
// " <if test='notNull== 0 '> and (PERSON_POST.ID_CARD is null) or (PERSON_POST.ACCEPT_THE_MATTER is null) or (PERSON_POST.BEGIN_USEFUL_LIFE is null) or (PERSON_POST.VALID_PERIOD_END is null) </if>" + // " <if test='notNull== 0 '> and (PERSON_POST.ID_CARD is null) or (PERSON_POST.ACCEPT_THE_MATTER is null) or (PERSON_POST.BEGIN_USEFUL_LIFE is null) or (PERSON_POST.VALID_PERIOD_END is null) </if>" +
" <if test='notNull== 1 '> and (PERSON_POST.ID_CARD is not null ) </if>" + " <if test='notNull== 1 '> and PREPRO_PERSON.JMSFZSLH is not null </if>" +
" <if test='notNull== 0 '> and (PERSON_POST.ID_CARD is null) </if>" + " <if test='notNull== 0 '> and PREPRO_PERSON.JMSFZSLH is null </if>" +
" <when test='latticeMouthInformation!=\"\"'> and PERSON_POST.LATTICE_MOUTH_INFORMATION=#{latticeMouthInformation} </when>" + " <when test='latticeMouthInformation!=\"\"'> 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!=\"\"'> 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>" +
") " + ") " +
"A" + "A" +
")" + ")" +
"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,@Param("emailNo")String emailNo,@Param("notNull")int notNull); 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,@Param("notNull")int notNull);
...@@ -67,18 +68,21 @@ public interface PersonPostMapper { ...@@ -67,18 +68,21 @@ public interface PersonPostMapper {
@Select("<script> " + @Select("<script> " +
"SELECT COUNT(*) FROM PERSON_POST \n" + "SELECT COUNT(*) FROM PERSON_POST \n" +
" 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 " +
" left join PREPRO_PERSON on PERSON_POST.first_white = prepro_person.jmsfzslh " +
" 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 =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='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>" +
" <if test='notNull== 1 '> and PREPRO_PERSON.JMSFZSLH is not null </if>" +
" <if test='notNull== 0 '> and PREPRO_PERSON.JMSFZSLH is null </if>" +
" <when test='latticeMouthInformation!=\"\"'> and PERSON_POST.LATTICE_MOUTH_INFORMATION=#{latticeMouthInformation} </when>" + " <when test='latticeMouthInformation!=\"\"'> 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!=\"\"'> 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,@Param("emailNo")String emailNo); 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,@Param("notNull")String notNull);
......
src/main/java/com/yxproject/start/mapper/PreproPersonMapper.java
View file @ b4e3a0fc
...@@ -82,9 +82,16 @@ public interface PreproPersonMapper { ...@@ -82,9 +82,16 @@ public interface PreproPersonMapper {
" </if> "+ " </if> "+
" <if test='uploadDate != null '>"+ " <if test='uploadDate != null '>"+
" and to_char(UPLOAD_DATE,'yyyyMMdd') = #{uploadDate}"+ " and to_char(UPLOAD_DATE,'yyyyMMdd') = #{uploadDate}"+
" </if> </where>"+ " </if> " +
" <if test='downloadState == 1 '>"+
" and PREPRO_PERSON.NEW_FILE_ID is not null"+
" </if> "+
" <if test='downloadState == 0 '>"+
" and PREPRO_PERSON.NEW_FILE_ID is null"+
" </if> "+
" </where>"+
" </script>"}) " </script>"})
public List<Map<String,Object>> selectPreproPerson1(@Param("uploadNo") String uploadNo, @Param("IDCard") String IDCard, @Param("oldFile") String oldFile, @Param("newFile") String newFile, @Param("SSXQDM") String SSXQDM, @Param("cardType") String cardType, @Param("state") String state, @Param("uploadDate") String uploadDate); public List<Map<String,Object>> selectPreproPerson1(@Param("uploadNo") String uploadNo, @Param("IDCard") String IDCard, @Param("oldFile") String oldFile, @Param("newFile") String newFile, @Param("SSXQDM") String SSXQDM, @Param("cardType") String cardType, @Param("state") String state, @Param("uploadDate") String uploadDate,@Param("downloadState") String downloadState);
...@@ -117,9 +124,15 @@ public interface PreproPersonMapper { ...@@ -117,9 +124,15 @@ public interface PreproPersonMapper {
" <if test='uploadDate != null '>", " <if test='uploadDate != null '>",
" and to_char(UPLOAD_DATE,'yyyyMMdd') = #{uploadDate}", " and to_char(UPLOAD_DATE,'yyyyMMdd') = #{uploadDate}",
" </if> ", " </if> ",
" <if test='downloadState == 1 '>"+
" and PREPRO_PERSON.NEW_FILE_ID is not null"+
" </if> "+
" <if test='downloadState == 0 '>"+
" and PREPRO_PERSON.NEW_FILE_ID is null"+
" </if> "+
"</where>" + "</where>" +
" </script>"}) " </script>"})
public List<PreproPersonEntity> selectPreproPersonCount(@Param("uploadNo") String uploadNo, @Param("IDCard") String IDCard, @Param("oldFile") String oldFile, @Param("newFile") String newFile, @Param("SSXQDM") String SSXQDM, @Param("cardType") String cardType, @Param("state") String state, @Param("uploadDate") String uploadDate); public List<PreproPersonEntity> selectPreproPersonCount(@Param("uploadNo") String uploadNo, @Param("IDCard") String IDCard, @Param("oldFile") String oldFile, @Param("newFile") String newFile, @Param("SSXQDM") String SSXQDM, @Param("cardType") String cardType, @Param("state") String state, @Param("uploadDate") String uploadDate,@Param("downloadState") String downloadState);
/*修改标记制证数据状态*/ /*修改标记制证数据状态*/
......
src/main/java/com/yxproject/start/service/PersonPostService.java
View file @ b4e3a0fc
...@@ -38,7 +38,7 @@ public interface PersonPostService { ...@@ -38,7 +38,7 @@ 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, String emailNo); public int findPersonalDataCount(String applicantName, String orderNumber, String state, String latticeMouthInformation, List<String> getToCounty, String uploadDate, String emailNo,String notNull);
public int findPersonalDataCountByImportDate(String importDate); public int findPersonalDataCountByImportDate(String importDate);
......
src/main/java/com/yxproject/start/service/PreproPersonService.java
View file @ b4e3a0fc
...@@ -17,13 +17,13 @@ public interface PreproPersonService { ...@@ -17,13 +17,13 @@ public interface PreproPersonService {
public boolean updatePreproPersonIsValid(PreproPersonEntity preproPersonEntity); public boolean updatePreproPersonIsValid(PreproPersonEntity preproPersonEntity);
public List<Map<String, Object>> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate,String currPage,String pageSize); public List<Map<String, Object>> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate,String currPage,String pageSize,String downloadState);
public List<Map<String, Object>> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate); public List<Map<String, Object>> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate,String downloadState);
public List<PreproPersonEntity> selectAllPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate); public List<PreproPersonEntity> selectAllPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate,String downloadState);
public List<PreproPersonEntity> selectPreproPersonCount(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate); public List<PreproPersonEntity> selectPreproPersonCount(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate,String downloadState);
public boolean updatePreproPerson_NewFileName(List<PreproPersonEntity> preproPersonEntities); public boolean updatePreproPerson_NewFileName(List<PreproPersonEntity> preproPersonEntities);
} }
src/main/java/com/yxproject/start/service/impl/PersonPostServiceImpl.java
View file @ b4e3a0fc
...@@ -100,7 +100,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -100,7 +100,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,String emailNo) { 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 notNull) {
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){
...@@ -109,7 +109,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -109,7 +109,7 @@ public class PersonPostServiceImpl implements PersonPostService {
str+="'"+getToCounty.get(i)+"',"; str+="'"+getToCounty.get(i)+"',";
} }
} }
int count=personPostMapper.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate,emailNo); int count=personPostMapper.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate,emailNo,notNull);
return count; return count;
} }
......
src/main/java/com/yxproject/start/service/impl/PreproPersonServiceImpl.java
View file @ b4e3a0fc
...@@ -39,7 +39,7 @@ public class PreproPersonServiceImpl implements PreproPersonService { ...@@ -39,7 +39,7 @@ public class PreproPersonServiceImpl implements PreproPersonService {
* @return * @return
*/ */
@Override @Override
public List<Map<String, Object>> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate,String currPage,String pageSize) { public List<Map<String, Object>> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate,String currPage,String pageSize,String downloadState) {
List<Map<String, Object>> mapList = preproPersonMapper.selectPreproPerson(replace(uploadNo), replace(IDCard), replace(oldFile), replace(newFile), replace(SSXQDM), replace(cardType), replace(state), replace(uploadDate), (Long.valueOf(currPage) - 1) * Long.valueOf(pageSize) + 1, Long.valueOf(currPage) * Long.valueOf(pageSize)); List<Map<String, Object>> mapList = preproPersonMapper.selectPreproPerson(replace(uploadNo), replace(IDCard), replace(oldFile), replace(newFile), replace(SSXQDM), replace(cardType), replace(state), replace(uploadDate), (Long.valueOf(currPage) - 1) * Long.valueOf(pageSize) + 1, Long.valueOf(currPage) * Long.valueOf(pageSize));
return mapList; return mapList;
} }
...@@ -57,8 +57,8 @@ public class PreproPersonServiceImpl implements PreproPersonService { ...@@ -57,8 +57,8 @@ public class PreproPersonServiceImpl implements PreproPersonService {
* @return * @return
*/ */
@Override @Override
public List<Map<String, Object>> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate) { public List<Map<String, Object>> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate,String downloadState) {
List<Map<String, Object>> mapList = preproPersonMapper.selectPreproPerson1(replace(uploadNo), replace(IDCard), replace(oldFile), replace(newFile), replace(SSXQDM), replace(cardType), replace(state), replace(uploadDate)); List<Map<String, Object>> mapList = preproPersonMapper.selectPreproPerson1(replace(uploadNo), replace(IDCard), replace(oldFile), replace(newFile), replace(SSXQDM), replace(cardType), replace(state), replace(uploadDate),downloadState);
return mapList; return mapList;
} }
...@@ -76,8 +76,8 @@ public class PreproPersonServiceImpl implements PreproPersonService { ...@@ -76,8 +76,8 @@ public class PreproPersonServiceImpl implements PreproPersonService {
* @return * @return
*/ */
@Override @Override
public List<PreproPersonEntity> selectAllPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate) { public List<PreproPersonEntity> selectAllPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate,String downloadState) {
List<PreproPersonEntity> preproPersonEntities = preproPersonMapper.selectPreproPersonCount(replace(uploadNo), replace(IDCard), replace(oldFile), replace(newFile), replace(SSXQDM), replace(cardType), replace(state), replace(uploadDate)); List<PreproPersonEntity> preproPersonEntities = preproPersonMapper.selectPreproPersonCount(replace(uploadNo), replace(IDCard), replace(oldFile), replace(newFile), replace(SSXQDM), replace(cardType), replace(state), replace(uploadDate),downloadState);
return preproPersonEntities; return preproPersonEntities;
} }
...@@ -94,8 +94,8 @@ public class PreproPersonServiceImpl implements PreproPersonService { ...@@ -94,8 +94,8 @@ public class PreproPersonServiceImpl implements PreproPersonService {
* @return * @return
*/ */
@Override @Override
public List<PreproPersonEntity> selectPreproPersonCount(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate) { public List<PreproPersonEntity> selectPreproPersonCount(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate,String downloadState) {
List<PreproPersonEntity> preproPersonEntities = preproPersonMapper.selectPreproPersonCount(replace(uploadNo), replace(IDCard), replace(oldFile), replace(newFile), replace(SSXQDM), replace(cardType), replace(state), replace(uploadDate)); List<PreproPersonEntity> preproPersonEntities = preproPersonMapper.selectPreproPersonCount(replace(uploadNo), replace(IDCard), replace(oldFile), replace(newFile), replace(SSXQDM), replace(cardType), replace(state), replace(uploadDate),downloadState);
return preproPersonEntities; return preproPersonEntities;
} }
......
src/main/resources/application.yml
View file @ b4e3a0fc
...@@ -4,14 +4,14 @@ server: ...@@ -4,14 +4,14 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: oracle.jdbc.driver.OracleDriver driver-class-name: oracle.jdbc.driver.OracleDriver
url: jdbc:oracle:thin:@192.168.1.102:1521:yingxin url: jdbc:oracle:thin:@192.168.1.16:1521:yingxin
username: yingxin username: yingxin
password: yingxin password: yingxin
servlet: servlet:
multipart: multipart:
enabled: true enabled: true
max-file-size: 20MB max-file-size: 20MB
max-request-size: 200MB max-request-size: 2000MB
......
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