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

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

@@ -227,7 +227,7 @@ public class TaskListApi {
             countyCode = "000000";
         }
         //查询快证是否存在受理库
-        List<Object> objects = taskListService.selectFastCardAtACCU(acceptNo.substring(0, 8));
+        List<Map<String,Object>> objects = taskListService.selectFastCardAtACCU(acceptNo.substring(0, 8));
         //存在受理库
         if (objects.size() == 1) {
             taskListService.saveFastTask(objects, name, acceptNo, Long.valueOf(cardType));
@@ -290,14 +290,15 @@ public class TaskListApi {
         String acceptNo = jsonObject.getString("acceptNo");
         String taskId = jsonObject.getString("taskId");
         String name = jsonObject.getString("name");
-        List<Object> objects = preproPersonService.selectUploadNoByAcceptNo(acceptNo);
-        for (Object o :objects){
+        List<Map<String,Object>> objects = preproPersonService.selectUploadNoByAcceptNo(acceptNo);
+        if (objects.size()>0){
+            for (Map<String,Object> map :objects){
                 PreproPersonEntity preproPersonEntity = new PreproPersonEntity();
-            Map<String,Object> map=(Map<String,Object>)o;
                 preproPersonEntity.setJmsfzslh(map.get("UPLOAD_NO").toString());
                 preproPersonEntity.setIsValid(0);
                 preproPersonService.updatePreproPersonIsValid(preproPersonEntity);
             }
+        }
         //存在任务单
         //更改组号详情的特证数量+1
         List<GroupNoEntity> groupNoEntities = groupNoService.selectGroupNoEntityByGroupNo(acceptNo.substring(0, 8));

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

+package com.yxproject.start.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/9   15:25
+ */
+@Mapper
+public interface PoliceStationVailedMapper {
+}

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

@@ -4,6 +4,7 @@ import com.yxproject.start.entity.PreproPersonEntity;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by Administrator on 2019/2/15.
@@ -80,5 +81,5 @@ public interface PreproPersonMapper {
     @Select("select UPLOAD_NO,ACCEPT_NO from ACC_CARD_T@ACCU_LINK WHERE ACCEPT_NO =#{acceptNo}\n" +
             "UNION all \n" +
             "select UPLOAD_NO,ACCEPT_NO from PROD_CARD_T@PROD_LINK WHERE ACCEPT_NO =#{acceptNo}")
-    public List<Object> selectUploadNoByAcceptNo(String acceptNo);
+    public List<Map<String,Object>> selectUploadNoByAcceptNo(String acceptNo);
 }
\ No newline at end of file

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

@@ -128,6 +128,7 @@ public interface TaskListMapper {
     @Insert("insert into task (CARD_TYPE,COUNTY_CODE,SUBMIT_NAME,TASK_STATE_ID,OLD_CARD_TYPE) values(#{cardType},#{countyCode},#{submitName},#{taskStateId},#{oldCardType})")
     @Options(useGeneratedKeys=true, keyProperty="taskId", keyColumn="TASK_ID")
     public boolean saveFastTask(TaskEntity taskEntity);
+
     /**
      * 生成任务单
      * @param taskEntity 任务单
@@ -282,7 +283,7 @@ public interface TaskListMapper {
             "left join county_dic on substr(PREPRO_PERSON.JMSFZSLH,0,6)=  county_dic.COUNTY_CODE\n" +
             "where county_dic.COUNTY_CODE is not null and ACC_GROUP_T.deal_flag =3\n" +
             "and ACC_GROUP_T.group_no =#{groupNo}")
-    public List<Object> selectFastCardAtACCU(@Param("groupNo") String groupNo);
+    public List<Map<String,Object>> selectFastCardAtACCU(@Param("groupNo") String groupNo);
 
     /**
      * 查询任务单详情

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

+package com.yxproject.start.service;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/9   15:26
+ */
+public interface PoliceStationVailedService {
+}

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

@@ -3,6 +3,7 @@ package com.yxproject.start.service;
 import com.yxproject.start.entity.PreproPersonEntity;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @auther zhangyusheng
@@ -12,7 +13,7 @@ public interface PreproPersonService {
 
     public boolean uploadState(String acceptNo,String state);
 
-    public List<Object> selectUploadNoByAcceptNo(String acceptNo);
+    public List<Map<String,Object>> selectUploadNoByAcceptNo(String acceptNo);
 
     public boolean updatePreproPersonIsValid(PreproPersonEntity preproPersonEntity);
 

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

@@ -35,9 +35,9 @@ public interface TaskListService {
 
     public boolean saveTask(List<Object> list,String submitName,String process);
 
-    public List<Object> selectFastCardAtACCU(String groupNo);
+    public List<Map<String,Object>> selectFastCardAtACCU(String groupNo);
 
-    public boolean saveFastTask(List<Object> list,String submitName,String acceptNo,long cardType);
+    public boolean saveFastTask(List<Map<String,Object>> list,String submitName,String acceptNo,long cardType);
 
     public List<TaskEntity> selectTaskEntityByTaskId(long taskId);
 

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

+package com.yxproject.start.service.impl;
+
+import com.yxproject.start.mapper.PoliceStationVailedMapper;
+import com.yxproject.start.service.PoliceStationVailedService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/9   15:26
+ */
+@Service
+public class PoliceStationVailedServiceImpl implements PoliceStationVailedService {
+    @Autowired
+    private PoliceStationVailedMapper policeStationVailedMapper;
+
+}

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

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @auther zhangyusheng
@@ -68,7 +69,7 @@ public class PreproPersonServiceImpl implements PreproPersonService {
      * @return
      */
     @Override
-    public List<Object> selectUploadNoByAcceptNo(String acceptNo) {
+    public List<Map<String,Object>> selectUploadNoByAcceptNo(String acceptNo) {
         return preproPersonMapper.selectUploadNoByAcceptNo(acceptNo);
     }
 }

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

@@ -299,7 +299,7 @@ public class TaskListServiceImpl implements TaskListService {
      * @return
      */
     @Override
-    public List<Object> selectFastCardAtACCU(String groupNo) {
+    public List<Map<String,Object>> selectFastCardAtACCU(String groupNo) {
         return taskListMapper.selectFastCardAtACCU(groupNo);
     }
 
@@ -311,9 +311,9 @@ public class TaskListServiceImpl implements TaskListService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean saveFastTask(List<Object> list, String submitName,String acceptNo,long cardType) {
+    public boolean saveFastTask(List<Map<String,Object>> list, String submitName,String acceptNo,long cardType) {
         //保存普通证件信息
-        Map<String,Object> stringObjectMap =(Map<String,Object>)list.get(0);
+        Map<String,Object> stringObjectMap =list.get(0);
         TaskEntity taskEntity = new TaskEntity();
         taskEntity.setCardType(cardType);
         taskEntity.setCountyCode(stringObjectMap.get("COUNTY_CODE")+"");

src/main/resources/static/js/app.js

@@ -199,26 +199,29 @@ angular.module('AvatarCheck', [
         }
 
         $scope.addQuickCardAccu = function(){
-            var check = $(".accu:checked").val();
-            console.log(check);
+            var idx = $(".accu:checked").val();
+            var check = idx.split("+");
             var json={};
-            json.acceptNo=check.ACCEPT_NO;
-            json.cardType=check.CARD_TYPE;
-            json.countyCode=check.COUNTY_CODE;
-            json.name=check.NAME;
+            json.acceptNo=check[0];
+            json.cardType=check[2];
+            json.countyCode=check[1];
+            json.name=$rootScope.loginData.name;
+            console.log(json)
             HttpService.addSpecialCard(json,function (data) {
                 console.log($scope.searchInput)
                 $scope.doSearch($scope.searchInput)
             })
         }
         $scope.addQuickCardProd = function(){
-            var check = $(".prod:checked").val();
-            console.log(check);
+            var idx = $(".prod:checked").val();
+            var check = idx.split("+");
+            console.log(idx,check)
             var json={};
-            json.acceptNo=check.ACCEPT_NO;
-            json.cardType=check.CARD_TYPE;
-            json.countyCode=check.COUNTY_CODE;
-            json.name=check.NAME;
+            json.acceptNo=check[0];
+            json.cardType=check[2];
+            json.countyCode=check[1];
+            json.name=$rootScope.loginData.name;
+            console.log(json)
             HttpService.addSpecialCard(json,function (data) {
                 console.log($scope.searchInput)
                 $scope.doSearch($scope.searchInput)

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

@@ -76,7 +76,7 @@
                         </thead>
                         <tbody>
                         <tr ng-repeat="item in searchResult.ACCdata">
-                            <td><input type="checkbox" value="{{item}}" class="accu"></td>
+                            <td><input type="checkbox" value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}" class="accu"></td>
                             <td>{{item.ACCEPT_NO}}</td>
                             <td>{{item.COUNTYNAME}}</td>
                             <td>{{item.NAME}}</td>
@@ -85,8 +85,8 @@
                             <td ng-if="item.SEX_NO==1">男</td>
                             <td ng-if="item.SEX_NO==2">女</td>
                             <td>{{item.GAJG1}}</td>
-                            <td>{{item.BEGIN_DATE  | date:'yyyy-MM-dd HH:mm:ss'}}</td>
-                            <td>{{item.EXPIRE_DATE  | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                            <td>{{item.BEGIN_DATE  | myDateFilter}}</td>
+                            <td>{{item.EXPIRE_DATE  | myDateFilter}}</td>
                             <td>{{item.SIGN_GOVT}}</td>
                             <td></td>
                             <td></td>
@@ -127,7 +127,7 @@
                         </thead>
                         <tbody>
                         <tr ng-repeat="item in searchResult.PRODData">
-                            <td><input type="checkbox" value="{{item}}" class="prod"></td>
+                            <td><input type="checkbox" value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}" class="prod"></td>
                             <td>{{item.ACCEPT_NO}}</td>
                             <td>{{item.COUNTYNAME}}</td>
                             <td>{{item.NAME}}</td>
@@ -136,8 +136,8 @@
                             <td ng-if="item.SEX_NO==1">男</td>
                             <td ng-if="item.SEX_NO==2">女</td>
                             <td>{{item.GAJG1}}</td>
-                            <td>{{item.BEGIN_DATE}}</td>
-                            <td>{{item.EXPIRE_DATE}}</td>
+                            <td>{{item.BEGIN_DATE | myDateFilter}}</td>
+                            <td>{{item.EXPIRE_DATE | myDateFilter}}</td>
                             <td>{{item.SIGN_GOVT}}</td>
                             <td></td>
                             <td></td>