Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit dec562da authored by suichenguang's avatar suichenguang
Browse files
Options

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

parents 8bb5a96f 27eb0673
Hide whitespace changes
Inline Side-by-side
Showing with 1652 additions and 722 deletions
src/main/java/com/yxproject/start/api/ReadXmlApi.java
View file @ dec562da
...@@ -81,7 +81,6 @@ public class ReadXmlApi { ...@@ -81,7 +81,6 @@ public class ReadXmlApi {
// 如果fileitem中封装的是上传文件 // 如果fileitem中封装的是上传文件
// 得到上传的文件名称 // 得到上传的文件名称
filename = item.getName(); filename = item.getName();
System.out.println(filename+"===============");
if (filename == null || filename.trim().equals("")) { if (filename == null || filename.trim().equals("")) {
continue; continue;
} }
......
src/main/java/com/yxproject/start/api/TagPrintApi.java 0 → 100644
View file @ dec562da
package com.yxproject.start.api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping("tagPrint")
public class TagPrintApi {
@RequestMapping("selectTagPrintData")
public List selectTagPrintData(@RequestParam("idCard")String idCard){
List list = new ArrayList();
return list;
}
}
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ dec562da
...@@ -102,7 +102,6 @@ public class TaskListApi { ...@@ -102,7 +102,6 @@ public class TaskListApi {
JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList"); JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList");
String process = jsonObject.get("process").toString(); String process = jsonObject.get("process").toString();
String name = jsonObject.get("name").toString(); String name = jsonObject.get("name").toString();
Boolean b = true;
List<String> list = (List<String>) jsonArray; List<String> list = (List<String>) jsonArray;
return taskListService.updateState(list, process, name); return taskListService.updateState(list, process, name);
} }
...@@ -123,7 +122,6 @@ public class TaskListApi { ...@@ -123,7 +122,6 @@ public class TaskListApi {
String process = jsonObject.get("process").toString(); String process = jsonObject.get("process").toString();
String name = jsonObject.get("name").toString(); String name = jsonObject.get("name").toString();
String printer = jsonObject.get("printer").toString(); String printer = jsonObject.get("printer").toString();
Boolean b = true;
List<String> list = (List<String>) jsonArray; List<String> list = (List<String>) jsonArray;
return taskListService.updateState2(list, process, name,Long.valueOf(printer)); return taskListService.updateState2(list, process, name,Long.valueOf(printer));
} }
...@@ -204,6 +202,38 @@ public class TaskListApi { ...@@ -204,6 +202,38 @@ 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) ,replaceDate(date));
return objects;
}
/**
* 查询任务单详情（历史）
* (辅助库)
*（分拣）
* @param resp
* @return
*/
@RequestMapping("queryHistoryTaskAtAuxiliary2")
public List<Object> queryHistoryTaskAtAuxiliary2(@RequestParam("date") String date, HttpServletResponse resp) {
List<Object> objects = taskListService.selectHistoryTaskAtAuxiliary2(replaceDate(date));
return objects;
}
/** /**
* 生成任务单 * 生成任务单
* <p> * <p>
......
src/main/java/com/yxproject/start/mapper/PreproPersonMapper.java
View file @ dec562da
...@@ -13,10 +13,10 @@ import java.util.Map; ...@@ -13,10 +13,10 @@ import java.util.Map;
public interface PreproPersonMapper { public interface PreproPersonMapper {
/*导入XMl*/ /*导入XMl*/
@Insert("INSERT INTO PREPRO_PERSON (JMSFZSLH,GMSFHM,XM,XBDM,MZDM,CSRQ,SSXQDM,DZMC,SDXP,ZWY_ZWTXSJ,ZWY_ZWTZSJ,ZWE_ZWTXSJ,ZWE_ZWTZSJ," + @Insert("INSERT INTO PREPRO_PERSON (JMSFZSLH,GMSFHM,XM,XBDM,MZDM,CSRQ,SSXQDM,DZMC,SDXP,ZWY_ZWTXSJ,ZWY_ZWTZSJ,ZWE_ZWTXSJ,ZWE_ZWTZSJ," +
"QFJG_GAJGMC,YXQQSRQ,YXQJZRQ,JMSFZSLYYDM,JMSFZZZLXDM,JMSFZLZFSDM,SJR_XM,SJR_LXDH,SJR_YZBM,SJR_TXDZ,SID)" + "QFJG_GAJGMC,YXQQSRQ,YXQJZRQ,JMSFZSLYYDM,JMSFZZZLXDM,JMSFZLZFSDM,SJR_XM,SJR_LXDH,SJR_YZBM,SJR_TXDZ,SID,FILE_ID)" +
"VALUES(#{jmsfzslh},#{gmsfhm},#{xm},#{xbdm},#{mzdm},#{csrq},#{ssxqdm},#{dzmc},#{sdxp},#{zwyZwtxsj},#{zwyZwtzsj},#{zweZwtxsj}," + "VALUES(#{jmsfzslh},#{gmsfhm},#{xm},#{xbdm},#{mzdm},#{csrq},#{ssxqdm},#{dzmc},#{sdxp},#{zwyZwtxsj},#{zwyZwtzsj},#{zweZwtxsj}," +
"#{zweZwtzsj},#{qfjgGajgmc},#{yxqqsrq},#{yxqjzrq},#{jmsfzslyydm},#{jmsfzzzlxdm},#{jmsfzlzfsdm},#{sjrXm},#{sjrLxdh},#{sjrYzbm}," + "#{zweZwtzsj},#{qfjgGajgmc},#{yxqqsrq},#{yxqjzrq},#{jmsfzslyydm},#{jmsfzzzlxdm},#{jmsfzlzfsdm},#{sjrXm},#{sjrLxdh},#{sjrYzbm}," +
"#{sjrTxdz},#{sid})") "#{sjrTxdz},#{sid},#{fileId})")
public boolean savePreproPersonEntity(PreproPersonEntity personEntity); public boolean savePreproPersonEntity(PreproPersonEntity personEntity);
/*更新制证数据是否邮寄*/ /*更新制证数据是否邮寄*/
...@@ -25,61 +25,63 @@ public interface PreproPersonMapper { ...@@ -25,61 +25,63 @@ public interface PreproPersonMapper {
/*按条件查询制证数据*/ /*按条件查询制证数据*/
@Select({"<script>"+ @Select({"<script>" +
"select * from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID "+ "select * from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID " +
"<where> " + "<where> " +
" 1=1" + " 1=1" +
"<if test='uploadNo != null '>"+ "<if test='uploadNo != null '>" +
"and PREPRO_PERSON.JMSFZSLH = #{uploadNo}"+ "and PREPRO_PERSON.JMSFZSLH = #{uploadNo}" +
"</if>"+ "</if>" +
" <if test='IDCard != null '> ", " <if test='IDCard != null '> ",
"and GMSFHM = #{IDCard} ", "and GMSFHM = #{IDCard} ",
"</if> " , "</if> ",
" <if test='oldFile != null '> ", " <if test='oldFile != null '> ",
"and files.SOURCE_FILE_NAME =#{oldFile} ", "and files.SOURCE_FILE_NAME =#{oldFile} ",
" </if> " , " </if> ",
" <if test='newFile != null'> ", " <if test='newFile != null'> ",
"and NEW_FILES.NEW_FILE_NAME = #{newFile}", "and NEW_FILES.NEW_FILE_NAME = #{newFile}",
" </if> " , " </if> ",
" <if test='SSXQDM != null '> ", " <if test='SSXQDM != null '> ",
"and PREPRO_PERSON.SSXQDM =#{SSXQDM}", "and PREPRO_PERSON.SSXQDM =#{SSXQDM}",
" </if>" , " </if>",
" <if test='cardType != null '>", " <if test='cardType != null '>",
" and PREPRO_PERSON.CARD_TYPE_ID =#{cardType}", " and PREPRO_PERSON.CARD_TYPE_ID =#{cardType}",
" </if> " , " </if> ",
" <if test='state != null'>", " <if test='state != null'>",
" and PREPRO_PERSON.state = #{state}", " and PREPRO_PERSON.state = #{state}",
" </if> " , " </if> ",
" <if test='uploadDate != null '>", " <if test='uploadDate != null '>",
" and files.CREAT_TIME = #{uploadDate}", " and files.CREAT_TIME = #{uploadDate}",
" </if> ", " </if> ",
"</where>"+ "</where>" +
"</script>"}) "</script>"})
public List<PreproPersonEntity> selectPreproPerson(@Param("uploadNo")String uploadNo, @Param("IDCard")String IDCard, @Param("oldFile")String oldFile, @Param("newFile")String newFile, @Param("SSXQDM")String SSXQDM, @Param("cardType")String cardType, @Param("state")String state, @Param("uploadDate")String uploadDate); public List<PreproPersonEntity> selectPreproPerson(@Param("uploadNo") String uploadNo, @Param("IDCard") String IDCard, @Param("oldFile") String oldFile, @Param("newFile") String newFile, @Param("SSXQDM") String SSXQDM, @Param("cardType") String cardType, @Param("state") String state, @Param("uploadDate") String uploadDate);
/*修改标记制证数据状态*/ /*修改标记制证数据状态*/
@Update("UPDATE PREPRO_PERSON SET STATE = #{state} WHERE JMSFZSLH=#{acceptNo}") @Update("UPDATE PREPRO_PERSON SET STATE = #{state} WHERE JMSFZSLH=#{acceptNo}")
public boolean updateState (@Param("state")String state, @Param("acceptNo") String acceptNo); public boolean updateState(@Param("state") String state, @Param("acceptNo") String acceptNo);
@Update("UPDATE PREPRO_PERSON SET NEW_FILE_ID=#{newFileId} where JMSFZSLH=#{jmsfzslh}") @Update("UPDATE PREPRO_PERSON SET NEW_FILE_ID=#{newFileId} where JMSFZSLH=#{jmsfzslh}")
public boolean updateNewFileName(PreproPersonEntity personEntity); public boolean updateNewFileName(PreproPersonEntity personEntity);
/** /**
* 更新制证数据是否有效 * 更新制证数据是否有效
*
* @param personEntity * @param personEntity
* @return * @return
*/ */
@Update("UPDATE PREPRO_PERSON SET IS_VALID=#{isValid} where JMSFZSLH=#{jmsfzslh}") @Update("UPDATE PREPRO_PERSON SET IS_VALID=#{isValid} where JMSFZSLH=#{jmsfzslh}")
public boolean updatePreproPersonIsValid(PreproPersonEntity personEntity); public boolean updatePreproPersonIsValid(PreproPersonEntity personEntity);
/** /**
* 查询制证信息的上传受理号 * 查询制证信息的上传受理号
* 受理库和制证库 * 受理库和制证库
*
* @param acceptNo 受理组号 * @param acceptNo 受理组号
* @return * @return
*/ */
@Select("select UPLOAD_NO,ACCEPT_NO from ACC_CARD_T@ACCU_LINK WHERE ACCEPT_NO =#{acceptNo}\n" + @Select("select UPLOAD_NO,ACCEPT_NO from ACC_CARD_T@ACCU_LINK WHERE ACCEPT_NO =#{acceptNo}\n" +
"UNION all \n" + "UNION all \n" +
"select UPLOAD_NO,ACCEPT_NO from PROD_CARD_T@PROD_LINK WHERE ACCEPT_NO =#{acceptNo}") "select UPLOAD_NO,ACCEPT_NO from PROD_CARD_T@PROD_LINK WHERE ACCEPT_NO =#{acceptNo}")
public List<Map<String,Object>> selectUploadNoByAcceptNo(String acceptNo); public List<Map<String, Object>> selectUploadNoByAcceptNo(String acceptNo);
} }
\ No newline at end of file
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ dec562da
...@@ -141,7 +141,7 @@ public interface TaskListMapper { ...@@ -141,7 +141,7 @@ public interface TaskListMapper {
/** /**
* 循环单查询 * 任务单查询
* 辅助库 大批证 * 辅助库 大批证
* @param process 工序 * @param process 工序
* @return * @return
...@@ -155,13 +155,155 @@ public interface TaskListMapper { ...@@ -155,13 +155,155 @@ public interface TaskListMapper {
"where task.TASK_STATE_ID = #{process} order by group_no.GROUP_NO") "where task.TASK_STATE_ID = #{process} order by group_no.GROUP_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_common(@Param("process") long process); public List<Map<String,Object>> selectByCountyAtAuxiliary_common(@Param("process") long 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 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 );
/**
* 任务单查询历史
* 辅助库 大批证
* @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 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 );
/**
* 任务单查询历史
* 辅助库 大批证
* @param date 查询时间
* @return
*/
@Select("select 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,\n" +
// "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 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 );
/**
* 任务单查询历史
* 辅助库 大批证
* @param date 查询时间
* @return
*/
@Select("select 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,\n" +
// "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 and to_char(POSITION_DATE,'yyyyMMdd')= #{date}\n" +
"order by group_no.GROUP_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_common3(@Param("date")String date );
/**
* 任务单查询历史
* 辅助库 大批证
* @param date 查询时间
* @return
*/
@Select("select 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.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 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 );
/**
* 任务单查询历史
* 辅助库 大批证
* @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 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 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,\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" +
" left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE=GROUP_NO.GROUP_NO " +
"where 1= 1 and to_char(SORTING_DATE,'yyyyMMdd')= #{date} " +
" group by SORTING_DATE, SORTING_NAME, task.task_id, task.COUNTY_CODE, task.SUBMIT_DATE, \n" +
"task.SUBMIT_NAME, task.ISSUED_DATE, task.ISSUED_NAME, task.PRINT_OUT_DATE, task.PRINT_OUT_NAME, \n" +
"task.POSITION_DATE, task.POSITION_NAME, task.CONCORA_CRUSH_DATE, task.CONCORA_CRUSH_NAME, TASK.PUNCHING_DATE, \n" +
"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 );
/**
* 任务单查询
* 辅助库、制证库 大批证 * 辅助库、制证库 大批证
* @param process 工序 * @param process 工序
* @return * @return
*/ */
@Select("select DISTINCT sum(RECEIPT_LIST.FINISH_COUNT) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9)police_code ,GAJG_DM.GAJG_MC,\n" + @Select("select DISTINCT nvl(sum(RECEIPT_LIST.FINISH_COUNT),0) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9)police_code ,GAJG_DM.GAJG_MC,\n" +
"sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,\n" + "sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,\n" +
"task.submit_date, task.task_id,CARD_TYPE_DIC.CARD_TYPE,\n" + "task.submit_date, task.task_id,CARD_TYPE_DIC.CARD_TYPE,\n" +
"CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" + "CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
...@@ -184,7 +326,7 @@ public interface TaskListMapper { ...@@ -184,7 +326,7 @@ public interface TaskListMapper {
public List<Map<String,Object>> selectByCountyAtAuxiliary_common2(@Param("process") long process); public List<Map<String,Object>> selectByCountyAtAuxiliary_common2(@Param("process") long process);
/** /**
* 循环单查询 * 任务单查询
* 辅助库 快证 * 辅助库 快证
* @param process 工序 * @param process 工序
* @return * @return
...@@ -199,12 +341,134 @@ public interface TaskListMapper { ...@@ -199,12 +341,134 @@ public interface TaskListMapper {
public List<Map<String,Object>> selectByCountyAtAuxiliary_fast(@Param("process") long process); public List<Map<String,Object>> selectByCountyAtAuxiliary_fast(@Param("process") long 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, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" +
"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 " +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2" +
" and SUBMIT_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_fast0(@Param("date") String 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 ,\n" +
" '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 \n" +
"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 " +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2" +
" and ISSUED_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_fast1(@Param("date") String 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 ,\n" +
" '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 \n" +
"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 " +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2" +
" and PRINT_OUT_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_fast2(@Param("date") String 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 ,\n" +
" '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 \n" +
"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 " +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2" +
" and POSITION_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_fast3(@Param("date") String 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 ,\n" +
" '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 \n" +
"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 " +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2" +
" and CONCORA_CRUSH_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_fast4(@Param("date") String 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 ,\n" +
" '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 \n" +
"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 " +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2" +
" and PUNCHING_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_fast5(@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 , '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" +
"left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = SPECIAL_CARD.ACCEPT_NO\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2 and SORTING_DATE =#{date} group by SORTING_DATE, SORTING_NAME, task.task_id, task.COUNTY_CODE, task.SUBMIT_DATE, \n" +
"task.SUBMIT_NAME, task.ISSUED_DATE, task.ISSUED_NAME, task.PRINT_OUT_DATE, task.PRINT_OUT_NAME, \n" +
"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);
/**
* 任务单查询
* 辅助库、制证库 快证 * 辅助库、制证库 快证
* @param process 工序 * @param process 工序
* @return * @return
*/ */
@Select("select DISTINCT sum(RECEIPT_LIST.FINISH_COUNT) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9)police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" + @Select("select DISTINCT nvl(sum(RECEIPT_LIST.FINISH_COUNT),0) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9)police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" + "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
"SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" + "SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
"from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" + "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
...@@ -238,12 +502,137 @@ public interface TaskListMapper { ...@@ -238,12 +502,137 @@ public interface TaskListMapper {
public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind(@Param("process") long process); 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, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" +
"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 " +
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 " +
" and SUBMIT_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind0(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 余证
* @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, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" +
"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 " +
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 " +
" and ISSUED_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind1(@Param("date") String 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 ,\n" +
"'99' 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 \n" +
"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 " +
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 " +
" and PRINT_OUT_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind2(@Param("date") String 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 ,\n" +
"'99' 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 \n" +
"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 " +
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 " +
" and POSITION_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind3(@Param("date") String 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 ,\n" +
"'99' 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 \n" +
"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 " +
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 " +
" and CONCORA_CRUSH_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind4(@Param("date") String 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 ,\n" +
"'99' 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 \n" +
"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 " +
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 " +
" and PUNCHING_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind5(@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" +
"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 RECEIPT_LIST on SPECIAL_CARD.ACCEPT_NO = RECEIPT_LIST.QR_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 and SUBMIT_DATE =#{date} group by SORTING_DATE, SORTING_NAME, task.task_id, task.COUNTY_CODE, task.SUBMIT_DATE, \n" +
"task.SUBMIT_NAME, task.ISSUED_DATE, task.ISSUED_NAME, task.PRINT_OUT_DATE, task.PRINT_OUT_NAME, \n" +
"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);
/**
* 任务单查询
* 辅助库、制证库 余证 * 辅助库、制证库 余证
* @param process 工序 * @param process 工序
* @return * @return
*/ */
@Select("select DISTINCT sum(RECEIPT_LIST.FINISH_COUNT) finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9)police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" + @Select("select DISTINCT nvl(sum(RECEIPT_LIST.FINISH_COUNT),0) finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9)police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" + "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
"SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" + "SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
"from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" + "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
...@@ -256,7 +645,7 @@ public interface TaskListMapper { ...@@ -256,7 +645,7 @@ public interface TaskListMapper {
"left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)" + "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)" +
" left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no " + " left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no " +
" where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID =#{process} " + " where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID =#{process} " +
"group by task.submit_date, SPECIAL_CARD.task_id, '余证', '1', COUNTY_DIC.COUNTY_CODE, \n" + "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" + "COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
"nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC order by SPECIAL_CARD.ACCEPT_NO") "nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind2(@Param("process") long process); public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind2(@Param("process") long process);
...@@ -369,12 +758,4 @@ public interface TaskListMapper { ...@@ -369,12 +758,4 @@ public interface TaskListMapper {
@Select("select * from task where task_ID = #{taskId}") @Select("select * from task where task_ID = #{taskId}")
public List<TaskEntity> selectTaskEntityByTaskId(long 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 @ dec562da
...@@ -29,6 +29,10 @@ public interface TaskListService { ...@@ -29,6 +29,10 @@ public interface TaskListService {
public List<Object> selectByCountyAtAuxiliary(long process); public List<Object> selectByCountyAtAuxiliary(long process);
public List selectHistoryTaskAtAuxiliary(long process,String date);
public List selectHistoryTaskAtAuxiliary2(String date);
public Map selectByCountyAtAuxiliary2(long process); public Map selectByCountyAtAuxiliary2(long process);
public List<Object> selectByCountyAtAuxiliary3(long process); public List<Object> selectByCountyAtAuxiliary3(long process);
......
src/main/java/com/yxproject/start/service/impl/ImportXmlServiceImpl.java
View file @ dec562da
...@@ -33,7 +33,7 @@ public class ImportXmlServiceImpl implements ImportXmlService { ...@@ -33,7 +33,7 @@ public class ImportXmlServiceImpl implements ImportXmlService {
public boolean importPersonXml(List<PreproPersonEntity> preproPersonEntities, FilesEntity filesEntity) { public boolean importPersonXml(List<PreproPersonEntity> preproPersonEntities, FilesEntity filesEntity) {
long l = filesMapper.insertFiles(filesEntity); long l = filesMapper.insertFiles(filesEntity);
for (PreproPersonEntity preproPersonEntity : preproPersonEntities) { for (PreproPersonEntity preproPersonEntity : preproPersonEntities) {
preproPersonEntity.setFileId(l); preproPersonEntity.setFileId(filesEntity.getId());
preproPersonMapper.savePreproPersonEntity(preproPersonEntity); preproPersonMapper.savePreproPersonEntity(preproPersonEntity);
} }
return true; return true;
......
src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java
View file @ dec562da
...@@ -22,7 +22,7 @@ import java.util.Map; ...@@ -22,7 +22,7 @@ import java.util.Map;
@Service @Service
public class TaskListServiceImpl implements TaskListService { public class TaskListServiceImpl implements TaskListService {
@Autowired @Autowired
private TaskListMapper taskListMapper; private TaskListMapper taskListMapper;
@Autowired @Autowired
private GroupNoMapper groupNoMapper; private GroupNoMapper groupNoMapper;
@Autowired @Autowired
...@@ -30,7 +30,7 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -30,7 +30,7 @@ public class TaskListServiceImpl implements TaskListService {
@Override @Override
public List<CountCountyEntity> selectByCounty(String submitDate) { public List<CountCountyEntity> selectByCounty(String submitDate) {
List <CountCountyEntity> resultList= taskListMapper.selectByCounty(submitDate); List<CountCountyEntity> resultList = taskListMapper.selectByCounty(submitDate);
return resultList; return resultList;
} }
...@@ -42,8 +42,8 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -42,8 +42,8 @@ public class TaskListServiceImpl implements TaskListService {
} }
@Override @Override
public List<TaskListEntity> selectACCU(String submitDate ,String countyCode,String Gajg ) { public List<TaskListEntity> selectACCU(String submitDate, String countyCode, String Gajg) {
List <TaskListEntity> resultList= taskListMapper.selectACCU(submitDate,countyCode,Gajg); List<TaskListEntity> resultList = taskListMapper.selectACCU(submitDate, countyCode, Gajg);
return resultList; return resultList;
} }
...@@ -55,26 +55,26 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -55,26 +55,26 @@ public class TaskListServiceImpl implements TaskListService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean updateState(List<String> list,String process,String name) { public boolean updateState(List<String> list, String process, String name) {
for (String taskId: list) { for (String taskId : list) {
switch (process){ switch (process) {
case "1": case "1":
taskListMapper.updateState1(taskId,process,name); taskListMapper.updateState1(taskId, process, name);
break; break;
case "3": case "3":
taskListMapper.updateState3(taskId,process,name); taskListMapper.updateState3(taskId, process, name);
break; break;
case "4": case "4":
taskListMapper.updateState4(taskId,process,name); taskListMapper.updateState4(taskId, process, name);
break; break;
case "5": case "5":
taskListMapper.updateState5(taskId,process,name); taskListMapper.updateState5(taskId, process, name);
break; break;
case "6": case "6":
taskListMapper.updateState6(taskId,process,name); taskListMapper.updateState6(taskId, process, name);
break; break;
case "7": case "7":
taskListMapper.updateState7(taskId,process,name); taskListMapper.updateState7(taskId, process, name);
break; break;
default: default:
break; break;
...@@ -86,9 +86,9 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -86,9 +86,9 @@ public class TaskListServiceImpl implements TaskListService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean updateState2(List<String> list,String process,String name,long printer) { public boolean updateState2(List<String> list, String process, String name, long printer) {
for (String taskId: list) { for (String taskId : list) {
taskListMapper.updateState2(taskId,process,name,printer); taskListMapper.updateState2(taskId, process, name, printer);
} }
return true; return true;
} }
...@@ -96,99 +96,100 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -96,99 +96,100 @@ public class TaskListServiceImpl implements TaskListService {
/** /**
* 查询任务单详情 * 查询任务单详情
* 受理库 * 受理库
*
* @param date * @param date
* @return * @return
*/ */
@Override @Override
public List selectByCountyAtACCU(String date) { public List selectByCountyAtACCU(String date) {
List<Map<String, Object>> maps = taskListMapper.selectByCountyAtACCU(date); List<Map<String, Object>> maps = taskListMapper.selectByCountyAtACCU(date);
Map<String,Object> typeMap = new LinkedHashMap<>(); Map<String, Object> typeMap = new LinkedHashMap<>();
//将查询出结果 按制证类型分成 Map //将查询出结果 按制证类型分成 Map
for (Map o :maps){ for (Map o : maps) {
// 组合JSON // 组合JSON
if (typeMap!=null&&typeMap.containsKey(o.get("CARD_TYPE")+"")){ 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); mapList.add(o);
typeMap.put(o.get("CARD_TYPE")+"",mapList); typeMap.put(o.get("CARD_TYPE") + "", mapList);
}else { } else {
List<Map<String,Object>> mapList = new ArrayList<>(); List<Map<String, Object>> mapList = new ArrayList<>();
mapList.add(o); mapList.add(o);
typeMap.put(o.get("CARD_TYPE")+"",mapList); typeMap.put(o.get("CARD_TYPE") + "", mapList);
} }
} }
//将已按制证分好的Map 再次细化分为区县Map //将已按制证分好的Map 再次细化分为区县Map
for (String type:typeMap.keySet()){ for (String type : typeMap.keySet()) {
List<Map<String,Object>> mapList = (List<Map<String,Object>>)typeMap.get(type); List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(type);
Map<String,Object> typemap = new LinkedHashMap<>(); Map<String, Object> typemap = new LinkedHashMap<>();
for (Map<String,Object> o:mapList){ for (Map<String, Object> o : mapList) {
if (typemap!=null&&typemap.containsKey(o.get("COUNTY_CODE")+"")){ if (typemap != null && typemap.containsKey(o.get("COUNTY_CODE") + "")) {
List<Map<String,Object>> maplist= (List<Map<String,Object>>)typemap.get(o.get("COUNTY_CODE")); List<Map<String, Object>> maplist = (List<Map<String, Object>>) typemap.get(o.get("COUNTY_CODE"));
maplist.add(o); maplist.add(o);
typemap.put(o.get("COUNTY_CODE")+"",maplist); typemap.put(o.get("COUNTY_CODE") + "", maplist);
}else { } else {
List<Map<String,Object>> maplist = new ArrayList<>(); List<Map<String, Object>> maplist = new ArrayList<>();
maplist.add(o); maplist.add(o);
typemap.put(o.get("COUNTY_CODE")+"",maplist); typemap.put(o.get("COUNTY_CODE") + "", maplist);
} }
} }
typeMap.put(type,typemap); typeMap.put(type, typemap);
} }
List<Map<String,Object>> typeList = new ArrayList<>(); List<Map<String, Object>> typeList = new ArrayList<>();
for (String type:typeMap.keySet()){ for (String type : typeMap.keySet()) {
Map<String,Object> mapType = new LinkedHashMap<>(); Map<String, Object> mapType = new LinkedHashMap<>();
int typeSum =0; int typeSum = 0;
String typeName=null; String typeName = null;
List<Map<String,Object>> countyList = new ArrayList<>(); List<Map<String, Object>> countyList = new ArrayList<>();
Map<String,List<Map<String, Object>>> mapList = (Map<String,List<Map<String, Object>>>)typeMap.get(type); Map<String, List<Map<String, Object>>> mapList = (Map<String, List<Map<String, Object>>>) typeMap.get(type);
for (String county:mapList.keySet()){ for (String county : mapList.keySet()) {
Map<String,Object> countyMapGroup= new LinkedHashMap<>(); Map<String, Object> countyMapGroup = new LinkedHashMap<>();
int validCount =0; int validCount = 0;
int invalidCount =0; int invalidCount = 0;
String countyName =null; String countyName = null;
Object submitDate = null; Object submitDate = null;
List<Map<String, Object>> countyMapList = mapList.get(county); List<Map<String, Object>> countyMapList = mapList.get(county);
for (Map<String,Object> countyMap:countyMapList){ for (Map<String, Object> countyMap : countyMapList) {
submitDate = countyMap.get("SUBMIT_DATE"); submitDate = countyMap.get("SUBMIT_DATE");
countyName = countyMap.get("COUNTYNAME")+""; countyName = countyMap.get("COUNTYNAME") + "";
typeName = countyMap.get("CARD_TYPE_ID") + ""; typeName = countyMap.get("CARD_TYPE_ID") + "";
typeSum+=Integer.valueOf(countyMap.get("VALID_COUNT") + ""); typeSum += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
validCount+=Integer.valueOf(countyMap.get("VALID_COUNT") + ""); validCount += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
invalidCount+=Integer.valueOf(countyMap.get("INVALID_COUNT") + ""); invalidCount += Integer.valueOf(countyMap.get("INVALID_COUNT") + "");
} }
if (countyMapList.size()==1){ if (countyMapList.size() == 1) {
countyMapGroup.put("groupNum",countyMapList.get(0).get("GROUP_NO")); countyMapGroup.put("groupNum", countyMapList.get(0).get("GROUP_NO"));
}else { } else {
List<Integer> c = new ArrayList<>(); List<Integer> c = new ArrayList<>();
List<Integer> nsList = new ArrayList<>(); List<Integer> nsList = new ArrayList<>();
for (int i = 0; i < countyMapList.size(); i++) { for (int i = 0; i < countyMapList.size(); i++) {
/** /**
* 判断组号中时候含有历史回迁组 * 判断组号中时候含有历史回迁组
*/ */
if (((( countyMapList.get(i)).get("GROUP_NO")) + "").contains("L")) { if ((((countyMapList.get(i)).get("GROUP_NO")) + "").contains("L")) {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) { if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add(Integer.parseInt(((( countyMapList.get(i)).get("GROUP_NO")) + "").substring(1, ((( countyMapList.get(i)).get("GROUP_NO")) + "").length()))); nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "").substring(1, (((countyMapList.get(i)).get("GROUP_NO")) + "").length())));
} }
} else { } else {
if (((( countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) { if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add(Integer.parseInt(((( countyMapList.get(i)).get("GROUP_NO")) + ""))); nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
} }
} }
} }
countyMapGroup.put("groupNum",createGroupNo(c, nsList)); countyMapGroup.put("groupNum", createGroupNo(c, nsList));
} }
countyMapGroup.put("countyCode",county); countyMapGroup.put("countyCode", county);
countyMapGroup.put("groupList",countyMapList); countyMapGroup.put("groupList", countyMapList);
countyMapGroup.put("saveDate",submitDate); countyMapGroup.put("saveDate", submitDate);
countyMapGroup.put("countyName",countyName); countyMapGroup.put("countyName", countyName);
countyMapGroup.put("countyValidCount",validCount); countyMapGroup.put("countyValidCount", validCount);
countyMapGroup.put("countyInvalidCount",invalidCount); countyMapGroup.put("countyInvalidCount", invalidCount);
countyList.add(countyMapGroup); countyList.add(countyMapGroup);
} }
mapType.put("typeCode",typeName); mapType.put("typeCode", typeName);
mapType.put("typeSum",typeSum ); mapType.put("typeSum", typeSum);
mapType.put("typeName", type); mapType.put("typeName", type);
mapType.put("countyList",countyList); mapType.put("countyList", countyList);
typeList.add(mapType); typeList.add(mapType);
} }
return typeList; return typeList;
...@@ -197,20 +198,21 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -197,20 +198,21 @@ public class TaskListServiceImpl implements TaskListService {
/** /**
* 查询组号列表详情 * 查询组号列表详情
* 受理库 * 受理库
* @param date 查询时间 *
* @param typeCode 制证类型 * @param date 查询时间
* @param countyCode 区县代码 * @param typeCode 制证类型
* @param currPage 当前页 * @param countyCode 区县代码
* @param pageSize 页面数量 * @param currPage 当前页
* @param pageSize 页面数量
* @return * @return
*/ */
@Override @Override
public Map<String ,Object> selectByGroupNoAtACCU(String date, String typeCode, String countyCode, long currPage, long pageSize) { public Map<String, Object> selectByGroupNoAtACCU(String date, String typeCode, String countyCode, long currPage, long pageSize) {
List<Map<String, Object>> mapList = taskListMapper.selectByGroupNoAtACCU(date, typeCode, countyCode, currPage * pageSize, (currPage - 1) * pageSize + 1); List<Map<String, Object>> mapList = taskListMapper.selectByGroupNoAtACCU(date, typeCode, countyCode, currPage * pageSize, (currPage - 1) * pageSize + 1);
List<Map<String, Object>> mapList1 = taskListMapper.selectByGroupNoAtACCUCount(date, typeCode, countyCode); List<Map<String, Object>> mapList1 = taskListMapper.selectByGroupNoAtACCUCount(date, typeCode, countyCode);
Map<String,Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("count",mapList1.size()); map.put("count", mapList1.size());
map.put("groupList",mapList); map.put("groupList", mapList);
return map; return map;
} }
...@@ -218,6 +220,7 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -218,6 +220,7 @@ public class TaskListServiceImpl implements TaskListService {
* 查询任务单详情 * 查询任务单详情
* 辅助库 * 辅助库
* (下发、数据核验) * (下发、数据核验)
*
* @param process 查询工序 * @param process 查询工序
* @return * @return
*/ */
...@@ -241,6 +244,7 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -241,6 +244,7 @@ public class TaskListServiceImpl implements TaskListService {
* 查询任务单详情 * 查询任务单详情
* 辅助库 * 辅助库
* (预订位、平压、冲切) * (预订位、平压、冲切)
*
* @param process 查询工序 * @param process 查询工序
* @return * @return
*/ */
...@@ -253,17 +257,17 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -253,17 +257,17 @@ public class TaskListServiceImpl implements TaskListService {
List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast(process); List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast(process);
//查询余证组号列表 在辅助库中 //查询余证组号列表 在辅助库中
List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind(process); List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind(process);
List<Map<String,Object>> list = new ArrayList<>(); List<Map<String, Object>> list = new ArrayList<>();
list = formateMap(mapList_common); list = formateMap(mapList_common);
list.addAll(formateMap(mapList_fast)); list.addAll(formateMap(mapList_fast));
list.addAll(formateMap(mapList_remaind)); list.addAll(formateMap(mapList_remaind));
int total =0; int total = 0;
for (Map<String,Object> map : list){ for (Map<String, Object> map : list) {
total+=Integer.valueOf(map.get("typeSum").toString()); total += Integer.valueOf(map.get("typeSum").toString());
} }
Map<String,Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("total",total); map.put("total", total);
map.put("typeList",list); map.put("typeList", list);
return map; return map;
} }
...@@ -272,6 +276,7 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -272,6 +276,7 @@ public class TaskListServiceImpl implements TaskListService {
* 查询任务单详情 * 查询任务单详情
* 辅助库、制证库 * 辅助库、制证库
* (分拣) * (分拣)
*
* @param process 查询工序 * @param process 查询工序
* @return * @return
*/ */
...@@ -284,7 +289,7 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -284,7 +289,7 @@ public class TaskListServiceImpl implements TaskListService {
List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast2(process); List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast2(process);
//查询余证组号列表 在辅助库、制证库中 //查询余证组号列表 在辅助库、制证库中
List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind2(process); List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind2(process);
List<Map<String,Object>> list = new ArrayList<>(); List<Map<String, Object>> list = new ArrayList<>();
list = formateMap2(mapList_common); list = formateMap2(mapList_common);
list.addAll(formateMap2(mapList_fast)); list.addAll(formateMap2(mapList_fast));
list.addAll(formateMap2(mapList_remaind)); list.addAll(formateMap2(mapList_remaind));
...@@ -292,32 +297,127 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -292,32 +297,127 @@ public class TaskListServiceImpl implements TaskListService {
return list; return list;
} }
/**
* 查询历史任务单详情
* （辅助库）
* （下发、数据核验、预订位、平压、冲切）
*
* @param process 工序
* @param date 查询时间
* @return
*/
@Override
public List selectHistoryTaskAtAuxiliary(long process, String date) {
int pro = (int) process;
List<Map<String, Object>> mapList = new ArrayList<>();
switch (pro) {
case 0:
//查询历史任务单 大批证
mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common0(date);
//查询历史任务单 快证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast0(date));
//查询历史任务单 余证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind0(date));
break;
case 1:
//查询历史任务单 大批证
mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common1(date);
//查询历史任务单 快证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast1(date));
//查询历史任务单 余证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind1(date));
break;
case 2:
//查询历史任务单 大批证
mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common2(date);
//查询历史任务单 快证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast2(date));
//查询历史任务单 余证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind2(date));
break;
case 3:
//查询历史任务单 大批证
mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common3(date);
//查询历史任务单 快证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast3(date));
//查询历史任务单 余证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind3(date));
break;
case 4:
//查询历史任务单 大批证
mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common4(date);
//查询历史任务单 快证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast4(date));
//查询历史任务单 余证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind4(date));
break;
case 5:
//查询历史任务单 大批证
mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common5(date);
//查询历史任务单 快证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast5(date));
//查询历史任务单 余证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind5(date));
break;
default:
break;
}
List<Map<String, Object>> mapList1 = formateMap3(mapList);
return mapList1;
}
/**
* 查询历史任务单详情
* （辅助库）
* （分拣）
*
* @param date 查询时间
* @return
*/
@Override
public List selectHistoryTaskAtAuxiliary2(String date) {
List<Map<String, Object>> mapList = new ArrayList<>();
//查询历史任务单 大批证
mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common6(date);
//查询历史任务单 快证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast6(date));
//查询历史任务单 余证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind6(date));
List<Map<String, Object>> mapList1 = formateMap4(mapList);
return mapList1;
}
/** /**
* 查询组号信息 * 查询组号信息
* 受理库 * 受理库
*
* @param date * @param date
* @param typeCode * @param typeCode
* @param countyCode * @param countyCode
* @return * @return
*/ */
@Override @Override
public List selectGroupAtACCU(String date,String typeCode,String countyCode) { public List selectGroupAtACCU(String date, String typeCode, String countyCode) {
return taskListMapper.selectGroupAtACCUByCountyCode(date,typeCode,countyCode); return taskListMapper.selectGroupAtACCUByCountyCode(date, typeCode, countyCode);
} }
/** /**
* 查询组号信息 * 查询组号信息
* 受理库 * 受理库
*
* @param groupNo 受理组号 * @param groupNo 受理组号
* @return * @return
*/ */
@Override @Override
public List selectGroupAtACCU(String groupNo) { public List selectGroupAtACCU(String groupNo) {
return taskListMapper.selectGroupAtACCUByGroupNo(groupNo); return taskListMapper.selectGroupAtACCUByGroupNo(groupNo);
} }
/** /**
* 保存任务单详情 * 保存任务单详情
*
* @param taskEntity * @param taskEntity
* @return * @return
*/ */
...@@ -329,26 +429,27 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -329,26 +429,27 @@ public class TaskListServiceImpl implements TaskListService {
/** /**
* 保存循环单 * 保存循环单
*
* @param list * @param list
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean saveTask(List<Object> list,String submitName,String process) { public boolean saveTask(List<Object> list, String submitName, String process) {
Map<String,Object> stringObjectMap =(Map<String,Object>)list.get(0); Map<String, Object> stringObjectMap = (Map<String, Object>) list.get(0);
TaskEntity taskEntity = new TaskEntity(); TaskEntity taskEntity = new TaskEntity();
taskEntity.setCardType(Long.valueOf(stringObjectMap.get("CARD_TYPE_ID")+"")); taskEntity.setCardType(Long.valueOf(stringObjectMap.get("CARD_TYPE_ID") + ""));
taskEntity.setCountyCode(stringObjectMap.get("COUNTY_CODE")+""); taskEntity.setCountyCode(stringObjectMap.get("COUNTY_CODE") + "");
taskEntity.setSubmitName(submitName); taskEntity.setSubmitName(submitName);
taskEntity.setTaskStateId(Long.valueOf(process)); taskEntity.setTaskStateId(Long.valueOf(process));
saveTask(taskEntity); saveTask(taskEntity);
for (Object object :list){ for (Object object : list) {
Map<String,Object> map =(Map<String,Object>)object; Map<String, Object> map = (Map<String, Object>) object;
GroupNoEntity groupNoEntity = new GroupNoEntity(); GroupNoEntity groupNoEntity = new GroupNoEntity();
groupNoEntity.setGroupNo(map.get("GROUP_NO")+""); groupNoEntity.setGroupNo(map.get("GROUP_NO") + "");
groupNoEntity.setInvalidCount(Long.valueOf(map.get("INVALID_COUNT")+"")); groupNoEntity.setInvalidCount(Long.valueOf(map.get("INVALID_COUNT") + ""));
groupNoEntity.setValidCount(Long.valueOf(map.get("VALID_COUNT")+"")); groupNoEntity.setValidCount(Long.valueOf(map.get("VALID_COUNT") + ""));
groupNoEntity.setSpecialCardCount((long)0); groupNoEntity.setSpecialCardCount((long) 0);
groupNoEntity.setTaskId(taskEntity.getTaskId()); groupNoEntity.setTaskId(taskEntity.getTaskId());
groupNoMapper.saveGroupNo(groupNoEntity); groupNoMapper.saveGroupNo(groupNoEntity);
} }
...@@ -357,55 +458,57 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -357,55 +458,57 @@ public class TaskListServiceImpl implements TaskListService {
/** /**
* 查询快证在受理库信息 * 查询快证在受理库信息
*
* @param groupNo 组号 * @param groupNo 组号
* @return * @return
*/ */
@Override @Override
public List<Map<String,Object>> selectFastCardAtACCU(String groupNo) { public List<Map<String, Object>> selectFastCardAtACCU(String groupNo) {
return taskListMapper.selectFastCardAtACCU(groupNo); return taskListMapper.selectFastCardAtACCU(groupNo);
} }
/** /**
* 保存快证任务单 * 保存快证任务单
*
* @param list * @param list
* @param submitName * @param submitName
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean saveFastTask(List<Map<String,Object>> list, String submitName,String acceptNo,long cardType) { public boolean saveFastTask(List<Map<String, Object>> list, String submitName, String acceptNo, long cardType) {
//保存普通证件信息 //保存普通证件信息
Map<String,Object> stringObjectMap =list.get(0); Map<String, Object> stringObjectMap = list.get(0);
TaskEntity taskEntity = new TaskEntity(); TaskEntity taskEntity = new TaskEntity();
taskEntity.setCardType(cardType); taskEntity.setCardType(cardType);
taskEntity.setCountyCode(stringObjectMap.get("COUNTY_CODE")+""); taskEntity.setCountyCode(stringObjectMap.get("COUNTY_CODE") + "");
taskEntity.setSubmitName(submitName); taskEntity.setSubmitName(submitName);
taskEntity.setTaskStateId((long)0); taskEntity.setTaskStateId((long) 0);
saveTask(taskEntity); saveTask(taskEntity);
for (Object object :list){ for (Object object : list) {
Map<String,Object> map =(Map<String,Object>)object; Map<String, Object> map = (Map<String, Object>) object;
GroupNoEntity groupNoEntity = new GroupNoEntity(); GroupNoEntity groupNoEntity = new GroupNoEntity();
groupNoEntity.setGroupNo(map.get("GROUP_NO")+""); groupNoEntity.setGroupNo(map.get("GROUP_NO") + "");
groupNoEntity.setInvalidCount(Long.valueOf(map.get("INVALID_COUNT")+"")); groupNoEntity.setInvalidCount(Long.valueOf(map.get("INVALID_COUNT") + ""));
groupNoEntity.setValidCount(Long.valueOf(map.get("VALID_COUNT")+"")); groupNoEntity.setValidCount(Long.valueOf(map.get("VALID_COUNT") + ""));
groupNoEntity.setSpecialCardCount((long)1); groupNoEntity.setSpecialCardCount((long) 1);
groupNoEntity.setTaskId(taskEntity.getTaskId()); groupNoEntity.setTaskId(taskEntity.getTaskId());
groupNoMapper.saveGroupNo(groupNoEntity); groupNoMapper.saveGroupNo(groupNoEntity);
} }
//保存快证件信息 //保存快证件信息
TaskEntity fastTaskEntity = new TaskEntity(); TaskEntity fastTaskEntity = new TaskEntity();
fastTaskEntity.setCardType((long)1); fastTaskEntity.setCardType((long) 1);
fastTaskEntity.setOldCardType(cardType); fastTaskEntity.setOldCardType(cardType);
fastTaskEntity.setCountyCode(stringObjectMap.get("COUNTY_CODE")+""); fastTaskEntity.setCountyCode(stringObjectMap.get("COUNTY_CODE") + "");
fastTaskEntity.setSubmitName(submitName); fastTaskEntity.setSubmitName(submitName);
fastTaskEntity.setTaskStateId((long)1); fastTaskEntity.setTaskStateId((long) 1);
taskListMapper.saveFastTask(fastTaskEntity); taskListMapper.saveFastTask(fastTaskEntity);
SpecialCardEntity specialCardEntity = new SpecialCardEntity(); SpecialCardEntity specialCardEntity = new SpecialCardEntity();
specialCardEntity.setAcceptNo(acceptNo); specialCardEntity.setAcceptNo(acceptNo);
specialCardEntity.setGroupNo(acceptNo.substring(0,8)); specialCardEntity.setGroupNo(acceptNo.substring(0, 8));
specialCardEntity.setTaskId(fastTaskEntity.getTaskId()); specialCardEntity.setTaskId(fastTaskEntity.getTaskId());
specialCardEntity.setSpecialType((long)2); specialCardEntity.setSpecialType((long) 2);
specialCardEntity.setInitiator(submitName); specialCardEntity.setInitiator(submitName);
specialCardMapper.saveSpecialCard(specialCardEntity); specialCardMapper.saveSpecialCard(specialCardEntity);
return true; return true;
...@@ -413,6 +516,7 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -413,6 +516,7 @@ public class TaskListServiceImpl implements TaskListService {
/** /**
* 查询任务单详情 * 查询任务单详情
*
* @param taskId 任务单流水号 * @param taskId 任务单流水号
* @return * @return
*/ */
...@@ -424,6 +528,7 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -424,6 +528,7 @@ public class TaskListServiceImpl implements TaskListService {
/** /**
* 保存快证任务单 * 保存快证任务单
* 辅助库 * 辅助库
*
* @param taskEntity * @param taskEntity
* @return * @return
*/ */
...@@ -468,209 +573,408 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -468,209 +573,408 @@ public class TaskListServiceImpl implements TaskListService {
} }
private List<Map<String,Object>> formateMap(List<Map<String, Object>> maplist){ private List<Map<String, Object>> formateMap(List<Map<String, Object>> maplist) {
Map<String,Object> typeMap = new LinkedHashMap<>(); Map<String, Object> typeMap = new LinkedHashMap<>();
for (Map o :maplist){ for (Map o : maplist) {
// 组合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 {
List<Map<String, Object>> mapList = new ArrayList<>();
mapList.add(o);
typeMap.put(o.get("CARD_TYPE") + "", mapList);
}
}
//将已按制证分好的Map 再次细化分为任务单Map
for (String type : typeMap.keySet()) {
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") + "")) {
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);
} else {
List<Map<String, Object>> maplist_county = new ArrayList<>();
maplist_county.add(o);
typemap.put(o.get("TASK_ID") + "", maplist_county);
}
}
typeMap.put(type, typemap);
}
List<Map<String, Object>> typeList = new ArrayList<>();
for (String type : typeMap.keySet()) {
Map<String, Object> mapType = new LinkedHashMap<>();
int typeSum = 0;
String typeName = null;
List<Map<String, Object>> countyList = new ArrayList<>();
Map<String, List<Map<String, Object>>> mapList = (Map<String, List<Map<String, Object>>>) typeMap.get(type);
for (String taskId : mapList.keySet()) {
Map<String, Object> countyMapGroup = new LinkedHashMap<>();
int validCount = 0;
int invalidCount = 0;
int specialCount = 0;
int faileCount = 0;
String countyName = null;
String countyCode = null;
Object submitDate = null;
List<Map<String, Object>> countyMapList = mapList.get(taskId);
for (Map<String, Object> countyMap : countyMapList) {
submitDate = countyMap.get("SUBMIT_DATE");
countyCode = countyMap.get("COUNTY_CODE") + "";
countyName = countyMap.get("COUNTYNAME") + "";
typeName = countyMap.get("CARD_TYPE_ID") + "";
typeSum += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
typeSum -= Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
validCount += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
invalidCount += Integer.valueOf(countyMap.get("INVALID_COUNT") + "");
specialCount += Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
faileCount += Integer.valueOf(countyMap.get("FAILECOUNT") + "");
}
if (countyMapList.size() == 1) {
countyMapGroup.put("groupNum", countyMapList.get(0).get("GROUP_NO"));
} else {
List<Integer> c = new ArrayList<>();
List<Integer> nsList = new ArrayList<>();
for (int i = 0; i < countyMapList.size(); i++) {
/**
* 判断组号中时候含有历史回迁组
*/
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").contains("L")) {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "").substring(1, (((countyMapList.get(i)).get("GROUP_NO")) + "").length())));
}
} else {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
}
}
}
countyMapGroup.put("groupNum", createGroupNo(c, nsList));
}
countyMapGroup.put("faileCount", faileCount);
countyMapGroup.put("specialCount", specialCount);
countyMapGroup.put("countyCode", countyCode);
countyMapGroup.put("taskId", taskId);
countyMapGroup.put("groupList", countyMapList);
countyMapGroup.put("saveDate", submitDate);
countyMapGroup.put("countyName", countyName);
countyMapGroup.put("countyValidCount", validCount);
countyMapGroup.put("countyInvalidCount", invalidCount);
countyList.add(countyMapGroup);
}
mapType.put("typeCode", typeName);
mapType.put("typeSum", typeSum);
mapType.put("typeName", type);
mapType.put("countyList", countyList);
typeList.add(mapType);
}
return typeList;
}
private List<Map<String, Object>> formateMap2(List<Map<String, Object>> maplist) {
Map<String, Object> typeMap = new LinkedHashMap<>();
for (Map o : maplist) {
// 组合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 {
List<Map<String, Object>> mapList = new ArrayList<>();
mapList.add(o);
typeMap.put(o.get("CARD_TYPE") + "", mapList);
}
}
//将已按制证分好的Map 再次细化分为任务单Map
for (String type : typeMap.keySet()) {
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") + "")) {
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);
} else {
List<Map<String, Object>> maplist_county = new ArrayList<>();
maplist_county.add(o);
typemap.put(o.get("TASK_ID") + "", maplist_county);
}
}
typeMap.put(type, typemap);
}
List<Map<String, Object>> typeList = new ArrayList<>();
for (String type : typeMap.keySet()) {
Map<String, Object> mapType = new LinkedHashMap<>();
int typeSum = 0;
String typeName = null;
List<Map<String, Object>> countyList = new ArrayList<>();
Map<String, List<Map<String, Object>>> mapList = (Map<String, List<Map<String, Object>>>) typeMap.get(type);
for (String taskId : mapList.keySet()) {
Map<String, Object> countyMapGroup = new LinkedHashMap<>();
int validCount = 0;
int invalidCount = 0;
int specialCount = 0;
int eWriteCount = 0;
int faileCount = 0;
int recheckCount = 0;
String countyName = null;
String countyCode = null;
Object submitDate = null;
List<Map<String, Object>> countyMapList = mapList.get(taskId);
for (Map<String, Object> countyMap : countyMapList) {
submitDate = countyMap.get("SUBMIT_DATE");
countyCode = countyMap.get("COUNTY_CODE") + "";
countyName = countyMap.get("COUNTYNAME") + "";
typeName = countyMap.get("CARD_TYPE_ID") + "";
typeSum += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
typeSum -= Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
validCount += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
invalidCount += Integer.valueOf(countyMap.get("INVALID_COUNT") + "");
specialCount += Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
faileCount += Integer.valueOf(countyMap.get("FAILECOUNT") + "");
eWriteCount += Integer.valueOf(countyMap.get("E_WRITER_COUNT") + "");
recheckCount += Integer.valueOf(countyMap.get("FINISH_COUNT") + "");
}
if (countyMapList.size() == 1) {
countyMapGroup.put("groupNum", countyMapList.get(0).get("GROUP_NO"));
} else {
List<Integer> c = new ArrayList<>();
List<Integer> nsList = new ArrayList<>();
for (int i = 0; i < countyMapList.size(); i++) {
/**
* 判断组号中时候含有历史回迁组
*/
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").contains("L")) {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "").substring(1, (((countyMapList.get(i)).get("GROUP_NO")) + "").length())));
}
} else {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
}
}
}
countyMapGroup.put("groupNum", createGroupNo(c, nsList));
}
countyMapGroup.put("faileCount", faileCount);
countyMapGroup.put("specialCount", specialCount);
countyMapGroup.put("countyCode", countyCode);
countyMapGroup.put("taskId", taskId);
countyMapGroup.put("groupList", countyMapList);
countyMapGroup.put("saveDate", submitDate);
countyMapGroup.put("countyName", countyName);
countyMapGroup.put("eWriteCount", eWriteCount);
countyMapGroup.put("countyValidCount", validCount);
countyMapGroup.put("countyInvalidCount", invalidCount);
countyMapGroup.put("recheckCount", recheckCount);
countyList.add(countyMapGroup);
}
mapType.put("typeCode", typeName);
mapType.put("typeSum", typeSum);
mapType.put("typeName", type);
mapType.put("countyList", countyList);
typeList.add(mapType);
}
return typeList;
}
private List<Map<String, Object>> formateMap3(List<Map<String, Object>> maplist) {
Map<String, Object> typeMap = new LinkedHashMap<>();
for (Map o : maplist) {
// 组合JSON // 组合JSON
if (typeMap!=null&typeMap.containsKey(o.get("CARD_TYPE")+"")){ 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); mapList.add(o);
typeMap.put(o.get("CARD_TYPE")+"",mapList); typeMap.put(o.get("CARD_TYPE") + "", mapList);
}else { } else {
List<Map<String,Object>> mapList = new ArrayList<>(); List<Map<String, Object>> mapList = new ArrayList<>();
mapList.add(o); mapList.add(o);
typeMap.put(o.get("CARD_TYPE")+"",mapList); typeMap.put(o.get("CARD_TYPE") + "", mapList);
} }
} }
//将已按制证分好的Map 再次细化分为任务单Map //将已按制证分好的Map 再次细化分为任务单Map
for (String type:typeMap.keySet()){ for (String type : typeMap.keySet()) {
List<Map<String,Object>> mapList = (List<Map<String,Object>>)typeMap.get(type); List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(type);
Map<String,Object> typemap = new LinkedHashMap<>(); Map<String, Object> typemap = new LinkedHashMap<>();
for (Map<String,Object> o:mapList){ for (Map<String, Object> o : mapList) {
if (typemap!=null&&typemap.containsKey(o.get("TASK_ID")+"")){ if (typemap != null && typemap.containsKey(o.get("TASK_ID") + "")) {
List<Map<String,Object>> maplist_county= (List<Map<String,Object>>)typemap.get(o.get("TASK_ID")+""); List<Map<String, Object>> maplist_county = (List<Map<String, Object>>) typemap.get(o.get("TASK_ID") + "");
maplist_county.add(o); maplist_county.add(o);
typemap.put(o.get("TASK_ID")+"",maplist_county); typemap.put(o.get("TASK_ID") + "", maplist_county);
}else { } else {
List<Map<String,Object>> maplist_county = new ArrayList<>(); List<Map<String, Object>> maplist_county = new ArrayList<>();
maplist_county.add(o); maplist_county.add(o);
typemap.put(o.get("TASK_ID")+"",maplist_county); typemap.put(o.get("TASK_ID") + "", maplist_county);
} }
} }
typeMap.put(type,typemap); typeMap.put(type, typemap);
} }
List<Map<String,Object>> typeList = new ArrayList<>(); List<Map<String, Object>> typeList = new ArrayList<>();
for (String type:typeMap.keySet()){ for (String type : typeMap.keySet()) {
Map<String,Object> mapType = new LinkedHashMap<>(); Map<String, Object> mapType = new LinkedHashMap<>();
int typeSum =0; int typeSum = 0;
String typeName=null; String typeName = null;
List<Map<String,Object>> countyList = new ArrayList<>(); List<Map<String, Object>> countyList = new ArrayList<>();
Map<String,List<Map<String, Object>>> mapList = (Map<String,List<Map<String, Object>>>)typeMap.get(type); Map<String, List<Map<String, Object>>> mapList = (Map<String, List<Map<String, Object>>>) typeMap.get(type);
for (String taskId:mapList.keySet()){ for (String taskId : mapList.keySet()) {
Map<String,Object> countyMapGroup= new LinkedHashMap<>(); Map<String, Object> countyMapGroup = new LinkedHashMap<>();
int validCount =0; int validCount = 0;
int invalidCount =0; int invalidCount = 0;
int specialCount=0; int specialCount = 0;
int faileCount=0; String countyName = null;
String countyName =null; String countyCode = null;
String countyCode =null;
Object submitDate = null; Object submitDate = null;
List<Map<String, Object>> countyMapList = mapList.get(taskId); List<Map<String, Object>> countyMapList = mapList.get(taskId);
for (Map<String,Object> countyMap:countyMapList){ for (Map<String, Object> countyMap : countyMapList) {
submitDate = countyMap.get("SUBMIT_DATE"); submitDate = countyMap.get("SUBMIT_DATE");
countyCode = countyMap.get("COUNTY_CODE")+""; countyCode = countyMap.get("COUNTY_CODE") + "";
countyName = countyMap.get("COUNTYNAME")+""; countyName = countyMap.get("COUNTYNAME") + "";
typeName = countyMap.get("CARD_TYPE_ID") + ""; typeName = countyMap.get("CARD_TYPE_ID") + "";
typeSum+=Integer.valueOf(countyMap.get("VALID_COUNT") + ""); typeSum += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
typeSum-=Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + ""); typeSum -= Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
validCount+=Integer.valueOf(countyMap.get("VALID_COUNT") + ""); validCount += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
invalidCount+=Integer.valueOf(countyMap.get("INVALID_COUNT") + ""); invalidCount += Integer.valueOf(countyMap.get("INVALID_COUNT") + "");
specialCount+=Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + ""); specialCount += Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
faileCount+=Integer.valueOf(countyMap.get("FAILECOUNT") + "");
} }
if (countyMapList.size()==1){ if (countyMapList.size() == 1) {
countyMapGroup.put("groupNum",countyMapList.get(0).get("GROUP_NO")); countyMapGroup.put("groupNum", countyMapList.get(0).get("GROUP_NO"));
}else { } else {
List<Integer> c = new ArrayList<>(); List<Integer> c = new ArrayList<>();
List<Integer> nsList = new ArrayList<>(); List<Integer> nsList = new ArrayList<>();
for (int i = 0; i < countyMapList.size(); i++) { for (int i = 0; i < countyMapList.size(); i++) {
/** /**
* 判断组号中时候含有历史回迁组 * 判断组号中时候含有历史回迁组
*/ */
if (((( countyMapList.get(i)).get("GROUP_NO")) + "").contains("L")) { if ((((countyMapList.get(i)).get("GROUP_NO")) + "").contains("L")) {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) { if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add(Integer.parseInt(((( countyMapList.get(i)).get("GROUP_NO")) + "").substring(1, ((( countyMapList.get(i)).get("GROUP_NO")) + "").length()))); nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "").substring(1, (((countyMapList.get(i)).get("GROUP_NO")) + "").length())));
} }
} else { } else {
if (((( countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) { if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add(Integer.parseInt(((( countyMapList.get(i)).get("GROUP_NO")) + ""))); nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
} }
} }
} }
countyMapGroup.put("groupNum",createGroupNo(c, nsList)); countyMapGroup.put("groupNum", createGroupNo(c, nsList));
} }
countyMapGroup.put("faileCount",faileCount); countyMapGroup.put("specialCount", specialCount);
countyMapGroup.put("specialCount",specialCount); countyMapGroup.put("countyCode", countyCode);
countyMapGroup.put("countyCode",countyCode); countyMapGroup.put("taskId", taskId);
countyMapGroup.put("taskId",taskId); countyMapGroup.put("groupList", countyMapList);
countyMapGroup.put("groupList",countyMapList); countyMapGroup.put("saveDate", submitDate);
countyMapGroup.put("saveDate",submitDate); countyMapGroup.put("countyName", countyName);
countyMapGroup.put("countyName",countyName); countyMapGroup.put("countyValidCount", validCount);
countyMapGroup.put("countyValidCount",validCount); countyMapGroup.put("countyInvalidCount", invalidCount);
countyMapGroup.put("countyInvalidCount",invalidCount);
countyList.add(countyMapGroup); countyList.add(countyMapGroup);
} }
mapType.put("typeCode",typeName); mapType.put("typeCode", typeName);
mapType.put("typeSum",typeSum ); mapType.put("typeSum", typeSum);
mapType.put("typeName", type); mapType.put("typeName", type);
mapType.put("countyList",countyList); mapType.put("countyList", countyList);
typeList.add(mapType); typeList.add(mapType);
} }
return typeList; return typeList;
} }
private List<Map<String,Object>> formateMap2(List<Map<String, Object>> maplist){ private List<Map<String, Object>> formateMap4(List<Map<String, Object>> maplist) {
Map<String,Object> typeMap = new LinkedHashMap<>(); Map<String, Object> typeMap = new LinkedHashMap<>();
for (Map o :maplist){ for (Map o : maplist) {
// 组合JSON // 组合JSON
if (typeMap!=null&typeMap.containsKey(o.get("CARD_TYPE")+"")){ 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); mapList.add(o);
typeMap.put(o.get("CARD_TYPE")+"",mapList); typeMap.put(o.get("CARD_TYPE") + "", mapList);
}else { } else {
List<Map<String,Object>> mapList = new ArrayList<>(); List<Map<String, Object>> mapList = new ArrayList<>();
mapList.add(o); mapList.add(o);
typeMap.put(o.get("CARD_TYPE")+"",mapList); typeMap.put(o.get("CARD_TYPE") + "", mapList);
} }
} }
//将已按制证分好的Map 再次细化分为任务单Map //将已按制证分好的Map 再次细化分为任务单Map
for (String type:typeMap.keySet()){ for (String type : typeMap.keySet()) {
List<Map<String,Object>> mapList = (List<Map<String,Object>>)typeMap.get(type); List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(type);
Map<String,Object> typemap = new LinkedHashMap<>(); Map<String, Object> typemap = new LinkedHashMap<>();
for (Map<String,Object> o:mapList){ for (Map<String, Object> o : mapList) {
if (typemap!=null&&typemap.containsKey(o.get("TASK_ID")+"")){ if (typemap != null && typemap.containsKey(o.get("TASK_ID") + "")) {
List<Map<String,Object>> maplist_county= (List<Map<String,Object>>)typemap.get(o.get("TASK_ID")+""); List<Map<String, Object>> maplist_county = (List<Map<String, Object>>) typemap.get(o.get("TASK_ID") + "");
maplist_county.add(o); maplist_county.add(o);
typemap.put(o.get("TASK_ID")+"",maplist_county); typemap.put(o.get("TASK_ID") + "", maplist_county);
}else { } else {
List<Map<String,Object>> maplist_county = new ArrayList<>(); List<Map<String, Object>> maplist_county = new ArrayList<>();
maplist_county.add(o); maplist_county.add(o);
typemap.put(o.get("TASK_ID")+"",maplist_county); typemap.put(o.get("TASK_ID") + "", maplist_county);
} }
} }
typeMap.put(type,typemap); typeMap.put(type, typemap);
} }
List<Map<String,Object>> typeList = new ArrayList<>(); List<Map<String, Object>> typeList = new ArrayList<>();
for (String type:typeMap.keySet()){ for (String type : typeMap.keySet()) {
Map<String,Object> mapType = new LinkedHashMap<>(); Map<String, Object> mapType = new LinkedHashMap<>();
int typeSum =0; int typeSum = 0;
String typeName=null; String typeName = null;
List<Map<String,Object>> countyList = new ArrayList<>(); List<Map<String, Object>> countyList = new ArrayList<>();
Map<String,List<Map<String, Object>>> mapList = (Map<String,List<Map<String, Object>>>)typeMap.get(type); Map<String, List<Map<String, Object>>> mapList = (Map<String, List<Map<String, Object>>>) typeMap.get(type);
for (String taskId:mapList.keySet()){ for (String taskId : mapList.keySet()) {
Map<String,Object> countyMapGroup= new LinkedHashMap<>(); Map<String, Object> countyMapGroup = new LinkedHashMap<>();
int validCount =0; int validCount = 0;
int invalidCount =0; int invalidCount = 0;
int specialCount=0; int specialCount = 0;
int eWriteCount=0; int recheckCount = 0;
int faileCount=0; String countyName = null;
int recheckCount=0; String countyCode = null;
String countyName =null;
String countyCode =null;
Object submitDate = null; Object submitDate = null;
List<Map<String, Object>> countyMapList = mapList.get(taskId); List<Map<String, Object>> countyMapList = mapList.get(taskId);
for (Map<String,Object> countyMap:countyMapList){ for (Map<String, Object> countyMap : countyMapList) {
submitDate = countyMap.get("SUBMIT_DATE"); submitDate = countyMap.get("SUBMIT_DATE");
countyCode = countyMap.get("COUNTY_CODE")+""; countyCode = countyMap.get("COUNTY_CODE") + "";
countyName = countyMap.get("COUNTYNAME")+""; countyName = countyMap.get("COUNTYNAME") + "";
typeName = countyMap.get("CARD_TYPE_ID") + ""; typeName = countyMap.get("CARD_TYPE_ID") + "";
typeSum+=Integer.valueOf(countyMap.get("VALID_COUNT") + ""); typeSum += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
typeSum-=Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + ""); typeSum -= Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
validCount+=Integer.valueOf(countyMap.get("VALID_COUNT") + ""); recheckCount += Integer.valueOf(countyMap.get("FINISH_COUNT") + "");
invalidCount+=Integer.valueOf(countyMap.get("INVALID_COUNT") + ""); validCount += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
specialCount+=Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + ""); invalidCount += Integer.valueOf(countyMap.get("INVALID_COUNT") + "");
faileCount+=Integer.valueOf(countyMap.get("FAILECOUNT") + ""); specialCount += Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
eWriteCount+=Integer.valueOf(countyMap.get("E_WRITER_COUNT") + "");
recheckCount+=Integer.valueOf(countyMap.get("FINISH_COUNT") + "");
} }
if (countyMapList.size()==1){ if (countyMapList.size() == 1) {
countyMapGroup.put("groupNum",countyMapList.get(0).get("GROUP_NO")); countyMapGroup.put("groupNum", countyMapList.get(0).get("GROUP_NO"));
}else { } else {
List<Integer> c = new ArrayList<>(); List<Integer> c = new ArrayList<>();
List<Integer> nsList = new ArrayList<>(); List<Integer> nsList = new ArrayList<>();
for (int i = 0; i < countyMapList.size(); i++) { for (int i = 0; i < countyMapList.size(); i++) {
/** /**
* 判断组号中时候含有历史回迁组 * 判断组号中时候含有历史回迁组
*/ */
if (((( countyMapList.get(i)).get("GROUP_NO")) + "").contains("L")) { if ((((countyMapList.get(i)).get("GROUP_NO")) + "").contains("L")) {
if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) { if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add(Integer.parseInt(((( countyMapList.get(i)).get("GROUP_NO")) + "").substring(1, ((( countyMapList.get(i)).get("GROUP_NO")) + "").length()))); nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "").substring(1, (((countyMapList.get(i)).get("GROUP_NO")) + "").length())));
} }
} else { } else {
if (((( countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) { if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
nsList.add(Integer.parseInt(((( countyMapList.get(i)).get("GROUP_NO")) + ""))); nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
} }
} }
} }
countyMapGroup.put("groupNum",createGroupNo(c, nsList)); countyMapGroup.put("groupNum", createGroupNo(c, nsList));
} }
countyMapGroup.put("faileCount",faileCount); countyMapGroup.put("specialCount", specialCount);
countyMapGroup.put("specialCount",specialCount); countyMapGroup.put("countyCode", countyCode);
countyMapGroup.put("countyCode",countyCode); countyMapGroup.put("taskId", taskId);
countyMapGroup.put("taskId",taskId); countyMapGroup.put("groupList", countyMapList);
countyMapGroup.put("policeList",countyMapList); countyMapGroup.put("saveDate", submitDate);
countyMapGroup.put("saveDate",submitDate); countyMapGroup.put("countyName", countyName);
countyMapGroup.put("countyName",countyName); countyMapGroup.put("countyValidCount", validCount);
countyMapGroup.put("eWriteCount",eWriteCount); countyMapGroup.put("countyInvalidCount", invalidCount);
countyMapGroup.put("countyValidCount",validCount);
countyMapGroup.put("countyInvalidCount",invalidCount);
countyMapGroup.put("recheckCount",recheckCount); countyMapGroup.put("recheckCount",recheckCount);
countyList.add(countyMapGroup); countyList.add(countyMapGroup);
} }
mapType.put("typeCode",typeName); mapType.put("typeCode", typeName);
mapType.put("typeSum",typeSum ); mapType.put("typeSum", typeSum);
mapType.put("typeName", type); mapType.put("typeName", type);
mapType.put("countyList",countyList); mapType.put("countyList", countyList);
typeList.add(mapType); typeList.add(mapType);
} }
return typeList; return typeList;
......
src/main/resources/static/dialogs/analysisDialog.html
View file @ dec562da
...@@ -83,9 +83,6 @@ ...@@ -83,9 +83,6 @@
</tbody> </tbody>
</table> </table>
<div style="padding-left: 27%;" ng-if="resultData.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
</div> </div>
<div class="ui-dialog-confirm"> <div class="ui-dialog-confirm">
<div class="progress"> <div class="progress">
......
src/main/resources/static/js/app.js
View file @ dec562da
...@@ -159,7 +159,6 @@ angular.module('AvatarCheck', [ ...@@ -159,7 +159,6 @@ angular.module('AvatarCheck', [
} }
$scope.doSearch = function (searchInput) { $scope.doSearch = function (searchInput) {
$rootScope.searchResult={};
$scope.msg=""; $scope.msg="";
$scope.alertMsg=""; $scope.alertMsg="";
var pattern = /^[0-9]*$/ var pattern = /^[0-9]*$/
...@@ -171,8 +170,9 @@ angular.module('AvatarCheck', [ ...@@ -171,8 +170,9 @@ angular.module('AvatarCheck', [
if(data==''){ if(data==''){
$scope.alertMsg = "暂无数据"; $scope.alertMsg = "暂无数据";
}else{ }else{
$rootScope.searchResult = data; $scope.searchResult = data;
console.log($rootScope.searchResult) console.log($scope.searchResult,"searchResult")
console.log($scope.searchResult['workOrderDate'],"searchResultWorkOrderDate")
} }
}) })
......
src/main/resources/static/js/service.js
View file @ dec562da
...@@ -437,6 +437,32 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -437,6 +437,32 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
getCreateHistoryTask:function(date,success){
console.log(date)
$http({
method: 'GET',
url: "../TaskList/queryHistoryTaskAtAuxiliary"+urlTimeStamp(),
params:{
process:$rootScope.loginData.roleList[0].process-1,
date:date
}
}).then(function successCallback(response) {
success(response.data)
})
},
getHistoryTask:function(date,success){
console.log(date)
$http({
method: 'GET',
url: "../TaskList/queryHistoryTaskAtAuxiliary"+urlTimeStamp(),
params:{
process:$rootScope.loginData.roleList[0].process,
date:date
}
}).then(function successCallback(response) {
success(response.data)
})
},
getGroupListData:function(saveDate,countyCode,typeCode,currPage,pageSize,success){ getGroupListData:function(saveDate,countyCode,typeCode,currPage,pageSize,success){
$http({ $http({
method: 'GET', method: 'GET',
...@@ -530,23 +556,29 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -530,23 +556,29 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
analyseData:function(date,currPage,pageSize,success){ analyseData:function(date,success){
if(date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(date)
$http({ $http({
method: 'GET', method: 'GET',
url: "../importXML/queryPersonXML"+urlTimeStamp(), url: "../LogApi/selectAnalysisData"+urlTimeStamp(),
params:{ params:{
importDate:date, uploadName:date
currPage:currPage,
pageSize:pageSize
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
}, },
analyseDataCount:function(date,success) { analyseDataCount:function(date,success) {
if(date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(date)
$http({ $http({
method: 'GET', method: 'GET',
url: "../importXML/queryPersonXMLCount"+urlTimeStamp(), url: "../LogApi/selectAnalysisLogCount"+urlTimeStamp(),
params:{ params:{
importDate:date importDate:date
} }
......
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ dec562da
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body" ng-if="isHistory==0">
<div ng-if="cycleSheetData.length>0"> <div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;"> <div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
...@@ -94,7 +94,56 @@ ...@@ -94,7 +94,56 @@
</div> </div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<!-- /.box-body --> <div class="box-body" ng-if="isHistory==1">
<div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
</ul>
</a>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover">
<thead>
<tr>
<th>保存日期</th>
<th>地区</th>
<th>组数</th>
<th>受理组号</th>
<th>合格数量</th>
<th>不合格数量</th>
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList">
<tr>
<td class="mailbox-star"><b>{{task.saveDate | date:'yyyy-MM-dd'}}</b></td>
<td class="mailbox-name"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-attachment">{{task.countyValidCount}}</td>
<td class="mailbox-date">{{task.countyInvalidCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.countyCode,type.typeCode)">组号列表</a></td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
</div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
</div> </div>
<!-- /. box --> <!-- /. box -->
......
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ dec562da
...@@ -25,7 +25,9 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -25,7 +25,9 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.isHistory=0;
$scope.searchCurrent = function(){ $scope.searchCurrent = function(){
$scope.isHistory=0;
HttpService.getTaskListToCreate($('#datepicker').val(),function(data){ HttpService.getTaskListToCreate($('#datepicker').val(),function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){ for(var i=0;i<$scope.cycleSheetData.length;i++){
...@@ -36,11 +38,25 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -36,11 +38,25 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
} }
} }
console.log($scope.cycleSheetData) console.log("当天：",$scope.cycleSheetData)
}) })
} }
$scope.searchCurrent(); $scope.searchCurrent();
$scope.searchHistory = function(){
$scope.isHistory=1;
HttpService.getCreateHistoryTask($('#datepicker').val(),function(data){
$scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){
if(i==$scope.currentTab){
$scope.cycleSheetData[i].isActive=true;
}else{
$scope.cycleSheetData[i].isActive=false;
}
}
console.log("历史：",$scope.cycleSheetData)
})
}
$scope.currentTab = 0; $scope.currentTab = 0;
$scope.func = function (index) { $scope.func = function (index) {
...@@ -72,6 +88,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -72,6 +88,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
HttpService.getGroupListData($('#datepicker').val(),countyCode,typeCode,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){ HttpService.getGroupListData($('#datepicker').val(),countyCode,typeCode,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.paginationConf.totalItems = data.count; $scope.paginationConf.totalItems = data.count;
$scope.policeList =data.groupList; $scope.policeList =data.groupList;
console.log(data)
}) })
} }
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目 // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
......
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ dec562da
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-right: 10px;" ng-click="searchCurrent()">查询</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-right: 10px;" ng-click="searchTaskList()">查询</button>
</div> </div>
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body" ng-if="isHistory==0">
<div ng-if="cycleSheetData.length>0"> <div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;" > <div class="nav-tabs-custom clearfix" style="margin-bottom: 0;" >
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
...@@ -97,6 +97,84 @@ ...@@ -97,6 +97,84 @@
</div> </div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<div class="box-body" ng-if="isHistory==1">
<div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;" >
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
</ul>
</a>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
<th>任务单编号</th>
<th>地区</th>
<th>组数</th>
<th>受理组号</th>
<th>合格数量</th>
<th>不合格数量</th>
<th>废证数量</th>
<th>特殊证件数量</th>
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList">
<tr>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-name"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-attachment">{{task.countyValidCount}}</td>
<td class="mailbox-date">{{task.countyInvalidCount}}</td>
<td class="mailbox-date" ng-if="task.faileCount==0">{{task.faileCount}}</td>
<td class="mailbox-date text-danger" ng-if="task.faileCount!=0">{{task.faileCount}}</td>
<td class="mailbox-date">{{task.specialCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
</div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body --> <!-- /.box-body -->
</div> </div>
<!-- /. box --> <!-- /. box -->
......
src/main/resources/static/views/dispatchTask/dispatchTask.js
View file @ dec562da
...@@ -22,7 +22,9 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -22,7 +22,9 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.isHistory=0;
$scope.searchTaskList = function(){ $scope.searchTaskList = function(){
$scope.isHistory=0;
HttpService.getTaskListByProcess(function(data){ HttpService.getTaskListByProcess(function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){ for(var i=0;i<$scope.cycleSheetData.length;i++){
...@@ -32,11 +34,25 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -32,11 +34,25 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.cycleSheetData[i].isActive=false; $scope.cycleSheetData[i].isActive=false;
} }
} }
console.log($scope.cycleSheetData) console.log("当天：",$scope.cycleSheetData)
}) })
} }
$scope.searchTaskList(); $scope.searchTaskList();
$scope.searchHistory = function(){
$scope.isHistory=1;
HttpService.getHistoryTask($('#datepicker').val(),function(data){
$scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){
if(i==$scope.currentTab){
$scope.cycleSheetData[i].isActive=true;
}else{
$scope.cycleSheetData[i].isActive=false;
}
}
console.log("历史：",$scope.cycleSheetData)
})
}
//创建变量用来保存选中结果 //创建变量用来保存选中结果
$scope.selected = []; $scope.selected = [];
......
src/main/resources/static/views/searchCard/searchCard.html
View file @ dec562da
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
请输入要查询的受理号/身份证号/任务单编号 请输入要查询的受理号/身份证号/任务单编号
</h4> </h4>
<!--任务单--> <!--任务单-->
<div class="panel panel-info" ng-if="searchResult.workOrderData.length>0"> <div class="panel panel-info" ng-if="searchResult.workOrderDate.length>0">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title"> <h3 class="panel-title">
任务单 任务单
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<th>仓库</th> <th>仓库</th>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in searchResult.workOrderData"> <tr ng-repeat="item in searchResult.workOrderDate">
<td>{{item.TASK_ID}}</td> <td>{{item.TASK_ID}}</td>
<td>{{item.COUNTYNAME}}</td> <td>{{item.COUNTYNAME}}</td>
<td>{{item.CARD_TYPE}}</td> <td>{{item.CARD_TYPE}}</td>
...@@ -151,6 +151,13 @@ ...@@ -151,6 +151,13 @@
</div> </div>
</div> </div>
<h4>{{searchResult.workOrderDate}}</h4>
<h4>{{searchResult.workOrderDate.length}}</h4>
<h4>{{searchResult.ACCdata.length}}</h4>
<h4>{{searchResult.PRODData.length}}</h4>
<div ng-if="searchResult.workOrderDate.length==0&&searchResult.ACCdata.length==0&&searchResult.PRODData.length==0">
<h4>没有查询到相关信息</h4>
</div>
</div> </div>
</div> </div>
......
src/main/resources/static/views/task/task.js
View file @ dec562da
...@@ -44,76 +44,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -44,76 +44,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
// $scope.cycleSheetData = [ $scope.isHistory=0;
// {
// typeCode: '1',
// typeName: '普通证',
// typeSum: 300,
// isActive: 'true',
// countyList: [
// {
// taskId: '20190228001',
// county: '西城区',
// groupNo: '00234653-03687587',
// checkDate:'20190301',
// groupCount:160,
// dataCheckCount:160,
// electricCount:160,
// failedCount:0
// },
// {
// taskId: '20190228001',
// county: '东城区',
// groupNo: '00234653-03687587',
// checkDate:'20190301',
// groupCount:160,
// dataCheckCount:160,
// electricCount:160,
// failedCount:0
// },
// {
// taskId: '20190228001',
// county: '海淀区',
// groupNo: '00234653-03687587',
// checkDate:'20190301',
// groupCount:160,
// dataCheckCount:160,
// electricCount:160,
// failedCount:0
// }
// ]
// },
// {
// typeCode: '9',
// typeName: '邮寄证',
// typeSum: 500,
// isActive: 'false',
// countyList: [
// {
// taskId: '20190228001',
// county: '东城区',
// groupNo: '00234653-03687587',
// checkDate:'20190301',
// groupCount:160,
// dataCheckCount:160,
// electricCount:160,
// failedCount:1
// },
// {
// taskId: '20190228001',
// county: '海淀区',
// groupNo: '00234653-03687587',
// checkDate:'20190301',
// groupCount:160,
// dataCheckCount:160,
// electricCount:160,
// failedCount:0
// }
// ]
// }
// ]
$scope.searchTaskList = function(){ $scope.searchTaskList = function(){
$scope.isHistory=0;
HttpService.getTaskListByProcess(function(data){ HttpService.getTaskListByProcess(function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){ for(var i=0;i<$scope.cycleSheetData.length;i++){
...@@ -128,6 +61,20 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -128,6 +61,20 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
} }
$scope.searchTaskList(); $scope.searchTaskList();
$scope.searchHistory = function(){
$scope.isHistory=1;
HttpService.getHistoryTask($('#datepicker').val(),function(data){
$scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){
if(i==$scope.currentTab){
$scope.cycleSheetData[i].isActive=true;
}else{
$scope.cycleSheetData[i].isActive=false;
}
}
console.log("历史：",$scope.cycleSheetData)
})
}
//TODO 需要保证有废证的任务单不能下发 //TODO 需要保证有废证的任务单不能下发
//创建变量用来保存选中结果 //创建变量用来保存选中结果
...@@ -277,7 +224,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -277,7 +224,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.isHistory=0;
$scope.searchTaskList = function(){ $scope.searchTaskList = function(){
$scope.isHistory=0;
HttpService.getPingTaskListByProcess(function(data){ HttpService.getPingTaskListByProcess(function(data){
$scope.cycleSheetData = data.typeList; $scope.cycleSheetData = data.typeList;
$scope.total = data.total; $scope.total = data.total;
...@@ -293,6 +242,21 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -293,6 +242,21 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
} }
$scope.searchTaskList(); $scope.searchTaskList();
$scope.searchHistory = function(){
$scope.isHistory=1;
HttpService.getHistoryTask($('#datepicker').val(),function(data){
$scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){
if(i==$scope.currentTab){
$scope.cycleSheetData[i].isActive=true;
}else{
$scope.cycleSheetData[i].isActive=false;
}
}
console.log("历史：",$scope.cycleSheetData)
})
}
//创建变量用来保存选中结果 //创建变量用来保存选中结果
$scope.selected = []; $scope.selected = [];
var updateSelected = function (action, task) { var updateSelected = function (action, task) {
...@@ -411,10 +375,10 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -411,10 +375,10 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
taskIdList:arr taskIdList:arr
} }
console.log(json) console.log(json)
// HttpService.updateTaskListProcess(json,function(data){ HttpService.updateTaskListProcess(json,function(data){
// $scope.searchTaskList(); $scope.searchTaskList();
// MessageService.showAlert("转出完成") MessageService.showAlert("转出完成")
// }) })
}else{ }else{
MessageService.showAlert("请选择转出的任务单") MessageService.showAlert("请选择转出的任务单")
} }
...@@ -422,305 +386,6 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -422,305 +386,6 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
} }
}) })
// .controller('taskListPushingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
//
//
//
// //Date picker
// $('#datepicker').datetimepicker({
// minView: "month", //选择日期后，不会再跳转去选择时分秒
// language: 'zh-CN',
// format: 'yyyy-mm-dd',
// todayBtn: 1,
// autoclose: 1
// });
//
// $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//
// $scope.searchTaskList = function(){
// HttpService.getPingTaskListByProcess(function(data){
// $scope.cycleSheetData = data.typeList;
// $scope.total = data.total;
// for(var i=0;i<$scope.cycleSheetData.length;i++){
// if(i==$scope.currentTab){
// $scope.cycleSheetData[i].isActive=true;
// }else{
// $scope.cycleSheetData[i].isActive=false;
// }
// }
// console.log(data)
// })
// }
// $scope.searchTaskList();
//
// //创建变量用来保存选中结果
// $scope.selected = [];
// var updateSelected = function (action, task) {
// if (action === 'add' && $scope.selected.indexOf(task) === -1) {
// $scope.selected.push(task);
// }
// if (action === 'remove' && $scope.selected.indexOf(task) !== -1) $scope.selected.splice($scope.selected.indexOf(task), 1);
// };
// //更新某一列数据的选择
// var temp = 0;
// $rootScope.cardsTotal = 0;
// $scope.updateSelection = function ($event, task) {
// var checkbox = $event.target;
// var action = (checkbox.checked ? 'add' : 'remove');
// updateSelected(action, task);
//
// var sum = 0;
// var checks = document.getElementsByClassName("checkOneBox");
// for (var i=0;i<checks.length;i++){
// if (checks[i].checked) {
// sum += parseInt(checks[i].value);
// }
// }
// $rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
// temp = sum;
//
// };
// //全选操作
// $scope.selectAll = function (task,$event) {
// var checkbox = $event.target;
// var action = (checkbox.checked ? 'add' : 'remove');
// for (var i = 0; i < task.length; i++) {
// var contact = task[i];
// updateSelected(action, contact);
// }
//
//
// if(checkbox.checked){
// var sum = 0;
// var checks = document.getElementsByClassName("checkOneBox");
// for (var i = 0; i < checks.length; i++) {
// sum += parseInt(checks[i].value);
// }
// $rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
// temp = sum;
//
// }else{
// $rootScope.cardsTotal =0;
// temp = 0;
// }
// };
// $scope.isSelected = function (task) {
// return $scope.selected.indexOf(task) >= 0;
// };
// $scope.isSelectedAll = function (index) {
// return $scope.selected.length === $scope.cycleSheetData[index].countyList.length > 0;
// };
//
// $scope.currentTab = 0;
// $scope.func = function (index) {
// for (var idx in $scope.cycleSheetData) {
// if (index == idx) {
// $scope.cycleSheetData[idx].isActive = true;
// } else {
// $scope.cycleSheetData[idx].isActive = false;
// }
// }
// $scope.currentTab = index;
// }
//
// $scope.taskId=1;
// $scope.getPoliceList = function(groupList,taskId){
// $scope.policeList = groupList;
// if($scope.taskId==1){
// $scope.taskId=taskId;
// }else{
// $scope.taskId=1
// }
// console.log(groupList)
// }
//
// $scope.getSpecialCardsInfo = function(groupNo,specialCardCount){
// if(parseInt(specialCardCount)>0){
// ngDialog.open({
// template: 'dialogs/specailCardInfo.html' + urlTimeStamp(),
// width: 600,
// cache: false,
// closeByDocument:false,
// controller: ['$scope', function ($scope) {
// HttpService.getSpecialCardData(groupNo,function(data) {
// $scope.specailCardData = data;
// console.log(data)
// })
// }]
// });
// }else{
// MessageService.showAlert("该组中没有特殊证件")
// }
//
// }
//
// $scope.goes = function(){
// var checks = $(".checkOneBox:checked");
// if(checks.length>0){
// var arr = [];
// for (var i=0;i<checks.length;i++){
// arr.push(checks[i].value)
// }
// var json={
// process:$rootScope.loginData.roleList[0].process,
// name:$rootScope.loginData.name,
// taskIdList:arr
// }
// console.log(json)
// HttpService.updateTaskListProcess(json,function(data){
// $scope.searchTaskList();
// MessageService.showAlert("转出完成")
// })
// }else{
// MessageService.showAlert("请选择转出的任务单")
// }
//
// }
//
// })
// .controller('taskListCuttingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
// //Date picker
// $('#datepicker').datetimepicker({
// minView: "month", //选择日期后，不会再跳转去选择时分秒
// language: 'zh-CN',
// format: 'yyyy-mm-dd',
// todayBtn: 1,
// autoclose: 1
// });
//
// $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
// $scope.searchTaskList = function(){
// HttpService.getTaskListByProcess(function(data){
// $scope.cycleSheetData = data;
// for(var i=0;i<$scope.cycleSheetData.length;i++){
// if(i==$scope.currentTab){
// $scope.cycleSheetData[i].isActive=true;
// }else{
// $scope.cycleSheetData[i].isActive=false;
// }
// }
// console.log($scope.cycleSheetData)
// })
// }
// $scope.searchTaskList();
//
// //创建变量用来保存选中结果
// $scope.selected = [];
// var updateSelected = function (action, task) {
// if (action === 'add' && $scope.selected.indexOf(task) === -1) {
// $scope.selected.push(task);
// }
// if (action === 'remove' && $scope.selected.indexOf(task) !== -1) $scope.selected.splice($scope.selected.indexOf(task), 1);
// };
// //更新某一列数据的选择
// var temp = 0;
// $rootScope.cardsTotal = 0;
// $scope.updateSelection = function ($event, task) {
// var checkbox = $event.target;
// var action = (checkbox.checked ? 'add' : 'remove');
// updateSelected(action, task);
//
// var sum = 0;
// var checks = document.getElementsByClassName("checkOneBox");
// for (var i=0;i<checks.length;i++){
// if (checks[i].checked) {
// sum += parseInt(checks[i].value);
// }
// }
// $rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
// temp = sum;
//
// };
// //全选操作
// $scope.selectAll = function (task,$event) {
// var checkbox = $event.target;
// var action = (checkbox.checked ? 'add' : 'remove');
// for (var i = 0; i < task.length; i++) {
// var contact = task[i];
// updateSelected(action, contact);
// }
//
//
// if(checkbox.checked){
// var sum = 0;
// var checks = document.getElementsByClassName("checkOneBox");
// for (var i = 0; i < checks.length; i++) {
// sum += parseInt(checks[i].value);
// }
// $rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
// temp = sum;
//
// }else{
// $rootScope.cardsTotal =0;
// temp = 0;
// }
// };
// $scope.isSelected = function (task) {
// return $scope.selected.indexOf(task) >= 0;
// };
// $scope.isSelectedAll = function (index) {
// return $scope.selected.length === $scope.cycleSheetData[index].countyList.length > 0;
// };
//
// $scope.getPoliceList = function(taskId){
// ngDialog.open({
// template: 'dialogs/policeList.html' + urlTimeStamp(),
// width: 600,
// cache: false,
// closeByDocument:false,
// controller: ['$scope', function ($scope) {
// $scope.policeList = [
// {
// policeName:'东城派出所',
// dataCheckCount:100,
// printCount:0,
// qualityCheckCount:0,
// failedCount:0
// },
// {
// policeName:'西城派出所',
// dataCheckCount:200,
// printCount:0,
// qualityCheckCount:0,
// failedCount:1
// }
// ]
// }]
// });
// };
//
// $scope.currentTab = 0;
// $scope.func = function (index) {
// for (var idx in $scope.cycleSheetData) {
// if (index == idx) {
// $scope.cycleSheetData[idx].isActive = true;
// } else {
// $scope.cycleSheetData[idx].isActive = false;
// }
// }
// $scope.currentTab = index;
// }
//
// $scope.goes = function(){
// var checks = $(".checkOneBox:checked");
// var arr = [];
// for (var i=0;i<checks.length;i++){
// arr.push(checks[i].value)
// }
// var json={
// process:$rootScope.loginData.roleList[0].process,
// name:$rootScope.loginData.name,
// taskIdList:arr
// }
// console.log(json)
// HttpService.updateTaskListProcess(json,function(data){
// $scope.searchTaskList();
// MessageService.showAlert("下发完成")
// })
// }
//
//
// })
.controller('taskListSortingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) { .controller('taskListSortingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
//Date picker //Date picker
......
src/main/resources/static/views/task/taskListCutting.html
View file @ dec562da
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
<strong>任务单详情</strong> <strong>任务单详情</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchToday()">当前</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchTaskList()">当前</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
</div> </div>
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body" ng-if="isHistory==0">
<div ng-if="cycleSheetData.length>0"> <div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;"> <div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
...@@ -105,6 +105,89 @@ ...@@ -105,6 +105,89 @@
</div> </div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<div class="box-body" ng-if="isHistory==1">
<div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
</ul>
</a>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
<th>任务单编号</th>
<th>核验日期</th>
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList">
<tr>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
</div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body --> <!-- /.box-body -->
</div> </div>
<!-- /. box --> <!-- /. box -->
......
src/main/resources/static/views/task/taskListPreLocating.html
View file @ dec562da
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
<strong>任务单详情</strong> <strong>任务单详情</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchToday()">当前</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchTaskList()">当前</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
</div> </div>
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body" ng-if="isHistory==0">
<div ng-if="cycleSheetData.length>0"> <div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;"> <div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
...@@ -105,6 +105,89 @@ ...@@ -105,6 +105,89 @@
</div> </div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<div class="box-body" ng-if="isHistory==1">
<div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
</ul>
</a>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
<th>任务单编号</th>
<th>核验日期</th>
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList">
<tr>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
</div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body --> <!-- /.box-body -->
</div> </div>
......
src/main/resources/static/views/task/taskListPrint.html
View file @ dec562da
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
<strong>任务单详情</strong> <strong>任务单详情</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchToday()">当前</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchTaskList()">当前</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
</div> </div>
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body" ng-if="isHistory==0">
<div ng-if="cycleSheetData.length>0"> <div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;"> <div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
...@@ -114,6 +114,89 @@ ...@@ -114,6 +114,89 @@
<h4>暂无数据</h4> <h4>暂无数据</h4>
</div> </div>
</div> </div>
<div class="box-body" ng-if="isHistory==1">
<div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
</ul>
</a>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
<th>任务单编号</th>
<th>核验日期</th>
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList">
<tr>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
</div>
<!-- /.mail-box-messages -->
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
</div>
<!-- /.box-body --> <!-- /.box-body -->
</div> </div>
<!-- /. box --> <!-- /. box -->
......
src/main/resources/static/views/task/taskListPushing.html
View file @ dec562da
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
<strong>任务单详情</strong> <strong>任务单详情</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchToday()">当前</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchTaskList()">当前</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
</div> </div>
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body" ng-if="isHistory==0">
<div ng-if="cycleSheetData.length>0"> <div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;"> <div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
...@@ -105,6 +105,89 @@ ...@@ -105,6 +105,89 @@
</div> </div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<div class="box-body" ng-if="isHistory==1">
<div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
</ul>
</a>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
<th>任务单编号</th>
<th>核验日期</th>
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList">
<tr>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
</div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body --> <!-- /.box-body -->
</div> </div>
<!-- /. box --> <!-- /. box -->
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.html
View file @ dec562da
...@@ -97,15 +97,9 @@ ...@@ -97,15 +97,9 @@
<div class="box-body" ng-if="xmlPackageData.length==0"> <div class="box-body" ng-if="xmlPackageData.length==0">
<h4>暂无记录。</h4> <h4>暂无记录。</h4>
</div> </div>
<div ng-if="xmlPackageData.length>0"> <div style="padding-left: 27%;" ng-if="xmlPackageData.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination> <tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div> </div>
<div class="row" style="padding:0 25px;" ng-if="postMsgDetail.length>0">
<div class="col-md-11"></div>
<div class="col-md-1" style="text-align: right;">
<button id="rev-btn" class="btn btn-primary" data-loading-text="Loading..." ng-click="PreviewMytableRotate()" type="button">打印</button>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ dec562da
...@@ -38,19 +38,19 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -38,19 +38,19 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
width: 876, width: 876,
cache: false, cache: false,
controller: ['$scope','HttpService', function ($scope,HttpService) { controller: ['$scope','HttpService', function ($scope,HttpService) {
$scope.paginationConf = { // $scope.paginationConf = {
currentPage: 1, // currentPage: 1,
itemsPerPage: 10, // itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50] // perPageOptions: [10, 20, 30, 40, 50]
}; // };
$scope.upDate =uploadDate; $scope.upDate =uploadDate;
$scope.upCount=packageCount; $scope.upCount=packageCount;
$scope.getAnalyseData = function() { $scope.getAnalyseData = function() {
HttpService.analyseDataCount(uploadDate, function (data) { // HttpService.analyseDataCount(uploadDate, function (data) {
$scope.paginationConf.totalItems =data.respData.string; // $scope.paginationConf.totalItems =data.respData.string;
console.log($scope.paginationConf.totalItems) // console.log($scope.paginationConf.totalItems)
}) // })
HttpService.analyseData(uploadDate, $scope.paginationConf.currentPage, $scope.paginationConf.itemsPerPage, function (data) { HttpService.analyseData(uploadDate, function (data) {
$scope.resultData = data; $scope.resultData = data;
console.log($scope.resultData) console.log($scope.resultData)
}) })
...@@ -72,7 +72,9 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -72,7 +72,9 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
fd.append('file', files[i]); fd.append('file', files[i]);
} }
HttpService.uploadPackage(fd,function (data) { HttpService.uploadPackage(fd,function (data) {
console.log("导入项目的返回结果：",data) if(data){
MessageService.showAlert("上传成功")
}
}) })
} }
} }
......
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