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

# Conflicts:
#	src/main/resources/mapper/CardBodyMapper.xml

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

@@ -320,6 +320,13 @@ public class AdminApi {
 //        }
 //        return map.toString();
 //    }
+
+    /**
+     * 添加角色
+     * @param jsonStr
+     * @param resp
+     * @return
+     */
     @RequestMapping("roleAdd")
     public Map<String, String> roleAdd(@RequestBody String jsonStr, HttpServletResponse resp) {
         resp.setCharacterEncoding("UTF-8");
@@ -420,12 +427,4 @@ public class AdminApi {
         return map;
 
     }
-
-
-
-
-
-
-
-
  }

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

@@ -56,7 +56,7 @@ public class YingxinApi {
      *
      *
      */
-    @RequestMapping("getCbCountInfo")
+    @RequestMapping("getCardBodyCount")
     public  String getCbCountInfo(@RequestParam("startTime")String startTime ,@RequestParam("endTime")String endTime,HttpServletResponse resp) {
         List<Map<String, Object>> list=cardBodyService.getCbCount(startTime, endTime);
         YXJSONResponse yxjsonResponse = new YXJSONResponse();

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

+package com.yxproject.start.api;
+
+import com.yxproject.start.entity.SpecialCardInfoEntity;
+import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
+import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
+import com.yxproject.start.entity.resp.SelectByIdcardEntity;
+import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
+import com.yxproject.start.service.SelectSerialNumberService;
+import com.yxproject.start.utils.YXJSONResponse;
+import net.sf.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Map;
+/**
+ *搜索框查询
+ */
+@RestController
+@RequestMapping("specialCardInfo")
+public class selectApi {
+    /**
+     * 根据 组号、受理号、身份证号、任务单号查询
+     */
+    @Autowired
+    private SelectSerialNumberService selectSerialNumberService;
+
+    @RequestMapping(value = "selectByCard")
+    public String  selectByCard(@RequestParam("id") String id, HttpServletResponse resp){
+        resp.setCharacterEncoding("UTF-8");
+        Map<String, Object> map = new HashMap<>();
+          switch (id.length()){
+              case 8:
+                  System.out.println("id"+id);
+                  SelectByGroupNumEntity specialCardInfo= selectSerialNumberService.selectByGroupNumber(id);
+                  map.put("searchResult",specialCardInfo);
+                  break;
+              case 10:
+                  SelectByAcceptedEntity specialCardInfo2 = selectSerialNumberService.selectByAccepted(id);
+                  map.put("searchResult",specialCardInfo2);
+                  break;
+              case 18:
+                  SelectByIdcardEntity specialCardInfo3 = selectSerialNumberService.selectByIdCard(id);
+                  map.put("searchResult",specialCardInfo3);
+                 break;
+              case 11:
+                  SelectByWorkOrderEntity specialCardInfo4 = selectSerialNumberService.selectByWorkOrderNumber(id);
+                  map.put("searchResult",specialCardInfo4);
+                 break;
+          }
+        YXJSONResponse yxjsonResponse = new YXJSONResponse();
+        resp.setCharacterEncoding("UTF-8");
+        yxjsonResponse.outPutSuccess(map);
+
+        System.out.println("222222222"+ yxjsonResponse.toJSONString());
+        return yxjsonResponse.toJSONString();
+
+    }
+}

src/main/java/com/yxproject/start/config/ShiroConfig.java

 package com.yxproject.start.config;
 
-import com.alibaba.druid.pool.DruidDataSourceFactory;
-import com.yxproject.start.utils.DatabaseType;
-import com.yxproject.start.utils.DynamicDataSource;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
-import org.apache.shiro.mgt.SecurityManager;
-import org.apache.shiro.realm.Realm;
-import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
-import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
 import org.apache.shiro.spring.web.config.DefaultShiroFilterChainDefinition;
 import org.apache.shiro.spring.web.config.ShiroFilterChainDefinition;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
-import org.mybatis.spring.SqlSessionFactoryBean;
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
-
-import javax.sql.DataSource;
-import java.util.*;
 
 /**
  * @author Administrator

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

@@ -29,9 +29,8 @@ public class FailedCardEntity {
     public void setFailed_Card_Id(long failed_Card_Id) {
         this.failed_Card_Id = failed_Card_Id;
     }
-
     @Basic
-    @Column(name = "FAILED_CARD_REASON_ID", nullable = true, precision = 0)
+    @Column(name = "FAILED_CARD_REASON_ID", nullable = true)
     public long getFailed_Card_Reason_Id() {
         return failed_Card_Reason_Id;
     }
@@ -39,7 +38,6 @@ public class FailedCardEntity {
     public void setFailed_Card_Reason_Id(long failed_Card_Reason_Id) {
         this.failed_Card_Reason_Id = failed_Card_Reason_Id;
     }
-
     @Basic
     @Column(name = "ACCEPT_NO", nullable = true, length = 20)
     public String getAccept_No() {
@@ -69,7 +67,7 @@ public class FailedCardEntity {
         this.position_Date = position_Date;
     }
     @Basic
-    @Column(name = "FINISH_DATE", nullable = true, length = 20)
+    @Column(name = "FINSH_DATE", nullable = true, length = 20)
     public Date getFinish_Date() {
         return finish_Date;
     }
@@ -83,9 +81,6 @@ public class FailedCardEntity {
         return allot_Date;
     }
 
-
-
-
     public void setAllot_Date(Date allot_Date) {
         this.allot_Date = allot_Date;
     }
@@ -94,13 +89,11 @@ public class FailedCardEntity {
     public Date getPrint_Date() {
         return print_Date;
     }
+
     public void setPrint_Date(Date print_Date) {
         this.print_Date = print_Date;
     }
 
-
-
-
     @Basic
     @Column(name = "STATE", nullable = false, precision = 0)
     public long getState() {

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

@@ -8,7 +8,7 @@ import java.util.Objects;
  */
 @Entity
 @Table(name = "GROUP_NO", schema = "DAHAI")
-public class GroupNoEntity {
+public class GroupNoEntity{
     private long task_Id;
     private String group_No;
     private long valid_Count;
@@ -21,7 +21,7 @@ public class GroupNoEntity {
         return task_Id;
     }
 
-    public void setTask_Id(long task_Id) {
+    public void setTask_Id(Long task_Id) {
         this.task_Id = task_Id;
     }
     @Id

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

@@ -45,7 +45,7 @@ public class ProdCardEntity {
     }
 
     @Basic
-    @Column(name = "specialType", nullable = false, precision = 0)
+    @Column(name = "specialType")
     public long getSpecialType() {
         return specialType;
     }

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

@@ -45,7 +45,7 @@ public class SpecialCardEntity {
         this.task_Id = task_Id;
     }
     @Basic
-    @Column(name = "SPECIAL_TYPE", nullable = false, precision = 0)
+    @Column(name = "SPECIAL_TYPE", nullable = true)
     public long getSpecial_Type() {
         return special_Type;
     }

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

+package com.yxproject.start.entity;
+
+import javax.xml.crypto.Data;
+
+public class SpecialCardInfoEntity {
+    private TaskEntity taskEntity;
+    private GroupNoEntity groupNoEntity;
+    private AccCardTEntity accCardTEntity;
+    private String taskState;
+    private String cityName;
+    private String library;
+    private String painterName;
+    private String cardType;
+    private Data lastModifyTime;
+
+    public Data getLastModifyTime() {
+        return lastModifyTime;
+    }
+
+    public void setLastModifyTime(Data lastModifyTime) {
+        this.lastModifyTime = lastModifyTime;
+    }
+
+    public AccCardTEntity getAccCardTEntity() {
+        return accCardTEntity;
+    }
+
+    public void setAccCardTEntity(AccCardTEntity accCardTEntity) {
+        this.accCardTEntity = accCardTEntity;
+    }
+
+    public String getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(String cardType) {
+        this.cardType = cardType;
+    }
+
+    public String getPainterName() {
+        return painterName;
+    }
+
+    public void setPainterName(String painterName) {
+        this.painterName = painterName;
+    }
+
+    public TaskEntity getTaskEntity() {
+        return taskEntity;
+    }
+
+    public void setTaskEntity(TaskEntity taskEntity) {
+        this.taskEntity = taskEntity;
+    }
+
+    public GroupNoEntity getGroupNoEntity() {
+        return groupNoEntity;
+    }
+
+    public void setGroupNoEntity(GroupNoEntity groupNoEntity) {
+        this.groupNoEntity = groupNoEntity;
+    }
+
+    public String getTaskState() {
+        return taskState;
+    }
+
+    public void setTaskState(String taskState) {
+        this.taskState = taskState;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void     setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getLibrary() {
+        return library;
+    }
+
+    public void setLibrary(String library) {
+        this.library = library;
+    }
+
+
+
+
+
+}

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

 package com.yxproject.start.entity;
 
 import javax.persistence.*;
-import java.sql.Time;
 import java.util.Date;
 import java.util.Objects;
 
@@ -205,7 +204,7 @@ public class TaskEntity {
         this.is_Exception = is_Exception;
     }
     @Basic
-    @Column(name = "PRINTER_ID", nullable = true, precision = 0)
+    @Column(name = "PRINTER_ID", nullable = false)
     public long getPrinter_Id() {
         return printer_Id;
     }

src/main/java/com/yxproject/start/entity/resp/SelectByAcceptedEntity.java

+package com.yxproject.start.entity.resp;
+
+import javax.xml.crypto.Data;
+
+public class SelectByAcceptedEntity {
+
+
+    private String cardType;
+    private String library;
+    private String accept_No;
+    private String name;
+    private String sex_No;
+    private String id_No;
+    private String birthday;
+    private String sign_Govt;
+    private String begin_Date;
+    private String expire_Date;
+    private String status_No;
+    private String taskState;
+    private String cityName;
+    private Data lastModifyTime;
+
+    public String getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(String cardType) {
+        this.cardType = cardType;
+    }
+
+    public String getLibrary() {
+        return library;
+    }
+
+    public void setLibrary(String library) {
+        this.library = library;
+    }
+
+    public String getAccept_No() {
+        return accept_No;
+    }
+
+    public void setAccept_No(String accept_No) {
+        this.accept_No = accept_No;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSex_No() {
+        return sex_No;
+    }
+
+    public void setSex_No(String sex_No) {
+        this.sex_No = sex_No;
+    }
+
+    public String getId_No() {
+        return id_No;
+    }
+
+    public void setId_No(String id_No) {
+        this.id_No = id_No;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getSign_Govt() {
+        return sign_Govt;
+    }
+
+    public void setSign_Govt(String sign_Govt) {
+        this.sign_Govt = sign_Govt;
+    }
+
+    public String getBegin_Date() {
+        return begin_Date;
+    }
+
+    public void setBegin_Date(String begin_Date) {
+        this.begin_Date = begin_Date;
+    }
+
+    public String getExpire_Date() {
+        return expire_Date;
+    }
+
+    public void setExpire_Date(String expire_Date) {
+        this.expire_Date = expire_Date;
+    }
+
+    public String getStatus_No() {
+        return status_No;
+    }
+
+    public void setStatus_No(String status_No) {
+        this.status_No = status_No;
+    }
+
+    public String getTaskState() {
+        return taskState;
+    }
+
+    public void setTaskState(String taskState) {
+        this.taskState = taskState;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public Data getLastModifyTime() {
+        return lastModifyTime;
+    }
+
+    public void setLastModifyTime(Data lastModifyTime) {
+        this.lastModifyTime = lastModifyTime;
+    }
+}

src/main/java/com/yxproject/start/entity/resp/SelectByGroupNumEntity.java

+package com.yxproject.start.entity.resp;
+
+import java.util.Date;
+
+public class SelectByGroupNumEntity {
+
+    private String library;
+    private String cityName;
+    private String cardType;
+    private String painterName;
+    private String taskId;
+    private String group_No;
+    private Date submit_Date;
+    private Date position_Date;
+    private String quality_People_Name;
+    private Date out_Storage_Date;
+    private Date in_Storage_Date;
+    private String exception_Information;
+
+
+    public String getLibrary() {
+        return library;
+    }
+
+    public void setLibrary(String library) {
+        this.library = library;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(String cardType) {
+        this.cardType = cardType;
+    }
+
+    public String getPainterName() {
+        return painterName;
+    }
+
+    public void setPainterName(String painterName) {
+        this.painterName = painterName;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getGroup_No() {
+        return group_No;
+    }
+
+    public void setGroup_No(String group_No) {
+        this.group_No = group_No;
+    }
+
+    public Date getSubmit_Date() {
+        return submit_Date;
+    }
+
+    public void setSubmit_Date(Date submit_Date) {
+        this.submit_Date = submit_Date;
+    }
+
+    public Date getPosition_Date() {
+        return position_Date;
+    }
+
+    public void setPosition_Date(Date position_Date) {
+        this.position_Date = position_Date;
+    }
+
+    public String getQuality_People_Name() {
+        return quality_People_Name;
+    }
+
+    public void setQuality_People_Name(String quality_People_Name) {
+        this.quality_People_Name = quality_People_Name;
+    }
+
+    public Date getOut_Storage_Date() {
+        return out_Storage_Date;
+    }
+
+    public void setOut_Storage_Date(Date out_Storage_Date) {
+        this.out_Storage_Date = out_Storage_Date;
+    }
+
+    public Date getIn_Storage_Date() {
+        return in_Storage_Date;
+    }
+
+    public void setIn_Storage_Date(Date in_Storage_Date) {
+        this.in_Storage_Date = in_Storage_Date;
+    }
+
+    public String getException_Information() {
+        return exception_Information;
+    }
+
+    public void setException_Information(String exception_Information) {
+        this.exception_Information = exception_Information;
+    }
+
+
+
+
+
+
+}

src/main/java/com/yxproject/start/entity/resp/SelectByIdcardEntity.java

+package com.yxproject.start.entity.resp;
+
+import javax.xml.crypto.Data;
+import java.util.Date;
+
+public class SelectByIdcardEntity {
+    private String cardType;
+    private String library;
+    private String accept_No;
+    private String name;
+    private String sex_No;
+    private String id_No;
+    private String birthday;
+    private String sign_Govt;
+    private String begin_Date;
+    private String expire_Date;
+    private String status_No;
+    private String taskState;
+    private String cityName;
+    private Data lastModifyTime;
+
+    public String getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(String cardType) {
+        this.cardType = cardType;
+    }
+
+    public String getLibrary() {
+        return library;
+    }
+
+    public void setLibrary(String library) {
+        this.library = library;
+    }
+
+    public String getAccept_No() {
+        return accept_No;
+    }
+
+    public void setAccept_No(String accept_No) {
+        this.accept_No = accept_No;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSex_No() {
+        return sex_No;
+    }
+
+    public void setSex_No(String sex_No) {
+        this.sex_No = sex_No;
+    }
+
+    public String getId_No() {
+        return id_No;
+    }
+
+    public void setId_No(String id_No) {
+        this.id_No = id_No;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getSign_Govt() {
+        return sign_Govt;
+    }
+
+    public void setSign_Govt(String sign_Govt) {
+        this.sign_Govt = sign_Govt;
+    }
+
+    public String getBegin_Date() {
+        return begin_Date;
+    }
+
+    public void setBegin_Date(String begin_Date) {
+        this.begin_Date = begin_Date;
+    }
+
+    public String getExpire_Date() {
+        return expire_Date;
+    }
+
+    public void setExpire_Date(String expire_Date) {
+        this.expire_Date = expire_Date;
+    }
+
+    public String getStatus_No() {
+        return status_No;
+    }
+
+    public void setStatus_No(String status_No) {
+        this.status_No = status_No;
+    }
+
+    public String getTaskState() {
+        return taskState;
+    }
+
+    public void setTaskState(String taskState) {
+        this.taskState = taskState;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public Data getLastModifyTime() {
+        return lastModifyTime;
+    }
+
+    public void setLastModifyTime(Data lastModifyTime) {
+        this.lastModifyTime = lastModifyTime;
+    }
+}
\ No newline at end of file

src/main/java/com/yxproject/start/entity/resp/SelectByWorkOrderEntity.java

+package com.yxproject.start.entity.resp;
+
+import java.util.Date;
+
+public class SelectByWorkOrderEntity {
+
+    private String library;
+    private String cityName;
+    private String cardType;
+    private String painterName;
+    private long task_Id;
+    private Date submit_Date;
+    private Date position_Date;
+    private String quality_People_Name;
+    private Date out_Storage_Date;
+    private Date in_Storage_Date;
+    private String exception_Information;
+
+    public String getLibrary() {
+        return library;
+    }
+
+    public void setLibrary(String library) {
+        this.library = library;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(String cardType) {
+        this.cardType = cardType;
+    }
+
+    public String getPainterName() {
+        return painterName;
+    }
+
+    public void setPainterName(String painterName) {
+        this.painterName = painterName;
+    }
+
+    public long getTask_Id() {
+        return task_Id;
+    }
+
+    public void setTask_Id(long task_Id) {
+        this.task_Id = task_Id;
+    }
+
+    public Date getSubmit_Date() {
+        return submit_Date;
+    }
+
+    public void setSubmit_Date(Date submit_Date) {
+        this.submit_Date = submit_Date;
+    }
+
+    public Date getPosition_Date() {
+        return position_Date;
+    }
+
+    public void setPosition_Date(Date position_Date) {
+        this.position_Date = position_Date;
+    }
+
+    public String getQuality_People_Name() {
+        return quality_People_Name;
+    }
+
+    public void setQuality_People_Name(String quality_People_Name) {
+        this.quality_People_Name = quality_People_Name;
+    }
+
+    public Date getOut_Storage_Date() {
+        return out_Storage_Date;
+    }
+
+    public void setOut_Storage_Date(Date out_Storage_Date) {
+        this.out_Storage_Date = out_Storage_Date;
+    }
+
+    public Date getIn_Storage_Date() {
+        return in_Storage_Date;
+    }
+
+    public void setIn_Storage_Date(Date in_Storage_Date) {
+        this.in_Storage_Date = in_Storage_Date;
+    }
+
+    public String getException_Information() {
+        return exception_Information;
+    }
+
+    public void setException_Information(String exception_Information) {
+        this.exception_Information = exception_Information;
+    }
+}

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

@@ -13,8 +13,9 @@ import java.util.Map;
 
 @Mapper
 public interface CardBodyMapper {
-    public List <CardBodyEntity> insertCardBody(String cardBodyId);
+    public List <CardBodyEntity> findCardBody(String cardBodyId);
+    public int insertCardBody(@Param("cardTypeId") String cardTypeId, @Param("isActive") String isActive, @Param("taskId") String taskId, @Param("totalCount") String totalCount);
 //    public  int updateCardBody(CardBodyEntity map);
-    public List<Map<String,Object>> findCbCountByDealdateViewData(@Param("startTime")String startTime,@Param("endTime")String endTime );
+    public List<Map<String,Object>> findCbCountByDealdateViewData(@Param("startTime") String startTime, @Param("endTime") String endTime);
     public List<Map<String,Object>> findCbCountByDealdate();
 }
\ No newline at end of file

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

@@ -17,12 +17,12 @@ import java.util.Map;
 @Mapper
 public interface CountyListMapper {
     public List<CountyEntity> findCountyList(String taskId);
-    public int reviseStorageCount( @Param("taskId") String taskId, @Param("countyCode") String countyCode,@Param("inStorageCount") String inStorageCount,@Param("outStorageCount") String out_Storage_Count);
-    public List<ReceiptListEntity> getReceiptList( @Param("startDate")String startDate , @Param("endDate") String endDate);
+    public int reviseStorageCount(@Param("taskId") String taskId, @Param("countyCode") String countyCode, @Param("inStorageCount") String inStorageCount, @Param("outStorageCount") String out_Storage_Count);
+    public List<ReceiptListEntity> getReceiptList(@Param("startDate") String startDate, @Param("endDate") String endDate);
     public List<CountyListEntity> findStorageCountByTaskId(String taskId);
-    public int totalFinshCount ();
-    public int totalInStorageCount ();
-    public int totalOutStorageCount ();
+    public int totalFinshCount();
+    public int totalInStorageCount();
+    public int totalOutStorageCount();
 //    public List<Map<String, Object>> PrintCountyListXML();
 
 }

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

 package com.yxproject.start.mapper;
 
 import com.yxproject.start.entity.FailedCardEntity;
+import com.yxproject.start.entity.GroupNoEntity;
+import com.yxproject.start.entity.SpecialCardEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -32,8 +34,30 @@ public interface FailedCardMapper {
      * @return
      */
 //    @SelectProvider(type=com.yxproject.start.SqlProvider.SqlProvider.class,method="selectFailedinfoBycolumnName")
-    public List<Map<String,Object>> selectFailedCardEntityByState(int state);
+    public List<FailedCardEntity> findFailedList(String state);
 
+    /**
+     * 查询废证的任务单
+     * 在废证表中
+     * @param accept_No 废证受理号
+     * @return
+     */
+    public List<FailedCardEntity> selectAcceptNoAtFailedCard(String accept_No);
+    /**
+     * 查询废证的任务单
+     * 在特证表中
+     * @param accept_No 废证受理号
+     * @return
+     */
+    public List<SpecialCardEntity> selectAcceptNoAtSpecialCard(String accept_No);
+
+    /**
+     * 查询废证的任务单
+     * 在组号表中
+     * @param groupNo 废证受理组号
+     * @return
+     */
+    public List<GroupNoEntity> selectAcceptNoAtGroupNo(String groupNo);
 
 
 

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

@@ -11,5 +11,5 @@ import java.util.Map;
  */
 @Mapper
 public interface FindCardMapper {
-    public List<Map<String,Object>>findCardByGroupNo(@Param("find_No")String find_No);
+    public List<Map<String,Object>>findCardByGroupNo(@Param("find_No") String find_No);
 }

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

@@ -11,6 +11,6 @@ import java.util.Map;
  */
 @Mapper
 public interface FindFinancialReportByViewMapper {
-    public List<Map<String,Object>>findFinancialReportByView(@Param("startTime") String startTime,@Param("endTime")String endTime,@Param("cardType")String cardType,@Param("cityCode")String cityCode);
+    public List<Map<String,Object>>findFinancialReportByView(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("cardType") String cardType, @Param("cityCode") String cityCode);
 }
 

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

@@ -15,5 +15,5 @@ import java.util.Map;
 @Mapper
 public interface FindTaskByDealdateViewMapper {
 
-    public List<Map<String,Object>> findTaskByDealdateViewData(@Param("startTime") String startTime,@Param("endTime")  String endTime);
+    public List<Map<String,Object>> findTaskByDealdateViewData(@Param("startTime") String startTime, @Param("endTime") String endTime);
 }

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

@@ -4,6 +4,7 @@ import com.yxproject.start.entity.GroupListEntity;
 import com.yxproject.start.entity.GroupNoEntity;
 import com.yxproject.start.entity.SpecialCardEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -20,7 +21,8 @@ public interface GroupNoMapper {
     public int findGroupNoCountByTaskId(String task_Id);
     public List<Map<String,Object>> findSpecialCountyList(String task_Id);
     public List<Map<String,Object>> findNormalCountyList(String task_Id);
-    public List<GroupListEntity> findGroupListByTaskId( String taskId);
-
+    public List<GroupListEntity> findGroupListByTaskId(String taskId);
+    public List<GroupListEntity> findGroupNoListAtACCU(@Param("importTime")String importTime,@Param("typeCode")String cardType,@Param("cityCode")String cityCode);
+    public List<Map<String,Object>> findGroupListAtACCU(@Param("typeCode")String typeCode,@Param("importTime")String importTime,@Param("cityCode")String cityCode);
 
 }

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

@@ -16,7 +16,7 @@ public interface PoliceStationApplyReasonMapper {
     public int updatePoliceStationApplyReasonEntity(PoliceStationApplyReasonEntity policeStationApplyReasonEntity);
     public List<Map<String,Object>> findNormalApplyReasonByCyclesheetID(String cyclesheetid);
     public List<Map<String,Object>> findSpecialApplyReasonByCyclesheetID(String cyclesheetid);
-    public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate( @Param("startDate") String startDate,@Param("endDate") String endDate);
+    public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate(@Param("startDate") String startDate, @Param("endDate") String endDate);
     public List<Map<String,Object>> findPoliceStationApplyReasonByCardType(String cardType);
     public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String city);
     public List<Map<String,Object>> findPoliceStationApplyReasonByCounty(String county);

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

+package com.yxproject.start.mapper;
+
+
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.Map;
+
+@Mapper
+public interface SelectSerialNumberMapper {
+    public Map<String,Object> selectByGroupNumber(String id);
+    public Map<String,Object> selectByAccepted(String id);
+    public Map<String,Object> selectByIdCard(String id);
+    public Map<String,Object> selectByWorkOrderNumber(String id);
+}

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

@@ -18,9 +18,9 @@ public interface SpecialCardMapper {
     public void saveSpecialCardEntity(SpecialCardEntity specialCardEntity);
     public void updateSpecialCardEntity(SpecialCardEntity specialCardEntity);
     public List<SpecialCardEntity> findSpecialCardEntityByGroupNo(String groupNo);
-    public List <SpecialCardEntity> findSpecialCardList( String groupNo);
+    public List <SpecialCardEntity> findSpecialCardList(String groupNo);
     public List <SpecialCardEntity> addTuiZheng(String acceptNumber);
-    public List<SpecialCardEntity> addRemainingCard(String accept_Number);
-    public List<ProdCardEntity> getProdCard ( String idNo);
+    public List<SpecialCardEntity> addRemainingCard(String acceptNo);
+    public List<ProdCardEntity> getProdCard(String idNo);
     public List<FailedTypeEntity> getFailedType();
 }

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

@@ -70,7 +70,7 @@ public interface SysPermissionMapper{
      * @return
      */
     @Select("select name from SYS_PERMISSION WHERE ID=#{parentId}")
-    public String selectParentNameById(@Param("parentId")Long parentId);
+    public String selectParentNameById(@Param("parentId") Long parentId);
 
     /**
      * 修改权限信息

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

@@ -26,7 +26,7 @@ public interface SysRoleMapper {
      * @param permissionId
      */
     @Insert("INSERT INTO SYS_ROLE_PERMISSION(ROLE_ID,PERMISSION_ID)VALUES(#{roleId},#{permissionId})")
-    public void addRolePermission(@Param("roleId")Integer roleId,@Param("permissionId") Integer permissionId);
+    public void addRolePermission(@Param("roleId") Integer roleId, @Param("permissionId") Integer permissionId);
 
     /**
      * 查询所有角色
@@ -77,7 +77,7 @@ public interface SysRoleMapper {
      * @param roleId
      */
     @Update("update SYS_USER_ROLE SET ROLE_ID=#{roleId} where USER_ID=#{userId}")
-    public void updateUserRole(@Param("userId") Integer userId,@Param("roleId")Integer roleId);
+    public void updateUserRole(@Param("userId") Integer userId, @Param("roleId") Integer roleId);
 
     /**
      * 删除角色
@@ -120,5 +120,5 @@ public interface SysRoleMapper {
      * @param oldPermissionId
      */
     @Delete("delete from SYS_ROLE_PERMISSION WHERE ROLE_ID=#{roleId} AND PERMISSION_ID=#{oldPermissionId}")
-    public void delRolePermission(@Param("roleId") Integer roleId,@Param("oldPermissionId") Integer oldPermissionId);
+    public void delRolePermission(@Param("roleId") Integer roleId, @Param("oldPermissionId") Integer oldPermissionId);
 }

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

@@ -13,15 +13,18 @@ import java.util.Map;
 @Mapper
 public interface TaskMapper {
     public List<TaskEntity> findTaskEntity(long id);
-    public int insertTaskEntity(TaskEntity taskEntity);
+    public long insertTaskEntity(TaskEntity taskEntity);
     public  int updateTaskEntity(TaskEntity taskEntity);
     public  List<TaskEntity> findTaskEntityByAcceptNo(String acceptNo);
     public List<TaskEntity> findTaskEntityByState(int state);
-    public  int updateTaskIsException(@Param("taskId") String taskId,@Param("exceptionInformation") String exceptionInformation,@Param("isException")String isException);
-    public int replaceExceptionInformation(@Param("taskId")String taskId,@Param("isException")String isException);
+    public  int updateTaskIsException(@Param("taskId") String taskId, @Param("exceptionInformation") String exceptionInformation, @Param("isException") String isException);
+    public int replaceExceptionInformation(@Param("taskId") String taskId, @Param("isException") String isException);
     public List<TypeListEntity> findTypeListByTaskStateId(String taskStateId);
-    public List <CityListEntity> findCityList(@Param("taskStateId") String taskStateId,@Param("cardType") String cardType);
+    public List <CityListEntity> findCityList(@Param("taskStateId") String taskStateId, @Param("cardType") String cardType);
+    public List<TypeListEntity> findTypeListByImportDateAtACCU(String importTime);
+    public List <CityListEntity> findCityListByImportDateAtACCU(@Param("importTime") String importTime, @Param("cardType") String cardType);
     public int updateOutStorageDate(String taskId);
     public int updateInStorageDate(String taskId);
     public int updateStorageDate(String taskId);
+
 }

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

@@ -45,7 +45,7 @@ public interface UserInfoMapper {
      * @param roleId
      */
     @Insert("INSERT INTO SYS_USER_ROLE(USER_ID,ROLE_ID)VALUES(#{userId},#{roleId})\n")
-    public void saveUserRole(@Param("userId") Integer userId, @Param("roleId")Integer roleId);
+    public void saveUserRole(@Param("userId") Integer userId, @Param("roleId") Integer roleId);
 
     /**
      * 查询所有用户

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

@@ -3,6 +3,8 @@ package com.yxproject.start.mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 /**
  * @author zhangyusheng
  */
@@ -35,6 +37,10 @@ public interface UtilMapper {
      * 查询派出所证件申请表序列值
      */
     public int findPoliceStationApplyReasonSequenceNextValue();
+
+    public List queryAllPoliceStation();
+
+    public List queryMakeTypeList();
 }
 
 

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

 package com.yxproject.start.service;
 
 import com.yxproject.start.entity.CardBodyEntity;
-import com.yxproject.start.entity.GroupNoEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -10,9 +9,11 @@ import java.util.Map;
  * Created by Administrator on 2018/11/7.
  */
 public interface CardBodyService {
-    public List<CardBodyEntity> insertCardBody(String cardBodyId);
+    public List<CardBodyEntity> findCardBody(String cardBodyId);
 
-    public List<Map<String,Object>> getCbCount(String startTime,String endTime);
+    public int insertCardBody(String cardTypeId, String isActive, String taskId, String totalCount);
+
+    public List<Map<String,Object>> getCbCount(String startTime, String endTime);
 
 //    public int updateCardBody(CardBodyEntity map);
 

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

 package com.yxproject.start.service;
 
+import com.yxproject.start.entity.CityListEntity;
 import org.springframework.stereotype.Service;
-import com.yxproject.start.entity.*;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by Administrator on 2018/12/19.
  */
 @Service
 public interface CityListService {
-    public  List <CityListEntity> findCityList( String taskStateId ,String cardType);
+    public  List <CityListEntity> findCityList(String taskStateId, String cardType);
+    public List <CityListEntity> findCityListByImportDateAtACCU(String importTime,String cardType);
 
 //    public  List <CityListEntity> findCityListByCardType(String cardType);
 }

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

@@ -2,12 +2,10 @@ package com.yxproject.start.service;
 
 import com.yxproject.start.entity.CountyListEntity;
 
-import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 public interface CountyListService {
 
     public List<CountyListEntity> findStorageCountByTaskId(String taskId);
-    public int reviseStorageCount(String taskId,String countyCode, String inStorageCount, String outStorageCount);
+    public int reviseStorageCount(String taskId, String countyCode, String inStorageCount, String outStorageCount);
 }

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

@@ -8,7 +8,7 @@ import java.util.List;
  * Created by Administrator on 2018/12/19.
  */
 public interface CountyService {
-    public List<CountyEntity> findCountyList( String taskId);
+    public List<CountyEntity> findCountyList(String taskId);
 
 
 }

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

 package com.yxproject.start.service;
 
 import com.yxproject.start.entity.FailedCardEntity;
+import com.yxproject.start.entity.GroupNoEntity;
+import com.yxproject.start.entity.SpecialCardEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by zhangyusheng on 2018/10/30 10:01
@@ -11,5 +12,9 @@ import java.util.Map;
 public interface FailedCardService {
     public int saveFailedinfo(List<FailedCardEntity> failedinfoEntityList);
     public int updateFailedinfo(List<FailedCardEntity> failedinfoEntityList);
-    public List<Map<String,Object>> selectFailedinfo(int state);
+    public List<FailedCardEntity> findFailedList(String state);
+
+    public List<FailedCardEntity> selectAcceptNoAtFailedCard(String accept_No);
+    public List<SpecialCardEntity> selectAcceptNoAtSpecialCard(String accept_No);
+    public List<GroupNoEntity> selectAcceptNoAtGroupNo(String groupNo);
 }

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

@@ -3,7 +3,6 @@ package com.yxproject.start.service;
 import com.yxproject.start.entity.FailedTypeEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by Administrator on 2018/12/26.

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

 package com.yxproject.start.service;
 
-import com.yxproject.start.entity.AccCardTEntity;
-
 import java.util.List;
 import java.util.Map;
 

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

@@ -7,5 +7,5 @@ import java.util.Map;
  * Created by Administrator on 2018/12/19.
  */
 public interface FindFinancialReportByViewService {
-    public List<Map<String,Object>> getFinancialReportData(String startTime, String endTime,String cardType,String cityCode);
+    public List<Map<String,Object>> getFinancialReportData(String startTime, String endTime, String cardType, String cityCode);
 }

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

@@ -3,7 +3,6 @@ package com.yxproject.start.service;
 import com.yxproject.start.entity.FindStationCountByViewEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by Administrator on 2018/11/29.

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

 package com.yxproject.start.service;
 
-import com.yxproject.start.entity.FindTaskByDealdateViewEntity;
-
 import java.util.List;
 import java.util.Map;
 
@@ -9,5 +7,5 @@ import java.util.Map;
  * Created by Administrator on 2018/11/21.
  */
 public interface FindTaskByDealdateViewService {
-    public List<Map<String,Object>> getAccGroupData(String startTime,String endTime);
+    public List<Map<String,Object>> getAccGroupData(String startTime, String endTime);
 }

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

@@ -3,12 +3,14 @@ package com.yxproject.start.service;
 import com.yxproject.start.entity.GroupListEntity;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by Administrator on 2018/12/18.
  */
 
 public interface GroupListService {
-    public List<GroupListEntity> findGroupListByTaskId( String taskId);
+    public List<GroupListEntity> findGroupListByTaskId(String taskId);
+    public List<Map<String,Object>> findGroupListAtACCU(String typeCode,String importTime,String cityCode);
 
 }

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

 package com.yxproject.start.service;
 
-import com.yxproject.start.entity.GroupListEntity;
-import com.yxproject.start.entity.GroupNoEntity;
-
 import java.util.List;
 import java.util.Map;
 

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

@@ -8,7 +8,7 @@ import java.util.Map;
  */
 public interface PoliceStationApplyReasonService {
     public int savePoliceStationApplyReasonEntity(String cyclesheetID);
-    public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate(String startDate,String endDate);
+    public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate(String startDate, String endDate);
     public List<Map<String,Object>> findPoliceStationApplyReasonByCardType(String cardType);
     public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String cityCode);
 }

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

@@ -3,7 +3,6 @@ package com.yxproject.start.service;
 import com.yxproject.start.entity.ProdCardEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by Administrator on 2018/12/26.
@@ -11,5 +10,5 @@ import java.util.Map;
 
 public interface ProdCardService {
 
-    public List<ProdCardEntity> getProdCard ( List idNo);
+    public List<ProdCardEntity> getProdCard(List idNo);
 }

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

@@ -8,6 +8,6 @@ import java.util.List;
  * Created by Administrator on 2018/12/19.
  */
 public interface ReceiptListService {
-    public List <ReceiptListEntity> getReceiptList( String startDate, String endDate);
+    public List <ReceiptListEntity> getReceiptList(String startDate, String endDate);
 
 }

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

+package com.yxproject.start.service;
+
+import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
+import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
+import com.yxproject.start.entity.resp.SelectByIdcardEntity;
+import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
+
+
+public interface SelectSerialNumberService {
+    SelectByGroupNumEntity selectByGroupNumber(String id);
+    SelectByAcceptedEntity selectByAccepted(String id);
+    SelectByIdcardEntity selectByIdCard(String id);
+    SelectByWorkOrderEntity selectByWorkOrderNumber(String id);
+}
+

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

@@ -25,7 +25,7 @@ public interface SysRoleService {
      * @return
      */
 
-    public boolean updateRole(SysRole sysRole,JSONArray ids,JSONArray oldIds);
+    public boolean updateRole(SysRole sysRole, JSONArray ids, JSONArray oldIds);
 
     /**
      * 查询所有角色

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

@@ -12,7 +12,7 @@ public interface TaskService {
 
     public int updateProductionTask(TaskEntity taskId);
 
-    public int addProductionTaskListEntity(TaskEntity taskEntity, List<GroupNoEntity> groupNoEntities);
+    public int addProductionTaskListEntity(TaskEntity taskEntity, List<Map<String, Object>> groupListAtACCU);
 
     public int addQuickCyclesheetInfo(String acceptNo);
 
@@ -22,13 +22,12 @@ public interface TaskService {
 
     public int savePoliceStationVailedEntity(List<PoliceStationVailedEntity> policeStationVailedInfoEntities);
 
-    public List<PoliceStationVailedEntity> find( String id);
+    public List<PoliceStationVailedEntity> find(String id);
 
     public List<Map<String,Object>> findProductionTaskListEntityByState(int state);
 
     public int addExceptionState(String taskId, String exceptionInformation);
 
-
 //    public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount);
 
 

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

@@ -9,5 +9,7 @@ import java.util.List;
  */
 public interface TypeListService {
 
-    public List<TypeListEntity> findTypeListByTaskStateId( String taskStateId);
+    public List<TypeListEntity> findTypeListByTaskStateId(String taskStateId);
+    public List<TypeListEntity> findTypeListByImportDateAtACCU(String importTime);
+
 }

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

@@ -22,7 +22,7 @@ public interface UserInfoService{
      * @param roleId
      * @return
      */
-    public boolean addUser(UserInfo userinfo,Integer roleId);
+    public boolean addUser(UserInfo userinfo, Integer roleId);
 
     /**
      * 查询所有用户
@@ -57,7 +57,7 @@ public interface UserInfoService{
      * @param roleId
      * @return
      */
-    public boolean updateUser(UserInfo userInfo, Integer roleId,Integer oldRoleId);
+    public boolean updateUser(UserInfo userInfo, Integer roleId, Integer oldRoleId);
 
 //    int delUsername( UserInfo userInfo);
 //    int updateUsername(UserInfo userInfo);

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

 package com.yxproject.start.service;
 
 
+import java.util.List;
+
 public interface UtilService {
 
 
     public  int findProductionTaskListSequenceNextValue();
     public  int findGroupInfoSequenceNextValue();
+    List findAllPoliceStation();
+    List findTypeListData();
 
 }
 

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

 package com.yxproject.start.service.impl;
 
 import com.yxproject.start.entity.CardBodyEntity;
-import com.yxproject.start.entity.GroupNoEntity;
 import com.yxproject.start.mapper.CardBodyMapper;
-import com.yxproject.start.mapper.GroupNoMapper;
-import com.yxproject.start.mapper.UtilMapper;
 import com.yxproject.start.service.CardBodyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Map;
 
@@ -43,12 +38,14 @@ public class CardBodyServiceImpl implements CardBodyService {
 //        return cardBodyMapper.updateCardBody(map);
 //    }
 
-
-
-
     @Override
-    public List<CardBodyEntity> insertCardBody(String cardBodyId) {
-        List<CardBodyEntity> cardBody = cardBodyMapper.insertCardBody(cardBodyId);
+    public List<CardBodyEntity> findCardBody(String cardBodyId) {
+        List<CardBodyEntity> cardBody = cardBodyMapper.findCardBody(cardBodyId);
+        return cardBody;
+    }
+
+    public int insertCardBody(String cardTypeId,String isActive,String taskId,String totalCount){
+        int cardBody = cardBodyMapper.insertCardBody(cardTypeId,isActive,taskId,totalCount);
         return cardBody;
     }
 }

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

@@ -8,7 +8,9 @@ import com.yxproject.start.service.CityListService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Created by Administrator on 2018/12/19.
@@ -63,7 +65,31 @@ public class CityListServiceImpl implements CityListService {
         for (CityListEntity cityListEntity : list1) {
             List <GroupListEntity> groupListEntities=groupNoMapper.findGroupListByTaskId(cityListEntity.getTaskId() + "");
             if(groupListEntities.size() == 1 ){
-                cityListEntity.setGroupNo(String.valueOf(groupListEntities.get(0).getGroupNo()));
+                cityListEntity.setGroupNo(groupListEntities.get(0).getGroupNo()+"");
+            } else if(groupListEntities.size() > 1 ){
+                List<Integer> c = new ArrayList<>();
+                List<Integer> nsList = new ArrayList<>();
+                for (int i = 0; i < groupListEntities.size(); i++){
+                    nsList.add(Integer.parseInt( groupListEntities.get(i).getGroupNo()+"" ));
+                }
+                cityListEntity.setGroupCount(nsList.size());
+                cityListEntity.setGroupNo(createGroupNo(c, nsList));
+            }else {
+                cityListEntity.setGroupNo("");
+            }
+            list2.add(cityListEntity);
+        }
+        return list2;
+    }
+
+    @Override
+    public  List <CityListEntity> findCityListByImportDateAtACCU( String importTime,String cardType) {
+        List<CityListEntity> list1 = taskMapper.findCityListByImportDateAtACCU(importTime,cardType);
+        List<CityListEntity> list2 = new ArrayList<CityListEntity>();
+        for (CityListEntity cityListEntity : list1) {
+            List <GroupListEntity> groupListEntities=groupNoMapper.findGroupNoListAtACCU(importTime,cardType,cityListEntity.getCitycode());
+            if(groupListEntities.size() == 1 ){
+                cityListEntity.setGroupNo(groupListEntities.get(0).getGroupNo()+"");
             } else if(groupListEntities.size() > 1 ){
                 List<Integer> c = new ArrayList<>();
                 List<Integer> nsList = new ArrayList<>();

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

@@ -7,10 +7,7 @@ import com.yxproject.start.service.CountyListService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by liuxinben on 2018/11/6.13:42

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

 package com.yxproject.start.service.impl;
 
 //import com.yxproject.start.entity.CountyEntity;
+
 import com.yxproject.start.entity.CountyEntity;
 import com.yxproject.start.mapper.CountyListMapper;
 import com.yxproject.start.service.CountyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

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

 package com.yxproject.start.service.impl;
 
 import com.yxproject.start.entity.FailedCardEntity;
+import com.yxproject.start.entity.GroupNoEntity;
+import com.yxproject.start.entity.SpecialCardEntity;
 import com.yxproject.start.mapper.FailedCardMapper;
 import com.yxproject.start.service.FailedCardService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by zhangyusheng on 2018/10/30 10:02
@@ -34,8 +35,27 @@ public class FailedCardServiceImpl implements FailedCardService {
     }
 
     @Override
-    public List<Map<String,Object>> selectFailedinfo(int state) {
-        List<Map<String, Object>> maps = failedCardMapper.selectFailedCardEntityByState(state);
-        return maps;
+    public List<FailedCardEntity> findFailedList(String state) {
+        List<FailedCardEntity> failedList = failedCardMapper.findFailedList(state);
+        return failedList;
     }
+
+    @Override
+    public List<FailedCardEntity> selectAcceptNoAtFailedCard(String accept_No) {
+        List<FailedCardEntity> failedCardEntities = failedCardMapper.selectAcceptNoAtFailedCard(accept_No);
+        return failedCardEntities;
+    }
+
+    @Override
+    public List<SpecialCardEntity> selectAcceptNoAtSpecialCard(String accept_No) {
+        List<SpecialCardEntity> specialCardEntities = failedCardMapper.selectAcceptNoAtSpecialCard(accept_No);
+        return specialCardEntities;
+    }
+
+    @Override
+    public List<GroupNoEntity> selectAcceptNoAtGroupNo(String groupNo) {
+        List<GroupNoEntity> groupNoEntities = failedCardMapper.selectAcceptNoAtGroupNo(groupNo);
+        return groupNoEntities;
+    }
+
 }

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

@@ -2,12 +2,11 @@ package com.yxproject.start.service.impl;
 
 import com.yxproject.start.entity.FailedTypeEntity;
 import com.yxproject.start.mapper.SpecialCardMapper;
-import com.yxproject.start.service.*;
+import com.yxproject.start.service.FailedTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by Administrator on 2018/12/26.

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

 package com.yxproject.start.service.impl;
 
-import com.yxproject.start.mapper.AccCardTMapper;
 import com.yxproject.start.mapper.FindCardMapper;
 import com.yxproject.start.service.FindCardService;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by Administrator on 2018/11/29.

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

@@ -8,8 +8,8 @@ import com.yxproject.start.service.GroupListService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by Administrator on 2018/12/18.
@@ -31,4 +31,16 @@ public class GroupListServiceImpl implements GroupListService {
         return  groupList;
     }
 
+    @Override
+    public List<Map<String,Object>> findGroupListAtACCU(String typeCode,String importTime,String cityCode) {
+        List<Map<String, Object>> groupListAtACCU = groupNoMapper.findGroupListAtACCU(typeCode, importTime, cityCode);
+        for ( Map<String,Object> map:groupListAtACCU) {
+            List <SpecialCardEntity> specialCardEntities=specialCardMapper.findSpecialCardList(map.get("GROUP_NO").toString());
+            map.put("SpecialCardList",specialCardEntities);
+        }
+        return  groupListAtACCU;
+    }
+
+
+
 }

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

 package com.yxproject.start.service.impl;
 
-import com.yxproject.start.entity.GroupListEntity;
-import com.yxproject.start.entity.GroupNoEntity;
-import com.yxproject.start.entity.SpecialCardEntity;
 import com.yxproject.start.mapper.GroupNoMapper;
 import com.yxproject.start.service.GroupNoService;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -7,9 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by Administrator on 2018/12/26.
@@ -29,6 +27,20 @@ public class ProdCardServiceImpl implements ProdCardService {
         List list = new ArrayList<>();
         for (int i=0; i <idNo.size(); i++) {
             List <ProdCardEntity> prodCardEntity = specialCardMapper.getProdCard((String) idNo.get(i));
+            if(prodCardEntity.size() == 0){
+                ProdCardEntity prodCardEntity1 = new ProdCardEntity() ;
+                prodCardEntity1.setName("信息有误");
+                if(((String) idNo.get(i)).length() == 10){
+                    prodCardEntity1.setAcceptNo((String) idNo.get(i));
+                    prodCardEntity1.setIdNo(null);
+                  }
+                else{
+                    prodCardEntity1.setAcceptNo(null);
+                    prodCardEntity1.setIdNo((String) idNo.get(i));
+                }
+                list.add(prodCardEntity1);
+            }
+
             list.addAll(prodCardEntity);
         }
 //        去重

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

+package com.yxproject.start.service.impl;
+
+import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
+import com.yxproject.start.entity.AccCardTEntity;
+import com.yxproject.start.entity.GroupNoEntity;
+import com.yxproject.start.entity.SpecialCardInfoEntity;
+import com.yxproject.start.entity.TaskEntity;
+import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
+import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
+import com.yxproject.start.entity.resp.SelectByIdcardEntity;
+import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
+import com.yxproject.start.mapper.SelectSerialNumberMapper;
+import com.yxproject.start.service.SelectSerialNumberService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.xml.crypto.Data;
+import java.util.Date;
+import java.util.Map;
+@Service
+public class SelectSerialNumberServiceImpl implements SelectSerialNumberService {
+
+    @Autowired
+    public SelectSerialNumberMapper selectSerialNumberMapper;
+
+
+    @Override
+    public SelectByGroupNumEntity selectByGroupNumber(String id){
+
+            Map<String, Object> map = selectSerialNumberMapper.selectByGroupNumber(id);
+            System.out.println("数据111"+map.toString());
+
+            SelectByGroupNumEntity selectByGroupNumEntity = new SelectByGroupNumEntity();
+            selectByGroupNumEntity.setLibrary("盈信库");
+            selectByGroupNumEntity.setCityName(String.valueOf(map.get("CITYNAME")));
+            selectByGroupNumEntity.setCardType((String) map.get("CARD_TYPE"));
+            selectByGroupNumEntity.setPainterName((String) map.get("PRINTER_NAME"));
+            selectByGroupNumEntity.setTaskId(String.valueOf(map.get("TASK_ID")));
+            selectByGroupNumEntity.setGroup_No(String.valueOf(map.get("GROUP_NO")));
+            selectByGroupNumEntity.setSubmit_Date((Date) map.get("SUBMIT_DATE"));
+            System.out.println("Date:"+selectByGroupNumEntity.getSubmit_Date().toString());
+            selectByGroupNumEntity.setPosition_Date((Date) map.get("POSITION_DATE"));
+            selectByGroupNumEntity.setQuality_People_Name((String) map.get("QUALITY_PEOPLE_NAME"));
+            selectByGroupNumEntity.setOut_Storage_Date((Date) map.get("OUT_STORAGE_DATE"));
+            selectByGroupNumEntity.setIn_Storage_Date((Date) map.get("IN_STORAGE_DATE"));
+            selectByGroupNumEntity.setException_Information((String) map.get("EXCEPTION_INFORMATION"));
+            return selectByGroupNumEntity;
+
+
+    }
+
+
+    @Override
+    public SelectByAcceptedEntity selectByAccepted(String id){
+        Map<String,Object> map = selectSerialNumberMapper.selectByAccepted(id);
+        SelectByAcceptedEntity selectByAcceptedEntity = new SelectByAcceptedEntity();
+        String sex ;
+        if (Integer.parseInt((String) map.get("SEX_NO")) ==1){
+            sex = "男";
+        }else if (Integer.parseInt((String) map.get("SEX_NO"))==2){
+            sex = "女";
+        }else {
+            sex = "缺失";
+        }
+
+        selectByAcceptedEntity.setCardType((String) map.get("CARD_TYPE"));
+        selectByAcceptedEntity.setLibrary("受理库");
+        selectByAcceptedEntity.setAccept_No((String) map.get("ACCEPT_NO"));
+        selectByAcceptedEntity.setName((String) map.get("NAME"));
+        selectByAcceptedEntity.setSex_No(sex);
+        selectByAcceptedEntity.setId_No((String) map.get("ID_NO"));
+        selectByAcceptedEntity.setBirthday((String) map.get("BIRTHDAY"));
+        selectByAcceptedEntity.setSign_Govt((String) map.get("SIGN_GOVT"));
+        selectByAcceptedEntity.setBegin_Date((String) map.get("BEGIN_DATE"));
+        selectByAcceptedEntity.setExpire_Date((String) map.get("EXPIRE_DATE"));
+        selectByAcceptedEntity.setStatus_No((String) map.get("STATUS_NO"));
+        selectByAcceptedEntity.setTaskState((String) map.get("TASK_STATE"));
+        selectByAcceptedEntity.setCityName((String) map.get("CITYNAME"));
+        selectByAcceptedEntity.setLastModifyTime((Data) map.get("lastModifyTime;"));
+
+        return selectByAcceptedEntity;
+
+    }
+    @Override
+    public SelectByIdcardEntity selectByIdCard(String id){
+        Map<String,Object> map = selectSerialNumberMapper.selectByIdCard(id);
+        SelectByIdcardEntity selectByIdcardEntity = new SelectByIdcardEntity();
+        String sex ;
+        if (Integer.parseInt((String) map.get("SEX_NO")) ==1){
+            sex = "男";
+        }else if (Integer.parseInt((String) map.get("SEX_NO"))==2){
+            sex = "女";
+        }else {
+            sex = "缺失";
+        }
+
+        selectByIdcardEntity.setCardType((String) map.get("CARD_TYPE"));
+        selectByIdcardEntity.setLibrary("受理库");
+        selectByIdcardEntity.setAccept_No((String) map.get("ACCEPT_NO"));
+        selectByIdcardEntity.setName((String) map.get("NAME"));
+        selectByIdcardEntity.setSex_No(sex);
+        selectByIdcardEntity.setId_No((String) map.get("ID_NO"));
+        selectByIdcardEntity.setBirthday((String) map.get("BIRTHDAY"));
+        selectByIdcardEntity.setSign_Govt((String) map.get("SIGN_GOVT"));
+        selectByIdcardEntity.setBegin_Date((String) map.get("BEGIN_DATE"));
+        selectByIdcardEntity.setExpire_Date((String) map.get("EXPIRE_DATE"));
+        selectByIdcardEntity.setStatus_No((String) map.get("STATUS_NO"));
+        selectByIdcardEntity.setTaskState((String) map.get("TASK_STATE"));
+        selectByIdcardEntity.setCityName((String) map.get("CITYNAME"));
+        selectByIdcardEntity.setLastModifyTime((Data) map.get("lastModifyTime;"));
+        return selectByIdcardEntity;
+
+    }
+
+    @Override
+    public SelectByWorkOrderEntity selectByWorkOrderNumber(String id){
+        Map<String,Object> map = selectSerialNumberMapper.selectByWorkOrderNumber(id);
+        SelectByWorkOrderEntity selectByWorkOrderEntity = new SelectByWorkOrderEntity();
+
+        selectByWorkOrderEntity.setLibrary("盈信库");
+        selectByWorkOrderEntity.setCityName((String) map.get("CITYNAME"));
+        selectByWorkOrderEntity.setCardType((String) map.get("CARD_TYPE"));
+        selectByWorkOrderEntity.setPainterName((String) map.get("PRINTER_NAME"));
+        selectByWorkOrderEntity.setTask_Id((Long.valueOf(String.valueOf( map.get("TASK_ID")))));
+        selectByWorkOrderEntity.setSubmit_Date((Date) map.get("SUBMIT_DATE"));
+        selectByWorkOrderEntity.setPosition_Date((Date) map.get("POSITION_DATE"));
+        selectByWorkOrderEntity.setQuality_People_Name((String) map.get("QUALITY_PEOPLE_NAME"));
+        selectByWorkOrderEntity.setOut_Storage_Date((Date) map.get("OUT_STORAGE_DATE"));
+        selectByWorkOrderEntity.setIn_Storage_Date((Date) map.get("IN_STORAGE_DATE"));
+        selectByWorkOrderEntity.setException_Information((String) map.get("EXCEPTION_INFORMATION"));
+        System.out.println("实体："+selectByWorkOrderEntity);
+        return selectByWorkOrderEntity;
+    }
+
+}

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

@@ -3,12 +3,10 @@ package com.yxproject.start.service.impl;
 import com.yxproject.start.entity.SysPermission;
 import com.yxproject.start.mapper.SysPermissionMapper;
 import com.yxproject.start.service.SysPermissionService;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author Administrator

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

@@ -4,15 +4,10 @@ import com.yxproject.start.entity.SysRole;
 import com.yxproject.start.mapper.SysRoleMapper;
 import com.yxproject.start.service.SysRoleService;
 import net.sf.json.JSONArray;
-import org.apache.ibatis.annotations.Mapper;
-import org.omg.CORBA.OBJ_ADAPTER;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

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

 package com.yxproject.start.service.impl;
 
-import com.yxproject.start.entity.*;
+import com.yxproject.start.entity.GroupNoEntity;
+import com.yxproject.start.entity.PoliceStationVailedEntity;
+import com.yxproject.start.entity.SpecialCardEntity;
+import com.yxproject.start.entity.TaskEntity;
 import com.yxproject.start.entity.accu.AccCardTEntity;
 import com.yxproject.start.entity.prod.ProdCardTEntity;
 import com.yxproject.start.mapper.*;
-import com.yxproject.start.entity.CountyListEntity;
 import com.yxproject.start.service.TaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -102,17 +104,25 @@ public class TaskServiceImpl implements TaskService {
      * 生成任务单并保存组号列表
      *
      * @param taskEntity 任务单详情
-     * @param groupNoEntities        组号列表
+     * @param groupListAtACCU        组号列表
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int addProductionTaskListEntity(TaskEntity taskEntity, List<GroupNoEntity> groupNoEntities) {
-
-        int production_task_list_seq = utilMapper.findProductionTaskListSequenceNextValue();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+    public int addProductionTaskListEntity(TaskEntity taskEntity, List<Map<String, Object>> groupListAtACCU) {
+        Long taskID = getTaskID();
+        taskEntity.setTask_Id(taskID);
         taskMapper.insertTaskEntity(taskEntity);
-        for (GroupNoEntity groupNoEntity : groupNoEntities) {
+//        System.out.println(taskMapper.insertTaskEntity(taskEntity)+"----测试数据--------");
+        System.out.println(taskEntity.getTask_Id()+"-----has an unsupported-----");
+        for (Map<String,Object> map : groupListAtACCU) {
+            System.out.println(map.get("GROUP_NO").toString()+"--------map.get(\"GROUP_NO\").toString()---");
+            GroupNoEntity groupNoEntity = new GroupNoEntity();
+            groupNoEntity.setGroup_No(map.get("GROUP_NO").toString());
+            groupNoEntity.setTask_Id(taskID);
+            groupNoEntity.setValid_Count(Long.valueOf(map.get("VALID_COUNT").toString()));
+            groupNoEntity.setInvalid_Count(Long.valueOf(map.get("INVALID_COUNT").toString()));
+            groupNoEntity.setSpecial_Card_Count(((List)map.get("SpecialCardList")).size());
             groupNoMapper.insertGroupNoEntity(groupNoEntity);
         }
 
@@ -193,7 +203,7 @@ public class TaskServiceImpl implements TaskService {
                  * 生成原来的任务单 但不下发
                  */
                 TaskEntity taskEntity = new TaskEntity();
-                int production_task_list_seq = utilMapper.findProductionTaskListSequenceNextValue();
+                taskEntity.setTask_Id(getTaskID());
                 taskEntity.setCitycode(original_no.toString().substring(0, 6));
                 taskEntity.setCard_Type(Long.valueOf(original_no.toString().substring(20, 21)));
                 taskEntity.setSubmit_Date(new Date());
@@ -218,6 +228,7 @@ public class TaskServiceImpl implements TaskService {
                  * 生成快证任务单并下发
                  */
                 TaskEntity taskEntity1 = new TaskEntity();
+                taskEntity1.setTask_Id(getTaskID());
                 taskEntity1.setCitycode(original_no.toString().substring(0, 6));
                 taskEntity1.setCard_Type((long) 1);
                 taskEntity1.setOld_Card_Type(Long.valueOf(original_no.toString().substring(20, 21)));
@@ -276,6 +287,7 @@ public class TaskServiceImpl implements TaskService {
              * 生成快证任务单并下发
              */
             TaskEntity taskEntity = new TaskEntity();
+            taskEntity.setTask_Id(getTaskID());
             taskEntity.setCitycode(taskEntities.get(0).getCitycode());
             taskEntity.setCard_Type((long) 1);
             taskEntity.setOld_Card_Type(taskEntities.get(0).getCard_Type());
@@ -446,4 +458,17 @@ public class TaskServiceImpl implements TaskService {
         List<PoliceStationVailedEntity> policeStationVailedInfoEntityByID = policeStationVailedMapper.findPoliceStationVailedEntity(id);
         return policeStationVailedInfoEntityByID;
     }
+    private Long getTaskID(){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+        int task_seq = utilMapper.findProductionTaskListSequenceNextValue();
+        String date = simpleDateFormat.format(new Date());
+        String sequence = task_seq+"";
+        String string0="";
+        for (int i = 0;i<3-sequence.length();i++){
+            string0+="0";
+        }
+        date+=string0+sequence;
+        return Long.valueOf(date);
+    }
+
 }

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

@@ -27,4 +27,14 @@ public class TypeListServiceImpl implements TypeListService {
         List<TypeListEntity> typeListEntity = taskMapper.findTypeListByTaskStateId(taskStateId);
         return typeListEntity;
     }
+    /**
+     * 通过状态查找TypeList
+     * @param
+     * @return
+     */
+    @Override
+    public List<TypeListEntity> findTypeListByImportDateAtACCU( String importTime ) {
+        List<TypeListEntity> typeListEntity = taskMapper.findTypeListByImportDateAtACCU(importTime);
+        return typeListEntity;
+    }
 }

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

@@ -6,10 +6,8 @@ import com.yxproject.start.mapper.UserInfoMapper;
 import com.yxproject.start.service.UserInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

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

@@ -2,9 +2,15 @@ package com.yxproject.start.service.impl;
 
 import com.yxproject.start.mapper.UtilMapper;
 import com.yxproject.start.service.UtilService;
+import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author Administrator
  */
@@ -21,4 +27,77 @@ public class UtilServiceImpl implements UtilService {
     public int findGroupInfoSequenceNextValue() {
         return utilMapper.findGroupInfoSequenceNextValue();
     }
+
+
+    /**
+     * 级联菜单
+     *
+     * @return
+     */
+    @Override
+    public List findAllPoliceStation() {
+        List<Map<String,Object>> listWithSQL = utilMapper.queryAllPoliceStation();
+        Map<String,Object> countyMap = new LinkedHashMap<String,Object>();
+        for (Map<String,Object> map :listWithSQL){
+            if(countyMap.containsKey(map.get("COUNTY_CODE").toString())){
+
+                List<Map<String, Object>> mapList = (List<Map<String, Object>>) countyMap.get(map.get("COUNTY_CODE").toString());
+                Map<String,Object> gajgMap = new HashedMap();
+                gajgMap.put("GAJG_DM",map.get("POLICE_CODE"));
+                gajgMap.put("GAJG_MC",map.get("GAJG_MC"));
+                gajgMap.put("info",map);
+                mapList.add(gajgMap);
+            }else {
+                List<Map<String, Object>> mapList = new ArrayList<>();
+                Map<String,Object> gajgMap = new HashedMap();
+                gajgMap.put("GAJG_DM",map.get("POLICE_CODE"));
+                gajgMap.put("GAJG_MC",map.get("GAJG_MC"));
+                gajgMap.put("info",map);
+                mapList.add(gajgMap);
+                countyMap.put(map.get("COUNTY_CODE").toString(),mapList);
+            }
+        }
+        Map<String,Object> cityMap = new LinkedHashMap<String,Object>();
+        for (String countyCode :countyMap.keySet()){
+            if (cityMap.containsKey(countyCode.substring(0,4))){
+                List<Map<String, Object>> mapList = (List<Map<String, Object>>) cityMap.get(countyCode.substring(0,4));
+                Map<String,Object> cityMapInfo = new HashedMap();
+                Map<String, Object> info = (Map<String, Object>) ((Map<String, Object>) ((List<Map<String, Object>>) countyMap.get(countyCode)).get(0)).get("info");
+                cityMapInfo.put("countyCode",info.get("COUNTY_CODE"));
+                cityMapInfo.put("countyName",info.get("COUNTYNAME"));
+                cityMapInfo.put("countyInfo",countyMap.get(countyCode));
+                mapList.add(cityMapInfo);
+
+            }else {
+                List<Map<String, Object>> mapList = new ArrayList<>();
+                Map<String,Object> cityMapInfo = new HashedMap();
+                Map<String, Object> info = (Map<String, Object>) ((Map<String, Object>) ((List<Map<String, Object>>) countyMap.get(countyCode)).get(0)).get("info");
+                cityMapInfo.put("countyCode",info.get("COUNTY_CODE"));
+                cityMapInfo.put("countyName",info.get("COUNTYNAME"));
+                cityMapInfo.put("countyInfo",countyMap.get(countyCode));
+                mapList.add(cityMapInfo);
+                cityMap.put(countyCode.substring(0,4),mapList);
+            }
+
+        }
+        List cityList = new ArrayList<>();
+        for (String citycode :cityMap.keySet()){
+            if ("0000".equals(citycode)){
+            }else {
+                Map<String,Object> map = new HashedMap();
+                map.put("cityCode",citycode);
+                map.put("cityInfo",cityMap.get(citycode));
+                Map<String, Object> info = (Map<String, Object>) ((Map<String, Object>) ((List<Map<String, Object>>) countyMap.get(citycode + "00")).get(0)).get("info");
+                map.put("cityName",info.get("CITYNAME"));
+                cityList.add( map);
+            }
+
+        }
+        return cityList;
+    }
+
+    @Override
+    public List findTypeListData() {
+        return utilMapper.queryMakeTypeList();
+    }
 }

src/main/java/com/yxproject/start/utils/YXJSONResponse.java

 package com.yxproject.start.utils;
 
+import com.yxproject.start.entity.SpecialCardInfoEntity;
 import net.sf.json.JSON;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -32,8 +33,9 @@ public class YXJSONResponse {
     /**
      * 返回一个只有起止时间的空返回值对象
      * @return 返回值对象
+     * @param specialCardInfoEntity
      */
-    public YXJSONResponse outPutSuccess() {
+    public YXJSONResponse outPutSuccess(SpecialCardInfoEntity specialCardInfoEntity) {
         this.ServerProcessingFinishStamp = System.currentTimeMillis();
         this.ServerProcessingDur = this.ServerProcessingFinishStamp - this.start_stamp;
         this.Error = false;

src/main/resources/mapper/CardBodyMapper.xml

@@ -10,9 +10,13 @@
         <result column="TOTAL_COUNT" property="total_Count" jdbcType="NUMERIC"/>
     </resultMap>
 
-    <select id="insertCardBodyEntity" resultType="com.yxproject.start.entity.CardBodyEntity" parameterType="String">
+    <select id="findCardBody" resultType="com.yxproject.start.entity.CardBodyEntity" parameterType="String">
     select * from CARD_BODY where CARD_BODY_ID=#{card_Body_Id}
-</select>
+    </select>
+
+    <insert id="insertCardBody"  parameterType="String" >
+        INSERT INTO CARD_BODY (CARD_TYPE_ID,IS_ACTIVE,TASK_ID,TOTAL_COUNT) VALUES (#{cardTypeId},#{isActive},#{taskId},#{totalCount})
+    </insert>
 
     <update id="updateCardBody" parameterType="com.yxproject.start.entity.CardBodyEntity">
         update CARD_BODY

src/main/resources/mapper/FailedCardMapper.xml

@@ -13,13 +13,13 @@
         <result column="STATE" property="state"  jdbcType="NUMERIC"/>
     </resultMap>
 
-    <select id="selectFailedCardEntityByState" resultType="java.util.HashMap" parameterType="java.lang.Integer">
-    select * from FAILED_CARD where state = #{state}
+    <select id="findFailedList" resultType="com.yxproject.start.entity.FailedCardEntity" parameterType="String">
+    select FAILED_CARD_ID as failedCardId, FAILED_CARD_REASON_ID as failedCardReasonId, ACCEPT_NO as acceptNo, TASK_ID as taskId, POSITION_DATE as positionDate, FINISH_DATE as finishDate, ALLOT_DATE as allotDate, PRINT_DATE as printDate, STATE as state  from FAILED_CARD where STATE = #{state}
     </select>
     
     <insert id="saveFailedCardEntity" parameterType="com.yxproject.start.entity.FailedCardEntity" >
-        insert  into FAILED_CARD (FAILED_CARD_ID,FAILED_CARD_REASON_ID,ACCEPT_NO,TASK_ID,POSITION_DATE,FINISH_DATE,ALLOT_DATE,PRINT_DATE,STATE )
-        values (#{failed_Card_Id},#{failed_Card_Reason_Id},#{accept_No},#{task_Id},#{position_Date},#{finish_Date},#{allot_Date},#{print_Date},#{state})
+        insert  into FAILED_CARD (failed_Card_Reason_Id,ACCEPT_NO,TASK_ID,STATE )
+        values (#{failed_Card_Reason_Id},#{accept_No},#{task_Id},#{state})
     </insert>
 
     <update id="updateFailedCardEntity" parameterType="com.yxproject.start.entity.FailedCardEntity">
@@ -36,5 +36,13 @@ update FAILED_CARD
 </set>
         where failed_Card_Id =#{failed_Card_Id}
     </update>
-
+    <select id="selectAcceptNoAtFailedCard" resultType="com.yxproject.start.entity.FailedCardEntity" parameterType="String">
+        select * from failed_card where accept_No =#{accept_No}
+    </select>
+    <select id="selectAcceptNoAtSpecialCard" resultType="com.yxproject.start.entity.SpecialCardEntity" parameterType="String">
+        select * from special_card where accept_No =#{accept_No}
+    </select>
+    <select id="selectAcceptNoAtGroupNo" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
+        select * from group_no where group_no =#{groupNo}
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/GroupNoMapper.xml

@@ -50,6 +50,23 @@
         group by GROUP_NO
     </select>
 
+    <select id="findGroupListAtACCU" resultType="java.util.HashMap" parameterType="String">
+        select acc_group_t.group_no,acc_group_t.valid_count,acc_group_t.invalid_count,acc_group_t.deal_flag,
+ to_char(acc_group_t.submit_date,'yyyyMMdd')submit_date,SPECIALCARD.SPECIALCARDcount,
+ acc_group_t.submit_code,acc_group_relation_t.original_no,substr(original_no,21,1),to_char(acc_group_t.import_time,'yyyyMMdd') import_time
+from acc_group_t@accu_dblink
+inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no
+left join (select count(SPECIAL_CARD.ACCEPT_NO) SPECIALCARDcount ,SPECIAL_CARD.GROUP_NO from SPECIAL_CARD group by SPECIAL_CARD.GROUP_NO) SPECIALCARD  on acc_group_t.group_no = SPECIALCARD.GROUP_NO
+where substr(original_no,21,1)=#{typeCode} and to_char(acc_group_t.import_time,'yyyyMMdd') =#{importTime}
+and substr(original_no,0,4) = substr(#{cityCode},0,4) and  acc_group_t.group_no not in (select GROUP_NO.GROUP_NO from group_no)
+    </select>
+    <select id="findGroupNoListAtACCU" resultType="com.yxproject.start.entity.GroupListEntity" parameterType="String">
+        select acc_group_t.group_no groupNo from acc_group_t@accu_dblink
+inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no
+where substr(original_no,21,1)=#{typeCode} and to_char(acc_group_t.import_time,'yyyyMMdd') =#{importTime}
+and substr(original_no,0,4) = substr(#{cityCode},0,4) and  acc_group_t.group_no not in (select GROUP_NO.GROUP_NO from group_no)
+    </select>
+
 
 
 

src/main/resources/mapper/SelectSerialNumberMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yxproject.start.mapper.SelectSerialNumberMapper">
+    <resultMap id="SelectSerialNumberMapper" type="java.util.HashMap">
+
+    </resultMap>
+    <!--根据组号查询-->
+    <select id="selectByGroupNumber" resultType="java.util.HashMap" parameterType="String">
+        select
+        TASK.TASK_ID,
+        GROUP_NO.GROUP_NO,
+        CITY_DIC.CITYNAME,
+        CARD_TYPE_DIC.CARD_TYPE,
+        TASK.SUBMIT_DATE,
+        PRINTER_DIC.PRINTER_NAME,
+        TASK.POSITION_DATE,
+        TASK.QUALITY_PEOPLE_NAME,
+        TASK.OUT_STORAGE_DATE,
+        TASK.IN_STORAGE_DATE,
+        TASK.EXCEPTION_INFORMATION
+        from GROUP_NO
+        LEFT JOIN TASK ON (GROUP_NO.TASK_ID =TASK.TASK_ID)
+        LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)
+        LEFT JOIN CITY_DIC ON(TASK.CITYCODE = CITY_DIC.CITYCODE)
+        LEFT JOIN PRINTER_DIC ON (TASK.PRINTER_ID = PRINTER_DIC.PRINTER_ID)
+        LEFT JOIN CARD_TYPE_DIC ON  (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)
+        where GROUP_NO=#{id}
+    </select>
+
+    <!--根据受理号查询-->
+    <select id="selectByAccepted" parameterType="String" resultType="java.util.HashMap">
+        SELECT
+        ACC_CARD_T.ACCEPT_NO,
+        ACC_CARD_T.NAME,
+        ACC_CARD_T.ID_NO,
+        ACC_CARD_T.SEX_NO,
+        ACC_CARD_T.BIRTHDAY,
+        CARD_TYPE_DIC.CARD_TYPE,
+        ACC_CARD_T.SIGN_GOVT,
+        ACC_CARD_T.BEGIN_DATE,
+        ACC_CARD_T.EXPIRE_DATE,
+        ACC_CARD_T.STATUS_NO,
+        TASK_STATE_DIC.TASK_STATE,
+        CITY_DIC.CITYNAME,
+        decode(TASK.TASK_STATE_ID,2,TASK.submit_date,3,TASK.ISSUED_DATE,4,TASK.OUT_WORKSHOP_DATE,5,TASK.POSITION_DATE) lastModifyTime
+        FROM acc_card_t@accu_dblink
+        LEFT JOIN group_no ON (substr(accept_no,0,8) = group_no.GROUP_NO)
+        LEFT JOIN task ON (task.task_id = group_no.TASK_ID)
+        LEFT JOIN CITY_DIC ON (TASK.CITYCODE = CITY_DIC.CITYCODE)
+        LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)
+        LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)
+        where ACCEPT_NO=#{id}
+    </select>
+
+    <!--根据身份证号查询-->
+    <select id="selectByIdCard" parameterType="String" resultType="java.util.HashMap">
+        SELECT
+        ACC_CARD_T.ACCEPT_NO,
+        ACC_CARD_T.NAME,
+        ACC_CARD_T.ID_NO,
+        ACC_CARD_T.SEX_NO,
+        ACC_CARD_T.BIRTHDAY,
+        CARD_TYPE_DIC.CARD_TYPE,
+        ACC_CARD_T.SIGN_GOVT,
+        ACC_CARD_T.BEGIN_DATE,
+        ACC_CARD_T.EXPIRE_DATE,
+        ACC_CARD_T.STATUS_NO,
+        TASK_STATE_DIC.TASK_STATE,
+        CITY_DIC.CITYNAME,
+        decode(TASK.TASK_STATE_ID,2,TASK.submit_date,3,TASK.ISSUED_DATE,4,TASK.OUT_WORKSHOP_DATE,5,TASK.POSITION_DATE) lastModifyTime
+        FROM acc_card_t@accu_dblink
+        LEFT JOIN group_no ON (substr(accept_no,0,8) = group_no.GROUP_NO)
+        LEFT JOIN task ON (task.task_id = group_no.TASK_ID)
+        LEFT JOIN CITY_DIC ON (TASK.CITYCODE = CITY_DIC.CITYCODE)
+        LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)
+        LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)
+        where ID_NO=#{id}
+    </select>
+
+    <!--根据任务单查询-->
+    <select id="selectByWorkOrderNumber" parameterType="String" resultType="java.util.HashMap">
+        select
+        TASK.TASK_ID,
+        CITY_DIC.CITYNAME,
+        CARD_TYPE_DIC.CARD_TYPE,
+        TASK.SUBMIT_DATE,
+        PRINTER_DIC.PRINTER_NAME,
+        TASK.POSITION_DATE,
+        TASK.QUALITY_PEOPLE_NAME,
+        TASK.OUT_STORAGE_DATE,
+        TASK.IN_STORAGE_DATE,
+        TASK.EXCEPTION_INFORMATION
+        from TASK
+        LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)
+        LEFT JOIN CITY_DIC ON (TASK.CITYCODE = CITY_DIC.CITYCODE)
+        LEFT JOIN PRINTER_DIC ON (TASK.PRINTER_ID = PRINTER_DIC.PRINTER_ID)
+        LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)
+        where  TASK_ID =#{id}
+    </select>
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/TaskMapper.xml

@@ -28,10 +28,17 @@
     </select>
 
 
-    <insert id="insertProductionTaskListEntity"  parameterType="com.yxproject.start.entity.TaskEntity">
-    Insert into TASK (TASK_ID,CARD_TYPE,OLD_CARD_TYPE,CITYCODE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,
-    OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID)
-    values (#{task_Id},#{card_Type},#{old_Card_Type},#{citycode},#{submit_Date},#{issued_Date},#{print_State},#{download_Date},#{print_Out_Date},#{position_Date},#{out_Workshop_Date},#{quality_People_Name},#{quality_Test_Date},#{exception_Information},#{out_Storage_Date},#{in_Storage_Date},#{task_State_Id},#{is_Exception},#{printer_Id})
+    <insert id="insertTaskEntity"  parameterType="com.yxproject.start.entity.TaskEntity" useGeneratedKeys="true" keyProperty="TASK_ID" >
+    Insert into TASK (TASK_ID,CARD_TYPE,OLD_CARD_TYPE,CITYCODE,TASK_STATE_ID,PRINTER_ID)
+    values (#{task_Id},#{card_Type},
+        <if test="old_Card_Type!=null">#{old_Card_Type},</if>
+        <if test="old_Card_Type==null">null,</if>
+    #{citycode},
+        <if test="task_State_Id!=null">#{task_State_Id},</if>
+        <if test="task_State_Id==null">null,</if>
+        <if test="printer_Id!=null">#{printer_Id}</if>
+        <if test="printer_Id==null">null</if>
+        )
     </insert>
 
     <update id="updateTaskEntity" parameterType="com.yxproject.start.entity.TaskEntity">
@@ -95,6 +102,15 @@
         GROUP BY CARD_TYPE_DIC.CARD_TYPE,TASK.CARD_TYPE
     </select>
 
+    <select id="findTypeListByImportDateAtACCU" resultType="com.yxproject.start.entity.TypeListEntity" parameterType="String">
+        select  substr(original_no,21,1) typeCode,sum(valid_count ) typeCount,CARD_TYPE_DIC.CARD_TYPE AS typeName
+from acc_group_t@accu_dblink
+inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no
+left join  CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID =substr(original_no,21,1)
+where  to_char(IMPORT_TIME,'yyyyMMdd') =#{importTime} and  acc_group_t.group_no not in (select GROUP_NO.GROUP_NO from group_no)
+group by substr(original_no,21,1), CARD_TYPE_DIC.CARD_TYPE
+    </select>
+
     <select id="findCityList" resultType="com.yxproject.start.entity.CityListEntity" parameterType="String">
         SELECT CARD_TYPE AS cardType,TASK.CITYCODE AS citycode,CITYNAME AS cityName,sum(VALID_COUNT) AS validCount,sum(INVALID_COUNT) AS invalidCount,COUNT(GROUP_NO) AS groupCount,TASK.TASK_ID AS taskId,OLD_CARD_TYPE AS oldCardType,SUBMIT_DATE AS submitDate,ISSUED_DATE AS issuedDate,PRINT_STATE AS printState,DOWNLOAD_DATE AS downloadDate,PRINT_OUT_DATE AS printOutDate,POSITION_DATE AS positionDate,OUT_WORKSHOP_DATE AS outWorkshopDate,QUALITY_PEOPLE_NAME AS qualityPeopleName,QUALITY_TEST_DATE AS qualityTestDate,EXCEPTION_INFORMATION AS exceptionInformation,OUT_STORAGE_DATE AS outStorageDate,IN_STORAGE_DATE AS inStorageDate,TASK_STATE_ID AS taskStateId,IS_EXCEPTION AS isException,PRINTER_ID AS printerId
         from  TASK
@@ -104,6 +120,23 @@
         GROUP BY CARD_TYPE,TASK.CITYCODE,CITYNAME,TASK.TASK_ID,OLD_CARD_TYPE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID
     </select>
 
+    <select id="findCityListByImportDateAtACCU" resultType="com.yxproject.start.entity.CityListEntity" parameterType="String">
+        select  CARDTYPE,CITYCODE,CITYNAME,VALIDCOUNT,INVALIDCOUNT,GROUPCOUNT,ROWNUM taskID
+from (select substr(original_no,21,1) cardType ,substr(original_no,0,4)||'00' CITYCODE ,CITY_DIC.CITYNAME,sum(valid_count ) validCount,
+sum(invalid_count) invalidCount,group_COUNT.groupCOUNT
+from acc_group_t@accu_dblink
+inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no
+left join (select count(acc_group_t.group_no) groupCOUNT,substr(acc_group_relation_t.original_no,0,4) citycode
+          from acc_group_t@accu_dblink
+          left join acc_group_relation_t@accu_dblink on acc_group_t.group_no = acc_group_relation_t.group_no
+          where to_char(IMPORT_TIME,'yyyyMMdd') =#{importTime} and substr(original_no,21,1) =#{cardType}
+          group by substr(acc_group_relation_t.original_no,0,4)) group_COUNT
+          ON group_COUNT.citycode = substr(original_no,0,4)
+left join (SELECT CITYCODE,CITYNAME FROM CITY_DIC) CITY_DIC on substr(CITY_DIC.CITYCODE,0,4) = substr(original_no,0,4)
+where to_char(IMPORT_TIME,'yyyyMMdd') =#{importTime} and substr(original_no,21,1) =#{cardType} and  acc_group_t.group_no not in (select GROUP_NO.GROUP_NO from group_no)
+group by substr(original_no,21,1), substr(original_no,0,4)||'00', CITY_DIC.CITYNAME, group_COUNT.groupCOUNT)
+    </select>
+
 
     <select id="findStationCountByDealDate" resultType="java.util.HashMap" parameterType="String">
         SELECT * FROM FIND_STATE_COUNT_VIEW WHERE FIND_STATE_COUNT_LIST.SET_SUBMITDATE_PARAM(#{submitDate})=#{submitDate}  AND FIND_STATE_COUNT_LIST.SET_STATE_PARAM(#{state})=#{state}

src/main/resources/mapper/UtilMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yxproject.start.mapper.UtilMapper">
     <select id="findProductionTaskListSequenceNextValue" resultType="int"  >
-    select  PRODUCTION_TASK_LIST_SEQ.nextval from  dual
+    select  TASK_SEQ.nextval from  dual
     </select>
     <select id="findGroupInfoSequenceNextValue" resultType="int"  >
     select  GROUPINFO_SEQ.nextval from  dual
@@ -19,6 +19,18 @@
     <select id="findPoliceStationApplyReasonSequenceNextValue" resultType="int">
     select APPLY_REASON_SEQ.nextval from  dual
     </select>
+    <select id="queryAllPoliceStation" resultType="java.util.HashMap">
+        select SUBSTR(GAJG_DM.GAJG_DM,0,8) police_Code,
+GAJG_DM.GAJG_MC,decode(COUNTY_DIC.COUNTY_CODE,null,'000000',COUNTY_DIC.COUNTY_CODE) COUNTY_CODE,
+decode(COUNTY_DIC.COUNTYNAME,null,'000000',COUNTY_DIC.COUNTYNAME) COUNTYNAME ,
+SUBSTR(GAJG_DM.XZQH_DM,0,4) city_code,CITY_DIC.CITYNAME from GAJG_DM
+left join COUNTY_DIC ON COUNTY_DIC.COUNTY_CODE = SUBSTR(GAJG_DM.GAJG_DM,0,6)
+LEFT JOIN CITY_DIC ON SUBSTR(CITY_DIC.CITYCODE,0,4) = SUBSTR(GAJG_DM.GAJG_DM,0,4)
+order  by SUBSTR(GAJG_DM.GAJG_DM,0,8)
+    </select>
 
+    <select id="queryMakeTypeList" resultType="java.util.HashMap">
+        select * from card_type_dic
+    </select>
 
 </mapper>
\ No newline at end of file

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

@@ -5,6 +5,7 @@
             <th>NO.</th>
             <th>受理号</th>
             <th>姓名</th>
+            <th>身份证号</th>
             <th>类型</th>
             </thead>
             <tbody>
@@ -12,9 +13,10 @@
                 <td>{{$index + 1}}</td>
                 <td>{{item.acceptNo}}</td>
                 <td>{{item.name}}</td>
-                <td ng-if="item.specialType==0">余证</td>
-                <td ng-if="item.specialType==1">快证</td>
-                <td ng-if="item.specialType==2" style="color: red;">退证</td>
+                <td>{{item.idNo}}</td>
+                <td ng-if="item.specialType==1">余证</td>
+                <td ng-if="item.specialType==2">快证</td>
+                <td ng-if="item.specialType==3" style="color: red;">退证</td>
             </tr>
             </tbody>
         </table>

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

@@ -13,9 +13,9 @@
                     <tbody>
                     <tr ng-repeat="specialCard in specialCardList">
                         <td>{{specialCard.accept_No}}</td>
-                        <td ng-if="specialCard.special_Type==0">余证</td>
-                        <td ng-if="specialCard.special_Type==1">快证</td>
-                        <td ng-if="specialCard.special_Type==2">退证</td>
+                        <td ng-if="specialCard.special_Type==1">余证</td>
+                        <td ng-if="specialCard.special_Type==2">快证</td>
+                        <td ng-if="specialCard.special_Type==3">退证</td>
                     </tr>
                     </tbody>
                 </table>

src/main/resources/static/index.html

@@ -17,7 +17,16 @@
   <link rel="stylesheet" href="vendor/modules/ngDialog/css/myth/ngDialog-theme-default.css" type="text/css" />
 </head>
 <body ng-controller="AppCtrl">
-  <div class="app" id="app" ng-class="{'app-header-fixed':app.settings.headerFixed, 'app-aside-fixed':app.settings.asideFixed, 'app-aside-folded':app.settings.asideFolded, 'app-aside-dock':app.settings.asideDock, 'container':app.settings.container}" ui-view></div>
+  <div class="app" id="app" ng-class="{'app-header-fixed':app.settings.headerFixed, 'app-aside-fixed':app.settings.asideFixed, 'app-aside-folded':app.settings.asideFolded, 'app-aside-dock':app.settings.asideDock, 'container':app.settings.container}" ui-view>
+    <!--<span>hahhahahhahah</span>-->
+
+    <!--<div class="input-group">-->
+      <!--<input type="text" id="searchInput" style="height: 40px;line-height: 40px;font-size: 1.2em;color:#000;font-weight:bolder;"  class="form-control no-padding" ng-model="search.text" ng-keyup="enterEvent($event)" placeholder="单证或组号查询...">-->
+      <!--<span class="input-group-btn" >-->
+                            <!--<button name="search" style="height: 40px;" id="search-btn" class="btn btn-flat" ng-click="doSearch()" ><i class="glyphicon glyphicon-search" ></i></button>-->
+                        <!--</span>-->
+    <!--</div>-->
+  </div>
 
 
   <!-- jQuery -->
@@ -26,6 +35,8 @@
   <script src="vendor/layui/layui.js"></script>
   <!-- Angular -->
   <script src="vendor/angular/angular.js"></script>
+  <script src="vendor/My97DatePicker/WdatePicker.js"></script>
+  <!--<script src="vendor/My97DatePicker/calendar.js"></script>-->
   
   <script src="vendor/angular/angular-animate/angular-animate.js"></script>
   <script src="vendor/angular/angular-cookies/angular-cookies.js"></script>

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

@@ -16,4 +16,34 @@ angular.module('app', [
     'ui.validate',
     'oc.lazyLoad',
     'pascalprecht.translate'
-]);
\ No newline at end of file
+])
+/* App Module */
+// var fs = angular.module('fs', ['fs.services', 'fs.controllers', 'fs.directives', 'ui.bootstrap','blueimp.fileupload']);
+
+.controller('appCtrl', function ($scope,$location,$rootScope, HttpService) {
+    $scope.logoutWithUI = function() {
+        localStorage.clear();
+        $rootScope.loginData = {userid:'用户未登录', login:false};
+    }
+
+});
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/main/resources/static/js/controllers/bootstrap.js

@@ -216,27 +216,29 @@
     $scope.htmlTooltip = 'I\'ve been made <b>bold</b>!';
   }])
   ; 
-  app.controller('TypeaheadDemoCtrl', ['$scope', '$http', function($scope, $http) {
+
+app.controller('TypeaheadDemoCtrl', ['$scope', '$http', function($scope, $http) {
     $scope.selected = undefined;
     $scope.states = ['Alabama', 'Alaska', 'Arizona', 'Arkansas', 'California', 'Colorado', 'Connecticut', 'Delaware', 'Florida', 'Georgia', 'Hawaii', 'Idaho', 'Illinois', 'Indiana', 'Iowa', 'Kansas', 'Kentucky', 'Louisiana', 'Maine', 'Maryland', 'Massachusetts', 'Michigan', 'Minnesota', 'Mississippi', 'Missouri', 'Montana', 'Nebraska', 'Nevada', 'New Hampshire', 'New Jersey', 'New Mexico', 'New York', 'North Dakota', 'North Carolina', 'Ohio', 'Oklahoma', 'Oregon', 'Pennsylvania', 'Rhode Island', 'South Carolina', 'South Dakota', 'Tennessee', 'Texas', 'Utah', 'Vermont', 'Virginia', 'Washington', 'West Virginia', 'Wisconsin', 'Wyoming'];
     // Any function returning a promise object can be used to load values asynchronously
     $scope.getLocation = function(val) {
-      return $http.get('http://maps.googleapis.com/maps/api/geocode/json', {
-        params: {
-          address: val,
-          sensor: false
-        }
-      }).then(function(res){
-        var addresses = [];
-        angular.forEach(res.data.results, function(item){
-          addresses.push(item.formatted_address);
+        return $http.get('http://maps.googleapis.com/maps/api/geocode/json', {
+            params: {
+                address: val,
+                sensor: false
+            }
+        }).then(function(res){
+            var addresses = [];
+            angular.forEach(res.data.results, function(item){
+                addresses.push(item.formatted_address);
+            });
+            return addresses;
         });
-        return addresses;
-      });
     };
-  }])
-  ; 
-  app.controller('DatepickerDemoCtrl', ['$scope', function($scope) {
+}])
+;
+
+app.controller('DatepickerDemoCtrl', ['$scope', function($scope) {
     $scope.today = function() {
       $scope.dt = new Date();
     };
@@ -273,7 +275,7 @@
     $scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
     $scope.format = $scope.formats[0];
   }])
-  ; 
+  ;
   app.controller('TimepickerDemoCtrl', ['$scope', function($scope) {
     $scope.mytime = new Date();
 

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

@@ -396,6 +396,20 @@ app.service('MessageService', function (ngDialog) {
                     MessageService.httpRequestFailed(JSON.stringify(errA))
                 })
             },
+            getTypeListByImportDateAtACCU:function(date,success){
+                $http({
+                    method: 'GET',
+                    url: "../user/getTypeListByImportDateAtACCU" + urlTimeStamp(),
+                    params:{
+                        importTime:date
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                },function(err){
+                    var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
+                    MessageService.httpRequestFailed(JSON.stringify(errA))
+                })
+            },
             getCityListByCardType:function(cardType,state,success){
                 $http({
                     method: 'GET',
@@ -411,6 +425,21 @@ app.service('MessageService', function (ngDialog) {
                     MessageService.httpRequestFailed(JSON.stringify(errA))
                 })
             },
+            getCityListByImportDateAtACCU:function(importDate,cardType,success){
+                $http({
+                    method: 'GET',
+                    url: "../user/getCityListByImportDateAtACCU" + urlTimeStamp(),
+                    params:{
+                        importTime:importDate,
+                        cardType:cardType
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                },function(err){
+                    var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
+                    MessageService.httpRequestFailed(JSON.stringify(errA))
+                })
+            },
             getGroupNoByTaskListId:function(taskStateId,success){
                 $http({
                     method: 'GET',
@@ -425,6 +454,23 @@ app.service('MessageService', function (ngDialog) {
                     MessageService.httpRequestFailed(JSON.stringify(errA))
                 })
             },
+            getGroupListAtACCU:function(citycode,cardType,importTime,success){
+                $http({
+                    method: 'GET',
+                    url: "../user/getGroupListAtACCU" + urlTimeStamp(),
+                    params:{
+                        typeCode:cardType,
+                        cityCode:citycode,
+                        importTime:importTime
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                },function(err){
+                    var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
+                    MessageService.httpRequestFailed(JSON.stringify(errA))
+                })
+            },
+
             getCountyListByTaskListId:function(taskStateId,success){
                 $http({
                     method: 'GET',
@@ -454,6 +500,21 @@ app.service('MessageService', function (ngDialog) {
                     MessageService.httpRequestFailed(JSON.stringify(errA))
                 })
             },
+            updateFailedCard:function(failedCardId,state,success){
+                $http({
+                    method: 'GET',
+                    url: "../user/updateFailedinfo" + urlTimeStamp(),
+                    params:{
+                        failedCardId:failedCardId,
+                        state:state
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                },function(err){
+                    var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
+                    MessageService.httpRequestFailed(JSON.stringify(errA))
+                })
+            },
             findFailedinfo:function(state,workShop,success){
                 $http({
                     method: 'GET',
@@ -514,10 +575,13 @@ app.service('MessageService', function (ngDialog) {
                 })
             },
 
-            saveFailedCardsID:function(success){
+            saveFailedCardsID:function(idNo,success){
                 $http({
                     method: 'GET',
-                    url: "../yingxin/addInValidCardInfo" + urlTimeStamp(),
+                    url: "../user/addFailedinfo" + urlTimeStamp(),
+                    params:{
+                        idNo:idNo
+                    }
                 }).then(function successCallback(response) {
                     console.log(response.data,"-------------response.data------")
                     success(response.data)
@@ -527,7 +591,7 @@ app.service('MessageService', function (ngDialog) {
                 })
             },
 
-            addRemainCard:function(success){
+            addRemainCard:function(idNo,success){
                 $http({
                     method: 'GET',
                     url: "../yingxin/addRemainCard" + urlTimeStamp(),
@@ -542,7 +606,47 @@ app.service('MessageService', function (ngDialog) {
                     MessageService.httpRequestFailed(JSON.stringify(errA))
                 })
             },
+            getCardBodyReportData:function(startDate,endDate,success){
+                $http({
+                    method: 'GET',
+                    url: "../yingxin/getCardBodyCount" + urlTimeStamp(),
+                    params:{
+                        startTime:startDate,
+                        endTime:endDate
+                    }
+                }).then(function successCallback(response) {
+                    console.log(response.data,"-------------getCardBodyReportData.data------")
+                    success(response.data)
+                },function(err){
+                    var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
+                    MessageService.httpRequestFailed(JSON.stringify(errA))
+                })
+            },
 
+            getAllPoliceStation:function(success){
+                $http({
+                    method: 'GET',
+                    url: "../user/getAllPoliceStation" + urlTimeStamp()
+                }).then(function successCallback(response) {
+                    console.log(response.data,"-------------getAllPoliceStation.data------")
+                    success(response.data)
+                },function(err){
+                    var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
+                    MessageService.httpRequestFailed(JSON.stringify(errA))
+                })
+            },
+            getTypeListData:function(success){
+                $http({
+                    method: 'GET',
+                    url: "../user/getTypeListData" + urlTimeStamp()
+                }).then(function successCallback(response) {
+                    console.log(response.data,"-------------getAllPoliceStation.data------")
+                    success(response.data)
+                },function(err){
+                    var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
+                    MessageService.httpRequestFailed(JSON.stringify(errA))
+                })
+            },
 
             getprintReceipt:function(startDate,endDate,success) {
                 $http({
@@ -592,6 +696,56 @@ app.service('MessageService', function (ngDialog) {
                     MessageService.httpRequestFailed(JSON.stringify(errA))
                 })
             },
+            getStateCountInfo:function(submitDate,state,success){
+			    console.log(submitDate,state,"------------submitDate,state,--")
+                $http({
+                    method: 'GET',
+                    url: "../yingxin/getStateCountInfo" + urlTimeStamp(),
+                    params:{
+                        submitDate:submitDate,
+                        state:state
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                },function(err){
+                    var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
+                    MessageService.httpRequestFailed(JSON.stringify(errA))
+                })
+            },
+            querySpecialCardInfo:function(cardid,success) {
+                console.log(cardid,"----------cardid---------")
+                $http({
+                    method: 'GET',
+                    url: "../specialCardInfo/selectByCard" + urlTimeStamp(),
+                    params:{
+                        id:cardid
+                    }
+                }).then(function successCallback(response) {
 
+                    console.log(response.data,"-------------response.data------")
+                    success(response.data)
+                },function(err){
+                    // DebugService.debug("$http error:", err)
+                    // DebugService.debug("----------------------------------------------")
+                    var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
+                    MessageService.httpRequestFailed(JSON.stringify(errA))
+                })
+            },
+            saveTask:function(typeCode,importTime,cityCode,success){
+                $http({
+                    method: 'GET',
+                    url: "../user/saveTask" + urlTimeStamp(),
+                    params:{
+                        typeCode:typeCode,
+                        importTime:importTime,
+                        cityCode:cityCode
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                },function(err){
+                    var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
+                    MessageService.httpRequestFailed(JSON.stringify(errA))
+                })
+            }
 		}
 	}])
\ No newline at end of file

src/main/resources/static/tpl/layout/addFailedCard/addFailedCard.js

@@ -86,7 +86,7 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state',
                             console.log($scope.dataInfo,"-=====$scope.dataInfo====")
                             var count = 0;
                             for(var i=0;i<$scope.dataInfo.size;i++){
-                                if($scope.dataInfo[i].name!=null){
+                                if($scope.dataInfo[i].idNo!=null&&$scope.dataInfo[i].acceptNo!=null){
                                     count+=1;
                                 }else{
                                     continue;
@@ -96,6 +96,9 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state',
                             $scope.confirmFailedInfo = function () {
                                 console.log($rootScope.arr)
                                 $(".confirmBtn").attr("disabled", true);
+                                console.log(count,"--------count");
+                                console.log($scope.dataInfo.length,"--$scope.dataInfo.length--");
+                                console.log($scope.dataInfo,"---$scope.dataInfo----");
                                 if(count==$scope.dataInfo.length){
                                     HttpService.saveFailedCardsID($rootScope.arr,function(data){
                                         $scope.isShowSuccess = 1;

src/main/resources/static/tpl/layout/addRemainCard/addRemainCard.js

@@ -90,6 +90,8 @@ app.controller('addRemainCardCtrl', ['$scope', '$rootScope', '$http', '$state',
                                 console.log($rootScope.arr)
                                 $(".confirmBtn").attr("disabled", true);
                                 if(count==$scope.dataInfo.length){
+
+                                    console.log($rootScope.arr,"---$rootScope.arr---")
                                     HttpService.addRemainCard($rootScope.arr,function(data){
                                         $scope.isShowSuccess = 1;
                                         $scope.AddSuccess = data.respData.string;

src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.html

@@ -25,9 +25,9 @@
                 <div class="row" style="padding-top:15px;padding-left:20px;">
                     <span class="col-lg-2">
                         <div class="input-group w-md">
-                            <input type="text" class="form-control" datepicker-popup="{{format}}" ng-model="dt"
+                            <input id="date" type="text" class="form-control" datepicker-popup="{{format}}" ng-model="dt"
                                    is-open="opened" datepicker-options="dateOptions" ng-required="true"
-                                   close-text="Close"/>
+                                   close-text="Close" value="12345678" />
                             <span class="input-group-btn">
                                <button type="button" class="btn btn-default" ng-click="open($event)"><i
                                        class="glyphicon glyphicon-calendar"></i></button>
@@ -57,15 +57,15 @@
                                 <th>状态</th>
                                 <th>操作</th>
                                 </thead>
-                                <tbody ng-repeat="city in cityList| orderBy:citycode:desc">
+                                <tbody ng-repeat="city in cityList| orderBy:citycode">
                                 <tr>
                                     <td>{{city.taskId}}</td>
                                     <td><span class="city"
                                               style="color: #337ab7;display:inline-block">{{city.cityName}}</span></td>
                                     <td>{{city.groupCount}}</td>
-                                    <td>{{city.groupNO}}</td>
-                                    <td>{{city.groupSum}}</td>
-                                    <td>{{city.groupInvailedSum}}</td>
+                                    <td>{{city.groupNo}}</td>
+                                    <td>{{city.validCount}}</td>
+                                    <td>{{city.invalidCount}}</td>
                                     <td>
                                         <span style="padding-left:10px;"
                                               ng-show="city.printer_Id==null">未分配</span>
@@ -73,14 +73,14 @@
                                               ng-show="city.printer_Id!=null">机器<span>{{city.printerId}}</span></span>
                                     </td>
                                     <td>{{city.state}}</td>
-                                    <td ng-if="userState<=4"><a ng-click="showTable(city.taskId)">组号列表</a></td>
+                                    <td ng-if="userState<=4"><a ng-click="showTable(city.citycode,city.taskId)">组号列表</a></td>
                                     <td ng-if="userState>4"><a ng-click="showTableCounty(city.taskId)">区县列表</a></td>
-                                    <td><a ng-click="finishClick(city.taskId,userState)">完成</a></td>
+                                    <td><a ng-click="finishClick(city.taskId,userState,city.citycode)">完成</a></td>
                                 </tr>
                                 <tr ng-show="showtable==city.taskId && userState<=4">
                                     <td></td>
-                                    <td colspan="4">
-                                        <table style="font-size:0.9em;color: #000;" class="table">
+                                    <td colspan="6">
+                                        <table style="font-size:0.9em;color: #000;" class="table"  ng-if="userState!=1">
                                             <thead>
                                             <th>组号</th>
                                             <th>合格数量</th>
@@ -89,7 +89,7 @@
                                             <th>特殊证件列表</th>
                                             </thead>
                                             <tbody>
-                                            <tr ng-repeat="group in groupList">
+                                            <tr ng-repeat="group in groupList | orderBy:groupNo">
                                                 <td>{{group.groupNo}}</td>
                                                 <td>{{group.validCount}}</td>
                                                 <td>{{group.invalidCount}}</td>
@@ -98,6 +98,31 @@
                                             </tr>
                                             </tbody>
                                         </table>
+                                        <table style="font-size:0.9em;color: #000;" class="table"  ng-if="userState=1">
+                                            <thead>
+                                            <th>组号</th>
+                                            <th>合格数量</th>
+                                            <th>不合格数量</th>
+                                            <th>入库时间</th>
+                                            <th>操作</th>
+                                            <th>特殊证件数量</th>
+                                            <th>特殊证件列表</th>
+                                            </thead>
+                                            <tbody>
+                                            <tr ng-repeat="group in groupList">
+                                                <td>{{group.GROUP_NO}}</td>
+                                                <td>{{group.VALID_COUNT}}</td>
+                                                <td>{{group.INVALID_COUNT}}</td>
+                                                <td>{{group.IMPORT_TIME}}</td>
+                                                <td ng-if="group.DEAL_FLAG==0">未处理</td>
+                                                <td ng-if="group.DEAL_FLAG==1">一次核验</td>
+                                                <td ng-if="group.DEAL_FLAG==2">二次核验</td>
+                                                <td ng-if="group.DEAL_FLAG==3">核验完成</td>
+                                                <td>{{group.SpecialCardList.length}}</td>
+                                                <td><a ng-click="showTableGroup(group.specialCardList)">特殊证件列表</a></td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
                                     </td>
                                 </tr>
 
@@ -131,21 +156,21 @@
                                 </tbody>
                             </table>
                         </div>
-                        <footer class="panel-footer">
-                            <div class="row">
-                                <div class="col-sm-4 text-right text-center-xs">
-                                    <ul class="pagination pagination-sm m-t-none m-b-none">
-                                        <li><a href><i class="fa fa-chevron-left"></i></a></li>
-                                        <li><a href>1</a></li>
-                                        <li><a href>2</a></li>
-                                        <li><a href>3</a></li>
-                                        <li><a href>4</a></li>
-                                        <li><a href>5</a></li>
-                                        <li><a href><i class="fa fa-chevron-right"></i></a></li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </footer>
+                        <!--<footer class="panel-footer">-->
+                            <!--&lt;!&ndash;<div class="row">&ndash;&gt;-->
+                                <!--&lt;!&ndash;<div class="col-sm-4 text-right text-center-xs">&ndash;&gt;-->
+                                    <!--&lt;!&ndash;<ul class="pagination pagination-sm m-t-none m-b-none">&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<li><a href><i class="fa fa-chevron-left"></i></a></li>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<li><a href>1</a></li>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<li><a href>2</a></li>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<li><a href>3</a></li>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<li><a href>4</a></li>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<li><a href>5</a></li>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<li><a href><i class="fa fa-chevron-right"></i></a></li>&ndash;&gt;-->
+                                    <!--&lt;!&ndash;</ul>&ndash;&gt;-->
+                                <!--&lt;!&ndash;</div>&ndash;&gt;-->
+                            <!--&lt;!&ndash;</div>&ndash;&gt;-->
+                        <!--</footer>-->
                     </div>
                 </div>
             </div>

src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.js

@@ -5,9 +5,8 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
     } else {
         $state.go("layout.cycleSheet")
     }
-    // $scope.userState = $rootScope.loginData.workshop;
-    console.log($scope.userState,'---------$scope.userState-------')
-    $scope.userState=5;
+    $scope.userState = $rootScope.loginData.workshop;
+    // $scope.userState=1;
 
     var getNowFormatDate = function () {
         var date = new Date();
@@ -19,7 +18,7 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
         if (strDate >= 0 && strDate <= 9) {
             strDate = "0" + strDate;
         }
-        var currentdate = date.getFullYear() + "/" + month + "/" + strDate;
+        var currentdate = date.getFullYear() + "-" + month + "-" + strDate;
         return currentdate;
     }
     $scope.today = function () {
@@ -53,23 +52,36 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
         class: 'datepicker'
     };
 
-    $scope.initDate = new Date('2016-15-20');
-    $scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
+    $scope.initDate = new Date('20161520');
+    $scope.formats = ['dd-MM-yyyy', 'yyyyMMdd', 'dd.MM.yyyy', 'shortDate'];
     $scope.format = $scope.formats[1];
     $scope.task_click = function () {
+        getTypeListData($scope.userState)
     }
 
     $scope.cardType = 0;
     $scope.check_type = function (typeCode) {
-        cardType = typeCode;
-        getCityListData(cardType,$scope.userState);
+        $scope.cardType = typeCode;
+        getCityListData($scope.cardType,$scope.userState);
     }
-    // 查询制证类型列表
+
+    // $scope.today = new  Date();
+    // $scope.date = $filter('date')($scope.today, 'yyyyMMdd');
+    // 查询制证类型列表submitDate,state,
     var getTypeListData = function (userState) {
-        HttpService.getTypeListByTaskStateId(userState,function (data) {
-            $scope.typeList = data.respData;
+        $scope.date = $("#date").val();
+        console.log($scope.date,"---$scope.date---")
+       if (userState==1){
+           HttpService.getTypeListByImportDateAtACCU($scope.date,function (data) {
+               $scope.typeList = data.respData;
 
-        })
+           })
+       } else {
+           HttpService.getTypeListByTaskStateId(userState,function (data) {
+               $scope.typeList = data.respData;
+
+           })
+       }
     }
     getTypeListData($scope.userState);
     $scope.currentTab = 1;
@@ -96,26 +108,43 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
 
     // 查询城市列表
     var getCityListData = function (cardType,state) {
-        console.log("----调用查询城市列表接口-",cardType,state)
-        HttpService.getCityListByCardType(cardType,state,function (data) {
-            $scope.cityList = data.respData;
-            console.log("---城市列表--数据源:")
-            console.log(data.respData)
+        $scope.date = $("#date").val();
+        if ($scope.userState==1){
+            console.log("==================")
+            HttpService.getCityListByImportDateAtACCU($scope.date,cardType,function (data) {
+                $scope.cityList = data.respData;
+                console.log("---城市列表--数据源:")
+                console.log(data.respData)
+
+            })
+        } else {
+            console.log("-------------------")
+            HttpService.getCityListByCardType(cardType,state,function (data) {
+                $scope.cityList = data.respData;
+                console.log("---城市列表--数据源:")
+                console.log(data.respData)
+
+            })
+        }
 
-        })
     }
-    console.log("--查看card type- -",$scope.cardType)
     getCityListData($scope.cardType,$scope.userState);
 
     // 查询组号列表
-    var getGroupListData = function (taskId) {
-        console.log("---查询组号列表--数据源:",taskId);
-        HttpService.getGroupNoByTaskListId(taskId,function (data) {
-            $scope.groupList = data.respData;
-            console.log("---查询组号列表--数据源:")
-            console.log(data.respData)
+    var getGroupListData = function (citycode,taskId) {
+        $scope.date = $("#date").val();
+        if ($scope.userState==1){
+            console.log(citycode,"----------",$scope.cardType,"-----",$scope.date,"-----citycode,$scope.cardType,$scope.date-----")
+            HttpService.getGroupListAtACCU(citycode,$scope.cardType,$scope.date,function (data) {
+                $scope.groupList = data.respData;
+                console.log($scope.groupList,"=====组号列表====")
+            })
+        } else {
+            HttpService.getGroupNoByTaskListId(taskId,function (data) {
+                $scope.groupList = data.respData;
+            })
+        }
 
-        })
     }
 
 
@@ -281,7 +310,7 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
     //         "task_State_Id": 1
     //     },
     // ]
-
+    //
     // $scope.groupList = [
     //     {
     //         "groupNO": 45,
@@ -336,14 +365,15 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
     // ]
 
     $scope.showtable = -1;
-    $scope.showTable = function (taskID) {
-        console.log("$scope.-------$scope.showtable----",taskID);
-        if ($scope.showtable != taskID) {
-            $scope.showtable = taskID;
-        } else {
-            $scope.showtable = -1;
-        }
-        getGroupListData($scope.showtable);
+    $scope.showTable = function (cityCode,taskID) {
+
+            if ($scope.showtable != taskID) {
+                $scope.showtable = taskID;
+            } else {
+                $scope.showtable = -1;
+            }
+
+        getGroupListData(cityCode,$scope.showtable);
     }
 
     $scope.showtableCounty = -1;
@@ -354,12 +384,10 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
         } else {
             $scope.showtableCounty = -1;
         }
-        console.log($scope.showtableCounty,"---$scope.showtableCounty--");
         getCountyListData($scope.showtableCounty);
     }
 
     $scope.showTableGroup = function (specialCardList) {
-        console.log("--specialCardList--",specialCardList);
         ngDialog.open({
             template: 'dialogs/specialCardList.html' + urlTimeStamp(),
             width: 800,
@@ -367,18 +395,23 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
             controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService, $rootScope) {
                 $scope.specialCardList = specialCardList;
             }]
-
         })
     }
 
-    $scope.finishClick = function (taskId, userState) {
+    $scope.finishClick = function (taskId, userState,citycode) {
         var state =parseInt(userState);
-        console.log("--userState+1--",state+1);
-        HttpService.updateProductionTask(taskId, state+1, function (success) {
-
-            //点击确认成功后  再次查询城市列表
-            getCityListData(cardType,state+1 );
-        })
+        if (state==1){
+            console.log(citycode,"----------",$scope.cardType,"-----",$scope.date,"-----citycode,$scope.cardType,$scope.date-----")
+            HttpService.saveTask($scope.cardType,$scope.date,citycode,function (success){
+                getTypeListData(state);
+                getCityListData($scope.cardType,state+1 );
+            })
+        } else {
+            HttpService.updateProductionTask(taskId, state+1, function (success) {
+                //点击确认成功后  再次查询城市列表
+                getCityListData($scope.cardType,state+1 );
+            })
+        }
     }
 
     // $scope.folds = [

src/main/resources/static/tpl/layout/failedCard/failedCard.html

@@ -3,13 +3,6 @@
          ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
 
         <div class="hbox hbox-auto-xs hbox-auto-sm">
-            <div class="col w-md bg-light dk b-r bg-auto">
-                <div class="wrapper b-b bg">
-                    <button class="btn btn-sm btn-default pull-right visible-sm visible-xs" ui-toggle-class="show"
-                            target="#email-menu"><i class="fa fa-bars"></i></button>
-                    <a class="w-xs font-bold">废证任务单</a>
-                </div>
-            </div>
             <div class="col">
 
                 <div class="wrapper-md">
@@ -39,7 +32,7 @@
                                         <span style="padding-left:10px;"
                                               ng-show="failedCard.allotDate==null">未分配</span>
                                         <span style="padding-left:10px;"
-                                              ng-show="failedCard.allotDate!=null">{{failedCard.allotDate}}}</span></span>
+                                              ng-show="failedCard.allotDate!=null">{{failedCard.allotDate}}</span></span>
                                     </td>
                                     <td>{{failedCard.positionDate}}</td>
                                     <td>{{failedCard.state}}</td>

src/main/resources/static/tpl/layout/failedCard/failedCard.js

@@ -109,8 +109,8 @@ app.controller('failedCardCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
     ]
 
 
-    $scope.finishClick = function (taskId, userState) {
-        HttpService.updateProductionTask(taskId, userState, function (data) {
+    $scope.finishClick = function (failedCardId,userState) {
+        HttpService.updateFailedCard(failedCardId, userState, function (data) {
             //点击确认成功后  再次废证列表
             getFailedCardListData($rootScope.loginData.state, $rootScope.loginData.workshop);
         })

src/main/resources/static/tpl/layout/layout.html

@@ -28,23 +28,44 @@
         <!-- / buttons -->
 
         <!-- search form -->
+        <!--<form class="navbar-form navbar-form-sm navbar-left shift" ui-shift="prependTo" target=".navbar-collapse"-->
+              <!--role="search" ng-controller="layOutCtrl" >-->
+            <!--<div class="form-group">-->
+                <!--<div class="input-group">-->
+                    <!--<input type="text" ng-model="selected" id="searchInput"-->
+                           <!--typeahead="state for state in states | filter:$viewValue"-->
+                           <!--class="form-control input-sm bg-light no-border rounded padder"-->
+                           <!--placeholder="单证或组号查询...">-->
+                    <!--<span class="input-group-btn">-->
+                        <!--<button type="submit" name="serach" class="btn btn-sm bg-light rounded" ng-click="doSearch()">-->
+                            <!--<i class="fa fa-search"></i>-->
+                        <!--</button>-->
+                    <!--</span>-->
+                <!--</div>-->
+            <!--</div>-->
+        <!--</form>-->
+        <!-- / search form -->
+
         <form class="navbar-form navbar-form-sm navbar-left shift" ui-shift="prependTo" target=".navbar-collapse"
-              role="search" ng-controller="TypeaheadDemoCtrl">
+              role="search" ng-controller="layOutCtrl">
             <div class="form-group">
                 <div class="input-group">
-                    <input type="text" ng-model="selected"
+                    <input type="text" ng-model="selected" id="searchInput"
                            typeahead="state for state in states | filter:$viewValue | limitTo:8"
                            class="form-control input-sm bg-light no-border rounded padder"
                            placeholder="Search projects...">
                     <span class="input-group-btn">
-                        <button type="submit" class="btn btn-sm bg-light rounded">
+                        <button type="submit" class="btn btn-sm bg-light rounded" ng-click="doSearch()">
                             <i class="fa fa-search"></i>
                         </button>
                     </span>
                 </div>
             </div>
+            <span style="margin-left: 300px">
+                已完成数量：<span>{{}}</span>
+                未完成数量：<span>{{}}</span>
+            </span>
         </form>
-        <!-- / search form -->
 
         <!-- nabar right -->
         <ul class="nav navbar-nav navbar-right">

src/main/resources/static/tpl/layout/layout.js

-app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService) {
+app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService,$location) {
     if ($rootScope.loginData.login == false) {
         $state.go("signin")
     } else {
@@ -20,5 +20,34 @@ app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filte
 
         $scope.menuList = $rootScope.loginData.roleList[0].permissions;
     }
+    $scope.userState=$rootScope.loginData.workshop;
+    $scope.today = new  Date();
+    $scope.timeString = $filter('date')($scope.today, 'yyyyMMdd');
+    var  getStateCountInfo = function (timeString,userState) {
+        HttpService.getStateCountInfo(timeString,userState, function (data) {
+            $scope.getStateCountInfoData=data.respData
+
+        })
+    }
+    getStateCountInfo($scope.timeString,$scope.userState);
+
+
+
+    $scope.doSearch = function(){
+        $rootScope.searchInput=$("#searchInput").val();
+        HttpService.querySpecialCardInfo($rootScope.searchInput,function(data) {
+            if(data != null){
+                $rootScope.specialCardInfo = data.respData.searchResult;
+            }
+
+        })
+        $state.go("layout.searchSpecialCard")
+    }
+    $scope.enterEvent = function(e) {
+        var keycode = window.event?e.keyCode:e.which;
+        if(keycode==13){
+            $scope.doSearch();
+        }
+    }
 
 }])
\ No newline at end of file

src/main/resources/static/tpl/layout/yieldReport/yieldReport.js

@@ -5,8 +5,8 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
     } else {
         $state.go("layout.yieldReport")
     }
-    $scope.userState = $rootScope.workshop;
-    // $scope.userState=5;
+    // $scope.userState = $rootScope.loginData.workshop;
+    $scope.userState=8;
 
 
     $scope.date = "date";
@@ -80,25 +80,17 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
         })
     }
 
-    var getPrintDataReport = function (startDate, endDate) {
-
-        if ($rootScope.loginData.state == 2) {
-            HttpService.getPrintData(startDate, endDate, function (data) {
-                $scope.printDataReport = data.respData;
-                console.log("初始化打印卸载报表：", $scope.printDataReport)
-            })
-        }
-        if ($rootScope.loginData.state == 0) {
-            HttpService.getAdminPrintData(startDate, endDate, $scope.userState, function (data) {
-                $scope.printDataReport = data.respData;
-                console.log("初始化打印卸载报表：", $scope.printDataReport)
+    var getCardBodyReport = function (startDate, endDate) {
+            HttpService.getCardBodyReportData(startDate, endDate, function (data) {
+                console.log(data,'--------测试打印卡基报表-------')
+                $scope.cardBodyReportData = data.respData;
+                console.log("打印卡基报表：", $scope.cardBodyReportData)
             })
-        }
 
     }
     if ($rootScope.loginData.state == 2 || $rootScope.loginData.state == 0) {
         console.log($scope.currentDetailDate, $scope.month_last)
-        getPrintDataReport($scope.currentDetailDate, $scope.month_last)
+        getCardBodyReport($scope.currentDetailDate, $scope.month_last)
     }
     //  打印  打印卸载报表按钮
     $scope.printPrintDataReport = function () {
@@ -127,24 +119,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
 
     }
 
-    var getQualityCheckReport = function (month) {
-        // if ($rootScope.loginData.state == 6) {
-        //     HttpService.getQualityCheckReportData(month, function (data) {
-        //         $scope.qulityCheckData = data.respData;
-        //         console.log("质检报表：", $scope.qulityCheckData)
-        //     })
-        // }
-        // if ($rootScope.loginData.state == 0) {
-        //     HttpService.getAdminQualityCheckReportData(month, $scope.state.substring(1, 2), function (data) {
-        //         $scope.qulityCheckData = data.respData;
-        //         console.log("质检报表：", $scope.qulityCheckData)
-        //     })
-        // }
 
-    }
-    // if ($rootScope.loginData.state == 6 || $rootScope.loginData.state == 0) {
-    //     getQualityCheckReport($scope.nowMonth)
-    // }
 
     $scope.printQualityCheckReport = function () {
         var month = $("#wdateZj").val()
@@ -171,24 +146,6 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
 
     }
 
-    var getPingReportByDay = function (date) {
-        if ($rootScope.loginData.state == 4) {
-            HttpService.getPingReportByDayData(date, function (data) {
-                $scope.pingReportByDay = data.respData;
-                console.log("车间日报表：", $scope.pingReportByDay)
-            })
-        }
-        if ($rootScope.loginData.state == 0) {
-            HttpService.getAdminPingReportByDayData(date, 'p' + $scope.state.substring(1, 2), function (data) {
-                $scope.pingReportByDay = data.respData;
-                console.log("车间日报表：", $scope.pingReportByDay)
-            })
-        }
-
-    }
-    if ($rootScope.loginData.state == 4 || $rootScope.loginData.state == 0) {
-        getPingReportByDay($scope.nowDate);
-    }
 
     $scope.printPingReportByDay = function () {
         var date = $("#wdateCj").val()
@@ -215,33 +172,6 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
 
     }
 
-    // var getCkReportByDay = function(date){
-    //     HttpService.getYieldDailyReportByStorehouseData(date,function(data){
-    //         $scope.storeRportData = data.respData;
-    //         console.log("仓库产量日报表：",$scope.storeRportData)
-    //     })
-    // }
-    // if($rootScope.loginData.state == 7){
-    //     getCkReportByDay($scope.nowDate);
-    // }
-
-    // var getStorehouseReportDatas = function(start,end){
-    //     HttpService.getCkReportData(start,end,function(data){
-    //         $scope.StoreReportData= data.respData;
-    //         for(var i=0;i<$scope.StoreReportData.length;i++){
-    //             if(i==0){
-    //                 $scope.StoreReportData[i].isActive=true;
-    //             }else{
-    //                 $scope.StoreReportData[i].isActive=false;
-    //             }
-    //         }
-    //         console.log("初始化仓库报表：",data.respData)
-    //     })
-    // }
-    // if($rootScope.loginData.state == 7||$rootScope.loginData.state == 0) {
-    //     getStorehouseReportDatas($scope.month_first,$scope.month_last)
-    // }
-
     $scope.showtable = -1;
     $scope.showTable = function (index) {
         if ($scope.showtable != index) {
@@ -252,25 +182,6 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
         }
     }
 
-    var getStorehouseReportDatas = function (start, end) {
-        HttpService.getStorehouseReportDatas(start, end, function (data) {
-            $scope.totalCount = data.respData.sumInfo;
-            $scope.StoreReportData = data.respData.listInfo;
-            for (var i = 0; i < $scope.StoreReportData.length; i++) {
-                if (i == 0) {
-                    $scope.StoreReportData[i].isActive = true;
-                } else {
-                    $scope.StoreReportData[i].isActive = false;
-                }
-            }
-            console.log("初始化仓库出入库报表：", data.respData)
-        })
-    }
-    if ($rootScope.loginData.state == 7 || $rootScope.loginData.state == 0 || $rootScope.loginData.state == 8) {
-        getStorehouseReportDatas($scope.month_first, $scope.month_last)
-    }
-
-
     $scope.printStoreDayReport = function () {
         var date = $("#wdateCj").val()
         console.log("时间")
@@ -290,12 +201,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
         var end = $("#wdate2").val()
         if (parseInt(start) <= parseInt(end)) {
             $scope.msgAlert = '';
-            if ($rootScope.loginData.state == 2 || $scope.state == '02') {
-                getPrintDataReport(start, end);
-            }
-            if ($rootScope.loginData.state == 7 || $scope.state == '07' || $rootScope.loginData.state == 8) {
-                getStorehouseReportDatas(start, end)
-            }
+            getCardBodyReport(start, end);
         } else {
             $scope.msgAlert = "起始日期不能大于结束日期，请重新选择！";
         }
@@ -314,4 +220,82 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
 
     }
 
+    var vm = $scope.vm = {};
+    HttpService.getAllPoliceStation(function(data){
+        vm.countries = data.respData;
+        console.log(vm.countries)
+    })
+
+    HttpService.getTypeListData(function(data){
+        $scope.typeList = data.respData;
+        var json = {CARD_TYPE_ID: -1, CARD_TYPE: "全部类型"};
+        $scope.typeList.unshift(json);
+        console.log($scope.typeList)
+    })
+
+    $scope.myClickFinance = function () {
+        var start = $("#wdate1").val()
+        var end = $("#wdate2").val()
+        var makeType = $("#selectType").val()
+        var cityCode;
+        if(vm.country==undefined) {
+            cityCode = -1;
+        }else{
+            if(vm.province==null){
+                cityCode = vm.country.cityCode;
+            }else{
+                if(vm.city==null){
+                    cityCode = vm.province.countyCode;
+                }else{
+                    cityCode = vm.city.GAJG_DM;
+                }
+            }
+        }
+        if(parseInt(start)<=parseInt(end)){
+            getFinanceReportData(start,end,cityCode,makeType)
+        }else{
+            $scope.msgAlert = "起始日期不能大于结束日期，请重新选择！";
+        }
+
+    }
+//TODO
+    //财务报表
+    var getFinanceReportData = function(start,end,citycode,type){
+        console.log(start,end,citycode,type,"-------start,end,citycode,type--------")
+        HttpService.getFinanceReportDatas(start,end,citycode,type,function(data){
+            $scope.financeData = data.respData;
+            for(var i=0;i<$scope.financeData.length;i++){
+                if(i==0){
+                    $scope.financeData[i].isActive=true;
+                }else{
+                    $scope.financeData[i].isActive=false;
+                }
+            }
+            console.log("初始化财务报表：",$scope.financeData)
+        })
+    }
+    if($rootScope.loginData.workshop == 8) {
+        HttpService.getTypeListData(function(data){
+            $scope.typeList = data.respData;
+            var json = ["全部类型","-1",2];
+            $scope.typeList.unshift(json);
+        })
+        var vm = $scope.vm = {};
+        HttpService.getAllCityJson(function(data){
+            vm.countries = data.respData;
+            console.log(vm.countries)
+        })
+        // 更换国家的时候清空省
+        $scope.$watch('vm.country', function(country) {
+            vm.province = null;
+        });
+        // 更换省的时候清空城市
+        $scope.$watch('vm.province', function(province) {
+            vm.city = null;
+        });
+        getFinanceReportData($scope.month_first,$scope.month_last,"-1","-1")
+    }
+
+
+
 }]);
\ No newline at end of file

src/main/resources/static/vendor/My97DatePicker/lang/en.js

+var $lang={
+errAlertMsg: "Invalid date or the date out of range,redo or not?",
+aWeekStr: ["wk", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
+aLongWeekStr:["wk","Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],
+aMonStr: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
+aLongMonStr: ["January","February","March","April","May","June","July","August","September","October","November","December"],
+clearStr: "Clear",
+todayStr: "Today",
+okStr: "OK",
+updateStr: "OK",
+timeStr: "Time",
+quickStr: "Quick Selection",
+err_1: 'MinDate Cannot be bigger than MaxDate!'
+}
\ No newline at end of file

src/main/resources/static/vendor/My97DatePicker/lang/zh-cn.js

+var $lang={
+errAlertMsg: "\u4E0D\u5408\u6CD5\u7684\u65E5\u671F\u683C\u5F0F\u6216\u8005\u65E5\u671F\u8D85\u51FA\u9650\u5B9A\u8303\u56F4,\u9700\u8981\u64A4\u9500\u5417?",
+aWeekStr: ["\u5468","\u65E5","\u4E00","\u4E8C","\u4E09","\u56DB","\u4E94","\u516D"],
+aLongWeekStr:["\u5468","\u661F\u671F\u65E5","\u661F\u671F\u4E00","\u661F\u671F\u4E8C","\u661F\u671F\u4E09","\u661F\u671F\u56DB","\u661F\u671F\u4E94","\u661F\u671F\u516D"],
+aMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00","\u5341\u4E8C"],
+aLongMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00\u6708","\u5341\u4E8C\u6708"],
+clearStr: "\u6E05\u7A7A",
+todayStr: "\u4ECA\u5929",
+okStr: "\u786E\u5B9A",
+updateStr: "\u786E\u5B9A",
+timeStr: "\u65F6\u95F4",
+quickStr: "\u5FEB\u901F\u9009\u62E9", 
+err_1: '\u6700\u5C0F\u65E5\u671F\u4E0D\u80FD\u5927\u4E8E\u6700\u5927\u65E5\u671F!'
+}
\ No newline at end of file

src/main/resources/static/vendor/My97DatePicker/lang/zh-tw.js

+var $lang={
+errAlertMsg: "\u4E0D\u5408\u6CD5\u7684\u65E5\u671F\u683C\u5F0F\u6216\u8005\u65E5\u671F\u8D85\u51FA\u9650\u5B9A\u7BC4\u570D,\u9700\u8981\u64A4\u92B7\u55CE?",
+aWeekStr: ["\u5468","\u65E5","\u4E00","\u4E8C","\u4E09","\u56DB","\u4E94","\u516D"],
+aLongWeekStr:["\u5468","\u661F\u671F\u65E5","\u661F\u671F\u4E00","\u661F\u671F\u4E8C","\u661F\u671F\u4E09","\u661F\u671F\u56DB","\u661F\u671F\u4E94","\u661F\u671F\u516D"],
+aMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00","\u5341\u4E8C"],
+aLongMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00\u6708","\u5341\u4E8C\u6708"],
+clearStr: "\u6E05\u7A7A",
+todayStr: "\u4ECA\u5929",
+okStr: "\u78BA\u5B9A",
+updateStr: "\u78BA\u5B9A",
+timeStr: "\u6642\u9593",
+quickStr: "\u5FEB\u901F\u9078\u64C7",
+err_1: '\u6700\u5C0F\u65E5\u671F\u4E0D\u80FD\u5927\u65BC\u6700\u5927\u65E5\u671F!'
+}
\ No newline at end of file

src/main/resources/static/vendor/My97DatePicker/skin/WdatePicker.css

+.Wdate{
+	border:#999 1px solid;
+	height:30px;
+	border-radius: 4px;
+	background:#fff url(datePicker.gif) no-repeat right;
+}
+.Wdate::-ms-clear{display:none;}
+
+.WdateFmtErr{
+	font-weight:bold;
+	color:red;
+}
\ No newline at end of file