Commit ef9037c6 authored by dahai's avatar dahai

修改查询所有身份证详单

parent 4d0aca4a
...@@ -127,9 +127,9 @@ public class TaskListApi { ...@@ -127,9 +127,9 @@ public class TaskListApi {
JSONArray failedList = (JSONArray) jsonObject.get("failedList"); JSONArray failedList = (JSONArray) jsonObject.get("failedList");
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();
List<String> list = (List<String>) jsonArray; List<String> list = (List<String>) jsonArray;
return taskListService.updateState2(failedList, list, process, name, Long.valueOf(printer)); return taskListService.updateState2(failedList, list, process, name);
} }
......
...@@ -26,14 +26,12 @@ public interface CardDetailedListMapper { ...@@ -26,14 +26,12 @@ public interface CardDetailedListMapper {
/** /**
*查询详单数据 *查询详单数据
*/ */
@Select("select * from DETAIL_RECEIPT_LIST where CARD_ID = #{idCard}") @Select("select * from DETAIL_RECEIPT_LIST where CARD_ID = #{idCard}")
public List<DetailReceiptListEntity> findCardDetailedListByIdCard(@Param("idCard")String idCard); public List<DetailReceiptListEntity> findCardDetailedListByIdCard(@Param("idCard")String idCard);
/** /**
*查询详单数据 *查询详单数据
*/ */
@Select("select DETAIL_RECEIPT_LIST.*,RECEIPT_LIST.state,PROD_TRACE_T.DOWNLOAD_DATE,PROD_TRACE_T.ELECTRIC_WRITE_DATE,PROD_TRACE_T.CHECK_DATE from DETAIL_RECEIPT_LIST \n" + @Select("select DETAIL_RECEIPT_LIST.*,RECEIPT_LIST.state,PROD_TRACE_T.DOWNLOAD_DATE,PROD_TRACE_T.ELECTRIC_WRITE_DATE,PROD_TRACE_T.CHECK_DATE from DETAIL_RECEIPT_LIST \n" +
"left join PROD_CARD_T@PROD_LINK ON PROD_CARD_T.ID_NO=DETAIL_RECEIPT_LIST.CARD_ID\n" + "left join PROD_CARD_T@PROD_LINK ON PROD_CARD_T.ID_NO=DETAIL_RECEIPT_LIST.CARD_ID\n" +
"LEFT JOIN PROD_TRACE_T@PROD_LINK ON PROD_TRACE_T.ACCEPT_NO = PROD_CARD_T.ACCEPT_NO\n" + "LEFT JOIN PROD_TRACE_T@PROD_LINK ON PROD_TRACE_T.ACCEPT_NO = PROD_CARD_T.ACCEPT_NO\n" +
......
...@@ -1160,8 +1160,8 @@ public interface TaskListMapper { ...@@ -1160,8 +1160,8 @@ public interface TaskListMapper {
* @param taskId * @param taskId
* @return * @return
*/ */
@Update("UPDATE TASK SET TASK_STATE_ID=#{process},PRINT_OUT_NAME=#{name},PRINTER_ID =#{printer} WHERE TASK_ID = #{taskId} ") @Update("UPDATE TASK SET TASK_STATE_ID=#{process},PRINT_OUT_NAME=#{name} WHERE TASK_ID = #{taskId} ")
public boolean updateState2(@Param("taskId") String taskId,@Param("process") String process,@Param("name") String name,@Param("printer") long printer); public boolean updateState2(@Param("taskId") String taskId,@Param("process") String process,@Param("name") String name);
/** /**
*更改任务单状态 *更改任务单状态
......
...@@ -25,7 +25,7 @@ public interface TaskListService { ...@@ -25,7 +25,7 @@ public interface TaskListService {
public boolean updateState1(List<String> failedlist,List<String> list,String process,String name,String workGroup); public boolean updateState1(List<String> failedlist,List<String> list,String process,String name,String workGroup);
public boolean updateState2(List<String> failedlist,List<String> list,String process,String name,long printer); public boolean updateState2(List<String> failedlist,List<String> list,String process,String name);
public List<Object> selectByCountyAtACCU(String date); public List<Object> selectByCountyAtACCU(String date);
......
...@@ -115,17 +115,17 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -115,17 +115,17 @@ public class TaskListServiceImpl implements TaskListService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean updateState2(List<String> failedlist,List<String> list, String process, String name, long printer) { public boolean updateState2(List<String> failedlist,List<String> list, String process, String name) {
if ("2".equals(process)){ if ("2".equals(process)){
for (String taskId : list) { for (String taskId : list) {
taskListMapper.updateState2(taskId, process, name, printer); taskListMapper.updateState2(taskId, process, name);
} }
for (String taskId : list) { for (String taskId : list) {
taskListMapper.updateState2(taskId, (Long.valueOf(process)+2)+"", name, printer); taskListMapper.updateState2(taskId, (Long.valueOf(process)+2)+"", name);
} }
}else { }else {
for (String taskId : list) { for (String taskId : list) {
taskListMapper.updateState2(taskId, process, name, printer); taskListMapper.updateState2(taskId, process, name);
} }
} }
......
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