Merge branch 'dev' of…

Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev

src/main/java/com/yxproject/start/api/ReceiptApi.java

@@ -208,6 +208,27 @@ public class ReceiptApi {
         return resultList;
     }
 
+    /**
+     * 根据任务单查询详细信息
+     *
+     * @param receiptId 交接单ID
+     * @return
+     */
+    @RequestMapping("selectDetailListByReceiptId")
+    public Map<String, Object> selectDetailListByReceiptId( String receiptId) {
+        Map<String,Object> mapList = new HashMap<>();
+        List<Map<String, Object>> resultList = receiptService.selectDetailList(receiptId);
+        if (resultList.size()>0){
+            mapList.put("policeName",resultList.get(0).get("GAJG_MC"));
+            mapList.put("groupNo",resultList.get(0).get("ACCEPT_NO").toString().substring(0,8));
+            mapList.put("checkDate",resultList.get(0).get("RECEIPT_DATE"));
+            mapList.put("count",resultList.get(0).get("FINISH_COUNT"));
+        }
+        mapList.put("list",resultList);
+
+        return mapList;
+    }
+
     /**
      * 数据核验--更改交接单状态
      *

src/main/java/com/yxproject/start/mapper/ReceiptMapper.java

@@ -119,7 +119,12 @@ public interface ReceiptMapper {
     public Map<String,Object> selectReceiptList(@Param("id") String id);
 
     //根据交接单号查详单信息
-    @Select("select *  from detail_receipt_list where receipt_id=#{receiptId}")
+    @Select("select detail_receipt_list.UPLOAD_NO,detail_receipt_list.ACCEPT_NO,detail_receipt_list.NAME,detail_receipt_list.POLICE_CODE,detail_receipt_list.CARD_ID\n" +
+            ",detail_receipt_list.NOTE,detail_receipt_list.SIGN_GOVT,detail_receipt_list.RECEIPT_ID,detail_receipt_list.SEX,\n" +
+            "RECEIPT_LIST.QR_CODE,RECEIPT_LIST.RECEIPT_DATE,RECEIPT_LIST.FINISH_COUNT,GAJG_DM.GAJG_MC\n" +
+            "from detail_receipt_list left join RECEIPT_LIST on detail_receipt_list.RECEIPT_ID = RECEIPT_LIST.id\n" +
+            "left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" +
+            "where receipt_id= #{receiptId}")
     public List<Map<String,Object>> selectDetailList(@Param("receiptId") String receiptId);
 
     //根据传入的交接单ID和复核人ID插入复核人、复核时间、更改状态

src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java

@@ -283,11 +283,13 @@ public class ReceiptServiceImpl implements ReceiptService {
                 int validCount = 0;
                 String countyName = null;
                 String countyCode = null;
+                String receiptDate= null;
                 List<Map<String, Object>> countyMapList = mapList.get(taskId);
                 for (Map<String, Object> countyMap : countyMapList) {
                     countyCode = countyMap.get("COUNTY_CODE") + "";
                     countyName = countyMap.get("COUNTYNAME") + "";
                     typeName = countyMap.get("CARD_TYPE_ID") + "";
+                    receiptDate = countyMap.get("RECEIPT_DATE")+"";
                     typeSum += Integer.valueOf(countyMap.get("FINISH_COUNT") + "");
                     validCount += Integer.valueOf(countyMap.get("FINISH_COUNT") + "");
                 }
@@ -316,6 +318,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                 countyMapGroup.put("policeList", countyMapList);
                 countyMapGroup.put("countyName", countyName);
                 countyMapGroup.put("countyValidCount", validCount);
+                countyMapGroup.put("receiptDate",receiptDate);
                 countyList.add(countyMapGroup);
             }
             mapType.put("typeCode", typeName);