Commit 71db789a authored by dahai's avatar dahai

修改上传时间格式

parent b5322c7a
...@@ -13,7 +13,7 @@ public class FilesAnalysisApi { ...@@ -13,7 +13,7 @@ public class FilesAnalysisApi {
private PersonPostService personPostService; private PersonPostService personPostService;
/** /**
* 文件解析 * 文件解析 修改解析状态
* @param fileId * @param fileId
* @param creatTime * @param creatTime
* @return * @return
......
...@@ -4,6 +4,7 @@ import com.yxproject.start.entity.TaskList.CountCountyEntity; ...@@ -4,6 +4,7 @@ import com.yxproject.start.entity.TaskList.CountCountyEntity;
import com.yxproject.start.entity.TaskList.CountGajgEntity; import com.yxproject.start.entity.TaskList.CountGajgEntity;
import com.yxproject.start.entity.TaskList.TaskListEntity; import com.yxproject.start.entity.TaskList.TaskListEntity;
import com.yxproject.start.service.TaskListService; import com.yxproject.start.service.TaskListService;
import com.yxproject.start.utils.YXJSONResponse;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -83,4 +85,21 @@ public class TaskListApi { ...@@ -83,4 +85,21 @@ public class TaskListApi {
/**
* 查询任务单详情
* (受理库)
* @param state
* @return
*/
@RequestMapping("queryByCountyAtACCU")
public String queryByCountyAtACCU(@RequestParam("state") String state, HttpServletResponse resp){
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(taskListService.selectByCountyAtACCU(state));
return yxjsonResponse.toJSONString();
}
} }
...@@ -20,11 +20,8 @@ public interface FilesMapper { ...@@ -20,11 +20,8 @@ public interface FilesMapper {
"<where> 1=1" + "<where> 1=1" +
"<if test='importDate !=null'>" + "<if test='importDate !=null'>" +
" and to_char(FILES.UPLOAD_DATE,'yyyyMMdd')= #{importDate}" + " and to_char(FILES.UPLOAD_DATE,'yyyyMMdd')= #{importDate}" +
"</if>" +
"<if test='state !=-1'>" +
" and PREPRO_PERSON.STATE = #{state}" +
"</if> </where>" + "</if> </where>" +
" group by FILES.upload_date") "group by FILES.upload_date")
public List<CountDataEntity> selectFilesCount(@Param("importDate") String importDate,@Param("state") long state); public List<CountDataEntity> selectFilesCount(@Param("importDate") String importDate);
} }
...@@ -27,6 +27,20 @@ public interface TaskListMapper { ...@@ -27,6 +27,20 @@ public interface TaskListMapper {
" GROUP by coun.COUNTYNAME,substr(act.upload_no,0,6)") " GROUP by coun.COUNTYNAME,substr(act.upload_no,0,6)")
public List<CountCountyEntity> selectByCounty(@Param("submitDate") String submitDate); public List<CountCountyEntity> selectByCounty(@Param("submitDate") String submitDate);
/**
* 循环单查询
* 受理库
* @param submitDate
* @return
*/
@Select("select DISTINCT CARD_TYPE_DIC.*, ACC_GROUP_T.* ,county_dic.* from ACC_CARD_T@ACCU_LINK \n" +
"left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH = acc_card_t.upload_no \n" +
"left join ACC_GROUP_T@ACCU_LINK on substr(acc_card_t.accept_no,0,8) = ACC_GROUP_T.group_no\n" +
"left join CARD_TYPE_DIC on PREPRO_PERSON.card_type_id = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
"left join county_dic on substr(PREPRO_PERSON.JMSFZSLH,0,6)= county_dic.COUNTY_CODE\n" +
"where county_dic.COUNTY_CODE is not null and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{submitDate}")
public List<Object> selectByCountyAtACCU(@Param("submitDate") String submitDate);
/** /**
* 派出所计数查询 * 派出所计数查询
...@@ -81,15 +95,6 @@ public interface TaskListMapper { ...@@ -81,15 +95,6 @@ public interface TaskListMapper {
public boolean updateState(@Param("taskId") String taskId); public boolean updateState(@Param("taskId") String taskId);
/**
* 区县计数查询
* 辅助库
* @param submitDate
* @return
*/
@Select("")
public List<CountCountyEntity> selectTaskByCounty(@Param("submitDate") String submitDate,@Param("taskState")String taskState);
......
...@@ -14,5 +14,5 @@ public interface ImportXmlService { ...@@ -14,5 +14,5 @@ public interface ImportXmlService {
public boolean importPersonXml(List<PreproPersonEntity> preproPersonEntities,FilesEntity filesEntity); public boolean importPersonXml(List<PreproPersonEntity> preproPersonEntities,FilesEntity filesEntity);
public List<CountDataEntity> queryPersonXmlCount(String importDate,long state); public List<CountDataEntity> queryPersonXmlCount(String importDate);
} }
...@@ -13,7 +13,7 @@ import java.util.List; ...@@ -13,7 +13,7 @@ import java.util.List;
public interface PersonPostService { public interface PersonPostService {
/** /**
* 解析制证包 * 文件解析 修改解析状态
* @param fileId * @param fileId
* @param creatTime * @param creatTime
* @return * @return
......
...@@ -18,4 +18,6 @@ public interface TaskListService { ...@@ -18,4 +18,6 @@ public interface TaskListService {
public boolean createTaskList(List<TaskListEntity> resultMap); public boolean createTaskList(List<TaskListEntity> resultMap);
public boolean updateState(String taskId); public boolean updateState(String taskId);
public List<Object> selectByCountyAtACCU(String date);
} }
...@@ -40,7 +40,7 @@ public class ImportXmlServiceImpl implements ImportXmlService { ...@@ -40,7 +40,7 @@ public class ImportXmlServiceImpl implements ImportXmlService {
} }
@Override @Override
public List<CountDataEntity> queryPersonXmlCount(String importDate, long state) { public List<CountDataEntity> queryPersonXmlCount(String importDate) {
return filesMapper.selectFilesCount(importDate,state); return filesMapper.selectFilesCount(importDate);
} }
} }
...@@ -35,6 +35,12 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -35,6 +35,12 @@ public class PersonPostServiceImpl implements PersonPostService {
return true; return true;
} }
/**
* 文件解析 修改解析状态
* @param fileId
* @param creatTime
* @return
*/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean updateIsPost(String fileId, String creatTime) { public boolean updateIsPost(String fileId, String creatTime) {
...@@ -42,7 +48,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -42,7 +48,7 @@ public class PersonPostServiceImpl implements PersonPostService {
personPostMapper.updateIsPost(fileId,creatTime); personPostMapper.updateIsPost(fileId,creatTime);
return true; return true;
} }
//TODO
@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 str = null; String str = null;
...@@ -73,7 +79,7 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -73,7 +79,7 @@ public class PersonPostServiceImpl implements PersonPostService {
*/ */
@Override @Override
public List<FileNameDicEntity> queryFileNameDic(String fileName, long analysisState, long currPage, long pageSize) { public List<FileNameDicEntity> queryFileNameDic(String fileName, long analysisState, long currPage, long pageSize) {
List<FileNameDicEntity> fileNameDicEntities = fileNameDicMapper.queryFileNameDic(fileName, analysisState, currPage, pageSize);
return null; return fileNameDicEntities;
} }
} }
...@@ -44,4 +44,16 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -44,4 +44,16 @@ public class TaskListServiceImpl implements TaskListService {
taskListMapper.updateState(taskId); taskListMapper.updateState(taskId);
return true; return true;
} }
@Override
public List<Object> selectByCountyAtACCU(String date) {
List<Object> objects = taskListMapper.selectByCountyAtACCU(date);
for (Object o :objects){
}
System.out.println(objects.toString()+"---------");
return null;
}
} }
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