Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 84bddbc4 authored by xiachenqi's avatar xiachenqi
Browse files
Options

修正读取个人邮寄excel中受理号的识别问题

parent 35e0f45c
Hide whitespace changes
Inline Side-by-side
Showing with 337 additions and 227 deletions
src/main/java/com/yxproject/start/api/LogApi.java
View file @ 84bddbc4
......@@ -22,13 +22,17 @@ import static com.yxproject.start.utils.YXStringUtils.getCurrentDate2String;
@RestController
@RequestMapping("LogApi")
public class LogApi {
@Autowired
private LogService logService;
@Autowired
private PersonPostService personPostService;
private final LogService logService;
private final PersonPostService personPostService;
Logger logger= Logger.getLogger(LogApi.class);
public LogApi(LogService logService, PersonPostService personPostService) {
this.logService = logService;
this.personPostService = personPostService;
}
/**
* 查询新包生成日志
* @param newFileName 新文件名
......
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ 84bddbc4
......@@ -208,8 +208,8 @@ public class ReadExcelApi {
personPostEntity.setLatticeMouthInformation((String) list2.get(21));
personPostEntity.setNatureOfTheInternal((String) list2.get(22));
personPostEntity.setNatureOfTheInformation((String) list2.get(23));
// personPostEntity.setFirstWhite(list2.get(24).toString().substring(5, 27));
personPostEntity.setFirstWhite(list2.get(24).toString());
personPostEntity.setFirstWhite(list2.get(24).toString().substring(5, 27));
// personPostEntity.setFirstWhite(list2.get(24).toString());
personPostEntity.setFileId(fileNameDicEntity.getFileId());
personPostEntity.setGk(gkMap);
}
......
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ 84bddbc4
......@@ -2,19 +2,20 @@ package com.yxproject.start.api;
import com.yxproject.start.entity.*;
import com.yxproject.start.service.*;
import com.yxproject.start.service.impl.TaskListServiceImpl;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.core.io.FileSystemResource;
import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.transaction.Transactional;
import java.io.IOException;
import java.util.*;
/**
......@@ -24,21 +25,26 @@ import java.util.*;
@RestController
@RequestMapping("TaskList")
public class TaskListApi {
@Autowired
private TaskListService taskListService;
@Autowired
private SpecialCardService specialCardService;
@Autowired
private GroupNoService groupNoService;
@Autowired
private PreproPersonService preproPersonService;
@Autowired
private ReceiptService receiptService;
@Autowired
private FailedCardService failedCardService;
private final TaskListService taskListService;
private final SpecialCardService specialCardService;
private final GroupNoService groupNoService;
private final PreproPersonService preproPersonService;
private final ReceiptService receiptService;
private final FailedCardService failedCardService;
private final TaskListServiceImpl taskListServiceImpl;
Logger logger = Logger.getLogger(TaskListApi.class);
public TaskListApi(TaskListService taskListService, SpecialCardService specialCardService, GroupNoService groupNoService, PreproPersonService preproPersonService, ReceiptService receiptService, FailedCardService failedCardService, TaskListServiceImpl taskListServiceImpl) {
this.taskListService = taskListService;
this.specialCardService = specialCardService;
this.groupNoService = groupNoService;
this.preproPersonService = preproPersonService;
this.receiptService = receiptService;
this.failedCardService = failedCardService;
this.taskListServiceImpl = taskListServiceImpl;
}
/**
* 更改任务单状态
* （下发、预订位、平压、冲切、分拣）
......@@ -205,13 +211,8 @@ public class TaskListApi {
public List<Object> queryByCountyAtAuxiliary(@RequestParam("process") String process, HttpServletResponse resp, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Object> objects = new ArrayList<>();
// try {
objects = taskListService.selectByCountyAtAuxiliary(Long.valueOf(process) - 1);
// }catch (Exception e){
// logger.error("工序：" + process);
// logger.error("Exception 查询任务单详情(辅助库)（下发、数据核验、膜打印）异常", e);
// }
List<Object> objects;
objects = taskListService.selectByCountyAtAuxiliary(Long.parseLong(process) - 1);
return objects;
}
......@@ -290,16 +291,17 @@ public class TaskListApi {
* （创建、下发、膜打印、预订位、平压、冲切）
*
* @param process 工序
* @param resp
* @return
*/
@RequestMapping("queryHistoryTaskAtAuxiliary")
public List<Object> queryHistoryTaskAtAuxiliary(@RequestParam("process") String process, @RequestParam("date") String date, @RequestParam("workGroup") String workGroup, HttpServletResponse resp, HttpServletRequest requ) {
public List<Object> queryHistoryTaskAtAuxiliary(
@RequestParam("process") String process, @RequestParam("date") String date,
@RequestParam("workGroup") String workGroup, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Object> objects = new ArrayList<>();
try {
objects = taskListService.selectHistoryTaskAtAuxiliary(Long.valueOf(process), replaceDate(date), workGroup);
objects = taskListService.selectHistoryTaskAtAuxiliary(Long.parseLong(process), replaceDate(date), workGroup);
} catch (Exception e) {
logger.error("工序：" + process + "查询时间：" + date + "工作组" + workGroup);
logger.error("Exception 查询任务单详情（历史）(辅助库)（创建、下发、膜打印、预订位、平压、冲切）异常", e);
......@@ -761,15 +763,14 @@ public class TaskListApi {
return str.replace("-", "").replace(" ", "").replace(":", "");
}
/**
* 字符串去除空格
*
* @param str 原始字符串
* @return 返回新的字符串
*/
private String replaceNullString(String str) {
if (str == "") {
return null;
} else return str;
@GetMapping("exportPostPersonInfo")
public ResponseEntity<FileSystemResource> exportPostPersonInfo(@RequestParam String taskDate) throws IOException {
String fileName = taskListServiceImpl.exportPostPersonInfo(taskDate);
FileSystemResource resource = new FileSystemResource(fileName);
// 返回文件下载响应
return ResponseEntity.ok()
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + fileName)
.contentType(org.springframework.http.MediaType.parseMediaType("text/csv"))
.body(resource);
}
}
src/main/java/com/yxproject/start/mapper/LogMapper.java
View file @ 84bddbc4
......@@ -89,7 +89,7 @@ public interface LogMapper {
* @return
*/
@Insert("INSERT INTO ANALYSIS (FILE_DIC_ID,FILE_ID,COMMON_CARD_COUNT,POST_CARD_COUNT,ANALYSIS_DATE) VALUES (#{fileDic},#{fileId},#{commonCardCount},#{postCardCount},#{analysisDate})")
public boolean insertIntoAnalysis(@Param("fileDic")String fileDic,@Param("fileId")String fileId,@Param("commonCardCount")String commonCardCount,@Param("postCardCount")String postCardCount,@Param("analysisDate")String analysisDate);
boolean insertIntoAnalysis(@Param("fileDic") String fileDic, @Param("fileId") String fileId, @Param("commonCardCount") String commonCardCount, @Param("postCardCount") String postCardCount, @Param("analysisDate") String analysisDate);
//查询解析数据
......
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ 84bddbc4
......@@ -57,7 +57,7 @@ public interface PersonPostMapper {
" <when test='latticeMouthInformation!=\"\"'> and PERSON_POST.LATTICE_MOUTH_INFORMATION=#{latticeMouthInformation} </when>" +
" <when test='getToCounty!=\"\"'> and PERSON_POST.GET_TO_COUNTY in ( ${getToCounty}) </when>" +
" <if test='GK== 0 '> and GK = 0 </if>" +
" <if test='GK== 1 '> and GK in (1，2，3，4) </if>" +
" <if test='GK== 1 '> and GK in (1,2,3,4) </if>" +
" <if test='GK== 5 '> and GK = 5</if>" +
" <when test='startDate!=\"\"'> and subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8) between ${startDate} and ${endDate} </when>" +
" <when test='printDate!=\"\"'> and to_char(PERSON_POST.print_Date,'yyyyMMdd') = ${printDate} </when>" +
......
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ 84bddbc4
......@@ -19,6 +19,7 @@ public interface TaskListMapper {
* 任务单查询
* 受理库
* 包号21位，港澳6，台湾7，异地8
*
* @param submitDate
* @return
*/
......@@ -30,7 +31,7 @@ public interface TaskListMapper {
"ACC_GROUP_T.group_no not in (select group_no from group_no)\n" +
"and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{submitDate} \n" +
"order by ACC_GROUP_T.group_no")
public List<Map<String,Object>> selectByCountyAtACCU(@Param("submitDate") String submitDate);
public List<Map<String, Object>> selectByCountyAtACCU(@Param("submitDate") String submitDate);
@Select("select DISTINCT CARD_TYPE_DIC.*, PROD_GROUP_T.* ,'000000' COUNTY_CODE,'0000' COUNTYNAME,'3' DEAL_FLAG, '00000000' USER_CODE from PRODYD_DBA.PROD_CARD_T@PRODYD_LINK \n" +
"left join PRODYD_DBA.PROD_GROUP_T@PRODYD_LINK on substr(prod_card_t.accept_no,0,8) = prod_GROUP_T.group_no\n" +
......@@ -38,15 +39,16 @@ public interface TaskListMapper {
"left join CARD_TYPE_DIC on decode(substr(ORIGINAL_NO,21,1),6,5,substr(ORIGINAL_NO,21,1)) = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
"where \n" +
"PROD_GROUP_T.group_no not in (select group_no from group_no)\n" +
"and PROD_GROUP_T.GROUP_NO BETWEEN #{groupNo1} AND #{groupNo2}\n"+
"and PROD_GROUP_T.GROUP_NO BETWEEN #{groupNo1} AND #{groupNo2}\n" +
"order by PROD_GROUP_T.group_no")
public List<Map<String,Object>> selectByCounty(@Param("groupNo1") String groupNo1,@Param("groupNo2") String groupNo2);
public List<Map<String, Object>> selectByCounty(@Param("groupNo1") String groupNo1, @Param("groupNo2") String groupNo2);
/**
* 组号列表查询
* 受理库
* @param date 查询时间
* @param typeCode 制证类型
*
* @param date 查询时间
* @param typeCode 制证类型
* @param countyCode 区县代码
* @param maxNum
* @param minNum
......@@ -62,14 +64,15 @@ public interface TaskListMapper {
" and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{date}" +
" and PREPRO_PERSON.card_type_id = #{typeCode}" +
") a ) where rn BETWEEN #{minNum} and #{maxNum}")
public List<Map<String,Object>> selectByGroupNoAtACCU(@Param("date") String date,@Param("typeCode")String typeCode,@Param("countyCode")String countyCode,@Param("maxNum")long maxNum,@Param("minNum")long minNum );
public List<Map<String, Object>> selectByGroupNoAtACCU(@Param("date") String date, @Param("typeCode") String typeCode, @Param("countyCode") String countyCode, @Param("maxNum") long maxNum, @Param("minNum") long minNum);
/**
* 组号列表查询总数量
* 受理库
* @param date 查询时间
* @param typeCode 制证类型
*
* @param date 查询时间
* @param typeCode 制证类型
* @param countyCode 区县代码
* @return
*/
......@@ -80,14 +83,15 @@ public interface TaskListMapper {
"left join county_dic on substr(PREPRO_PERSON.JMSFZSLH,0,6)= county_dic.COUNTY_CODE\n" +
"where county_dic.COUNTY_CODE = #{countyCode} and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{date}" +
" and PREPRO_PERSON.card_type_id = #{typeCode}")
public List<Map<String,Object>> selectByGroupNoAtACCUCount(@Param("date") String date,@Param("typeCode")String typeCode,@Param("countyCode")String countyCode );
public List<Map<String, Object>> selectByGroupNoAtACCUCount(@Param("date") String date, @Param("typeCode") String typeCode, @Param("countyCode") String countyCode);
/**
* 查询组号列表
* 受理库
* @param date 查询时间
* @param typeCode 制证类型
*
* @param date 查询时间
* @param typeCode 制证类型
* @param countyCode 区县代码
* @return
*/
......@@ -99,12 +103,12 @@ public interface TaskListMapper {
"left join county_dic on substr(acc_card_t.upload_no,0,6)= county_dic.COUNTY_CODE\n" +
"where county_dic.COUNTY_CODE is not null and ACC_GROUP_T.deal_flag =3 and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')= #{date}\n" +
"and decode(substr(UPLOAD_NO,18,1),6,5,substr(UPLOAD_NO,18,1)) =#{typeCode} and substr(acc_card_t.upload_no,0,6) =#{countyCode}")
public List<Map<String,Object>> selectGroupAtACCUByCountyCode(@Param("date") String date,@Param("typeCode") String typeCode,@Param("countyCode") String countyCode);
public List<Map<String, Object>> selectGroupAtACCUByCountyCode(@Param("date") String date, @Param("typeCode") String typeCode, @Param("countyCode") String countyCode);
/**
* 生成快证任务单
*
* @param taskEntity 任务单
* @return
*/
......@@ -208,11 +212,12 @@ public interface TaskListMapper {
" , #{workGroup}" +
"</if>" +
",#{taskStateId},#{oldCardType}) </script>")
@Options(useGeneratedKeys=true, keyProperty="taskId", keyColumn="TASK_ID")
@Options(useGeneratedKeys = true, keyProperty = "taskId", keyColumn = "TASK_ID")
public boolean saveFastTask(TaskEntity taskEntity);
/**
* 生成任务单
*
* @param taskEntity 任务单
* @return
*/
......@@ -232,14 +237,14 @@ public interface TaskListMapper {
// " </if>" +
") " +
"</script>")
@Options(useGeneratedKeys=true, keyProperty="taskId", keyColumn="TASK_ID")
@Options(useGeneratedKeys = true, keyProperty = "taskId", keyColumn = "TASK_ID")
public boolean saveTask(TaskEntity taskEntity);
/**
* 任务单查询
* 辅助库 大批证
* 辅助库 大批证
*
* @param process 工序
* @return
*/
......@@ -256,12 +261,13 @@ public interface TaskListMapper {
"group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO, nvl(fc.faileCount,0), task.work_group, \n" +
"decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) \n" +
"order by group_no.GROUP_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_common(@Param("process") long process,@Param("process2") long process2);
public List<Map<String, Object>> selectByCountyAtAuxiliary_common(@Param("process") long process, @Param("process2") long process2);
/**
* 任务单查询
* 辅助库 大批证
* 辅助库 大批证
*
* @param process 工序
* @return
*/
......@@ -275,13 +281,13 @@ public interface TaskListMapper {
"and FAILED_CARD.state != FAILED_CARD.INITIATOR and accept_no not in (select accept_no from special_card ) group by accept_no ) fc " +
"on substr(fc.accept_no,0,8) = group_no.group_no \n" +
"where task.TASK_STATE_ID = #{process} and task.work_group = #{workGroup} order by group_no.GROUP_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_common4(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
public List<Map<String, Object>> selectByCountyAtAuxiliary_common4(@Param("process") long process, @Param("process2") long process2, @Param("workGroup") long workGroup);
/**
* 任务单查询历史
* 辅助库 大批证
* 辅助库 大批证
*
* @param date 查询时间
* @return
*/
......@@ -296,11 +302,12 @@ public interface TaskListMapper {
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where 1= 1 and to_char(SUBMIT_DATE,'yyyyMMdd')= #{date}\n" +
"order by group_no.GROUP_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_common0(@Param("date")String date );
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_common0(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 大批证
* 辅助库 大批证
*
* @param date 查询时间
* @return
*/
......@@ -315,11 +322,12 @@ public interface TaskListMapper {
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where 1= 1 and to_char(ISSUED_DATE,'yyyyMMdd')= #{date}\n" +
"order by group_no.GROUP_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_common1(@Param("date")String date );
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_common1(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 大批证
* 辅助库 大批证
*
* @param date 查询时间
* @return
*/
......@@ -334,7 +342,7 @@ public interface TaskListMapper {
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where 1= 1 and to_char(PRINT_OUT_DATE,'yyyyMMdd')= #{date}\n" +
"order by group_no.GROUP_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_common2(@Param("date")String date );
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_common2(@Param("date") String date);
// /**
// * 任务单查询历史
......@@ -357,13 +365,14 @@ public interface TaskListMapper {
/**
* 任务单查询历史
* 辅助库 大批证
* 辅助库 大批证
*
* @param date 查询时间
* @return
*/
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
"task.ISSUED_DATE,task.ISSUED_NAME,task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
"task.CONCORA_CRUSH_NAME,"+
"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" +
......@@ -372,11 +381,12 @@ public interface TaskListMapper {
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where 1= 1 and to_char(CONCORA_CRUSH_DATE,'yyyyMMdd')= #{date}\n" +
"order by group_no.GROUP_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_common4(@Param("date")String date );
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_common4(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 大批证
* 辅助库 大批证
*
* @param date 查询时间
* @return
*/
......@@ -391,11 +401,12 @@ public interface TaskListMapper {
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where 1= 1 and task.work_group =#{workGroup} and to_char(PUNCHING_DATE,'yyyyMMdd')= #{date}\n" +
"order by group_no.GROUP_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_common5(@Param("date")String date,@Param("workGroup")String workGroup );
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_common5(@Param("date") String date, @Param("workGroup") String workGroup);
/**
* 任务单查询历史
* 辅助库 大批证
* 辅助库 大批证
*
* @param date 查询时间
* @return
*/
......@@ -416,7 +427,7 @@ public interface TaskListMapper {
"TASK.PUNCHING_NAME, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT, \n" +
"group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO\n" +
"order by group_no.GROUP_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_common6(@Param("date")String date );
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_common6(@Param("date") String date);
// /**
// * 任务单查询历史
......@@ -445,10 +456,10 @@ public interface TaskListMapper {
// public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_common7(@Param("date")String date );
/**
* 任务单查询
* 辅助库、制证库 大批证
* 辅助库、制证库 大批证
*
* @param process 工序
* @return
*/
......@@ -478,12 +489,13 @@ public interface TaskListMapper {
"group by task.submit_date, task.task_id, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT, group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO, \n" +
"nvl(fc.faileCount,0),DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,DIC_UPLOAD_UNIT_T.UNIT_NAME,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) order by group_no.GROUP_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_common2(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
public List<Map<String, Object>> selectByCountyAtAuxiliary_common2(@Param("process") long process, @Param("process2") long process2, @Param("workGroup") long workGroup);
/**
* 任务单查询
* 辅助库、制证库 大批证
* 辅助库、制证库 大批证
*
* @param process 工序
* @return
*/
......@@ -516,12 +528,13 @@ public interface TaskListMapper {
"COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT, group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO, \n" +
"nvl(fc.faileCount,0), DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,DIC_UPLOAD_UNIT_T.UNIT_NAME, nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0), fc.faileCount,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) \n" +
"order by group_no.GROUP_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_common5(@Param("process") long process,@Param("process2") long process2);
public List<Map<String, Object>> selectByCountyAtAuxiliary_common5(@Param("process") long process, @Param("process2") long process2);
/**
* 任务单查询
* 辅助库、制证库 大批证
* 辅助库、制证库 大批证
*
* @param process 工序
* @return
*/
......@@ -546,12 +559,13 @@ public interface TaskListMapper {
"group by task.submit_date, task.task_id, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT, group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO, \n" +
"nvl(fc.faileCount,0),'000000000','000000000',nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),task.work_group,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) order by group_no.GROUP_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_common3(@Param("process") long process,@Param("process2") long process2);
public List<Map<String, Object>> selectByCountyAtAuxiliary_common3(@Param("process") long process, @Param("process2") long process2);
/**
* 任务单查询
* 辅助库 快证
* 辅助库 快证
*
* @param process 工序
* @return
*/
......@@ -565,11 +579,12 @@ public interface TaskListMapper {
"left join PRODYD_DBA.prod_card_t@PRODYD_LINK on SPECIAL_CARD.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <4 and FAILED_CARD.state != FAILED_CARD.INITIATOR group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID = #{process} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_fast(@Param("process") long process,@Param("process2") long process2);
public List<Map<String, Object>> selectByCountyAtAuxiliary_fast(@Param("process") long process, @Param("process2") long process2);
/**
* 任务单查询
* 辅助库 快证
* 辅助库 快证
*
* @param process 工序
* @return
*/
......@@ -582,11 +597,12 @@ public interface TaskListMapper {
"left join PRODYD_DBA.prod_card_t@PRODYD_LINK on SPECIAL_CARD.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <4 and FAILED_CARD.state != FAILED_CARD.INITIATOR group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID = #{process} and task.work_group = #{workGroup} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_fast9(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
public List<Map<String, Object>> selectByCountyAtAuxiliary_fast9(@Param("process") long process, @Param("process2") long process2, @Param("workGroup") long workGroup);
/**
* 任务单查询历史
* 辅助库 快证
* 辅助库 快证
*
* @return
*/
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
......@@ -600,11 +616,12 @@ public interface TaskListMapper {
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2" +
" and to_char(SUBMIT_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_fast0(@Param("date") String date);
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_fast0(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 快证
* 辅助库 快证
*
* @return
*/
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
......@@ -617,11 +634,12 @@ public interface TaskListMapper {
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2" +
" and to_char(ISSUED_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_fast1(@Param("date") String date);
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_fast1(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 快证
* 辅助库 快证
*
* @return
*/
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
......@@ -635,7 +653,7 @@ public interface TaskListMapper {
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2" +
" and to_char(PRINT_OUT_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_fast2(@Param("date") String date);
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_fast2(@Param("date") String date);
// /**
// * 任务单查询历史
......@@ -657,7 +675,8 @@ public interface TaskListMapper {
/**
* 任务单查询历史
* 辅助库 快证
* 辅助库 快证
*
* @return
*/
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
......@@ -671,11 +690,12 @@ public interface TaskListMapper {
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2" +
" and to_char(CONCORA_CRUSH_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_fast4(@Param("date") String date);
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_fast4(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 快证
* 辅助库 快证
*
* @return
*/
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
......@@ -687,12 +707,13 @@ public interface TaskListMapper {
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2 and task.work_group = #{workGroup}" +
" and to_char(PUNCHING_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_fast5(@Param("date") String date,@Param("workGroup")String workGroup);
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_fast5(@Param("date") String date, @Param("workGroup") String workGroup);
/**
* 任务单查询历史
* 辅助库 快证
* 辅助库 快证
*
* @return
*/
@Select("select nvl(sum(FINISH_COUNT),0) FINISH_COUNT, SORTING_DATE,SORTING_NAME, task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME, task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE, task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME, '快证' CARD_TYPE , '1' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME,1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from SPECIAL_CARD left join task on special_card.task_id= task.TASK_ID 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" +
......@@ -702,13 +723,13 @@ public interface TaskListMapper {
"task.POSITION_DATE, task.POSITION_NAME, task.CONCORA_CRUSH_DATE, task.CONCORA_CRUSH_NAME, TASK.PUNCHING_DATE, \n" +
"TASK.PUNCHING_NAME, '快证', '1', COUNTY_DIC.COUNTYNAME, 1, \n" +
"0, 0, SPECIAL_CARD.ACCEPT_NO order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_fast6(@Param("date") String date);
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_fast6(@Param("date") String date);
/**
* 任务单查询
* 辅助库、制证库 快证 分拣
* 辅助库、制证库 快证 分拣
*
* @param process 工序
* @return
*/
......@@ -726,17 +747,18 @@ public interface TaskListMapper {
// "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9) " +
"left join PRODYD_DBA.PROD_GROUP_T@PRODYD_LINK on PROD_GROUP_T.group_no =substr(prod_trace_t.ACCEPT_NO,0,8) " +
"left join PRODYD_DBA.PROD_GROUP_RELATION_T@PRODYD_LINK on PROD_GROUP_T.group_no = PROD_GROUP_RELATION_T.group_no " +
"left join ACCYD_DBA.DIC_UPLOAD_UNIT_T@ACCUYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12) "+
"left join ACCYD_DBA.DIC_UPLOAD_UNIT_T@ACCUYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12) " +
" left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no " +
"where SPECIAL_CARD.SPECIAL_TYPE =2 and task.work_group=#{workGroup} and task.TASK_STATE_ID =#{process}\n" +
"group by task.submit_date, SPECIAL_CARD.task_id, '快证', '1', COUNTY_DIC.COUNTY_CODE, \n" +
"COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
"nvl(fc.faileCount,0),DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,DIC_UPLOAD_UNIT_T.UNIT_NAME,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),prod_card_t.id_no,prod_card_t.name,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_fast2(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
public List<Map<String, Object>> selectByCountyAtAuxiliary_fast2(@Param("process") long process, @Param("process2") long process2, @Param("workGroup") long workGroup);
/**
* 任务单查询
* 辅助库、制证库 快证 分拣
* 辅助库、制证库 快证 分拣
*
* @param process 工序
* @return
*/
......@@ -759,7 +781,7 @@ public interface TaskListMapper {
"group by task.submit_date, SPECIAL_CARD.task_id, '快证', '1', COUNTY_DIC.COUNTY_CODE, \n" +
"COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
"nvl(fc.faileCount,0),DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,DIC_UPLOAD_UNIT_T.UNIT_NAME,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),prod_card_t.id_no,prod_card_t.name,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_fast5(@Param("process") long process,@Param("process2") long process2);
public List<Map<String, Object>> selectByCountyAtAuxiliary_fast5(@Param("process") long process, @Param("process2") long process2);
// /**
......@@ -790,7 +812,8 @@ public interface TaskListMapper {
/**
* 任务单查询
* 辅助库、制证库 快证 电写入
* 辅助库、制证库 快证 电写入
*
* @param process 工序
* @return
*/
......@@ -813,13 +836,13 @@ public interface TaskListMapper {
"where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID =#{process} \n" +
"group by task.submit_date, SPECIAL_CARD.task_id, '快证', '1', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),DIC_UPLOAD_UNIT_T.UNIT_NAME,0 \n" +
",task.work_group,prod_card_t.id_no,prod_card_t.name,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_fast4(@Param("process") long process,@Param("process2") long process2);
public List<Map<String, Object>> selectByCountyAtAuxiliary_fast4(@Param("process") long process, @Param("process2") long process2);
/**
* 循环单查询
* 辅助库 余证
* 辅助库 余证
*
* @param process 工序
* @return
*/
......@@ -832,11 +855,12 @@ public interface TaskListMapper {
"left join PRODYD_DBA.prod_card_t@PRODYD_LINK on SPECIAL_CARD.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <4 and FAILED_CARD.state != FAILED_CARD.INITIATOR group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 and task.TASK_STATE_ID = #{process} and task.work_group = #{workGroup} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind9(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
public List<Map<String, Object>> selectByCountyAtAuxiliary_remaind9(@Param("process") long process, @Param("process2") long process2, @Param("workGroup") long workGroup);
/**
* 循环单查询
* 辅助库 余证
* 辅助库 余证
*
* @param process 工序
* @return
*/
......@@ -849,12 +873,13 @@ public interface TaskListMapper {
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <4 and FAILED_CARD.state != FAILED_CARD.INITIATOR group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 and task.TASK_STATE_ID = #{process} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind(@Param("process") long process,@Param("process2") long process2);
public List<Map<String, Object>> selectByCountyAtAuxiliary_remaind(@Param("process") long process, @Param("process2") long process2);
/**
* 循环单查询
* 辅助库 废证
* 辅助库 废证
*
* @param process2 工序
* @return
*/
......@@ -867,7 +892,7 @@ public interface TaskListMapper {
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where FAILED_CARD.state =#{process2} and FAILED_CARD.work_group = #{workGroup} " +
"and FAILED_CARD.state != FAILED_CARD.INITIATOR order by FAILED_CARD.FAILED_CARD_ID")
public List<Map<String,Object>> selectByCountyAtAuxiliary_failed4(@Param("process2") long process2,@Param("workGroup") long workGroup);
public List<Map<String, Object>> selectByCountyAtAuxiliary_failed4(@Param("process2") long process2, @Param("workGroup") long workGroup);
// /**
// * 循环单查询
......@@ -888,7 +913,8 @@ public interface TaskListMapper {
/**
* 任务单查询历史
* 辅助库 余证
* 辅助库 余证
*
* @param
* @return
*/
......@@ -903,11 +929,12 @@ public interface TaskListMapper {
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 " +
" and to_char(SUBMIT_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind0(@Param("date") String date);
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_remaind0(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 余证
* 辅助库 余证
*
* @param
* @return
*/
......@@ -921,11 +948,12 @@ public interface TaskListMapper {
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 " +
" and to_char(ISSUED_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind1(@Param("date") String date);
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_remaind1(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 余证
* 辅助库 余证
*
* @return
*/
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
......@@ -939,11 +967,12 @@ public interface TaskListMapper {
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 " +
" and to_char(PRINT_OUT_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind2(@Param("date") String date);
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_remaind2(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 废证
* 辅助库 废证
*
* @return
*/
@Select("select NVL(FAILED_CARD.work_group,TASK.work_group) work_group,FAILED_CARD.FAILED_CARD_ID task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
......@@ -953,7 +982,7 @@ public interface TaskListMapper {
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE \n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where to_char(FAILED_CARD.PRINT_DATE,'yyyyMMdd') = #{date} order by FAILED_CARD.FAILED_CARD_ID")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed2(@Param("date") String date);
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_failed2(@Param("date") String date);
// /**
......@@ -992,7 +1021,8 @@ public interface TaskListMapper {
/**
* 任务单查询历史
* 辅助库 余证
* 辅助库 余证
*
* @return
*/
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
......@@ -1006,12 +1036,13 @@ public interface TaskListMapper {
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 " +
" and to_char(CONCORA_CRUSH_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind4(@Param("date") String date);
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_remaind4(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 废证
* 辅助库 废证
*
* @return
*/
@Select("select FAILED_CARD.work_group,FAILED_CARD.FAILED_CARD_ID task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
......@@ -1023,12 +1054,13 @@ public interface TaskListMapper {
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE \n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where to_char(FAILED_CARD.POSITION_DATE,'yyyyMMdd') = #{date} and FAILED_CARD.work_group =#{workGroup} order by FAILED_CARD.FAILED_CARD_ID")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed4(@Param("date") String date,@Param("workGroup") String workGroup);
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_failed4(@Param("date") String date, @Param("workGroup") String workGroup);
/**
* 任务单查询历史
* 辅助库 余证
* 辅助库 余证
*
* @return
*/
@Select("select task.work_group,task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
......@@ -1040,11 +1072,12 @@ public interface TaskListMapper {
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 and task.work_group =#{workGroup} " +
" and to_char(PUNCHING_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind5(@Param("date") String date,@Param("workGroup") String workGroup);
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_remaind5(@Param("date") String date, @Param("workGroup") String workGroup);
/**
* 任务单查询历史
* 辅助库 废证
* 辅助库 废证
*
* @return
*/
@Select("select FAILED_CARD.work_group,FAILED_CARD.FAILED_CARD_ID task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
......@@ -1056,11 +1089,12 @@ public interface TaskListMapper {
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE \n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where to_char(FAILED_CARD.FINISH_DATE,'yyyyMMdd') = #{date} and FAILED_CARD.work_group =#{workGroup} order by FAILED_CARD.FAILED_CARD_ID")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed5(@Param("date") String date,@Param("workGroup") String workGroup);
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_failed5(@Param("date") String date, @Param("workGroup") String workGroup);
/**
* 任务单查询历史
* 辅助库 废证
* 辅助库 废证
*
* @return
*/
@Select("select 1 FINISH_COUNT, sysdate SORTING_DATE,'' SORTING_NAME, FAILED_CARD.FAILED_CARD_ID task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
......@@ -1072,12 +1106,13 @@ public interface TaskListMapper {
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE \n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where to_char(FAILED_CARD.ALLOT_DATE,'yyyyMMdd') = #{date} order by FAILED_CARD.FAILED_CARD_ID")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed6(@Param("date") String date);
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_failed6(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 余证
* 辅助库 余证
*
* @return
*/
@Select("select nvl(sum(FINISH_COUNT),0) FINISH_COUNT, SORTING_DATE,SORTING_NAME, task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME, task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE, task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME, '余证' CARD_TYPE , '99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME,1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO \n" +
......@@ -1090,12 +1125,13 @@ public interface TaskListMapper {
"task.POSITION_DATE, task.POSITION_NAME, task.CONCORA_CRUSH_DATE, task.CONCORA_CRUSH_NAME, TASK.PUNCHING_DATE, \n" +
"TASK.PUNCHING_NAME, '余证', '99', COUNTY_DIC.COUNTYNAME, 1, \n" +
"0, 0, SPECIAL_CARD.ACCEPT_NO order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind6(@Param("date") String date);
public List<Map<String, Object>> selectHistoryTaskAtAuxiliary_remaind6(@Param("date") String date);
/**
* 任务单查询
* 辅助库、制证库 余证
* 辅助库、制证库 余证
*
* @param process 工序
* @return
*/
......@@ -1113,18 +1149,19 @@ public interface TaskListMapper {
// "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)" +
"left join PRODYD_DBA.PROD_GROUP_T@PRODYD_LINK on PROD_GROUP_T.group_no =substr(prod_trace_t.ACCEPT_NO,0,8) " +
"left join PRODYD_DBA.PROD_GROUP_RELATION_T@PRODYD_LINK on PROD_GROUP_T.group_no = PROD_GROUP_RELATION_T.group_no " +
"left join ACCYD_DBA.DIC_UPLOAD_UNIT_T@ACCUYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12) "+
"left join ACCYD_DBA.DIC_UPLOAD_UNIT_T@ACCUYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12) " +
" left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no " +
" where SPECIAL_CARD.SPECIAL_TYPE =1 and task.work_group=#{workGroup} and task.TASK_STATE_ID =#{process} " +
"group by task.submit_date, SPECIAL_CARD.task_id, '余证', '99', COUNTY_DIC.COUNTY_CODE, \n" +
"COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
"nvl(fc.faileCount,0),DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,DIC_UPLOAD_UNIT_T.UNIT_NAME,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),prod_card_t.id_no,prod_card_t.name,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind2(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
public List<Map<String, Object>> selectByCountyAtAuxiliary_remaind2(@Param("process") long process, @Param("process2") long process2, @Param("workGroup") long workGroup);
/**
* 任务单查询
* 辅助库、制证库 余证
* 辅助库、制证库 余证
*
* @param process 工序
* @return
*/
......@@ -1148,7 +1185,7 @@ public interface TaskListMapper {
"group by task.submit_date, SPECIAL_CARD.task_id, '余证', '99', COUNTY_DIC.COUNTY_CODE, \n" +
"COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
"nvl(fc.faileCount,0),DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,DIC_UPLOAD_UNIT_T.UNIT_NAME,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),prod_card_t.id_no,prod_card_t.name,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind5(@Param("process") long process,@Param("process2") long process2);
public List<Map<String, Object>> selectByCountyAtAuxiliary_remaind5(@Param("process") long process, @Param("process2") long process2);
//
// /**
......@@ -1180,7 +1217,8 @@ public interface TaskListMapper {
/**
* 任务单查询
* 辅助库、制证库 余证 膜打印
* 辅助库、制证库 余证 膜打印
*
* @param process 工序
* @return
*/
......@@ -1203,14 +1241,13 @@ public interface TaskListMapper {
"where SPECIAL_CARD.SPECIAL_TYPE =1 and task.TASK_STATE_ID =#{process} \n" +
"group by task.submit_date, SPECIAL_CARD.task_id, '余证', '99', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),DIC_UPLOAD_UNIT_T.UNIT_NAME,0 \n" +
",task.work_group,prod_card_t.id_no,prod_card_t.name,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind4(@Param("process") long process,@Param("process2") long process2);
public List<Map<String, Object>> selectByCountyAtAuxiliary_remaind4(@Param("process") long process, @Param("process2") long process2);
/**
* 任务单查询
* 辅助库、制证库 废证
* 辅助库、制证库 废证
*
* @param process 工序
* @return
*/
......@@ -1229,16 +1266,17 @@ public interface TaskListMapper {
// "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)\n" +
"left join PRODYD_DBA.PROD_GROUP_T@PRODYD_LINK on PROD_GROUP_T.group_no =substr(prod_trace_t.ACCEPT_NO,0,8) " +
"left join PRODYD_DBA.PROD_GROUP_RELATION_T@PRODYD_LINK on PROD_GROUP_T.group_no = PROD_GROUP_RELATION_T.group_no " +
"left join ACCYD_DBA.DIC_UPLOAD_UNIT_T@ACCUYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12) "+
"left join ACCYD_DBA.DIC_UPLOAD_UNIT_T@ACCUYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12) " +
"where FAILED_CARD.STATE =#{process} and FAILED_CARD.work_group=#{workGroup} and FAILED_CARD.STATE!=FAILED_CARD.INITIATOR \n" +
"group by 0, DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO, DIC_UPLOAD_UNIT_T.UNIT_NAME, task.submit_date, FAILED_CARD.failed_card_id, \n" +
"'废证', '100', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, FAILED_CARD.ACCEPT_NO, 0,prod_card_t.id_no,prod_card_t.name,decode(ALLOT_DATE,null,decode(FINISH_DATE,null,decode(FAILED_CARD.POSITION_DATE,null,decode(PRINT_DATE,null,FAILED_CARD.SUBMIT_DATE,PRINT_DATE),FAILED_CARD.POSITION_DATE),FINISH_DATE),ALLOT_DATE) \n" +
"order by FAILED_CARD.FAILED_CARD_ID")
public List<Map<String,Object>> selectByCountyAtAuxiliary_failed2(@Param("process") long process,@Param("workGroup") long workGroup);
public List<Map<String, Object>> selectByCountyAtAuxiliary_failed2(@Param("process") long process, @Param("workGroup") long workGroup);
/**
* 任务单查询
* 辅助库、制证库 废证
* 辅助库、制证库 废证
*
* @param process 工序
* @return
*/
......@@ -1262,12 +1300,13 @@ public interface TaskListMapper {
"group by 0, DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO, DIC_UPLOAD_UNIT_T.UNIT_NAME, task.submit_date, FAILED_CARD.failed_card_id, \n" +
"'废证', '100', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, FAILED_CARD.ACCEPT_NO, 0,prod_card_t.id_no,prod_card_t.name,decode(ALLOT_DATE,null,decode(FINISH_DATE,null,decode(FAILED_CARD.POSITION_DATE,null,decode(PRINT_DATE,null,FAILED_CARD.SUBMIT_DATE,PRINT_DATE),FAILED_CARD.POSITION_DATE),FINISH_DATE),ALLOT_DATE) \n" +
"order by FAILED_CARD.FAILED_CARD_ID")
public List<Map<String,Object>> selectByCountyAtAuxiliary_failed5(@Param("process") long process);
public List<Map<String, Object>> selectByCountyAtAuxiliary_failed5(@Param("process") long process);
/**
* 任务单查询
* 辅助库、制证库 废证 膜打印
* 辅助库、制证库 废证 膜打印
*
* @param process 工序
* @return
*/
......@@ -1287,95 +1326,103 @@ public interface TaskListMapper {
"group by 0, substr(prod_card_t.upload_no,0,9), DIC_UPLOAD_UNIT_T.UNIT_NAME, task.submit_date, FAILED_CARD.failed_card_id, \n" +
"'废证', '100', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, FAILED_CARD.ACCEPT_NO, 0\n" +
",NVL(FAILED_CARD.work_group,TASK.work_group) ,prod_card_t.id_no,prod_card_t.name,decode(ALLOT_DATE,null,decode(FINISH_DATE,null,decode(FAILED_CARD.POSITION_DATE,null,decode(PRINT_DATE,null,FAILED_CARD.SUBMIT_DATE,PRINT_DATE),FAILED_CARD.POSITION_DATE),FINISH_DATE),ALLOT_DATE) order by FAILED_CARD.FAILED_CARD_ID")
public List<Map<String,Object>> selectByCountyAtAuxiliary_failed3(@Param("process") long process);
public List<Map<String, Object>> selectByCountyAtAuxiliary_failed3(@Param("process") long process);
/**
*按时间、区、派出所查询受理库数据
* 按时间、区、派出所查询受理库数据
*
* @param submitDate
* @param countyCode
* @param Gajg
* @return
*/
@Select("SELECT act.ACCEPT_NO, agt.deal_flag, gajg.gajg_mc, gajg.UPLOAD_UNIT_NO GAJG_DM, coun.COUNTYNAME,agt.group_no\n" +
" FROM ACCYD_DBA.ACC_CARD_T@ACCUYD_LINK act \n"+
" FROM ACCYD_DBA.ACC_CARD_T@ACCUYD_LINK act \n" +
" LEFT JOIN COUNTY_DIC coun on substr(act.upload_no,0,6) = coun.county_code " +
" LEFT JOIN ACCYD_DBA.ACC_GROUP_T@ACCUYD_LINK agt on substr(act.accept_no,0,8) = agt.group_no \n" +
" LEFT JOIN PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK gajg on substr(act.upload_no,0,9) = subStr(gajg.UPLOAD_UNIT_NO,0,9) \n"+
" LEFT JOIN PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK gajg on substr(act.upload_no,0,9) = subStr(gajg.UPLOAD_UNIT_NO,0,9) \n" +
" WHERE agt.group_no not in (select GROUP_NO.group_no from GROUP_NO) " +
" and to_char(IMPORT_TIME,'yyyymmdd') = #{submitDate} " +
" and subStr(gajg.UPLOAD_UNIT_NO,0,9) = #{Gajg} " +
" and coun.county_code = #{countyCode}")
public List<TaskListEntity> selectACCU(@Param("submitDate") String submitDate,@Param("countyCode") String countyCode,@Param("Gajg_dm") String Gajg);
public List<TaskListEntity> selectACCU(@Param("submitDate") String submitDate, @Param("countyCode") String countyCode, @Param("Gajg_dm") String Gajg);
/**
*更改任务单状态
* 更改任务单状态
* 下发
*
* @param taskId
* @return
*/
@Update("UPDATE TASK SET TASK_STATE_ID=#{process},ISSUED_NAME=#{name} ,work_group = #{workGroup} WHERE TASK_ID = #{taskId} ")
public boolean updateState1(@Param("taskId") String taskId,@Param("process") String process,@Param("name") String name,@Param("workGroup") String workGroup);
public boolean updateState1(@Param("taskId") String taskId, @Param("process") String process, @Param("name") String name, @Param("workGroup") String workGroup);
/**
*更改任务单状态
* 更改任务单状态
* 膜打印
*
* @param taskId
* @return
*/
@Update("UPDATE TASK SET TASK_STATE_ID=#{process},PRINT_OUT_NAME=#{name} WHERE TASK_ID = #{taskId} ")
public boolean updateState2(@Param("taskId") String taskId,@Param("process") String process,@Param("name") String name);
public boolean updateState2(@Param("taskId") String taskId, @Param("process") String process, @Param("name") String name);
/**
*更改任务单状态
* 更改任务单状态
* 预订位
*
* @param taskId
* @return
*/
@Update("UPDATE TASK SET TASK_STATE_ID=#{process},POSITION_NAME=#{name} WHERE TASK_ID = #{taskId} ")
public boolean updateState3(@Param("taskId") String taskId,@Param("process") String process,@Param("name") String name);
public boolean updateState3(@Param("taskId") String taskId, @Param("process") String process, @Param("name") String name);
/**
*更改任务单状态
* 更改任务单状态
* 平压
*
* @param taskId
* @return
*/
@Update("UPDATE TASK SET TASK_STATE_ID=#{process},CONCORA_CRUSH_NAME=#{name} WHERE TASK_ID = #{taskId} ")
public boolean updateState4(@Param("taskId") String taskId,@Param("process") String process,@Param("name") String name);
public boolean updateState4(@Param("taskId") String taskId, @Param("process") String process, @Param("name") String name);
/**
*更改任务单状态
* 更改任务单状态
* 冲切
*
* @param taskId
* @return
*/
@Update("UPDATE TASK SET TASK_STATE_ID=#{process},PUNCHING_NAME=#{name} WHERE TASK_ID = #{taskId} ")
public boolean updateState5(@Param("taskId") String taskId,@Param("process") String process,@Param("name") String name);
public boolean updateState5(@Param("taskId") String taskId, @Param("process") String process, @Param("name") String name);
/**
*更改任务单状态
* 更改任务单状态
* 分拣
*
* @param taskId
* @return
*/
@Update("UPDATE TASK SET TASK_STATE_ID=#{process},SORTING_NAME=#{name} WHERE TASK_ID = #{taskId} ")
public boolean updateState6(@Param("taskId") String taskId,@Param("process") String process,@Param("name") String name);
public boolean updateState6(@Param("taskId") String taskId, @Param("process") String process, @Param("name") String name);
/**
*更改任务单状态
* 更改任务单状态
* 交接
*
* @param taskId
* @return
*/
@Update("UPDATE TASK SET TASK_STATE_ID=#{process},CONNECT_NAME=#{name} WHERE TASK_ID = #{taskId} ")
public boolean updateState7(@Param("taskId") String taskId,@Param("process") String process,@Param("name") String name);
public boolean updateState7(@Param("taskId") String taskId, @Param("process") String process, @Param("name") String name);
/**
*查询快证是否存在受理库
* 查询快证是否存在受理库
*
* @param groupNo
* @return
*/
......@@ -1387,17 +1434,20 @@ public interface TaskListMapper {
"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 ACC_GROUP_T.deal_flag =3 and ACC_GROUP_T.group_no not in (select group_no from group_no) \n" +
"and ACC_GROUP_T.group_no =#{groupNo}")
public List<Map<String,Object>> selectFastCardAtACCU(@Param("groupNo") String groupNo);
public List<Map<String, Object>> selectFastCardAtACCU(@Param("groupNo") String groupNo);
/**
* 查询任务单详情
*
* @param taskId
* @return
*/
@Select("select * from task where task_ID = #{taskId}")
public List<TaskEntity> selectTaskEntityByTaskId(long taskId);
/**
* 查询制证类型列表
*
* @return
*/
@Select("SELECT * FROM CARD_TYPE_DIC")
......@@ -1414,7 +1464,7 @@ public interface TaskListMapper {
@Select("SELECT SUM(GROUP_NO.VALID_COUNT) \n" +
"FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
"WHERE TO_CHAR(TASK.SUBMIT_DATE,'yyyy-MM-dd')=#{date}")
public String selectCountSubmit2(@Param("date")String date);
public String selectCountSubmit2(@Param("date") String date);
//下发任务单查询历史总数
......@@ -1427,7 +1477,7 @@ public interface TaskListMapper {
@Select("SELECT SUM(GROUP_NO.VALID_COUNT) \n" +
"FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
"WHERE TO_CHAR(TASK.ISSUED_DATE,'yyyy-MM-dd')=#{date}")
public String selectCountIssue2(@Param("date")String date);
public String selectCountIssue2(@Param("date") String date);
//打印转出查询历史总数
......@@ -1440,7 +1490,7 @@ public interface TaskListMapper {
@Select("SELECT SUM(GROUP_NO.VALID_COUNT) \n" +
"FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
"WHERE TO_CHAR(TASK.PRINT_OUT_DATE,'yyyy-MM-dd')=#{date}")
public String selectCountPrintOut2(@Param("date")String date);
public String selectCountPrintOut2(@Param("date") String date);
//预定位查询历史总数
......@@ -1453,7 +1503,7 @@ public interface TaskListMapper {
@Select("SELECT SUM(GROUP_NO.VALID_COUNT) \n" +
"FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
"WHERE TO_CHAR(TASK.POSITION_DATE,'yyyy-MM-dd')=#{date}")
public String selectCountPosition2(@Param("date")String date);
public String selectCountPosition2(@Param("date") String date);
//平压查询历史总数
......@@ -1466,8 +1516,7 @@ public interface TaskListMapper {
@Select("SELECT SUM(GROUP_NO.VALID_COUNT) \n" +
"FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
"WHERE TO_CHAR(TASK.CONCORA_CRUSH_DATE,'yyyy-MM-dd')=#{date}")
public String selectCountConcora2(@Param("date")String date);
public String selectCountConcora2(@Param("date") String date);
//电写查询历史总数
......@@ -1480,8 +1529,7 @@ public interface TaskListMapper {
@Select("SELECT SUM(GROUP_NO.VALID_COUNT) \n" +
"FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
"WHERE TO_CHAR(TASK.PUNCHING_DATE,'yyyy-MM-dd')=#{date}")
public String selectCountPunching2(@Param("date")String date);
public String selectCountPunching2(@Param("date") String date);
//分拣查询历史总数
......@@ -1494,8 +1542,7 @@ public interface TaskListMapper {
@Select("SELECT SUM(GROUP_NO.VALID_COUNT) \n" +
"FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
"WHERE TO_CHAR(TASK.SORTING_DATE,'yyyy-MM-dd')=#{date}")
public String selectCountSorting2(@Param("date")String date);
public String selectCountSorting2(@Param("date") String date);
//人工质检查询历史总数
......@@ -1508,14 +1555,14 @@ public interface TaskListMapper {
@Select("SELECT SUM(GROUP_NO.VALID_COUNT) \n" +
"FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
"WHERE TO_CHAR(TASK.QUALITY_TEST_DATE,'yyyy-MM-dd')=#{date}")
public String selectCountQuality2(@Param("date")String date);
public String selectCountQuality2(@Param("date") String date);
@Select("select sum(asum) bsum,sum(bsum) asum from (select sum(decode(TASK.WORK_GROUP,1,0,valid_count)) asum,sum(decode(TASK.WORK_GROUP,2,0,valid_count)) bsum from TASK left join GROUP_NO on GROUP_NO.TASK_ID = TASK.TASK_ID\n" +
"where to_char(ISSUED_DATE,'yyyyMMdd') = to_char(sysdate,'yyyyMMdd')\n" +
"UNION all\n" +
"select sum(decode(TASK.WORK_GROUP,1,0,1)) bsum,sum(decode(TASK.WORK_GROUP,2,0,1)) asum from SPECIAL_CARD left join TASK on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" +
"where to_char(ISSUED_DATE,'yyyyMMdd') = to_char(sysdate,'yyyyMMdd'))")
public List<Map<String,Object>> getPrintOutCount();
public List<Map<String, Object>> getPrintOutCount();
@Select("SELECT CARD_TYPE,CARD_TYPE_ID,SUM(valid_count) valid_count, failed_count,PRINT_OUT_DATE FROM (select GROUP_NO.GROUP_NO,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,decode(group_no.valid_count,null,1,GROUP_NO.VALID_COUNT) valid_count ,\n" +
"failed_info.failed_count,to_char(PRINT_OUT_DATE,'yyyyMMdd') PRINT_OUT_DATE\n" +
......@@ -1531,7 +1578,7 @@ public interface TaskListMapper {
"group by task.task_id, GROUP_NO.GROUP_NO,task.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE, failed_info.failed_count, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"decode(group_no.valid_count,null,1,GROUP_NO.VALID_COUNT), to_char(PRINT_OUT_DATE,'yyyyMMdd')) \n" +
"group by CARD_TYPE, CARD_TYPE_ID, failed_count, PRINT_OUT_DATE")
public List<Map<String, Object>> selectFilmReport(@Param("startDate")String startDate,@Param("endDate") String endDate);
public List<Map<String, Object>> selectFilmReport(@Param("startDate") String startDate, @Param("endDate") String endDate);
// @Select("SELECT CARD_TYPE,CARD_TYPE_ID,SUM(valid_count) valid_count , failed_count,PUNCHING_DATE FROM (select CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,decode(group_no.valid_count,null,1,GROUP_NO.VALID_COUNT) valid_count ,\n" +
// "failed_info.failed_count,to_char(PUNCHING_DATE,'yyyyMMdd') PUNCHING_DATE\n" +
......@@ -1563,19 +1610,20 @@ public interface TaskListMapper {
" where to_char(punching_date,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} and task.WORK_GROUP = #{workGroup} \n" +
" group by task.TASK_ID, card_type, to_char(punching_date,'yyyyMMdd'), work_group, FAILED_CARD.failed_count\n" +
" ) a group by a.card_type, a.finish_date, a.work_group")
public List<Map<String, Object>> selectWorkGroupReport(@Param("startDate")String startDate,@Param("endDate") String endDate,@Param("workGroup") String workGroup);
public List<Map<String, Object>> selectWorkGroupReport(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("workGroup") String workGroup);
@Select("select to_char(FINISH_DATE,'yyyyMMdd')FINISH_DATE,WORK_GROUP,count(FAILED_CARD.accept_no) failed_count \n" +
"from FAILED_CARD \n" +
"where to_char(FINISH_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} and WORK_GROUP = #{workGroup}\n" +
"group by to_char(FINISH_DATE,'yyyyMMdd'),WORK_GROUP")
public List<Map<String, Object>> selectWorkGroupReportBu(@Param("startDate")String startDate,@Param("endDate") String endDate,@Param("workGroup") String workGroup);
public List<Map<String, Object>> selectWorkGroupReportBu(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("workGroup") String workGroup);
@Update("update task set work_group = ${workGroup} where TASK_ID = ${taskId}")
public boolean updateWorkGroup(@Param("taskId")String taskId,@Param("workGroup") long workGroup);
public boolean updateWorkGroup(@Param("taskId") String taskId, @Param("workGroup") long workGroup);
/**
* 查询余证详情
*
* @param date 时间
* @param name 提交人
* @return
......@@ -1587,28 +1635,30 @@ public interface TaskListMapper {
"where to_char(SPECIAL_CARD.FILL_IN_DATE,'yyyyMMdd') = ${date} \n" +
"and SPECIAL_CARD.SPECIAL_TYPE=1 and SPECIAL_CARD.INITIATOR =#{name} " +
"order by SPECIAL_CARD.accept_no")
public List<Map<String, Object>> selectRemainderCardInfo(@Param("date")String date, @Param("name")String name);
public List<Map<String, Object>> selectRemainderCardInfo(@Param("date") String date, @Param("name") String name);
@Update("update failed_card set work_group = ${workGroup} where failed_card_ID = ${taskId}")
public boolean updateFailedCardWorkGroup(@Param("taskId")String taskId,@Param("workGroup") long workGroup);
public boolean updateFailedCardWorkGroup(@Param("taskId") String taskId, @Param("workGroup") long workGroup);
/**
* 查询重做返回登记证件
*
* @param startDate 查询登记起始时间
* @param endDate 查询登记结束时间
* @param endDate 查询登记结束时间
* @return
*/
@Select("select * from task left join group_no on task.task_id = group_no.task_id" +
" left join TASK_STATE_DIC on task.TASK_STATE_ID=TASK_STATE_DIC.TASK_STATE_ID where card_type = 2 and to_char(submit_date,'yyyyMMdd') between #{startDate} and #{endDate} order by task.task_id")
public List<Map<String, Object>> selectRedoTask(@Param("startDate")String startDate,@Param("endDate") String endDate);
public List<Map<String, Object>> selectRedoTask(@Param("startDate") String startDate, @Param("endDate") String endDate);
/**
* 删除重做返回任务单
*
* @param taskId 任务单编号
* @return
*/
@Delete("delete task where task_id = ${taskId}")
public boolean deleteTaskByTaskId(@Param("taskId")long taskId);
public boolean deleteTaskByTaskId(@Param("taskId") long taskId);
@Select("select * from (\n" +
" select \n" +
......@@ -1655,31 +1705,41 @@ public interface TaskListMapper {
" group by to_char(FINISH_DATE,'yyyyMMdd') ) c\n" +
" on a.finish_date=c.finish_date" +
" order by a.finish_date")
public List<Map<String, Object>> selectQualityCheckReport(@Param("startDate")String startDate,@Param("endDate") String endDate);
public List<Map<String, Object>> selectQualityCheckReport(@Param("startDate") String startDate, @Param("endDate") String endDate);
@Select("select to_char(FINISH_DATE,'yyyyMMdd')FINISH_DATE,count(FAILED_CARD.accept_no) failed_count \n" +
"from FAILED_CARD \n" +
"where to_char(FINISH_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} \n" +
"group by to_char(FINISH_DATE,'yyyyMMdd')")
public List<Map<String, Object>> selectQualityCheckReportBu(@Param("startDate")String startDate,@Param("endDate") String endDate);
public List<Map<String, Object>> selectQualityCheckReportBu(@Param("startDate") String startDate, @Param("endDate") String endDate);
@Select("SELECT * FROM POLICE_DIC")
public List<Map<String,Object>> selectPoliceList();
public List<Map<String, Object>> selectPoliceList();
@Select("SELECT * FROM POLICE_DIC WHERE POLICE_CODE like #{policeCode} OR POLICE_NAME LIKE #{policeCode}")
public List<Map<String,Object>> selectPoliceListByPoliceCode(@Param("policeCode") String policeCode);
public List<Map<String, Object>> selectPoliceListByPoliceCode(@Param("policeCode") String policeCode);
@Insert("INSERT INTO POLICE_DIC (POLICE_CODE,POLICE_NAME) VALUES (#{policeCode},#{policeName})")
public boolean insertPolice(@Param("policeCode") String policeCode,@Param("policeName") String policeName);
public boolean insertPolice(@Param("policeCode") String policeCode, @Param("policeName") String policeName);
@Update("UPDATE POLICE_DIC SET POLICE_NAME = #{policeName},POLICE_CODE = #{newPoliceCode} WHERE POLICE_CODE = #{policeCode}")
public boolean updatePolice(@Param("policeCode") String policeCode,@Param("policeName") String policeName,@Param("newPoliceCode") String newPoliceCode);
public boolean updatePolice(@Param("policeCode") String policeCode, @Param("policeName") String policeName, @Param("newPoliceCode") String newPoliceCode);
@Delete("DELETE FROM POLICE_DIC WHERE POLICE_CODE = #{policeCode}")
public boolean deletePolice(String policeCode);
boolean deletePolice(String policeCode);
@Update("UPDATE DATA_AUDITING SET TASK_ID = #{newTaskId} WHERE TASK_ID = #{oldTaskId} ")
public boolean updateTaskIdInDataAuditing (@Param("newTaskId")long newTaskId,@Param("oldTaskId")long oldTaskId);
boolean updateTaskIdInDataAuditing(@Param("newTaskId") long newTaskId, @Param("oldTaskId") long oldTaskId);
@Select(" SELECT ID_CARD, APPLICANT_NAME, RECIPIENT_PHONE, RECIPIENT_ADDRESS " +
" FROM PERSON_POST person " +
" WHERE person.FIRST_WHITE IN ( " +
" SELECT UPLOAD_NO FROM PRODYD_DBA.PROD_CARD_T@PRODYD_LINK prod_card_t " +
" WHERE SUBSTR(prod_card_t.ACCEPT_NO, 1, 8) IN ( " +
" SELECT GROUP_NO FROM GROUP_NO WHERE TASK_ID IN ( " +
" SELECT TASK_ID FROM TASK task " +
" WHERE TO_CHAR(task.SUBMIT_DATE, 'yyyy-MM-dd') = #{taskDate} " +
" AND task.CARD_TYPE = 9 )))")
List<Map<String, Object>> exportPostPersonInfo(@Param("taskDate") String taskDate);
}
src/main/java/com/yxproject/start/service/GroupNoService.java
View file @ 84bddbc4
......@@ -2,7 +2,6 @@ package com.yxproject.start.service;
import com.yxproject.start.entity.GroupNoEntity;
import javax.jws.Oneway;
import java.util.List;
import java.util.Map;
......@@ -11,9 +10,9 @@ import java.util.Map;
* 2019/3/6 21:12
*/
public interface GroupNoService {
public boolean saveGroupNo(GroupNoEntity groupNoEntity);
public List<GroupNoEntity> selectGroupNoEntityByGroupNo(String groupNo);
public boolean updateGroupNoSpecialCount(GroupNoEntity groupNoEntity);
public int selectGroupCount(long TaskId);
public List<Map<String, Object>> selectAcceptNo(String cardId);
boolean saveGroupNo(GroupNoEntity groupNoEntity);
List<GroupNoEntity> selectGroupNoEntityByGroupNo(String groupNo);
boolean updateGroupNoSpecialCount(GroupNoEntity groupNoEntity);
int selectGroupCount(long TaskId);
List<Map<String, Object>> selectAcceptNo(String cardId);
}
src/main/java/com/yxproject/start/service/LogService.java
View file @ 84bddbc4
......@@ -26,7 +26,7 @@ public interface LogService {
public boolean insertAnalysisDate(String printDate,String fileId);
public boolean changeCardTypeByPrintDate(String analysisDate, String printDate);
boolean changeCardTypeByPrintDate(String analysisDate, String printDate);
public boolean deleteFilesData(@Param("id")String id);
......@@ -34,7 +34,7 @@ public interface LogService {
public List<String> selectId(@Param("uploadTime")String uploadTime);
public boolean insertIntoAnalysis(@Param("fileDic")String fileDic,@Param("fileId")String fileId,@Param("commonCardCount")String commonCardCount,@Param("postCardCount")String postCardCount,@Param("analysisDate")String analysisDate);
boolean insertIntoAnalysis(@Param("fileDic") String fileDic, @Param("fileId") String fileId, @Param("commonCardCount") String commonCardCount, @Param("postCardCount") String postCardCount, @Param("analysisDate") String analysisDate);
List<Map<String,Object>> selectFileIdByUploadDate(@Param("uploadDate") String uploadDate);
......
src/main/java/com/yxproject/start/service/TaskListService.java
View file @ 84bddbc4
......@@ -8,6 +8,7 @@ import com.yxproject.start.entity.TaskList.CountGajgEntity;
import com.yxproject.start.entity.TaskList.TaskListEntity;
import org.apache.ibatis.annotations.Param;
import java.io.IOException;
import java.util.List;
import java.util.Map;
......@@ -27,9 +28,9 @@ public interface TaskListService {
public Map<String ,Object> selectByGroupNoAtACCU(String date, String typeCode, String countyCode,long currPage, long pageSize);
public List<Object> selectByCountyAtAuxiliary(long process);
List<Object> selectByCountyAtAuxiliary(long process);
public List selectHistoryTaskAtAuxiliary(long process,String date,String workGroup);
List selectHistoryTaskAtAuxiliary(long process, String date, String workGroup);
public List selectHistoryTaskAtAuxiliary2(String date);
......@@ -127,4 +128,6 @@ public interface TaskListService {
public boolean deletePolice(String policeCode);
public boolean updateTaskIdInDataAuditing (long newTaskId,long oldTaskId);
String exportPostPersonInfo(String taskDate) throws IOException;
}
src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java
View file @ 84bddbc4
package com.yxproject.start.service.impl;
import com.opencsv.CSVWriter;
import com.yxproject.start.entity.*;
import com.yxproject.start.entity.TaskList.TaskListEntity;
import com.yxproject.start.mapper.DataAuditingMapper;
import com.yxproject.start.mapper.GroupNoMapper;
import com.yxproject.start.mapper.SpecialCardMapper;
......@@ -12,7 +12,12 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.util.*;
@Service
......@@ -403,7 +408,7 @@ public class TaskListServiceImpl implements TaskListService {
@Override
@Transactional(rollbackFor = Exception.class)
public List<Object> selectByCountyAtAuxiliary(long process) {
List list = new ArrayList();
List list;
if (process == 0) {
//查询下发状态下的任务单
//查询普通组号列表 在辅助库中
......@@ -645,10 +650,9 @@ public class TaskListServiceImpl implements TaskListService {
default:
break;
}
List<Map<String, Object>> mapList1 = formateMap3(mapList);
return mapList1;
return formatMap3(mapList);
}
/**
......@@ -1731,15 +1735,15 @@ private String createGroupNo(List<Integer> c, List<Integer> nsList) {
}
private List<Map<String, Object>> formateMap3(List<Map<String, Object>> maplist) {
Map<String, Object> typeMap = new LinkedHashMap<>();
for (Map o : maplist) {
private List<Map<String, Object>> formatMap3(List<Map<String, Object>> maplist) {
Map<String, Object> typeMap = new LinkedHashMap<>(); //类型Map
for (Map o : maplist) { //遍历原始list获取单个map
// 组合JSON
if (typeMap != null & typeMap.containsKey(o.get("CARD_TYPE") + "")) {
List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(o.get("CARD_TYPE"));
mapList.add(o);
typeMap.put(o.get("CARD_TYPE") + "", mapList);
} else {
if (typeMap.containsKey(o.get("CARD_TYPE") + "")) { //如果类型map中已有单个map中这个类型
List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(o.get("CARD_TYPE")); // 先获取类型map中这个类型的list
mapList.add(o); //然后把当前的单个map加入到这个list中
typeMap.put(o.get("CARD_TYPE") + "", mapList); //list重新放回类型map
} else { // 类型map中没有这个类型则新建一个然后添加
List<Map<String, Object>> mapList = new ArrayList<>();
mapList.add(o);
typeMap.put(o.get("CARD_TYPE") + "", mapList);
......@@ -1750,7 +1754,7 @@ private String createGroupNo(List<Integer> c, List<Integer> nsList) {
List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(type);
Map<String, Object> typemap = new LinkedHashMap<>();
for (Map<String, Object> o : mapList) {
if (typemap != null && typemap.containsKey(o.get("TASK_ID") + "")) {
if (typemap.containsKey(o.get("TASK_ID") + "")) {
List<Map<String, Object>> maplist_county = (List<Map<String, Object>>) typemap.get(o.get("TASK_ID") + "");
maplist_county.add(o);
typemap.put(o.get("TASK_ID") + "", maplist_county);
......@@ -1947,4 +1951,43 @@ private String createGroupNo(List<Integer> c, List<Integer> nsList) {
return typeList;
}
@Override
public String exportPostPersonInfo(String taskDate) throws IOException {
List<Map<String, Object>> postPersonInfo = taskListMapper.exportPostPersonInfo(taskDate);
return generateCsv(postPersonInfo);
}
private String generateCsv(List<Map<String, Object>> personInfoList) throws IOException {
LocalDate date = LocalDate.now();
// 定义 CSV 文件路径
String csvFile = date + "_postPersonInfo.csv";
// 创建 CSVWriter
// 使用 OutputStreamWriter 和 FileOutputStream 来设置 UTF-8 编码
try (FileOutputStream fileOut = new FileOutputStream(csvFile);
OutputStreamWriter writer = new OutputStreamWriter(fileOut, StandardCharsets.UTF_8)) {
// 可选：写入 UTF-8 BOM（用于兼容 Excel）
writer.write('\uFEFF');
// 创建 CSVWriter
CSVWriter csvWriter = new CSVWriter(writer);
// 写入表头
String[] header = {"身份证号", "姓名", "联系电话", "收件地址"};
csvWriter.writeNext(header);
// 写入数据
for (Map<String, Object> data : personInfoList) {
// 确保所有字段都作为字符串保存，防止 Excel 将其解析为数字
String[] row = {
data.get("ID_CARD") == null ? "" : data.get("ID_CARD").toString() + "\t", // 身份证号
data.get("APPLICANT_NAME") == null ? "" : data.get("APPLICANT_NAME").toString(), // 姓名
data.get("RECIPIENT_PHONE") == null ? "" : data.get("RECIPIENT_PHONE").toString() + "\t", // 联系电话
data.get("RECIPIENT_ADDRESS") == null ? "" : data.get("RECIPIENT_ADDRESS").toString(), // 收件地址
};
csvWriter.writeNext(row);
}
}
System.out.println("CSV 文件生成成功，路径为：" + csvFile);
return csvFile;
}
}
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