Merge remote-tracking branch 'origin/dev' into dev

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

@@ -62,8 +62,9 @@ public class InfoManagementApi {
     @RequestMapping("deleteInfo")
     @Transactional(rollbackFor = Exception.class)
     public boolean deleteInfo(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate){
-       boolean result=  infoManagementService.deleteInfo(beginFileName,endFileName,gajgMc,replaceDate(beginDate),replaceDate(endDate));
-       return result;
+
+        boolean result=  infoManagementService.deleteInfo(beginFileName,endFileName,gajgMc,replaceDate(beginDate),replaceDate(endDate));
+        return result;
     }
 
     /**

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

 package com.yxproject.start.api;
 
+import com.yxproject.start.entity.DetailReceiptListEntity;
 import com.yxproject.start.service.ReceiptService;
+import net.sf.json.JSONArray;
 import org.apache.ibatis.annotations.Param;
+import org.omg.CORBA.PUBLIC_MEMBER;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
@@ -209,6 +210,40 @@ public class ReceiptApi {
     }
 
 
+    /**
+     * 根据受理号查询详单信息
+     * @param jsonStr
+     * @return
+     */
+    @RequestMapping("selectDetailByAcceptNo")
+    public List<DetailReceiptListEntity> selectDetailByAcceptNo(@RequestBody String jsonStr){
+        JSONArray jsonarray = JSONArray.fromObject(jsonStr);
+        List<DetailReceiptListEntity> resultList = new ArrayList<>();
+        for (int i=0;i<jsonarray.size();i++){
+            DetailReceiptListEntity detailReceiptListEntity= receiptService.selectDetailByAcceptNo((String) jsonarray.get(i));
+            resultList.add(detailReceiptListEntity);
+
+        }
+        return  resultList;
+    }
+
+    /**
+     * 更改备注信息
+     * @param jsonStr
+     * @return
+     */
+    @RequestMapping("updateDetailNote")
+    public boolean updateDetailNote(@RequestBody String jsonStr){
+
+        JSONArray jsonArray = JSONArray.fromObject(jsonStr);
+        for (int i=0;i<jsonArray.size();i++){
+            Map<String,Object> resultMap= (Map<String, Object>) jsonArray.get(i);
+            receiptService.updateDetail(resultMap.get("acceptNo").toString(),resultMap.get("note").toString());
+        }
+        return true;
+    }
+
+
     /**
      * 生成交接单
      * @param receiptId

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

 package com.yxproject.start.mapper;
 
+import com.yxproject.start.entity.DetailReceiptListEntity;
 import org.apache.ibatis.annotations.*;
 
 import java.util.Date;
@@ -111,14 +112,6 @@ public interface ReceiptMapper {
 
 
 
-    //复核一致，按交接单编号查询证件数量
-    @Select("select FINISH_COUNT from RECEIPT_LIST WHERE ID=#{receiptId}")
-    public int selectCountByReceiptId(@Param("receiptId")String receiptId);
-
-    //符合一致，按交接单编号查询详单库数量
-    public int selectDetailCountByReceiptId(@Param("receiptId")String receiptId);
-
-
     @Select("select \n" +
             "count(prod_trace_t.download_no)as download,\n" +
             "count(prod_trace_t.checker_no) as  checkerCount,\n" +
@@ -145,4 +138,11 @@ public interface ReceiptMapper {
     public List<Map<String,Object>> selectReceiptDateByCheckDate(@Param("date") String date);
 
 
+    @Select("select * from DETAIL_RECEIPT_LIST where ACCEPT_NO=#{acceptNo} or card_id=#{acceptNo}")
+    public DetailReceiptListEntity selectDetailByAcceptNo(@Param("acceptNo") String acceptNo);
+
+
+    @Update("update DETAIL_RECEIPT_LIST set NOTE = #{note} WHERE ACCEPT_NO=#{acceptNo}")
+    public boolean updateDetail(@Param("acceptNo")String accept,@Param("note")String note);
+
 }

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

 package com.yxproject.start.service;
 
+import com.yxproject.start.entity.DetailReceiptListEntity;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
@@ -57,4 +58,8 @@ public interface ReceiptService {
 
     public Map<String,Object> selectTimes(String groupNo);
 
+    public DetailReceiptListEntity selectDetailByAcceptNo(@Param("acceptNo") String acceptNo);
+
+    public boolean updateDetail(@Param("acceptNo")String accept,@Param("note")String note);
+
 }

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

 package com.yxproject.start.service.impl;
 
+import com.yxproject.start.entity.DetailReceiptListEntity;
 import com.yxproject.start.mapper.ReceiptMapper;
 import com.yxproject.start.service.ReceiptService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -133,6 +134,18 @@ public class ReceiptServiceImpl implements ReceiptService {
         return maps;
     }
 
+    @Override
+    public DetailReceiptListEntity selectDetailByAcceptNo(String acceptNo) {
+        DetailReceiptListEntity detailReceiptListEntity  = receiptMapper.selectDetailByAcceptNo(acceptNo);
+        return detailReceiptListEntity;
+    }
+
+    @Override
+    public boolean updateDetail(String accept, String note) {
+        receiptMapper.updateDetail(accept,note);
+        return false;
+    }
+
     @Override
     public List<Map<String, Object>> selectReceiptDateByCheckDate(String date) {
         List<Map<String, Object>> mapList = receiptMapper.selectReceiptDateByCheckDate(date);

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

@@ -334,6 +334,18 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
+            updateReceiptList:function(id,success) {
+                $http({
+                    method: 'GET',
+                    url: "../LogApi/selectNewFileLogCount"+urlTimeStamp(),
+                    params:{
+                        receiptId:id,
+                        checkName:$rootScope.loginData.name
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
             selectAnalyseLogCount:function (oldPackageName,date,success) {
                 if(angular.isUndefined(oldPackageName)){
                     oldPackageName='';

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

@@ -110,7 +110,7 @@
                 </table>
                 <div class="box-footer clearfix" style="border: 0;">
                     <button class="btn btn-success  pull-right" style="margin-right: 20px;" ng-click="checkSame(json.id)">复核一致</button>
-                    <button class="btn btn-info  pull-right" style="margin-right: 20px;">打印标签</button>
+                    <button class="btn btn-info  pull-right" style="margin-right: 20px;" ng-click="PreviewMytableRotate()">打印标签</button>
                 </div>
             </div>
             <h4 class="col-md-7" ng-if="json.policeCardsList.length==0">
@@ -119,4 +119,16 @@
         </div>
     </div>
 </div>
-</section>
+</section>
\ No newline at end of file
+<div style="display: none;">
+    <div id="div1">
+        <p>
+           <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0>
+                <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0 pluginspage="install_lodop32.exe"></embed>
+           </object>
+        </p>
+        <div  style="font-family:'黑体';height:7mm;position: absolute;top:5mm;left:5mm;">密云分局</div>
+        <div  style="font-family:'黑体';height:7mm;position: absolute;top:12mm;left:3mm;">河南寨派出所</div>
+        <div  style="font-family:'黑体';height:7mm;position: absolute;top:20mm;left:5mm;">数量：1张</div>
+    </div>
+</div>
\ No newline at end of file

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

@@ -61,9 +61,31 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
             })
         }
 
-        $scope.checkSame = function () {
-            
+        $scope.checkSame = function (id) {
+            HttpService.updateReceiptList(id,function(data) {
+                if(data){
+                    getPoliceListDataNotChecked();
+                }else {
+                    MessageService.showAlert("复核失败")
+                }
+            })
         }
 
+
+        $scope.PreviewMytableRotate = function(){
+            var LODOP = getLodop();
+            LODOP.SET_LICENSES("", "15F0BE661E7F32F37491843CB2510905", "C94CEE276DB2187AE6B65D56B3FC2848", "");
+            LODOP.SET_PRINT_STYLE("FontName", "黑体");
+            LODOP.PRINT_INIT("标签");
+            LODOP.SET_PRINT_PAGESIZE(1, "70mm", "40mm", "");
+            LODOP = getLodop(document.getElementById('LODOP1'), document.getElementById('LODOP_EM'));
+            LODOP.SET_PRINT_STYLE("FontName", "黑体");
+            LODOP.ADD_PRINT_BARCODE(7, 20, 242, 60, "128A", "E1006155001");
+            LODOP.ADD_PRINT_HTM(60, 80, 300, 300, document.getElementById("div1").innerHTML);
+            LODOP.SET_PRINT_STYLEA(0, "AngleOfPageInside", 0);
+            LODOP.PREVIEW();
+            // LODOP.PRINT();
+        };
+
     });