Commit 78cf378b authored by dahai's avatar dahai

push

parent f0c9ef0e
...@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
...@@ -50,7 +51,7 @@ public class FailedCardApi { ...@@ -50,7 +51,7 @@ public class FailedCardApi {
* @return * @return
*/ */
@RequestMapping("selectInfoByCardId") @RequestMapping("selectInfoByCardId")
public List<Map<String, Object>> selectInfoByCardId(@RequestBody String jsonStr) { public List<Map<String, Object>> selectInfoByCardId(@RequestBody String jsonStr ) {
JSONArray jsonarray = JSONArray.fromObject(jsonStr); JSONArray jsonarray = JSONArray.fromObject(jsonStr);
List<Map<String, Object>> resultList = new ArrayList<>(); List<Map<String, Object>> resultList = new ArrayList<>();
for (Object o : jsonarray) { for (Object o : jsonarray) {
......
...@@ -1032,7 +1032,7 @@ public interface TaskListMapper { ...@@ -1032,7 +1032,7 @@ public interface TaskListMapper {
"left join task on FAILED_CARD.task_id= task.TASK_ID \n" + "left join task on FAILED_CARD.task_id= task.TASK_ID \n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE \n" + "left join 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 COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where to_char(FAILED_CARD.FINISH_DATE,'yyyyMMdd') = #{date} order by FAILED_CARD.FAILED_CARD_ID") "where to_char(FAILED_CARD.ALLOT_DATE,'yyyyMMdd') = #{date} order by FAILED_CARD.FAILED_CARD_ID")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed6(@Param("date") String date); public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed6(@Param("date") String date);
......
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