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

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;
@@ -21,30 +25,36 @@ public class selectApi {
      */
     @Autowired
     private SelectSerialNumberService selectSerialNumberService;
-    @RequestMapping(value = "selectByCard", method = RequestMethod.GET)
-    public Map<String,Object> selectByCard(@RequestParam("id") String id, HttpServletResponse resp){
+
+    @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:
-                  SpecialCardInfoEntity specialCardInfo= selectSerialNumberService.selectByGroupNumber(id);
+                  System.out.println("id"+id);
+                  SelectByGroupNumEntity specialCardInfo= selectSerialNumberService.selectByGroupNumber(id);
                   map.put("searchResult",specialCardInfo);
                   break;
               case 10:
-                  SpecialCardInfoEntity specialCardInfo2 = selectSerialNumberService.selectByIDCardOrAccepted(id);
+                  SelectByAcceptedEntity specialCardInfo2 = selectSerialNumberService.selectByAccepted(id);
                   map.put("searchResult",specialCardInfo2);
                   break;
               case 18:
-                  SpecialCardInfoEntity specialCardInfo3 = selectSerialNumberService.selectByIDCardOrAccepted(id);
+                  SelectByIdcardEntity specialCardInfo3 = selectSerialNumberService.selectByIdCard(id);
                   map.put("searchResult",specialCardInfo3);
                  break;
               case 11:
-                  SpecialCardInfoEntity specialCardInfo4 = selectSerialNumberService.selectByWorkOrderNumber(id);
+                  SelectByWorkOrderEntity specialCardInfo4 = selectSerialNumberService.selectByWorkOrderNumber(id);
                   map.put("searchResult",specialCardInfo4);
                  break;
           }
-          JSONObject resultJson = JSONObject.fromObject(map);
-          System.out.println("api111111111111"+resultJson);
-          return resultJson;
+        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/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/SpecialCardInfoEntity.java

 package com.yxproject.start.entity;
 
-import javax.persistence.Entity;
 import javax.xml.crypto.Data;
 
 public class SpecialCardInfoEntity {
-
     private TaskEntity taskEntity;
     private GroupNoEntity groupNoEntity;
     private AccCardTEntity accCardTEntity;
@@ -75,7 +73,7 @@ public class SpecialCardInfoEntity {
         return cityName;
     }
 
-    public void setCityName(String cityName) {
+    public void     setCityName(String cityName) {
         this.cityName = cityName;
     }
 

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/SelectSerialNumberMapper.java

@@ -8,6 +8,7 @@ import java.util.Map;
 @Mapper
 public interface SelectSerialNumberMapper {
     public Map<String,Object> selectByGroupNumber(String id);
-    public Map<String,Object> selectByIDCardOrAccepted(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/service/SelectSerialNumberService.java

 package com.yxproject.start.service;
 
-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;
 
 
 public interface SelectSerialNumberService {
-    SpecialCardInfoEntity selectByGroupNumber(String id);
-
-    SpecialCardInfoEntity selectByIDCardOrAccepted(String id);
-
-    SpecialCardInfoEntity selectByWorkOrderNumber(String id);
+    SelectByGroupNumEntity selectByGroupNumber(String id);
+    SelectByAcceptedEntity selectByAccepted(String id);
+    SelectByIdcardEntity selectByIdCard(String id);
+    SelectByWorkOrderEntity selectByWorkOrderNumber(String id);
 }
 

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;
@@ -15,87 +23,113 @@ public class SelectSerialNumberServiceImpl implements SelectSerialNumberService
     @Autowired
     public SelectSerialNumberMapper selectSerialNumberMapper;
 
+
     @Override
-    public SpecialCardInfoEntity selectByGroupNumber(String id){
-        Map<String, Object> map = selectSerialNumberMapper.selectByGroupNumber(id);
-
-
-         System.out.println("数据111"+map);
-         SpecialCardInfoEntity specialCardInfoEntity = new SpecialCardInfoEntity();
-         specialCardInfoEntity.setLibrary("盈信库");
-         specialCardInfoEntity.getGroupNoEntity().setTask_Id((Long) map.get("TASK_ID"));
-         specialCardInfoEntity.getGroupNoEntity().setGroup_No(String.valueOf(map.get("GROUP_NO")));
-         specialCardInfoEntity.setCityName(String.valueOf(map.get("CITYNAME")));
-         specialCardInfoEntity.setCardType((String) map.get("CARD_TYPE"));
-         specialCardInfoEntity.getTaskEntity().setSubmit_Date((Date) map.get("SUBMIT_DATE"));
-         specialCardInfoEntity.setPainterName((String) map.get("PRINTER_NAME"));
-         specialCardInfoEntity.getTaskEntity().setPosition_Date((Date) map.get("POSITION_DATE"));
-         specialCardInfoEntity.getTaskEntity().setQuality_People_Name((String) map.get("QUALITY_PEOPLE_NAME"));
-         specialCardInfoEntity.getTaskEntity().setOut_Storage_Date((Date) map.get("OUT_STORAGE_DATE"));
-         specialCardInfoEntity.getTaskEntity().setIn_Storage_Date((Date) map.get("IN_STORAGE_DATE"));
-         specialCardInfoEntity.getTaskEntity().setException_Information((String) map.get("EXCEPTION_INFORMATION"));
-         
-         return specialCardInfoEntity;
+    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 SpecialCardInfoEntity selectByIDCardOrAccepted(String id){
-        Map<String,Object> map = selectSerialNumberMapper.selectByIDCardOrAccepted(id);
-        SpecialCardInfoEntity specialCardInfoEntity = new SpecialCardInfoEntity();
+    public SelectByAcceptedEntity selectByAccepted(String id){
+        Map<String,Object> map = selectSerialNumberMapper.selectByAccepted(id);
+        SelectByAcceptedEntity selectByAcceptedEntity = new SelectByAcceptedEntity();
         String sex ;
-        if ((Integer)map.get("SEX_NO")==1){
+        if (Integer.parseInt((String) map.get("SEX_NO")) ==1){
             sex = "男";
-        }else if ((Integer)map.get("SEX_NO")==2){
+        }else if (Integer.parseInt((String) map.get("SEX_NO"))==2){
             sex = "女";
         }else {
             sex = "缺失";
         }
 
-        if ((Integer) map.get("CARD_TYPE")==0){
-            specialCardInfoEntity.setCardType((String) map.get("CARD_TYPE"));
-        }else if ( (Integer) map.get("CARD_TYPE")!= 0&& map.get("CARD_TYPE")!=null){
+        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 {
-            specialCardInfoEntity.setCardType("缺失");
+            sex = "缺失";
         }
 
-        specialCardInfoEntity.setLibrary("受理库");
-        specialCardInfoEntity.getAccCardTEntity().setAcceptNo((String) map.get("ACCEPT_NO"));
-        specialCardInfoEntity.getAccCardTEntity().setName((String) map.get("NAME"));
-        specialCardInfoEntity.getAccCardTEntity().setIdNo((String) map.get("ID_NO"));
-        specialCardInfoEntity.getAccCardTEntity().setSexNo(sex);
-        specialCardInfoEntity.getAccCardTEntity().setBirthday((String) map.get("BIRTHDAY"));
-        specialCardInfoEntity.getAccCardTEntity().setSignGovt((String) map.get("SIGN_GOVT"));
-        specialCardInfoEntity.getAccCardTEntity().setBeginDate((String) map.get("BEGIN_DATE"));
-        specialCardInfoEntity.getAccCardTEntity().setExpireDate((String) map.get("EXPIRE_DATE"));
-        specialCardInfoEntity.getAccCardTEntity().setStatusNo((String) map.get("STATUS_NO"));
-        specialCardInfoEntity.setTaskState((String) map.get("TASK_STATE"));
-        specialCardInfoEntity.setCityName((String) map.get("CITYNAME"));
-        specialCardInfoEntity.setLastModifyTime((Data) map.get("lastModifyTime;"));
-
-        return specialCardInfoEntity;
+        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 SpecialCardInfoEntity selectByWorkOrderNumber(String id){
+    public SelectByWorkOrderEntity selectByWorkOrderNumber(String id){
         Map<String,Object> map = selectSerialNumberMapper.selectByWorkOrderNumber(id);
-        SpecialCardInfoEntity specialCardInfoEntity = new SpecialCardInfoEntity();
-
-        specialCardInfoEntity.setLibrary("盈信库");
-        specialCardInfoEntity.getTaskEntity().setTask_Id((Long) map.get("TASK_ID"));
-        specialCardInfoEntity.setCityName((String) map.get("CITYNAME"));
-        specialCardInfoEntity.setCardType((String) map.get("CARD_TYPE"));
-        specialCardInfoEntity.getTaskEntity().setSubmit_Date((Date) map.get("SUBMIT_DATE"));
-        specialCardInfoEntity.setPainterName((String) map.get("PRINTER_NAME"));
-        specialCardInfoEntity.getTaskEntity().setPosition_Date((Date) map.get("POSITION_DATE"));
-        specialCardInfoEntity.getTaskEntity().setQuality_People_Name((String) map.get("QUALITY_PEOPLE_NAME"));
-        specialCardInfoEntity.getTaskEntity().setOut_Storage_Date((Date) map.get("OUT_STORAGE_DATE"));
-        specialCardInfoEntity.getTaskEntity().setIn_Storage_Date((Date) map.get("IN_STORAGE_DATE"));
-        specialCardInfoEntity.getTaskEntity().setException_Information((String) map.get("EXCEPTION_INFORMATION"));
-
-        return specialCardInfoEntity;
+        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/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.ProdCardTMapper">
-    <resultMap id="SelectSerialNumberMapper" type="com.yxproject.start.entity.SpecialCardInfoEntity">
-
-
+<mapper namespace="com.yxproject.start.mapper.SelectSerialNumberMapper">
+    <resultMap id="SelectSerialNumberMapper" type="java.util.HashMap">
 
     </resultMap>
     <!--根据组号查询-->
-    <select id="selectByGroupNumber" parameterType="String" resultType="com.yxproject.start.entity.SpecialCardInfoEntity">
-        select * from GROUP_NO
-        INNER JOIN TASK ON (GROUP_NO.TASK_ID =TASK.TASK_ID)
-        INNER JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)
-        INNER JOIN CITY_DIC ON(TASK.CITYCODE = CITY_DIC.CITYCODE)
+    <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="com.yxproject.start.entity.SpecialCardInfoEntity">
-        select * from acc_card_t@accu_dblink
+    <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="com.yxproject.start.entity.SpecialCardInfoEntity">
-        select * from PROD_CARD_T@PROD_LINK
-        where ID_NO =#{id}
+    <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="com.yxproject.start.entity.SpecialCardInfoEntity">
-        select * from PROD_CARD_T@PROD_LINK
-        where ACCEPT_NO=#{id} or ID_NO =#{id}
+    <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/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 -->

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

@@ -16,6 +16,34 @@ angular.module('app', [
     'ui.validate',
     'oc.lazyLoad',
     'pascalprecht.translate'
-]);
+])
 /* App Module */
-var fs = angular.module('fs', ['fs.services', 'fs.controllers', 'fs.directives', 'ui.bootstrap','blueimp.fileupload']);
+// 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

@@ -382,6 +382,7 @@ app.service('MessageService', function (ngDialog) {
                 })
             },
             getTypeListByTaskStateId:function(userState,success){
+			    console.log('----测试查询代码----',userState)
                 $http({
                     method: 'GET',
                     url: "../user/getTypeListByTaskStateId" + urlTimeStamp(),
@@ -711,6 +712,24 @@ app.service('MessageService', function (ngDialog) {
                     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))
+                })
+            }
 		}
 	}])
\ No newline at end of file

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

@@ -28,16 +28,34 @@
         <!-- / 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>
@@ -48,7 +66,6 @@
                 未完成数量：<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 {
@@ -33,4 +33,21 @@ app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filte
 
 
 
+    $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/searchSpecialCard/searchSpecialCard.html

@@ -16,15 +16,17 @@
     <h3 ng-show="specialCardInfo== null&&searchInput!=null">没有找到与 "{{searchInput}}" 相关的信息。</h3>
     <h3 ng-show="searchInput==null">请在快速搜索框中填写身份证号/受理号，查询相关信息。</h3>
     <div style="width: auto">
-        <div ng-if="specialCardInfo[0].isGroup==0">
-
-            <div class="panel panel-default" ng-if="specialCardInfo[1]!=null">
+        <h3 class="panel-title">
+            {{specialCardInfo.library}}
+        </h3>
+        <div >
+            <div class="panel panel-default" ng-if="specialCardInfo.library=='盈信库'">
                 <div class="panel-heading">
                     <h3 class="panel-title">
-                        {{specialCardInfo[1].cycleSheetInfo}}
+                        {{specialCardInfo.library}}
                     </h3>
                 </div>
-                <div class="panel-body" style="width: auto">
+                <div  class="panel-body" style="width: auto">
                     <div class="container" style="width: auto">
                         <div style="float: left;padding:0px 15px 0px 15px;">
                             <table class="table">
@@ -33,34 +35,27 @@
                                 <th>地市</th>
                                 <th>制证类型</th>
                                 <th>日期</th>
-                                <th>工序</th>
                                 <th>操作时间</th>
                                 <th>机器号</th>
-                                <th>制证车间</th>
                                 <th>质检</th>
                                 <th>出库时间</th>
                                 <th>入库时间</th>
+                                <th>异常信息</th>
                                 </thead>
                                 <tbody>
                                 <tr>
-                                    <td>{{specialCardInfo[1].info[9]}}</td>
-                                    <td>{{specialCardInfo[1].info[14]}}</td>
-                                    <td>{{specialCardInfo[1].info[6]}}</td>
-                                    <td>{{specialCardInfo[1].info[1]|myDateFilter}}</td>
-                                    <td>{{specialCardInfo[1].info[7]}}</td>
-                                    <td>{{specialCardInfo[1].info[4]}}</td>
-                                    <td>{{specialCardInfo[1].info[16]}}</td>
-                                    <td ng-if="specialCardInfo[1].info[2]=='p1'">平一</td>
-                                    <td ng-if="specialCardInfo[1].info[2]=='p2'">平二</td>
-                                    <td>{{specialCardInfo[1].info[15]}}</td>
-                                    <td ng-if="specialCardInfo[1].info[12]!=null">{{specialCardInfo[1].info[12] |
-                                        myDateFilter}}
-                                    </td>
-                                    <td ng-if="specialCardInfo[1].info[13]!=null">{{specialCardInfo[1].info[12] |
-                                        myDateFilter}}
+                                    <td>{{specialCardInfo.group_No}}</td>
+                                    <td>{{specialCardInfo.cityName}}</td>
+                                    <td>{{specialCardInfo.cardType}}</td>
+                                    <td><span>{{specialCardInfo.submit_Date.time | date:'yyyy-MM-dd'}}</span></td>
+                                    <td>{{specialCardInfo.position_Date}}</td>
+                                    <td>{{specialCardInfo.painterName}}</td>
+                                    <td>{{specialCardInfo.quality_People_Name}}</td>
+                                    <td>{{specialCardInfo.out_Storage_Date.time | date:'yyyy-MM-dd'}}</td>
+                                    <td>{{specialCardInfo.in_Storage_Date.time | date:'yyyy-MM-dd'}}</td>
+                                    <td ng-if="specialCardInfo.exception_Information!=null">{{specialCardInfo.exception_Information}}
                                     </td>
-                                    <td ng-if="specialCardInfo[1].info[12]==null"></td>
-                                    <td ng-if="specialCardInfo[1].info[13]==null"></td>
+
                                 </tr>
                                 </tbody>
                             </table>
@@ -69,11 +64,11 @@
                 </div>
             </div>
 
-            <div class="panel panel-default">
+            <div class="panel panel-default"  ng-if="specialCardInfo.library=='受理库'">
 
                 <div class="panel-heading">
                     <h3 class="panel-title">
-                        {{specialCardInfo[0].database}}
+                        {{specialCardInfo.library}}
                     </h3>
                 </div>
                 <div class="panel-body" style="width: auto">
@@ -82,9 +77,9 @@
                             <table class="table">
                                 <thead>
                                 <th>地市</th>
-                                <th ng-show="specialCardInfo[0].oldGroupNo!=null">受理号</th>
+                                <th ng-show="specialCardInfo.accept_No!=null">受理号</th>
                                 <th>姓名</th>
-                                <th ng-show="specialCardInfo[0].makeName!=null">制证类型</th>
+                                <th ng-show="specialCardInfo.cardType!=null">制证类型</th>
                                 <th>身份证号</th>
                                 <th>性别</th>
                                 <th>出生日期</th>
@@ -93,29 +88,24 @@
                                 <th>终止有效期</th>
                                 <th>证件状态</th>
                                 <th>上报受理单位</th>
-                                <th>证件状态</th>
 
                                 </thead>
                                 <tbody>
                                 <tr>
-                                    <td>{{specialCardInfo[0].sbdw}}</td>
-                                    <td ng-show="specialCardInfo[0].oldGroupNo!=null">
-                                        {{specialCardInfo[0].oldGroupNo}}
+                                    <td>{{specialCardInfo.cityName}}</td>
+                                    <td ng-show="specialCardInfo.accept_No!=null">
+                                        {{specialCardInfo.accept_No}}
                                     </td>
-                                    <td>{{specialCardInfo[0].name}}</td>
-                                    <td ng-show="specialCardInfo[0].makeType!=null">{{specialCardInfo[0].makeName}}</td>
-                                    <td>{{specialCardInfo[0].IDcard}}</td>
-                                    <td>{{specialCardInfo[0].xb}}</td>
-                                    <td>{{specialCardInfo[0].csrq | myDateFilter}}</td>
-                                    <td>{{specialCardInfo[0].jfjg}}</td>
-                                    <td>{{specialCardInfo[0].yxqqsrq}}</td>
-                                    <td>{{specialCardInfo[0].yxqjzrq}}</td>
-                                    <td>{{specialCardInfo[0].state}}</td>
-                                    <td>{{specialCardInfo[0].sbdw}}</td>
-                                    <td ng-if="specialCardInfo[0].type==0">废证</td>
-                                    <td ng-if="specialCardInfo[0].type==1">快证</td>
-                                    <td ng-if="specialCardInfo[0].type==2">余证</td>
-                                    <td ng-if="specialCardInfo[0].type==3">退证</td>
+                                    <td>{{specialCardInfo.name}}</td>
+                                    <td ng-show="specialCardInfo.cardType!=null">{{specialCardInfo.cardType}}</td>
+                                    <td>{{specialCardInfo.id_No}}</td>
+                                    <td>{{specialCardInfo.sex_No}}</td>
+                                    <td>{{specialCardInfo.birthday }}</td>
+                                    <td>{{specialCardInfo.sign_Govt}}</td>
+                                    <td>{{specialCardInfo.begin_Date}}</td>
+                                    <td>{{specialCardInfo.expire_Date}}</td>
+                                    <td>{{specialCardInfo.taskState}}</td>
+                                    <td>{{specialCardInfo.sign_Govt}}</td>
                                 </tr>
                                 </tbody>
                             </table>
@@ -147,486 +137,484 @@
                 </div>
             </div>
 
-            <div class="panel panel-default" ng-if="specialCardInfo[1].info[11]==1">
+            <!--<div class="panel panel-default" ng-if="specialCardInfo[1].info[11]==1">-->
 
-                <div class="panel-heading">
-                    <h3 class="panel-title">
-                        异常信息
-                    </h3>
-                </div>
-                <div class="panel-body" style="width: auto">
-                    <div class="container" style="width: auto">
-                        <div style="float: left;padding:0px 15px 0px 15px;">
-                            {{specialCardInfo[1].info[10]}}
-                        </div>
-                    </div>
-                </div>
-            </div>
+                <!--<div class="panel-heading">-->
+                    <!--<h3 class="panel-title">-->
+                        <!--异常信息-->
+                    <!--</h3>-->
+                <!--</div>-->
+                <!--<div class="panel-body" style="width: auto">-->
+                    <!--<div class="container" style="width: auto">-->
+                        <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
+                            <!--{{specialCardInfo[1].info[10]}}-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+            <!--</div>-->
 
         </div>
-        <div ng-if="specialCardInfo[0].isGroup==1">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">
-                        {{specialCardInfo[0].library}}
-                    </h3>
-                </div>
-                <div class="panel-body" style="width: auto">
-                    <div class="container" style="width: auto">
-                        <div style="float: left;padding:0px 15px 0px 15px;">
-                            <table class="table">
-                                <thead>
-                                <th>组号</th>
-                                <th>证件类型</th>
-                                <th>地域</th>
-                                <th>循环单生成时间</th>
-                                <th>工序</th>
-                                <th>转入制证库时间</th>
-                                <th>打印卸载时间</th>
-                                <th>电写入时间</th>
-                                <th>电质检时间</th>
-                                <th>生产车间</th>
-                                <th>机器号</th>
-                                <th>出库时间</th>
-                                <th>入库时间</th>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td>{{specialCardInfo[0].groupNo}}</td>
-                                    <td>{{specialCardInfo[0].info[5]}}</td>
-                                    <td>{{specialCardInfo[0].info[5]}}</td>
-                                    <td>{{specialCardInfo[0].info[3]}}</td>
-                                    <td>{{specialCardInfo[0].info[6]}}</td>
-                                    <td>{{specialCardInfo[0].info[7]}}</td>
-                                    <td>{{specialCardInfo[0].info[8]}}</td>
-                                    <td>{{specialCardInfo[0].info[9]}}</td>
-                                    <td>{{specialCardInfo[0].info[10]}}</td>
-                                    <td ng-if="specialCardInfo[0].info[12]=='p1'">平一车间</td>
-                                    <td ng-if="specialCardInfo[0].info[12]=='p2'">平二车间</td>
-                                    <td ng-if="specialCardInfo[0].info[12]==null">未分配</td>
-                                    <td>{{specialCardInfo[0].info[11]}}</td>
-                                    <td>{{specialCardInfo[0].info[16]| limitTo:8}}</td>
-                                    <td>{{specialCardInfo[0].info[17]| limitTo:8}}</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
+        <!--<div ng-if="specialCardInfo[0].isGroup==1">-->
+            <!--<div class="panel panel-default">-->
+                <!--<div class="panel-heading">-->
+                    <!--<h3 class="panel-title">-->
+                        <!--{{specialCardInfo[0].library}}-->
+                    <!--</h3>-->
+                <!--</div>-->
+                <!--<div class="panel-body" style="width: auto">-->
+                    <!--<div class="container" style="width: auto">-->
+                        <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
+                            <!--<table class="table">-->
+                                <!--<thead>-->
+                                <!--<th>组号</th>-->
+                                <!--<th>证件类型</th>-->
+                                <!--<th>地域</th>-->
+                                <!--<th>循环单生成时间</th>-->
+                                <!--<th>工序</th>-->
+                                <!--<th>转入制证库时间</th>-->
+                                <!--<th>打印卸载时间</th>-->
+                                <!--<th>电写入时间</th>-->
+                                <!--<th>电质检时间</th>-->
+                                <!--<th>生产车间</th>-->
+                                <!--<th>机器号</th>-->
+                                <!--<th>出库时间</th>-->
+                                <!--<th>入库时间</th>-->
+                                <!--</thead>-->
+                                <!--<tbody>-->
+                                <!--<tr>-->
+                                    <!--<td>{{specialCardInfo[0].groupNo}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[5]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[5]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[3]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[6]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[7]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[8]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[9]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[10]}}</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].info[12]=='p1'">平一车间</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].info[12]=='p2'">平二车间</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].info[12]==null">未分配</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[11]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[16]| limitTo:8}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[17]| limitTo:8}}</td>-->
+                                <!--</tr>-->
+                                <!--</tbody>-->
+                            <!--</table>-->
+                        <!--</div>-->
+                    <!--</div>-->
 
-                </div>
-            </div>
-            <div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1">
+                <!--</div>-->
+            <!--</div>-->
+            <!--<div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1">-->
 
-                <div class="panel-heading">
-                    <h3 class="panel-title">
-                        异常信息
-                    </h3>
-                </div>
-                <div class="panel-body" style="width: auto">
-                    <div class="container" style="width: auto">
-                        <div style="float: left;padding:0px 15px 0px 15px;">
-                            {{specialCardInfo[0].info[14]}}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div ng-if="specialCardInfo[0].isGroup==3">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">
-                        {{specialCardInfo[0].library}}
-                    </h3>
-                </div>
-                <div class="panel-body" style="width: auto">
-                    <div class="container" style="width: auto">
-                        <div style="float: left;padding:0px 15px 0px 15px;">
-                            <table class="table">
-                                <thead>
-                                <th>组号</th>
-                                <th>原文件名</th>
-                                <th>证件类型</th>
-                                <th>循环单生成时间</th>
-                                <th>循环单所处工序</th>
-                                <th>装库时间</th>
-                                <th>出库时间</th>
-                                <th>入库时间</th>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td>{{specialCardInfo[0].groupNo}}</td>
-                                    <td>{{specialCardInfo[0].info[12]}}</td>
-                                    <td>{{specialCardInfo[0].info[5]}}</td>
-                                    <td>{{specialCardInfo[0].info[4]}}</td>
-                                    <td>{{specialCardInfo[0].info[6]}}</td>
-                                    <td>{{specialCardInfo[0].info[7]}}</td>
-                                    <td>{{specialCardInfo[0].info[16]| limitTo:8}}</td>
-                                    <td>{{specialCardInfo[0].info[17]| limitTo:8}}</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
+                <!--<div class="panel-heading">-->
+                    <!--<h3 class="panel-title">-->
+                        <!--异常信息-->
+                    <!--</h3>-->
+                <!--</div>-->
+                <!--<div class="panel-body" style="width: auto">-->
+                    <!--<div class="container" style="width: auto">-->
+                        <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
+                            <!--{{specialCardInfo[0].info[14]}}-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+            <!--</div>-->
+        <!--</div>-->
+        <!--<div ng-if="specialCardInfo[0].isGroup==3">-->
+            <!--<div class="panel panel-default">-->
+                <!--<div class="panel-heading">-->
+                    <!--<h3 class="panel-title">-->
+                        <!--{{specialCardInfo[0].library}}-->
+                    <!--</h3>-->
+                <!--</div>-->
+                <!--<div class="panel-body" style="width: auto">-->
+                    <!--<div class="container" style="width: auto">-->
+                        <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
+                            <!--<table class="table">-->
+                                <!--<thead>-->
+                                <!--<th>组号</th>-->
+                                <!--<th>原文件名</th>-->
+                                <!--<th>证件类型</th>-->
+                                <!--<th>循环单生成时间</th>-->
+                                <!--<th>循环单所处工序</th>-->
+                                <!--<th>装库时间</th>-->
+                                <!--<th>出库时间</th>-->
+                                <!--<th>入库时间</th>-->
+                                <!--</thead>-->
+                                <!--<tbody>-->
+                                <!--<tr>-->
+                                    <!--<td>{{specialCardInfo[0].groupNo}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[12]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[5]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[4]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[6]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[7]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[16]| limitTo:8}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[17]| limitTo:8}}</td>-->
+                                <!--</tr>-->
+                                <!--</tbody>-->
+                            <!--</table>-->
+                        <!--</div>-->
+                    <!--</div>-->
 
-                </div>
-            </div>
-            <div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1">
+                <!--</div>-->
+            <!--</div>-->
+            <!--<div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1">-->
 
-                <div class="panel-heading">
-                    <h3 class="panel-title">
-                        异常信息
-                    </h3>
-                </div>
-                <div class="panel-body" style="width: auto">
-                    <div class="container" style="width: auto">
-                        <div style="float: left;padding:0px 15px 0px 15px;">
-                            {{specialCardInfo[0].info[14]}}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div ng-if="specialCardInfo[0].isGroup==4">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">
-                        {{specialCardInfo[0].library}}
-                    </h3>
-                </div>
-                <div class="panel-body" style="width: auto">
-                    <div class="container" style="width: auto">
-                        <div style="float: left;padding:0px 15px 0px 15px;">
-                            <table class="table">
-                                <thead>
-                                <th>循环单流水号</th>
-                                <th>组号</th>
-                                <th>制证类型</th>
-                                <th>时间</th>
-                                <th>工序</th>
-                                <th>打印机器</th>
-                                <th>制证车间</th>
-                                <th>质检人</th>
-                                <th>出库时间</th>
-                                <th>入库时间</th>
-                                <th>异常</th>
-                                <th ng-if="specialCardInfo[0].info[12]==1">异常信息</th>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td>{{specialCardInfo[0].info[1]}}</td>
-                                    <td>{{specialCardInfo[0].groupNo}}</td>
-                                    <td>{{specialCardInfo[0].info[5]}}</td>
-                                    <td>{{specialCardInfo[0].info[3]}}</td>
-                                    <td>{{specialCardInfo[0].info[6]}}</td>
-                                    <td>{{specialCardInfo[0].info[8]}}</td>
-                                    <td ng-if="specialCardInfo[0].info[9]=='p1'">平一车间</td>
-                                    <td ng-if="specialCardInfo[0].info[9]=='p2'">平二车间</td>
-                                    <td ng-if="specialCardInfo[0].info[9]==null">未分配</td>
-                                    <td>{{specialCardInfo[0].info[10]}}</td>
-                                    <td>{{specialCardInfo[0].info[13] | limitTo:8}}</td>
-                                    <td>{{specialCardInfo[0].info[14] | limitTo:8}}</td>
-                                    <td ng-if="specialCardInfo[0].info[12]==0">无</td>
-                                    <td ng-if="specialCardInfo[0].info[12]==1" style="color:red;">异常</td>
-                                    <td ng-if="specialCardInfo[0].info[12]==1">{{specialCardInfo[0].info[11]}}</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
+                <!--<div class="panel-heading">-->
+                    <!--<h3 class="panel-title">-->
+                        <!--异常信息-->
+                    <!--</h3>-->
+                <!--</div>-->
+                <!--<div class="panel-body" style="width: auto">-->
+                    <!--<div class="container" style="width: auto">-->
+                        <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
+                            <!--{{specialCardInfo[0].info[14]}}-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+            <!--</div>-->
+        <!--</div>-->
+        <!--<div ng-if="specialCardInfo[0].isGroup==4">-->
+            <!--<div class="panel panel-default">-->
+                <!--<div class="panel-heading">-->
+                    <!--<h3 class="panel-title">-->
+                        <!--{{specialCardInfo[0].library}}-->
+                    <!--</h3>-->
+                <!--</div>-->
+                <!--<div class="panel-body" style="width: auto">-->
+                    <!--<div class="container" style="width: auto">-->
+                        <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
+                            <!--<table class="table">-->
+                                <!--<thead>-->
+                                <!--<th>循环单流水号</th>-->
+                                <!--<th>组号</th>-->
+                                <!--<th>制证类型</th>-->
+                                <!--<th>时间</th>-->
+                                <!--<th>工序</th>-->
+                                <!--<th>打印机器</th>-->
+                                <!--<th>制证车间</th>-->
+                                <!--<th>质检人</th>-->
+                                <!--<th>出库时间</th>-->
+                                <!--<th>入库时间</th>-->
+                                <!--<th>异常</th>-->
+                                <!--<th ng-if="specialCardInfo[0].info[12]==1">异常信息</th>-->
+                                <!--</thead>-->
+                                <!--<tbody>-->
+                                <!--<tr>-->
+                                    <!--<td>{{specialCardInfo[0].info[1]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].groupNo}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[5]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[3]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[6]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[8]}}</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].info[9]=='p1'">平一车间</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].info[9]=='p2'">平二车间</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].info[9]==null">未分配</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[10]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[13] | limitTo:8}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[14] | limitTo:8}}</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].info[12]==0">无</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].info[12]==1" style="color:red;">异常</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].info[12]==1">{{specialCardInfo[0].info[11]}}</td>-->
+                                <!--</tr>-->
+                                <!--</tbody>-->
+                            <!--</table>-->
+                        <!--</div>-->
+                    <!--</div>-->
 
-                </div>
-            </div>
-            <div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1">
+                <!--</div>-->
+            <!--</div>-->
+            <!--<div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1">-->
 
-                <div class="panel-heading">
-                    <h3 class="panel-title">
-                        异常信息
-                    </h3>
-                </div>
-                <div class="panel-body" style="width: auto">
-                    <div class="container" style="width: auto">
-                        <div style="float: left;padding:0px 15px 0px 15px;">
-                            {{specialCardInfo[0].info[14]}}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div ng-if="specialCardInfo[0].isGroup==5">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">
-                        {{specialCardInfo[0].library}}
-                    </h3>
-                </div>
-                <div class="panel-body" style="width: auto">
-                    <div class="container" style="width: auto">
-                        <div style="float: left;padding:0px 15px 0px 15px;">
-                            <table class="table">
-                                <thead>
-                                <th>组号</th>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td>{{specialCardInfo[0].groupNo}}</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
+                <!--<div class="panel-heading">-->
+                    <!--<h3 class="panel-title">-->
+                        <!--异常信息-->
+                    <!--</h3>-->
+                <!--</div>-->
+                <!--<div class="panel-body" style="width: auto">-->
+                    <!--<div class="container" style="width: auto">-->
+                        <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
+                            <!--{{specialCardInfo[0].info[14]}}-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+            <!--</div>-->
+        <!--</div>-->
+        <!--<div ng-if="specialCardInfo[0].isGroup==5">-->
+            <!--<div class="panel panel-default">-->
+                <!--<div class="panel-heading">-->
+                    <!--<h3 class="panel-title">-->
+                        <!--{{specialCardInfo[0].library}}-->
+                    <!--</h3>-->
+                <!--</div>-->
+                <!--<div class="panel-body" style="width: auto">-->
+                    <!--<div class="container" style="width: auto">-->
+                        <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
+                            <!--<table class="table">-->
+                                <!--<thead>-->
+                                <!--<th>组号</th>-->
+                                <!--</thead>-->
+                                <!--<tbody>-->
+                                <!--<tr>-->
+                                    <!--<td>{{specialCardInfo[0].groupNo}}</td>-->
+                                <!--</tr>-->
+                                <!--</tbody>-->
+                            <!--</table>-->
+                        <!--</div>-->
+                    <!--</div>-->
 
-                </div>
-            </div>
-        </div>
-        <div ng-if="specialCardInfo[0].isGroup==6">
-            <div class="panel panel-default" ng-if="specialCardInfo[0]!=null">
-                <div class="panel-heading">
-                    <h3 class="panel-title">
-                        {{specialCardInfo[0].cycleSheetInfo}}
-                    </h3>
-                </div>
-                <div class="panel-body" style="width: auto">
-                    <div class="container" style="width: auto">
-                        <div style="float: left;padding:0px 15px 0px 15px;">
-                            <table class="table">
-                                <thead>
-                                <th>编号</th>
-                                <th>地市</th>
-                                <th>制证类型</th>
-                                <th>日期</th>
-                                <!--<th>最后修改日期</th>-->
-                                <th>工序</th>
-                                <th>操作时间</th>
-                                <th>机器号</th>
-                                <th>制证车间</th>
-                                <th>质检</th>
-                                <th>出库时间</th>
-                                <th>入库时间</th>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td>{{specialCardInfo[0].info[9]}}</td>
-                                    <td>{{specialCardInfo[0].info[14]}}</td>
-                                    <td>{{specialCardInfo[0].info[6]}}</td>
-                                    <td>{{specialCardInfo[0].info[1]|myDateFilter}}</td>
-                                    <td>{{specialCardInfo[0].info[7]}}</td>
-                                    <td>{{specialCardInfo[0].info[4]}}</td>
-                                    <td>{{specialCardInfo[0].info[16]}}</td>
-                                    <td ng-if="specialCardInfo[0].info[2]=='p1'">平一</td>
-                                    <td ng-if="specialCardInfo[0].info[2]=='p2'">平二</td>
-                                    <td>{{specialCardInfo[0].info[15]}}</td>
-                                    <td ng-if="specialCardInfo[0].info[12]!=null">{{specialCardInfo[1].info[12] |
-                                        myDateFilter}}
-                                    </td>
-                                    <td ng-if="specialCardInfo[0].info[13]!=null">{{specialCardInfo[1].info[12] |
-                                        myDateFilter}}
-                                    </td>
-                                    <td ng-if="specialCardInfo[0].info[12]==null"></td>
-                                    <td ng-if="specialCardInfo[0].info[13]==null"></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div ng-if="specialCardInfo[0].isGroup==8">
-            <!--循环单-->
-            <div class="panel panel-default" ng-if="specialCardInfo[0].cyclesheet.length>0">
-                <div class="panel-heading">
-                    <h3 class="panel-title">
-                        循环单
-                    </h3>
-                </div>
-                <div class="panel-body" style="width: auto">
-                    <div class="container" style="width: auto">
-                        <div style="float: left;padding:0 15px 0 15px;">
-                            <table class="table">
-                                <thead>
-                                <th>循环单流水号</th>
-                                <th>组号</th>
-                                <th>地市</th>
-                                <th>制证类型</th>
-                                <th>创建日期</th>
-                                <th>工序</th>
-                                <th>最后修改时间</th>
-                                <th>机器号</th>
-                                <th>制证车间</th>
-                                <th>预定位接收时间</th>
-                                <th>质检人</th>
-                                <th>出库时间</th>
-                                <th>入库时间</th>
-                                <th>异常</th>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td>{{specialCardInfo[0].cyclesheet[0]}}</td>
-                                    <td>{{specialCardInfo[0].cyclesheet[1]}}</td>
-                                    <td>{{specialCardInfo[0].cyclesheet[2]}}</td>
-                                    <td>{{specialCardInfo[0].cyclesheet[3]}}</td>
-                                    <td>{{specialCardInfo[0].cyclesheet[4]}}</td>
-                                    <td>{{specialCardInfo[0].cyclesheet[5]}}</td>
-                                    <td>{{specialCardInfo[0].cyclesheet[6]}}</td>
-                                    <td>{{specialCardInfo[0].cyclesheet[7]}}</td>
-                                    <td ng-if="specialCardInfo[0].cyclesheet[8]=='p1'||specialCardInfo[0].cyclesheet[8]=='p3'">
-                                        平一
-                                    </td>
-                                    <td ng-if="specialCardInfo[0].cyclesheet[8]=='p2'||specialCardInfo[0].cyclesheet[8]=='p4'">
-                                        平二
-                                    </td>
-                                    <td>{{specialCardInfo[0].cyclesheet[9]}}</td>
-                                    <td>{{specialCardInfo[0].cyclesheet[10]}}</td>
-                                    <td>{{specialCardInfo[0].cyclesheet[11] | limitTo:8}}</td>
-                                    <td>{{specialCardInfo[0].cyclesheet[12] | limitTo:8}}</td>
-                                    <td ng-if="specialCardInfo[0].cyclesheet[14]==0">无</td>
-                                    <td ng-if="specialCardInfo[0].cyclesheet[14]==1">
-                                        {{specialCardInfo[0].cyclesheet[13]}}
-                                    </td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
+                <!--</div>-->
+            <!--</div>-->
+        <!--</div>-->
+        <!--<div ng-if="specialCardInfo[0].isGroup==6">-->
+            <!--<div class="panel panel-default" ng-if="specialCardInfo[0]!=null">-->
+                <!--<div class="panel-heading">-->
+                    <!--<h3 class="panel-title">-->
+                        <!--{{specialCardInfo[0].cycleSheetInfo}}-->
+                    <!--</h3>-->
+                <!--</div>-->
+                <!--<div class="panel-body" style="width: auto">-->
+                    <!--<div class="container" style="width: auto">-->
+                        <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
+                            <!--<table class="table">-->
+                                <!--<thead>-->
+                                <!--<th>编号</th>-->
+                                <!--<th>地市</th>-->
+                                <!--<th>制证类型</th>-->
+                                <!--<th>日期</th>-->
+                                <!--&lt;!&ndash;<th>最后修改日期</th>&ndash;&gt;-->
+                                <!--<th>工序</th>-->
+                                <!--<th>操作时间</th>-->
+                                <!--<th>机器号</th>-->
+                                <!--<th>制证车间</th>-->
+                                <!--<th>质检</th>-->
+                                <!--<th>出库时间</th>-->
+                                <!--<th>入库时间</th>-->
+                                <!--</thead>-->
+                                <!--<tbody>-->
+                                <!--<tr>-->
+                                    <!--<td>{{specialCardInfo[0].info[9]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[14]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[6]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[1]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[7]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[4]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[16]}}</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].info[2]=='p1'">平一</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].info[2]=='p2'">平二</td>-->
+                                    <!--<td>{{specialCardInfo[0].info[15]}}</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].info[12]!=null">{{specialCardInfo[1].info[12] }}-->
+                                    <!--</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].info[13]!=null">{{specialCardInfo[1].info[12] }}-->
+                                    <!--</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].info[12]==null"></td>-->
+                                    <!--<td ng-if="specialCardInfo[0].info[13]==null"></td>-->
+                                <!--</tr>-->
+                                <!--</tbody>-->
+                            <!--</table>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+            <!--</div>-->
+        <!--</div>-->
+        <!--<div ng-if="specialCardInfo[0].isGroup==8">-->
+            <!--&lt;!&ndash;循环单&ndash;&gt;-->
+            <!--<div class="panel panel-default" ng-if="specialCardInfo[0].cyclesheet.length>0">-->
+                <!--<div class="panel-heading">-->
+                    <!--<h3 class="panel-title">-->
+                        <!--循环单-->
+                    <!--</h3>-->
+                <!--</div>-->
+                <!--<div class="panel-body" style="width: auto">-->
+                    <!--<div class="container" style="width: auto">-->
+                        <!--<div style="float: left;padding:0 15px 0 15px;">-->
+                            <!--<table class="table">-->
+                                <!--<thead>-->
+                                <!--<th>循环单流水号</th>-->
+                                <!--<th>组号</th>-->
+                                <!--<th>地市</th>-->
+                                <!--<th>制证类型</th>-->
+                                <!--<th>创建日期</th>-->
+                                <!--<th>工序</th>-->
+                                <!--<th>最后修改时间</th>-->
+                                <!--<th>机器号</th>-->
+                                <!--<th>制证车间</th>-->
+                                <!--<th>预定位接收时间</th>-->
+                                <!--<th>质检人</th>-->
+                                <!--<th>出库时间</th>-->
+                                <!--<th>入库时间</th>-->
+                                <!--<th>异常</th>-->
+                                <!--</thead>-->
+                                <!--<tbody>-->
+                                <!--<tr>-->
+                                    <!--<td>{{specialCardInfo[0].cyclesheet[0]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].cyclesheet[1]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].cyclesheet[2]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].cyclesheet[3]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].cyclesheet[4]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].cyclesheet[5]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].cyclesheet[6]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].cyclesheet[7]}}</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].cyclesheet[8]=='p1'||specialCardInfo[0].cyclesheet[8]=='p3'">-->
+                                        <!--平一-->
+                                    <!--</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].cyclesheet[8]=='p2'||specialCardInfo[0].cyclesheet[8]=='p4'">-->
+                                        <!--平二-->
+                                    <!--</td>-->
+                                    <!--<td>{{specialCardInfo[0].cyclesheet[9]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].cyclesheet[10]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].cyclesheet[11] | limitTo:8}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].cyclesheet[12] | limitTo:8}}</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].cyclesheet[14]==0">无</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].cyclesheet[14]==1">-->
+                                        <!--{{specialCardInfo[0].cyclesheet[13]}}-->
+                                    <!--</td>-->
+                                <!--</tr>-->
+                                <!--</tbody>-->
+                            <!--</table>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+            <!--</div>-->
 
-            <!--制证库-->
-            <div class="panel panel-default" ng-if="specialCardInfo[0].prod.length>0">
+            <!--&lt;!&ndash;制证库&ndash;&gt;-->
+            <!--<div class="panel panel-default" ng-if="specialCardInfo[0].prod.length>0">-->
 
-                <div class="panel-heading">
-                    <h3 class="panel-title">
-                        制证库
-                    </h3>
-                </div>
-                <div class="panel-body" style="width: auto">
-                    <div class="container" style="width: auto">
-                        <div style="float: left;padding:0px 15px 0px 15px;">
-                            <table class="table">
-                                <thead>
-                                <th>组号</th>
-                                <th>卸载数量</th>
-                                <th>卸载日期</th>
-                                <th>电写入数量</th>
-                                <th>电写入日期</th>
-                                <th>质检数量</th>
-                                <th>质检日期</th>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td>{{specialCardInfo[0].prod[0]}}</td>
-                                    <td>{{specialCardInfo[0].prod[1]}}</td>
-                                    <td>{{specialCardInfo[0].prod[2]}}</td>
-                                    <td>{{specialCardInfo[0].prod[3]}}</td>
-                                    <td>{{specialCardInfo[0].prod[4]}}</td>
-                                    <td>{{specialCardInfo[0].prod[5]}}</td>
-                                    <td>{{specialCardInfo[0].prod[6]}}</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
+                <!--<div class="panel-heading">-->
+                    <!--<h3 class="panel-title">-->
+                        <!--制证库-->
+                    <!--</h3>-->
+                <!--</div>-->
+                <!--<div class="panel-body" style="width: auto">-->
+                    <!--<div class="container" style="width: auto">-->
+                        <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
+                            <!--<table class="table">-->
+                                <!--<thead>-->
+                                <!--<th>组号</th>-->
+                                <!--<th>卸载数量</th>-->
+                                <!--<th>卸载日期</th>-->
+                                <!--<th>电写入数量</th>-->
+                                <!--<th>电写入日期</th>-->
+                                <!--<th>质检数量</th>-->
+                                <!--<th>质检日期</th>-->
+                                <!--</thead>-->
+                                <!--<tbody>-->
+                                <!--<tr>-->
+                                    <!--<td>{{specialCardInfo[0].prod[0]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].prod[1]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].prod[2]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].prod[3]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].prod[4]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].prod[5]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].prod[6]}}</td>-->
+                                <!--</tr>-->
+                                <!--</tbody>-->
+                            <!--</table>-->
+                        <!--</div>-->
 
-                    </div>
-                </div>
-            </div>
+                    <!--</div>-->
+                <!--</div>-->
+            <!--</div>-->
 
-            <!--受理库-->
-            <div class="panel panel-default" ng-if="specialCardInfo[0].accu.length>0">
+            <!--&lt;!&ndash;受理库&ndash;&gt;-->
+            <!--<div class="panel panel-default" ng-if="specialCardInfo[0].accu.length>0">-->
 
-                <div class="panel-heading">
-                    <h3 class="panel-title">
-                        受理库
-                    </h3>
-                </div>
-                <div class="panel-body" style="width: auto">
-                    <div class="container" style="width: auto">
-                        <div style="float: left;padding:0px 15px 0px 15px;">
-                            <table class="table">
-                                <thead>
-                                <th>组号</th>
-                                <th>装库日期</th>
-                                <th>组号状态</th>
-                                <th>合格数</th>
-                                <th>不合格数</th>
-                                <th>核验日期</th>
-                                <th>核验人</th>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td>{{specialCardInfo[0].accu[0]}}</td>
-                                    <td>{{specialCardInfo[0].accu[1]}}</td>
-                                    <td>{{specialCardInfo[0].accu[2]}}</td>
-                                    <td>{{specialCardInfo[0].accu[3]}}</td>
-                                    <td>{{specialCardInfo[0].accu[4]}}</td>
-                                    <td>{{specialCardInfo[0].accu[5]}}</td>
-                                    <td>{{specialCardInfo[0].accu[6]}}</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
+                <!--<div class="panel-heading">-->
+                    <!--<h3 class="panel-title">-->
+                        <!--受理库-->
+                    <!--</h3>-->
+                <!--</div>-->
+                <!--<div class="panel-body" style="width: auto">-->
+                    <!--<div class="container" style="width: auto">-->
+                        <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
+                            <!--<table class="table">-->
+                                <!--<thead>-->
+                                <!--<th>组号</th>-->
+                                <!--<th>装库日期</th>-->
+                                <!--<th>组号状态</th>-->
+                                <!--<th>合格数</th>-->
+                                <!--<th>不合格数</th>-->
+                                <!--<th>核验日期</th>-->
+                                <!--<th>核验人</th>-->
+                                <!--</thead>-->
+                                <!--<tbody>-->
+                                <!--<tr>-->
+                                    <!--<td>{{specialCardInfo[0].accu[0]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].accu[1]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].accu[2]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].accu[3]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].accu[4]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].accu[5]}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].accu[6]}}</td>-->
+                                <!--</tr>-->
+                                <!--</tbody>-->
+                            <!--</table>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+            <!--</div>-->
 
-        </div>
-        <div ng-if="specialCardInfo[0].isGroup==11">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">
-                        循环单
-                    </h3>分配时间
-                </div>
-                <div class="panel-body" style="width: auto">
-                    <div class="container" style="width: auto">
-                        <div style="float: left;padding:0 15px 0 15px;">
-                            <table class="table">
-                                <thead>
-                                <th>循环单流水号</th>
-                                <th>组号</th>
-                                <th>证件数量</th>
-                                <th>地市</th>
-                                <th>制证类型</th>
-                                <th>创建日期</th>
-                                <th>最后修改日期</th>
-                                <th>最后工序</th>
-                                <th>机器号</th>
-                                <th>制证车间</th>
-                                <th>预定位接收时间</th>
-                                <th>质检人</th>
-                                <th>出库时间</th>
-                                <th>入库时间</th>
-                                <th>异常</th>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td>{{specialCardInfo[0].cycleSheetID}}</td>
-                                    <td>{{specialCardInfo[0].groupNum}}</td>
-                                    <td>{{specialCardInfo[0].count}}</td>
-                                    <td>{{specialCardInfo[0].cityName}}</td>
-                                    <td>{{specialCardInfo[0].makeTypeName}}</td>
-                                    <td>{{specialCardInfo[0].createDate}}</td>
-                                    <td>{{specialCardInfo[0].lastDate}}</td>
-                                    <td>{{specialCardInfo[0].lastProcessName}}</td>
-                                    <td>{{specialCardInfo[0].machine}}</td>
-                                    <td ng-if="specialCardInfo[0].workShop=='p1'||specialCardInfo[0].workShop=='p3'">
-                                        平一
-                                    </td>
-                                    <td ng-if="specialCardInfo[0].workShop=='p2'||specialCardInfo[0].workShop=='p4'">
-                                        平二
-                                    </td>
-                                    <td>{{specialCardInfo[0].permanentPositionDate}}</td>
-                                    <td>{{specialCardInfo[0].qualityinspection}}</td>
-                                    <td>{{specialCardInfo[0].outbound}}</td>
-                                    <td>{{specialCardInfo[0].putInStorage}}</td>
-                                    <td ng-if="specialCardInfo[0].abnormal==0">无</td>
-                                    <td ng-if="specialCardInfo[0].abnormal==1">{{specialCardInfo[0].note}}</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
+        <!--</div>-->
+        <!--<div ng-if="specialCardInfo[0].isGroup==11">-->
+            <!--<div class="panel panel-default">-->
+                <!--<div class="panel-heading">-->
+                    <!--<h3 class="panel-title">-->
+                        <!--循环单-->
+                    <!--</h3>分配时间-->
+                <!--</div>-->
+                <!--<div class="panel-body" style="width: auto">-->
+                    <!--<div class="container" style="width: auto">-->
+                        <!--<div style="float: left;padding:0 15px 0 15px;">-->
+                            <!--<table class="table">-->
+                                <!--<thead>-->
+                                <!--<th>循环单流水号</th>-->
+                                <!--<th>组号</th>-->
+                                <!--<th>证件数量</th>-->
+                                <!--<th>地市</th>-->
+                                <!--<th>制证类型</th>-->
+                                <!--<th>创建日期</th>-->
+                                <!--<th>最后修改日期</th>-->
+                                <!--<th>最后工序</th>-->
+                                <!--<th>机器号</th>-->
+                                <!--<th>制证车间</th>-->
+                                <!--<th>预定位接收时间</th>-->
+                                <!--<th>质检人</th>-->
+                                <!--<th>出库时间</th>-->
+                                <!--<th>入库时间</th>-->
+                                <!--<th>异常</th>-->
+                                <!--</thead>-->
+                                <!--<tbody>-->
+                                <!--<tr>-->
+                                    <!--<td>{{specialCardInfo[0].cycleSheetID}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].groupNum}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].count}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].cityName}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].makeTypeName}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].createDate}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].lastDate}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].lastProcessName}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].machine}}</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].workShop=='p1'||specialCardInfo[0].workShop=='p3'">-->
+                                        <!--平一-->
+                                    <!--</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].workShop=='p2'||specialCardInfo[0].workShop=='p4'">-->
+                                        <!--平二-->
+                                    <!--</td>-->
+                                    <!--<td>{{specialCardInfo[0].permanentPositionDate}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].qualityinspection}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].outbound}}</td>-->
+                                    <!--<td>{{specialCardInfo[0].putInStorage}}</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].abnormal==0">无</td>-->
+                                    <!--<td ng-if="specialCardInfo[0].abnormal==1">{{specialCardInfo[0].note}}</td>-->
+                                <!--</tr>-->
+                                <!--</tbody>-->
+                            <!--</table>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+            <!--</div>-->
+        <!--</div>-->
     </div>
 </div>
\ No newline at end of file

src/test/java/com/yxproject/start/service/impl/selectTest.java

+package com.yxproject.start.service.impl;
+
+public class selectTest {
+    public static void main(String args[]){
+
+        Object c = 1111;
+        Long b=Long.valueOf(String.valueOf(c));
+        System.out.println(b);
+        System.out.println(c.getClass());
+
+    }
+}

制证项目E-R图.pdm

 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{18CA0EBF-33D8-4343-8FB4-0EB2E587246F}" Label="" LastModificationDate="1542330939" Name="PhysicalDataModel_3" Objects="399" Symbols="60" Target="ORACLE Version 11g" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{18CA0EBF-33D8-4343-8FB4-0EB2E587246F}" Label="" LastModificationDate="1545205413" Name="PhysicalDataModel_3" Objects="400" Symbols="56" Target="ORACLE Version 11g" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -1628,8 +1628,8 @@ Shadow=0</a:DisplayPreferences>
 <c:Symbols>
 <o:ReferenceSymbol Id="o5">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((-60811,-84790), (-60361,-76015))</a:Rect>
-<a:ListOfPoints>((-60586,-76015),(-60586,-84790))</a:ListOfPoints>
+<a:Rect>((-60595,-84693), (-60145,-76015))</a:Rect>
+<a:ListOfPoints>((-60370,-76015),(-60370,-84693))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1649,8 +1649,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o9">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((16771,15791), (26181,45639))</a:Rect>
-<a:ListOfPoints>((26181,45639),(26181,40989),(23385,40989),(23385,27791),(16996,27791),(16996,15791))</a:ListOfPoints>
+<a:Rect>((16771,15791), (26789,45417))</a:Rect>
+<a:ListOfPoints>((26789,45417),(26789,40989),(23385,40989),(23385,27791),(16996,27791),(16996,15791))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1670,8 +1670,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o13">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((12311,37577), (12882,45639))</a:Rect>
-<a:ListOfPoints>((12882,45639),(12882,40989),(12536,40989),(12536,37577))</a:ListOfPoints>
+<a:Rect>((12273,37386), (13447,45417))</a:Rect>
+<a:ListOfPoints>((12273,45417),(12273,40989),(13222,40989),(13222,37386))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1691,8 +1691,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o16">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((49091,12492), (50065,31203))</a:Rect>
-<a:ListOfPoints>((49091,31203),(49091,27791),(49840,27791),(49840,12492))</a:ListOfPoints>
+<a:Rect>((49091,12972), (49601,31203))</a:Rect>
+<a:ListOfPoints>((49091,31203),(49091,27791),(49376,27791),(49376,12972))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1733,8 +1733,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o22">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((27207,15791), (64889,31203))</a:Rect>
-<a:ListOfPoints>((64889,31203),(64889,21791),(27432,21791),(27432,15791))</a:ListOfPoints>
+<a:Rect>((27207,15791), (63975,30945))</a:Rect>
+<a:ListOfPoints>((63975,30945),(63975,21791),(27432,21791),(27432,15791))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1754,8 +1754,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o25">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((85093,8830), (88173,31203))</a:Rect>
-<a:ListOfPoints>((85093,31203),(85093,27791),(87948,27791),(87948,8830))</a:ListOfPoints>
+<a:Rect>((86007,8830), (88173,30945))</a:Rect>
+<a:ListOfPoints>((86007,30945),(86007,27791),(87948,27791),(87948,8830))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1775,8 +1775,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o28">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((60015,12492), (74991,31203))</a:Rect>
-<a:ListOfPoints>((74991,31203),(74991,18791),(60240,18791),(60240,12492))</a:ListOfPoints>
+<a:Rect>((60479,12972), (74991,30945))</a:Rect>
+<a:ListOfPoints>((74991,30945),(74991,18791),(60704,18791),(60704,12972))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1796,8 +1796,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o30">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((11624,15448), (12074,37182))</a:Rect>
-<a:ListOfPoints>((11712,37182),(11712,23497),(11849,23497),(11849,15448))</a:ListOfPoints>
+<a:Rect>((11624,15448), (12323,37015))</a:Rect>
+<a:ListOfPoints>((12323,37015),(12323,23497),(11849,23497),(11849,15448))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1818,8 +1818,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o32">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((-55208,36390), (-27034,43989))</a:Rect>
-<a:ListOfPoints>((-27034,43989),(-27034,40989),(-54983,40989),(-54983,36390))</a:ListOfPoints>
+<a:Rect>((-55208,36390), (-27974,43619))</a:Rect>
+<a:ListOfPoints>((-27974,43619),(-27974,40989),(-54983,40989),(-54983,36390))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1839,8 +1839,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o36">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((-6313,37577), (-2391,43989))</a:Rect>
-<a:ListOfPoints>((-6313,43989),(-6313,40989),(-2616,40989),(-2616,37577))</a:ListOfPoints>
+<a:Rect>((-5373,37386), (-3077,43619))</a:Rect>
+<a:ListOfPoints>((-5373,43619),(-5373,40989),(-3302,40989),(-3302,37386))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1860,8 +1860,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o38">
 <a:ModificationDate>1542266763</a:ModificationDate>
-<a:Rect>((-16673,15791), (6786,43989))</a:Rect>
-<a:ListOfPoints>((-16673,43989),(-16673,40989),(-13464,40989),(-13464,27791),(6561,27791),(6561,15791))</a:ListOfPoints>
+<a:Rect>((-16673,15791), (6786,43619))</a:Rect>
+<a:ListOfPoints>((-16673,43619),(-16673,40989),(-13464,40989),(-13464,27791),(6561,27791),(6561,15791))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1880,9 +1880,9 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </c:Object>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o40">
-<a:ModificationDate>1542330939</a:ModificationDate>
-<a:Rect>((-70707,15791), (-3651,22920))</a:Rect>
-<a:ListOfPoints>((-70707,22920),(-70707,21791),(-3876,21791),(-3876,15791))</a:ListOfPoints>
+<a:ModificationDate>1545205413</a:ModificationDate>
+<a:Rect>((-60585,15791), (-3651,22624))</a:Rect>
+<a:ListOfPoints>((-60585,22624),(-60585,21791),(-3876,21791),(-3876,15791))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1901,9 +1901,9 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </c:Object>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o43">
-<a:ModificationDate>1542330939</a:ModificationDate>
-<a:Rect>((-78531,9130), (-77190,30111))</a:Rect>
-<a:ListOfPoints>((-78531,30111),(-78531,16025),(-77415,16025),(-77415,9130))</a:ListOfPoints>
+<a:ModificationDate>1545205413</a:ModificationDate>
+<a:Rect>((-77583,9314), (-69097,30406))</a:Rect>
+<a:ListOfPoints>((-69097,30406),(-69097,16025),(-77358,16025),(-77358,9314))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1924,8 +1924,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o46">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((-24664,15791), (1567,31203))</a:Rect>
-<a:ListOfPoints>((-24664,31203),(-24664,24791),(1342,24791),(1342,15791))</a:ListOfPoints>
+<a:Rect>((-24162,15791), (1567,30945))</a:Rect>
+<a:ListOfPoints>((-24162,30945),(-24162,24791),(1342,24791),(1342,15791))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1945,8 +1945,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o49">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((-41869,-13192), (-38176,34433))</a:Rect>
-<a:ListOfPoints>((-41869,34433),(-41869,-5131),(-38401,-5131),(-38401,-13192))</a:ListOfPoints>
+<a:Rect>((-42871,-13192), (-38704,34436))</a:Rect>
+<a:ListOfPoints>((-42871,34436),(-42871,-5131),(-38929,-5131),(-38929,-13192))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1967,8 +1967,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o52">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((-79219,-84793), (-69730,-76015))</a:Rect>
-<a:ListOfPoints>((-69730,-76015),(-69730,-81793),(-78994,-81793),(-78994,-84793))</a:ListOfPoints>
+<a:Rect>((-78872,-84793), (-70136,-76015))</a:Rect>
+<a:ListOfPoints>((-70136,-76015),(-70136,-81793),(-78647,-81793),(-78647,-84793))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -1988,8 +1988,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o55">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((-87368,-84793), (-86853,-78793))</a:Rect>
-<a:ListOfPoints>((-87368,-78793),(-87368,-81793),(-87078,-81793),(-87078,-84793))</a:ListOfPoints>
+<a:Rect>((-87650,-84793), (-87200,-79015))</a:Rect>
+<a:ListOfPoints>((-87368,-79015),(-87368,-81793),(-87425,-81793),(-87425,-84793))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -2009,8 +2009,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o58">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((-39370,-66826), (-31857,-59176))</a:Rect>
-<a:ListOfPoints>((-31857,-59176),(-31857,-62176),(-39145,-62176),(-39145,-66826))</a:ListOfPoints>
+<a:Rect>((-38742,-66642), (-32446,-59176))</a:Rect>
+<a:ListOfPoints>((-32446,-59176),(-32446,-62176),(-38517,-62176),(-38517,-66642))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -2030,8 +2030,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o62">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((-18945,-65176), (-12301,-59176))</a:Rect>
-<a:ListOfPoints>((-18945,-59176),(-18945,-62176),(-12526,-62176),(-12526,-65176))</a:ListOfPoints>
+<a:Rect>((-18356,-64844), (-12301,-59176))</a:Rect>
+<a:ListOfPoints>((-18356,-59176),(-18356,-62176),(-12526,-62176),(-12526,-64844))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -2051,8 +2051,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o65">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((-81413,-66001), (-73514,-59176))</a:Rect>
-<a:ListOfPoints>((-73514,-59176),(-73514,-62176),(-81188,-62176),(-81188,-66001))</a:ListOfPoints>
+<a:Rect>((-81413,-65743), (-74065,-59176))</a:Rect>
+<a:ListOfPoints>((-74065,-59176),(-74065,-62176),(-81188,-62176),(-81188,-65743))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -2072,8 +2072,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o69">
 <a:ModificationDate>1542330866</a:ModificationDate>
-<a:Rect>((-61374,-66826), (-52606,-59176))</a:Rect>
-<a:ListOfPoints>((-61374,-59176),(-61374,-62176),(-52831,-62176),(-52831,-66826))</a:ListOfPoints>
+<a:Rect>((-60823,-66642), (-53234,-59176))</a:Rect>
+<a:ListOfPoints>((-60823,-59176),(-60823,-62176),(-53459,-62176),(-53459,-66642))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -2157,8 +2157,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o79">
 <a:ModificationDate>1542267060</a:ModificationDate>
-<a:Rect>((-23363,-14586), (-6455,-2131))</a:Rect>
-<a:ListOfPoints>((-6455,-2131),(-6455,-14361),(-23363,-14361))</a:ListOfPoints>
+<a:Rect>((-22575,-14586), (-6455,-2131))</a:Rect>
+<a:ListOfPoints>((-6455,-2131),(-6455,-14361),(-22575,-14361))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -2201,7 +2201,7 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 <o:TableSymbol Id="o67">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-96225,-72375), (-66151,-66001))</a:Rect>
+<a:Rect>((-97615,-72633), (-64761,-65743))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2233,7 +2233,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o85">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-10172,-77245), (6770,-73245))</a:Rect>
+<a:Rect>((-10905,-77245), (7503,-73245))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2333,7 +2333,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o66">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-79584,-59176), (-55304,-55176))</a:Rect>
+<a:Rect>((-80685,-59176), (-54203,-55176))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2365,7 +2365,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o59">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-38314,-59176), (-12488,-55176))</a:Rect>
+<a:Rect>((-39492,-59176), (-11310,-55176))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2397,7 +2397,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o60">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-59673,-71550), (-32303,-66826))</a:Rect>
+<a:Rect>((-60929,-71734), (-31047,-66642))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2429,7 +2429,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o63">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-25825,-73200), (773,-65176))</a:Rect>
+<a:Rect>((-27042,-73532), (1990,-64844))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2461,7 +2461,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o56">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-97191,-78793), (-77545,-73245))</a:Rect>
+<a:Rect>((-98060,-79015), (-76676,-73023))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2493,7 +2493,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o6">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-74351,-78014), (-55865,-74015))</a:Rect>
+<a:Rect>((-75162,-78112), (-55054,-73918))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2525,7 +2525,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o53">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-91121,-88793), (-74951,-84793))</a:Rect>
+<a:Rect>((-91815,-88793), (-74257,-84793))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2557,7 +2557,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o7">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-69247,-88788), (-52305,-84789))</a:Rect>
+<a:Rect>((-69980,-88886), (-51572,-84692))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2589,7 +2589,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o10">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((6233,45639), (32831,51187))</a:Rect>
+<a:Rect>((5016,45417), (34048,51409))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2621,7 +2621,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o98">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-28202,-77245), (-13424,-73245))</a:Rect>
+<a:Rect>((-28859,-77245), (-12767,-73245))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2653,7 +2653,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o100">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-51100,-77245), (-31454,-73245))</a:Rect>
+<a:Rect>((-51968,-77245), (-30586,-73245))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2753,7 +2753,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o23">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((59838,31203), (90144,37577))</a:Rect>
+<a:Rect>((58467,30945), (91515,37835))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2785,7 +2785,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o14">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-10193,31203), (20113,37577))</a:Rect>
+<a:Rect>((-11564,31394), (21484,37386))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2817,7 +2817,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o18">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((44638,1168), (65442,12492))</a:Rect>
+<a:Rect>((43711,688), (66369,12972))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2849,7 +2849,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o34">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-65771,32390), (-44195,36390))</a:Rect>
+<a:Rect>((-66737,32390), (-43229,36390))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2881,7 +2881,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o33">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-32212,43989), (-1134,52837))</a:Rect>
+<a:Rect>((-33622,43619), (276,53207))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2911,9 +2911,9 @@ Table.Comment 0</a:SymbolContent>
 </c:Object>
 </o:TableSymbol>
 <o:TableSymbol Id="o41">
-<a:ModificationDate>1542330939</a:ModificationDate>
+<a:ModificationDate>1545205413</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-88511,22920), (-64771,30118))</a:Rect>
+<a:Rect>((-79954,22624), (-54128,30414))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -2945,7 +2945,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o44">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-88458,4406), (-67654,9130))</a:Rect>
+<a:Rect>((-89384,4222), (-66728,9314))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -3043,7 +3043,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o50">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-41417,-17192), (-23317,-13192))</a:Rect>
+<a:Rect>((-42209,-17192), (-22525,-13192))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -3075,7 +3075,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o47">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-41891,31203), (-18923,37577))</a:Rect>
+<a:Rect>((-42895,30945), (-17919,37835))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -3107,7 +3107,7 @@ Table.Comment 0</a:SymbolContent>
 <o:TableSymbol Id="o26">
 <a:ModificationDate>1542330866</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((77160,4830), (98736,8830))</a:Rect>
+<a:Rect>((76194,4830), (99702,8830))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -4534,7 +4534,7 @@ tablespace USERS</a:PhysicalOptions>
 <a:Code>GROUP_NO</a:Code>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1542271363</a:ModificationDate>
+<a:ModificationDate>1545204276</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>组号列表 主表的附属表</a:Comment>
 <a:PhysicalOptions>pctfree 10
@@ -4554,18 +4554,6 @@ logging
 <a:TotalSavingCurrency/>
 <c:Columns>
 <o:Column Id="o194">
-<a:ObjectID>97B4BCE1-9476-4BD9-A697-7A78D3324C41</a:ObjectID>
-<a:Name>组号ID</a:Name>
-<a:Code>GROUP_ID</a:Code>
-<a:CreationDate>1542263934</a:CreationDate>
-<a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1542267651</a:ModificationDate>
-<a:Modifier>Administrator</a:Modifier>
-<a:Comment>组号信息表流水号</a:Comment>
-<a:DataType>NUMBER</a:DataType>
-<a:Column.Mandatory>1</a:Column.Mandatory>
-</o:Column>
-<o:Column Id="o195">
 <a:ObjectID>6E7C9818-6A5D-4ED2-AADA-44DBCC3B16ED</a:ObjectID>
 <a:Name>受理组号</a:Name>
 <a:Code>GROUP_NO</a:Code>
@@ -4578,7 +4566,7 @@ logging
 <a:Length>8</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o196">
+<o:Column Id="o195">
 <a:ObjectID>0215DC4B-4259-4C34-8568-62E525CBD868</a:ObjectID>
 <a:Name>任务单ID</a:Name>
 <a:Code>TASK_ID</a:Code>
@@ -4590,7 +4578,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o197">
+<o:Column Id="o196">
 <a:ObjectID>470B6BF3-6929-42E1-A4B7-6176D656DF37</a:ObjectID>
 <a:Name>合格数量</a:Name>
 <a:Code>VAILD_COUNT</a:Code>
@@ -4602,7 +4590,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o198">
+<o:Column Id="o197">
 <a:ObjectID>41BBC3C8-2638-427D-88BD-A2451B98D1FC</a:ObjectID>
 <a:Name>不合格数量</a:Name>
 <a:Code>INVALID_COUNT</a:Code>
@@ -4615,7 +4603,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o199">
+<o:Column Id="o198">
 <a:ObjectID>0D7ECEA7-43BB-4643-B007-13DF9C6695FC</a:ObjectID>
 <a:Name>特殊证件数量（包含快、余、退证）</a:Name>
 <a:Code>SPECIAL_CARD_COUNT</a:Code>
@@ -4630,7 +4618,7 @@ logging
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o200">
+<o:Key Id="o199">
 <a:ObjectID>35B39FDD-686A-4360-AB73-0ACCB385DBFA</a:ObjectID>
 <a:Name>GROUP_NO_PK</a:Name>
 <a:Code>GROUP_NO_PK</a:Code>
@@ -4651,7 +4639,7 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:ConstraintName>GROUP_NO_PK</a:ConstraintName>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o201">
+<o:ExtendedCollection Id="o200">
 <a:ObjectID>1C772FCC-2466-41D5-A72A-C097E3796323</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -4662,7 +4650,7 @@ tablespace USERS</a:PhysicalOptions>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Key.Columns>
-<o:Column Ref="o195"/>
+<o:Column Ref="o194"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -4670,7 +4658,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:User Ref="o117"/>
 </c:Owner>
 <c:PrimaryKey>
-<o:Key Ref="o200"/>
+<o:Key Ref="o199"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o104">
@@ -4698,7 +4686,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o202">
+<o:Column Id="o201">
 <a:ObjectID>BA432D72-5A92-46CB-834F-F336C058BDE3</a:ObjectID>
 <a:Name>派出所申领表ID</a:Name>
 <a:Code>POLICE_STATION_APPLY_REASON_ID</a:Code>
@@ -4710,7 +4698,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o203">
+<o:Column Id="o202">
 <a:ObjectID>EC686365-CB0E-4CEF-8D6B-91E8B041D819</a:ObjectID>
 <a:Name>保存时间</a:Name>
 <a:Code>SAVE_DATE</a:Code>
@@ -4723,7 +4711,7 @@ logging
 <a:DataType>DATE</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o204">
+<o:Column Id="o203">
 <a:ObjectID>C99FC391-2FE2-4CFC-A486-2193587B3B2F</a:ObjectID>
 <a:Name>循环单流水号</a:Name>
 <a:Code>TASK_ID</a:Code>
@@ -4735,7 +4723,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o205">
+<o:Column Id="o204">
 <a:ObjectID>70674C59-8B82-4AF1-BE12-8056474BE062</a:ObjectID>
 <a:Name>派出所代码</a:Name>
 <a:Code>POLICE_STATION_CODE</a:Code>
@@ -4748,7 +4736,7 @@ logging
 <a:Length>8</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o206">
+<o:Column Id="o205">
 <a:ObjectID>DC13606F-AE25-4280-B11D-9A6C9AA622A3</a:ObjectID>
 <a:Name>申领原因</a:Name>
 <a:Code>APPLY_CODE</a:Code>
@@ -4760,7 +4748,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o207">
+<o:Column Id="o206">
 <a:ObjectID>CA938E06-5478-42AF-808A-ED812F2A2E37</a:ObjectID>
 <a:Name>申领数量</a:Name>
 <a:Code>APPLY_COUNT</a:Code>
@@ -4774,7 +4762,7 @@ logging
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o208">
+<o:Key Id="o207">
 <a:ObjectID>8C2E6CFF-F71D-402D-8B39-ED3FE5A08127</a:ObjectID>
 <a:Name>POLICE_STATION_APPLY_REASO_PK</a:Name>
 <a:Code>POLICE_STATION_APPLY_REASO_PK</a:Code>
@@ -4795,7 +4783,7 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:ConstraintName>POLICE_STATION_APPLY_REASO_PK</a:ConstraintName>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o209">
+<o:ExtendedCollection Id="o208">
 <a:ObjectID>D0FE1901-4E85-4E98-A9EA-9A90637CD0E2</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -4806,7 +4794,7 @@ tablespace USERS</a:PhysicalOptions>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Key.Columns>
-<o:Column Ref="o202"/>
+<o:Column Ref="o201"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -4814,7 +4802,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:User Ref="o117"/>
 </c:Owner>
 <c:PrimaryKey>
-<o:Key Ref="o208"/>
+<o:Key Ref="o207"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o103">
@@ -4842,7 +4830,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o210">
+<o:Column Id="o209">
 <a:ObjectID>D2E6DEFD-2122-4088-951A-83651ABAFE54</a:ObjectID>
 <a:Name>派出所合格表ID</a:Name>
 <a:Code>POLICE_STATION_VAILED_ID</a:Code>
@@ -4854,7 +4842,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o211">
+<o:Column Id="o210">
 <a:ObjectID>80C0EE89-AF3E-4702-AB53-7DE1367505B0</a:ObjectID>
 <a:Name>任务单流水号</a:Name>
 <a:Code>TASK_ID</a:Code>
@@ -4866,7 +4854,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o212">
+<o:Column Id="o211">
 <a:ObjectID>F1668619-45DC-4A54-A81B-DDB0A9CC9981</a:ObjectID>
 <a:Name>派出所代码</a:Name>
 <a:Code>POLICE_STATION_CODE</a:Code>
@@ -4879,7 +4867,7 @@ logging
 <a:Length>8</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o213">
+<o:Column Id="o212">
 <a:ObjectID>2B8D18B3-D611-4357-A10B-212C5BC011D4</a:ObjectID>
 <a:Name>合格数</a:Name>
 <a:Code>VAILED_COUNT</a:Code>
@@ -4891,7 +4879,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o214">
+<o:Column Id="o213">
 <a:ObjectID>DF21E498-5E73-46C8-8FA2-E5438003B40E</a:ObjectID>
 <a:Name>不合格数</a:Name>
 <a:Code>INVALID_COUNT</a:Code>
@@ -4903,7 +4891,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o215">
+<o:Column Id="o214">
 <a:ObjectID>643444E6-2AEF-4000-BD99-C659608E510C</a:ObjectID>
 <a:Name>保存时间</a:Name>
 <a:Code>SAVA_DATE</a:Code>
@@ -4918,7 +4906,7 @@ logging
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o216">
+<o:Key Id="o215">
 <a:ObjectID>F31AAADA-0EA3-4216-8629-44592AF75B19</a:ObjectID>
 <a:Name>POLICE_STATION_VAILED_PK</a:Name>
 <a:Code>POLICE_STATION_VAILED_PK</a:Code>
@@ -4928,12 +4916,12 @@ logging
 <a:Modifier>Administrator</a:Modifier>
 <a:ConstraintName>POLICE_STATION_VAILED_PK</a:ConstraintName>
 <c:Key.Columns>
-<o:Column Ref="o210"/>
+<o:Column Ref="o209"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:Indexes>
-<o:Index Id="o217">
+<o:Index Id="o216">
 <a:ObjectID>67438D52-208D-43CD-A8E5-8E545BCF0EB1</a:ObjectID>
 <a:Name>POLICE_STATION_VAILED_INFO_PK</a:Name>
 <a:Code>POLICE_STATION_VAILED_INFO_PK</a:Code>
@@ -4955,17 +4943,17 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:Unique>1</a:Unique>
 <c:LinkedObject>
-<o:Key Ref="o216"/>
+<o:Key Ref="o215"/>
 </c:LinkedObject>
 <c:IndexColumns>
-<o:IndexColumn Id="o218">
+<o:IndexColumn Id="o217">
 <a:ObjectID>4F6827CC-A656-4CD4-9C0C-5D1B6E900446</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Column>
-<o:Column Ref="o210"/>
+<o:Column Ref="o209"/>
 </c:Column>
 </o:IndexColumn>
 </c:IndexColumns>
@@ -4978,7 +4966,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:User Ref="o117"/>
 </c:Owner>
 <c:PrimaryKey>
-<o:Key Ref="o216"/>
+<o:Key Ref="o215"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o102">
@@ -4999,7 +4987,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o219">
+<o:Column Id="o218">
 <a:ObjectID>2847F42E-4EBF-4EE9-B948-C910BBACA98D</a:ObjectID>
 <a:Name>打印机ID</a:Name>
 <a:Code>PRINTER_ID</a:Code>
@@ -5011,7 +4999,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o220">
+<o:Column Id="o219">
 <a:ObjectID>4C6A8590-98D3-4C89-B168-7034D2A84CFE</a:ObjectID>
 <a:Name>打印机名称</a:Name>
 <a:Code>PRINTER_NAME</a:Code>
@@ -5026,7 +5014,7 @@ logging
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o221">
+<o:Key Id="o220">
 <a:ObjectID>2946E470-8AFF-4BA1-997F-79794FD15906</a:ObjectID>
 <a:Name>PRINTER_DIC_PK</a:Name>
 <a:Code>PRINTER_DIC_PK</a:Code>
@@ -5040,7 +5028,7 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:ConstraintName>PRINTER_DIC_PK</a:ConstraintName>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o222">
+<o:ExtendedCollection Id="o221">
 <a:ObjectID>B666C31E-F3D6-4EC4-BE8D-78D905216039</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -5051,7 +5039,7 @@ tablespace USERS</a:PhysicalOptions>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Key.Columns>
-<o:Column Ref="o219"/>
+<o:Column Ref="o218"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -5059,7 +5047,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:User Ref="o117"/>
 </c:Owner>
 <c:PrimaryKey>
-<o:Key Ref="o221"/>
+<o:Key Ref="o220"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o101">
@@ -5086,7 +5074,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o223">
+<o:ExtendedCollection Id="o222">
 <a:ObjectID>C90FE17A-1C8A-47F1-923D-DAAD7E63995B</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -5097,7 +5085,7 @@ logging
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o224">
+<o:Column Id="o223">
 <a:ObjectID>E7AEC94D-DFD4-4B7F-8D02-5CD1D4FE2393</a:ObjectID>
 <a:Name>对应地址</a:Name>
 <a:Code>URL</a:Code>
@@ -5109,7 +5097,7 @@ logging
 <a:DataType>VARCHAR2(20)</a:DataType>
 <a:Length>20</a:Length>
 </o:Column>
-<o:Column Id="o225">
+<o:Column Id="o224">
 <a:ObjectID>1EC2CAFE-D01D-49A4-BEF9-138C2FECB6AA</a:ObjectID>
 <a:Name>角色表ID</a:Name>
 <a:Code>ROLE_URL_INFO_ID</a:Code>
@@ -5123,7 +5111,7 @@ logging
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o226">
+<o:Key Id="o225">
 <a:ObjectID>8C41A9D5-1B2B-499E-B202-CF8DD30B40C5</a:ObjectID>
 <a:Name>ROLE_URL_INFO_PK</a:Name>
 <a:Code>ROLE_URL_INFO_PK</a:Code>
@@ -5144,7 +5132,7 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:ConstraintName>ROLE_URL_INFO_PK</a:ConstraintName>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o227">
+<o:ExtendedCollection Id="o226">
 <a:ObjectID>D8231908-9217-4957-AD20-6E369A0BCC6E</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -5155,7 +5143,7 @@ tablespace USERS</a:PhysicalOptions>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Key.Columns>
-<o:Column Ref="o225"/>
+<o:Column Ref="o224"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -5163,7 +5151,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:User Ref="o117"/>
 </c:Owner>
 <c:PrimaryKey>
-<o:Key Ref="o226"/>
+<o:Key Ref="o225"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o99">
@@ -5190,7 +5178,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o228">
+<o:ExtendedCollection Id="o227">
 <a:ObjectID>B9B8BF74-7E30-4950-8D3F-DDADF23457AC</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -5201,7 +5189,7 @@ logging
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o229">
+<o:Column Id="o228">
 <a:ObjectID>2E2DB575-36CA-4213-A603-69E0F75EE804</a:ObjectID>
 <a:Name>          </a:Name>
 <a:Code>GAJG_DM</a:Code>
@@ -5212,7 +5200,7 @@ logging
 <a:DataType>VARCHAR2(20)</a:DataType>
 <a:Length>20</a:Length>
 </o:Column>
-<o:Column Id="o230">
+<o:Column Id="o229">
 <a:ObjectID>402F48AE-3414-4F26-9F28-1C60BEDD5E7C</a:ObjectID>
 <a:Name>           </a:Name>
 <a:Code>SLH_GAJG_DM</a:Code>
@@ -5253,7 +5241,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o231">
+<o:Column Id="o230">
 <a:ObjectID>302D4459-DCCB-42EE-891E-468CCDC59176</a:ObjectID>
 <a:Name>受理号表ID</a:Name>
 <a:Code>SPECIAL_CARD_ID</a:Code>
@@ -5265,7 +5253,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o232">
+<o:Column Id="o231">
 <a:ObjectID>7AE57708-9AC4-4E58-A504-E56389FBF760</a:ObjectID>
 <a:Name>受理号</a:Name>
 <a:Code>ACCEPT_NO</a:Code>
@@ -5278,7 +5266,7 @@ logging
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o233">
+<o:Column Id="o232">
 <a:ObjectID>A36C0D3A-A870-497F-B2EB-2F52E4F004A1</a:ObjectID>
 <a:Name>任务单ID</a:Name>
 <a:Code>TASK_ID</a:Code>
@@ -5290,7 +5278,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o234">
+<o:Column Id="o233">
 <a:ObjectID>6486E565-DF73-4FB7-A420-536F17F773E3</a:ObjectID>
 <a:Name>受理类型（0余证1快证2退证）</a:Name>
 <a:Code>SPECIAL_TYPE</a:Code>
@@ -5302,7 +5290,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o235">
+<o:Column Id="o234">
 <a:ObjectID>1C7BBB1D-FEAE-44D5-A773-85D62D6D775B</a:ObjectID>
 <a:Name>受理组号</a:Name>
 <a:Code>GROUP_NO</a:Code>
@@ -5317,7 +5305,7 @@ logging
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o236">
+<o:Key Id="o235">
 <a:ObjectID>93297D3C-4916-4BA5-ADDB-310B3836CC4A</a:ObjectID>
 <a:Name>SPECIAL_CARD_PK</a:Name>
 <a:Code>SPECIAL_CARD_PK</a:Code>
@@ -5331,7 +5319,7 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:ConstraintName>SPECIAL_CARD_PK</a:ConstraintName>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o237">
+<o:ExtendedCollection Id="o236">
 <a:ObjectID>CB829C82-EF57-49E2-98DD-2B9814A28D49</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -5342,7 +5330,7 @@ tablespace USERS</a:PhysicalOptions>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Key.Columns>
-<o:Column Ref="o231"/>
+<o:Column Ref="o230"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -5350,7 +5338,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:User Ref="o117"/>
 </c:Owner>
 <c:PrimaryKey>
-<o:Key Ref="o236"/>
+<o:Key Ref="o235"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o96">
@@ -5377,7 +5365,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o238">
+<o:ExtendedCollection Id="o237">
 <a:ObjectID>2CC0112F-6062-4BA7-B421-030C0FC0BD6D</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -5388,7 +5376,7 @@ logging
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o239">
+<o:Column Id="o238">
 <a:ObjectID>E1579F50-350C-4C95-8F83-F2EA664F591D</a:ObjectID>
 <a:Name>角色表ID</a:Name>
 <a:Code>MENU_ID</a:Code>
@@ -5400,7 +5388,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o240">
+<o:Column Id="o239">
 <a:ObjectID>11EED76D-96D2-40A2-89A6-B14C668230CD</a:ObjectID>
 <a:Name>对应地址</a:Name>
 <a:Code>MENU</a:Code>
@@ -5412,7 +5400,7 @@ logging
 <a:DataType>VARCHAR2(40)</a:DataType>
 <a:Length>40</a:Length>
 </o:Column>
-<o:Column Id="o241">
+<o:Column Id="o240">
 <a:ObjectID>BCE060C9-DC9B-4061-A08C-C363B7539D37</a:ObjectID>
 <a:Name>菜单名称</a:Name>
 <a:Code>MENU_NAME</a:Code>
@@ -5426,7 +5414,7 @@ logging
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o242">
+<o:Key Id="o241">
 <a:ObjectID>CB12045D-1667-458E-A0D1-297E09822751</a:ObjectID>
 <a:Name>SYSTEM_MENU_PK</a:Name>
 <a:Code>SYSTEM_MENU_PK</a:Code>
@@ -5447,7 +5435,7 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:ConstraintName>SYSTEM_MENU_PK</a:ConstraintName>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o243">
+<o:ExtendedCollection Id="o242">
 <a:ObjectID>49CE061E-D76C-4B9C-AA9F-9B7E8F4DDE90</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -5458,7 +5446,7 @@ tablespace USERS</a:PhysicalOptions>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Key.Columns>
-<o:Column Ref="o239"/>
+<o:Column Ref="o238"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -5466,7 +5454,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:User Ref="o117"/>
 </c:Owner>
 <c:PrimaryKey>
-<o:Key Ref="o242"/>
+<o:Key Ref="o241"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o95">
@@ -5493,7 +5481,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o244">
+<o:ExtendedCollection Id="o243">
 <a:ObjectID>05D2CA1E-DF0D-41AF-8631-E2C65A3D7867</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -5504,7 +5492,7 @@ logging
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o245">
+<o:Column Id="o244">
 <a:ObjectID>42717CFF-A53D-4F33-81E3-07465E3F18FF</a:ObjectID>
 <a:Name>角色ID</a:Name>
 <a:Code>ROLE_ID</a:Code>
@@ -5516,7 +5504,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o246">
+<o:Column Id="o245">
 <a:ObjectID>14B16DBB-BF5A-465C-9AC6-1D4BC124F725</a:ObjectID>
 <a:Name>角色名</a:Name>
 <a:Code>ROLE_NAME</a:Code>
@@ -5530,7 +5518,7 @@ logging
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o247">
+<o:Key Id="o246">
 <a:ObjectID>E0390190-9644-4589-8F90-E153949F90CE</a:ObjectID>
 <a:Name>SYSTEM_ROLE_PK</a:Name>
 <a:Code>SYSTEM_ROLE_PK</a:Code>
@@ -5551,7 +5539,7 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:ConstraintName>SYSTEM_ROLE_PK</a:ConstraintName>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o248">
+<o:ExtendedCollection Id="o247">
 <a:ObjectID>A634E2CD-E406-40F1-8075-FE16AAC56931</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -5562,7 +5550,7 @@ tablespace USERS</a:PhysicalOptions>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Key.Columns>
-<o:Column Ref="o245"/>
+<o:Column Ref="o244"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -5570,7 +5558,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:User Ref="o117"/>
 </c:Owner>
 <c:PrimaryKey>
-<o:Key Ref="o247"/>
+<o:Key Ref="o246"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o94">
@@ -5597,7 +5585,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o249">
+<o:ExtendedCollection Id="o248">
 <a:ObjectID>703BF8F7-7121-4018-93A8-864BED51C332</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -5608,7 +5596,7 @@ logging
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o250">
+<o:Column Id="o249">
 <a:ObjectID>85B50558-E0AB-4443-9FD1-E20853EE452F</a:ObjectID>
 <a:Name>对应表ID</a:Name>
 <a:Code>ROLE_ID</a:Code>
@@ -5619,7 +5607,7 @@ logging
 <a:Comment>对应表ID</a:Comment>
 <a:DataType>NUMBER</a:DataType>
 </o:Column>
-<o:Column Id="o251">
+<o:Column Id="o250">
 <a:ObjectID>EE442EB2-8F8E-483A-9496-3FD70EDD5A75</a:ObjectID>
 <a:Name>角色表ID</a:Name>
 <a:Code>ROLE_MENU_ID</a:Code>
@@ -5630,7 +5618,7 @@ logging
 <a:Comment>角色表ID</a:Comment>
 <a:DataType>NUMBER</a:DataType>
 </o:Column>
-<o:Column Id="o252">
+<o:Column Id="o251">
 <a:ObjectID>0DA4E4B6-5C95-4A65-B3A1-F064C05CA4BF</a:ObjectID>
 <a:Name>ID</a:Name>
 <a:Code>SYSTEM_ROLE_MENU_ID</a:Code>
@@ -5644,7 +5632,7 @@ logging
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o253">
+<o:Key Id="o252">
 <a:ObjectID>899D0784-29AF-4102-BA26-69928A91B73A</a:ObjectID>
 <a:Name>SYSTEM_ROLE_MENU_PK</a:Name>
 <a:Code>SYSTEM_ROLE_MENU_PK</a:Code>
@@ -5665,7 +5653,7 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:ConstraintName>SYSTEM_ROLE_MENU_PK</a:ConstraintName>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o254">
+<o:ExtendedCollection Id="o253">
 <a:ObjectID>1A72D3A6-B0BD-4DE4-82A4-8D499B768889</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -5676,7 +5664,7 @@ tablespace USERS</a:PhysicalOptions>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Key.Columns>
-<o:Column Ref="o252"/>
+<o:Column Ref="o251"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -5684,7 +5672,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:User Ref="o117"/>
 </c:Owner>
 <c:PrimaryKey>
-<o:Key Ref="o253"/>
+<o:Key Ref="o252"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o93">
@@ -5714,7 +5702,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o255">
+<o:ExtendedCollection Id="o254">
 <a:ObjectID>A7E7F67E-6BCC-4470-BFD5-FEB9E3FB347A</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -5725,7 +5713,7 @@ logging
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o256">
+<o:Column Id="o255">
 <a:ObjectID>6916D391-8289-4BF5-ABF0-916209949A65</a:ObjectID>
 <a:Name>            </a:Name>
 <a:Code>ID</a:Code>
@@ -5736,7 +5724,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o257">
+<o:Column Id="o256">
 <a:ObjectID>CC700EFA-B250-42CB-B67B-8739574E4AC3</a:ObjectID>
 <a:Name>对应表ID</a:Name>
 <a:Code>ROLE_ID</a:Code>
@@ -5747,7 +5735,7 @@ logging
 <a:Comment>对应表ID</a:Comment>
 <a:DataType>NUMBER</a:DataType>
 </o:Column>
-<o:Column Id="o258">
+<o:Column Id="o257">
 <a:ObjectID>37FBAA12-27F6-4B4D-AE09-4F173F4EBDE2</a:ObjectID>
 <a:Name>             </a:Name>
 <a:Code>USERNAME</a:Code>
@@ -5758,7 +5746,7 @@ logging
 <a:DataType>VARCHAR2(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o259">
+<o:Column Id="o258">
 <a:ObjectID>50C8740B-057D-483C-A77D-F4B68600075E</a:ObjectID>
 <a:Name>              </a:Name>
 <a:Code>PASSWORD</a:Code>
@@ -5769,7 +5757,7 @@ logging
 <a:DataType>VARCHAR2(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o260">
+<o:Column Id="o259">
 <a:ObjectID>8EE8BA9D-61FF-4392-98F2-6096349987B6</a:ObjectID>
 <a:Name>               </a:Name>
 <a:Code>WORKSHOP</a:Code>
@@ -5782,7 +5770,7 @@ logging
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o261">
+<o:Key Id="o260">
 <a:ObjectID>87ED81CD-428A-49AF-BBAF-91B517ACCC64</a:ObjectID>
 <a:Name>SYSTEM_USER_PK</a:Name>
 <a:Code>SYSTEM_USER_PK</a:Code>
@@ -5803,7 +5791,7 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:ConstraintName>SYSTEM_USER_PK</a:ConstraintName>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o262">
+<o:ExtendedCollection Id="o261">
 <a:ObjectID>B54FFB0F-7E18-4EDA-99ED-BFC31B7C906C</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -5814,7 +5802,7 @@ tablespace USERS</a:PhysicalOptions>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Key.Columns>
-<o:Column Ref="o256"/>
+<o:Column Ref="o255"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -5822,7 +5810,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:User Ref="o117"/>
 </c:Owner>
 <c:PrimaryKey>
-<o:Key Ref="o261"/>
+<o:Key Ref="o260"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o92">
@@ -5849,7 +5837,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o263">
+<o:ExtendedCollection Id="o262">
 <a:ObjectID>F685BEC4-9007-48C3-B470-CB1CDEF16D81</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -5860,7 +5848,7 @@ logging
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o264">
+<o:Column Id="o263">
 <a:ObjectID>E36237FC-B5E3-4324-855E-9CCC53A1EEFC</a:ObjectID>
 <a:Name>                </a:Name>
 <a:Code>ID</a:Code>
@@ -5872,7 +5860,7 @@ logging
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o265">
+<o:Column Id="o264">
 <a:ObjectID>DD37D7AD-51A7-4B84-AA0E-B2BBC0821C9B</a:ObjectID>
 <a:Name>                 </a:Name>
 <a:Code>AVAILABLE</a:Code>
@@ -5883,7 +5871,7 @@ logging
 <a:DataType>NUMBER(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o266">
+<o:Column Id="o265">
 <a:ObjectID>A7AF5D91-3C05-48D6-BD6E-4889992620D6</a:ObjectID>
 <a:Name>                  </a:Name>
 <a:Code>NAME</a:Code>
@@ -5894,7 +5882,7 @@ logging
 <a:DataType>VARCHAR2(255 char)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o267">
+<o:Column Id="o266">
 <a:ObjectID>BCD6CB78-D38A-4366-BE48-240C723C4CAD</a:ObjectID>
 <a:Name>                   </a:Name>
 <a:Code>PARENT_ID</a:Code>
@@ -5905,7 +5893,7 @@ logging
 <a:DataType>NUMBER(19)</a:DataType>
 <a:Length>19</a:Length>
 </o:Column>
-<o:Column Id="o268">
+<o:Column Id="o267">
 <a:ObjectID>9CF15020-D2C0-4D18-B131-41B4695AFB76</a:ObjectID>
 <a:Name>                    </a:Name>
 <a:Code>PARENT_IDS</a:Code>
@@ -5916,7 +5904,7 @@ logging
 <a:DataType>VARCHAR2(255 char)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o269">
+<o:Column Id="o268">
 <a:ObjectID>BDA46010-21EF-49FC-9037-ABB8391DDE4B</a:ObjectID>
 <a:Name>                     </a:Name>
 <a:Code>PERMISSION</a:Code>
@@ -5927,7 +5915,7 @@ logging
 <a:DataType>VARCHAR2(255 char)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o270">
+<o:Column Id="o269">
 <a:ObjectID>A5639155-6BCC-4153-AA77-4CE7A6AE083C</a:ObjectID>
 <a:Name>                      </a:Name>
 <a:Code>RESOURCE_TYPE</a:Code>
@@ -5938,7 +5926,7 @@ logging
 <a:DataType>VARCHAR2(255 char)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o271">
+<o:Column Id="o270">
 <a:ObjectID>51FD55AF-6887-401C-BE4C-EED7EFC822CE</a:ObjectID>
 <a:Name>                       </a:Name>
 <a:Code>URL</a:Code>
@@ -5951,7 +5939,7 @@ logging
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o272">
+<o:Key Id="o271">
 <a:ObjectID>9A74CF90-1E66-4C90-ACE8-D0EA2832822B</a:ObjectID>
 <a:Name>SYS_C0012307</a:Name>
 <a:Code>SYS_C0012307</a:Code>
@@ -5972,7 +5960,7 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:ConstraintName>SYS_C0012307</a:ConstraintName>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o273">
+<o:ExtendedCollection Id="o272">
 <a:ObjectID>4605D5C6-CD8A-4106-B9BC-8291E34902F5</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -5983,7 +5971,7 @@ tablespace USERS</a:PhysicalOptions>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Key.Columns>
-<o:Column Ref="o264"/>
+<o:Column Ref="o263"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -5991,7 +5979,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:User Ref="o117"/>
 </c:Owner>
 <c:PrimaryKey>
-<o:Key Ref="o272"/>
+<o:Key Ref="o271"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o91">
@@ -6018,7 +6006,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o274">
+<o:ExtendedCollection Id="o273">
 <a:ObjectID>D4CE666D-70CE-419E-90C4-A40A2884A908</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -6029,7 +6017,7 @@ logging
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o275">
+<o:Column Id="o274">
 <a:ObjectID>F78EF420-3C18-42C5-B6F7-96A1C8F313AA</a:ObjectID>
 <a:Name>                        </a:Name>
 <a:Code>ID</a:Code>
@@ -6041,7 +6029,7 @@ logging
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o276">
+<o:Column Id="o275">
 <a:ObjectID>C470784B-9EFA-4FF4-A0E3-53AA81DB52D8</a:ObjectID>
 <a:Name>                         </a:Name>
 <a:Code>AVAILABLE</a:Code>
@@ -6052,7 +6040,7 @@ logging
 <a:DataType>NUMBER(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o277">
+<o:Column Id="o276">
 <a:ObjectID>FEF2A56E-84C7-4A32-A88E-21D98BFC3FA5</a:ObjectID>
 <a:Name>                          </a:Name>
 <a:Code>DESCRIPTION</a:Code>
@@ -6063,7 +6051,7 @@ logging
 <a:DataType>VARCHAR2(255 char)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o278">
+<o:Column Id="o277">
 <a:ObjectID>1FDAEFDF-5716-44E2-A26F-F7114A5D4868</a:ObjectID>
 <a:Name>                           </a:Name>
 <a:Code>ROLE</a:Code>
@@ -6076,7 +6064,7 @@ logging
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o279">
+<o:Key Id="o278">
 <a:ObjectID>83551291-CD75-4CDA-BA7E-CC11205A39E1</a:ObjectID>
 <a:Name>SYS_C0012309</a:Name>
 <a:Code>SYS_C0012309</a:Code>
@@ -6097,7 +6085,7 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:ConstraintName>SYS_C0012309</a:ConstraintName>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o280">
+<o:ExtendedCollection Id="o279">
 <a:ObjectID>F65D08F7-C491-49AB-86DE-B037E612A819</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -6108,7 +6096,7 @@ tablespace USERS</a:PhysicalOptions>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Key.Columns>
-<o:Column Ref="o275"/>
+<o:Column Ref="o274"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -6116,7 +6104,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:User Ref="o117"/>
 </c:Owner>
 <c:PrimaryKey>
-<o:Key Ref="o279"/>
+<o:Key Ref="o278"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o90">
@@ -6143,7 +6131,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o281">
+<o:ExtendedCollection Id="o280">
 <a:ObjectID>F9E5117D-2389-4506-8308-4AA25A748015</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -6154,7 +6142,7 @@ logging
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o282">
+<o:Column Id="o281">
 <a:ObjectID>509A1110-A2F2-40FC-9610-8CF2A0A414FB</a:ObjectID>
 <a:Name>                            </a:Name>
 <a:Code>ROLE_ID</a:Code>
@@ -6166,7 +6154,7 @@ logging
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o283">
+<o:Column Id="o282">
 <a:ObjectID>12DAC3CE-8F98-46C9-BAA2-D3B283A581F8</a:ObjectID>
 <a:Name>                             </a:Name>
 <a:Code>PERMISSION_ID</a:Code>
@@ -6207,7 +6195,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o284">
+<o:ExtendedCollection Id="o283">
 <a:ObjectID>7B6B2F1A-98DE-495B-A69B-75D2147D0DAE</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -6218,7 +6206,7 @@ logging
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o285">
+<o:Column Id="o284">
 <a:ObjectID>74053DBF-DC18-4808-B08E-BBC9FE6A81C9</a:ObjectID>
 <a:Name>                              </a:Name>
 <a:Code>USER_ID</a:Code>
@@ -6230,7 +6218,7 @@ logging
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o286">
+<o:Column Id="o285">
 <a:ObjectID>1A7CBBF6-1D07-4E35-9BB0-BBB4AE7D76CA</a:ObjectID>
 <a:Name>                               </a:Name>
 <a:Code>ROLE_ID</a:Code>
@@ -6272,7 +6260,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o287">
+<o:ExtendedCollection Id="o286">
 <a:ObjectID>5EEDFD21-D565-4B12-8DC0-073C5131DFCB</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -6283,7 +6271,7 @@ logging
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o288">
+<o:Column Id="o287">
 <a:ObjectID>6784A384-E68E-4873-B428-623BE920FF13</a:ObjectID>
 <a:Name>任务单ID</a:Name>
 <a:Code>TASK_ID</a:Code>
@@ -6295,7 +6283,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o289">
+<o:Column Id="o288">
 <a:ObjectID>F575D27C-F9D9-4573-B1AC-DB515C15E5CC</a:ObjectID>
 <a:Name>制证类型</a:Name>
 <a:Code>CARD_TYPE</a:Code>
@@ -6307,7 +6295,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o290">
+<o:Column Id="o289">
 <a:ObjectID>0F5E1A28-958E-484E-B7C4-64C3CC01E4B5</a:ObjectID>
 <a:Name>原制证类型</a:Name>
 <a:Code>OLD_CARD_TYPE</a:Code>
@@ -6318,7 +6306,7 @@ logging
 <a:Comment>原制证类型</a:Comment>
 <a:DataType>NUMBER</a:DataType>
 </o:Column>
-<o:Column Id="o291">
+<o:Column Id="o290">
 <a:ObjectID>A441B19E-03B2-47FF-9C25-38C91027DF58</a:ObjectID>
 <a:Name>城市代码</a:Name>
 <a:Code>CITYCODE</a:Code>
@@ -6331,7 +6319,7 @@ logging
 <a:Length>6</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o292">
+<o:Column Id="o291">
 <a:ObjectID>8FB62867-DEF6-4B35-B475-4C364F9238C9</a:ObjectID>
 <a:Name>提交生成时间</a:Name>
 <a:Code>SUBMIT_DATE</a:Code>
@@ -6343,7 +6331,7 @@ logging
 <a:DefaultValue>SYSDATE</a:DefaultValue>
 <a:DataType>DATE</a:DataType>
 </o:Column>
-<o:Column Id="o293">
+<o:Column Id="o292">
 <a:ObjectID>353FA01A-D8C4-47B2-8882-5FECC5FEEDF9</a:ObjectID>
 <a:Name>下发任务单时间</a:Name>
 <a:Code>ISSUED_DATE</a:Code>
@@ -6354,7 +6342,7 @@ logging
 <a:Comment>下发任务单时间</a:Comment>
 <a:DataType>DATE</a:DataType>
 </o:Column>
-<o:Column Id="o294">
+<o:Column Id="o293">
 <a:ObjectID>E30E2565-1203-4D54-BAE6-A0DFCE19A0A3</a:ObjectID>
 <a:Name>打印状态(1正面打印2反面打印3打印完成)</a:Name>
 <a:Code>PRINT_STATE</a:Code>
@@ -6366,7 +6354,7 @@ logging
 <a:DefaultValue>0</a:DefaultValue>
 <a:DataType>NUMBER</a:DataType>
 </o:Column>
-<o:Column Id="o295">
+<o:Column Id="o294">
 <a:ObjectID>3B0B912B-C7D6-4EE3-89F1-06570DA61BC8</a:ObjectID>
 <a:Name>卸载时间</a:Name>
 <a:Code>DOWNLOAD_DATE</a:Code>
@@ -6377,7 +6365,7 @@ logging
 <a:Comment>卸载时间</a:Comment>
 <a:DataType>DATE</a:DataType>
 </o:Column>
-<o:Column Id="o296">
+<o:Column Id="o295">
 <a:ObjectID>09B0A790-F080-4E07-95BE-EAADE61973FD</a:ObjectID>
 <a:Name>打印转出时间</a:Name>
 <a:Code>PRINT_OUT_DATE</a:Code>
@@ -6388,7 +6376,7 @@ logging
 <a:Comment>打印转出时间</a:Comment>
 <a:DataType>DATE</a:DataType>
 </o:Column>
-<o:Column Id="o297">
+<o:Column Id="o296">
 <a:ObjectID>10A45F9D-6337-4E86-BF1A-ACF5AAC09323</a:ObjectID>
 <a:Name>预订位时间</a:Name>
 <a:Code>POSITION_DATE</a:Code>
@@ -6399,7 +6387,7 @@ logging
 <a:Comment>预订位时间</a:Comment>
 <a:DataType>DATE</a:DataType>
 </o:Column>
-<o:Column Id="o298">
+<o:Column Id="o297">
 <a:ObjectID>8C978601-9B05-42C3-8BC6-DE07C70A9A38</a:ObjectID>
 <a:Name>车间转出时间</a:Name>
 <a:Code>OUT_WORKSHOP_DATE</a:Code>
@@ -6410,7 +6398,7 @@ logging
 <a:Comment>车间转出时间</a:Comment>
 <a:DataType>DATE</a:DataType>
 </o:Column>
-<o:Column Id="o299">
+<o:Column Id="o298">
 <a:ObjectID>08A28BC6-5537-49C0-9401-29A789CFA4E4</a:ObjectID>
 <a:Name>质检人姓名</a:Name>
 <a:Code>QUALITY_PEOPLE_NAME</a:Code>
@@ -6422,7 +6410,7 @@ logging
 <a:DataType>VARCHAR2(20)</a:DataType>
 <a:Length>20</a:Length>
 </o:Column>
-<o:Column Id="o300">
+<o:Column Id="o299">
 <a:ObjectID>385B1308-C249-4655-8373-C36FEA53CBA4</a:ObjectID>
 <a:Name>人工质检时间</a:Name>
 <a:Code>QUALITY_TEST_DATE</a:Code>
@@ -6433,7 +6421,7 @@ logging
 <a:Comment>人工质检时间</a:Comment>
 <a:DataType>DATE</a:DataType>
 </o:Column>
-<o:Column Id="o301">
+<o:Column Id="o300">
 <a:ObjectID>08889DDB-C73A-42C1-BE40-6BE4D4CB43ED</a:ObjectID>
 <a:Name>异常信息</a:Name>
 <a:Code>EXCEPTION_INFORMATION</a:Code>
@@ -6445,7 +6433,7 @@ logging
 <a:DataType>VARCHAR2(120)</a:DataType>
 <a:Length>120</a:Length>
 </o:Column>
-<o:Column Id="o302">
+<o:Column Id="o301">
 <a:ObjectID>8D6DF373-73FF-4103-B481-DCA7A0684F96</a:ObjectID>
 <a:Name>出库时间</a:Name>
 <a:Code>OUT_STORAGE_DATE</a:Code>
@@ -6456,7 +6444,7 @@ logging
 <a:Comment>出库时间</a:Comment>
 <a:DataType>DATE</a:DataType>
 </o:Column>
-<o:Column Id="o303">
+<o:Column Id="o302">
 <a:ObjectID>1D41D157-E313-43B8-95C2-506442485D6C</a:ObjectID>
 <a:Name>入库时间</a:Name>
 <a:Code>IN_STORAGE_DATE</a:Code>
@@ -6467,7 +6455,7 @@ logging
 <a:Comment>入库时间</a:Comment>
 <a:DataType>DATE</a:DataType>
 </o:Column>
-<o:Column Id="o304">
+<o:Column Id="o303">
 <a:ObjectID>1CA84D7C-1780-46EF-9BC5-13585F71C89D</a:ObjectID>
 <a:Name>任务单状态</a:Name>
 <a:Code>TASK_STATE_ID</a:Code>
@@ -6479,7 +6467,7 @@ logging
 <a:DefaultValue>0</a:DefaultValue>
 <a:DataType>NUMBER</a:DataType>
 </o:Column>
-<o:Column Id="o305">
+<o:Column Id="o304">
 <a:ObjectID>CD2F8A58-DEF5-4737-BA28-B5155449F34A</a:ObjectID>
 <a:Name>异常状态 0正常  1 异常</a:Name>
 <a:Code>IS_EXCEPTION</a:Code>
@@ -6490,7 +6478,7 @@ logging
 <a:Comment>异常状态 0正常  1 异常</a:Comment>
 <a:DataType>NUMBER</a:DataType>
 </o:Column>
-<o:Column Id="o306">
+<o:Column Id="o305">
 <a:ObjectID>06B07ACB-D356-40AF-A21D-1817F806484E</a:ObjectID>
 <a:Name>打印机ID</a:Name>
 <a:Code>PRINTER_ID</a:Code>
@@ -6503,7 +6491,7 @@ logging
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o307">
+<o:Key Id="o306">
 <a:ObjectID>A32670E6-1CC4-4621-8F91-983598851C0F</a:ObjectID>
 <a:Name>TASK_PK</a:Name>
 <a:Code>TASK_PK</a:Code>
@@ -6524,7 +6512,7 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:ConstraintName>TASK_PK</a:ConstraintName>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o308">
+<o:ExtendedCollection Id="o307">
 <a:ObjectID>0FAD199B-C0F3-4240-93AD-94064BC874DF</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -6535,7 +6523,7 @@ tablespace USERS</a:PhysicalOptions>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Key.Columns>
-<o:Column Ref="o288"/>
+<o:Column Ref="o287"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -6543,7 +6531,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:User Ref="o117"/>
 </c:Owner>
 <c:PrimaryKey>
-<o:Key Ref="o307"/>
+<o:Key Ref="o306"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o87">
@@ -6571,7 +6559,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o309">
+<o:Column Id="o308">
 <a:ObjectID>1BF84519-B6CE-4BB9-8F6C-AC1888E0D063</a:ObjectID>
 <a:Name>状态ID</a:Name>
 <a:Code>TASK_STATE_ID</a:Code>
@@ -6583,7 +6571,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o310">
+<o:Column Id="o309">
 <a:ObjectID>C84B449B-405F-4AB5-98B1-65AEC8A5BFEA</a:ObjectID>
 <a:Name>状态名称</a:Name>
 <a:Code>TASK_STATE</a:Code>
@@ -6598,7 +6586,7 @@ logging
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o311">
+<o:Key Id="o310">
 <a:ObjectID>CF71938F-719F-40F3-9155-E8CCD21369C4</a:ObjectID>
 <a:Name>TASK_STATE_DIC_PK</a:Name>
 <a:Code>TASK_STATE_DIC_PK</a:Code>
@@ -6619,7 +6607,7 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:ConstraintName>TASK_STATE_DIC_PK</a:ConstraintName>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o312">
+<o:ExtendedCollection Id="o311">
 <a:ObjectID>8834A09D-09A5-464C-864B-9CE77CCB5C12</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -6630,7 +6618,7 @@ tablespace USERS</a:PhysicalOptions>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Key.Columns>
-<o:Column Ref="o309"/>
+<o:Column Ref="o308"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -6638,7 +6626,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:User Ref="o117"/>
 </c:Owner>
 <c:PrimaryKey>
-<o:Key Ref="o311"/>
+<o:Key Ref="o310"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o84">
@@ -6665,7 +6653,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o313">
+<o:ExtendedCollection Id="o312">
 <a:ObjectID>66147AA8-2A12-4347-9667-99D720513E90</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -6676,7 +6664,7 @@ logging
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o314">
+<o:Column Id="o313">
 <a:ObjectID>3979E5BA-2849-4DA2-A7FB-267338034BA6</a:ObjectID>
 <a:Name>                                </a:Name>
 <a:Code>ID</a:Code>
@@ -6688,7 +6676,7 @@ logging
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o315">
+<o:Column Id="o314">
 <a:ObjectID>A8C9B0F8-D4D1-4591-9569-11C9265F1DBD</a:ObjectID>
 <a:Name>                                 </a:Name>
 <a:Code>NAME</a:Code>
@@ -6699,7 +6687,7 @@ logging
 <a:DataType>VARCHAR2(255 char)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o316">
+<o:Column Id="o315">
 <a:ObjectID>EB244AF2-D641-425D-A569-6B3B04B57FB5</a:ObjectID>
 <a:Name>                                  </a:Name>
 <a:Code>PASSWORD</a:Code>
@@ -6710,7 +6698,7 @@ logging
 <a:DataType>VARCHAR2(255 char)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o317">
+<o:Column Id="o316">
 <a:ObjectID>8600FC0A-FFD6-4F96-A879-617ABBD5B908</a:ObjectID>
 <a:Name>                                   </a:Name>
 <a:Code>SALT</a:Code>
@@ -6721,7 +6709,7 @@ logging
 <a:DataType>VARCHAR2(255 char)</a:DataType>
 <a:Length>255</a:Length>
 </o:Column>
-<o:Column Id="o318">
+<o:Column Id="o317">
 <a:ObjectID>97D9A740-AD8D-4D70-AFE3-20717FC05FF6</a:ObjectID>
 <a:Name>                                    </a:Name>
 <a:Code>STATE</a:Code>
@@ -6733,7 +6721,7 @@ logging
 <a:Length>3</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o319">
+<o:Column Id="o318">
 <a:ObjectID>7859394A-C26D-40AD-A1A3-52452D40B27E</a:ObjectID>
 <a:Name>                                     </a:Name>
 <a:Code>USERNAME</a:Code>
@@ -6746,7 +6734,7 @@ logging
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o320">
+<o:Key Id="o319">
 <a:ObjectID>E59AF24D-D2F6-4837-A4B9-2E843F11F12F</a:ObjectID>
 <a:Name>UK_F2KSD6H8HSJTD57IPFQ9MYR64</a:Name>
 <a:Code>UK_F2KSD6H8HSJTD57IPFQ9MYR64</a:Code>
@@ -6767,7 +6755,7 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:ConstraintName>UK_F2KSD6H8HSJTD57IPFQ9MYR64</a:ConstraintName>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o321">
+<o:ExtendedCollection Id="o320">
 <a:ObjectID>DAEFC681-D78E-4169-BA19-BE6D865056BA</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -6778,10 +6766,10 @@ tablespace USERS</a:PhysicalOptions>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Key.Columns>
-<o:Column Ref="o319"/>
+<o:Column Ref="o318"/>
 </c:Key.Columns>
 </o:Key>
-<o:Key Id="o322">
+<o:Key Id="o321">
 <a:ObjectID>EB8A77BC-5D32-45E4-A5FD-CCC58A980754</a:ObjectID>
 <a:Name>SYS_C0012316</a:Name>
 <a:Code>SYS_C0012316</a:Code>
@@ -6802,7 +6790,7 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:ConstraintName>SYS_C0012316</a:ConstraintName>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o323">
+<o:ExtendedCollection Id="o322">
 <a:ObjectID>4D49DF7B-A05C-46D8-B62D-0E8CEDABC377</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -6813,7 +6801,7 @@ tablespace USERS</a:PhysicalOptions>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Key.Columns>
-<o:Column Ref="o314"/>
+<o:Column Ref="o313"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -6821,7 +6809,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:User Ref="o117"/>
 </c:Owner>
 <c:PrimaryKey>
-<o:Key Ref="o322"/>
+<o:Key Ref="o321"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o86">
@@ -6848,7 +6836,7 @@ logging
  noparallel</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o324">
+<o:ExtendedCollection Id="o323">
 <a:ObjectID>08801EC4-3DDA-4869-A690-A39F5648A54D</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -6859,7 +6847,7 @@ logging
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o325">
+<o:Column Id="o324">
 <a:ObjectID>4AF7CCBD-8E80-4CC2-B85A-BA492FB8E4FA</a:ObjectID>
 <a:Name>接收类型</a:Name>
 <a:Code>REPORTYPE</a:Code>
@@ -6871,7 +6859,7 @@ logging
 <a:DataType>NUMBER</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o326">
+<o:Column Id="o325">
 <a:ObjectID>E883B16F-FCDF-4DEC-963A-64D02F6FFA11</a:ObjectID>
 <a:Name>接收名称</a:Name>
 <a:Code>REPORNAME</a:Code>
@@ -6885,7 +6873,7 @@ logging
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o327">
+<o:Key Id="o326">
 <a:ObjectID>82975234-C197-414A-8D88-0EB1B4DD19AE</a:ObjectID>
 <a:Name>WORKSHOPREPORINFOTYPE_DIC_PK</a:Name>
 <a:Code>WORKSHOPREPORINFOTYPE_DIC_PK</a:Code>
@@ -6906,7 +6894,7 @@ logging
 tablespace USERS</a:PhysicalOptions>
 <a:ConstraintName>WORKSHOPREPORINFOTYPE_DIC_PK</a:ConstraintName>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o328">
+<o:ExtendedCollection Id="o327">
 <a:ObjectID>E1238B03-D361-404B-875C-593A1E77E7E9</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -6917,7 +6905,7 @@ tablespace USERS</a:PhysicalOptions>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Key.Columns>
-<o:Column Ref="o325"/>
+<o:Column Ref="o324"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
@@ -6925,7 +6913,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:User Ref="o117"/>
 </c:Owner>
 <c:PrimaryKey>
-<o:Key Ref="o327"/>
+<o:Key Ref="o326"/>
 </c:PrimaryKey>
 </o:Table>
 </c:Tables>
@@ -6954,7 +6942,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:Key Ref="o133"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o329">
+<o:ReferenceJoin Id="o328">
 <a:ObjectID>82CC0A68-5410-4A5E-BA68-FDC918EEAEF1</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -6990,17 +6978,17 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o115"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o307"/>
+<o:Key Ref="o306"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o330">
+<o:ReferenceJoin Id="o329">
 <a:ObjectID>6B5855A3-8AEE-40F3-A9A3-6C851EE7A1C7</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o288"/>
+<o:Column Ref="o287"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o126"/>
@@ -7032,7 +7020,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:Key Ref="o149"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o331">
+<o:ReferenceJoin Id="o330">
 <a:ObjectID>B5BBFDB5-6EC0-4C23-8B7C-58707E47BE06</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -7068,17 +7056,17 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o109"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o307"/>
+<o:Key Ref="o306"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o332">
+<o:ReferenceJoin Id="o331">
 <a:ObjectID>D45846BB-EF50-4996-BC21-DDE3E4683401</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o288"/>
+<o:Column Ref="o287"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o153"/>
@@ -7107,17 +7095,17 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o108"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o307"/>
+<o:Key Ref="o306"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o333">
+<o:ReferenceJoin Id="o332">
 <a:ObjectID>755AD0E4-11B8-4DA8-90DD-F6574B0D5428</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o288"/>
+<o:Column Ref="o287"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o164"/>
@@ -7146,17 +7134,17 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o108"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o200"/>
+<o:Key Ref="o199"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o334">
+<o:ReferenceJoin Id="o333">
 <a:ObjectID>0E1DFD26-E9BE-4BAF-98E0-9624C82195E2</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o195"/>
+<o:Column Ref="o194"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o163"/>
@@ -7188,7 +7176,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:Key Ref="o175"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o335">
+<o:ReferenceJoin Id="o334">
 <a:ObjectID>078F6BCF-C5B0-47A8-A110-CFF5B5BDF624</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -7224,20 +7212,20 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o105"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o307"/>
+<o:Key Ref="o306"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o336">
+<o:ReferenceJoin Id="o335">
 <a:ObjectID>EB6600A7-5337-4313-9638-561D38A614E3</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o288"/>
+<o:Column Ref="o287"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o196"/>
+<o:Column Ref="o195"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7266,7 +7254,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:Key Ref="o190"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o337">
+<o:ReferenceJoin Id="o336">
 <a:ObjectID>6B48DCD7-1986-4277-A221-9C04983557E8</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -7276,7 +7264,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:Column Ref="o179"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o205"/>
+<o:Column Ref="o204"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7305,7 +7293,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:Key Ref="o120"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o338">
+<o:ReferenceJoin Id="o337">
 <a:ObjectID>9F88CF94-E919-4E35-8B5C-683774DE0A5D</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -7315,7 +7303,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:Column Ref="o118"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o206"/>
+<o:Column Ref="o205"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7342,20 +7330,20 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o104"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o307"/>
+<o:Key Ref="o306"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o339">
+<o:ReferenceJoin Id="o338">
 <a:ObjectID>8CD1C7D8-FE5A-42C1-BDB4-7E91A63B1827</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o288"/>
+<o:Column Ref="o287"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o204"/>
+<o:Column Ref="o203"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7381,20 +7369,20 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o103"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o307"/>
+<o:Key Ref="o306"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o340">
+<o:ReferenceJoin Id="o339">
 <a:ObjectID>AB6028AB-159A-4958-9BB0-C3CFCF3FB0E3</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o288"/>
+<o:Column Ref="o287"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o211"/>
+<o:Column Ref="o210"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7423,7 +7411,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:Key Ref="o190"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o341">
+<o:ReferenceJoin Id="o340">
 <a:ObjectID>21DF597B-245A-4D2F-9CF3-906BA91AC12E</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -7433,7 +7421,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:Column Ref="o179"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o212"/>
+<o:Column Ref="o211"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7459,20 +7447,20 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o97"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o200"/>
+<o:Key Ref="o199"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o342">
+<o:ReferenceJoin Id="o341">
 <a:ObjectID>D740AF41-D977-4A95-900B-91FACD51CFE8</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o195"/>
+<o:Column Ref="o194"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o235"/>
+<o:Column Ref="o234"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7498,20 +7486,20 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o97"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o307"/>
+<o:Key Ref="o306"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o343">
+<o:ReferenceJoin Id="o342">
 <a:ObjectID>5375CE4B-7FCF-4DEA-AA48-BE588316A1EC</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o288"/>
+<o:Column Ref="o287"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o233"/>
+<o:Column Ref="o232"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7537,20 +7525,20 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o94"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o242"/>
+<o:Key Ref="o241"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o344">
+<o:ReferenceJoin Id="o343">
 <a:ObjectID>AD9CFD4C-42B8-4EBD-89A6-3D6A5A1D1E9D</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o239"/>
+<o:Column Ref="o238"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o251"/>
+<o:Column Ref="o250"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7576,20 +7564,20 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o94"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o247"/>
+<o:Key Ref="o246"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o345">
+<o:ReferenceJoin Id="o344">
 <a:ObjectID>1DE5AEE7-F57A-4FC2-B6FB-42BD82926470</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o245"/>
+<o:Column Ref="o244"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o250"/>
+<o:Column Ref="o249"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7615,20 +7603,20 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o93"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o247"/>
+<o:Key Ref="o246"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o346">
+<o:ReferenceJoin Id="o345">
 <a:ObjectID>2ECB0BEE-A99D-402C-9E53-BBA694950614</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o245"/>
+<o:Column Ref="o244"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o257"/>
+<o:Column Ref="o256"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7654,20 +7642,20 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o90"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o279"/>
+<o:Key Ref="o278"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o347">
+<o:ReferenceJoin Id="o346">
 <a:ObjectID>3A349B3D-2B2D-4867-ADA1-0F2A9DF29D9B</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o275"/>
+<o:Column Ref="o274"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o282"/>
+<o:Column Ref="o281"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7693,20 +7681,20 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o90"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o272"/>
+<o:Key Ref="o271"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o348">
+<o:ReferenceJoin Id="o347">
 <a:ObjectID>E3E932A1-3F8C-4310-8F1D-77CB63FDC13D</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o264"/>
+<o:Column Ref="o263"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o283"/>
+<o:Column Ref="o282"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7732,20 +7720,20 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o89"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o322"/>
+<o:Key Ref="o321"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o349">
+<o:ReferenceJoin Id="o348">
 <a:ObjectID>98B2407D-632F-49AF-8708-B13D93266371</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o314"/>
+<o:Column Ref="o313"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o285"/>
+<o:Column Ref="o284"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7771,20 +7759,20 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o89"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o279"/>
+<o:Key Ref="o278"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o350">
+<o:ReferenceJoin Id="o349">
 <a:ObjectID>D235B270-BD7A-484D-A130-675DBF0F498D</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o275"/>
+<o:Column Ref="o274"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o286"/>
+<o:Column Ref="o285"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7810,20 +7798,20 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o88"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o311"/>
+<o:Key Ref="o310"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o351">
+<o:ReferenceJoin Id="o350">
 <a:ObjectID>51A45B28-C944-42DF-A638-037021311434</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o309"/>
+<o:Column Ref="o308"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o304"/>
+<o:Column Ref="o303"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7852,7 +7840,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:Key Ref="o137"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o352">
+<o:ReferenceJoin Id="o351">
 <a:ObjectID>C6D38A59-F81C-46C2-9AFC-2A5C746ECA9B</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -7862,7 +7850,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:Column Ref="o135"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o291"/>
+<o:Column Ref="o290"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7891,7 +7879,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:Key Ref="o133"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o353">
+<o:ReferenceJoin Id="o352">
 <a:ObjectID>BE3B7B60-10E7-4EFA-8DBA-4AD9BE648C56</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -7901,7 +7889,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:Column Ref="o132"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o290"/>
+<o:Column Ref="o289"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7930,7 +7918,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:Key Ref="o133"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o354">
+<o:ReferenceJoin Id="o353">
 <a:ObjectID>359156FC-9C48-425C-8CA4-598639020732</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -7940,7 +7928,7 @@ tablespace USERS</a:PhysicalOptions>
 <o:Column Ref="o132"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o289"/>
+<o:Column Ref="o288"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
@@ -7966,27 +7954,27 @@ tablespace USERS</a:PhysicalOptions>
 <o:Table Ref="o88"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o221"/>
+<o:Key Ref="o220"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o355">
+<o:ReferenceJoin Id="o354">
 <a:ObjectID>7ACAE0DA-EF71-4E68-AF94-C8D8C5FE4E93</a:ObjectID>
 <a:CreationDate>1542263934</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1542263934</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Object1>
-<o:Column Ref="o219"/>
+<o:Column Ref="o218"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o306"/>
+<o:Column Ref="o305"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
 </o:Reference>
 </c:References>
 <c:DefaultGroups>
-<o:Group Id="o356">
+<o:Group Id="o355">
 <a:ObjectID>5AF85F90-9460-49A3-B908-BFC7D1E7EB5F</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -8000,18 +7988,18 @@ tablespace USERS</a:PhysicalOptions>
 </o:Group>
 </c:DefaultGroups>
 <c:TargetModels>
-<o:TargetModel Id="o357">
+<o:TargetModel Id="o356">
 <a:ObjectID>9250A867-C3EB-4B64-A40C-34FE4E3C9ED8</a:ObjectID>
 <a:Name>ORACLE Version 11g</a:Name>
 <a:Code>ORA11GR1</a:Code>
 <a:CreationDate>1542263555</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1542263555</a:ModificationDate>
+<a:ModificationDate>1545203978</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:TargetModelURL>file:///%_DBMS%/ora11g.xdb</a:TargetModelURL>
 <a:TargetModelID>BAE632F3-AC04-4059-9893-259ABA89351C</a:TargetModelID>
 <a:TargetModelClassID>4BA9F647-DAB1-11D1-9944-006097355D9B</a:TargetModelClassID>
-<a:TargetModelLastModificationDate>1537522101</a:TargetModelLastModificationDate>
+<a:TargetModelLastModificationDate>1355934917</a:TargetModelLastModificationDate>
 <c:SessionShortcuts>
 <o:Shortcut Ref="o3"/>
 </c:SessionShortcuts>