Commit 1c7d48a5 authored by suichenguang's avatar suichenguang

EXcel查询添加不为空状态

parent 98ebd032
...@@ -87,7 +87,8 @@ public class PersonPostApi { ...@@ -87,7 +87,8 @@ public class PersonPostApi {
String firstIndex = jsonObject.getString("firstIndex"); String firstIndex = jsonObject.getString("firstIndex");
String pageSize = jsonObject.getString("pageSize"); String pageSize = jsonObject.getString("pageSize");
String emailNo = jsonObject.getString("emailNo"); String emailNo = jsonObject.getString("emailNo");
List<PersonPostEntity> list = personPostService.findPersonalData(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate,firstIndex,pageSize,emailNo); int notNull = Integer.parseInt((jsonObject.getString("notNull")));
List<PersonPostEntity> list = personPostService.findPersonalData(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate,firstIndex,pageSize,emailNo,notNull);
return list; return list;
} }
......
...@@ -44,7 +44,6 @@ public class queryPreproPerson { ...@@ -44,7 +44,6 @@ public class queryPreproPerson {
if ("0".equals(map1.get("IS_VALID")+"")){ if ("0".equals(map1.get("IS_VALID")+"")){
invaildCount++; invaildCount++;
} }
} }
map.put("list",preproPersonEntities); map.put("list",preproPersonEntities);
map.put("youSum",youSum); map.put("youSum",youSum);
...@@ -53,7 +52,6 @@ public class queryPreproPerson { ...@@ -53,7 +52,6 @@ public class queryPreproPerson {
return map; return map;
} }
/** /**
* 更新制证数据是否有效 * 更新制证数据是否有效
*/ */
...@@ -69,8 +67,6 @@ public class queryPreproPerson { ...@@ -69,8 +67,6 @@ public class queryPreproPerson {
return map; return map;
} }
/** /**
* 查询制证数据 * 查询制证数据
*/ */
...@@ -84,8 +80,6 @@ public class queryPreproPerson { ...@@ -84,8 +80,6 @@ public class queryPreproPerson {
return map; return map;
} }
/** /**
* 去除字符串中中线 * 去除字符串中中线
* *
......
...@@ -43,6 +43,8 @@ public interface PersonPostMapper { ...@@ -43,6 +43,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>" +
" <if test='notNull== 1 '> and (PERSON_POST.ID_CARD is not null and PERSON_POST.ID_CARD > '') or (PERSON_POST.ACCEPT_THE_MATTER is not null and PERSON_POST.ACCEPT_THE_MATTER > '') or (PERSON_POST.BEGIN_USEFUL_LIFE is not null and PERSON_POST.BEGIN_USEFUL_LIFE > '') or (PERSON_POST.VALID_PERIOD_END is not null and PERSON_POST.VALID_PERIOD_END > '') </if>" +
" <if test='notNull== 0 '> and (PERSON_POST.ID_CARD in null) or (PERSON_POST.ACCEPT_THE_MATTER in null) or (PERSON_POST.BEGIN_USEFUL_LIFE in null) or (PERSON_POST.VALID_PERIOD_END in 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>" +
...@@ -51,7 +53,7 @@ public interface PersonPostMapper { ...@@ -51,7 +53,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,@Param("emailNo")String emailNo); 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);
@Select("<script> " + @Select("<script> " +
......
...@@ -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, String emailNo); 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,int notNull);
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);
......
...@@ -16,7 +16,7 @@ public interface ReceiptService { ...@@ -16,7 +16,7 @@ public interface ReceiptService {
public Map<String,Object>selectDetailedData(String id); public Map<String,Object>selectDetailedData(String id);
public boolean createDetailedList(@Param("UPLOAD_NO")String UPLOAD_NO,@Param("ACCEPT_NO")String ACCEPT_NO,@Param("NAME")String NAME,@Param("CARD_ID")String CARD_ID,@Param("GAJG_DM")String GAJG_DM,@Param("RECEIPT_ID")long RECEIPT_ID,@Param("SEX")String SEX); public boolean createDetailedList(String UPLOAD_NO,String ACCEPT_NO,String NAME,String CARD_ID,String GAJG_DM,long RECEIPT_ID,String SEX);
public int selectSpecialCard(String GROUP_NO); public int selectSpecialCard(String GROUP_NO);
...@@ -44,7 +44,6 @@ public interface ReceiptService { ...@@ -44,7 +44,6 @@ public interface ReceiptService {
//特证查询是否生成交接单 //特证查询是否生成交接单
public int selectCountById(@Param("id") String id); public int selectCountById(@Param("id") String id);
//查询是否已生成交接单详单 //查询是否已生成交接单详单
public int selectReceiptById(@Param("id") String id); public int selectReceiptById(@Param("id") String id);
......
...@@ -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,String emailNo){ public List<PersonPostEntity> findPersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate,String firstIndex,String pageSize,String emailNo,int notNull){
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,emailNo); List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate,firstIndexLong * pageSizeLong,(firstIndexLong - 1) * pageSizeLong + 1,emailNo,notNull);
System.out.println("数据:"+list); System.out.println("数据:"+list);
return list; return list;
} }
......
...@@ -164,7 +164,6 @@ public class ReceiptServiceImpl implements ReceiptService { ...@@ -164,7 +164,6 @@ public class ReceiptServiceImpl implements ReceiptService {
str+=stringList.get(i)+","; str+=stringList.get(i)+",";
} }
} }
return receiptMapper.selectReceiptDate(date,str,typeCode); return receiptMapper.selectReceiptDate(date,str,typeCode);
} }
......
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