Merge branch 'dev' of…

Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_beijing_auxiliary_YD into dev

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

@@ -55,7 +55,7 @@ public interface DetailReceiptListMapper {
      *
      * @return
      */
-    @Update("UPDATE DETAIL_RECEIPT_LIST set RECEIPT_ID = #{reciptId} where id =#{id}")
-    public boolean updateDetailReceiptList(@Param("id") long id, @Param("reciptId") long reciptId);
+    @Update("UPDATE DETAIL_RECEIPT_LIST set RECEIPT_ID = #{reciptId},POLICE_CODE= #{policeCode} where id =#{id}")
+    public boolean updateDetailReceiptList(@Param("id") long id, @Param("reciptId") long reciptId,@Param("policeCode")String policeCode);
 
 }

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

@@ -42,6 +42,6 @@ public class DetailReceiptListServiceImpl implements DetailReceiptListService {
 
     @Override
     public boolean updateDetailReceiptList(DetailReceiptListEntity detailReceiptListEntity, long reciptId) {
-        return detailReceiptListMapper.updateDetailReceiptList(detailReceiptListEntity.getId(), reciptId);
+        return detailReceiptListMapper.updateDetailReceiptList(detailReceiptListEntity.getId(), reciptId,detailReceiptListEntity.getPoliceCode());
     }
 }

src/main/resources/static/views/confirmNotDeliveredInfo/confirmNotDeliveredInfo.html

@@ -45,8 +45,10 @@
                             <th>No.</th>
                             <th>正向运单号</th>
                             <th>身份证号码</th>
+                            <th>身份证受理号</th>
                             <th>退回原因</th>
-                            <th>登记人姓名</th>
+                            <th>登记日期</th>
+                            <th>登记人</th>
                             <th>备注</th>
                         </tr>
                         </thead>
@@ -56,7 +58,9 @@
                             <td>{{$index+1}}</td>
                             <td>{{item.WAYBILL_NUMBER}}</td>
                             <td>{{item.CARD_ID}}</td>
+                            <td>{{item.JMSFZSLH}}</td>
                             <td>{{item.REASON}}</td>
+                            <td>{{item.BACK_DATE|date:'yyyy-MM-dd'}}</td>
                             <td>{{item.REGISTER_NAME}}</td>
                             <td>{{item.NOTE}}</td>
                         </tr>

src/main/resources/static/views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.html

@@ -104,7 +104,8 @@
                         <th>正向运单号</th>
                         <th>身份证号码</th>
                         <th>退回原因</th>
-                        <th>登记人姓名</th>
+                        <th>登记日期</th>
+                        <th>登记人</th>
                         <th>备注</th>
                         <th></th>
                     </tr>
@@ -115,6 +116,7 @@
                         <td>{{item.WAYBILL_NUMBER}}</td>
                         <td>{{item.CARD_ID}}</td>
                         <td>{{item.REASON}}</td>
+                        <td>{{item.BACK_DATE|date:'yyyy-MM-dd'}}</td>
                         <td>{{item.REGISTER_NAME}}</td>
                         <td>{{item.NOTE}}</td>
                         <td ng-if="item.RECEIVE_DATE==null"><button class="btn btn-primary" ng-click="deleteDeliveredFailedById(item.ID)">删除</button></td>

src/main/resources/static/views/searchCard/searchCard.html

@@ -87,11 +87,11 @@
                             <td>{{item.ID_NO}}</td>
                             <td ng-if="item.SEX_NO==1">男</td>
                             <td ng-if="item.SEX_NO==2">女</td>
-                            <td>{{item.SIGN_GOVT}}</td>
+                            <td>{{item.POLICE_NAME}}</td>
                             <td>{{item.BEGIN_DATE | myDateFilter}}</td>
                             <td ng-if="item.EXPIRE_DATE=='长期'">{{item.EXPIRE_DATE}}</td>
                             <td ng-if="item.EXPIRE_DATE!='长期'">{{item.EXPIRE_DATE | myDateFilter}}</td>
-                            <td>{{item.POLICE_NAME}}</td>
+                            <td>{{item.GAJG1}}</td>
                         </tr>
                         </tbody>
                     </table>
@@ -124,7 +124,6 @@
                             <th>起始有效期</th>
                             <th>终止有效期</th>
                             <th>上报受理单位</th>
-                            <th>数据状态</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -138,12 +137,11 @@
                             <td>{{item.ID_NO}}</td>
                             <td ng-if="item.SEX_NO==1">男</td>
                             <td ng-if="item.SEX_NO==2">女</td>
-                            <td>{{item.SIGN_GOVT}}</td>
+                            <td>{{item.POLICE_NAME}}</td>
                             <td>{{item.BEGIN_DATE | myDateFilter}}</td>
                             <td ng-if="item.EXPIRE_DATE=='长期'">{{item.EXPIRE_DATE}}</td>
                             <td ng-if="item.EXPIRE_DATE!='长期'">{{item.EXPIRE_DATE | myDateFilter}}</td>
-                            <td>{{item.POLICE_NAME}}</td>
-                            <td></td>
+                            <td>{{item.GAJG1}}</td>
                         </tr>
                         </tbody>
                     </table>