修改提前领取登记 添加登记时间、登记人姓名

添加查询提前领取登记记录

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

@@ -356,7 +356,7 @@ public class ReceiptApi {
             jsonArray = JSONArray.fromObject(jsonStr);
             for (int i = 0; i < jsonArray.size(); i++) {
                 Map<String, Object> resultMap = (Map<String, Object>) jsonArray.get(i);
-                receiptService.updateDetail(formateAcceptNo(resultMap.get("acceptNo").toString()), resultMap.get("note").toString());
+                receiptService.updateDetail(formateAcceptNo(resultMap.get("acceptNo").toString()), resultMap.get("note").toString(), resultMap.get("name").toString());
             }
         }catch (Exception e) {
             logger.error("备注信息：" + jsonStr );
@@ -365,6 +365,17 @@ public class ReceiptApi {
         return true;
     }
 
+    /**
+     * 查询提前领取登记记录
+     *
+     * @return
+     */
+    @RequestMapping("queryDetailNote")
+    public List<DetailReceiptListEntity> queryDetailNote(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate,@RequestParam("name") String name) {
+        List<DetailReceiptListEntity> detailReceiptListEntityList = receiptService.selectDetailNote(replaceDate(startDate), replaceDate(endDate), replaceNullString(name));
+        return detailReceiptListEntityList;
+    }
+
 
     /**
      * 生成交接单

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

@@ -232,8 +232,8 @@ public interface ReceiptMapper {
     public DetailReceiptListEntity selectDetailByAcceptNo(@Param("acceptNo") String acceptNo);
 
 
-    @Update("update DETAIL_RECEIPT_LIST set NOTE = #{note} WHERE ACCEPT_NO=#{acceptNo} or CARD_ID= #{acceptNo}")
-    public boolean updateDetail(@Param("acceptNo")String accept,@Param("note")String note);
+    @Update("update DETAIL_RECEIPT_LIST set NOTE = #{note},submit_date = sysdate,submit_name = #{name} WHERE ACCEPT_NO=#{acceptNo} or CARD_ID= #{acceptNo}")
+    public boolean updateDetail(@Param("acceptNo")String accept,@Param("note")String note,@Param("name")String name);
 
     /**
      * 更新交接单是否已打印
@@ -269,4 +269,13 @@ public interface ReceiptMapper {
             "where to_char(DOWNLOAD_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate}")
     public List<Map<String, Object>> selectPoliceDataByDownLoadDate(@Param("startDate") String startDate,@Param("endDate") String endDate);
 
+    @Select("<script> select * from DETAIL_RECEIPT_LIST " +
+            "where to_char(SUBMIT_DATE,'yyyyMMdd') between #{startDate} and #{endDate} " +
+            "<if test = 'name != null'> " +
+            " and SUBMIT_NAME = #{name} " +
+            " </if>" +
+            "</script>")
+    public List<DetailReceiptListEntity> selectDetailNote(@Param("startDate") String startDate,@Param("endDate") String endDate ,@Param("name")String name);
+
+
 }

src/main/java/com/yxproject/start/service/ReceiptService.java

@@ -62,7 +62,9 @@ public interface ReceiptService {
 
     public DetailReceiptListEntity selectDetailByAcceptNo(String acceptNo);
 
-    public boolean updateDetail(String accept,String note);
+    public boolean updateDetail(String accept,String note,String name);
+
+    public List<DetailReceiptListEntity> selectDetailNote(String startDate,String endDate,String name);
 
     public Map<String, Object> selectReceiptList(List<Integer> stringList,long typeCode);
 

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

@@ -143,9 +143,9 @@ public class ReceiptServiceImpl implements ReceiptService {
     }
 
     @Override
-    public boolean updateDetail(String accept, String note) {
+    public boolean updateDetail(String accept,String note,String name) {
 
-        return receiptMapper.updateDetail(accept,note);
+        return receiptMapper.updateDetail(accept,note,name);
     }
 
     @Override
@@ -341,6 +341,13 @@ public class ReceiptServiceImpl implements ReceiptService {
     }
 
 
+    @Override
+    public List<DetailReceiptListEntity> selectDetailNote(String startDate, String endDate, String name) {
+        List<DetailReceiptListEntity> detailReceiptListEntityList = receiptMapper.selectDetailNote(startDate, endDate, name);
+
+        return detailReceiptListEntityList;
+    }
+
     private List<Map<String, Object>> formateMap(List<Map<String, Object>> maplist) {
         Map<String, Object> typeMap = new LinkedHashMap<>();
         for (Map o : maplist) {