Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 8ca0a4e6 authored by dahai's avatar dahai
Browse files
Options

push

parent 7e3b3d4b
Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 17 deletions
src/main/java/com/yxproject/start/api/ReadXmlApi.java
View file @ 8ca0a4e6
......@@ -81,7 +81,6 @@ public class ReadXmlApi {
// 如果fileitem中封装的是上传文件
// 得到上传的文件名称
filename = item.getName();
System.out.println(filename+"===============");
if (filename == null || filename.trim().equals("")) {
continue;
}
......
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ 8ca0a4e6
......@@ -102,7 +102,6 @@ public class TaskListApi {
JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList");
String process = jsonObject.get("process").toString();
String name = jsonObject.get("name").toString();
Boolean b = true;
List<String> list = (List<String>) jsonArray;
return taskListService.updateState(list, process, name);
}
......@@ -123,7 +122,6 @@ public class TaskListApi {
String process = jsonObject.get("process").toString();
String name = jsonObject.get("name").toString();
String printer = jsonObject.get("printer").toString();
Boolean b = true;
List<String> list = (List<String>) jsonArray;
return taskListService.updateState2(list, process, name,Long.valueOf(printer));
}
......@@ -204,6 +202,23 @@ public class TaskListApi {
}
/**
* 查询任务单详情（历史）
* (辅助库)
*（下发、数据核验、预订位、平压、冲切）
* @param process 工序
* @param resp
* @return
*/
@RequestMapping("queryHistoryTaskAtAuxiliary")
public List<Object> queryHistoryTaskAtAuxiliary(@RequestParam("process") String process,@RequestParam("date") String date, HttpServletResponse resp) {
List<Object> objects = taskListService.selectHistoryTaskAtAuxiliary(Long.valueOf(process) ,date);
return objects;
}
/**
* 生成任务单
* <p>
......
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ 8ca0a4e6
......@@ -141,7 +141,7 @@ public interface TaskListMapper {
/**
* 循环单查询
* 任务单查询
* 辅助库 大批证
* @param process 工序
* @return
......@@ -155,8 +155,28 @@ public interface TaskListMapper {
"where task.TASK_STATE_ID = #{process} order by group_no.GROUP_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_common(@Param("process") long process);
/**
* 循环单查询
* 任务单查询历史
* 辅助库 大批证
* @param process 工序
* @param date 查询时间
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
"task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME,CARD_TYPE_DIC.CARD_TYPE ,\n" +
"CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,\n" +
"group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO 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" +
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where 1=1 #{date}\n" +
"order by group_no.GROUP_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_common(@Param("process") long process,@Param("date")String date );
/**
* 任务单查询
* 辅助库、制证库 大批证
* @param process 工序
* @return
......@@ -184,7 +204,7 @@ public interface TaskListMapper {
public List<Map<String,Object>> selectByCountyAtAuxiliary_common2(@Param("process") long process);
/**
* 循环单查询
* 任务单查询
* 辅助库 快证
* @param process 工序
* @return
......@@ -199,7 +219,41 @@ public interface TaskListMapper {
public List<Map<String,Object>> selectByCountyAtAuxiliary_fast(@Param("process") long process);
/**
* 循环单查询
* 任务单查询历史
* 辅助库 快证
* @param process 工序
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
"task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME, '快证' CARD_TYPE ,\n" +
" '1' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,\n" +
"group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO 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 " +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2" +
" <if test='#{process}==1 '> "+
"and ISSUED_DATE =#{date}"+
" </if>" +
" <if test='2 ==#{process}'> "+
"and PRINT_OUT_DATE =#{date}"+
" </if>" +
" <if test='3==#{process} '> "+
"and POSITION_DATE =#{date}"+
" </if>" +
" <if test='4 ==#{process}'> "+
"and CONCORA_CRUSH_DATE =#{date}"+
" </if>" +
" <if test='5==#{process} '> "+
"and PUNCHING_DATE =#{date}"+
" </if>" +
" order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_fast(@Param("process") long process,@Param("date") String date);
/**
* 任务单查询
* 辅助库、制证库 快证
* @param process 工序
* @return
......@@ -238,7 +292,39 @@ public interface TaskListMapper {
public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind(@Param("process") long process);
/**
* 循环单查询
* 任务单查询历史
* 辅助库 余证
* @param process 工序
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
"task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME,'余证' CARD_TYPE ,\n" +
"'99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,\n" +
"group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO 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" +
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 " +
" <if test='1 ==#{process} '> "+
"and ISSUED_DATE =#{date}"+
" </if>" +
" <if test='2 ==#{process}'> "+
"and PRINT_OUT_DATE =#{date}"+
" </if>" +
" <if test='3==#{process} '> "+
"and POSITION_DATE =#{date}"+
" </if>" +
" <if test='4 ==#{process}'> "+
"and CONCORA_CRUSH_DATE =#{date}"+
" </if>" +
" <if test='5==#{process} '> "+
"and PUNCHING_DATE =#{date}"+
" </if>" +
" order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind(@Param("process") long process ,@Param("date") String date);
/**
* 任务单查询
* 辅助库、制证库 余证
* @param process 工序
* @return
......@@ -369,12 +455,4 @@ public interface TaskListMapper {
@Select("select * from task where task_ID = #{taskId}")
public List<TaskEntity> selectTaskEntityByTaskId(long taskId);
// /**
// * 保存快证任务单
// * 辅助库
// * @param taskEntity
// * @return
// */
//
// public boolean saveTask(TaskEntity taskEntity);
}
src/main/java/com/yxproject/start/service/TaskListService.java
View file @ 8ca0a4e6
......@@ -29,6 +29,8 @@ public interface TaskListService {
public List<Object> selectByCountyAtAuxiliary(long process);
public List<Object> selectHistoryTaskAtAuxiliary(long process,String date);
public Map selectByCountyAtAuxiliary2(long process);
public List<Object> selectByCountyAtAuxiliary3(long process);
......
src/main/java/com/yxproject/start/service/impl/ImportXmlServiceImpl.java
View file @ 8ca0a4e6
......@@ -33,7 +33,7 @@ public class ImportXmlServiceImpl implements ImportXmlService {
public boolean importPersonXml(List<PreproPersonEntity> preproPersonEntities, FilesEntity filesEntity) {
long l = filesMapper.insertFiles(filesEntity);
for (PreproPersonEntity preproPersonEntity : preproPersonEntities) {
preproPersonEntity.setFileId(l);
preproPersonEntity.setFileId(filesEntity.getId());
preproPersonMapper.savePreproPersonEntity(preproPersonEntity);
}
return true;
......
src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java
View file @ 8ca0a4e6
......@@ -292,6 +292,47 @@ public class TaskListServiceImpl implements TaskListService {
return list;
}
/**
* 查询历史任务单详情
* （辅助库）
* （下发、数据核验、预订位、平压、冲切）
* @param process 工序
* @param date 查询时间
* @return
*/
@Override
public List<Object> selectHistoryTaskAtAuxiliary(long process, String date) {
String str = "and ";
int pro = (int)process;
switch (pro){
case 1:
str =str +" to_char(ISSUED_DATE,'yyyyMMdd')= '"+date+"'";
break;
case 2:
str =str +" to_char(PRINT_OUT_DATE,'yyyyMMdd')= '"+date+"'";
break;
case 3:
str =str +" to_char(POSITION_DATE,'yyyyMMdd')= '"+date+"'";
break;
case 4:
str =str +" to_char(CONCORA_CRUSH_DATE,'yyyyMMdd')= '"+date+"'";
break;
case 5:
str =str +" to_char(PUNCHING_DATE,'yyyyMMdd')= '"+date+"'";
break;
default:
break;
}
//查询历史任务单 大批证
List<Map<String, Object>> mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common(process, str);
//查询历史任务单 快证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast(process,str));
//查询历史任务单 余证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind(process,str));
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