修改交接单生成方法

src/main/java/com/yxproject/start/entity/DetailReceiptListEntity.java

@@ -21,7 +21,26 @@ public class DetailReceiptListEntity {
     private Long receiptId;
     private Long sex;
     private String gajg_mc;
+    private String submitName;
+    private String submitDate;
+    @Basic
+    @Column(name = "SUBMIT_NAME")
+    public String getSubmitName() {
+        return submitName;
+    }
 
+    public void setSubmitName(String submitName) {
+        this.submitName = submitName;
+    }
+    @Basic
+    @Column(name = "SUBMIT_DATE")
+    public String getSubmitDate() {
+        return submitDate;
+    }
+
+    public void setSubmitDate(String submitDate) {
+        this.submitDate = submitDate;
+    }
 
     public String getGajg_mc() {
         return gajg_mc;

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

@@ -267,7 +267,7 @@ public interface ReceiptMapper {
             "left join COUNTY_DIC on substr(RECEIPT_LIST.POLICE_CODE,0,6) = COUNTY_DIC.COUNTY_CODE" +
             " where CHECK_DATE is not null and RECEIPT_LIST.IS_PRINT = 0  " +
             "<if test ='startDate != null'> " +
-            "and to_char(CHECK_DATE,'yyyyMMddhhmmss')  BETWEEN  #{startDate} and #{endDate}  " +
+            "and to_char(CHECK_DATE,'yyyyMMddhhmm')  BETWEEN  #{startDate} and #{endDate}  " +
             "</if>" +
             " ORDER BY RECEIPT_LIST.POLICE_CODE" +
             "</script> " +
@@ -282,7 +282,7 @@ public interface ReceiptMapper {
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = RECEIPT_LIST.CARD_TYPE_ID \n" +
             "left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO = RECEIPT_LIST.POLICE_CODE\n" +
             "left join COUNTY_DIC on  RECEIPT_LIST.FJDM  = COUNTY_DIC.COUNTY_CODE" +
-            " where to_char(RECEIPT_DATE,'yyyyMMddhhmmss')  BETWEEN  ${startDate} and ${endDate} order by RECEIPT_LIST.id  ")
+            " where to_char(RECEIPT_DATE,'yyyyMMddhhmm')  BETWEEN  ${startDate} and ${endDate} order by RECEIPT_LIST.id  ")
     public List<Map<String,Object>> selectReceiptDateByReceiptDate(@Param("startDate") String startDate,@Param("endDate") String endDate);
 
 
@@ -381,7 +381,7 @@ public interface ReceiptMapper {
 
     //查询交接单详单 组内数量
     @Select("select UPLOAD_NO,ACCEPT_NO,NAME,ID_NO,SIGN_GOVT,SEX_NO\n" +
-            "from PROD_DBA.prod_card_t@PROD_LINK cardT \n" +
+            "from PRODYD_DBA.prod_card_t@PRODYD_LINK cardT \n" +
             "where cardT.ACCEPT_NO not in \n" +
             "(select ACCEPT_NO from  SPECIAL_CARD \n" +
             "where GROUP_NO like #{groupNo}  " +

src/main/resources/static/js/service.js

@@ -621,7 +621,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
             selectTagPrintData:function(idCard,startDate,endDate,success){
                 $http({
                     method: 'GET',
-                    url: "../ReceiptApi/createReceiptList"+urlTimeStamp(),
+                    url: "../ReceiptApi/createReceiptListALl"+urlTimeStamp(),
                     params:{
                         id:idCard,
                         name:$rootScope.loginData.name,

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

@@ -12,23 +12,23 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
     .controller('receitpCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
 
         //Date picker
-        $('#datepicker1').datetimepicker({
-            minView: 0, //选择到分钟
-            language: 'zh-CN',
-            format: 'yyyy-MM-dd HH:mm:ss',
-            todayBtn: 1,
-            autoclose: 1
-        });
-        $('#datepicker2').datetimepicker({
-            minView: 0, //选择到分钟
-            language: 'zh-CN',
-            format: 'yyyy-MM-dd HH:mm:ss',
-            todayBtn: 1,
-            autoclose: 1
-        });
-
-        $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd 00:00:00");
-        $scope.choseDate_end = $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
+             $('#datepicker1').datetimepicker({
+                 minView: 0, //选择到分钟
+                 language: 'zh-CN',
+                 format: 'yyyy-mm-dd hh:ii',
+                 todayBtn: 1,
+                 autoclose: 1
+             });
+             $('#datepicker2').datetimepicker({
+                 minView: 0, //选择到分钟
+                 language: 'zh-CN',
+                 format: 'yyyy-mm-dd hh:ii',
+                 todayBtn: 1,
+                 autoclose: 1
+             });
+
+             $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd 00:00");
+             $scope.choseDate_end = $filter("date")(new Date(), "yyyy-MM-dd HH:mm");
 
 
         $scope.downloadGAinfo = function(){
@@ -97,7 +97,6 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
                         $scope.receitpData[i].isActive=false;
                     }
                 }
-                console.log($scope.receitpData,"初始化");
             });
         };
         if($rootScope.loginData.login==true&&$scope.isHistory == -1){
@@ -117,7 +116,6 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
                         $scope.receitpData[i].isActive=false;
                     }
                 }
-                console.log($scope.receitpData,"点击查询");
             })
         }
 
@@ -135,16 +133,13 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
                         $scope.receitpHistoryData[i].isActive=false;
                     }
                 }
-                console.log($scope.receitpHistoryData);
             })
         }
 
 
         $scope.checkAllPolice = function ($event,typeCode,countyCode) {
-            console.log(countyCode)
             var checkAllPolice = $event.target;
             var checkbox =document.getElementsByName("checkPolice"+typeCode+countyCode);
-            console.log(checkbox.length);
             for(var i=0;i<checkbox.length;i++){
                 if(checkAllPolice.checked) {
                     checkbox[i].checked = true;
@@ -163,7 +158,6 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
             }else{
                 typeCode = $scope.receitpHistoryData[$scope.currentTab].typeCode;
             }
-            console.log(typeCode)
             var json={
                 type:typeCode,
                 list:[]
@@ -210,7 +204,6 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
                             $scope.result.push(json);
                         }
                     }
-                    console.log("result",$scope.result);
 
                     $timeout(function () {
                         for (var i=0;i<$scope.result.length;i++){