页面调整

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

@@ -235,7 +235,7 @@ public class LogApi {
             for (int i = 0; i < invalidList.size(); i++) {
                 Map<String, Object> noteMap = invalidList.get(i);
                 String uploadNo=noteMap.get("JMSFZSLH").toString();
-                String note= "出生日期不符合";
+                String note= "出生日期填写不符！办证人信息："+noteMap.get("XM").toString()+"-"+noteMap.get("CSRQ").toString();
                 String name="system";
                 personPostService.cancelPostByAcceptNo(uploadNo,note,name);
             }

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

@@ -211,7 +211,7 @@ public interface LogMapper {
     public List<Map<String, Object>> selectPersonPostUnanalysis(@Param("uploadDate")String uploadDate);
 
 
-    @Select("select DISTINCT PREPRO_PERSON.JMSFZSLH \n" +
+    @Select("select DISTINCT PREPRO_PERSON.JMSFZSLH,PREPRO_PERSON.XM,PREPRO_PERSON.CSRQ \n" +
             "FROM PERSON_POST " +
             "LEFT JOIN PREPRO_PERSON ON PERSON_POST.FIRST_WHITE =  PREPRO_PERSON.JMSFZSLH \n" +
             "LEFT JOIN FILES ON FILES.ID =  PREPRO_PERSON.FILE_ID \n" +

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

@@ -149,7 +149,7 @@ public interface PersonPostMapper {
     @Insert("INSERT INTO AUDLIT_FAILURE (UPLOAD_NO,UP_TIUME,REMARKS,NAME) VALUES (#{uploadNo},SYSDATE,#{remarks},#{name})")
     public boolean cancelPostByAcceptNo(@Param("uploadNo")String uploadNo, @Param("remarks")String remarks, @Param("name")String name);
 
-    @Select("SELECT af.*,pp.APPLICANT_NAME,pp.NATURE_OF_THE_INFORMATION,pp.RECIPIENT_NAME,pp.RECIPIENT_ADDRESS,pp.RECIPIENT_PHONE FROM AUDLIT_FAILURE  af\n" +
+    @Select("SELECT af.*,pp.APPLICANT_NAME,pp.NATURE_OF_THE_INFORMATION,pp.RECIPIENT_NAME,pp.RECIPIENT_ADDRESS,pp.RECIPIENT_PHONE,pp.ORDER_NUMBER FROM AUDLIT_FAILURE  af\n" +
             "left join PERSON_POST pp \n" +
             "on af.UPLOAD_NO=pp.FIRST_WHITE " +
             "WHERE TO_CHAR(UP_TIUME,'yyyyMMdd') BETWEEN #{beginDate} AND #{endDate}")

src/main/resources/static/dialogs/showDetail.html

@@ -17,7 +17,7 @@
         <tr>
             <td style="text-align:left;"><strong>订单状态:</strong>{{item.orderState}}</td>
             <td style="text-align:left;"><strong>openid:</strong>{{item.openid}}</td>
-            <td style="text-align:left;"><strong>申请人姓名:</strong>{{item.applicantName}}</td>
+            <td style="text-align:left;"><strong>内件性质:</strong>{{item.natureOfTheInternal}}</td>
         </tr>
         <tr>
             <td style="text-align:left;"><strong>*寄件人姓名:</strong>{{item.senderName}}</td>
@@ -40,9 +40,12 @@
             <td style="text-align:left;"><strong>格口信息:</strong>{{item.latticeMouthInformation}}</td>
         </tr>
         <tr>
-            <td style="text-align:left;"><strong>内件性质:</strong>{{item.natureOfTheInternal}}</td>
             <td style="text-align:left;"><strong>内件信息:</strong>{{item.natureOfTheInformation}}</td>
-            <td style="text-align:left;"><strong>备注:</strong>{{item.note}}</td>
+            <td style="text-align:left;"><strong>申请人姓名:</strong>{{item.applicantName}}</td>
+            <td style="text-align:left;"><strong>出生日期:</strong>{{item.birthDate|date:'yyyy-MM-dd'}}</td>
+        </tr>
+        <tr>
+            <td colspan="3" style="text-align:left;"><strong>备注:</strong><h4>{{item.note}}</h4></td>
         </tr>
     </table>
 </div>
\ No newline at end of file

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

@@ -117,6 +117,7 @@
                         <thead>
                         <tr>
                             <th>NO.</th>
+                            <th>订单号</th>
                             <th>上传受理号</th>
                             <th>提交人</th>
                             <th>提交时间</th>
@@ -132,6 +133,7 @@
                         <tbody>
                             <tr ng-repeat="item in afInfo | orderBy:'ID'">
                                 <td>{{$index+1}}</td>
+                                <td>{{item.ORDER_NUMBER}}</td>
                                 <td>{{item.UPLOAD_NO}}</td>
                                 <td>{{item.NAME}}</td>
                                 <td>{{item.UP_TIUME | date:'yyyy-MM-dd HH:mm:ss'}}</td>

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

@@ -145,7 +145,7 @@
                     <table class="table table-bordered table-hover" ng-if="postData.length>0">
                         <thead>
                         <tr>
-                            <!--<th>NO.</th>-->
+                            <th>NO.</th>
                             <th>订单号</th>
                             <th>正-反向邮件号</th>
                             <th>受理号</th>
@@ -160,7 +160,7 @@
                         </thead>
                         <tbody>
                         <tr ng-repeat="item in postData | orderBy:item.id">
-                            <!--<td>{{item.id}}</td>-->
+                            <td>{{$index+1}}</td>
                             <td>{{item.orderNumber}}</td>
                             <td>{{item.waybillNumber}} -
                                 {{item.backWaybillNumber}}