Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 837537c1 authored by liboyang's avatar liboyang
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents fbcaf1fa 35551c05
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 16 deletions
src/main/java/com/yxproject/start/api/LogApi.java
View file @ 837537c1
......@@ -116,6 +116,7 @@ public class LogApi {
List<Map<String,Object>> resultList = logService.selectFileIdByUploadDate(printDate);
//查询Excel文件信息
Map<String, Object> resultMap = logService.selectFileNameDic(fileId);
logService.changeFileState(fileId);
List<Map<String,Object>> result = new ArrayList<>();
for (int i=0; i<resultList.size();i++){
String fileName=(BigDecimal)(resultList.get(i).get("ID"))+"";
......
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ 837537c1
......@@ -136,7 +136,7 @@ public class ReadExcelApi {
personPostEntity.setLatticeMouthInformation((String) list2.get(19));
personPostEntity.setNatureOfTheInternal((String) list2.get(20));
personPostEntity.setNatureOfTheInformation((String) list2.get(21));
personPostEntity.setFirstWhite(list2.get(22).toString().substring(5,27) );
personPostEntity.setFirstWhite(list2.get(22).toString().substring(5,27 ) );
personPostEntity.setFileId(fileNameDicEntity.getFileId());
entityList.add(personPostEntity);
}
......
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ 837537c1
......@@ -161,7 +161,7 @@ public class TaskListApi {
/**
* 查询任务单详情
* (辅助库)
*（下发、膜打印）
*（下发、数据核验、膜打印）
* @param process 工序
* @param resp
* @return
......
src/main/java/com/yxproject/start/mapper/LogMapper.java
View file @ 837537c1
......@@ -74,7 +74,7 @@ public interface LogMapper {
" ( " +
" SELECT A.*, ROWNUM RN " +
" FROM (SELECT NEW_FILE_NAME,CREATE_DATE,RECORD_NUMBER,DWDM,DWMC FROM NEW_FILES " +
" LEFT JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID" +
" RIGHT JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID" +
" where 1=1 " +
" <if test='newFileName !=\"\"' >" +
" and NEW_FILES.NEW_FILE_NAME=#{newFileName} " +
......@@ -154,7 +154,13 @@ public interface LogMapper {
public Map<String,Object> selectCountByCardType(@Param("fileId")String fileId);
/**
* 解析时更改Excel文件状态
* @param fileId
* @return
*/
@Update("update FILE_NAME_DIC set STATE = 1 WHERE FILE_ID =#{fileId} ")
public boolean changeFileState(@Param("fileId") String fileId);
......
src/main/java/com/yxproject/start/mapper/SelectSerialNumberMapper.java
View file @ 837537c1
......@@ -12,7 +12,18 @@ import java.util.Map;
@Mapper
public interface SelectSerialNumberMapper {
@Select("select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
@Select("select TASK.TASK_ID," +
"COUNTY_DIC.COUNTYNAME," +
"COUNTY_DIC.COUNTY_CODE," +
"CARD_TYPE_DIC.CARD_TYPE," +
"CARD_TYPE_DIC.CARD_TYPE_ID," +
"TASK.ISSUED_DATE," +
"TASK.PRINT_OUT_DATE," +
"TASK.POSITION_DATE," +
"TASK.CONCORA_CRUSH_DATE, "+
"TASK.PUNCHING_DATE," +
"TASK.SORTING_DATE," +
"TASK.QUALITY_TEST_DATE\n" +
" from TASK \n" +
" LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
" LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
......@@ -20,7 +31,18 @@ public interface SelectSerialNumberMapper {
public List<Map<String,Object>> selectByWorkOrder(String id);
@Select("select GROUP_NO.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
@Select("select GROUP_NO.TASK_ID," +
"COUNTY_DIC.COUNTYNAME," +
"COUNTY_DIC.COUNTY_CODE," +
"CARD_TYPE_DIC.CARD_TYPE," +
"CARD_TYPE_DIC.CARD_TYPE_ID," +
"TASK.ISSUED_DATE," +
"TASK.PRINT_OUT_DATE," +
"TASK.POSITION_DATE," +
"TASK.CONCORA_CRUSH_DATE, "+
"TASK.PUNCHING_DATE," +
"TASK.SORTING_DATE," +
"TASK.QUALITY_TEST_DATE\n" +
"from TASK\n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
......@@ -38,9 +60,19 @@ public interface SelectSerialNumberMapper {
public int selectCount(String id);
@Select("select DISTINCT TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,\n" +
"TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,\n" +
"TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
@Select("select DISTINCT " +
"TASK.TASK_ID," +
"COUNTY_DIC.COUNTYNAME," +
"COUNTY_DIC.COUNTY_CODE," +
"CARD_TYPE_DIC.CARD_TYPE," +
"CARD_TYPE_DIC.CARD_TYPE_ID," +
"TASK.ISSUED_DATE," +
"TASK.PRINT_OUT_DATE," +
"TASK.POSITION_DATE," +
"TASK.CONCORA_CRUSH_DATE, "+
"TASK.PUNCHING_DATE," +
"TASK.SORTING_DATE," +
"TASK.QUALITY_TEST_DATE\n" +
"from TASK\n" +
"LEFT JOIN SPECIAL_CARD ON SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
......
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ 837537c1
......@@ -138,7 +138,7 @@ public interface TaskListMapper {
"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\n" +
"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 <#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
"left join (select task_id, nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
"where task.TASK_STATE_ID = #{process} order by group_no.GROUP_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_common(@Param("process") long process,@Param("process2") long process2);
......@@ -325,7 +325,7 @@ public interface TaskListMapper {
"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\n" +
"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 < #{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR \n" +
"left join (select task_id, nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR \n" +
"group by task_id ) fc \n" +
"on fc.TASK_ID = task.TASK_ID\n" +
"left join prod_trace_t@PROD_LINK on SUBSTR(prod_trace_t.ACCEPT_NO,0,8) = group_no.GROUP_NO\n" +
......@@ -349,7 +349,7 @@ public interface TaskListMapper {
"from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
"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" +
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state =#{process2} 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);
......@@ -510,7 +510,7 @@ public interface TaskListMapper {
"from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
"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" +
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state =#{process2} 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);
......@@ -525,7 +525,7 @@ public interface TaskListMapper {
"0 faileCount from FAILED_CARD left join task on FAILED_CARD.task_id= task.TASK_ID\n" +
"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 FAILED_CARD.state <#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR order by FAILED_CARD.ACCEPT_NO")
"where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR order by FAILED_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_failed(@Param("process2") long process2);
/**
......
src/main/java/com/yxproject/start/service/LogService.java
View file @ 837537c1
......@@ -40,4 +40,6 @@ public interface LogService {
public Map<String,Object> selectCountByCardType(@Param("fileId")String fileName);
public String selectByFileName(@Param("fileName")String fileName);
public boolean changeFileState(@Param("fileId") String fileId);
}
src/main/java/com/yxproject/start/service/impl/LogServiceImpl.java
View file @ 837537c1
......@@ -110,4 +110,10 @@ public class LogServiceImpl implements LogService {
String fileId= logMapper.selectByFileName(fileName);
return fileId;
}
@Override
public boolean changeFileState(String fileId) {
logMapper.changeFileState(fileId);
return false;
}
}
src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java
View file @ 837537c1
......@@ -135,7 +135,7 @@ public class TaskListServiceImpl implements TaskListService {
for (Map o : maps) {
// 组合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"));
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 {
......@@ -174,11 +174,17 @@ public class TaskListServiceImpl implements TaskListService {
int invalidCount = 0;
String countyName = null;
Object submitDate = null;
long dealFlag = 3;
List<Map<String, Object>> countyMapList = mapList.get(county);
for (Map<String, Object> countyMap : countyMapList) {
submitDate = countyMap.get("SUBMIT_DATE");
countyName = countyMap.get("COUNTYNAME") + "";
typeName = countyMap.get("CARD_TYPE_ID") + "";
if (Long.valueOf(countyMap.get("DEAL_FLAG") + "")<dealFlag){
dealFlag = Long.valueOf(countyMap.get("DEAL_FLAG") + "");
}else {
}
typeSum += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
validCount += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
invalidCount += Integer.valueOf(countyMap.get("INVALID_COUNT") + "");
......@@ -206,6 +212,7 @@ public class TaskListServiceImpl implements TaskListService {
countyMapGroup.put("groupNum", createGroupNo(c, nsList));
}
countyMapGroup.put("countyCode", county);
countyMapGroup.put("dealFlag", dealFlag);
countyMapGroup.put("groupList", countyMapList);
countyMapGroup.put("saveDate", submitDate);
countyMapGroup.put("countyName", countyName);
......@@ -246,7 +253,7 @@ public class TaskListServiceImpl implements TaskListService {
/**
* 查询任务单详情
* 辅助库
* (下发、数据核验)
* (下发、膜打印)
*
* @param process 查询工序
* @return
......
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