Commit 1ad57a41 authored by suichenguang's avatar suichenguang

修改

parent a1eb4f5e
...@@ -54,8 +54,8 @@ public class LogApi { ...@@ -54,8 +54,8 @@ public class LogApi {
* *
*/ */
@RequestMapping("selectNewFileLogCount") @RequestMapping("selectNewFileLogCount")
public String selectNewFileLogCount(@RequestParam("newFileName")String newFileName, @RequestParam("cardId")String cardId,@RequestParam("createDate")String createDate,@RequestParam("uploadCountyCode")String uploadCountyCode){ public int selectNewFileLogCount(@RequestParam("newFileName")String newFileName, @RequestParam("cardId")String cardId,@RequestParam("createDate")String createDate,@RequestParam("uploadCountyCode")String uploadCountyCode){
String total = logService.selectNewFileLogCount(newFileName,cardId,replaceDate(createDate),uploadCountyCode); int total = logService.selectNewFileLogCount(newFileName,cardId,replaceDate(createDate),uploadCountyCode);
return total; return total;
} }
...@@ -80,8 +80,8 @@ public class LogApi { ...@@ -80,8 +80,8 @@ public class LogApi {
* @return * @return
*/ */
@RequestMapping("selectAnalysisLogCount") @RequestMapping("selectAnalysisLogCount")
public String selectAnalysisLogCount (@RequestParam("fileName")String fileName,@RequestParam("analysisTime")String analysisTime){ public int selectAnalysisLogCount (@RequestParam("fileName")String fileName,@RequestParam("analysisTime")String analysisTime){
String total = logService.selectAnalysisLogCount(fileName,replaceDate(analysisTime)); int total = logService.selectAnalysisLogCount(fileName,replaceDate(analysisTime));
return total; return total;
} }
......
...@@ -2,8 +2,6 @@ package com.yxproject.start.mapper; ...@@ -2,8 +2,6 @@ package com.yxproject.start.mapper;
import com.yxproject.start.entity.CountyDicEntity; import com.yxproject.start.entity.CountyDicEntity;
import org.apache.ibatis.annotations.*; import org.apache.ibatis.annotations.*;
import org.omg.CORBA.PUBLIC_MEMBER;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -116,7 +114,7 @@ public interface LogMapper { ...@@ -116,7 +114,7 @@ public interface LogMapper {
" and PREPRO_PERSON.GMSFHM=#{cardId} " + " and PREPRO_PERSON.GMSFHM=#{cardId} " +
" </if>" + " </if>" +
"</script>") "</script>")
public String selectNewFileLogCount(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate,@Param("uploadCountyCode") String uploadCountyName); public int selectNewFileLogCount(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate, @Param("uploadCountyCode") String uploadCountyName);
@Select("<script> " + @Select("<script> " +
...@@ -131,9 +129,6 @@ public interface LogMapper { ...@@ -131,9 +129,6 @@ public interface LogMapper {
"<if test='analysisDate !=\"\"' >" + "<if test='analysisDate !=\"\"' >" +
"AND FILE_NAME_DIC.ANALYSIS_DATE = #{analysisDate} " + "AND FILE_NAME_DIC.ANALYSIS_DATE = #{analysisDate} " +
"</if>" + "</if>" +
"group by FILE_NAME_DIC.FILE_NAME, FILE_NAME_DIC.FORM_START_TIME, " +
"FILE_NAME_DIC.FORM_DEADLINE, PERSON_POST.LATTICE_MOUTH_INFORMATION, " +
"FILE_NAME_DIC.ANALYSIS_DATE, FILES.RECORD_NUMBER" +
"</script>") "</script>")
public String selectAnalysisLogCount(@Param("fileName")String fileName, @Param("analysisDate")String analysisDate); public int selectAnalysisLogCount(@Param("fileName")String fileName, @Param("analysisDate")String analysisDate);
} }
...@@ -10,11 +10,11 @@ public interface LogService { ...@@ -10,11 +10,11 @@ public interface LogService {
public List<Map<String,Object>> selectNewFilesLog(String newFileName,String cardId,String createDate,String uploadCountyCode,long currPage,long pageSize); public List<Map<String,Object>> selectNewFilesLog(String newFileName,String cardId,String createDate,String uploadCountyCode,long currPage,long pageSize);
public String selectNewFileLogCount(String newFileName,String cardId,String createDate,String uploadCountyCode); public int selectNewFileLogCount(String newFileName, String cardId, String createDate, String uploadCountyCode);
public List<Map<String,Object>> selectAnalysisLog(String fileName,String analysisDate,long currPage,long pageSize); public List<Map<String,Object>> selectAnalysisLog(String fileName,String analysisDate,long currPage,long pageSize);
public String selectAnalysisLogCount(String fileName,String analysisDate); public int selectAnalysisLogCount(String fileName, String analysisDate);
public List<CountyDicEntity> getCountyList(); public List<CountyDicEntity> getCountyList();
......
...@@ -20,8 +20,8 @@ public class LogServiceImpl implements LogService { ...@@ -20,8 +20,8 @@ public class LogServiceImpl implements LogService {
} }
@Override @Override
public String selectNewFileLogCount(String newFileName, String cardId, String createDate, String uploadCountyCode) { public int selectNewFileLogCount(String newFileName, String cardId, String createDate, String uploadCountyCode) {
String count= logMapper.selectNewFileLogCount(newFileName,cardId,createDate,uploadCountyCode); int count= logMapper.selectNewFileLogCount(newFileName,cardId,createDate,uploadCountyCode);
return count; return count;
} }
...@@ -32,8 +32,8 @@ public class LogServiceImpl implements LogService { ...@@ -32,8 +32,8 @@ public class LogServiceImpl implements LogService {
} }
@Override @Override
public String selectAnalysisLogCount(String fileName, String analysisDate) { public int selectAnalysisLogCount(String fileName, String analysisDate) {
String count= logMapper.selectAnalysisLogCount(fileName,analysisDate); int count= logMapper.selectAnalysisLogCount(fileName,analysisDate);
return count; return count;
} }
......
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