格口导入时间查询，制空格口文件状态，删除不必要的表连接，PROD_DBA_YD改为PRODYD_DBA

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

@@ -202,5 +202,8 @@ public interface LogMapper {
     //置空Person_post身份证号
     @Update("UPDATE  PERSON_POST SET ID_CARD=NULL where PERSON_POST.FILE_ID=#{fileId}")
     public boolean updateNullIdDate(@Param("fileId")String fileId);
+    //置空Excel文件状态
+    @Update("UPDATE  PERSON_POST SET STATE=NULL where PERSON_POST.FILE_ID=#{fileId}")
+    public boolean updateNullIdFileState(@Param("fileId")String fileId);
 
 }

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

@@ -67,15 +67,15 @@ public interface PersonPostMapper {
     @Select("<script> " +
             "SELECT COUNT(*)  FROM PERSON_POST \n" +
             " LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID " +
-            " left join PREPRO_PERSON  on PERSON_POST.first_white = prepro_person.jmsfzslh " +
+//            " left join PREPRO_PERSON  on PERSON_POST.first_white = prepro_person.jmsfzslh " +
             " where 1=1 " +
             " <when test='applicantName!=\"\"'> and  PERSON_POST.APPLICANT_NAME = #{applicantName} </when>" +
             " <when test='emailNo!=\"\" '> and  PERSON_POST.WAYBILL_NUMBER =TO_NUMBER(#{emailNo}) </when>" +
             " <when test='orderNumber!=\"\"'> and  PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
             " <when test='state== 0 '> and  PERSON_POST.print_date is null  </when>" +
             " <when test='state== 1 '> and  PERSON_POST.print_date is not null  </when>" +
-            " <if test='notNull== 1 '> and PREPRO_PERSON.JMSFZSLH is not null </if>" +
-            " <if test='notNull== 0 '> and PREPRO_PERSON.JMSFZSLH is  null  </if>" +
+            " <if test='notNull== 1 '> and  PERSON_POST.FIRST_WHITE is not null </if>" +
+            " <if test='notNull== 0 '> and  PERSON_POST.FIRST_WHITE is  null  </if>" +
             " <when test='latticeMouthInformation!=\"\"'> and  PERSON_POST.LATTICE_MOUTH_INFORMATION=#{latticeMouthInformation} </when>" +
             " <when test='getToCounty!=\"\"'> and  PERSON_POST.GET_TO_COUNTY  in ( ${getToCounty} ) </when>" +
             " <when test='startDate!=\"\"'> and  subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8) between #{startDate} and #{endDate} </when>" +

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

@@ -561,7 +561,7 @@ public interface TaskListMapper {
             " from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE " +
-            "left join PROD_DBA_YD.prod_card_t@PRODYD_LINK on SPECIAL_CARD.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
+            "left join PRODYD_DBA.prod_card_t@PRODYD_LINK on SPECIAL_CARD.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
             "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <4 and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
             "where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID = #{process} order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_fast(@Param("process") long process,@Param("process2") long process2);
@@ -578,7 +578,7 @@ public interface TaskListMapper {
             "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE " +
-            "left join PROD_DBA_YD.prod_card_t@PRODYD_LINK on SPECIAL_CARD.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
+            "left join PRODYD_DBA.prod_card_t@PRODYD_LINK on SPECIAL_CARD.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
             "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <4 and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
             "where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID = #{process} and task.work_group = #{workGroup} order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_fast9(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);

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

@@ -154,6 +154,7 @@ public class LogServiceImpl implements LogService {
     @Override
     public boolean updateNullIdDate(String fileId){
         logMapper.updateNullIdDate(fileId);
+        logMapper.updateNullIdFileState(fileId);
         return true;
     }
 }

src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: oracle.jdbc.driver.OracleDriver
-    url: jdbc:oracle:thin:@192.168.10.65:1521:yingxin
+    url: jdbc:oracle:thin:@192.168.1.16:1521:yingxin
     username: yingxinyd
     password: yingxinyd
   servlet:

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

@@ -57,8 +57,8 @@
         <div class="box box-primary">
         <table class="table table-bordered" style="margin-bottom: 0;">
             <tr>
-                <td width="15%">XML导入时间:</td>
-                <td colspan="2" width="35%">
+                <td>XML导入时间:</td>
+                <td>
                     <div class="input-group date" style="width: 65%">
                         <div class="input-group-addon">
                             <i class="fa fa-calendar"></i>
@@ -67,6 +67,16 @@
                         <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
                     </div>
                 </td>
+                <td>格口导入日期:</td>
+                <td>
+                    <div class="input-group date" >
+                        <div class="input-group-addon">
+                            <i class="fa fa-calendar"></i>
+                        </div>
+                        <input type="text"  class="form-control pull-right" ng-model="gridDate" id="dateGrid"  readonly/>
+                        <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
+                    </div>
+                </td>
                 <td style="text-align: left;">
                     <button class="btn btn-primary" ng-click="getXmlPackage()">查询</button>
                 </td>

src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js

@@ -27,11 +27,20 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
             todayBtn: 1,
             autoclose: 1
         });
+        $('#dateGrid').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyy-mm-dd',
+            todayBtn: 1,
+            autoclose: 1
+        });
         //清除的代码
         $(".glyphicon-remove").click(function(){
             $($($(this).parent()).prev()).val("");
         })
         $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
+        $scope.gridDate = $filter("date")(new Date(), "yyyy-MM-dd");
+
 
         $scope.paginationConf = {
             currentPage: 1,
@@ -69,7 +78,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
                     $scope.wrongMsg = -1;
                     $scope.upDate =uploadDate;
                     $scope.upCount=packageCount;
-                    HttpService.analyseData(uploadDate, function (data) {
+                    HttpService.analyseData($("#dateGrid").val(), function (data) {
                         $scope.resultData = data;
                         console.log($scope.resultData)
                     })