Commit 1356b74c authored by suichenguang's avatar suichenguang

交接单

parent 1090ffec
......@@ -75,7 +75,10 @@ public class ReceiptApi {
//已经生成特证交接单,不做操作。
}
} else {
System.out.println("333333333333333333333333333333333333333333333");
//判断组里有几个特证,去掉特证的交接单
// if (
//
// ){}else()
//查询交接单所需数据
Map<String, Object> receiptListDate = receiptService.selectReceiptListDate(id);
ReceiptListEntity receiptListEntity = new ReceiptListEntity();
......@@ -154,9 +157,9 @@ public class ReceiptApi {
for (int i=0;i<resultMap.size();i++){
String groupNo= (String) resultMap.get(i).get("QR_CODE");
Map<String,Object> map= receiptService.selectCountTime(groupNo);
resultMap.get(i).put("download",map.get("download"));
resultMap.get(i).put("checkerCount",map.get("checkerCount"));
resultMap.get(i).put("electricCount",map.get("electricCount"));
resultMap.get(i).put("download",map.get("DOWNLOAD"));
resultMap.get(i).put("checkerCount",map.get("CHECKERCOUNT"));
resultMap.get(i).put("electricCount",map.get("ELECTRICCOUNT"));
}
return resultMap;
}
......@@ -182,11 +185,10 @@ public class ReceiptApi {
*/
@RequestMapping("selectDetailList")
public List<Map<String,Object>> selectDetailList(@RequestParam("receiptId") String receiptId){
List<Map<String, Object>> resultList = receiptService.selectDetailList(receiptId);
for (int i=0;i<resultList.size();i++){
String acceptNo= (String) resultList.get(i).get("ACCEPT_NO");
Map<String,Object> map= receiptService.selectTimes(acceptNo);
resultList.get(i).put("downloadDate",map.get("DOWNLOADDATE"));
resultList.get(i).put("checkDate",map.get("CHECKDATE"));
......
......@@ -141,6 +141,7 @@ public interface ReceiptMapper {
@Select("select \n" +
"count(prod_trace_t.download_no)as download,\n" +
"count(prod_trace_t.checker_no) as checkerCount,\n" +
......@@ -149,6 +150,7 @@ public interface ReceiptMapper {
"WHERE subStr(ACCEPT_NO,0,8) = #{groupNo} or ACCEPT_NO=#{groupNo}")
public Map<String,Object> selectCountTime(@Param("groupNo") String groupNo);
@Select("select \n" +
"prod_trace_t.DOWNLOAD_DATE as downloadDate,\n" +
"prod_trace_t.CHECK_DATE as checkDate,\n" +
......
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