Skip to content

Y
YX_IDENT_REFACTORING
Commit cab10107 authored by xuwang's avatar xuwang
Browse files
Options

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

# Conflicts:
#	src/main/resources/mapper/CardBodyMapper.xml
parents 333aeff3 3a634a92
Hide whitespace changes
Inline Side-by-side
Showing with 4116 additions and 1359 deletions
src/main/java/com/yxproject/start/api/AdminApi.java
View file @ cab10107
...@@ -320,6 +320,13 @@ public class AdminApi { ...@@ -320,6 +320,13 @@ public class AdminApi {
// } // }
// return map.toString(); // return map.toString();
// } // }
/**
* 添加角色
* @param jsonStr
* @param resp
* @return
*/
@RequestMapping("roleAdd") @RequestMapping("roleAdd")
public Map<String, String> roleAdd(@RequestBody String jsonStr, HttpServletResponse resp) { public Map<String, String> roleAdd(@RequestBody String jsonStr, HttpServletResponse resp) {
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
...@@ -420,12 +427,4 @@ public class AdminApi { ...@@ -420,12 +427,4 @@ public class AdminApi {
return map; return map;
} }
} }
src/main/java/com/yxproject/start/api/UserApi.java
View file @ cab10107
...@@ -57,6 +57,8 @@ public class UserApi { ...@@ -57,6 +57,8 @@ public class UserApi {
private FailedTypeService failedTypeService; private FailedTypeService failedTypeService;
@Autowired @Autowired
private ProdCardService prodCardService; private ProdCardService prodCardService;
@Autowired
private UtilService utilService;
// @Autowired // @Autowired
// private ReadCountyListXMLService readCountyListXMLService; // private ReadCountyListXMLService readCountyListXMLService;
...@@ -103,7 +105,6 @@ public class UserApi { ...@@ -103,7 +105,6 @@ public class UserApi {
/** /**
* 查询任务单; * 查询任务单;
*
* @return * @return
*/ */
@RequestMapping(value = "/getProductionTaskListByID", method = RequestMethod.GET) @RequestMapping(value = "/getProductionTaskListByID", method = RequestMethod.GET)
...@@ -148,19 +149,18 @@ public class UserApi { ...@@ -148,19 +149,18 @@ public class UserApi {
* *
* @return * @return
*/ */
@RequestMapping(value = "/addProductionTaskList", method = RequestMethod.GET) @RequestMapping("saveTask")
@RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
@ResponseBody @ResponseBody
public String addProductionTaskList(@RequestParam("id") String id, HttpServletResponse resp) { public String addProductionTaskList(@RequestParam("typeCode") String typeCode,@RequestParam("importTime") String importTime,@RequestParam("cityCode") String cityCode, HttpServletResponse resp) {
String map = "{\"productionTaskListId\":\"20181016001\",\"makeType\":4,\"oldMakeType\":7}"; List<Map<String, Object>> groupListAtACCU = groupListService.findGroupListAtACCU(typeCode, importTime, cityCode);
JSONObject jsonObject = JSONObject.fromObject(map); TaskEntity taskEntity = new TaskEntity();
Object taskList = jsonObject.get("taskList"); taskEntity.setCard_Type(Long.valueOf(typeCode));
Object groupInfoList = jsonObject.get("groupInfoList"); taskEntity.setCitycode(cityCode);
List<GroupNoEntity> groupNoEntities = (List<GroupNoEntity>) groupInfoList; taskEntity.setTask_State_Id((long)1);
TaskEntity taskEntity = (TaskEntity) taskList;
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
int i = taskService.addProductionTaskListEntity(taskEntity, groupNoEntities); int i = taskService.addProductionTaskListEntity(taskEntity, groupListAtACCU);
yxjsonResponse.outPutSuccess(i + "添加成功"); yxjsonResponse.outPutSuccess(i + "添加成功");
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
...@@ -187,11 +187,10 @@ public class UserApi { ...@@ -187,11 +187,10 @@ public class UserApi {
* *
* @return * @return
*/ */
@RequestMapping(value = "/addQuickCyclesheetInfo", method = RequestMethod.GET) @RequestMapping(value = "/addQuickTask", method = RequestMethod.GET)
@RequiresPermissions("userInfo.add")//权限管理; @RequiresPermissions("userInfo.add")//权限管理;
@ResponseBody @ResponseBody
public String addQuickCyclesheetInfo(@RequestParam("id") String id, HttpServletResponse resp) { public String addQuickCyclesheetInfo(@RequestParam("id") String id, HttpServletResponse resp) {
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
int i = taskService.addQuickCyclesheetInfo(id); int i = taskService.addQuickCyclesheetInfo(id);
...@@ -247,13 +246,32 @@ public class UserApi { ...@@ -247,13 +246,32 @@ public class UserApi {
* @return * @return
*/ */
@RequestMapping("addFailedinfo") @RequestMapping("addFailedinfo")
public String addFailedinfo(@RequestParam("id") String id, HttpServletResponse resp) { // @RequiresPermissions("userInfo.add")//权限管理;
String map = "[{\"failedinfoid\":\"20181016002\",\"failed_Reason\":1,\"groupno\":\"41108201\",\"cyclesheetid\":\"20181016001\"}]"; public String addFailedinfo(@RequestParam("idNo") String idNo, HttpServletResponse resp) throws Exception {
JSONArray jsonArray = JSONArray.fromObject(map); JSONObject jsonObject = JSONObject.fromObject(idNo);
Map<String, List> map = jsonObject;
List<Map<String,String>> list = map.get("list");
List<FailedCardEntity> failedinfoEntityList = new ArrayList<>(); List<FailedCardEntity> failedinfoEntityList = new ArrayList<>();
for (Object object : jsonArray) { for (Map<String,String> acceptMap : list) {
FailedCardEntity o = (FailedCardEntity) JSONObject.toBean((JSONObject) object, FailedCardEntity.class); FailedCardEntity failedCardEntity = new FailedCardEntity();
failedinfoEntityList.add(o); String acceptNo = acceptMap.get("acceptNo");
failedCardEntity.setAccept_No(acceptNo);
failedCardEntity.setFailed_Card_Reason_Id(Long.valueOf(acceptMap.get("reson")));
List<FailedCardEntity> failedCardEntities = failedCardService.selectAcceptNoAtFailedCard(acceptNo);
List<SpecialCardEntity> specialCardEntities = failedCardService.selectAcceptNoAtSpecialCard(acceptNo);
List<GroupNoEntity> groupNoEntities = failedCardService.selectAcceptNoAtGroupNo(acceptNo.substring(0, 8));
if (failedCardEntities.size()!=0){
failedCardEntity.setTask_Id(failedCardEntities.get(0).getTask_Id());
}else if (specialCardEntities.size()!=0){
failedCardEntity.setTask_Id(specialCardEntities.get(0).getTask_Id());
}else if (groupNoEntities.size()!=0){
failedCardEntity.setTask_Id(groupNoEntities.get(0).getTask_Id());
}else {
throw new Exception("证件信息有误");
}
failedinfoEntityList.add(failedCardEntity);
} }
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
...@@ -268,15 +286,17 @@ public class UserApi { ...@@ -268,15 +286,17 @@ public class UserApi {
* @return * @return
*/ */
@RequestMapping("updateFailedinfo") @RequestMapping("updateFailedinfo")
@RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String updateFailedinfo(@RequestParam("id") String id, HttpServletResponse resp) { public String updateFailedinfo(@RequestParam("failedCardId") String id,@RequestParam("state") String state, HttpServletResponse resp) {
String map = "[{\"failedinfoid\":\"201810302\",\"failed_Reason\":1,\"groupno\":\"411081\",\"cyclesheetid\":\"20181016001\"}]"; FailedCardEntity failedCardEntity = new FailedCardEntity();
JSONArray jsonArray = JSONArray.fromObject(map); failedCardEntity.setFailed_Card_Id(Long.valueOf(id));
failedCardEntity.setState(Long.valueOf(state));
List<FailedCardEntity> failedinfoEntityList = new ArrayList<>(); List<FailedCardEntity> failedinfoEntityList = new ArrayList<>();
for (Object object : jsonArray) { // for (Object object : jsonArray) {
FailedCardEntity o = (FailedCardEntity) JSONObject.toBean((JSONObject) object, FailedCardEntity.class); //// FailedCardEntity o = (FailedCardEntity) JSONObject.toBean((JSONObject) object, FailedCardEntity.class);
failedinfoEntityList.add(o); // failedinfoEntityList.add(o);
} // }
failedinfoEntityList.add(failedCardEntity);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
int i = failedCardService.updateFailedinfo(failedinfoEntityList); int i = failedCardService.updateFailedinfo(failedinfoEntityList);
...@@ -289,13 +309,15 @@ public class UserApi { ...@@ -289,13 +309,15 @@ public class UserApi {
* *
* @return * @return
*/ */
@RequestMapping("findFailedinfo") @RequestMapping("findFailedList")
@RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String findFailedinfo(@RequestParam("id") String id, HttpServletResponse resp) { public String findFailedList(@RequestParam("state") String state, HttpServletResponse resp) {
List<FailedCardEntity> failedList = failedCardService.findFailedList(state);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
List<Map<String, Object>> maps = failedCardService.selectFailedinfo(valueOf(id)); yxjsonResponse.outPutSuccess(failedList);
yxjsonResponse.outPutSuccess(maps + "------添加成功---" + maps.size()); Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
...@@ -378,6 +400,20 @@ public class UserApi { ...@@ -378,6 +400,20 @@ public class UserApi {
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
/**
* 通过任务单查询组列表;
*
* @return
*/
@RequestMapping("getGroupListAtACCU")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getGroupListAtACCU(@RequestParam("typeCode") String typeCode,@RequestParam("importTime") String importTime,@RequestParam("cityCode") String cityCode, HttpServletResponse resp) {
List<Map<String, Object>> groupListAtACCU = groupListService.findGroupListAtACCU(typeCode, importTime, cityCode);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(groupListAtACCU);
return yxjsonResponse.toJSONString();
}
/** /**
* 查询TypeList通过状态; * 查询TypeList通过状态;
...@@ -391,8 +427,6 @@ public class UserApi { ...@@ -391,8 +427,6 @@ public class UserApi {
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(typeListEntity); yxjsonResponse.outPutSuccess(typeListEntity);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
...@@ -408,8 +442,37 @@ public class UserApi { ...@@ -408,8 +442,37 @@ public class UserApi {
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(cityListEntity); yxjsonResponse.outPutSuccess(cityListEntity);
Map map = new HashMap(); return yxjsonResponse.toJSONString();
// map.put("MakeType",productionTaskListEntity); }
/**
* 查询TypeList通过状态;
*
* @return
*/
@RequestMapping("getTypeListByImportDateAtACCU")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getTypeListByImportDateAtACCU(@RequestParam("importTime") String importTime, HttpServletResponse resp) {
List<TypeListEntity> typeListEntity = typeListService.findTypeListByImportDateAtACCU(importTime);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(typeListEntity);
return yxjsonResponse.toJSONString();
}
/**
* 查询CityList通过状态;
*
* @return
*/
@RequestMapping("getCityListByImportDateAtACCU")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getCityListByImportDateAtACCU(@RequestParam("importTime") String importTime,@RequestParam("cardType") String cardType, HttpServletResponse resp) {
List <CityListEntity> cityListEntity = cityListService.findCityListByImportDateAtACCU(importTime,cardType);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(cityListEntity);
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
...@@ -489,8 +552,8 @@ public class UserApi { ...@@ -489,8 +552,8 @@ public class UserApi {
*/ */
@RequestMapping("getCardBody") @RequestMapping("getCardBody")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String insertCardBody(@RequestParam("cardBodyId") String cardbodyid, HttpServletResponse resp) { public String getCardBody(@RequestParam("cardBodyId") String cardBodyId, HttpServletResponse resp) {
List<CardBodyEntity> cardBodyEntity = cardBodyService.insertCardBody(cardbodyid); List<CardBodyEntity> cardBodyEntity = cardBodyService.findCardBody(cardBodyId);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(cardBodyEntity); yxjsonResponse.outPutSuccess(cardBodyEntity);
...@@ -498,6 +561,22 @@ public class UserApi { ...@@ -498,6 +561,22 @@ public class UserApi {
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
/**
* 添加卡基表;
*
* @return
*/
@RequestMapping("addCardBody")
// @RequiresPermissions("userInfo.add")//权限管理;
public String addCardBody(@RequestParam("cardTypeId") String cardTypeId,@RequestParam("isActive") String isActive,@RequestParam("taskId") String taskId,@RequestParam("totalCount") String totalCount, HttpServletResponse resp) {
int i = cardBodyService.insertCardBody(cardTypeId,isActive,taskId,totalCount);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(i + "添加成功");
Map map = new HashMap();
return yxjsonResponse.toJSONString();
}
/** /**
* 查询简易证件信息; * 查询简易证件信息;
* *
...@@ -509,10 +588,10 @@ public class UserApi { ...@@ -509,10 +588,10 @@ public class UserApi {
JSONObject jsonObject = JSONObject.fromObject(idNo); JSONObject jsonObject = JSONObject.fromObject(idNo);
Map<String, List> jsonArray1 = (Map<String, List>)jsonObject; Map<String, List> jsonArray1 = (Map<String, List>)jsonObject;
List list = jsonArray1.get("list"); List list = jsonArray1.get("list");
List<ProdCardEntity> taskEntity = prodCardService.getProdCard(list); List<ProdCardEntity> prodCardEntity = prodCardService.getProdCard(list);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(taskEntity); yxjsonResponse.outPutSuccess(prodCardEntity);
Map map = new HashMap(); Map map = new HashMap();
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
...@@ -553,7 +632,7 @@ public class UserApi { ...@@ -553,7 +632,7 @@ public class UserApi {
* *
* @return * @return
*/ */
@RequestMapping("reviseStorageCount") @RequestMapping("updateStorageCount")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String reviseStorageCount(@RequestParam("taskId") String taskId,@RequestParam("countyCode") String countyCode,@RequestParam("inStorageCount") String inStorageCount, @RequestParam("outStorageCount") String outStorageCount, HttpServletResponse resp) { public String reviseStorageCount(@RequestParam("taskId") String taskId,@RequestParam("countyCode") String countyCode,@RequestParam("inStorageCount") String inStorageCount, @RequestParam("outStorageCount") String outStorageCount, HttpServletResponse resp) {
int i=countyListService.reviseStorageCount(taskId,countyCode, inStorageCount, outStorageCount); int i=countyListService.reviseStorageCount(taskId,countyCode, inStorageCount, outStorageCount);
...@@ -660,6 +739,7 @@ public class UserApi { ...@@ -660,6 +739,7 @@ public class UserApi {
font3.setFontHeightInPoints((short) 24); font3.setFontHeightInPoints((short) 24);
style3.setFont(font3); style3.setFont(font3);
HSSFCellStyle style4=wb.createCellStyle(); //表头样式 HSSFCellStyle style4=wb.createCellStyle(); //表头样式
style4.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER); //设置垂直居中 style4.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER); //设置垂直居中
style4.setAlignment(HSSFCellStyle.ALIGN_CENTER); style4.setAlignment(HSSFCellStyle.ALIGN_CENTER);
...@@ -1732,4 +1812,31 @@ public class UserApi { ...@@ -1732,4 +1812,31 @@ public class UserApi {
} }
/**
* 查询级联菜单列表
*/
@RequestMapping("getAllPoliceStation")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getAll( HttpServletResponse resp) {
resp.setCharacterEncoding("UTF-8");
YXJSONResponse yxresp = new YXJSONResponse();
List all = utilService.findAllPoliceStation();
yxresp.outPutSuccess(all);
return yxresp.toJSONString();
}
/**
* 查询级联菜单列表
*/
@RequestMapping("getTypeListData")
// @RequiresPermissions("userInfo.add")//权限管理;
public String getTypeListData( HttpServletResponse resp) {
resp.setCharacterEncoding("UTF-8");
YXJSONResponse yxresp = new YXJSONResponse();
List all = utilService.findTypeListData();
yxresp.outPutSuccess(all);
return yxresp.toJSONString();
}
} }
src/main/java/com/yxproject/start/api/YingxinApi.java
View file @ cab10107
...@@ -56,7 +56,7 @@ public class YingxinApi { ...@@ -56,7 +56,7 @@ public class YingxinApi {
* *
* *
*/ */
@RequestMapping("getCbCountInfo") @RequestMapping("getCardBodyCount")
public String getCbCountInfo(@RequestParam("startTime")String startTime ,@RequestParam("endTime")String endTime,HttpServletResponse resp) { public String getCbCountInfo(@RequestParam("startTime")String startTime ,@RequestParam("endTime")String endTime,HttpServletResponse resp) {
List<Map<String, Object>> list=cardBodyService.getCbCount(startTime, endTime); List<Map<String, Object>> list=cardBodyService.getCbCount(startTime, endTime);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
......
src/main/java/com/yxproject/start/api/selectApi.java 0 → 100644
View file @ cab10107
package com.yxproject.start.api;
import com.yxproject.start.entity.SpecialCardInfoEntity;
import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
import com.yxproject.start.entity.resp.SelectByIdcardEntity;
import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
import com.yxproject.start.service.SelectSerialNumberService;
import com.yxproject.start.utils.YXJSONResponse;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;
/**
*搜索框查询
*/
@RestController
@RequestMapping("specialCardInfo")
public class selectApi {
/**
* 根据 组号、受理号、身份证号、任务单号查询
*/
@Autowired
private SelectSerialNumberService selectSerialNumberService;
@RequestMapping(value = "selectByCard")
public String selectByCard(@RequestParam("id") String id, HttpServletResponse resp){
resp.setCharacterEncoding("UTF-8");
Map<String, Object> map = new HashMap<>();
switch (id.length()){
case 8:
System.out.println("id"+id);
SelectByGroupNumEntity specialCardInfo= selectSerialNumberService.selectByGroupNumber(id);
map.put("searchResult",specialCardInfo);
break;
case 10:
SelectByAcceptedEntity specialCardInfo2 = selectSerialNumberService.selectByAccepted(id);
map.put("searchResult",specialCardInfo2);
break;
case 18:
SelectByIdcardEntity specialCardInfo3 = selectSerialNumberService.selectByIdCard(id);
map.put("searchResult",specialCardInfo3);
break;
case 11:
SelectByWorkOrderEntity specialCardInfo4 = selectSerialNumberService.selectByWorkOrderNumber(id);
map.put("searchResult",specialCardInfo4);
break;
}
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(map);
System.out.println("222222222"+ yxjsonResponse.toJSONString());
return yxjsonResponse.toJSONString();
}
}
src/main/java/com/yxproject/start/config/ShiroConfig.java
View file @ cab10107
package com.yxproject.start.config; package com.yxproject.start.config;
import com.alibaba.druid.pool.DruidDataSourceFactory;
import com.yxproject.start.utils.DatabaseType;
import com.yxproject.start.utils.DynamicDataSource;
import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
import org.apache.shiro.mgt.SecurityManager;
import org.apache.shiro.realm.Realm;
import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
import org.apache.shiro.spring.web.config.DefaultShiroFilterChainDefinition; import org.apache.shiro.spring.web.config.DefaultShiroFilterChainDefinition;
import org.apache.shiro.spring.web.config.ShiroFilterChainDefinition; import org.apache.shiro.spring.web.config.ShiroFilterChainDefinition;
import org.apache.shiro.web.mgt.DefaultWebSecurityManager; import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
import org.mybatis.spring.SqlSessionFactoryBean;
import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator; import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.core.env.Environment;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
import javax.sql.DataSource;
import java.util.*;
/** /**
* @author Administrator * @author Administrator
......
src/main/java/com/yxproject/start/entity/FailedCardEntity.java
View file @ cab10107
...@@ -29,9 +29,8 @@ public class FailedCardEntity { ...@@ -29,9 +29,8 @@ public class FailedCardEntity {
public void setFailed_Card_Id(long failed_Card_Id) { public void setFailed_Card_Id(long failed_Card_Id) {
this.failed_Card_Id = failed_Card_Id; this.failed_Card_Id = failed_Card_Id;
} }
@Basic @Basic
@Column(name = "FAILED_CARD_REASON_ID", nullable = true, precision = 0) @Column(name = "FAILED_CARD_REASON_ID", nullable = true)
public long getFailed_Card_Reason_Id() { public long getFailed_Card_Reason_Id() {
return failed_Card_Reason_Id; return failed_Card_Reason_Id;
} }
...@@ -39,7 +38,6 @@ public class FailedCardEntity { ...@@ -39,7 +38,6 @@ public class FailedCardEntity {
public void setFailed_Card_Reason_Id(long failed_Card_Reason_Id) { public void setFailed_Card_Reason_Id(long failed_Card_Reason_Id) {
this.failed_Card_Reason_Id = failed_Card_Reason_Id; this.failed_Card_Reason_Id = failed_Card_Reason_Id;
} }
@Basic @Basic
@Column(name = "ACCEPT_NO", nullable = true, length = 20) @Column(name = "ACCEPT_NO", nullable = true, length = 20)
public String getAccept_No() { public String getAccept_No() {
...@@ -69,7 +67,7 @@ public class FailedCardEntity { ...@@ -69,7 +67,7 @@ public class FailedCardEntity {
this.position_Date = position_Date; this.position_Date = position_Date;
} }
@Basic @Basic
@Column(name = "FINISH_DATE", nullable = true, length = 20) @Column(name = "FINSH_DATE", nullable = true, length = 20)
public Date getFinish_Date() { public Date getFinish_Date() {
return finish_Date; return finish_Date;
} }
...@@ -83,9 +81,6 @@ public class FailedCardEntity { ...@@ -83,9 +81,6 @@ public class FailedCardEntity {
return allot_Date; return allot_Date;
} }
public void setAllot_Date(Date allot_Date) { public void setAllot_Date(Date allot_Date) {
this.allot_Date = allot_Date; this.allot_Date = allot_Date;
} }
...@@ -94,13 +89,11 @@ public class FailedCardEntity { ...@@ -94,13 +89,11 @@ public class FailedCardEntity {
public Date getPrint_Date() { public Date getPrint_Date() {
return print_Date; return print_Date;
} }
public void setPrint_Date(Date print_Date) { public void setPrint_Date(Date print_Date) {
this.print_Date = print_Date; this.print_Date = print_Date;
} }
@Basic @Basic
@Column(name = "STATE", nullable = false, precision = 0) @Column(name = "STATE", nullable = false, precision = 0)
public long getState() { public long getState() {
......
src/main/java/com/yxproject/start/entity/GroupNoEntity.java
View file @ cab10107
...@@ -8,7 +8,7 @@ import java.util.Objects; ...@@ -8,7 +8,7 @@ import java.util.Objects;
*/ */
@Entity @Entity
@Table(name = "GROUP_NO", schema = "DAHAI") @Table(name = "GROUP_NO", schema = "DAHAI")
public class GroupNoEntity { public class GroupNoEntity{
private long task_Id; private long task_Id;
private String group_No; private String group_No;
private long valid_Count; private long valid_Count;
...@@ -21,7 +21,7 @@ public class GroupNoEntity { ...@@ -21,7 +21,7 @@ public class GroupNoEntity {
return task_Id; return task_Id;
} }
public void setTask_Id(long task_Id) { public void setTask_Id(Long task_Id) {
this.task_Id = task_Id; this.task_Id = task_Id;
} }
@Id @Id
......
src/main/java/com/yxproject/start/entity/ProdCardEntity.java
View file @ cab10107
...@@ -45,7 +45,7 @@ public class ProdCardEntity { ...@@ -45,7 +45,7 @@ public class ProdCardEntity {
} }
@Basic @Basic
@Column(name = "specialType", nullable = false, precision = 0) @Column(name = "specialType")
public long getSpecialType() { public long getSpecialType() {
return specialType; return specialType;
} }
......
src/main/java/com/yxproject/start/entity/SpecialCardEntity.java
View file @ cab10107
...@@ -45,7 +45,7 @@ public class SpecialCardEntity { ...@@ -45,7 +45,7 @@ public class SpecialCardEntity {
this.task_Id = task_Id; this.task_Id = task_Id;
} }
@Basic @Basic
@Column(name = "SPECIAL_TYPE", nullable = false, precision = 0) @Column(name = "SPECIAL_TYPE", nullable = true)
public long getSpecial_Type() { public long getSpecial_Type() {
return special_Type; return special_Type;
} }
......
src/main/java/com/yxproject/start/entity/SpecialCardInfoEntity.java 0 → 100644
View file @ cab10107
package com.yxproject.start.entity;
import javax.xml.crypto.Data;
public class SpecialCardInfoEntity {
private TaskEntity taskEntity;
private GroupNoEntity groupNoEntity;
private AccCardTEntity accCardTEntity;
private String taskState;
private String cityName;
private String library;
private String painterName;
private String cardType;
private Data lastModifyTime;
public Data getLastModifyTime() {
return lastModifyTime;
}
public void setLastModifyTime(Data lastModifyTime) {
this.lastModifyTime = lastModifyTime;
}
public AccCardTEntity getAccCardTEntity() {
return accCardTEntity;
}
public void setAccCardTEntity(AccCardTEntity accCardTEntity) {
this.accCardTEntity = accCardTEntity;
}
public String getCardType() {
return cardType;
}
public void setCardType(String cardType) {
this.cardType = cardType;
}
public String getPainterName() {
return painterName;
}
public void setPainterName(String painterName) {
this.painterName = painterName;
}
public TaskEntity getTaskEntity() {
return taskEntity;
}
public void setTaskEntity(TaskEntity taskEntity) {
this.taskEntity = taskEntity;
}
public GroupNoEntity getGroupNoEntity() {
return groupNoEntity;
}
public void setGroupNoEntity(GroupNoEntity groupNoEntity) {
this.groupNoEntity = groupNoEntity;
}
public String getTaskState() {
return taskState;
}
public void setTaskState(String taskState) {
this.taskState = taskState;
}
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
public String getLibrary() {
return library;
}
public void setLibrary(String library) {
this.library = library;
}
}
src/main/java/com/yxproject/start/entity/TaskEntity.java
View file @ cab10107
package com.yxproject.start.entity; package com.yxproject.start.entity;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Time;
import java.util.Date; import java.util.Date;
import java.util.Objects; import java.util.Objects;
...@@ -205,7 +204,7 @@ public class TaskEntity { ...@@ -205,7 +204,7 @@ public class TaskEntity {
this.is_Exception = is_Exception; this.is_Exception = is_Exception;
} }
@Basic @Basic
@Column(name = "PRINTER_ID", nullable = true, precision = 0) @Column(name = "PRINTER_ID", nullable = false)
public long getPrinter_Id() { public long getPrinter_Id() {
return printer_Id; return printer_Id;
} }
......
src/main/java/com/yxproject/start/entity/resp/SelectByAcceptedEntity.java 0 → 100644
View file @ cab10107
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 0 → 100644
View file @ cab10107
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 0 → 100644
View file @ cab10107
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 0 → 100644
View file @ cab10107
package com.yxproject.start.entity.resp;
import java.util.Date;
public class SelectByWorkOrderEntity {
private String library;
private String cityName;
private String cardType;
private String painterName;
private long task_Id;
private Date submit_Date;
private Date position_Date;
private String quality_People_Name;
private Date out_Storage_Date;
private Date in_Storage_Date;
private String exception_Information;
public String getLibrary() {
return library;
}
public void setLibrary(String library) {
this.library = library;
}
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
public String getCardType() {
return cardType;
}
public void setCardType(String cardType) {
this.cardType = cardType;
}
public String getPainterName() {
return painterName;
}
public void setPainterName(String painterName) {
this.painterName = painterName;
}
public long getTask_Id() {
return task_Id;
}
public void setTask_Id(long task_Id) {
this.task_Id = task_Id;
}
public Date getSubmit_Date() {
return submit_Date;
}
public void setSubmit_Date(Date submit_Date) {
this.submit_Date = submit_Date;
}
public Date getPosition_Date() {
return position_Date;
}
public void setPosition_Date(Date position_Date) {
this.position_Date = position_Date;
}
public String getQuality_People_Name() {
return quality_People_Name;
}
public void setQuality_People_Name(String quality_People_Name) {
this.quality_People_Name = quality_People_Name;
}
public Date getOut_Storage_Date() {
return out_Storage_Date;
}
public void setOut_Storage_Date(Date out_Storage_Date) {
this.out_Storage_Date = out_Storage_Date;
}
public Date getIn_Storage_Date() {
return in_Storage_Date;
}
public void setIn_Storage_Date(Date in_Storage_Date) {
this.in_Storage_Date = in_Storage_Date;
}
public String getException_Information() {
return exception_Information;
}
public void setException_Information(String exception_Information) {
this.exception_Information = exception_Information;
}
}
src/main/java/com/yxproject/start/mapper/CardBodyMapper.java
View file @ cab10107
...@@ -13,8 +13,9 @@ import java.util.Map; ...@@ -13,8 +13,9 @@ import java.util.Map;
@Mapper @Mapper
public interface CardBodyMapper { public interface CardBodyMapper {
public List <CardBodyEntity> insertCardBody(String cardBodyId); public List <CardBodyEntity> findCardBody(String cardBodyId);
public int insertCardBody(@Param("cardTypeId") String cardTypeId, @Param("isActive") String isActive, @Param("taskId") String taskId, @Param("totalCount") String totalCount);
// public int updateCardBody(CardBodyEntity map); // public int updateCardBody(CardBodyEntity map);
public List<Map<String,Object>> findCbCountByDealdateViewData(@Param("startTime")String startTime,@Param("endTime")String endTime ); public List<Map<String,Object>> findCbCountByDealdateViewData(@Param("startTime") String startTime, @Param("endTime") String endTime);
public List<Map<String,Object>> findCbCountByDealdate(); public List<Map<String,Object>> findCbCountByDealdate();
} }
\ No newline at end of file
src/main/java/com/yxproject/start/mapper/CountyListMapper.java
View file @ cab10107
...@@ -17,12 +17,12 @@ import java.util.Map; ...@@ -17,12 +17,12 @@ import java.util.Map;
@Mapper @Mapper
public interface CountyListMapper { public interface CountyListMapper {
public List<CountyEntity> findCountyList(String taskId); public List<CountyEntity> findCountyList(String taskId);
public int reviseStorageCount( @Param("taskId") String taskId, @Param("countyCode") String countyCode,@Param("inStorageCount") String inStorageCount,@Param("outStorageCount") String out_Storage_Count); public int reviseStorageCount(@Param("taskId") String taskId, @Param("countyCode") String countyCode, @Param("inStorageCount") String inStorageCount, @Param("outStorageCount") String out_Storage_Count);
public List<ReceiptListEntity> getReceiptList( @Param("startDate")String startDate , @Param("endDate") String endDate); public List<ReceiptListEntity> getReceiptList(@Param("startDate") String startDate, @Param("endDate") String endDate);
public List<CountyListEntity> findStorageCountByTaskId(String taskId); public List<CountyListEntity> findStorageCountByTaskId(String taskId);
public int totalFinshCount (); public int totalFinshCount();
public int totalInStorageCount (); public int totalInStorageCount();
public int totalOutStorageCount (); public int totalOutStorageCount();
// public List<Map<String, Object>> PrintCountyListXML(); // public List<Map<String, Object>> PrintCountyListXML();
} }
src/main/java/com/yxproject/start/mapper/FailedCardMapper.java
View file @ cab10107
package com.yxproject.start.mapper; package com.yxproject.start.mapper;
import com.yxproject.start.entity.FailedCardEntity; import com.yxproject.start.entity.FailedCardEntity;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
...@@ -32,8 +34,30 @@ public interface FailedCardMapper { ...@@ -32,8 +34,30 @@ public interface FailedCardMapper {
* @return * @return
*/ */
// @SelectProvider(type=com.yxproject.start.SqlProvider.SqlProvider.class,method="selectFailedinfoBycolumnName") // @SelectProvider(type=com.yxproject.start.SqlProvider.SqlProvider.class,method="selectFailedinfoBycolumnName")
public List<Map<String,Object>> selectFailedCardEntityByState(int state); public List<FailedCardEntity> findFailedList(String state);
/**
* 查询废证的任务单
* 在废证表中
* @param accept_No 废证受理号
* @return
*/
public List<FailedCardEntity> selectAcceptNoAtFailedCard(String accept_No);
/**
* 查询废证的任务单
* 在特证表中
* @param accept_No 废证受理号
* @return
*/
public List<SpecialCardEntity> selectAcceptNoAtSpecialCard(String accept_No);
/**
* 查询废证的任务单
* 在组号表中
* @param groupNo 废证受理组号
* @return
*/
public List<GroupNoEntity> selectAcceptNoAtGroupNo(String groupNo);
......
src/main/java/com/yxproject/start/mapper/FindCardMapper.java
View file @ cab10107
...@@ -11,5 +11,5 @@ import java.util.Map; ...@@ -11,5 +11,5 @@ import java.util.Map;
*/ */
@Mapper @Mapper
public interface FindCardMapper { public interface FindCardMapper {
public List<Map<String,Object>>findCardByGroupNo(@Param("find_No")String find_No); public List<Map<String,Object>>findCardByGroupNo(@Param("find_No") String find_No);
} }
src/main/java/com/yxproject/start/mapper/FindFinancialReportByViewMapper.java
View file @ cab10107
...@@ -11,6 +11,6 @@ import java.util.Map; ...@@ -11,6 +11,6 @@ import java.util.Map;
*/ */
@Mapper @Mapper
public interface FindFinancialReportByViewMapper { public interface FindFinancialReportByViewMapper {
public List<Map<String,Object>>findFinancialReportByView(@Param("startTime") String startTime,@Param("endTime")String endTime,@Param("cardType")String cardType,@Param("cityCode")String cityCode); public List<Map<String,Object>>findFinancialReportByView(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("cardType") String cardType, @Param("cityCode") String cityCode);
} }
src/main/java/com/yxproject/start/mapper/FindTaskByDealdateViewMapper.java
View file @ cab10107
...@@ -15,5 +15,5 @@ import java.util.Map; ...@@ -15,5 +15,5 @@ import java.util.Map;
@Mapper @Mapper
public interface FindTaskByDealdateViewMapper { public interface FindTaskByDealdateViewMapper {
public List<Map<String,Object>> findTaskByDealdateViewData(@Param("startTime") String startTime,@Param("endTime") String endTime); public List<Map<String,Object>> findTaskByDealdateViewData(@Param("startTime") String startTime, @Param("endTime") String endTime);
} }
src/main/java/com/yxproject/start/mapper/GroupNoMapper.java
View file @ cab10107
...@@ -4,6 +4,7 @@ import com.yxproject.start.entity.GroupListEntity; ...@@ -4,6 +4,7 @@ import com.yxproject.start.entity.GroupListEntity;
import com.yxproject.start.entity.GroupNoEntity; import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardEntity; import com.yxproject.start.entity.SpecialCardEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -20,7 +21,8 @@ public interface GroupNoMapper { ...@@ -20,7 +21,8 @@ public interface GroupNoMapper {
public int findGroupNoCountByTaskId(String task_Id); public int findGroupNoCountByTaskId(String task_Id);
public List<Map<String,Object>> findSpecialCountyList(String task_Id); public List<Map<String,Object>> findSpecialCountyList(String task_Id);
public List<Map<String,Object>> findNormalCountyList(String task_Id); public List<Map<String,Object>> findNormalCountyList(String task_Id);
public List<GroupListEntity> findGroupListByTaskId( String taskId); public List<GroupListEntity> findGroupListByTaskId(String taskId);
public List<GroupListEntity> findGroupNoListAtACCU(@Param("importTime")String importTime,@Param("typeCode")String cardType,@Param("cityCode")String cityCode);
public List<Map<String,Object>> findGroupListAtACCU(@Param("typeCode")String typeCode,@Param("importTime")String importTime,@Param("cityCode")String cityCode);
} }
src/main/java/com/yxproject/start/mapper/PoliceStationApplyReasonMapper.java
View file @ cab10107
...@@ -16,7 +16,7 @@ public interface PoliceStationApplyReasonMapper { ...@@ -16,7 +16,7 @@ public interface PoliceStationApplyReasonMapper {
public int updatePoliceStationApplyReasonEntity(PoliceStationApplyReasonEntity policeStationApplyReasonEntity); public int updatePoliceStationApplyReasonEntity(PoliceStationApplyReasonEntity policeStationApplyReasonEntity);
public List<Map<String,Object>> findNormalApplyReasonByCyclesheetID(String cyclesheetid); public List<Map<String,Object>> findNormalApplyReasonByCyclesheetID(String cyclesheetid);
public List<Map<String,Object>> findSpecialApplyReasonByCyclesheetID(String cyclesheetid); public List<Map<String,Object>> findSpecialApplyReasonByCyclesheetID(String cyclesheetid);
public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate( @Param("startDate") String startDate,@Param("endDate") String endDate); public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate(@Param("startDate") String startDate, @Param("endDate") String endDate);
public List<Map<String,Object>> findPoliceStationApplyReasonByCardType(String cardType); public List<Map<String,Object>> findPoliceStationApplyReasonByCardType(String cardType);
public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String city); public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String city);
public List<Map<String,Object>> findPoliceStationApplyReasonByCounty(String county); public List<Map<String,Object>> findPoliceStationApplyReasonByCounty(String county);
......
src/main/java/com/yxproject/start/mapper/SelectSerialNumberMapper.java 0 → 100644
View file @ cab10107
package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper;
import java.util.Map;
@Mapper
public interface SelectSerialNumberMapper {
public Map<String,Object> selectByGroupNumber(String id);
public Map<String,Object> selectByAccepted(String id);
public Map<String,Object> selectByIdCard(String id);
public Map<String,Object> selectByWorkOrderNumber(String id);
}
src/main/java/com/yxproject/start/mapper/SpecialCardMapper.java
View file @ cab10107
...@@ -18,9 +18,9 @@ public interface SpecialCardMapper { ...@@ -18,9 +18,9 @@ public interface SpecialCardMapper {
public void saveSpecialCardEntity(SpecialCardEntity specialCardEntity); public void saveSpecialCardEntity(SpecialCardEntity specialCardEntity);
public void updateSpecialCardEntity(SpecialCardEntity specialCardEntity); public void updateSpecialCardEntity(SpecialCardEntity specialCardEntity);
public List<SpecialCardEntity> findSpecialCardEntityByGroupNo(String groupNo); public List<SpecialCardEntity> findSpecialCardEntityByGroupNo(String groupNo);
public List <SpecialCardEntity> findSpecialCardList( String groupNo); public List <SpecialCardEntity> findSpecialCardList(String groupNo);
public List <SpecialCardEntity> addTuiZheng(String acceptNumber); public List <SpecialCardEntity> addTuiZheng(String acceptNumber);
public List<SpecialCardEntity> addRemainingCard(String accept_Number); public List<SpecialCardEntity> addRemainingCard(String acceptNo);
public List<ProdCardEntity> getProdCard ( String idNo); public List<ProdCardEntity> getProdCard(String idNo);
public List<FailedTypeEntity> getFailedType(); public List<FailedTypeEntity> getFailedType();
} }
src/main/java/com/yxproject/start/mapper/SysPermissionMapper.java
View file @ cab10107
...@@ -70,7 +70,7 @@ public interface SysPermissionMapper{ ...@@ -70,7 +70,7 @@ public interface SysPermissionMapper{
* @return * @return
*/ */
@Select("select name from SYS_PERMISSION WHERE ID=#{parentId}") @Select("select name from SYS_PERMISSION WHERE ID=#{parentId}")
public String selectParentNameById(@Param("parentId")Long parentId); public String selectParentNameById(@Param("parentId") Long parentId);
/** /**
* 修改权限信息 * 修改权限信息
......
src/main/java/com/yxproject/start/mapper/SysRoleMapper.java
View file @ cab10107
...@@ -26,7 +26,7 @@ public interface SysRoleMapper { ...@@ -26,7 +26,7 @@ public interface SysRoleMapper {
* @param permissionId * @param permissionId
*/ */
@Insert("INSERT INTO SYS_ROLE_PERMISSION(ROLE_ID,PERMISSION_ID)VALUES(#{roleId},#{permissionId})") @Insert("INSERT INTO SYS_ROLE_PERMISSION(ROLE_ID,PERMISSION_ID)VALUES(#{roleId},#{permissionId})")
public void addRolePermission(@Param("roleId")Integer roleId,@Param("permissionId") Integer permissionId); public void addRolePermission(@Param("roleId") Integer roleId, @Param("permissionId") Integer permissionId);
/** /**
* 查询所有角色 * 查询所有角色
...@@ -77,7 +77,7 @@ public interface SysRoleMapper { ...@@ -77,7 +77,7 @@ public interface SysRoleMapper {
* @param roleId * @param roleId
*/ */
@Update("update SYS_USER_ROLE SET ROLE_ID=#{roleId} where USER_ID=#{userId}") @Update("update SYS_USER_ROLE SET ROLE_ID=#{roleId} where USER_ID=#{userId}")
public void updateUserRole(@Param("userId") Integer userId,@Param("roleId")Integer roleId); public void updateUserRole(@Param("userId") Integer userId, @Param("roleId") Integer roleId);
/** /**
* 删除角色 * 删除角色
...@@ -120,5 +120,5 @@ public interface SysRoleMapper { ...@@ -120,5 +120,5 @@ public interface SysRoleMapper {
* @param oldPermissionId * @param oldPermissionId
*/ */
@Delete("delete from SYS_ROLE_PERMISSION WHERE ROLE_ID=#{roleId} AND PERMISSION_ID=#{oldPermissionId}") @Delete("delete from SYS_ROLE_PERMISSION WHERE ROLE_ID=#{roleId} AND PERMISSION_ID=#{oldPermissionId}")
public void delRolePermission(@Param("roleId") Integer roleId,@Param("oldPermissionId") Integer oldPermissionId); public void delRolePermission(@Param("roleId") Integer roleId, @Param("oldPermissionId") Integer oldPermissionId);
} }
src/main/java/com/yxproject/start/mapper/TaskMapper.java
View file @ cab10107
...@@ -13,15 +13,18 @@ import java.util.Map; ...@@ -13,15 +13,18 @@ import java.util.Map;
@Mapper @Mapper
public interface TaskMapper { public interface TaskMapper {
public List<TaskEntity> findTaskEntity(long id); public List<TaskEntity> findTaskEntity(long id);
public int insertTaskEntity(TaskEntity taskEntity); public long insertTaskEntity(TaskEntity taskEntity);
public int updateTaskEntity(TaskEntity taskEntity); public int updateTaskEntity(TaskEntity taskEntity);
public List<TaskEntity> findTaskEntityByAcceptNo(String acceptNo); public List<TaskEntity> findTaskEntityByAcceptNo(String acceptNo);
public List<TaskEntity> findTaskEntityByState(int state); public List<TaskEntity> findTaskEntityByState(int state);
public int updateTaskIsException(@Param("taskId") String taskId,@Param("exceptionInformation") String exceptionInformation,@Param("isException")String isException); public int updateTaskIsException(@Param("taskId") String taskId, @Param("exceptionInformation") String exceptionInformation, @Param("isException") String isException);
public int replaceExceptionInformation(@Param("taskId")String taskId,@Param("isException")String isException); public int replaceExceptionInformation(@Param("taskId") String taskId, @Param("isException") String isException);
public List<TypeListEntity> findTypeListByTaskStateId(String taskStateId); public List<TypeListEntity> findTypeListByTaskStateId(String taskStateId);
public List <CityListEntity> findCityList(@Param("taskStateId") String taskStateId,@Param("cardType") String cardType); public List <CityListEntity> findCityList(@Param("taskStateId") String taskStateId, @Param("cardType") String cardType);
public List<TypeListEntity> findTypeListByImportDateAtACCU(String importTime);
public List <CityListEntity> findCityListByImportDateAtACCU(@Param("importTime") String importTime, @Param("cardType") String cardType);
public int updateOutStorageDate(String taskId); public int updateOutStorageDate(String taskId);
public int updateInStorageDate(String taskId); public int updateInStorageDate(String taskId);
public int updateStorageDate(String taskId); public int updateStorageDate(String taskId);
} }
src/main/java/com/yxproject/start/mapper/UserInfoMapper.java
View file @ cab10107
...@@ -45,7 +45,7 @@ public interface UserInfoMapper { ...@@ -45,7 +45,7 @@ public interface UserInfoMapper {
* @param roleId * @param roleId
*/ */
@Insert("INSERT INTO SYS_USER_ROLE(USER_ID,ROLE_ID)VALUES(#{userId},#{roleId})\n") @Insert("INSERT INTO SYS_USER_ROLE(USER_ID,ROLE_ID)VALUES(#{userId},#{roleId})\n")
public void saveUserRole(@Param("userId") Integer userId, @Param("roleId")Integer roleId); public void saveUserRole(@Param("userId") Integer userId, @Param("roleId") Integer roleId);
/** /**
* 查询所有用户 * 查询所有用户
......
src/main/java/com/yxproject/start/mapper/UtilMapper.java
View file @ cab10107
...@@ -3,6 +3,8 @@ package com.yxproject.start.mapper; ...@@ -3,6 +3,8 @@ package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import java.util.List;
/** /**
* @author zhangyusheng * @author zhangyusheng
*/ */
...@@ -35,6 +37,10 @@ public interface UtilMapper { ...@@ -35,6 +37,10 @@ public interface UtilMapper {
* 查询派出所证件申请表序列值 * 查询派出所证件申请表序列值
*/ */
public int findPoliceStationApplyReasonSequenceNextValue(); public int findPoliceStationApplyReasonSequenceNextValue();
public List queryAllPoliceStation();
public List queryMakeTypeList();
} }
src/main/java/com/yxproject/start/service/CardBodyService.java
View file @ cab10107
package com.yxproject.start.service; package com.yxproject.start.service;
import com.yxproject.start.entity.CardBodyEntity; import com.yxproject.start.entity.CardBodyEntity;
import com.yxproject.start.entity.GroupNoEntity;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -10,9 +9,11 @@ import java.util.Map; ...@@ -10,9 +9,11 @@ import java.util.Map;
* Created by Administrator on 2018/11/7. * Created by Administrator on 2018/11/7.
*/ */
public interface CardBodyService { public interface CardBodyService {
public List<CardBodyEntity> insertCardBody(String cardBodyId); public List<CardBodyEntity> findCardBody(String cardBodyId);
public List<Map<String,Object>> getCbCount(String startTime,String endTime); public int insertCardBody(String cardTypeId, String isActive, String taskId, String totalCount);
public List<Map<String,Object>> getCbCount(String startTime, String endTime);
// public int updateCardBody(CardBodyEntity map); // public int updateCardBody(CardBodyEntity map);
......
src/main/java/com/yxproject/start/service/CityListService.java
View file @ cab10107
package com.yxproject.start.service; package com.yxproject.start.service;
import com.yxproject.start.entity.CityListEntity;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.yxproject.start.entity.*;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by Administrator on 2018/12/19. * Created by Administrator on 2018/12/19.
*/ */
@Service @Service
public interface CityListService { public interface CityListService {
public List <CityListEntity> findCityList( String taskStateId ,String cardType); public List <CityListEntity> findCityList(String taskStateId, String cardType);
public List <CityListEntity> findCityListByImportDateAtACCU(String importTime,String cardType);
// public List <CityListEntity> findCityListByCardType(String cardType); // public List <CityListEntity> findCityListByCardType(String cardType);
} }
src/main/java/com/yxproject/start/service/CountyListService.java
View file @ cab10107
...@@ -2,12 +2,10 @@ package com.yxproject.start.service; ...@@ -2,12 +2,10 @@ package com.yxproject.start.service;
import com.yxproject.start.entity.CountyListEntity; import com.yxproject.start.entity.CountyListEntity;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
public interface CountyListService { public interface CountyListService {
public List<CountyListEntity> findStorageCountByTaskId(String taskId); public List<CountyListEntity> findStorageCountByTaskId(String taskId);
public int reviseStorageCount(String taskId,String countyCode, String inStorageCount, String outStorageCount); public int reviseStorageCount(String taskId, String countyCode, String inStorageCount, String outStorageCount);
} }
src/main/java/com/yxproject/start/service/CountyService.java
View file @ cab10107
...@@ -8,7 +8,7 @@ import java.util.List; ...@@ -8,7 +8,7 @@ import java.util.List;
* Created by Administrator on 2018/12/19. * Created by Administrator on 2018/12/19.
*/ */
public interface CountyService { public interface CountyService {
public List<CountyEntity> findCountyList( String taskId); public List<CountyEntity> findCountyList(String taskId);
} }
src/main/java/com/yxproject/start/service/FailedCardService.java
View file @ cab10107
package com.yxproject.start.service; package com.yxproject.start.service;
import com.yxproject.start.entity.FailedCardEntity; import com.yxproject.start.entity.FailedCardEntity;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by zhangyusheng on 2018/10/30 10:01 * Created by zhangyusheng on 2018/10/30 10:01
...@@ -11,5 +12,9 @@ import java.util.Map; ...@@ -11,5 +12,9 @@ import java.util.Map;
public interface FailedCardService { public interface FailedCardService {
public int saveFailedinfo(List<FailedCardEntity> failedinfoEntityList); public int saveFailedinfo(List<FailedCardEntity> failedinfoEntityList);
public int updateFailedinfo(List<FailedCardEntity> failedinfoEntityList); public int updateFailedinfo(List<FailedCardEntity> failedinfoEntityList);
public List<Map<String,Object>> selectFailedinfo(int state); public List<FailedCardEntity> findFailedList(String state);
public List<FailedCardEntity> selectAcceptNoAtFailedCard(String accept_No);
public List<SpecialCardEntity> selectAcceptNoAtSpecialCard(String accept_No);
public List<GroupNoEntity> selectAcceptNoAtGroupNo(String groupNo);
} }
src/main/java/com/yxproject/start/service/FailedTypeService.java
View file @ cab10107
...@@ -3,7 +3,6 @@ package com.yxproject.start.service; ...@@ -3,7 +3,6 @@ package com.yxproject.start.service;
import com.yxproject.start.entity.FailedTypeEntity; import com.yxproject.start.entity.FailedTypeEntity;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by Administrator on 2018/12/26. * Created by Administrator on 2018/12/26.
......
src/main/java/com/yxproject/start/service/FindCardService.java
View file @ cab10107
package com.yxproject.start.service; package com.yxproject.start.service;
import com.yxproject.start.entity.AccCardTEntity;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
src/main/java/com/yxproject/start/service/FindFinancialReportByViewService.java
View file @ cab10107
...@@ -7,5 +7,5 @@ import java.util.Map; ...@@ -7,5 +7,5 @@ import java.util.Map;
* Created by Administrator on 2018/12/19. * Created by Administrator on 2018/12/19.
*/ */
public interface FindFinancialReportByViewService { public interface FindFinancialReportByViewService {
public List<Map<String,Object>> getFinancialReportData(String startTime, String endTime,String cardType,String cityCode); public List<Map<String,Object>> getFinancialReportData(String startTime, String endTime, String cardType, String cityCode);
} }
src/main/java/com/yxproject/start/service/FindStationCountService.java
View file @ cab10107
...@@ -3,7 +3,6 @@ package com.yxproject.start.service; ...@@ -3,7 +3,6 @@ package com.yxproject.start.service;
import com.yxproject.start.entity.FindStationCountByViewEntity; import com.yxproject.start.entity.FindStationCountByViewEntity;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by Administrator on 2018/11/29. * Created by Administrator on 2018/11/29.
......
src/main/java/com/yxproject/start/service/FindTaskByDealdateViewService.java
View file @ cab10107
package com.yxproject.start.service; package com.yxproject.start.service;
import com.yxproject.start.entity.FindTaskByDealdateViewEntity;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -9,5 +7,5 @@ import java.util.Map; ...@@ -9,5 +7,5 @@ import java.util.Map;
* Created by Administrator on 2018/11/21. * Created by Administrator on 2018/11/21.
*/ */
public interface FindTaskByDealdateViewService { public interface FindTaskByDealdateViewService {
public List<Map<String,Object>> getAccGroupData(String startTime,String endTime); public List<Map<String,Object>> getAccGroupData(String startTime, String endTime);
} }
src/main/java/com/yxproject/start/service/GroupListService.java
View file @ cab10107
...@@ -3,12 +3,14 @@ package com.yxproject.start.service; ...@@ -3,12 +3,14 @@ package com.yxproject.start.service;
import com.yxproject.start.entity.GroupListEntity; import com.yxproject.start.entity.GroupListEntity;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by Administrator on 2018/12/18. * Created by Administrator on 2018/12/18.
*/ */
public interface GroupListService { public interface GroupListService {
public List<GroupListEntity> findGroupListByTaskId( String taskId); public List<GroupListEntity> findGroupListByTaskId(String taskId);
public List<Map<String,Object>> findGroupListAtACCU(String typeCode,String importTime,String cityCode);
} }
src/main/java/com/yxproject/start/service/GroupNoService.java
View file @ cab10107
package com.yxproject.start.service; package com.yxproject.start.service;
import com.yxproject.start.entity.GroupListEntity;
import com.yxproject.start.entity.GroupNoEntity;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
src/main/java/com/yxproject/start/service/PoliceStationApplyReasonService.java
View file @ cab10107
...@@ -8,7 +8,7 @@ import java.util.Map; ...@@ -8,7 +8,7 @@ import java.util.Map;
*/ */
public interface PoliceStationApplyReasonService { public interface PoliceStationApplyReasonService {
public int savePoliceStationApplyReasonEntity(String cyclesheetID); public int savePoliceStationApplyReasonEntity(String cyclesheetID);
public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate(String startDate,String endDate); public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate(String startDate, String endDate);
public List<Map<String,Object>> findPoliceStationApplyReasonByCardType(String cardType); public List<Map<String,Object>> findPoliceStationApplyReasonByCardType(String cardType);
public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String cityCode); public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String cityCode);
} }
src/main/java/com/yxproject/start/service/ProdCardService.java
View file @ cab10107
...@@ -3,7 +3,6 @@ package com.yxproject.start.service; ...@@ -3,7 +3,6 @@ package com.yxproject.start.service;
import com.yxproject.start.entity.ProdCardEntity; import com.yxproject.start.entity.ProdCardEntity;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by Administrator on 2018/12/26. * Created by Administrator on 2018/12/26.
...@@ -11,5 +10,5 @@ import java.util.Map; ...@@ -11,5 +10,5 @@ import java.util.Map;
public interface ProdCardService { public interface ProdCardService {
public List<ProdCardEntity> getProdCard ( List idNo); public List<ProdCardEntity> getProdCard(List idNo);
} }
src/main/java/com/yxproject/start/service/ReceiptListService.java
View file @ cab10107
...@@ -8,6 +8,6 @@ import java.util.List; ...@@ -8,6 +8,6 @@ import java.util.List;
* Created by Administrator on 2018/12/19. * Created by Administrator on 2018/12/19.
*/ */
public interface ReceiptListService { public interface ReceiptListService {
public List <ReceiptListEntity> getReceiptList( String startDate, String endDate); public List <ReceiptListEntity> getReceiptList(String startDate, String endDate);
} }
src/main/java/com/yxproject/start/service/SelectSerialNumberService.java 0 → 100644
View file @ cab10107
package com.yxproject.start.service;
import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
import com.yxproject.start.entity.resp.SelectByIdcardEntity;
import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
public interface SelectSerialNumberService {
SelectByGroupNumEntity selectByGroupNumber(String id);
SelectByAcceptedEntity selectByAccepted(String id);
SelectByIdcardEntity selectByIdCard(String id);
SelectByWorkOrderEntity selectByWorkOrderNumber(String id);
}
src/main/java/com/yxproject/start/service/SysRoleService.java
View file @ cab10107
...@@ -25,7 +25,7 @@ public interface SysRoleService { ...@@ -25,7 +25,7 @@ public interface SysRoleService {
* @return * @return
*/ */
public boolean updateRole(SysRole sysRole,JSONArray ids,JSONArray oldIds); public boolean updateRole(SysRole sysRole, JSONArray ids, JSONArray oldIds);
/** /**
* 查询所有角色 * 查询所有角色
......
src/main/java/com/yxproject/start/service/TaskService.java
View file @ cab10107
...@@ -12,7 +12,7 @@ public interface TaskService { ...@@ -12,7 +12,7 @@ public interface TaskService {
public int updateProductionTask(TaskEntity taskId); public int updateProductionTask(TaskEntity taskId);
public int addProductionTaskListEntity(TaskEntity taskEntity, List<GroupNoEntity> groupNoEntities); public int addProductionTaskListEntity(TaskEntity taskEntity, List<Map<String, Object>> groupListAtACCU);
public int addQuickCyclesheetInfo(String acceptNo); public int addQuickCyclesheetInfo(String acceptNo);
...@@ -22,13 +22,12 @@ public interface TaskService { ...@@ -22,13 +22,12 @@ public interface TaskService {
public int savePoliceStationVailedEntity(List<PoliceStationVailedEntity> policeStationVailedInfoEntities); public int savePoliceStationVailedEntity(List<PoliceStationVailedEntity> policeStationVailedInfoEntities);
public List<PoliceStationVailedEntity> find( String id); public List<PoliceStationVailedEntity> find(String id);
public List<Map<String,Object>> findProductionTaskListEntityByState(int state); public List<Map<String,Object>> findProductionTaskListEntityByState(int state);
public int addExceptionState(String taskId, String exceptionInformation); public int addExceptionState(String taskId, String exceptionInformation);
// public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount); // public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount);
......
src/main/java/com/yxproject/start/service/TypeListService.java
View file @ cab10107
...@@ -9,5 +9,7 @@ import java.util.List; ...@@ -9,5 +9,7 @@ import java.util.List;
*/ */
public interface TypeListService { public interface TypeListService {
public List<TypeListEntity> findTypeListByTaskStateId( String taskStateId); public List<TypeListEntity> findTypeListByTaskStateId(String taskStateId);
public List<TypeListEntity> findTypeListByImportDateAtACCU(String importTime);
} }
src/main/java/com/yxproject/start/service/UserInfoService.java
View file @ cab10107
...@@ -22,7 +22,7 @@ public interface UserInfoService{ ...@@ -22,7 +22,7 @@ public interface UserInfoService{
* @param roleId * @param roleId
* @return * @return
*/ */
public boolean addUser(UserInfo userinfo,Integer roleId); public boolean addUser(UserInfo userinfo, Integer roleId);
/** /**
* 查询所有用户 * 查询所有用户
...@@ -57,7 +57,7 @@ public interface UserInfoService{ ...@@ -57,7 +57,7 @@ public interface UserInfoService{
* @param roleId * @param roleId
* @return * @return
*/ */
public boolean updateUser(UserInfo userInfo, Integer roleId,Integer oldRoleId); public boolean updateUser(UserInfo userInfo, Integer roleId, Integer oldRoleId);
// int delUsername( UserInfo userInfo); // int delUsername( UserInfo userInfo);
// int updateUsername(UserInfo userInfo); // int updateUsername(UserInfo userInfo);
......
src/main/java/com/yxproject/start/service/UtilService.java
View file @ cab10107
package com.yxproject.start.service; package com.yxproject.start.service;
import java.util.List;
public interface UtilService { public interface UtilService {
public int findProductionTaskListSequenceNextValue(); public int findProductionTaskListSequenceNextValue();
public int findGroupInfoSequenceNextValue(); public int findGroupInfoSequenceNextValue();
List findAllPoliceStation();
List findTypeListData();
} }
src/main/java/com/yxproject/start/service/impl/CardBodyServiceImpl.java
View file @ cab10107
package com.yxproject.start.service.impl; package com.yxproject.start.service.impl;
import com.yxproject.start.entity.CardBodyEntity; import com.yxproject.start.entity.CardBodyEntity;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.mapper.CardBodyMapper; import com.yxproject.start.mapper.CardBodyMapper;
import com.yxproject.start.mapper.GroupNoMapper;
import com.yxproject.start.mapper.UtilMapper;
import com.yxproject.start.service.CardBodyService; import com.yxproject.start.service.CardBodyService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -43,12 +38,14 @@ public class CardBodyServiceImpl implements CardBodyService { ...@@ -43,12 +38,14 @@ public class CardBodyServiceImpl implements CardBodyService {
// return cardBodyMapper.updateCardBody(map); // return cardBodyMapper.updateCardBody(map);
// } // }
@Override @Override
public List<CardBodyEntity> insertCardBody(String cardBodyId) { public List<CardBodyEntity> findCardBody(String cardBodyId) {
List<CardBodyEntity> cardBody = cardBodyMapper.insertCardBody(cardBodyId); List<CardBodyEntity> cardBody = cardBodyMapper.findCardBody(cardBodyId);
return cardBody;
}
public int insertCardBody(String cardTypeId,String isActive,String taskId,String totalCount){
int cardBody = cardBodyMapper.insertCardBody(cardTypeId,isActive,taskId,totalCount);
return cardBody; return cardBody;
} }
} }
src/main/java/com/yxproject/start/service/impl/CityListServiceImpl.java
View file @ cab10107
...@@ -8,7 +8,9 @@ import com.yxproject.start.service.CityListService; ...@@ -8,7 +8,9 @@ import com.yxproject.start.service.CityListService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.*; import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/** /**
* Created by Administrator on 2018/12/19. * Created by Administrator on 2018/12/19.
...@@ -63,7 +65,31 @@ public class CityListServiceImpl implements CityListService { ...@@ -63,7 +65,31 @@ public class CityListServiceImpl implements CityListService {
for (CityListEntity cityListEntity : list1) { for (CityListEntity cityListEntity : list1) {
List <GroupListEntity> groupListEntities=groupNoMapper.findGroupListByTaskId(cityListEntity.getTaskId() + ""); List <GroupListEntity> groupListEntities=groupNoMapper.findGroupListByTaskId(cityListEntity.getTaskId() + "");
if(groupListEntities.size() == 1 ){ if(groupListEntities.size() == 1 ){
cityListEntity.setGroupNo(String.valueOf(groupListEntities.get(0).getGroupNo())); cityListEntity.setGroupNo(groupListEntities.get(0).getGroupNo()+"");
} else if(groupListEntities.size() > 1 ){
List<Integer> c = new ArrayList<>();
List<Integer> nsList = new ArrayList<>();
for (int i = 0; i < groupListEntities.size(); i++){
nsList.add(Integer.parseInt( groupListEntities.get(i).getGroupNo()+"" ));
}
cityListEntity.setGroupCount(nsList.size());
cityListEntity.setGroupNo(createGroupNo(c, nsList));
}else {
cityListEntity.setGroupNo("");
}
list2.add(cityListEntity);
}
return list2;
}
@Override
public List <CityListEntity> findCityListByImportDateAtACCU( String importTime,String cardType) {
List<CityListEntity> list1 = taskMapper.findCityListByImportDateAtACCU(importTime,cardType);
List<CityListEntity> list2 = new ArrayList<CityListEntity>();
for (CityListEntity cityListEntity : list1) {
List <GroupListEntity> groupListEntities=groupNoMapper.findGroupNoListAtACCU(importTime,cardType,cityListEntity.getCitycode());
if(groupListEntities.size() == 1 ){
cityListEntity.setGroupNo(groupListEntities.get(0).getGroupNo()+"");
} else if(groupListEntities.size() > 1 ){ } else if(groupListEntities.size() > 1 ){
List<Integer> c = new ArrayList<>(); List<Integer> c = new ArrayList<>();
List<Integer> nsList = new ArrayList<>(); List<Integer> nsList = new ArrayList<>();
......
src/main/java/com/yxproject/start/service/impl/CountyListServiceImpl.java
View file @ cab10107
...@@ -7,10 +7,7 @@ import com.yxproject.start.service.CountyListService; ...@@ -7,10 +7,7 @@ import com.yxproject.start.service.CountyListService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by liuxinben on 2018/11/6.13:42 * Created by liuxinben on 2018/11/6.13:42
......
src/main/java/com/yxproject/start/service/impl/CountyServiceImpl.java
View file @ cab10107
package com.yxproject.start.service.impl; package com.yxproject.start.service.impl;
//import com.yxproject.start.entity.CountyEntity; //import com.yxproject.start.entity.CountyEntity;
import com.yxproject.start.entity.CountyEntity; import com.yxproject.start.entity.CountyEntity;
import com.yxproject.start.mapper.CountyListMapper; import com.yxproject.start.mapper.CountyListMapper;
import com.yxproject.start.service.CountyService; import com.yxproject.start.service.CountyService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
......
src/main/java/com/yxproject/start/service/impl/FailedCardServiceImpl.java
View file @ cab10107
package com.yxproject.start.service.impl; package com.yxproject.start.service.impl;
import com.yxproject.start.entity.FailedCardEntity; import com.yxproject.start.entity.FailedCardEntity;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import com.yxproject.start.mapper.FailedCardMapper; import com.yxproject.start.mapper.FailedCardMapper;
import com.yxproject.start.service.FailedCardService; import com.yxproject.start.service.FailedCardService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by zhangyusheng on 2018/10/30 10:02 * Created by zhangyusheng on 2018/10/30 10:02
...@@ -34,8 +35,27 @@ public class FailedCardServiceImpl implements FailedCardService { ...@@ -34,8 +35,27 @@ public class FailedCardServiceImpl implements FailedCardService {
} }
@Override @Override
public List<Map<String,Object>> selectFailedinfo(int state) { public List<FailedCardEntity> findFailedList(String state) {
List<Map<String, Object>> maps = failedCardMapper.selectFailedCardEntityByState(state); List<FailedCardEntity> failedList = failedCardMapper.findFailedList(state);
return maps; return failedList;
} }
@Override
public List<FailedCardEntity> selectAcceptNoAtFailedCard(String accept_No) {
List<FailedCardEntity> failedCardEntities = failedCardMapper.selectAcceptNoAtFailedCard(accept_No);
return failedCardEntities;
}
@Override
public List<SpecialCardEntity> selectAcceptNoAtSpecialCard(String accept_No) {
List<SpecialCardEntity> specialCardEntities = failedCardMapper.selectAcceptNoAtSpecialCard(accept_No);
return specialCardEntities;
}
@Override
public List<GroupNoEntity> selectAcceptNoAtGroupNo(String groupNo) {
List<GroupNoEntity> groupNoEntities = failedCardMapper.selectAcceptNoAtGroupNo(groupNo);
return groupNoEntities;
}
} }
src/main/java/com/yxproject/start/service/impl/FailedTypeServiceImpl.java
View file @ cab10107
...@@ -2,12 +2,11 @@ package com.yxproject.start.service.impl; ...@@ -2,12 +2,11 @@ package com.yxproject.start.service.impl;
import com.yxproject.start.entity.FailedTypeEntity; import com.yxproject.start.entity.FailedTypeEntity;
import com.yxproject.start.mapper.SpecialCardMapper; import com.yxproject.start.mapper.SpecialCardMapper;
import com.yxproject.start.service.*; import com.yxproject.start.service.FailedTypeService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by Administrator on 2018/12/26. * Created by Administrator on 2018/12/26.
......
src/main/java/com/yxproject/start/service/impl/FindCardServiceImpl.java
View file @ cab10107
package com.yxproject.start.service.impl; package com.yxproject.start.service.impl;
import com.yxproject.start.mapper.AccCardTMapper;
import com.yxproject.start.mapper.FindCardMapper; import com.yxproject.start.mapper.FindCardMapper;
import com.yxproject.start.service.FindCardService; import com.yxproject.start.service.FindCardService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
src/main/java/com/yxproject/start/service/impl/FindStationCountServiceImpl.java
View file @ cab10107
...@@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by Administrator on 2018/11/29. * Created by Administrator on 2018/11/29.
......
src/main/java/com/yxproject/start/service/impl/GroupListServiceImpl.java
View file @ cab10107
...@@ -8,8 +8,8 @@ import com.yxproject.start.service.GroupListService; ...@@ -8,8 +8,8 @@ import com.yxproject.start.service.GroupListService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by Administrator on 2018/12/18. * Created by Administrator on 2018/12/18.
...@@ -31,4 +31,16 @@ public class GroupListServiceImpl implements GroupListService { ...@@ -31,4 +31,16 @@ public class GroupListServiceImpl implements GroupListService {
return groupList; return groupList;
} }
@Override
public List<Map<String,Object>> findGroupListAtACCU(String typeCode,String importTime,String cityCode) {
List<Map<String, Object>> groupListAtACCU = groupNoMapper.findGroupListAtACCU(typeCode, importTime, cityCode);
for ( Map<String,Object> map:groupListAtACCU) {
List <SpecialCardEntity> specialCardEntities=specialCardMapper.findSpecialCardList(map.get("GROUP_NO").toString());
map.put("SpecialCardList",specialCardEntities);
}
return groupListAtACCU;
}
} }
src/main/java/com/yxproject/start/service/impl/GroupNoServiceImpl.java
View file @ cab10107
package com.yxproject.start.service.impl; package com.yxproject.start.service.impl;
import com.yxproject.start.entity.GroupListEntity;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import com.yxproject.start.mapper.GroupNoMapper; import com.yxproject.start.mapper.GroupNoMapper;
import com.yxproject.start.service.GroupNoService; import com.yxproject.start.service.GroupNoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
src/main/java/com/yxproject/start/service/impl/ProdCardServiceImpl.java
View file @ cab10107
...@@ -7,9 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -7,9 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by Administrator on 2018/12/26. * Created by Administrator on 2018/12/26.
...@@ -29,6 +27,20 @@ public class ProdCardServiceImpl implements ProdCardService { ...@@ -29,6 +27,20 @@ public class ProdCardServiceImpl implements ProdCardService {
List list = new ArrayList<>(); List list = new ArrayList<>();
for (int i=0; i <idNo.size(); i++) { for (int i=0; i <idNo.size(); i++) {
List <ProdCardEntity> prodCardEntity = specialCardMapper.getProdCard((String) idNo.get(i)); List <ProdCardEntity> prodCardEntity = specialCardMapper.getProdCard((String) idNo.get(i));
if(prodCardEntity.size() == 0){
ProdCardEntity prodCardEntity1 = new ProdCardEntity() ;
prodCardEntity1.setName("信息有误");
if(((String) idNo.get(i)).length() == 10){
prodCardEntity1.setAcceptNo((String) idNo.get(i));
prodCardEntity1.setIdNo(null);
}
else{
prodCardEntity1.setAcceptNo(null);
prodCardEntity1.setIdNo((String) idNo.get(i));
}
list.add(prodCardEntity1);
}
list.addAll(prodCardEntity); list.addAll(prodCardEntity);
} }
// 去重 // 去重
......
src/main/java/com/yxproject/start/service/impl/SelectSerialNumberServiceImpl.java 0 → 100644
View file @ cab10107
package com.yxproject.start.service.impl;
import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
import com.yxproject.start.entity.AccCardTEntity;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardInfoEntity;
import com.yxproject.start.entity.TaskEntity;
import com.yxproject.start.entity.resp.SelectByAcceptedEntity;
import com.yxproject.start.entity.resp.SelectByGroupNumEntity;
import com.yxproject.start.entity.resp.SelectByIdcardEntity;
import com.yxproject.start.entity.resp.SelectByWorkOrderEntity;
import com.yxproject.start.mapper.SelectSerialNumberMapper;
import com.yxproject.start.service.SelectSerialNumberService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.xml.crypto.Data;
import java.util.Date;
import java.util.Map;
@Service
public class SelectSerialNumberServiceImpl implements SelectSerialNumberService {
@Autowired
public SelectSerialNumberMapper selectSerialNumberMapper;
@Override
public SelectByGroupNumEntity selectByGroupNumber(String id){
Map<String, Object> map = selectSerialNumberMapper.selectByGroupNumber(id);
System.out.println("数据111"+map.toString());
SelectByGroupNumEntity selectByGroupNumEntity = new SelectByGroupNumEntity();
selectByGroupNumEntity.setLibrary("盈信库");
selectByGroupNumEntity.setCityName(String.valueOf(map.get("CITYNAME")));
selectByGroupNumEntity.setCardType((String) map.get("CARD_TYPE"));
selectByGroupNumEntity.setPainterName((String) map.get("PRINTER_NAME"));
selectByGroupNumEntity.setTaskId(String.valueOf(map.get("TASK_ID")));
selectByGroupNumEntity.setGroup_No(String.valueOf(map.get("GROUP_NO")));
selectByGroupNumEntity.setSubmit_Date((Date) map.get("SUBMIT_DATE"));
System.out.println("Date:"+selectByGroupNumEntity.getSubmit_Date().toString());
selectByGroupNumEntity.setPosition_Date((Date) map.get("POSITION_DATE"));
selectByGroupNumEntity.setQuality_People_Name((String) map.get("QUALITY_PEOPLE_NAME"));
selectByGroupNumEntity.setOut_Storage_Date((Date) map.get("OUT_STORAGE_DATE"));
selectByGroupNumEntity.setIn_Storage_Date((Date) map.get("IN_STORAGE_DATE"));
selectByGroupNumEntity.setException_Information((String) map.get("EXCEPTION_INFORMATION"));
return selectByGroupNumEntity;
}
@Override
public SelectByAcceptedEntity selectByAccepted(String id){
Map<String,Object> map = selectSerialNumberMapper.selectByAccepted(id);
SelectByAcceptedEntity selectByAcceptedEntity = new SelectByAcceptedEntity();
String sex ;
if (Integer.parseInt((String) map.get("SEX_NO")) ==1){
sex = "男";
}else if (Integer.parseInt((String) map.get("SEX_NO"))==2){
sex = "女";
}else {
sex = "缺失";
}
selectByAcceptedEntity.setCardType((String) map.get("CARD_TYPE"));
selectByAcceptedEntity.setLibrary("受理库");
selectByAcceptedEntity.setAccept_No((String) map.get("ACCEPT_NO"));
selectByAcceptedEntity.setName((String) map.get("NAME"));
selectByAcceptedEntity.setSex_No(sex);
selectByAcceptedEntity.setId_No((String) map.get("ID_NO"));
selectByAcceptedEntity.setBirthday((String) map.get("BIRTHDAY"));
selectByAcceptedEntity.setSign_Govt((String) map.get("SIGN_GOVT"));
selectByAcceptedEntity.setBegin_Date((String) map.get("BEGIN_DATE"));
selectByAcceptedEntity.setExpire_Date((String) map.get("EXPIRE_DATE"));
selectByAcceptedEntity.setStatus_No((String) map.get("STATUS_NO"));
selectByAcceptedEntity.setTaskState((String) map.get("TASK_STATE"));
selectByAcceptedEntity.setCityName((String) map.get("CITYNAME"));
selectByAcceptedEntity.setLastModifyTime((Data) map.get("lastModifyTime;"));
return selectByAcceptedEntity;
}
@Override
public SelectByIdcardEntity selectByIdCard(String id){
Map<String,Object> map = selectSerialNumberMapper.selectByIdCard(id);
SelectByIdcardEntity selectByIdcardEntity = new SelectByIdcardEntity();
String sex ;
if (Integer.parseInt((String) map.get("SEX_NO")) ==1){
sex = "男";
}else if (Integer.parseInt((String) map.get("SEX_NO"))==2){
sex = "女";
}else {
sex = "缺失";
}
selectByIdcardEntity.setCardType((String) map.get("CARD_TYPE"));
selectByIdcardEntity.setLibrary("受理库");
selectByIdcardEntity.setAccept_No((String) map.get("ACCEPT_NO"));
selectByIdcardEntity.setName((String) map.get("NAME"));
selectByIdcardEntity.setSex_No(sex);
selectByIdcardEntity.setId_No((String) map.get("ID_NO"));
selectByIdcardEntity.setBirthday((String) map.get("BIRTHDAY"));
selectByIdcardEntity.setSign_Govt((String) map.get("SIGN_GOVT"));
selectByIdcardEntity.setBegin_Date((String) map.get("BEGIN_DATE"));
selectByIdcardEntity.setExpire_Date((String) map.get("EXPIRE_DATE"));
selectByIdcardEntity.setStatus_No((String) map.get("STATUS_NO"));
selectByIdcardEntity.setTaskState((String) map.get("TASK_STATE"));
selectByIdcardEntity.setCityName((String) map.get("CITYNAME"));
selectByIdcardEntity.setLastModifyTime((Data) map.get("lastModifyTime;"));
return selectByIdcardEntity;
}
@Override
public SelectByWorkOrderEntity selectByWorkOrderNumber(String id){
Map<String,Object> map = selectSerialNumberMapper.selectByWorkOrderNumber(id);
SelectByWorkOrderEntity selectByWorkOrderEntity = new SelectByWorkOrderEntity();
selectByWorkOrderEntity.setLibrary("盈信库");
selectByWorkOrderEntity.setCityName((String) map.get("CITYNAME"));
selectByWorkOrderEntity.setCardType((String) map.get("CARD_TYPE"));
selectByWorkOrderEntity.setPainterName((String) map.get("PRINTER_NAME"));
selectByWorkOrderEntity.setTask_Id((Long.valueOf(String.valueOf( map.get("TASK_ID")))));
selectByWorkOrderEntity.setSubmit_Date((Date) map.get("SUBMIT_DATE"));
selectByWorkOrderEntity.setPosition_Date((Date) map.get("POSITION_DATE"));
selectByWorkOrderEntity.setQuality_People_Name((String) map.get("QUALITY_PEOPLE_NAME"));
selectByWorkOrderEntity.setOut_Storage_Date((Date) map.get("OUT_STORAGE_DATE"));
selectByWorkOrderEntity.setIn_Storage_Date((Date) map.get("IN_STORAGE_DATE"));
selectByWorkOrderEntity.setException_Information((String) map.get("EXCEPTION_INFORMATION"));
System.out.println("实体："+selectByWorkOrderEntity);
return selectByWorkOrderEntity;
}
}
src/main/java/com/yxproject/start/service/impl/SysPermissionServiceImpl.java
View file @ cab10107
...@@ -3,12 +3,10 @@ package com.yxproject.start.service.impl; ...@@ -3,12 +3,10 @@ package com.yxproject.start.service.impl;
import com.yxproject.start.entity.SysPermission; import com.yxproject.start.entity.SysPermission;
import com.yxproject.start.mapper.SysPermissionMapper; import com.yxproject.start.mapper.SysPermissionMapper;
import com.yxproject.start.service.SysPermissionService; import com.yxproject.start.service.SysPermissionService;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* @author Administrator * @author Administrator
......
src/main/java/com/yxproject/start/service/impl/SysRoleServiceImpl.java
View file @ cab10107
...@@ -4,15 +4,10 @@ import com.yxproject.start.entity.SysRole; ...@@ -4,15 +4,10 @@ import com.yxproject.start.entity.SysRole;
import com.yxproject.start.mapper.SysRoleMapper; import com.yxproject.start.mapper.SysRoleMapper;
import com.yxproject.start.service.SysRoleService; import com.yxproject.start.service.SysRoleService;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import org.apache.ibatis.annotations.Mapper;
import org.omg.CORBA.OBJ_ADAPTER;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
......
src/main/java/com/yxproject/start/service/impl/TaskServiceImpl.java
View file @ cab10107
package com.yxproject.start.service.impl; package com.yxproject.start.service.impl;
import com.yxproject.start.entity.*; import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.PoliceStationVailedEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import com.yxproject.start.entity.TaskEntity;
import com.yxproject.start.entity.accu.AccCardTEntity; import com.yxproject.start.entity.accu.AccCardTEntity;
import com.yxproject.start.entity.prod.ProdCardTEntity; import com.yxproject.start.entity.prod.ProdCardTEntity;
import com.yxproject.start.mapper.*; import com.yxproject.start.mapper.*;
import com.yxproject.start.entity.CountyListEntity;
import com.yxproject.start.service.TaskService; import com.yxproject.start.service.TaskService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -102,17 +104,25 @@ public class TaskServiceImpl implements TaskService { ...@@ -102,17 +104,25 @@ public class TaskServiceImpl implements TaskService {
* 生成任务单并保存组号列表 * 生成任务单并保存组号列表
* *
* @param taskEntity 任务单详情 * @param taskEntity 任务单详情
* @param groupNoEntities 组号列表 * @param groupListAtACCU 组号列表
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public int addProductionTaskListEntity(TaskEntity taskEntity, List<GroupNoEntity> groupNoEntities) { public int addProductionTaskListEntity(TaskEntity taskEntity, List<Map<String, Object>> groupListAtACCU) {
Long taskID = getTaskID();
int production_task_list_seq = utilMapper.findProductionTaskListSequenceNextValue(); taskEntity.setTask_Id(taskID);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
taskMapper.insertTaskEntity(taskEntity); taskMapper.insertTaskEntity(taskEntity);
for (GroupNoEntity groupNoEntity : groupNoEntities) { // System.out.println(taskMapper.insertTaskEntity(taskEntity)+"----测试数据--------");
System.out.println(taskEntity.getTask_Id()+"-----has an unsupported-----");
for (Map<String,Object> map : groupListAtACCU) {
System.out.println(map.get("GROUP_NO").toString()+"--------map.get(\"GROUP_NO\").toString()---");
GroupNoEntity groupNoEntity = new GroupNoEntity();
groupNoEntity.setGroup_No(map.get("GROUP_NO").toString());
groupNoEntity.setTask_Id(taskID);
groupNoEntity.setValid_Count(Long.valueOf(map.get("VALID_COUNT").toString()));
groupNoEntity.setInvalid_Count(Long.valueOf(map.get("INVALID_COUNT").toString()));
groupNoEntity.setSpecial_Card_Count(((List)map.get("SpecialCardList")).size());
groupNoMapper.insertGroupNoEntity(groupNoEntity); groupNoMapper.insertGroupNoEntity(groupNoEntity);
} }
...@@ -193,7 +203,7 @@ public class TaskServiceImpl implements TaskService { ...@@ -193,7 +203,7 @@ public class TaskServiceImpl implements TaskService {
* 生成原来的任务单 但不下发 * 生成原来的任务单 但不下发
*/ */
TaskEntity taskEntity = new TaskEntity(); TaskEntity taskEntity = new TaskEntity();
int production_task_list_seq = utilMapper.findProductionTaskListSequenceNextValue(); taskEntity.setTask_Id(getTaskID());
taskEntity.setCitycode(original_no.toString().substring(0, 6)); taskEntity.setCitycode(original_no.toString().substring(0, 6));
taskEntity.setCard_Type(Long.valueOf(original_no.toString().substring(20, 21))); taskEntity.setCard_Type(Long.valueOf(original_no.toString().substring(20, 21)));
taskEntity.setSubmit_Date(new Date()); taskEntity.setSubmit_Date(new Date());
...@@ -218,6 +228,7 @@ public class TaskServiceImpl implements TaskService { ...@@ -218,6 +228,7 @@ public class TaskServiceImpl implements TaskService {
* 生成快证任务单并下发 * 生成快证任务单并下发
*/ */
TaskEntity taskEntity1 = new TaskEntity(); TaskEntity taskEntity1 = new TaskEntity();
taskEntity1.setTask_Id(getTaskID());
taskEntity1.setCitycode(original_no.toString().substring(0, 6)); taskEntity1.setCitycode(original_no.toString().substring(0, 6));
taskEntity1.setCard_Type((long) 1); taskEntity1.setCard_Type((long) 1);
taskEntity1.setOld_Card_Type(Long.valueOf(original_no.toString().substring(20, 21))); taskEntity1.setOld_Card_Type(Long.valueOf(original_no.toString().substring(20, 21)));
...@@ -276,6 +287,7 @@ public class TaskServiceImpl implements TaskService { ...@@ -276,6 +287,7 @@ public class TaskServiceImpl implements TaskService {
* 生成快证任务单并下发 * 生成快证任务单并下发
*/ */
TaskEntity taskEntity = new TaskEntity(); TaskEntity taskEntity = new TaskEntity();
taskEntity.setTask_Id(getTaskID());
taskEntity.setCitycode(taskEntities.get(0).getCitycode()); taskEntity.setCitycode(taskEntities.get(0).getCitycode());
taskEntity.setCard_Type((long) 1); taskEntity.setCard_Type((long) 1);
taskEntity.setOld_Card_Type(taskEntities.get(0).getCard_Type()); taskEntity.setOld_Card_Type(taskEntities.get(0).getCard_Type());
...@@ -446,4 +458,17 @@ public class TaskServiceImpl implements TaskService { ...@@ -446,4 +458,17 @@ public class TaskServiceImpl implements TaskService {
List<PoliceStationVailedEntity> policeStationVailedInfoEntityByID = policeStationVailedMapper.findPoliceStationVailedEntity(id); List<PoliceStationVailedEntity> policeStationVailedInfoEntityByID = policeStationVailedMapper.findPoliceStationVailedEntity(id);
return policeStationVailedInfoEntityByID; return policeStationVailedInfoEntityByID;
} }
private Long getTaskID(){
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
int task_seq = utilMapper.findProductionTaskListSequenceNextValue();
String date = simpleDateFormat.format(new Date());
String sequence = task_seq+"";
String string0="";
for (int i = 0;i<3-sequence.length();i++){
string0+="0";
}
date+=string0+sequence;
return Long.valueOf(date);
}
} }
src/main/java/com/yxproject/start/service/impl/TypeListServiceImpl.java
View file @ cab10107
...@@ -27,4 +27,14 @@ public class TypeListServiceImpl implements TypeListService { ...@@ -27,4 +27,14 @@ public class TypeListServiceImpl implements TypeListService {
List<TypeListEntity> typeListEntity = taskMapper.findTypeListByTaskStateId(taskStateId); List<TypeListEntity> typeListEntity = taskMapper.findTypeListByTaskStateId(taskStateId);
return typeListEntity; return typeListEntity;
} }
/**
* 通过状态查找TypeList
* @param
* @return
*/
@Override
public List<TypeListEntity> findTypeListByImportDateAtACCU( String importTime ) {
List<TypeListEntity> typeListEntity = taskMapper.findTypeListByImportDateAtACCU(importTime);
return typeListEntity;
}
} }
src/main/java/com/yxproject/start/service/impl/UserInfoServiceImpl.java
View file @ cab10107
...@@ -6,10 +6,8 @@ import com.yxproject.start.mapper.UserInfoMapper; ...@@ -6,10 +6,8 @@ import com.yxproject.start.mapper.UserInfoMapper;
import com.yxproject.start.service.UserInfoService; import com.yxproject.start.service.UserInfoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
......
src/main/java/com/yxproject/start/service/impl/UtilServiceImpl.java
View file @ cab10107
...@@ -2,9 +2,15 @@ package com.yxproject.start.service.impl; ...@@ -2,9 +2,15 @@ package com.yxproject.start.service.impl;
import com.yxproject.start.mapper.UtilMapper; import com.yxproject.start.mapper.UtilMapper;
import com.yxproject.start.service.UtilService; import com.yxproject.start.service.UtilService;
import org.apache.commons.collections.map.HashedMap;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/** /**
* @author Administrator * @author Administrator
*/ */
...@@ -21,4 +27,77 @@ public class UtilServiceImpl implements UtilService { ...@@ -21,4 +27,77 @@ public class UtilServiceImpl implements UtilService {
public int findGroupInfoSequenceNextValue() { public int findGroupInfoSequenceNextValue() {
return utilMapper.findGroupInfoSequenceNextValue(); return utilMapper.findGroupInfoSequenceNextValue();
} }
/**
* 级联菜单
*
* @return
*/
@Override
public List findAllPoliceStation() {
List<Map<String,Object>> listWithSQL = utilMapper.queryAllPoliceStation();
Map<String,Object> countyMap = new LinkedHashMap<String,Object>();
for (Map<String,Object> map :listWithSQL){
if(countyMap.containsKey(map.get("COUNTY_CODE").toString())){
List<Map<String, Object>> mapList = (List<Map<String, Object>>) countyMap.get(map.get("COUNTY_CODE").toString());
Map<String,Object> gajgMap = new HashedMap();
gajgMap.put("GAJG_DM",map.get("POLICE_CODE"));
gajgMap.put("GAJG_MC",map.get("GAJG_MC"));
gajgMap.put("info",map);
mapList.add(gajgMap);
}else {
List<Map<String, Object>> mapList = new ArrayList<>();
Map<String,Object> gajgMap = new HashedMap();
gajgMap.put("GAJG_DM",map.get("POLICE_CODE"));
gajgMap.put("GAJG_MC",map.get("GAJG_MC"));
gajgMap.put("info",map);
mapList.add(gajgMap);
countyMap.put(map.get("COUNTY_CODE").toString(),mapList);
}
}
Map<String,Object> cityMap = new LinkedHashMap<String,Object>();
for (String countyCode :countyMap.keySet()){
if (cityMap.containsKey(countyCode.substring(0,4))){
List<Map<String, Object>> mapList = (List<Map<String, Object>>) cityMap.get(countyCode.substring(0,4));
Map<String,Object> cityMapInfo = new HashedMap();
Map<String, Object> info = (Map<String, Object>) ((Map<String, Object>) ((List<Map<String, Object>>) countyMap.get(countyCode)).get(0)).get("info");
cityMapInfo.put("countyCode",info.get("COUNTY_CODE"));
cityMapInfo.put("countyName",info.get("COUNTYNAME"));
cityMapInfo.put("countyInfo",countyMap.get(countyCode));
mapList.add(cityMapInfo);
}else {
List<Map<String, Object>> mapList = new ArrayList<>();
Map<String,Object> cityMapInfo = new HashedMap();
Map<String, Object> info = (Map<String, Object>) ((Map<String, Object>) ((List<Map<String, Object>>) countyMap.get(countyCode)).get(0)).get("info");
cityMapInfo.put("countyCode",info.get("COUNTY_CODE"));
cityMapInfo.put("countyName",info.get("COUNTYNAME"));
cityMapInfo.put("countyInfo",countyMap.get(countyCode));
mapList.add(cityMapInfo);
cityMap.put(countyCode.substring(0,4),mapList);
}
}
List cityList = new ArrayList<>();
for (String citycode :cityMap.keySet()){
if ("0000".equals(citycode)){
}else {
Map<String,Object> map = new HashedMap();
map.put("cityCode",citycode);
map.put("cityInfo",cityMap.get(citycode));
Map<String, Object> info = (Map<String, Object>) ((Map<String, Object>) ((List<Map<String, Object>>) countyMap.get(citycode + "00")).get(0)).get("info");
map.put("cityName",info.get("CITYNAME"));
cityList.add( map);
}
}
return cityList;
}
@Override
public List findTypeListData() {
return utilMapper.queryMakeTypeList();
}
} }
src/main/java/com/yxproject/start/utils/YXJSONResponse.java
View file @ cab10107
package com.yxproject.start.utils; package com.yxproject.start.utils;
import com.yxproject.start.entity.SpecialCardInfoEntity;
import net.sf.json.JSON; import net.sf.json.JSON;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
...@@ -32,8 +33,9 @@ public class YXJSONResponse { ...@@ -32,8 +33,9 @@ public class YXJSONResponse {
/** /**
* 返回一个只有起止时间的空返回值对象 * 返回一个只有起止时间的空返回值对象
* @return 返回值对象 * @return 返回值对象
* @param specialCardInfoEntity
*/ */
public YXJSONResponse outPutSuccess() { public YXJSONResponse outPutSuccess(SpecialCardInfoEntity specialCardInfoEntity) {
this.ServerProcessingFinishStamp = System.currentTimeMillis(); this.ServerProcessingFinishStamp = System.currentTimeMillis();
this.ServerProcessingDur = this.ServerProcessingFinishStamp - this.start_stamp; this.ServerProcessingDur = this.ServerProcessingFinishStamp - this.start_stamp;
this.Error = false; this.Error = false;
......
src/main/resources/mapper/CardBodyMapper.xml
View file @ cab10107
...@@ -10,9 +10,13 @@ ...@@ -10,9 +10,13 @@
<result column="TOTAL_COUNT" property="total_Count" jdbcType="NUMERIC"/> <result column="TOTAL_COUNT" property="total_Count" jdbcType="NUMERIC"/>
</resultMap> </resultMap>
<select id="insertCardBodyEntity" resultType="com.yxproject.start.entity.CardBodyEntity" parameterType="String"> <select id="findCardBody" resultType="com.yxproject.start.entity.CardBodyEntity" parameterType="String">
select * from CARD_BODY where CARD_BODY_ID=#{card_Body_Id} select * from CARD_BODY where CARD_BODY_ID=#{card_Body_Id}
</select> </select>
<insert id="insertCardBody" parameterType="String" >
INSERT INTO CARD_BODY (CARD_TYPE_ID,IS_ACTIVE,TASK_ID,TOTAL_COUNT) VALUES (#{cardTypeId},#{isActive},#{taskId},#{totalCount})
</insert>
<update id="updateCardBody" parameterType="com.yxproject.start.entity.CardBodyEntity"> <update id="updateCardBody" parameterType="com.yxproject.start.entity.CardBodyEntity">
update CARD_BODY update CARD_BODY
......
src/main/resources/mapper/FailedCardMapper.xml
View file @ cab10107
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
<result column="STATE" property="state" jdbcType="NUMERIC"/> <result column="STATE" property="state" jdbcType="NUMERIC"/>
</resultMap> </resultMap>
<select id="selectFailedCardEntityByState" resultType="java.util.HashMap" parameterType="java.lang.Integer"> <select id="findFailedList" resultType="com.yxproject.start.entity.FailedCardEntity" parameterType="String">
select * from FAILED_CARD where state = #{state} select FAILED_CARD_ID as failedCardId, FAILED_CARD_REASON_ID as failedCardReasonId, ACCEPT_NO as acceptNo, TASK_ID as taskId, POSITION_DATE as positionDate, FINISH_DATE as finishDate, ALLOT_DATE as allotDate, PRINT_DATE as printDate, STATE as state from FAILED_CARD where STATE = #{state}
</select> </select>
<insert id="saveFailedCardEntity" parameterType="com.yxproject.start.entity.FailedCardEntity" > <insert id="saveFailedCardEntity" parameterType="com.yxproject.start.entity.FailedCardEntity" >
insert into FAILED_CARD (FAILED_CARD_ID,FAILED_CARD_REASON_ID,ACCEPT_NO,TASK_ID,POSITION_DATE,FINISH_DATE,ALLOT_DATE,PRINT_DATE,STATE ) insert into FAILED_CARD (failed_Card_Reason_Id,ACCEPT_NO,TASK_ID,STATE )
values (#{failed_Card_Id},#{failed_Card_Reason_Id},#{accept_No},#{task_Id},#{position_Date},#{finish_Date},#{allot_Date},#{print_Date},#{state}) values (#{failed_Card_Reason_Id},#{accept_No},#{task_Id},#{state})
</insert> </insert>
<update id="updateFailedCardEntity" parameterType="com.yxproject.start.entity.FailedCardEntity"> <update id="updateFailedCardEntity" parameterType="com.yxproject.start.entity.FailedCardEntity">
...@@ -36,5 +36,13 @@ update FAILED_CARD ...@@ -36,5 +36,13 @@ update FAILED_CARD
</set> </set>
where failed_Card_Id =#{failed_Card_Id} where failed_Card_Id =#{failed_Card_Id}
</update> </update>
<select id="selectAcceptNoAtFailedCard" resultType="com.yxproject.start.entity.FailedCardEntity" parameterType="String">
select * from failed_card where accept_No =#{accept_No}
</select>
<select id="selectAcceptNoAtSpecialCard" resultType="com.yxproject.start.entity.SpecialCardEntity" parameterType="String">
select * from special_card where accept_No =#{accept_No}
</select>
<select id="selectAcceptNoAtGroupNo" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
select * from group_no where group_no =#{groupNo}
</select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/GroupNoMapper.xml
View file @ cab10107
...@@ -50,6 +50,23 @@ ...@@ -50,6 +50,23 @@
group by GROUP_NO group by GROUP_NO
</select> </select>
<select id="findGroupListAtACCU" resultType="java.util.HashMap" parameterType="String">
select acc_group_t.group_no,acc_group_t.valid_count,acc_group_t.invalid_count,acc_group_t.deal_flag,
to_char(acc_group_t.submit_date,'yyyyMMdd')submit_date,SPECIALCARD.SPECIALCARDcount,
acc_group_t.submit_code,acc_group_relation_t.original_no,substr(original_no,21,1),to_char(acc_group_t.import_time,'yyyyMMdd') import_time
from acc_group_t@accu_dblink
inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no
left join (select count(SPECIAL_CARD.ACCEPT_NO) SPECIALCARDcount ,SPECIAL_CARD.GROUP_NO from SPECIAL_CARD group by SPECIAL_CARD.GROUP_NO) SPECIALCARD on acc_group_t.group_no = SPECIALCARD.GROUP_NO
where substr(original_no,21,1)=#{typeCode} and to_char(acc_group_t.import_time,'yyyyMMdd') =#{importTime}
and substr(original_no,0,4) = substr(#{cityCode},0,4) and acc_group_t.group_no not in (select GROUP_NO.GROUP_NO from group_no)
</select>
<select id="findGroupNoListAtACCU" resultType="com.yxproject.start.entity.GroupListEntity" parameterType="String">
select acc_group_t.group_no groupNo from acc_group_t@accu_dblink
inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no
where substr(original_no,21,1)=#{typeCode} and to_char(acc_group_t.import_time,'yyyyMMdd') =#{importTime}
and substr(original_no,0,4) = substr(#{cityCode},0,4) and acc_group_t.group_no not in (select GROUP_NO.GROUP_NO from group_no)
</select>
......
src/main/resources/mapper/SelectSerialNumberMapper.xml 0 → 100644
View file @ cab10107
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yxproject.start.mapper.SelectSerialNumberMapper">
<resultMap id="SelectSerialNumberMapper" type="java.util.HashMap">
</resultMap>
<!--根据组号查询-->
<select id="selectByGroupNumber" resultType="java.util.HashMap" parameterType="String">
select
TASK.TASK_ID,
GROUP_NO.GROUP_NO,
CITY_DIC.CITYNAME,
CARD_TYPE_DIC.CARD_TYPE,
TASK.SUBMIT_DATE,
PRINTER_DIC.PRINTER_NAME,
TASK.POSITION_DATE,
TASK.QUALITY_PEOPLE_NAME,
TASK.OUT_STORAGE_DATE,
TASK.IN_STORAGE_DATE,
TASK.EXCEPTION_INFORMATION
from GROUP_NO
LEFT JOIN TASK ON (GROUP_NO.TASK_ID =TASK.TASK_ID)
LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)
LEFT JOIN CITY_DIC ON(TASK.CITYCODE = CITY_DIC.CITYCODE)
LEFT JOIN PRINTER_DIC ON (TASK.PRINTER_ID = PRINTER_DIC.PRINTER_ID)
LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)
where GROUP_NO=#{id}
</select>
<!--根据受理号查询-->
<select id="selectByAccepted" parameterType="String" resultType="java.util.HashMap">
SELECT
ACC_CARD_T.ACCEPT_NO,
ACC_CARD_T.NAME,
ACC_CARD_T.ID_NO,
ACC_CARD_T.SEX_NO,
ACC_CARD_T.BIRTHDAY,
CARD_TYPE_DIC.CARD_TYPE,
ACC_CARD_T.SIGN_GOVT,
ACC_CARD_T.BEGIN_DATE,
ACC_CARD_T.EXPIRE_DATE,
ACC_CARD_T.STATUS_NO,
TASK_STATE_DIC.TASK_STATE,
CITY_DIC.CITYNAME,
decode(TASK.TASK_STATE_ID,2,TASK.submit_date,3,TASK.ISSUED_DATE,4,TASK.OUT_WORKSHOP_DATE,5,TASK.POSITION_DATE) lastModifyTime
FROM acc_card_t@accu_dblink
LEFT JOIN group_no ON (substr(accept_no,0,8) = group_no.GROUP_NO)
LEFT JOIN task ON (task.task_id = group_no.TASK_ID)
LEFT JOIN CITY_DIC ON (TASK.CITYCODE = CITY_DIC.CITYCODE)
LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)
LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)
where ACCEPT_NO=#{id}
</select>
<!--根据身份证号查询-->
<select id="selectByIdCard" parameterType="String" resultType="java.util.HashMap">
SELECT
ACC_CARD_T.ACCEPT_NO,
ACC_CARD_T.NAME,
ACC_CARD_T.ID_NO,
ACC_CARD_T.SEX_NO,
ACC_CARD_T.BIRTHDAY,
CARD_TYPE_DIC.CARD_TYPE,
ACC_CARD_T.SIGN_GOVT,
ACC_CARD_T.BEGIN_DATE,
ACC_CARD_T.EXPIRE_DATE,
ACC_CARD_T.STATUS_NO,
TASK_STATE_DIC.TASK_STATE,
CITY_DIC.CITYNAME,
decode(TASK.TASK_STATE_ID,2,TASK.submit_date,3,TASK.ISSUED_DATE,4,TASK.OUT_WORKSHOP_DATE,5,TASK.POSITION_DATE) lastModifyTime
FROM acc_card_t@accu_dblink
LEFT JOIN group_no ON (substr(accept_no,0,8) = group_no.GROUP_NO)
LEFT JOIN task ON (task.task_id = group_no.TASK_ID)
LEFT JOIN CITY_DIC ON (TASK.CITYCODE = CITY_DIC.CITYCODE)
LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)
LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)
where ID_NO=#{id}
</select>
<!--根据任务单查询-->
<select id="selectByWorkOrderNumber" parameterType="String" resultType="java.util.HashMap">
select
TASK.TASK_ID,
CITY_DIC.CITYNAME,
CARD_TYPE_DIC.CARD_TYPE,
TASK.SUBMIT_DATE,
PRINTER_DIC.PRINTER_NAME,
TASK.POSITION_DATE,
TASK.QUALITY_PEOPLE_NAME,
TASK.OUT_STORAGE_DATE,
TASK.IN_STORAGE_DATE,
TASK.EXCEPTION_INFORMATION
from TASK
LEFT JOIN TASK_STATE_DIC ON (TASK.TASK_STATE_ID = TASK_STATE_DIC.TASK_STATE_ID)
LEFT JOIN CITY_DIC ON (TASK.CITYCODE = CITY_DIC.CITYCODE)
LEFT JOIN PRINTER_DIC ON (TASK.PRINTER_ID = PRINTER_DIC.PRINTER_ID)
LEFT JOIN CARD_TYPE_DIC ON (TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID)
where TASK_ID =#{id}
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/TaskMapper.xml
View file @ cab10107
...@@ -28,10 +28,17 @@ ...@@ -28,10 +28,17 @@
</select> </select>
<insert id="insertProductionTaskListEntity" parameterType="com.yxproject.start.entity.TaskEntity"> <insert id="insertTaskEntity" parameterType="com.yxproject.start.entity.TaskEntity" useGeneratedKeys="true" keyProperty="TASK_ID" >
Insert into TASK (TASK_ID,CARD_TYPE,OLD_CARD_TYPE,CITYCODE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE, Insert into TASK (TASK_ID,CARD_TYPE,OLD_CARD_TYPE,CITYCODE,TASK_STATE_ID,PRINTER_ID)
OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID) values (#{task_Id},#{card_Type},
values (#{task_Id},#{card_Type},#{old_Card_Type},#{citycode},#{submit_Date},#{issued_Date},#{print_State},#{download_Date},#{print_Out_Date},#{position_Date},#{out_Workshop_Date},#{quality_People_Name},#{quality_Test_Date},#{exception_Information},#{out_Storage_Date},#{in_Storage_Date},#{task_State_Id},#{is_Exception},#{printer_Id}) <if test="old_Card_Type!=null">#{old_Card_Type},</if>
<if test="old_Card_Type==null">null,</if>
#{citycode},
<if test="task_State_Id!=null">#{task_State_Id},</if>
<if test="task_State_Id==null">null,</if>
<if test="printer_Id!=null">#{printer_Id}</if>
<if test="printer_Id==null">null</if>
)
</insert> </insert>
<update id="updateTaskEntity" parameterType="com.yxproject.start.entity.TaskEntity"> <update id="updateTaskEntity" parameterType="com.yxproject.start.entity.TaskEntity">
...@@ -95,6 +102,15 @@ ...@@ -95,6 +102,15 @@
GROUP BY CARD_TYPE_DIC.CARD_TYPE,TASK.CARD_TYPE GROUP BY CARD_TYPE_DIC.CARD_TYPE,TASK.CARD_TYPE
</select> </select>
<select id="findTypeListByImportDateAtACCU" resultType="com.yxproject.start.entity.TypeListEntity" parameterType="String">
select substr(original_no,21,1) typeCode,sum(valid_count ) typeCount,CARD_TYPE_DIC.CARD_TYPE AS typeName
from acc_group_t@accu_dblink
inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no
left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID =substr(original_no,21,1)
where to_char(IMPORT_TIME,'yyyyMMdd') =#{importTime} and acc_group_t.group_no not in (select GROUP_NO.GROUP_NO from group_no)
group by substr(original_no,21,1), CARD_TYPE_DIC.CARD_TYPE
</select>
<select id="findCityList" resultType="com.yxproject.start.entity.CityListEntity" parameterType="String"> <select id="findCityList" resultType="com.yxproject.start.entity.CityListEntity" parameterType="String">
SELECT CARD_TYPE AS cardType,TASK.CITYCODE AS citycode,CITYNAME AS cityName,sum(VALID_COUNT) AS validCount,sum(INVALID_COUNT) AS invalidCount,COUNT(GROUP_NO) AS groupCount,TASK.TASK_ID AS taskId,OLD_CARD_TYPE AS oldCardType,SUBMIT_DATE AS submitDate,ISSUED_DATE AS issuedDate,PRINT_STATE AS printState,DOWNLOAD_DATE AS downloadDate,PRINT_OUT_DATE AS printOutDate,POSITION_DATE AS positionDate,OUT_WORKSHOP_DATE AS outWorkshopDate,QUALITY_PEOPLE_NAME AS qualityPeopleName,QUALITY_TEST_DATE AS qualityTestDate,EXCEPTION_INFORMATION AS exceptionInformation,OUT_STORAGE_DATE AS outStorageDate,IN_STORAGE_DATE AS inStorageDate,TASK_STATE_ID AS taskStateId,IS_EXCEPTION AS isException,PRINTER_ID AS printerId SELECT CARD_TYPE AS cardType,TASK.CITYCODE AS citycode,CITYNAME AS cityName,sum(VALID_COUNT) AS validCount,sum(INVALID_COUNT) AS invalidCount,COUNT(GROUP_NO) AS groupCount,TASK.TASK_ID AS taskId,OLD_CARD_TYPE AS oldCardType,SUBMIT_DATE AS submitDate,ISSUED_DATE AS issuedDate,PRINT_STATE AS printState,DOWNLOAD_DATE AS downloadDate,PRINT_OUT_DATE AS printOutDate,POSITION_DATE AS positionDate,OUT_WORKSHOP_DATE AS outWorkshopDate,QUALITY_PEOPLE_NAME AS qualityPeopleName,QUALITY_TEST_DATE AS qualityTestDate,EXCEPTION_INFORMATION AS exceptionInformation,OUT_STORAGE_DATE AS outStorageDate,IN_STORAGE_DATE AS inStorageDate,TASK_STATE_ID AS taskStateId,IS_EXCEPTION AS isException,PRINTER_ID AS printerId
from TASK from TASK
...@@ -104,6 +120,23 @@ ...@@ -104,6 +120,23 @@
GROUP BY CARD_TYPE,TASK.CITYCODE,CITYNAME,TASK.TASK_ID,OLD_CARD_TYPE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID GROUP BY CARD_TYPE,TASK.CITYCODE,CITYNAME,TASK.TASK_ID,OLD_CARD_TYPE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID
</select> </select>
<select id="findCityListByImportDateAtACCU" resultType="com.yxproject.start.entity.CityListEntity" parameterType="String">
select CARDTYPE,CITYCODE,CITYNAME,VALIDCOUNT,INVALIDCOUNT,GROUPCOUNT,ROWNUM taskID
from (select substr(original_no,21,1) cardType ,substr(original_no,0,4)||'00' CITYCODE ,CITY_DIC.CITYNAME,sum(valid_count ) validCount,
sum(invalid_count) invalidCount,group_COUNT.groupCOUNT
from acc_group_t@accu_dblink
inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no
left join (select count(acc_group_t.group_no) groupCOUNT,substr(acc_group_relation_t.original_no,0,4) citycode
from acc_group_t@accu_dblink
left join acc_group_relation_t@accu_dblink on acc_group_t.group_no = acc_group_relation_t.group_no
where to_char(IMPORT_TIME,'yyyyMMdd') =#{importTime} and substr(original_no,21,1) =#{cardType}
group by substr(acc_group_relation_t.original_no,0,4)) group_COUNT
ON group_COUNT.citycode = substr(original_no,0,4)
left join (SELECT CITYCODE,CITYNAME FROM CITY_DIC) CITY_DIC on substr(CITY_DIC.CITYCODE,0,4) = substr(original_no,0,4)
where to_char(IMPORT_TIME,'yyyyMMdd') =#{importTime} and substr(original_no,21,1) =#{cardType} and acc_group_t.group_no not in (select GROUP_NO.GROUP_NO from group_no)
group by substr(original_no,21,1), substr(original_no,0,4)||'00', CITY_DIC.CITYNAME, group_COUNT.groupCOUNT)
</select>
<select id="findStationCountByDealDate" resultType="java.util.HashMap" parameterType="String"> <select id="findStationCountByDealDate" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM FIND_STATE_COUNT_VIEW WHERE FIND_STATE_COUNT_LIST.SET_SUBMITDATE_PARAM(#{submitDate})=#{submitDate} AND FIND_STATE_COUNT_LIST.SET_STATE_PARAM(#{state})=#{state} SELECT * FROM FIND_STATE_COUNT_VIEW WHERE FIND_STATE_COUNT_LIST.SET_SUBMITDATE_PARAM(#{submitDate})=#{submitDate} AND FIND_STATE_COUNT_LIST.SET_STATE_PARAM(#{state})=#{state}
......
src/main/resources/mapper/UtilMapper.xml
View file @ cab10107
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yxproject.start.mapper.UtilMapper"> <mapper namespace="com.yxproject.start.mapper.UtilMapper">
<select id="findProductionTaskListSequenceNextValue" resultType="int" > <select id="findProductionTaskListSequenceNextValue" resultType="int" >
select PRODUCTION_TASK_LIST_SEQ.nextval from dual select TASK_SEQ.nextval from dual
</select> </select>
<select id="findGroupInfoSequenceNextValue" resultType="int" > <select id="findGroupInfoSequenceNextValue" resultType="int" >
select GROUPINFO_SEQ.nextval from dual select GROUPINFO_SEQ.nextval from dual
...@@ -19,6 +19,18 @@ ...@@ -19,6 +19,18 @@
<select id="findPoliceStationApplyReasonSequenceNextValue" resultType="int"> <select id="findPoliceStationApplyReasonSequenceNextValue" resultType="int">
select APPLY_REASON_SEQ.nextval from dual select APPLY_REASON_SEQ.nextval from dual
</select> </select>
<select id="queryAllPoliceStation" resultType="java.util.HashMap">
select SUBSTR(GAJG_DM.GAJG_DM,0,8) police_Code,
GAJG_DM.GAJG_MC,decode(COUNTY_DIC.COUNTY_CODE,null,'000000',COUNTY_DIC.COUNTY_CODE) COUNTY_CODE,
decode(COUNTY_DIC.COUNTYNAME,null,'000000',COUNTY_DIC.COUNTYNAME) COUNTYNAME ,
SUBSTR(GAJG_DM.XZQH_DM,0,4) city_code,CITY_DIC.CITYNAME from GAJG_DM
left join COUNTY_DIC ON COUNTY_DIC.COUNTY_CODE = SUBSTR(GAJG_DM.GAJG_DM,0,6)
LEFT JOIN CITY_DIC ON SUBSTR(CITY_DIC.CITYCODE,0,4) = SUBSTR(GAJG_DM.GAJG_DM,0,4)
order by SUBSTR(GAJG_DM.GAJG_DM,0,8)
</select>
<select id="queryMakeTypeList" resultType="java.util.HashMap">
select * from card_type_dic
</select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/static/dialogs/confirmFailedCardsInfo.html
View file @ cab10107
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<th>NO.</th> <th>NO.</th>
<th>受理号</th> <th>受理号</th>
<th>姓名</th> <th>姓名</th>
<th>身份证号</th>
<th>类型</th> <th>类型</th>
</thead> </thead>
<tbody> <tbody>
...@@ -12,9 +13,10 @@ ...@@ -12,9 +13,10 @@
<td>{{$index + 1}}</td> <td>{{$index + 1}}</td>
<td>{{item.acceptNo}}</td> <td>{{item.acceptNo}}</td>
<td>{{item.name}}</td> <td>{{item.name}}</td>
<td ng-if="item.specialType==0">余证</td> <td>{{item.idNo}}</td>
<td ng-if="item.specialType==1">快证</td> <td ng-if="item.specialType==1">余证</td>
<td ng-if="item.specialType==2" style="color: red;">退证</td> <td ng-if="item.specialType==2">快证</td>
<td ng-if="item.specialType==3" style="color: red;">退证</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
src/main/resources/static/dialogs/specialCardList.html
View file @ cab10107
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
<tbody> <tbody>
<tr ng-repeat="specialCard in specialCardList"> <tr ng-repeat="specialCard in specialCardList">
<td>{{specialCard.accept_No}}</td> <td>{{specialCard.accept_No}}</td>
<td ng-if="specialCard.special_Type==0">余证</td> <td ng-if="specialCard.special_Type==1">余证</td>
<td ng-if="specialCard.special_Type==1">快证</td> <td ng-if="specialCard.special_Type==2">快证</td>
<td ng-if="specialCard.special_Type==2">退证</td> <td ng-if="specialCard.special_Type==3">退证</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
src/main/resources/static/index.html
View file @ cab10107
...@@ -17,7 +17,16 @@ ...@@ -17,7 +17,16 @@
<link rel="stylesheet" href="vendor/modules/ngDialog/css/myth/ngDialog-theme-default.css" type="text/css" /> <link rel="stylesheet" href="vendor/modules/ngDialog/css/myth/ngDialog-theme-default.css" type="text/css" />
</head> </head>
<body ng-controller="AppCtrl"> <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 --> <!-- jQuery -->
...@@ -26,6 +35,8 @@ ...@@ -26,6 +35,8 @@
<script src="vendor/layui/layui.js"></script> <script src="vendor/layui/layui.js"></script>
<!-- Angular --> <!-- Angular -->
<script src="vendor/angular/angular.js"></script> <script src="vendor/angular/angular.js"></script>
<script src="vendor/My97DatePicker/WdatePicker.js"></script>
<!--<script src="vendor/My97DatePicker/calendar.js"></script>-->
<script src="vendor/angular/angular-animate/angular-animate.js"></script> <script src="vendor/angular/angular-animate/angular-animate.js"></script>
<script src="vendor/angular/angular-cookies/angular-cookies.js"></script> <script src="vendor/angular/angular-cookies/angular-cookies.js"></script>
......
src/main/resources/static/js/app.js
View file @ cab10107
...@@ -16,4 +16,34 @@ angular.module('app', [ ...@@ -16,4 +16,34 @@ angular.module('app', [
'ui.validate', 'ui.validate',
'oc.lazyLoad', 'oc.lazyLoad',
'pascalprecht.translate' 'pascalprecht.translate'
]); ])
\ No newline at end of file /* App Module */
// var fs = angular.module('fs', ['fs.services', 'fs.controllers', 'fs.directives', 'ui.bootstrap','blueimp.fileupload']);
.controller('appCtrl', function ($scope,$location,$rootScope, HttpService) {
$scope.logoutWithUI = function() {
localStorage.clear();
$rootScope.loginData = {userid:'用户未登录', login:false};
}
});
src/main/resources/static/js/controllers/bootstrap.js
View file @ cab10107
...@@ -216,27 +216,29 @@ ...@@ -216,27 +216,29 @@
$scope.htmlTooltip = 'I\'ve been made <b>bold</b>!'; $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.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']; $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 // Any function returning a promise object can be used to load values asynchronously
$scope.getLocation = function(val) { $scope.getLocation = function(val) {
return $http.get('http://maps.googleapis.com/maps/api/geocode/json', { return $http.get('http://maps.googleapis.com/maps/api/geocode/json', {
params: { params: {
address: val, address: val,
sensor: false sensor: false
} }
}).then(function(res){ }).then(function(res){
var addresses = []; var addresses = [];
angular.forEach(res.data.results, function(item){ angular.forEach(res.data.results, function(item){
addresses.push(item.formatted_address); 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.today = function() {
$scope.dt = new Date(); $scope.dt = new Date();
}; };
...@@ -273,7 +275,7 @@ ...@@ -273,7 +275,7 @@
$scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate']; $scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
$scope.format = $scope.formats[0]; $scope.format = $scope.formats[0];
}]) }])
; ;
app.controller('TimepickerDemoCtrl', ['$scope', function($scope) { app.controller('TimepickerDemoCtrl', ['$scope', function($scope) {
$scope.mytime = new Date(); $scope.mytime = new Date();
......
src/main/resources/static/js/services/service.js
View file @ cab10107
...@@ -396,6 +396,20 @@ app.service('MessageService', function (ngDialog) { ...@@ -396,6 +396,20 @@ app.service('MessageService', function (ngDialog) {
MessageService.httpRequestFailed(JSON.stringify(errA)) MessageService.httpRequestFailed(JSON.stringify(errA))
}) })
}, },
getTypeListByImportDateAtACCU:function(date,success){
$http({
method: 'GET',
url: "../user/getTypeListByImportDateAtACCU" + urlTimeStamp(),
params:{
importTime:date
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getCityListByCardType:function(cardType,state,success){ getCityListByCardType:function(cardType,state,success){
$http({ $http({
method: 'GET', method: 'GET',
...@@ -411,6 +425,21 @@ app.service('MessageService', function (ngDialog) { ...@@ -411,6 +425,21 @@ app.service('MessageService', function (ngDialog) {
MessageService.httpRequestFailed(JSON.stringify(errA)) MessageService.httpRequestFailed(JSON.stringify(errA))
}) })
}, },
getCityListByImportDateAtACCU:function(importDate,cardType,success){
$http({
method: 'GET',
url: "../user/getCityListByImportDateAtACCU" + urlTimeStamp(),
params:{
importTime:importDate,
cardType:cardType
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getGroupNoByTaskListId:function(taskStateId,success){ getGroupNoByTaskListId:function(taskStateId,success){
$http({ $http({
method: 'GET', method: 'GET',
...@@ -425,6 +454,23 @@ app.service('MessageService', function (ngDialog) { ...@@ -425,6 +454,23 @@ app.service('MessageService', function (ngDialog) {
MessageService.httpRequestFailed(JSON.stringify(errA)) MessageService.httpRequestFailed(JSON.stringify(errA))
}) })
}, },
getGroupListAtACCU:function(citycode,cardType,importTime,success){
$http({
method: 'GET',
url: "../user/getGroupListAtACCU" + urlTimeStamp(),
params:{
typeCode:cardType,
cityCode:citycode,
importTime:importTime
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getCountyListByTaskListId:function(taskStateId,success){ getCountyListByTaskListId:function(taskStateId,success){
$http({ $http({
method: 'GET', method: 'GET',
...@@ -454,6 +500,21 @@ app.service('MessageService', function (ngDialog) { ...@@ -454,6 +500,21 @@ app.service('MessageService', function (ngDialog) {
MessageService.httpRequestFailed(JSON.stringify(errA)) MessageService.httpRequestFailed(JSON.stringify(errA))
}) })
}, },
updateFailedCard:function(failedCardId,state,success){
$http({
method: 'GET',
url: "../user/updateFailedinfo" + urlTimeStamp(),
params:{
failedCardId:failedCardId,
state:state
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
findFailedinfo:function(state,workShop,success){ findFailedinfo:function(state,workShop,success){
$http({ $http({
method: 'GET', method: 'GET',
...@@ -514,10 +575,13 @@ app.service('MessageService', function (ngDialog) { ...@@ -514,10 +575,13 @@ app.service('MessageService', function (ngDialog) {
}) })
}, },
saveFailedCardsID:function(success){ saveFailedCardsID:function(idNo,success){
$http({ $http({
method: 'GET', method: 'GET',
url: "../yingxin/addInValidCardInfo" + urlTimeStamp(), url: "../user/addFailedinfo" + urlTimeStamp(),
params:{
idNo:idNo
}
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response.data,"-------------response.data------") console.log(response.data,"-------------response.data------")
success(response.data) success(response.data)
...@@ -527,7 +591,7 @@ app.service('MessageService', function (ngDialog) { ...@@ -527,7 +591,7 @@ app.service('MessageService', function (ngDialog) {
}) })
}, },
addRemainCard:function(success){ addRemainCard:function(idNo,success){
$http({ $http({
method: 'GET', method: 'GET',
url: "../yingxin/addRemainCard" + urlTimeStamp(), url: "../yingxin/addRemainCard" + urlTimeStamp(),
...@@ -542,7 +606,47 @@ app.service('MessageService', function (ngDialog) { ...@@ -542,7 +606,47 @@ app.service('MessageService', function (ngDialog) {
MessageService.httpRequestFailed(JSON.stringify(errA)) MessageService.httpRequestFailed(JSON.stringify(errA))
}) })
}, },
getCardBodyReportData:function(startDate,endDate,success){
$http({
method: 'GET',
url: "../yingxin/getCardBodyCount" + urlTimeStamp(),
params:{
startTime:startDate,
endTime:endDate
}
}).then(function successCallback(response) {
console.log(response.data,"-------------getCardBodyReportData.data------")
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getAllPoliceStation:function(success){
$http({
method: 'GET',
url: "../user/getAllPoliceStation" + urlTimeStamp()
}).then(function successCallback(response) {
console.log(response.data,"-------------getAllPoliceStation.data------")
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getTypeListData:function(success){
$http({
method: 'GET',
url: "../user/getTypeListData" + urlTimeStamp()
}).then(function successCallback(response) {
console.log(response.data,"-------------getAllPoliceStation.data------")
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getprintReceipt:function(startDate,endDate,success) { getprintReceipt:function(startDate,endDate,success) {
$http({ $http({
...@@ -592,6 +696,56 @@ app.service('MessageService', function (ngDialog) { ...@@ -592,6 +696,56 @@ app.service('MessageService', function (ngDialog) {
MessageService.httpRequestFailed(JSON.stringify(errA)) MessageService.httpRequestFailed(JSON.stringify(errA))
}) })
}, },
getStateCountInfo:function(submitDate,state,success){
console.log(submitDate,state,"------------submitDate,state,--")
$http({
method: 'GET',
url: "../yingxin/getStateCountInfo" + urlTimeStamp(),
params:{
submitDate:submitDate,
state:state
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
querySpecialCardInfo:function(cardid,success) {
console.log(cardid,"----------cardid---------")
$http({
method: 'GET',
url: "../specialCardInfo/selectByCard" + urlTimeStamp(),
params:{
id:cardid
}
}).then(function successCallback(response) {
console.log(response.data,"-------------response.data------")
success(response.data)
},function(err){
// DebugService.debug("$http error:", err)
// DebugService.debug("----------------------------------------------")
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
saveTask:function(typeCode,importTime,cityCode,success){
$http({
method: 'GET',
url: "../user/saveTask" + urlTimeStamp(),
params:{
typeCode:typeCode,
importTime:importTime,
cityCode:cityCode
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
}
} }
}]) }])
\ No newline at end of file
src/main/resources/static/tpl/layout/addFailedCard/addFailedCard.js
View file @ cab10107
...@@ -86,7 +86,7 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state', ...@@ -86,7 +86,7 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state',
console.log($scope.dataInfo,"-=====$scope.dataInfo====") console.log($scope.dataInfo,"-=====$scope.dataInfo====")
var count = 0; var count = 0;
for(var i=0;i<$scope.dataInfo.size;i++){ for(var i=0;i<$scope.dataInfo.size;i++){
if($scope.dataInfo[i].name!=null){ if($scope.dataInfo[i].idNo!=null&&$scope.dataInfo[i].acceptNo!=null){
count+=1; count+=1;
}else{ }else{
continue; continue;
...@@ -96,6 +96,9 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state', ...@@ -96,6 +96,9 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state',
$scope.confirmFailedInfo = function () { $scope.confirmFailedInfo = function () {
console.log($rootScope.arr) console.log($rootScope.arr)
$(".confirmBtn").attr("disabled", true); $(".confirmBtn").attr("disabled", true);
console.log(count,"--------count");
console.log($scope.dataInfo.length,"--$scope.dataInfo.length--");
console.log($scope.dataInfo,"---$scope.dataInfo----");
if(count==$scope.dataInfo.length){ if(count==$scope.dataInfo.length){
HttpService.saveFailedCardsID($rootScope.arr,function(data){ HttpService.saveFailedCardsID($rootScope.arr,function(data){
$scope.isShowSuccess = 1; $scope.isShowSuccess = 1;
......
src/main/resources/static/tpl/layout/addRemainCard/addRemainCard.js
View file @ cab10107
...@@ -90,6 +90,8 @@ app.controller('addRemainCardCtrl', ['$scope', '$rootScope', '$http', '$state', ...@@ -90,6 +90,8 @@ app.controller('addRemainCardCtrl', ['$scope', '$rootScope', '$http', '$state',
console.log($rootScope.arr) console.log($rootScope.arr)
$(".confirmBtn").attr("disabled", true); $(".confirmBtn").attr("disabled", true);
if(count==$scope.dataInfo.length){ if(count==$scope.dataInfo.length){
console.log($rootScope.arr,"---$rootScope.arr---")
HttpService.addRemainCard($rootScope.arr,function(data){ HttpService.addRemainCard($rootScope.arr,function(data){
$scope.isShowSuccess = 1; $scope.isShowSuccess = 1;
$scope.AddSuccess = data.respData.string; $scope.AddSuccess = data.respData.string;
......
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.html
View file @ cab10107
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
<div class="row" style="padding-top:15px;padding-left:20px;"> <div class="row" style="padding-top:15px;padding-left:20px;">
<span class="col-lg-2"> <span class="col-lg-2">
<div class="input-group w-md"> <div class="input-group w-md">
<input type="text" class="form-control" datepicker-popup="{{format}}" ng-model="dt" <input id="date" type="text" class="form-control" datepicker-popup="{{format}}" ng-model="dt"
is-open="opened" datepicker-options="dateOptions" ng-required="true" is-open="opened" datepicker-options="dateOptions" ng-required="true"
close-text="Close"/> close-text="Close" value="12345678" />
<span class="input-group-btn"> <span class="input-group-btn">
<button type="button" class="btn btn-default" ng-click="open($event)"><i <button type="button" class="btn btn-default" ng-click="open($event)"><i
class="glyphicon glyphicon-calendar"></i></button> class="glyphicon glyphicon-calendar"></i></button>
...@@ -57,15 +57,15 @@ ...@@ -57,15 +57,15 @@
<th>状态</th> <th>状态</th>
<th>操作</th> <th>操作</th>
</thead> </thead>
<tbody ng-repeat="city in cityList| orderBy:citycode:desc"> <tbody ng-repeat="city in cityList| orderBy:citycode">
<tr> <tr>
<td>{{city.taskId}}</td> <td>{{city.taskId}}</td>
<td><span class="city" <td><span class="city"
style="color: #337ab7;display:inline-block">{{city.cityName}}</span></td> style="color: #337ab7;display:inline-block">{{city.cityName}}</span></td>
<td>{{city.groupCount}}</td> <td>{{city.groupCount}}</td>
<td>{{city.groupNO}}</td> <td>{{city.groupNo}}</td>
<td>{{city.groupSum}}</td> <td>{{city.validCount}}</td>
<td>{{city.groupInvailedSum}}</td> <td>{{city.invalidCount}}</td>
<td> <td>
<span style="padding-left:10px;" <span style="padding-left:10px;"
ng-show="city.printer_Id==null">未分配</span> ng-show="city.printer_Id==null">未分配</span>
...@@ -73,14 +73,14 @@ ...@@ -73,14 +73,14 @@
ng-show="city.printer_Id!=null">机器<span>{{city.printerId}}</span></span> ng-show="city.printer_Id!=null">机器<span>{{city.printerId}}</span></span>
</td> </td>
<td>{{city.state}}</td> <td>{{city.state}}</td>
<td ng-if="userState<=4"><a ng-click="showTable(city.taskId)">组号列表</a></td> <td ng-if="userState<=4"><a ng-click="showTable(city.citycode,city.taskId)">组号列表</a></td>
<td ng-if="userState>4"><a ng-click="showTableCounty(city.taskId)">区县列表</a></td> <td ng-if="userState>4"><a ng-click="showTableCounty(city.taskId)">区县列表</a></td>
<td><a ng-click="finishClick(city.taskId,userState)">完成</a></td> <td><a ng-click="finishClick(city.taskId,userState,city.citycode)">完成</a></td>
</tr> </tr>
<tr ng-show="showtable==city.taskId && userState<=4"> <tr ng-show="showtable==city.taskId && userState<=4">
<td></td> <td></td>
<td colspan="4"> <td colspan="6">
<table style="font-size:0.9em;color: #000;" class="table"> <table style="font-size:0.9em;color: #000;" class="table" ng-if="userState!=1">
<thead> <thead>
<th>组号</th> <th>组号</th>
<th>合格数量</th> <th>合格数量</th>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<th>特殊证件列表</th> <th>特殊证件列表</th>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="group in groupList"> <tr ng-repeat="group in groupList | orderBy:groupNo">
<td>{{group.groupNo}}</td> <td>{{group.groupNo}}</td>
<td>{{group.validCount}}</td> <td>{{group.validCount}}</td>
<td>{{group.invalidCount}}</td> <td>{{group.invalidCount}}</td>
...@@ -98,6 +98,31 @@ ...@@ -98,6 +98,31 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table style="font-size:0.9em;color: #000;" class="table" ng-if="userState=1">
<thead>
<th>组号</th>
<th>合格数量</th>
<th>不合格数量</th>
<th>入库时间</th>
<th>操作</th>
<th>特殊证件数量</th>
<th>特殊证件列表</th>
</thead>
<tbody>
<tr ng-repeat="group in groupList">
<td>{{group.GROUP_NO}}</td>
<td>{{group.VALID_COUNT}}</td>
<td>{{group.INVALID_COUNT}}</td>
<td>{{group.IMPORT_TIME}}</td>
<td ng-if="group.DEAL_FLAG==0">未处理</td>
<td ng-if="group.DEAL_FLAG==1">一次核验</td>
<td ng-if="group.DEAL_FLAG==2">二次核验</td>
<td ng-if="group.DEAL_FLAG==3">核验完成</td>
<td>{{group.SpecialCardList.length}}</td>
<td><a ng-click="showTableGroup(group.specialCardList)">特殊证件列表</a></td>
</tr>
</tbody>
</table>
</td> </td>
</tr> </tr>
...@@ -131,21 +156,21 @@ ...@@ -131,21 +156,21 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<footer class="panel-footer"> <!--<footer class="panel-footer">-->
<div class="row"> <!--&lt;!&ndash;<div class="row">&ndash;&gt;-->
<div class="col-sm-4 text-right text-center-xs"> <!--&lt;!&ndash;<div class="col-sm-4 text-right text-center-xs">&ndash;&gt;-->
<ul class="pagination pagination-sm m-t-none m-b-none"> <!--&lt;!&ndash;<ul class="pagination pagination-sm m-t-none m-b-none">&ndash;&gt;-->
<li><a href><i class="fa fa-chevron-left"></i></a></li> <!--&lt;!&ndash;<li><a href><i class="fa fa-chevron-left"></i></a></li>&ndash;&gt;-->
<li><a href>1</a></li> <!--&lt;!&ndash;<li><a href>1</a></li>&ndash;&gt;-->
<li><a href>2</a></li> <!--&lt;!&ndash;<li><a href>2</a></li>&ndash;&gt;-->
<li><a href>3</a></li> <!--&lt;!&ndash;<li><a href>3</a></li>&ndash;&gt;-->
<li><a href>4</a></li> <!--&lt;!&ndash;<li><a href>4</a></li>&ndash;&gt;-->
<li><a href>5</a></li> <!--&lt;!&ndash;<li><a href>5</a></li>&ndash;&gt;-->
<li><a href><i class="fa fa-chevron-right"></i></a></li> <!--&lt;!&ndash;<li><a href><i class="fa fa-chevron-right"></i></a></li>&ndash;&gt;-->
</ul> <!--&lt;!&ndash;</ul>&ndash;&gt;-->
</div> <!--&lt;!&ndash;</div>&ndash;&gt;-->
</div> <!--&lt;!&ndash;</div>&ndash;&gt;-->
</footer> <!--</footer>-->
</div> </div>
</div> </div>
</div> </div>
......
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.js
View file @ cab10107
...@@ -5,9 +5,8 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f ...@@ -5,9 +5,8 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
} else { } else {
$state.go("layout.cycleSheet") $state.go("layout.cycleSheet")
} }
// $scope.userState = $rootScope.loginData.workshop; $scope.userState = $rootScope.loginData.workshop;
console.log($scope.userState,'---------$scope.userState-------') // $scope.userState=1;
$scope.userState=5;
var getNowFormatDate = function () { var getNowFormatDate = function () {
var date = new Date(); var date = new Date();
...@@ -19,7 +18,7 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f ...@@ -19,7 +18,7 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
if (strDate >= 0 && strDate <= 9) { if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate; strDate = "0" + strDate;
} }
var currentdate = date.getFullYear() + "/" + month + "/" + strDate; var currentdate = date.getFullYear() + "-" + month + "-" + strDate;
return currentdate; return currentdate;
} }
$scope.today = function () { $scope.today = function () {
...@@ -53,23 +52,36 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f ...@@ -53,23 +52,36 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
class: 'datepicker' class: 'datepicker'
}; };
$scope.initDate = new Date('2016-15-20'); $scope.initDate = new Date('20161520');
$scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate']; $scope.formats = ['dd-MM-yyyy', 'yyyyMMdd', 'dd.MM.yyyy', 'shortDate'];
$scope.format = $scope.formats[1]; $scope.format = $scope.formats[1];
$scope.task_click = function () { $scope.task_click = function () {
getTypeListData($scope.userState)
} }
$scope.cardType = 0; $scope.cardType = 0;
$scope.check_type = function (typeCode) { $scope.check_type = function (typeCode) {
cardType = typeCode; $scope.cardType = typeCode;
getCityListData(cardType,$scope.userState); getCityListData($scope.cardType,$scope.userState);
} }
// 查询制证类型列表
// $scope.today = new Date();
// $scope.date = $filter('date')($scope.today, 'yyyyMMdd');
// 查询制证类型列表submitDate,state,
var getTypeListData = function (userState) { var getTypeListData = function (userState) {
HttpService.getTypeListByTaskStateId(userState,function (data) { $scope.date = $("#date").val();
$scope.typeList = data.respData; console.log($scope.date,"---$scope.date---")
if (userState==1){
HttpService.getTypeListByImportDateAtACCU($scope.date,function (data) {
$scope.typeList = data.respData;
}) })
} else {
HttpService.getTypeListByTaskStateId(userState,function (data) {
$scope.typeList = data.respData;
})
}
} }
getTypeListData($scope.userState); getTypeListData($scope.userState);
$scope.currentTab = 1; $scope.currentTab = 1;
...@@ -96,26 +108,43 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f ...@@ -96,26 +108,43 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
// 查询城市列表 // 查询城市列表
var getCityListData = function (cardType,state) { var getCityListData = function (cardType,state) {
console.log("----调用查询城市列表接口-",cardType,state) $scope.date = $("#date").val();
HttpService.getCityListByCardType(cardType,state,function (data) { if ($scope.userState==1){
$scope.cityList = data.respData; console.log("==================")
console.log("---城市列表--数据源:") HttpService.getCityListByImportDateAtACCU($scope.date,cardType,function (data) {
console.log(data.respData) $scope.cityList = data.respData;
console.log("---城市列表--数据源:")
console.log(data.respData)
})
} else {
console.log("-------------------")
HttpService.getCityListByCardType(cardType,state,function (data) {
$scope.cityList = data.respData;
console.log("---城市列表--数据源:")
console.log(data.respData)
})
}
})
} }
console.log("--查看card type- -",$scope.cardType)
getCityListData($scope.cardType,$scope.userState); getCityListData($scope.cardType,$scope.userState);
// 查询组号列表 // 查询组号列表
var getGroupListData = function (taskId) { var getGroupListData = function (citycode,taskId) {
console.log("---查询组号列表--数据源:",taskId); $scope.date = $("#date").val();
HttpService.getGroupNoByTaskListId(taskId,function (data) { if ($scope.userState==1){
$scope.groupList = data.respData; console.log(citycode,"----------",$scope.cardType,"-----",$scope.date,"-----citycode,$scope.cardType,$scope.date-----")
console.log("---查询组号列表--数据源:") HttpService.getGroupListAtACCU(citycode,$scope.cardType,$scope.date,function (data) {
console.log(data.respData) $scope.groupList = data.respData;
console.log($scope.groupList,"=====组号列表====")
})
} else {
HttpService.getGroupNoByTaskListId(taskId,function (data) {
$scope.groupList = data.respData;
})
}
})
} }
...@@ -281,7 +310,7 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f ...@@ -281,7 +310,7 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
// "task_State_Id": 1 // "task_State_Id": 1
// }, // },
// ] // ]
//
// $scope.groupList = [ // $scope.groupList = [
// { // {
// "groupNO": 45, // "groupNO": 45,
...@@ -336,14 +365,15 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f ...@@ -336,14 +365,15 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
// ] // ]
$scope.showtable = -1; $scope.showtable = -1;
$scope.showTable = function (taskID) { $scope.showTable = function (cityCode,taskID) {
console.log("$scope.-------$scope.showtable----",taskID);
if ($scope.showtable != taskID) { if ($scope.showtable != taskID) {
$scope.showtable = taskID; $scope.showtable = taskID;
} else { } else {
$scope.showtable = -1; $scope.showtable = -1;
} }
getGroupListData($scope.showtable);
getGroupListData(cityCode,$scope.showtable);
} }
$scope.showtableCounty = -1; $scope.showtableCounty = -1;
...@@ -354,12 +384,10 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f ...@@ -354,12 +384,10 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
} else { } else {
$scope.showtableCounty = -1; $scope.showtableCounty = -1;
} }
console.log($scope.showtableCounty,"---$scope.showtableCounty--");
getCountyListData($scope.showtableCounty); getCountyListData($scope.showtableCounty);
} }
$scope.showTableGroup = function (specialCardList) { $scope.showTableGroup = function (specialCardList) {
console.log("--specialCardList--",specialCardList);
ngDialog.open({ ngDialog.open({
template: 'dialogs/specialCardList.html' + urlTimeStamp(), template: 'dialogs/specialCardList.html' + urlTimeStamp(),
width: 800, width: 800,
...@@ -367,18 +395,23 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f ...@@ -367,18 +395,23 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService, $rootScope) { controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService, $rootScope) {
$scope.specialCardList = specialCardList; $scope.specialCardList = specialCardList;
}] }]
}) })
} }
$scope.finishClick = function (taskId, userState) { $scope.finishClick = function (taskId, userState,citycode) {
var state =parseInt(userState); var state =parseInt(userState);
console.log("--userState+1--",state+1); if (state==1){
HttpService.updateProductionTask(taskId, state+1, function (success) { console.log(citycode,"----------",$scope.cardType,"-----",$scope.date,"-----citycode,$scope.cardType,$scope.date-----")
HttpService.saveTask($scope.cardType,$scope.date,citycode,function (success){
//点击确认成功后 再次查询城市列表 getTypeListData(state);
getCityListData(cardType,state+1 ); getCityListData($scope.cardType,state+1 );
}) })
} else {
HttpService.updateProductionTask(taskId, state+1, function (success) {
//点击确认成功后 再次查询城市列表
getCityListData($scope.cardType,state+1 );
})
}
} }
// $scope.folds = [ // $scope.folds = [
......
src/main/resources/static/tpl/layout/failedCard/failedCard.html
View file @ cab10107
...@@ -3,13 +3,6 @@ ...@@ -3,13 +3,6 @@
ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;"> ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<div class="hbox hbox-auto-xs hbox-auto-sm"> <div class="hbox hbox-auto-xs hbox-auto-sm">
<div class="col w-md bg-light dk b-r bg-auto">
<div class="wrapper b-b bg">
<button class="btn btn-sm btn-default pull-right visible-sm visible-xs" ui-toggle-class="show"
target="#email-menu"><i class="fa fa-bars"></i></button>
<a class="w-xs font-bold">废证任务单</a>
</div>
</div>
<div class="col"> <div class="col">
<div class="wrapper-md"> <div class="wrapper-md">
...@@ -39,7 +32,7 @@ ...@@ -39,7 +32,7 @@
<span style="padding-left:10px;" <span style="padding-left:10px;"
ng-show="failedCard.allotDate==null">未分配</span> ng-show="failedCard.allotDate==null">未分配</span>
<span style="padding-left:10px;" <span style="padding-left:10px;"
ng-show="failedCard.allotDate!=null">{{failedCard.allotDate}}}</span></span> ng-show="failedCard.allotDate!=null">{{failedCard.allotDate}}</span></span>
</td> </td>
<td>{{failedCard.positionDate}}</td> <td>{{failedCard.positionDate}}</td>
<td>{{failedCard.state}}</td> <td>{{failedCard.state}}</td>
......
src/main/resources/static/tpl/layout/failedCard/failedCard.js
View file @ cab10107
...@@ -109,8 +109,8 @@ app.controller('failedCardCtrl', ['$scope', '$rootScope', '$http', '$state', '$f ...@@ -109,8 +109,8 @@ app.controller('failedCardCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
] ]
$scope.finishClick = function (taskId, userState) { $scope.finishClick = function (failedCardId,userState) {
HttpService.updateProductionTask(taskId, userState, function (data) { HttpService.updateFailedCard(failedCardId, userState, function (data) {
//点击确认成功后 再次废证列表 //点击确认成功后 再次废证列表
getFailedCardListData($rootScope.loginData.state, $rootScope.loginData.workshop); getFailedCardListData($rootScope.loginData.state, $rootScope.loginData.workshop);
}) })
......
src/main/resources/static/tpl/layout/layout.html
View file @ cab10107
...@@ -28,23 +28,44 @@ ...@@ -28,23 +28,44 @@
<!-- / buttons --> <!-- / buttons -->
<!-- search form --> <!-- 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" <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="form-group">
<div class="input-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" typeahead="state for state in states | filter:$viewValue | limitTo:8"
class="form-control input-sm bg-light no-border rounded padder" class="form-control input-sm bg-light no-border rounded padder"
placeholder="Search projects..."> placeholder="Search projects...">
<span class="input-group-btn"> <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> <i class="fa fa-search"></i>
</button> </button>
</span> </span>
</div> </div>
</div> </div>
<span style="margin-left: 300px">
已完成数量：<span>{{}}</span>
未完成数量：<span>{{}}</span>
</span>
</form> </form>
<!-- / search form -->
<!-- nabar right --> <!-- nabar right -->
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
......
src/main/resources/static/tpl/layout/layout.js
View file @ cab10107
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) { if ($rootScope.loginData.login == false) {
$state.go("signin") $state.go("signin")
} else { } else {
...@@ -20,5 +20,34 @@ app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filte ...@@ -20,5 +20,34 @@ app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filte
$scope.menuList = $rootScope.loginData.roleList[0].permissions; $scope.menuList = $rootScope.loginData.roleList[0].permissions;
} }
$scope.userState=$rootScope.loginData.workshop;
$scope.today = new Date();
$scope.timeString = $filter('date')($scope.today, 'yyyyMMdd');
var getStateCountInfo = function (timeString,userState) {
HttpService.getStateCountInfo(timeString,userState, function (data) {
$scope.getStateCountInfoData=data.respData
})
}
getStateCountInfo($scope.timeString,$scope.userState);
$scope.doSearch = function(){
$rootScope.searchInput=$("#searchInput").val();
HttpService.querySpecialCardInfo($rootScope.searchInput,function(data) {
if(data != null){
$rootScope.specialCardInfo = data.respData.searchResult;
}
})
$state.go("layout.searchSpecialCard")
}
$scope.enterEvent = function(e) {
var keycode = window.event?e.keyCode:e.which;
if(keycode==13){
$scope.doSearch();
}
}
}]) }])
\ No newline at end of file
src/main/resources/static/tpl/layout/searchSpecialCard/searchSpecialCard.html
View file @ cab10107
...@@ -16,15 +16,17 @@ ...@@ -16,15 +16,17 @@
<h3 ng-show="specialCardInfo== null&&searchInput!=null">没有找到与 "{{searchInput}}" 相关的信息。</h3> <h3 ng-show="specialCardInfo== null&&searchInput!=null">没有找到与 "{{searchInput}}" 相关的信息。</h3>
<h3 ng-show="searchInput==null">请在快速搜索框中填写身份证号/受理号，查询相关信息。</h3> <h3 ng-show="searchInput==null">请在快速搜索框中填写身份证号/受理号，查询相关信息。</h3>
<div style="width: auto"> <div style="width: auto">
<div ng-if="specialCardInfo[0].isGroup==0"> <h3 class="panel-title">
{{specialCardInfo.library}}
<div class="panel panel-default" ng-if="specialCardInfo[1]!=null"> </h3>
<div >
<div class="panel panel-default" ng-if="specialCardInfo.library=='盈信库'">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title"> <h3 class="panel-title">
{{specialCardInfo[1].cycleSheetInfo}} {{specialCardInfo.library}}
</h3> </h3>
</div> </div>
<div class="panel-body" style="width: auto"> <div class="panel-body" style="width: auto">
<div class="container" style="width: auto"> <div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;"> <div style="float: left;padding:0px 15px 0px 15px;">
<table class="table"> <table class="table">
...@@ -33,34 +35,27 @@ ...@@ -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>
<th>制证车间</th>
<th>质检</th> <th>质检</th>
<th>出库时间</th> <th>出库时间</th>
<th>入库时间</th> <th>入库时间</th>
<th>异常信息</th>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>{{specialCardInfo[1].info[9]}}</td> <td>{{specialCardInfo.group_No}}</td>
<td>{{specialCardInfo[1].info[14]}}</td> <td>{{specialCardInfo.cityName}}</td>
<td>{{specialCardInfo[1].info[6]}}</td> <td>{{specialCardInfo.cardType}}</td>
<td>{{specialCardInfo[1].info[1]|myDateFilter}}</td> <td><span>{{specialCardInfo.submit_Date.time | date:'yyyy-MM-dd'}}</span></td>
<td>{{specialCardInfo[1].info[7]}}</td> <td>{{specialCardInfo.position_Date}}</td>
<td>{{specialCardInfo[1].info[4]}}</td> <td>{{specialCardInfo.painterName}}</td>
<td>{{specialCardInfo[1].info[16]}}</td> <td>{{specialCardInfo.quality_People_Name}}</td>
<td ng-if="specialCardInfo[1].info[2]=='p1'">平一</td> <td>{{specialCardInfo.out_Storage_Date.time | date:'yyyy-MM-dd'}}</td>
<td ng-if="specialCardInfo[1].info[2]=='p2'">平二</td> <td>{{specialCardInfo.in_Storage_Date.time | date:'yyyy-MM-dd'}}</td>
<td>{{specialCardInfo[1].info[15]}}</td> <td ng-if="specialCardInfo.exception_Information!=null">{{specialCardInfo.exception_Information}}
<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> </td>
<td ng-if="specialCardInfo[1].info[12]==null"></td>
<td ng-if="specialCardInfo[1].info[13]==null"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -69,11 +64,11 @@ ...@@ -69,11 +64,11 @@
</div> </div>
</div> </div>
<div class="panel panel-default"> <div class="panel panel-default" ng-if="specialCardInfo.library=='受理库'">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title"> <h3 class="panel-title">
{{specialCardInfo[0].database}} {{specialCardInfo.library}}
</h3> </h3>
</div> </div>
<div class="panel-body" style="width: auto"> <div class="panel-body" style="width: auto">
...@@ -82,9 +77,9 @@ ...@@ -82,9 +77,9 @@
<table class="table"> <table class="table">
<thead> <thead>
<th>地市</th> <th>地市</th>
<th ng-show="specialCardInfo[0].oldGroupNo!=null">受理号</th> <th ng-show="specialCardInfo.accept_No!=null">受理号</th>
<th>姓名</th> <th>姓名</th>
<th ng-show="specialCardInfo[0].makeName!=null">制证类型</th> <th ng-show="specialCardInfo.cardType!=null">制证类型</th>
<th>身份证号</th> <th>身份证号</th>
<th>性别</th> <th>性别</th>
<th>出生日期</th> <th>出生日期</th>
...@@ -93,29 +88,24 @@ ...@@ -93,29 +88,24 @@
<th>终止有效期</th> <th>终止有效期</th>
<th>证件状态</th> <th>证件状态</th>
<th>上报受理单位</th> <th>上报受理单位</th>
<th>证件状态</th>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>{{specialCardInfo[0].sbdw}}</td> <td>{{specialCardInfo.cityName}}</td>
<td ng-show="specialCardInfo[0].oldGroupNo!=null"> <td ng-show="specialCardInfo.accept_No!=null">
{{specialCardInfo[0].oldGroupNo}} {{specialCardInfo.accept_No}}
</td> </td>
<td>{{specialCardInfo[0].name}}</td> <td>{{specialCardInfo.name}}</td>
<td ng-show="specialCardInfo[0].makeType!=null">{{specialCardInfo[0].makeName}}</td> <td ng-show="specialCardInfo.cardType!=null">{{specialCardInfo.cardType}}</td>
<td>{{specialCardInfo[0].IDcard}}</td> <td>{{specialCardInfo.id_No}}</td>
<td>{{specialCardInfo[0].xb}}</td> <td>{{specialCardInfo.sex_No}}</td>
<td>{{specialCardInfo[0].csrq | myDateFilter}}</td> <td>{{specialCardInfo.birthday }}</td>
<td>{{specialCardInfo[0].jfjg}}</td> <td>{{specialCardInfo.sign_Govt}}</td>
<td>{{specialCardInfo[0].yxqqsrq}}</td> <td>{{specialCardInfo.begin_Date}}</td>
<td>{{specialCardInfo[0].yxqjzrq}}</td> <td>{{specialCardInfo.expire_Date}}</td>
<td>{{specialCardInfo[0].state}}</td> <td>{{specialCardInfo.taskState}}</td>
<td>{{specialCardInfo[0].sbdw}}</td> <td>{{specialCardInfo.sign_Govt}}</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>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -147,486 +137,484 @@ ...@@ -147,486 +137,484 @@
</div> </div>
</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"> <!--<div class="panel-heading">-->
<h3 class="panel-title"> <!--<h3 class="panel-title">-->
异常信息 <!--异常信息-->
</h3> <!--</h3>-->
</div> <!--</div>-->
<div class="panel-body" style="width: auto"> <!--<div class="panel-body" style="width: auto">-->
<div class="container" style="width: auto"> <!--<div class="container" style="width: auto">-->
<div style="float: left;padding:0px 15px 0px 15px;"> <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
{{specialCardInfo[1].info[10]}} <!--{{specialCardInfo[1].info[10]}}-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> </div>
<div ng-if="specialCardInfo[0].isGroup==1"> <!--<div ng-if="specialCardInfo[0].isGroup==1">-->
<div class="panel panel-default"> <!--<div class="panel panel-default">-->
<div class="panel-heading"> <!--<div class="panel-heading">-->
<h3 class="panel-title"> <!--<h3 class="panel-title">-->
{{specialCardInfo[0].library}} <!--{{specialCardInfo[0].library}}-->
</h3> <!--</h3>-->
</div> <!--</div>-->
<div class="panel-body" style="width: auto"> <!--<div class="panel-body" style="width: auto">-->
<div class="container" style="width: auto"> <!--<div class="container" style="width: auto">-->
<div style="float: left;padding:0px 15px 0px 15px;"> <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
<table class="table"> <!--<table class="table">-->
<thead> <!--<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> <!--<th>电写入时间</th>-->
<th>电质检时间</th> <!--<th>电质检时间</th>-->
<th>生产车间</th> <!--<th>生产车间</th>-->
<th>机器号</th> <!--<th>机器号</th>-->
<th>出库时间</th> <!--<th>出库时间</th>-->
<th>入库时间</th> <!--<th>入库时间</th>-->
</thead> <!--</thead>-->
<tbody> <!--<tbody>-->
<tr> <!--<tr>-->
<td>{{specialCardInfo[0].groupNo}}</td> <!--<td>{{specialCardInfo[0].groupNo}}</td>-->
<td>{{specialCardInfo[0].info[5]}}</td> <!--<td>{{specialCardInfo[0].info[5]}}</td>-->
<td>{{specialCardInfo[0].info[5]}}</td> <!--<td>{{specialCardInfo[0].info[5]}}</td>-->
<td>{{specialCardInfo[0].info[3]}}</td> <!--<td>{{specialCardInfo[0].info[3]}}</td>-->
<td>{{specialCardInfo[0].info[6]}}</td> <!--<td>{{specialCardInfo[0].info[6]}}</td>-->
<td>{{specialCardInfo[0].info[7]}}</td> <!--<td>{{specialCardInfo[0].info[7]}}</td>-->
<td>{{specialCardInfo[0].info[8]}}</td> <!--<td>{{specialCardInfo[0].info[8]}}</td>-->
<td>{{specialCardInfo[0].info[9]}}</td> <!--<td>{{specialCardInfo[0].info[9]}}</td>-->
<td>{{specialCardInfo[0].info[10]}}</td> <!--<td>{{specialCardInfo[0].info[10]}}</td>-->
<td ng-if="specialCardInfo[0].info[12]=='p1'">平一车间</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]=='p2'">平二车间</td>-->
<td ng-if="specialCardInfo[0].info[12]==null">未分配</td> <!--<td ng-if="specialCardInfo[0].info[12]==null">未分配</td>-->
<td>{{specialCardInfo[0].info[11]}}</td> <!--<td>{{specialCardInfo[0].info[11]}}</td>-->
<td>{{specialCardInfo[0].info[16]| limitTo:8}}</td> <!--<td>{{specialCardInfo[0].info[16]| limitTo:8}}</td>-->
<td>{{specialCardInfo[0].info[17]| limitTo:8}}</td> <!--<td>{{specialCardInfo[0].info[17]| limitTo:8}}</td>-->
</tr> <!--</tr>-->
</tbody> <!--</tbody>-->
</table> <!--</table>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
<div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1"> <!--<div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1">-->
<div class="panel-heading"> <!--<div class="panel-heading">-->
<h3 class="panel-title"> <!--<h3 class="panel-title">-->
异常信息 <!--异常信息-->
</h3> <!--</h3>-->
</div> <!--</div>-->
<div class="panel-body" style="width: auto"> <!--<div class="panel-body" style="width: auto">-->
<div class="container" style="width: auto"> <!--<div class="container" style="width: auto">-->
<div style="float: left;padding:0px 15px 0px 15px;"> <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
{{specialCardInfo[0].info[14]}} <!--{{specialCardInfo[0].info[14]}}-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
<div ng-if="specialCardInfo[0].isGroup==3"> <!--<div ng-if="specialCardInfo[0].isGroup==3">-->
<div class="panel panel-default"> <!--<div class="panel panel-default">-->
<div class="panel-heading"> <!--<div class="panel-heading">-->
<h3 class="panel-title"> <!--<h3 class="panel-title">-->
{{specialCardInfo[0].library}} <!--{{specialCardInfo[0].library}}-->
</h3> <!--</h3>-->
</div> <!--</div>-->
<div class="panel-body" style="width: auto"> <!--<div class="panel-body" style="width: auto">-->
<div class="container" style="width: auto"> <!--<div class="container" style="width: auto">-->
<div style="float: left;padding:0px 15px 0px 15px;"> <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
<table class="table"> <!--<table class="table">-->
<thead> <!--<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> <!--<th>入库时间</th>-->
</thead> <!--</thead>-->
<tbody> <!--<tbody>-->
<tr> <!--<tr>-->
<td>{{specialCardInfo[0].groupNo}}</td> <!--<td>{{specialCardInfo[0].groupNo}}</td>-->
<td>{{specialCardInfo[0].info[12]}}</td> <!--<td>{{specialCardInfo[0].info[12]}}</td>-->
<td>{{specialCardInfo[0].info[5]}}</td> <!--<td>{{specialCardInfo[0].info[5]}}</td>-->
<td>{{specialCardInfo[0].info[4]}}</td> <!--<td>{{specialCardInfo[0].info[4]}}</td>-->
<td>{{specialCardInfo[0].info[6]}}</td> <!--<td>{{specialCardInfo[0].info[6]}}</td>-->
<td>{{specialCardInfo[0].info[7]}}</td> <!--<td>{{specialCardInfo[0].info[7]}}</td>-->
<td>{{specialCardInfo[0].info[16]| limitTo:8}}</td> <!--<td>{{specialCardInfo[0].info[16]| limitTo:8}}</td>-->
<td>{{specialCardInfo[0].info[17]| limitTo:8}}</td> <!--<td>{{specialCardInfo[0].info[17]| limitTo:8}}</td>-->
</tr> <!--</tr>-->
</tbody> <!--</tbody>-->
</table> <!--</table>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
<div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1"> <!--<div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1">-->
<div class="panel-heading"> <!--<div class="panel-heading">-->
<h3 class="panel-title"> <!--<h3 class="panel-title">-->
异常信息 <!--异常信息-->
</h3> <!--</h3>-->
</div> <!--</div>-->
<div class="panel-body" style="width: auto"> <!--<div class="panel-body" style="width: auto">-->
<div class="container" style="width: auto"> <!--<div class="container" style="width: auto">-->
<div style="float: left;padding:0px 15px 0px 15px;"> <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
{{specialCardInfo[0].info[14]}} <!--{{specialCardInfo[0].info[14]}}-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
<div ng-if="specialCardInfo[0].isGroup==4"> <!--<div ng-if="specialCardInfo[0].isGroup==4">-->
<div class="panel panel-default"> <!--<div class="panel panel-default">-->
<div class="panel-heading"> <!--<div class="panel-heading">-->
<h3 class="panel-title"> <!--<h3 class="panel-title">-->
{{specialCardInfo[0].library}} <!--{{specialCardInfo[0].library}}-->
</h3> <!--</h3>-->
</div> <!--</div>-->
<div class="panel-body" style="width: auto"> <!--<div class="panel-body" style="width: auto">-->
<div class="container" style="width: auto"> <!--<div class="container" style="width: auto">-->
<div style="float: left;padding:0px 15px 0px 15px;"> <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
<table class="table"> <!--<table class="table">-->
<thead> <!--<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> <!--<th>质检人</th>-->
<th>出库时间</th> <!--<th>出库时间</th>-->
<th>入库时间</th> <!--<th>入库时间</th>-->
<th>异常</th> <!--<th>异常</th>-->
<th ng-if="specialCardInfo[0].info[12]==1">异常信息</th> <!--<th ng-if="specialCardInfo[0].info[12]==1">异常信息</th>-->
</thead> <!--</thead>-->
<tbody> <!--<tbody>-->
<tr> <!--<tr>-->
<td>{{specialCardInfo[0].info[1]}}</td> <!--<td>{{specialCardInfo[0].info[1]}}</td>-->
<td>{{specialCardInfo[0].groupNo}}</td> <!--<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[3]}}</td>-->
<td>{{specialCardInfo[0].info[6]}}</td> <!--<td>{{specialCardInfo[0].info[6]}}</td>-->
<td>{{specialCardInfo[0].info[8]}}</td> <!--<td>{{specialCardInfo[0].info[8]}}</td>-->
<td ng-if="specialCardInfo[0].info[9]=='p1'">平一车间</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]=='p2'">平二车间</td>-->
<td ng-if="specialCardInfo[0].info[9]==null">未分配</td> <!--<td ng-if="specialCardInfo[0].info[9]==null">未分配</td>-->
<td>{{specialCardInfo[0].info[10]}}</td> <!--<td>{{specialCardInfo[0].info[10]}}</td>-->
<td>{{specialCardInfo[0].info[13] | limitTo:8}}</td> <!--<td>{{specialCardInfo[0].info[13] | limitTo:8}}</td>-->
<td>{{specialCardInfo[0].info[14] | 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]==0">无</td>-->
<td ng-if="specialCardInfo[0].info[12]==1" style="color:red;">异常</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> <!--<td ng-if="specialCardInfo[0].info[12]==1">{{specialCardInfo[0].info[11]}}</td>-->
</tr> <!--</tr>-->
</tbody> <!--</tbody>-->
</table> <!--</table>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
<div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1"> <!--<div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1">-->
<div class="panel-heading"> <!--<div class="panel-heading">-->
<h3 class="panel-title"> <!--<h3 class="panel-title">-->
异常信息 <!--异常信息-->
</h3> <!--</h3>-->
</div> <!--</div>-->
<div class="panel-body" style="width: auto"> <!--<div class="panel-body" style="width: auto">-->
<div class="container" style="width: auto"> <!--<div class="container" style="width: auto">-->
<div style="float: left;padding:0px 15px 0px 15px;"> <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
{{specialCardInfo[0].info[14]}} <!--{{specialCardInfo[0].info[14]}}-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
<div ng-if="specialCardInfo[0].isGroup==5"> <!--<div ng-if="specialCardInfo[0].isGroup==5">-->
<div class="panel panel-default"> <!--<div class="panel panel-default">-->
<div class="panel-heading"> <!--<div class="panel-heading">-->
<h3 class="panel-title"> <!--<h3 class="panel-title">-->
{{specialCardInfo[0].library}} <!--{{specialCardInfo[0].library}}-->
</h3> <!--</h3>-->
</div> <!--</div>-->
<div class="panel-body" style="width: auto"> <!--<div class="panel-body" style="width: auto">-->
<div class="container" style="width: auto"> <!--<div class="container" style="width: auto">-->
<div style="float: left;padding:0px 15px 0px 15px;"> <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
<table class="table"> <!--<table class="table">-->
<thead> <!--<thead>-->
<th>组号</th> <!--<th>组号</th>-->
</thead> <!--</thead>-->
<tbody> <!--<tbody>-->
<tr> <!--<tr>-->
<td>{{specialCardInfo[0].groupNo}}</td> <!--<td>{{specialCardInfo[0].groupNo}}</td>-->
</tr> <!--</tr>-->
</tbody> <!--</tbody>-->
</table> <!--</table>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
<div ng-if="specialCardInfo[0].isGroup==6"> <!--<div ng-if="specialCardInfo[0].isGroup==6">-->
<div class="panel panel-default" ng-if="specialCardInfo[0]!=null"> <!--<div class="panel panel-default" ng-if="specialCardInfo[0]!=null">-->
<div class="panel-heading"> <!--<div class="panel-heading">-->
<h3 class="panel-title"> <!--<h3 class="panel-title">-->
{{specialCardInfo[0].cycleSheetInfo}} <!--{{specialCardInfo[0].cycleSheetInfo}}-->
</h3> <!--</h3>-->
</div> <!--</div>-->
<div class="panel-body" style="width: auto"> <!--<div class="panel-body" style="width: auto">-->
<div class="container" style="width: auto"> <!--<div class="container" style="width: auto">-->
<div style="float: left;padding:0px 15px 0px 15px;"> <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
<table class="table"> <!--<table class="table">-->
<thead> <!--<thead>-->
<th>编号</th> <!--<th>编号</th>-->
<th>地市</th> <!--<th>地市</th>-->
<th>制证类型</th> <!--<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> <!--<th>制证车间</th>-->
<th>质检</th> <!--<th>质检</th>-->
<th>出库时间</th> <!--<th>出库时间</th>-->
<th>入库时间</th> <!--<th>入库时间</th>-->
</thead> <!--</thead>-->
<tbody> <!--<tbody>-->
<tr> <!--<tr>-->
<td>{{specialCardInfo[0].info[9]}}</td> <!--<td>{{specialCardInfo[0].info[9]}}</td>-->
<td>{{specialCardInfo[0].info[14]}}</td> <!--<td>{{specialCardInfo[0].info[14]}}</td>-->
<td>{{specialCardInfo[0].info[6]}}</td> <!--<td>{{specialCardInfo[0].info[6]}}</td>-->
<td>{{specialCardInfo[0].info[1]|myDateFilter}}</td> <!--<td>{{specialCardInfo[0].info[1]}}</td>-->
<td>{{specialCardInfo[0].info[7]}}</td> <!--<td>{{specialCardInfo[0].info[7]}}</td>-->
<td>{{specialCardInfo[0].info[4]}}</td> <!--<td>{{specialCardInfo[0].info[4]}}</td>-->
<td>{{specialCardInfo[0].info[16]}}</td> <!--<td>{{specialCardInfo[0].info[16]}}</td>-->
<td ng-if="specialCardInfo[0].info[2]=='p1'">平一</td> <!--<td ng-if="specialCardInfo[0].info[2]=='p1'">平一</td>-->
<td ng-if="specialCardInfo[0].info[2]=='p2'">平二</td> <!--<td ng-if="specialCardInfo[0].info[2]=='p2'">平二</td>-->
<td>{{specialCardInfo[0].info[15]}}</td> <!--<td>{{specialCardInfo[0].info[15]}}</td>-->
<td ng-if="specialCardInfo[0].info[12]!=null">{{specialCardInfo[1].info[12] | <!--<td ng-if="specialCardInfo[0].info[12]!=null">{{specialCardInfo[1].info[12] }}-->
myDateFilter}} <!--</td>-->
</td> <!--<td ng-if="specialCardInfo[0].info[13]!=null">{{specialCardInfo[1].info[12] }}-->
<td ng-if="specialCardInfo[0].info[13]!=null">{{specialCardInfo[1].info[12] | <!--</td>-->
myDateFilter}} <!--<td ng-if="specialCardInfo[0].info[12]==null"></td>-->
</td> <!--<td ng-if="specialCardInfo[0].info[13]==null"></td>-->
<td ng-if="specialCardInfo[0].info[12]==null"></td> <!--</tr>-->
<td ng-if="specialCardInfo[0].info[13]==null"></td> <!--</tbody>-->
</tr> <!--</table>-->
</tbody> <!--</div>-->
</table> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--<div ng-if="specialCardInfo[0].isGroup==8">-->
</div> <!--&lt;!&ndash;循环单&ndash;&gt;-->
<div ng-if="specialCardInfo[0].isGroup==8"> <!--<div class="panel panel-default" ng-if="specialCardInfo[0].cyclesheet.length>0">-->
<!--循环单--> <!--<div class="panel-heading">-->
<div class="panel panel-default" ng-if="specialCardInfo[0].cyclesheet.length>0"> <!--<h3 class="panel-title">-->
<div class="panel-heading"> <!--循环单-->
<h3 class="panel-title"> <!--</h3>-->
循环单 <!--</div>-->
</h3> <!--<div class="panel-body" style="width: auto">-->
</div> <!--<div class="container" style="width: auto">-->
<div class="panel-body" style="width: auto"> <!--<div style="float: left;padding:0 15px 0 15px;">-->
<div class="container" style="width: auto"> <!--<table class="table">-->
<div style="float: left;padding:0 15px 0 15px;"> <!--<thead>-->
<table class="table"> <!--<th>循环单流水号</th>-->
<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>-->
<th>机器号</th> <!--<th>预定位接收时间</th>-->
<th>制证车间</th> <!--<th>质检人</th>-->
<th>预定位接收时间</th> <!--<th>出库时间</th>-->
<th>质检人</th> <!--<th>入库时间</th>-->
<th>出库时间</th> <!--<th>异常</th>-->
<th>入库时间</th> <!--</thead>-->
<th>异常</th> <!--<tbody>-->
</thead> <!--<tr>-->
<tbody> <!--<td>{{specialCardInfo[0].cyclesheet[0]}}</td>-->
<tr> <!--<td>{{specialCardInfo[0].cyclesheet[1]}}</td>-->
<td>{{specialCardInfo[0].cyclesheet[0]}}</td> <!--<td>{{specialCardInfo[0].cyclesheet[2]}}</td>-->
<td>{{specialCardInfo[0].cyclesheet[1]}}</td> <!--<td>{{specialCardInfo[0].cyclesheet[3]}}</td>-->
<td>{{specialCardInfo[0].cyclesheet[2]}}</td> <!--<td>{{specialCardInfo[0].cyclesheet[4]}}</td>-->
<td>{{specialCardInfo[0].cyclesheet[3]}}</td> <!--<td>{{specialCardInfo[0].cyclesheet[5]}}</td>-->
<td>{{specialCardInfo[0].cyclesheet[4]}}</td> <!--<td>{{specialCardInfo[0].cyclesheet[6]}}</td>-->
<td>{{specialCardInfo[0].cyclesheet[5]}}</td> <!--<td>{{specialCardInfo[0].cyclesheet[7]}}</td>-->
<td>{{specialCardInfo[0].cyclesheet[6]}}</td> <!--<td ng-if="specialCardInfo[0].cyclesheet[8]=='p1'||specialCardInfo[0].cyclesheet[8]=='p3'">-->
<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 ng-if="specialCardInfo[0].cyclesheet[8]=='p2'||specialCardInfo[0].cyclesheet[8]=='p4'"> <!--</td>-->
平二 <!--<td>{{specialCardInfo[0].cyclesheet[9]}}</td>-->
</td> <!--<td>{{specialCardInfo[0].cyclesheet[10]}}</td>-->
<td>{{specialCardInfo[0].cyclesheet[9]}}</td> <!--<td>{{specialCardInfo[0].cyclesheet[11] | limitTo:8}}</td>-->
<td>{{specialCardInfo[0].cyclesheet[10]}}</td> <!--<td>{{specialCardInfo[0].cyclesheet[12] | limitTo:8}}</td>-->
<td>{{specialCardInfo[0].cyclesheet[11] | limitTo:8}}</td> <!--<td ng-if="specialCardInfo[0].cyclesheet[14]==0">无</td>-->
<td>{{specialCardInfo[0].cyclesheet[12] | limitTo:8}}</td> <!--<td ng-if="specialCardInfo[0].cyclesheet[14]==1">-->
<td ng-if="specialCardInfo[0].cyclesheet[14]==0">无</td> <!--{{specialCardInfo[0].cyclesheet[13]}}-->
<td ng-if="specialCardInfo[0].cyclesheet[14]==1"> <!--</td>-->
{{specialCardInfo[0].cyclesheet[13]}} <!--</tr>-->
</td> <!--</tbody>-->
</tr> <!--</table>-->
</tbody> <!--</div>-->
</table> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div>
</div>
<!--制证库--> <!--&lt;!&ndash;制证库&ndash;&gt;-->
<div class="panel panel-default" ng-if="specialCardInfo[0].prod.length>0"> <!--<div class="panel panel-default" ng-if="specialCardInfo[0].prod.length>0">-->
<div class="panel-heading"> <!--<div class="panel-heading">-->
<h3 class="panel-title"> <!--<h3 class="panel-title">-->
制证库 <!--制证库-->
</h3> <!--</h3>-->
</div> <!--</div>-->
<div class="panel-body" style="width: auto"> <!--<div class="panel-body" style="width: auto">-->
<div class="container" style="width: auto"> <!--<div class="container" style="width: auto">-->
<div style="float: left;padding:0px 15px 0px 15px;"> <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
<table class="table"> <!--<table class="table">-->
<thead> <!--<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> <!--</thead>-->
<tbody> <!--<tbody>-->
<tr> <!--<tr>-->
<td>{{specialCardInfo[0].prod[0]}}</td> <!--<td>{{specialCardInfo[0].prod[0]}}</td>-->
<td>{{specialCardInfo[0].prod[1]}}</td> <!--<td>{{specialCardInfo[0].prod[1]}}</td>-->
<td>{{specialCardInfo[0].prod[2]}}</td> <!--<td>{{specialCardInfo[0].prod[2]}}</td>-->
<td>{{specialCardInfo[0].prod[3]}}</td> <!--<td>{{specialCardInfo[0].prod[3]}}</td>-->
<td>{{specialCardInfo[0].prod[4]}}</td> <!--<td>{{specialCardInfo[0].prod[4]}}</td>-->
<td>{{specialCardInfo[0].prod[5]}}</td> <!--<td>{{specialCardInfo[0].prod[5]}}</td>-->
<td>{{specialCardInfo[0].prod[6]}}</td> <!--<td>{{specialCardInfo[0].prod[6]}}</td>-->
</tr> <!--</tr>-->
</tbody> <!--</tbody>-->
</table> <!--</table>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
<!--受理库--> <!--&lt;!&ndash;受理库&ndash;&gt;-->
<div class="panel panel-default" ng-if="specialCardInfo[0].accu.length>0"> <!--<div class="panel panel-default" ng-if="specialCardInfo[0].accu.length>0">-->
<div class="panel-heading"> <!--<div class="panel-heading">-->
<h3 class="panel-title"> <!--<h3 class="panel-title">-->
受理库 <!--受理库-->
</h3> <!--</h3>-->
</div> <!--</div>-->
<div class="panel-body" style="width: auto"> <!--<div class="panel-body" style="width: auto">-->
<div class="container" style="width: auto"> <!--<div class="container" style="width: auto">-->
<div style="float: left;padding:0px 15px 0px 15px;"> <!--<div style="float: left;padding:0px 15px 0px 15px;">-->
<table class="table"> <!--<table class="table">-->
<thead> <!--<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> <!--</thead>-->
<tbody> <!--<tbody>-->
<tr> <!--<tr>-->
<td>{{specialCardInfo[0].accu[0]}}</td> <!--<td>{{specialCardInfo[0].accu[0]}}</td>-->
<td>{{specialCardInfo[0].accu[1]}}</td> <!--<td>{{specialCardInfo[0].accu[1]}}</td>-->
<td>{{specialCardInfo[0].accu[2]}}</td> <!--<td>{{specialCardInfo[0].accu[2]}}</td>-->
<td>{{specialCardInfo[0].accu[3]}}</td> <!--<td>{{specialCardInfo[0].accu[3]}}</td>-->
<td>{{specialCardInfo[0].accu[4]}}</td> <!--<td>{{specialCardInfo[0].accu[4]}}</td>-->
<td>{{specialCardInfo[0].accu[5]}}</td> <!--<td>{{specialCardInfo[0].accu[5]}}</td>-->
<td>{{specialCardInfo[0].accu[6]}}</td> <!--<td>{{specialCardInfo[0].accu[6]}}</td>-->
</tr> <!--</tr>-->
</tbody> <!--</tbody>-->
</table> <!--</table>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
<div ng-if="specialCardInfo[0].isGroup==11"> <!--<div ng-if="specialCardInfo[0].isGroup==11">-->
<div class="panel panel-default"> <!--<div class="panel panel-default">-->
<div class="panel-heading"> <!--<div class="panel-heading">-->
<h3 class="panel-title"> <!--<h3 class="panel-title">-->
循环单 <!--循环单-->
</h3> <!--</h3>分配时间-->
</div> <!--</div>-->
<div class="panel-body" style="width: auto"> <!--<div class="panel-body" style="width: auto">-->
<div class="container" style="width: auto"> <!--<div class="container" style="width: auto">-->
<div style="float: left;padding:0 15px 0 15px;"> <!--<div style="float: left;padding:0 15px 0 15px;">-->
<table class="table"> <!--<table class="table">-->
<thead> <!--<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> <!--<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> <!--</thead>-->
<tbody> <!--<tbody>-->
<tr> <!--<tr>-->
<td>{{specialCardInfo[0].cycleSheetID}}</td> <!--<td>{{specialCardInfo[0].cycleSheetID}}</td>-->
<td>{{specialCardInfo[0].groupNum}}</td> <!--<td>{{specialCardInfo[0].groupNum}}</td>-->
<td>{{specialCardInfo[0].count}}</td> <!--<td>{{specialCardInfo[0].count}}</td>-->
<td>{{specialCardInfo[0].cityName}}</td> <!--<td>{{specialCardInfo[0].cityName}}</td>-->
<td>{{specialCardInfo[0].makeTypeName}}</td> <!--<td>{{specialCardInfo[0].makeTypeName}}</td>-->
<td>{{specialCardInfo[0].createDate}}</td> <!--<td>{{specialCardInfo[0].createDate}}</td>-->
<td>{{specialCardInfo[0].lastDate}}</td> <!--<td>{{specialCardInfo[0].lastDate}}</td>-->
<td>{{specialCardInfo[0].lastProcessName}}</td> <!--<td>{{specialCardInfo[0].lastProcessName}}</td>-->
<td>{{specialCardInfo[0].machine}}</td> <!--<td>{{specialCardInfo[0].machine}}</td>-->
<td ng-if="specialCardInfo[0].workShop=='p1'||specialCardInfo[0].workShop=='p3'"> <!--<td ng-if="specialCardInfo[0].workShop=='p1'||specialCardInfo[0].workShop=='p3'">-->
平一 <!--平一-->
</td> <!--</td>-->
<td ng-if="specialCardInfo[0].workShop=='p2'||specialCardInfo[0].workShop=='p4'"> <!--<td ng-if="specialCardInfo[0].workShop=='p2'||specialCardInfo[0].workShop=='p4'">-->
平二 <!--平二-->
</td> <!--</td>-->
<td>{{specialCardInfo[0].permanentPositionDate}}</td> <!--<td>{{specialCardInfo[0].permanentPositionDate}}</td>-->
<td>{{specialCardInfo[0].qualityinspection}}</td> <!--<td>{{specialCardInfo[0].qualityinspection}}</td>-->
<td>{{specialCardInfo[0].outbound}}</td> <!--<td>{{specialCardInfo[0].outbound}}</td>-->
<td>{{specialCardInfo[0].putInStorage}}</td> <!--<td>{{specialCardInfo[0].putInStorage}}</td>-->
<td ng-if="specialCardInfo[0].abnormal==0">无</td> <!--<td ng-if="specialCardInfo[0].abnormal==0">无</td>-->
<td ng-if="specialCardInfo[0].abnormal==1">{{specialCardInfo[0].note}}</td> <!--<td ng-if="specialCardInfo[0].abnormal==1">{{specialCardInfo[0].note}}</td>-->
</tr> <!--</tr>-->
</tbody> <!--</tbody>-->
</table> <!--</table>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> </div>
</div> </div>
\ No newline at end of file
src/main/resources/static/tpl/layout/yieldReport/yieldReport.html
View file @ cab10107
<div class="row" style="font-size: 1.3em;border-bottom:1px solid #CCCCCC;margin-bottom:10px;padding-top:10px;"> <div class="row" style="font-size: 1.3em;border-bottom:1px solid #CCCCCC;margin-bottom:10px;padding-top:10px;">
<div class="col-md-2"> <!--<div class="col-md-2">-->
<div ng-if="loginData.state==1||state=='01'">地市质量报表</div> <!--<div ng-if="userState==1">地市质量报表</div>-->
<div ng-if="loginData.state==2||state=='02'">生产情况统计日报表</div> <!--<div ng-if="userState==2">生产情况统计日报表</div>-->
<div ng-if="loginData.username=='ping1'||loginData.username=='ydw1'||state=='014'">平一日报表</div> <!--<div ng-if="userState=='ping1'">平一日报表</div>-->
<div ng-if="loginData.username=='ping2'||loginData.username=='ydw2'||state=='024'">平二日报表</div> <!--<div ng-if="userState==6">质检月报表</div>-->
<div ng-if="loginData.state==6||state=='06'">质检月报表</div> <!--<div ng-if="userState==7">仓库报表</div>-->
<div ng-if="loginData.state==7||state=='07'||loginData.state==8">仓库报表</div> <!--</div>-->
</div> <!--<div class="col-md-10" style="text-align: right;">-->
<div class="col-md-10" style="text-align: right;"> <div style="width: auto" ng-if="userState==0||userState==2||state=='01'||state=='02'" style="margin-left:100px;">
<div style="width: auto" ng-if="loginData.state==0||loginData.state==2||state=='01'||state=='02'">
<span>起始日期：</span> <span>起始日期：</span>
<input type="text" ng-model="nowDate" id="wdate1" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})"> <input type="text" ng-model="nowDate" id="wdate1" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})">
<span>结束日期：</span> <span>结束日期：</span>
<input type="text" ng-model="month_last" id="wdate2" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})"> <input type="text" ng-model="month_last" id="wdate2" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})">
<input type="submit" ng-if="loginData.state==1||state=='01'" class="btn btn-primary" value="查询" ng-click="myClickLlx()"> <input type="submit" ng-if="userState==1||state=='01'" class="btn btn-primary" value="查询" ng-click="myClickLlx()">
<input type="submit" ng-if="loginData.state==2||state=='02'" class="btn btn-primary" value="查询" ng-click="myClick()"> <input type="submit" ng-if="userState==2||state=='02'" class="btn btn-primary" value="查询" ng-click="myClick()">
<span ng-if="msgAlert" style="color:red;font-size: 17px;">{{msgAlert}}</span> <span ng-if="msgAlert" style="color:red;font-size: 17px;">{{msgAlert}}</span>
</div> </div>
<div style="width: auto" ng-if="loginData.state==4||state=='014'||state=='024'"> <div class="yx-div-header" ng-if="userState==8">
<span>查询日期：</span> <span>起始时间：</span>
<input type="text" ng-model="nowDate" id="wdateCj" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})"> <input type="text" id="wdate1" class="Wdate" ng-model="month_first" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})">
<input type="submit" class="btn btn-primary" value="查询" ng-click="myCjClick()"> <span>结束时间：</span>
</div> <input type="text" id="wdate2" class="Wdate" ng-model="month_last" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})">
<div style="width: auto" ng-if="loginData.state==6||state=='06'"> <select id="selectType" style="height: 30px;border-radius: 4px;">
<span>预定位接收月份：</span> <option value="{{type.CARD_TYPE_ID}}" ng-repeat="type in typeList">{{type.CARD_TYPE}}</option>
<input type="text" ng-model="nowMonth" id="wdateZj" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyyMM',autoPickDate:'true'})"> </select>
<input type="submit" class="btn btn-primary" value="查询" ng-click="myZjClick()"> <select id="selectCountry" style="height: 30px;border-radius: 4px;" ng-model="vm.country" ng-options="country.cityName for country in vm.countries">
</div> <option value="">地市</option>
<div class="yx-div-header" ng-if="loginData.state==7||state=='07'||loginData.state==8"> </select>
<span>查询日期：</span> <select style="height: 30px;border-radius: 4px;" ng-model="vm.province"
<input type="text" id="wdate1" class="Wdate" ng-model="month_first" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})"> ng-options="province.countyName for province in vm.country.cityInfo">
<span>-</span> <option value="">区县</option>
<input type="text" id="wdate2" class="Wdate" ng-model="month_last" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})"> </select>
<input type="submit" value="查询" class="btn btn-primary" ng-click="myClick()"> <select style="height: 30px;border-radius: 4px;" ng-model="vm.city" ng-options="city.GAJG_MC for city in vm.province.countyInfo">
<span ng-if="msgAlert" style="color:red;font-size: 17px;">{{msgAlert}}</span> <option value="">派出所</option>
</div> </select>
</div> <input type="submit" class="btn btn-primary" value="查询" ng-click="myClickFinance()">
</div>
<div id="mask-loading" class="mask-loading" ng-if="loading" style="background-color: rgba(0, 0, 0, 0.17);">
<div class="loading">
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
</div> </div>
<!--</div>-->
</div> </div>
<div style="padding: 10px;background-color: #fff;border: 1px solid #CCC;border-radius: 10px;"> <div style="padding: 10px;background-color: #fff;border: 1px solid #CCC;border-radius: 10px;">
<div ng-if="loginData.state==1||state=='01'"> <div ng-if="userState==2">
<div ng-if="dataCheckData.length>0 && dataCheckData[0][1]!='合计'"> <div ng-if="cardBodyReportData.length>0">
<table class="table table-hover" style="margin-top:10px;">
<thead>
<th>地市</th>
<th>合格数</th>
<th>不合格数</th>
<th>不合格率</th>
</thead>
<tbody>
<tr ng-repeat="city in dataCheckData">
<td width="100px">{{city[1]}}</td>
<td width="100px">{{city[2]}}</td>
<td width="100px">{{city[3]}}</td>
<td width="100px" ng-if="city[4]==0">0</td>
<td width="100px" ng-if="city[4]>0">{{city[4] | number:2}} </td>
</tr>
</tbody>
</table>
<div style="text-align: right">
<button class="btn btn-primary" ng-click="printQualityReport()" >
下载报表
</button>
</div>
</div>
<div ng-if="dataCheckData.length==0 || dataCheckData[0][1]=='合计'" style="font-size:1.5em;">
当天暂无报表数据。
</div>
</div>
<div ng-if="loginData.state==2||state=='02'">
<div ng-if="printDataReport.dayInfo.length>0">
<table class="table table-hover" style="margin-top:10px;"> <table class="table table-hover" style="margin-top:10px;">
<thead> <thead>
<th></th> <th></th>
<th>普通证</th> <th>普通证</th>
<!--<th>特证</th>--> <th>快证</th>
<th>异地KS邮</th> <th>异地KS邮</th>
<th>异地KS普</th> <th>异地KS普</th>
<th>异地邮</th> <th>异地邮</th>
...@@ -91,18 +53,23 @@ ...@@ -91,18 +53,23 @@
<th>KS普</th> <th>KS普</th>
<th>KS邮</th> <th>KS邮</th>
<th>邮寄证</th> <th>邮寄证</th>
<th>废证</th> <th>军人证</th>
<th>小计</th> <th>小计</th>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="city in printDataReport.dayInfo"> <tr ng-repeat="city in cardBodyReportData">
<td width="100px">{{city.cityName}}</td> <td width="100px">{{city.cityName}}</td>
<td width="100px" ng-repeat="item in city.info track by $index" ng-if="$index!=1 && $index!=6 && $index!=10 && $index!=11 && $index!=12"> <td width="100px">{{city.PUTONGZHENG}}</td>
<span ng-if="item!=0">{{item}}</span> <td width="100px">{{city.KUAIZHENG}}</td>
<span ng-if="item==0"></span> <td width="100px">{{city.YIDIKSPU}}</td>
</td> <td width="100px">{{city.YIDIKSYOU}}</td>
<td width="100px">{{city.info[12]}}</td> <td width="100px">{{city.YIDIYOU}}</td>
<td width="100px">{{city.info[11]}}</td> <td width="100px">{{city.YIDIPU}}</td>
<td width="100px">{{city.KSPU}}</td>
<td width="100px">{{city.KSYOU}}</td>
<td width="100px">{{city.YOUJIZHENG}}</td>
<td width="100px">{{city.JUNRENZHENG}}</td>
<td width="100px">{{city.ACTIVE_COUNT}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -113,11 +80,11 @@ ...@@ -113,11 +80,11 @@
</div> </div>
</div> </div>
<div ng-if="printDataReport.dayInfo == null" style="font-size:1.5em;"> <div ng-if=" cardBodyReportData== null" style="font-size:1.5em;">
当天暂无报表数据。 当天暂无报表数据。
</div> </div>
</div> </div>
<div ng-if="loginData.state==4||state=='014'||state=='024'"> <div ng-if="userState==4">
<div ng-if="pingReportByDay.normalInfo.length>0 &&pingReportByDay.normalInfo[0][11]!='合计'"> <div ng-if="pingReportByDay.normalInfo.length>0 &&pingReportByDay.normalInfo[0][11]!='合计'">
<table class="table table-hover" style="margin-top:10px;"> <table class="table table-hover" style="margin-top:10px;">
<thead> <thead>
...@@ -176,7 +143,7 @@ ...@@ -176,7 +143,7 @@
当天暂无报表数据。 当天暂无报表数据。
</div> </div>
</div> </div>
<div ng-if="loginData.state==6||state=='06'"> <div ng-if="userState==6||state=='06'">
<div ng-if="qulityCheckData.length>0 && qulityCheckData[0][3]!='合计'"> <div ng-if="qulityCheckData.length>0 && qulityCheckData[0][3]!='合计'">
<table class="table table-hover" style="margin-top:10px;"> <table class="table table-hover" style="margin-top:10px;">
<thead> <thead>
...@@ -211,7 +178,7 @@ ...@@ -211,7 +178,7 @@
当天暂无报表数据。 当天暂无报表数据。
</div> </div>
</div> </div>
<div ng-if="loginData.state==7||state=='07'||loginData.state==8"> <div ng-if="userState==7||state=='07'||loginData.state==8">
<div ng-if="StoreReportData.length==0" style="font-size:1.5em;"> <div ng-if="StoreReportData.length==0" style="font-size:1.5em;">
当天暂无报表数据。 当天暂无报表数据。
</div> </div>
......
src/main/resources/static/tpl/layout/yieldReport/yieldReport.js
View file @ cab10107
...@@ -5,8 +5,8 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$ ...@@ -5,8 +5,8 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
} else { } else {
$state.go("layout.yieldReport") $state.go("layout.yieldReport")
} }
$scope.userState = $rootScope.workshop; // $scope.userState = $rootScope.loginData.workshop;
// $scope.userState=5; $scope.userState=8;
$scope.date = "date"; $scope.date = "date";
...@@ -80,25 +80,17 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$ ...@@ -80,25 +80,17 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
}) })
} }
var getPrintDataReport = function (startDate, endDate) { var getCardBodyReport = function (startDate, endDate) {
HttpService.getCardBodyReportData(startDate, endDate, function (data) {
if ($rootScope.loginData.state == 2) { console.log(data,'--------测试打印卡基报表-------')
HttpService.getPrintData(startDate, endDate, function (data) { $scope.cardBodyReportData = data.respData;
$scope.printDataReport = data.respData; console.log("打印卡基报表：", $scope.cardBodyReportData)
console.log("初始化打印卸载报表：", $scope.printDataReport)
})
}
if ($rootScope.loginData.state == 0) {
HttpService.getAdminPrintData(startDate, endDate, $scope.userState, function (data) {
$scope.printDataReport = data.respData;
console.log("初始化打印卸载报表：", $scope.printDataReport)
}) })
}
} }
if ($rootScope.loginData.state == 2 || $rootScope.loginData.state == 0) { if ($rootScope.loginData.state == 2 || $rootScope.loginData.state == 0) {
console.log($scope.currentDetailDate, $scope.month_last) console.log($scope.currentDetailDate, $scope.month_last)
getPrintDataReport($scope.currentDetailDate, $scope.month_last) getCardBodyReport($scope.currentDetailDate, $scope.month_last)
} }
// 打印 打印卸载报表按钮 // 打印 打印卸载报表按钮
$scope.printPrintDataReport = function () { $scope.printPrintDataReport = function () {
...@@ -127,24 +119,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$ ...@@ -127,24 +119,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
} }
var getQualityCheckReport = function (month) {
// if ($rootScope.loginData.state == 6) {
// HttpService.getQualityCheckReportData(month, function (data) {
// $scope.qulityCheckData = data.respData;
// console.log("质检报表：", $scope.qulityCheckData)
// })
// }
// if ($rootScope.loginData.state == 0) {
// HttpService.getAdminQualityCheckReportData(month, $scope.state.substring(1, 2), function (data) {
// $scope.qulityCheckData = data.respData;
// console.log("质检报表：", $scope.qulityCheckData)
// })
// }
}
// if ($rootScope.loginData.state == 6 || $rootScope.loginData.state == 0) {
// getQualityCheckReport($scope.nowMonth)
// }
$scope.printQualityCheckReport = function () { $scope.printQualityCheckReport = function () {
var month = $("#wdateZj").val() var month = $("#wdateZj").val()
...@@ -171,24 +146,6 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$ ...@@ -171,24 +146,6 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
} }
var getPingReportByDay = function (date) {
if ($rootScope.loginData.state == 4) {
HttpService.getPingReportByDayData(date, function (data) {
$scope.pingReportByDay = data.respData;
console.log("车间日报表：", $scope.pingReportByDay)
})
}
if ($rootScope.loginData.state == 0) {
HttpService.getAdminPingReportByDayData(date, 'p' + $scope.state.substring(1, 2), function (data) {
$scope.pingReportByDay = data.respData;
console.log("车间日报表：", $scope.pingReportByDay)
})
}
}
if ($rootScope.loginData.state == 4 || $rootScope.loginData.state == 0) {
getPingReportByDay($scope.nowDate);
}
$scope.printPingReportByDay = function () { $scope.printPingReportByDay = function () {
var date = $("#wdateCj").val() var date = $("#wdateCj").val()
...@@ -215,33 +172,6 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$ ...@@ -215,33 +172,6 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
} }
// var getCkReportByDay = function(date){
// HttpService.getYieldDailyReportByStorehouseData(date,function(data){
// $scope.storeRportData = data.respData;
// console.log("仓库产量日报表：",$scope.storeRportData)
// })
// }
// if($rootScope.loginData.state == 7){
// getCkReportByDay($scope.nowDate);
// }
// var getStorehouseReportDatas = function(start,end){
// HttpService.getCkReportData(start,end,function(data){
// $scope.StoreReportData= data.respData;
// for(var i=0;i<$scope.StoreReportData.length;i++){
// if(i==0){
// $scope.StoreReportData[i].isActive=true;
// }else{
// $scope.StoreReportData[i].isActive=false;
// }
// }
// console.log("初始化仓库报表：",data.respData)
// })
// }
// if($rootScope.loginData.state == 7||$rootScope.loginData.state == 0) {
// getStorehouseReportDatas($scope.month_first,$scope.month_last)
// }
$scope.showtable = -1; $scope.showtable = -1;
$scope.showTable = function (index) { $scope.showTable = function (index) {
if ($scope.showtable != index) { if ($scope.showtable != index) {
...@@ -252,25 +182,6 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$ ...@@ -252,25 +182,6 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
} }
} }
var getStorehouseReportDatas = function (start, end) {
HttpService.getStorehouseReportDatas(start, end, function (data) {
$scope.totalCount = data.respData.sumInfo;
$scope.StoreReportData = data.respData.listInfo;
for (var i = 0; i < $scope.StoreReportData.length; i++) {
if (i == 0) {
$scope.StoreReportData[i].isActive = true;
} else {
$scope.StoreReportData[i].isActive = false;
}
}
console.log("初始化仓库出入库报表：", data.respData)
})
}
if ($rootScope.loginData.state == 7 || $rootScope.loginData.state == 0 || $rootScope.loginData.state == 8) {
getStorehouseReportDatas($scope.month_first, $scope.month_last)
}
$scope.printStoreDayReport = function () { $scope.printStoreDayReport = function () {
var date = $("#wdateCj").val() var date = $("#wdateCj").val()
console.log("时间") console.log("时间")
...@@ -290,12 +201,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$ ...@@ -290,12 +201,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
var end = $("#wdate2").val() var end = $("#wdate2").val()
if (parseInt(start) <= parseInt(end)) { if (parseInt(start) <= parseInt(end)) {
$scope.msgAlert = ''; $scope.msgAlert = '';
if ($rootScope.loginData.state == 2 || $scope.state == '02') { getCardBodyReport(start, end);
getPrintDataReport(start, end);
}
if ($rootScope.loginData.state == 7 || $scope.state == '07' || $rootScope.loginData.state == 8) {
getStorehouseReportDatas(start, end)
}
} else { } else {
$scope.msgAlert = "起始日期不能大于结束日期，请重新选择！"; $scope.msgAlert = "起始日期不能大于结束日期，请重新选择！";
} }
...@@ -314,4 +220,82 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$ ...@@ -314,4 +220,82 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
} }
var vm = $scope.vm = {};
HttpService.getAllPoliceStation(function(data){
vm.countries = data.respData;
console.log(vm.countries)
})
HttpService.getTypeListData(function(data){
$scope.typeList = data.respData;
var json = {CARD_TYPE_ID: -1, CARD_TYPE: "全部类型"};
$scope.typeList.unshift(json);
console.log($scope.typeList)
})
$scope.myClickFinance = function () {
var start = $("#wdate1").val()
var end = $("#wdate2").val()
var makeType = $("#selectType").val()
var cityCode;
if(vm.country==undefined) {
cityCode = -1;
}else{
if(vm.province==null){
cityCode = vm.country.cityCode;
}else{
if(vm.city==null){
cityCode = vm.province.countyCode;
}else{
cityCode = vm.city.GAJG_DM;
}
}
}
if(parseInt(start)<=parseInt(end)){
getFinanceReportData(start,end,cityCode,makeType)
}else{
$scope.msgAlert = "起始日期不能大于结束日期，请重新选择！";
}
}
//TODO
//财务报表
var getFinanceReportData = function(start,end,citycode,type){
console.log(start,end,citycode,type,"-------start,end,citycode,type--------")
HttpService.getFinanceReportDatas(start,end,citycode,type,function(data){
$scope.financeData = data.respData;
for(var i=0;i<$scope.financeData.length;i++){
if(i==0){
$scope.financeData[i].isActive=true;
}else{
$scope.financeData[i].isActive=false;
}
}
console.log("初始化财务报表：",$scope.financeData)
})
}
if($rootScope.loginData.workshop == 8) {
HttpService.getTypeListData(function(data){
$scope.typeList = data.respData;
var json = ["全部类型","-1",2];
$scope.typeList.unshift(json);
})
var vm = $scope.vm = {};
HttpService.getAllCityJson(function(data){
vm.countries = data.respData;
console.log(vm.countries)
})
// 更换国家的时候清空省
$scope.$watch('vm.country', function(country) {
vm.province = null;
});
// 更换省的时候清空城市
$scope.$watch('vm.province', function(province) {
vm.city = null;
});
getFinanceReportData($scope.month_first,$scope.month_last,"-1","-1")
}
}]); }]);
\ No newline at end of file
src/main/resources/static/vendor/My97DatePicker/WdatePicker.js 0 → 100644
View file @ cab10107
/*
* My97 DatePicker 4.8
* License: http://www.my97.net/license.asp
*/
var $dp,WdatePicker;(function(){var l={
$langList:[
{name:"en",charset:"UTF-8"},
{name:"zh-cn",charset:"gb2312"},
{name:"zh-tw",charset:"GBK"}
],
$skinList:[
{name:"default",charset:"gb2312"},
{name:"whyGreen",charset:"gb2312"},
{name:"blue",charset:"gb2312"},
{name:"green",charset:"gb2312"},
{name:"simple",charset:"gb2312"},
{name:"ext",charset:"gb2312"},
{name:"blueFresh",charset:"gb2312"},
{name:"twoer",charset:"gb2312"},
{name:"YcloudRed",charset:"gb2312"}],
$wdate:true,
$crossFrame:false,
$preLoad:false,
$dpPath:"",
doubleCalendar:false,
enableKeyboard:true,
enableInputMask:true,
autoUpdateOnChanged:null,
weekMethod:"MSExcel",
position:{},
lang:"auto",
skin:"default",
dateFmt:"yyyy-MM-dd",
realDateFmt:"yyyy-MM-dd",
realTimeFmt:"HH:mm:ss",
realFullFmt:"%Date %Time",
minDate:"0001-01-01 00:00:00",
maxDate:"9999-12-31 23:59:59",
minTime:"00:00:00",
maxTime:"23:59:59",
startDate:"",
alwaysUseStartDate:false,
yearOffset:1911,
firstDayOfWeek:0,
isShowWeek:false,
highLineWeekDay:true,
isShowClear:true,
isShowToday:true,
isShowOK:true,
isShowOthers:true,
readOnly:false,
errDealMode:0,
autoPickDate:null,
qsEnabled:true,
autoShowQS:false,
hmsMenuCfg:{H:[1,6],m:[5,6],s:[15,4]},
opposite:false,specialDates:null,specialDays:null,disabledDates:null,disabledDays:null,onpicking:null,onpicked:null,onclearing:null,oncleared:null,ychanging:null,ychanged:null,Mchanging:null,Mchanged:null,dchanging:null,dchanged:null,Hchanging:null,Hchanged:null,mchanging:null,mchanged:null,schanging:null,schanged:null,eCont:null,vel:null,elProp:"",errMsg:"",quickSel:[],has:{},getRealLang:function(){var d=l.$langList;for(var e=0;e<d.length;e++){if(d[e].name==this.lang){return d[e]}}return d[0]}};WdatePicker=g;var n=window,i={innerHTML:""},z="document",B="documentElement",H="getElementsByTagName",E,u,h,f,D;var v=navigator.appName;if(v=="Microsoft Internet Explorer"){h=true}else{if(v=="Opera"){D=true}else{f=true}}u=l.$dpPath||q();if(l.$wdate){m(u+"skin/WdatePicker.css")}E=n;if(l.$crossFrame){try{while(E.parent!=E&&E.parent[z][H]("frameset").length==0){E=E.parent}}catch(y){}}if(!E.$dp){E.$dp={ff:f,ie:h,opera:D,status:0,defMinDate:l.minDate,defMaxDate:l.maxDate}}b();if(l.$preLoad&&$dp.status==0){k(n,"onload",function(){g(null,true)})}if(!n[z].docMD){k(n[z],"onmousedown",s,true);n[z].docMD=true}if(!E[z].docMD){k(E[z],"onmousedown",s,true);E[z].docMD=true}k(n,"onunload",function(){if($dp.dd){r($dp.dd,"none")}});function b(){try{E[z],E.$dp=E.$dp||{}}catch(I){E=n;$dp=$dp||{}}var w={win:n,$:function(e){return(typeof e=="string")?n[z].getElementById(e):e},$D:function(J,e){return this.$DV(this.$(J).value,e)},$DV:function(J,e){if(J!=""){this.dt=$dp.cal.splitDate(J,$dp.cal.dateFmt);if(e){for(var L in e){if(this.dt[L]===undefined){this.errMsg="invalid property:"+L}else{this.dt[L]+=e[L];if(L=="M"){var M=e.M>0?1:0;var K=new Date(this.dt.y,this.dt.M,0).getDate();this.dt.d=Math.min(K+M,this.dt.d)}}}}if(this.dt.refresh()){return this.dt}}return""},show:function(){var K=E[z].getElementsByTagName("div"),J=100000;for(var e=0;e<K.length;e++){var L=parseInt(K[e].style.zIndex);if(L>J){J=L}}this.dd.style.zIndex=J+2;r(this.dd,"block");r(this.dd.firstChild,"")},unbind:function(e){e=this.$(e);if(e.initcfg){t(e,"onclick",function(){g(e.initcfg)});t(e,"onfocus",function(){g(e.initcfg)})}},hide:function(){r(this.dd,"none")},attachEvent:k};for(var d in w){E.$dp[d]=w[d]}$dp=E.$dp}function k(I,J,w,d){if(I.addEventListener){var e=J.replace(/on/,"");w._ieEmuEventHandler=function(K){return w(K)};I.addEventListener(e,w._ieEmuEventHandler,d)}else{I.attachEvent(J,w)}}function t(w,I,e){if(w.removeEventListener){var d=I.replace(/on/,"");e._ieEmuEventHandler=function(J){return e(J)};w.removeEventListener(d,e._ieEmuEventHandler,false)}else{w.detachEvent(I,e)}}function C(w,e,d){if(typeof w!=typeof e){return false}if(typeof w=="object"){if(!d){for(var I in w){if(typeof e[I]=="undefined"){return false}if(!C(w[I],e[I],true)){return false}}}return true}else{if(typeof w=="function"&&typeof e=="function"){return w.toString()==e.toString()}else{return w==e}}}function q(){var I,w,d=n[z][H]("script");for(var e=0;e<d.length;e++){I=d[e].getAttribute("src")||"";I=I.substr(0,I.toLowerCase().indexOf("wdatepicker.js"));var w=I.lastIndexOf("/");if(w>0){I=I.substring(0,w+1)}if(I){break}}return I}function m(w,I,J){var d=n[z][H]("HEAD").item(0),e=n[z].createElement("link");if(d){e.href=w;e.rel="stylesheet";e.type="text/css";if(I){e.title=I}if(J){e.charset=J}d.appendChild(e)}}function p(I){I=I||E;var L=0,d=0;while(I!=E){var N=I.parent[z][H]("iframe");for(var J=0;J<N.length;J++){try{if(N[J].contentWindow==I){var K=o(N[J]);L+=K.left;d+=K.top;break}}catch(M){}}I=I.parent}return{leftM:L,topM:d}}function o(I,w){if(I.getBoundingClientRect){return I.getBoundingClientRect()}else{var J={ROOT_TAG:/^body|html$/i,OP_SCROLL:/^(?:inline|table-row)$/i};var e=false,M=null,P=I.offsetTop,K=I.offsetLeft,d=I.offsetWidth,O=I.offsetHeight;var L=I.offsetParent;if(L!=I){while(L){K+=L.offsetLeft;P+=L.offsetTop;if(c(L,"position").toLowerCase()=="fixed"){e=true}else{if(L.tagName.toLowerCase()=="body"){M=L.ownerDocument.defaultView}}L=L.offsetParent}}L=I.parentNode;while(L.tagName&&!J.ROOT_TAG.test(L.tagName)){if(L.scrollTop||L.scrollLeft){if(!J.OP_SCROLL.test(r(L))){if(!D||L.style.overflow!=="visible"){K-=L.scrollLeft;P-=L.scrollTop}}}L=L.parentNode}if(!e){var N=F(M);K-=N.left;P-=N.top}d+=K;O+=P;return{left:K,top:P,right:d,bottom:O}}}function x(e){e=e||E;var J=e[z],I=(e.innerWidth)?e.innerWidth:(J[B]&&J[B].clientWidth)?J[B].clientWidth:J.body.offsetWidth,d=(e.innerHeight)?e.innerHeight:(J[B]&&J[B].clientHeight)?J[B].clientHeight:J.body.offsetHeight;return{width:I,height:d}}function F(e){e=e||E;var J=e[z],d=J[B],I=J.body;J=(d&&d.scrollTop!=null&&(d.scrollTop>I.scrollTop||d.scrollLeft>I.scrollLeft))?d:I;return{top:J.scrollTop,left:J.scrollLeft}}function s(d){try{var w=d?(d.srcElement||d.target):null;if($dp.cal&&!$dp.eCont&&$dp.dd&&w!=$dp.el&&$dp.dd.style.display=="block"){$dp.cal.close()}}catch(d){}}function A(){$dp.status=2}var G,j;function g(M,d){if(!$dp){return}b();var J={};for(var L in M){J[L]=M[L]}for(var L in l){if(L.substring(0,1)!="$"&&J[L]===undefined){J[L]=l[L]}}if(d){if(!w()){j=j||setInterval(function(){if(E[z].readyState=="complete"){clearInterval(j)}g(null,true)},50);return}if($dp.status==0){$dp.status=1;J.el=i;a(J,true)}else{return}}else{if(J.eCont){J.eCont=$dp.$(J.eCont);J.el=i;J.autoPickDate=true;J.qsEnabled=false;a(J)}else{if(l.$preLoad&&$dp.status!=2){return}var I=N();if(n.event===I||I){J.srcEl=I.srcElement||I.target;I.cancelBubble=true}J.el=J.el=$dp.$(J.el||J.srcEl);if(J.el==null){alert("WdatePicker:el is null!\nexample:onclick=\"WdatePicker({el:this})\"");return;}try{if(!J.el||J.el.My97Mark===true||J.el.disabled||($dp.dd&&r($dp.dd)!="none"&&$dp.dd.style.left!="-970px")){if(J.el.My97Mark){J.el.My97Mark=false}return}}catch(K){}if(I&&J.el.nodeType==1&&!C(J.el.initcfg,M)){$dp.unbind(J.el);k(J.el,I.type=="focus"?"onclick":"onfocus",function(){g(M)});J.el.initcfg=M}a(J)}}function w(){if(h&&E!=n&&E[z].readyState!="complete"){return false}return true}function N(){if(f){try{func=N.caller;while(func!=null){var O=func.arguments[0];if(O&&(O+"").indexOf("Event")>=0){return O}func=func.caller}}catch(P){}return null}return event}}function c(e,d){return e.currentStyle?e.currentStyle[d]:document.defaultView.getComputedStyle(e,false)[d]}function r(e,d){if(e){if(d!=null){e.style.display=d}else{return c(e,"display")}}}function a(e,d){var K=e.el?e.el.nodeName:"INPUT";if(d||e.eCont||new RegExp(/input|textarea|div|span|p|a/ig).test(K)){e.elProp=K=="INPUT"?"value":"innerHTML"}else{return}if(e.lang=="auto"){e.lang=h?navigator.browserLanguage.toLowerCase():navigator.language.toLowerCase()}if(!e.eCont){for(var J in e){$dp[J]=e[J]}}if(!$dp.dd||e.eCont||($dp.dd&&(e.getRealLang().name!=$dp.dd.lang||e.skin!=$dp.dd.skin))){if(e.eCont){w(e.eCont,e)}else{$dp.dd=E[z].createElement("DIV");$dp.dd.style.cssText="position:absolute";E[z].body.appendChild($dp.dd);w($dp.dd,e);if(d){$dp.dd.style.left=$dp.dd.style.top="-970px"}else{$dp.show();I($dp)}}}else{if($dp.cal){$dp.show();$dp.cal.init();if(!$dp.eCont){I($dp)}}}function w(V,P){var O=E[z].domain,S=false,M='<iframe hideFocus=true width=9 height=7 frameborder=0 border=0 scrolling=no src="about:blank"></iframe>';V.innerHTML=M;var L=l.$langList,U=l.$skinList,T;try{T=V.lastChild.contentWindow[z]}catch(Q){S=true;V.removeChild(V.lastChild);var N=E[z].createElement("iframe");N.hideFocus=true;N.frameBorder=0;N.scrolling="no";N.src="javascript:(function(){var d=document;d.open();d.domain='"+O+"';})()";V.appendChild(N);setTimeout(function(){T=V.lastChild.contentWindow[z];R()},97);return}R();function R(){var Y=P.getRealLang();V.lang=Y.name;V.skin=P.skin;var X=["<head><script>","","var doc=document, $d, $dp, $cfg=doc.cfg, $pdp = parent.$dp, $dt, $tdt, $sdt, $lastInput, $IE=$pdp.ie, $FF = $pdp.ff,$OPERA=$pdp.opera, $ny, $cMark = false;","if($cfg.eCont){$dp = {};for(var p in $pdp)$dp[p]=$pdp[p];}else{$dp=$pdp;};for(var p in $cfg){$dp[p]=$cfg[p];}","doc.oncontextmenu=function(){try{$c._fillQS(!$dp.has.d,1);showB($d.qsDivSel);}catch(e){};return false;};","<\/script><script src=",u,"lang/",Y.name,".js charset=",Y.charset,"><\/script>"];if(S){X[1]='document.domain="'+O+'";'}for(var W=0;W<U.length;W++){if(U[W].name==P.skin){X.push('<link rel="stylesheet" type="text/css" href="'+u+"skin/"+U[W].name+'/datepicker.css" charset="'+U[W].charset+'"/>')}}X.push('<script src="'+u+'calendar.js"><\/script>');X.push('</head><body leftmargin="0" topmargin="0" tabindex=0></body></html>');X.push('<script>var t;t=t||setInterval(function(){if((typeof(doc.ready)=="boolean"&&doc.ready)||doc.readyState=="complete"){new My97DP();$cfg.onload();$c.autoSize();$cfg.setPos($dp);clearInterval(t);}},20);<\/script>');P.setPos=I;P.onload=A;T.write("<html>");T.cfg=P;T.write(X.join(""));T.close()}}function I(O){var M=O.position.left,V=O.position.top,L=O.el;if(L==i){return}if(L!=O.srcEl&&(r(L)=="none"||L.type=="hidden")){L=O.srcEl}var T=o(L),P=p(n),U=x(E),Q=F(E),N=$dp.dd.offsetHeight,S=$dp.dd.offsetWidth;if(isNaN(V)){V=0}if((P.topM+T.bottom+N>U.height)&&(P.topM+T.top-N>0)){V+=Q.top+P.topM+T.top-N-2}else{V+=Q.top+P.topM+T.bottom;var R=V-Q.top+N-U.height;if(R>0){V-=R}}if(isNaN(M)){M=0}M+=Q.left+Math.min(P.leftM+T.left,U.width-S-5)-(h?2:0);O.dd.style.top=V+"px";O.dd.style.left=M+"px"}}})();
\ No newline at end of file
src/main/resources/static/vendor/My97DatePicker/calendar.js 0 → 100644
View file @ cab10107
/*
* My97 DatePicker 4.8
* License: http://www.my97.net/license.asp
*/
eval(function (p, a, c, k, e, d) { e = function (c) { return (c < a ? "" : e(parseInt(c / a))) + ((c = c % a) > 35 ? String.fromCharCode(c + 29) : c.toString(36)) }; if (!''.replace(/^/, String)) { while (c--) d[e(c)] = k[c] || e(c); k = [function (e) { return d[e] }]; e = function () { return '\\w+' }; c = 1; }; while (c--) if (k[c]) p = p.replace(new RegExp('\\b' + e(c) + '\\b', 'g'), k[c]); return p; }('z($2N.4T){$x={};R(C p 66 $3h){z(7r $3h[p]=="7q"){$x[p]={};R(C 5u 66 $3h[p]){$x[p][5u]=$3h[p][5u]}}G{$x[p]=$3h[p]}}}G{$x=$3h}R(C p 66 $2N){$x[p]=$2N[p]}C $c;z($7A){6U.4n.9X("7J",B(v){z(!v){A.2t()}J v});6U.4n.9B("7L",B(){C 4h=A.7G;3n(4h.6K!=1){4h=4h.9A}J 4h})}B 70(){$c=A;A.3l=[];$d=1R.9C("L");$d.Z="5B";$d.1W=\'<L 1L=9x><L N="4p 9K"><a></a></L><L N="4p 9J"><a></a></L><L U="3Y:1Y"><L N="47 9I"></L><1x N=4J></L><L U="3Y:1Y"><L N="47 9F"></L><1x N=4J></L><L N="4p 9H"><a></a></L><L N="4p ap"><a></a></L><L U="3Y:6V"></L></L><L U="a9:al;8H:7R"></L><L></L><L 1L=8O><L N="47 8B"></L><L N="47 9i"></L><L N="47 9m"></L><1z 3a=0 3g=0 35=0><1b><P 93=2><6a 1L=92></6a>&5c;<1x N=8W 63=2><1x Y=":" N=6X 6R><1x N=6Q 63=2><1x Y=":" N=6X 6R><1x N=6Q 63=2></P><P><22 1L=9a></22></P></1b><1b><P><22 1L=9c></22></P></1b></1z></L><L 1L=99></L><L 1L=95><1x N=62 1L=90 3X=22><1x N=62 1L=9o 3X=22><1x N=62 1L=9n 3X=22></L>\';7K($d,B(){4r()});73();A.6G();$x.2c=[1R,$d.1H,$d.1v,$d.2O,$d.3I,$d.3q,$d.3Z,$d.2u,$d.2d];R(C i=0;i<$x.2c.K;i++){C 64=$x.2c[i];64.3Q=i==$x.2c.K-1?$x.2c[1]:$x.2c[i+1];$x.4v(64,"6l",6z)}71();5S("y,M,H,m,s");$d.72.1u=B(){4D(1)};$d.75.1u=B(){4D(-1)};$d.58.1u=B(){z($d.1O.U.2A!="7I"){$c.5x();5j($d.1O)}G{1j($d.1O)}};1R.8g.5J($d);B 73(){C as=3j("a");1t=3j("L"),1S=3j("1x"),6g=3j("22"),6Y=3j("6a");$d.5m=as[0];$d.5k=as[1];$d.4G=as[3];$d.5l=as[2];$d.5a=1t[9];$d.1H=1S[0];$d.1v=1S[1];$d.5F=1t[0];$d.4q=1t[4];$d.3m=1t[6];$d.1O=1t[10];$d.4i=1t[11];$d.3T=1t[12];$d.8c=1t[13];$d.8d=1t[14];$d.8b=1t[15];$d.58=1t[16];$d.58.6m=$19.6P;$d.54=1t[17];$d.2O=1S[2];$d.3I=1S[4];$d.3q=1S[6];$d.3Z=1S[7];$d.2u=1S[8];$d.2d=1S[9];$d.72=6g[0];$d.75=6g[1];$d.6O=6Y[0];B 3j(s){J $d.8u(s)}}B 71(){$d.5m.1u=B(){$21=$21<=0?$21-1:-1;z($21%5==0){$d.1v.2i();J}$d.1v.Y=$q.y-1;$d.1v.2U()};$d.5k.1u=B(){$q.2f("M",-1);$d.1H.2U()};$d.4G.1u=B(){$q.2f("M",1);$d.1H.2U()};$d.5l.1u=B(){$21=$21>=0?$21+1:1;z($21%5==0){$d.1v.2i();J}$d.1v.Y=$q.y+1;$d.1v.2U()}}}70.4n={6G:B(){$21=0;$x.6d=A;z($x.4K&&$x.E.4K!=18){$x.E.4K=S;$x.E.7z()}A.5D();$q=A.5z=Q 1J();$1A=Q 1J();$1C=A.2T=Q 1J();$x.4g=0;A.1E=A.4e($x.1E);A.41=$x.41==18?($x.O.2r&&$x.O.2r?1m:S):$x.41;$x.4B=$x.4B==18?($x.5v&&$x.O.d?1m:S):$x.4B;A.5U=A.3u("8K");A.7m=A.3u("8L");A.7i=A.3u("8N");A.7l=A.3u("8S");A.2e=A.2Z($x.2e,$x.2e!=$x.6I?$x.2p:$x.2P,$x.6I);A.2l=A.2Z($x.2l,$x.2l!=$x.6N?$x.2p:$x.2P,$x.6N);A.3M=A.2Z($x.3M,$x.5e);A.3R=A.2Z($x.3R,$x.5e);z(A.2e.2k(A.2l)>0){$x.6f=$19.8T}z(A.2n()){A.6L();A.3S=$x.E[$x.1K]}G{A.3V(1m,2)}4l($q);$d.6O.1W=$19.8U;$d.3Z.Y=$19.8P;$d.2u.Y=$19.8x;$d.2d.Y=$19.8A;$d.2d.2B=!$c.1G($1C);A.7g();A.8n();z($x.6f){5y($x.6f)}A.6x();z($x.E.6K==1&&$x.E.5b===6u){$x.4v($x.E,"6l",6z);$x.4v($x.E,"2U",B(){z($x&&$x.1Q.U.2A=="2S"){$c.4d();z(!$x.4g&&$x.6d.3S!=$x.E[$x.1K]&&$x.E.9j){6o($x.E,"9g")}}});$x.E.5b=1m}$c.1a=$x.E;4r()},6L:B(){C 1f=A.4c();z(1f!=0){C q;z(1f>0){q=A.2l}G{q=A.2e}z($x.O.5h){$q.y=q.y;$q.M=q.M;$q.d=q.d}z($x.O.2r){$q.H=q.H;$q.m=q.m;$q.s=q.s}}},3N:B(1k,1y,y,M,d,H,m,s,6M){C q;z(1k&&1k.2n){q=1k}G{q=Q 1J();1y=1y||$x.1E;C i,3d,1h=0,1o,1I=/43|3c|4b|y|3e|3A|4I|M|1Q|d|%2D|6b|H|1Z|m|1q|s|3w|D|6c|W|w/g;C g=1y.1o(1I);1I.3f=0;z(6M){1o=1k.56(/\\W+/)}G{C 4O=0,25="^";3n((1o=1I.3L(1y))!==18){z(4O>=0){3d=1y.1M(4O,1o.5g);z(3d&&"-/\\\\".1d(3d)>=0){3d="[\\\\-/]"}25+=3d}4O=1I.3f;4N(1o[0]){1e"43":25+="(\\\\d{4})";1c;1e"3c":25+="(\\\\d{3})";1c;1e"3e":1e"3A":1e"3w":1e"D":25+="(\\\\D+)";1c;7t:25+="(\\\\d\\\\d?)";1c}}25+=".*$";1o=Q 3x(25).3L(1k);1h=1}z(1o){R(i=0;i<g.K;i++){C v=1o[i+1h];z(v){4N(g[i]){1e"3e":1e"3A":q.M=3D(g[i],v);1c;1e"y":1e"4b":v=5n(v,0);z(v<50){v+=6H}G{v+=7X}q.y=v;1c;1e"3c":q.y=5n(v,0)+$x.74;1c;7t:q[g[i].5W(-1)]=v;1c}}}q.1X()}G{z(1k!=""){q.d=32}}}q.7Z(y,M,d,H,m,s);J q;B 3D(1y,v){C V=1y=="3e"?$19.6T:$19.2h;R(C i=0;i<12;i++){z(V[i].5d()==v.7k(0,V[i].K).5d()){J i+1}}J-1}},3u:B(p){C i,v=$x[p],T="";z(v&&v.K>0){R(i=0;i<v.K;i++){T+=A.4e(v[i]);z(i!=v.K-1){T+="|"}}T=T?Q 3x("(?:"+T+")"):18}G{T=18}J T},4f:B(v){z(v===6u){v=A.5C()}z($x.E[$x.1K]!=v){$x.E[$x.1K]=v}A.5N()},5N:B(v){C 4M=$x.$($x.4M),v=3C(v,A.5C($x.2p));z(4M){4M.Y=v}$x.E.3F=v},4e:B(s){C 4H="3r",V,3b,T=/#?\\{(.*?)\\}/;s=s+"";R(C i=0;i<4H.K;i++){s=s.1g("%"+4H.1P(i),A.28(4H.1P(i),18,$1A))}z(s.1M(0,3)=="#F{"){s=s.1M(3,s.K-1);z(s.1d("J ")<0){s="J "+s}s=$x.65.4L(\'Q 94("\'+s+\'");\');s=s()}3n((V=T.3L(s))!=18){V.3f=V.5g+V[1].K+V[0].K-V[1].K-1;3b=2I(4L(V[1]));z(3b<0){3b="2x"+(-3b)}s=s.1M(0,V.5g)+3b+s.1M(V.3f+1)}J s},2Z:B(s,1y,7p){C q;s=A.4e(s);z(!s||s==""){s=7p}z(7r s=="7q"){q=s}G{q=A.3N(s,1y,18,18,1,0,0,0,S);q.y=(""+q.y).1g(/^2x/,"-");q.M=(""+q.M).1g(/^2x/,"-");q.d=(""+q.d).1g(/^2x/,"-");q.H=(""+q.H).1g(/^2x/,"-");q.m=(""+q.m).1g(/^2x/,"-");q.s=(""+q.s).1g(/^2x/,"-");z(s.1d("%2D")>=0){s=s.1g(/%2D/g,"0");q.d=0;q.M=2I(q.M)+1}q.1X()}J q},2n:B(){C v=$x.E[$x.1K],f=A.1E,3i=$x.O;z($x.9d||($x.7w!=""&&v=="")){v=A.4e($x.7w);f=$x.2p}$q.2H(A.3N(v,f));z(v!=""){C 1f=1;z(3i.5h&&!A.5P($q)){$q.y=$1A.y;$q.M=$1A.M;$q.d=$1A.d;1f=0}z(3i.2r&&!A.5Q($q)){$q.H=$1A.H;$q.m=$1A.m;$q.s=$1A.s;1f=0}J 1f&&A.1G($q)}z(!3i.H){$q.H=0}z(!3i.m){$q.m=0}z(!3i.s){$q.s=0}J 1},5P:B(q){z(q.y!=18){q=3v(q.y,4)+"-"+q.M+"-"+q.d}J q.1o(/^((\\d{2}(([7C][8Y])|([7B][26]))[\\-\\/\\s]?((((0?[7E])|(1[7D]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[7y])))|(((0?[7x])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([7C][8Z])|([7B][8X]))[\\-\\/\\s]?((((0?[7E])|(1[7D]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[7y])))|(((0?[7x])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))(\\s(((0?[0-9])|([1-2][0-3]))\\:([0-5]?[0-9])((\\s)|(\\:([0-5]?[0-9])))))?$/)},5Q:B(d){z(d.H!=18){d=d.H+":"+d.m+":"+d.s}J d.1o(/^([0-9]|([0-1][0-9])|([2][0-3])):([0-9]|([0-5][0-9])):([0-9]|([0-5][0-9]))$/)},4c:B(q,p){q=q||$q;C v=q.2k(A.2e,p);z(v>0){v=q.2k(A.2l,p);z(v<0){v=0}}J v},5p:B(q,p){q=q||$q;z(q.2k(A.3M,p,"2K")<0){J-1}G{z(q.2k(A.3R,p,"2K")>0){J 1}}J 0},1G:B(q,p,k){p=p||$x.O.4k;C v=A.4c(q,p);z(v==0){v=1;z(p=="d"&&k==18){k=1s.78((Q 1p(q.y,q.M-1,q.d).20()-$x.4Q+7)%7)}v=!A.7j(k)&&!A.7e(q,p);z("2K".1d(p)>=0){v=A.5p(q,p)==0}}G{v=0}J v},7a:B(){C E=$x.E,c=A,v=$x.E[$x.1K];z($x.4V>=0&&$x.4V<=2&&v!=18){z(v!=""){c.2T.2H(c.3N(v,$x.1E))}z(v==""||(c.5P(c.2T)&&c.5Q(c.2T)&&c.1G(c.2T))){z(v!=""){c.5z.2H(c.2T);c.4f()}G{c.5N("")}}G{J 1m}}J S},4d:B(e){4r();z(A.7a()){A.3V(S);$x.1j()}G{z(e){3J(e);A.3V(1m,2)}G{A.3V(1m)}$x.2j()}},4P:B(){C i,j,k,1T,3P,s=Q 2V(),5Y=$19.6F,2L=$x.4Q;C 1V="",4S="",q=Q 1J($q.y,$q.M,$q.d,2,0,0);C y=q.y,M=q.M;3P=1-Q 1p(y,M-1,1).20()+2L;z(3P>1){3P-=7}s.a("<1z N=6Z 42=3z% 35=0 3a=0 3g=0>");s.a("<1b N=6S 5I=7n>");z($x.79){s.a("<P>"+5Y[0]+"</P>")}R(i=0;i<7;i++){s.a("<P>"+5Y[(2L+i)%7+1]+"</P>")}s.a("</1b>");R(i=1,j=3P;i<7;i++){s.a("<1b>");R(k=0;k<7;k++){q.2n(y,M,j++);q.1X();z(q.M==M){1T=S;z(q.2k($1C,"d")==0){1V="9h"}G{z(q.2k($1A,"d")==0){1V="9f"}G{1V=($x.76&&(0==(2L+k)%7||6==(2L+k)%7)?"9k":"9l")}}4S=($x.76&&(0==(2L+k)%7||6==(2L+k)%7)?"8V":"8y")}G{z($x.8j){1T=S;1V="8w";4S="8D"}G{1T=1m}}z($x.79&&k==0&&(i<4||1T)){s.a("<P N=8F>"+5o(q,$x.4Q==0?1:0)+"</P>")}s.a("<P ");z(1T){z(A.1G(q,"d",k)){z(A.7h(1s.78((Q 1p(q.y,q.M-1,q.d).20()-$x.4Q+7)%7))||A.7f(q)){1V="8C"}s.a(\'1u="3U(\'+q.y+","+q.M+","+q.d+\');" \');s.a("2R=\\"A.Z=\'"+4S+"\'\\" ");s.a("2Q=\\"A.Z=\'"+1V+"\'\\" ")}G{1V="8E"}s.a("N="+1V);s.a(">"+q.d+"</P>")}G{s.a("></P>")}}s.a("</1b>")}s.a("</1z>");J s.j()},7e:B(d,p){C v=A.6E(d,A.5U,p);J(A.5U&&$x.6t)?!v:v},7j:B(d){J A.6y(d,A.7m)},7f:B(d){J A.6E(d,A.7i)},7h:B(d){J A.6y(d,A.7l)},6E:B(d,T,p){C 1y=p=="d"?$x.5E:$x.2p;z(p=="d"&&$x.O.d&&$x.6t){T=(T+"").1g(/^\\/\\(\\?:(.*)\\)\\/.*/,"$1");C 6n=T.1d($x.7b);z(6n>=0){T=T.7k(0,6n)}T=Q 3x(T)}J T?T.6h(A.4x(1y,d)):0},6y:B(k,T){J T?T.6h(k):0},3o:B(p,1F,c,r,e,1n){C s=Q 2V(),6q=1n?"r"+p:p;z(1n){$q.2f("M",1)}2E=$q[p];s.a("<1z 3a=0 3g=3 35=0");R(C i=0;i<r;i++){s.a(\'<1b 3y="3y">\');R(C j=0;j<c;j++){s.a("<P 3y ");$q[p]=4L(e);z($q[p]>1F){s.a("N=\'1w\'")}G{z(A.1G($q,p)||($x.6t&&"2K".1d(p)==-1&&A.4c($q,p)==0)){s.a("N=\'1w\' 2R=\\"A.Z=\'3B\'\\" 2Q=\\"A.Z=\'1w\'\\" 4m=\\"");s.a("1j($d."+p+"D);$d."+6q+"I.Y="+$q[p]+";3W.55($d."+6q+\'I);"\')}G{s.a("N=\'6w\'")}}s.a(">");z($q[p]<=1F){s.a(p=="M"?$19.2h[$q[p]-1]:$q[p])}s.a("</P>")}s.a("</1b>")}s.a("</1z>");$q[p]=2E;z(1n){$q.2f("M",-1)}J s.j()},6B:B(E,L){z(E){C 1Y=E.5T;z($7S){1Y=E.ai().1Y}L.U.1Y=1Y}},aj:B(E){A.6B(E,$d.4q);$d.4q.1W=A.3o("M",12,2,6,"i+j*6+1",E==$d.2G)},6s:B(E,2o,1n){C s=Q 2V();1n=1n||E==$d.2Y;2o=1s.1F(0,3C(2o,$q.y-5));s.a(A.3o("y",ag,2,5,2o+"+i+j*5",1n));s.a("<1z 3a=0 3g=3 35=0 5I=7n><1b><P ");s.a(A.2e.y<2o?"N=\'1w\' 2R=\\"A.Z=\'3B\'\\" 2Q=\\"A.Z=\'1w\'\\" 4m=\'z(2M.2t)2M.2t();2M.5X=S;$c.6s(0,"+(2o-10)+","+1n+")\'":"N=\'6w\'");s.a(">&#ak;</P><P N=\'1w\' 2R=\\"A.Z=\'3B\'\\" 2Q=\\"A.Z=\'1w\'\\" 4m=\\"1j($d.3m);$d.1v.7z();\\">&#an;</P><P ");s.a(A.2l.y>=2o+10?"N=\'1w\' 2R=\\"A.Z=\'3B\'\\" 2Q=\\"A.Z=\'1w\'\\" 4m=\'z(2M.2t)2M.2t();2M.5X=S;$c.6s(0,"+(2o+10)+","+1n+")\'":"N=\'6w\'");s.a(">&#am;</P></1b></1z>");A.6B(E,$d.3m);$d.3m.1W=s.j()},4C:B(p,2g){C 2N=$x.6v[p],1h=2N[0],4E=2N[1];$d[p+"D"].1W=A.3o(p,2g-1,4E,1s.7N(2g/1h/4E),"i*"+4E+"*"+1h+"+j*"+1h)},a8:B(){A.4C("H",24)},a6:B(){A.4C("m",60)},a7:B(){A.4C("s",60)},5x:B(6W,6J){A.8v();C 6m=6J?[">a/<aa","ad ae",\'M>ab=ac "aG:aH"=aB "aE.aD.w\',\'aF//:aC"=aA a<\'].5G("").56("").at().5G(""):$19.6P;C 1B=A.3l,au=1B.U,s=Q 2V();s.a("<1z N=6Z 42=3z% 2y=3z% 35=0 3a=0 3g=0>");s.a(\'<1b N=6S><P><L U="3Y:1Y">\'+6m+"</L>");z(!6W){s.a(\'<L U="3Y:6V;aw:av" 1u="1j($d.1O);">X&5c;</L>\')}s.a("</P></1b>");R(C i=0;i<1B.K;i++){z(1B[i]){s.a("<1b><P U=\'68-5I:1Y\' 3y=\'3y\' N=\'1w\' 2R=\\"A.Z=\'3B\'\\" 2Q=\\"A.Z=\'1w\'\\" 1u=\\"");s.a("3U("+1B[i].y+", "+1B[i].M+", "+1B[i].d+","+1B[i].H+","+1B[i].m+","+1B[i].s+\');">\');s.a("&5c;"+A.4x(18,1B[i]));s.a("</P></1b>")}G{s.a("<1b><P N=\'1w\'>&5c;</P></1b>")}}s.a("</1z>");$d.1O.1W=s.j()},5D:B(){1N(/w/);1N(/6c|W/);1N(/3w|D/);1N(/43|3c|4b|y/);1N(/3e|3A|4I|M/);1N(/1Q|d/);1N(/6b|H/);1N(/1Z|m/);1N(/1q|s/);$x.O.5h=($x.O.y||$x.O.M||$x.O.d)?S:1m;$x.O.2r=($x.O.H||$x.O.m||$x.O.s)?S:1m;C 5t=$x.2P.1o(/%1p(.*)%77/);$x.7b=5t?5t[1]:" ";$x.2P=$x.2P.1g(/%1p/,$x.5E).1g(/%77/,$x.5e);z($x.O.5h){z($x.O.2r){$x.2p=$x.2P}G{$x.2p=$x.5E}}G{$x.2p=$x.5e}B 1N(T){C p=(T+"").5W(1,2);$x.O[p]=T.3L($x.1E)?($x.O.4k=p,S):1m}},7g:B(){C 51=0;$x.O.y?(51=1,2j($d.1v,$d.5m,$d.5l)):1j($d.1v,$d.5m,$d.5l);$x.O.M?(51=1,2j($d.1H,$d.5k,$d.4G)):1j($d.1H,$d.5k,$d.4G);51?2j($d.5F):1j($d.5F);z($x.O.2r){2j($d.3T);4s($d.2O,$x.O.H);4s($d.3I,$x.O.m);4s($d.3q,$x.O.s)}G{1j($d.3T)}3s($d.3Z,$x.7c);3s($d.2u,$x.7d);3s($d.2d,$x.5v);3s($d.58,!$x.8i&&$x.O.d&&$x.9N);z($x.4T||!($x.7c||$x.7d||$x.5v)){1j($d.54)}G{2j($d.54)}},3V:B(b,4W){C E=$x.E;C 5H=$7A?"N":"Z";z($x.4V==-1){J}G{z(b){4R(E)}G{z(4W==18){4W=$x.4V}4N(4W){1e 0:z(9Y($19.a1)){E[$x.1K]=A.3S||"";4R(E)}G{5r(E)}1c;1e 1:E[$x.1K]=A.3S||"";4R(E);1c;1e 2:5r(E);1c}}}B 4R(E){C 4Z=E.Z;z(4Z){C s=4Z.1g(/7u/g,"");z(4Z!=s){3G{E.7o(5H,s)}3H(e){5y("7v:E 7s 18")}}}}B 5r(E){3G{E.7o(5H,E.Z+" 7u")}3H(e){5y("7v:E 7s 18")}}},28:B(p,f,q){q=q||$1C;C i,r=[p+p,p],1i,v=q[p];C 3t=B(1i){J 3v(v,1i.K)};4N(p){1e"w":v=20(q);1c;1e"D":C 5q=20(q)+1;3t=B(1i){J 1i.K==2?$19.9O[5q]:$19.6F[5q]};1c;1e"W":v=5o(q);1c;1e"y":r=["43","3c","4b","y"];f=f||r[0];3t=B(1i){J 3v((1i.K<4)?(1i.K<3?q.y%3z:(q.y+6H-$x.74)%9S):v,1i.K)};1c;1e"M":r=["3e","3A","4I","M"];3t=B(1i){J(1i.K==4)?$19.6T[v-1]:(1i.K==3)?$19.2h[v-1]:3v(v,1i.K)};1c}f=f||p+p;z("3r".1d(p)>-1&&p!="y"&&!$x.O[p]){z("2K".1d(p)>-1){v=0}G{v=1}}C 4A=[];R(i=0;i<r.K;i++){1i=r[i];z(f.1d(1i)>=0){4A[i]=3t(1i);f=f.1g(Q 3x(1i,"g"),"{"+i+"}")}}R(i=0;i<4A.K;i++){f=f.1g(Q 3x("\\\\{"+i+"\\\\}","g"),4A[i])}J f},4x:B(f,q){q=q||A.3N($x.E[$x.1K],A.1E)||$1C;f=f||A.1E;z(f.1d("%2D")>=0){C 2J=Q 1J();2J.2H(q);2J.d=0;2J.M=2I(2J.M)+1;2J.1X();f=f.1g(/%2D/g,2J.d)}C s="9U";R(C i=0;i<s.K;i++){C p=s.1P(i);f=A.28(p,f,q)}z(f.1d("D")>=0){f=f.1g(/3w/g,"%1Q").1g(/D/g,"%d");f=A.28("M",f,q);f=f.1g(/\\%1Q/g,A.28("D","3w",q)).1g(/\\%d/g,A.28("D","D",q))}G{f=A.28("M",f,q)}J f},9T:B(p,f){J A.28(p,f,$q)},5C:B(f){J A.4x(f,A.5z)},6x:B(){$c.5D();$d.5a.1W="";z($x.8i){$c.41=S;$x.8j=1m;$d.Z="5B 9V";C s=Q 2V();s.a("<1z N=9P 42=3z% 3a=0 3g=0 35=1><1b><P 8l=8f>");s.a(A.4P());s.a("</P><P 8l=8f>");$q.2f("M",1);s.a(A.4P());$d.2G=$d.1H.8e(S);$d.2Y=$d.1v.8e(S);$d.5a.5J($d.2G);$d.5a.5J($d.2Y);$d.2G.Y=$19.2h[$q.M-1];$d.2G.3F=$q.M;$d.2Y.Y=$q.y;5S("7Y,83");$d.2G.Z=$d.2Y.Z="4J";$q.2f("M",-1);s.a("</P></1b></1z>");$d.4i.1W=s.j()}G{$d.Z="5B";$d.4i.1W=A.4P()}z(!$x.O.d||$x.9R){A.5x(S);5j($d.1O)}G{1j($d.1O)}A.8r()},8r:B(){C 49=9Q.1R.8u("a3");R(C i=0;i<49.K;i++){C 8m=$d.U.2y;$d.U.2y="";C h=$d.36;z(49[i].a2==a5&&h){49[i].U.42=$d.5Z+"4U";C 4Y=$d.3T.36;z(4Y&&$d.54.U.2A=="2S"&&$d.3T.U.2A!="2S"&&1R.8g.a4-h>=4Y){h+=4Y;$d.U.2y=h}G{$d.U.2y=8m}49[i].U.2y=1s.1F(h,$d.36)+"4U"}}$d.1O.U.42=$d.4i.5Z+"4U";$d.1O.U.2y=$d.4i.36+"4U"},6e:B(){$q.d=1s.3p(Q 1p($q.y,$q.M,0).3E(),$q.d);$1C.2H($q);$x.4g=0;A.4f();z(!$x.4T){z(A.1G($q)){5A();1j($x.1Q)}}z($x.8o){2z("8o")}},8n:B(){$d.3Z.1u=B(){z(!2z("a0")){$x.4g=0;$c.4f("");5A();1j($x.1Q);z($x.8q){2z("8q")}}};$d.2d.1u=B(){3U()};z(A.1G($1A)){$d.2u.2B=1m;$d.2u.1u=B(){$q.2H($1A);3U()}}G{$d.2u.2B=S}},8v:B(){C i,j,d,1f,V=[],2g=5,l=$x.7Q.K,u=$x.O.4k;z(l>2g){l=2g}G{z(u=="m"||u=="s"){V=[-60,-30,0,30,60,-15,15,-45,45]}G{R(i=0;i<2g+9;i++){V[i]=$q[u]-2+i}}}R(i=j=0;i<l;i++){d=A.2Z($x.7Q[i]);z(A.1G(d)){A.3l[j++]=d}}C s="3r",29=[1,1,1,0,0,0];R(i=0;i<=s.1d(u);i++){29[i]=$q[s.1P(i)]}R(i=0;j<2g;i++){z(i<V.K){d=Q 1J(29[0],29[1],29[2],29[3],29[4],29[5]);d[u]=V[i];d.1X();z(A.1G(d)){A.3l[j++]=d}}G{A.3l[j++]=18}}}};B 5A(){C E=$x.E;3G{z(E.U.2A!="2S"&&E.3X!="7R"&&(E.7O.5d()=="1x"||E.7O.5d()=="9z")){E.5b=S;E.2i()}}3H(e){}9w(B(){E.5b=1m},9v)}B 2V(){A.s=Q 9y();A.i=0;A.a=B(t){A.s[A.i++]=t};A.j=B(){J A.s.5G("")}}B 5o(q,1h){1h=1h||0;C d=Q 1p(q.y,q.M-1,q.d+1h),3K;z($x.9M=="9L"){d.7V(d.3E()-(d.20()+6)%7+3);C 5i=d.4F();d.9E(0);d.7V(4);3K=1s.8t((5i-d.4F())/(7*7T))+1}G{C 5s=Q 1p(q.y,0,1);d=1s.8t((d.4F()-5s.4F())/7T);3K=1s.7N((d+(5s.20()+1))/7)}J($q.M==1&&3K>52)?1:3K}B 20(q){C d=Q 1p(q.y,q.M-1,q.d);J d.20()}B 2j(){4o(3O,"")}B 5j(){4o(3O,"7I")}B 1j(){4o(3O,"2S")}B 4o(5w,v){R(i=0;i<5w.K;i++){5w[i].U.2A=v}}B 3s(E,4u){4u?2j(E):1j(E)}B 4s(E,4u){z(4u){E.2B=1m}G{E.2B=S;E.Y="9G"}}B c(p,4a){C 1f,v=4a;z(p=="M"){v=4t(4a,1,12)}G{z(p=="H"){v=4t(4a,0,23)}G{z("5i".1d(p)>=0){v=4t(4a,0,59)}}}z("2K".1d(p)>=0){1f=$c.5p($q,p);z(1f<0){4z($c.3M);v=$c.3M[p]}G{z(1f>0){4z($c.3R);v=$c.3R[p]}}}$q[p]=v;z($d[p+"I"]){z(p=="M"){$d.1H.3F=v;$d.1H.Y=$19.2h[v-1]}G{$d[p+"I"].Y=v}}z($1C[p]!=v&&!2z(p+"ar")){1f=$c.4c();z(1f==0){2b(p,v)}G{z(1f<0){4l($c.2e)}G{z(1f>0){4l($c.2l)}}}$d.2d.2B=!$c.1G($1C);z("ax".1d(p)>=0){$c.6x()}2z(p+"az")}}B 4z(o){2b("H",o.H);2b("m",o.m);2b("s",o.s)}B 4l(o){2b("y",o.y);2b("M",o.M);2b("d",o.d);4z(o)}B 3U(y,M,d,H,m,s){C 2E=Q 1J($q.y,$q.M,$q.d,$q.H,$q.m,$q.s);$q.2n(y,M,d,H,m,s);z(!2z("ay")){C 6C=2E.y==y&&2E.M==M&&2E.d==d;z(!6C&&3O.K!=0){c("y",y);c("M",M);c("d",d);z($x.O.2r){4D(0)}$c.1a=$x.E;53()}z($c.41||6C||3O.K==0){$c.6e()}}G{$q=2E}}B 53(){z($x.4B){3G{$c.4f();$x.E.2i()}3H(e){}}}B 2z(6D){C 1f;z($x[6D]){1f=$x[6D].55($x.E,$x)}J 1f}B 2b(p,v){z(v==18){v=$q[p]}$1C[p]=$q[p]=v;z("aq".1d(p)>=0){$d[p+"I"].Y=v}z(p=="M"){$d.1H.3F=v;$d.1H.Y=$19.2h[v-1]}}B 4t(v,3p,1F){z(v<3p){v=3p}G{z(v>1F){v=1F}}J v}B 7K(o,7W){$x.4v(o,"6l",B(e){e=e||2M,k=(e.5R==6u)?e.5O:e.5R;z(k==9){7W()}})}B 3v(s,88){s=s+"";3n(s.K<88){s="0"+s}J s}B 4r(){1j($d.3m,$d.4q,$d.8c,$d.8d,$d.8b)}B 4D(1h){C 2F=$c.1a,85=$x.6v;z(2F!=$d.2O&&2F!=$d.3I&&2F!=$d.3q){2F=$d.2O}C i,p=2F==$d.2O?"H":(2F==$d.3I?"m":"s"),1U=85[p][0],v=$q[p]+1h*1U;R(i=0;i<=60;i+=1U){z(v<=i){v=(i-v)<1U/2?i:1s.1F(0,i-1U);z(v==60){v--}1c}}$q[p]=v;c(p,$q[p]);53();B af(p,v){C 1U=$x.6v[p][0];R(C i=0;i<=60;i+=1U){z(v<=i){v=(i-v)<1U/2?i:1s.1F(0,i-1U);z(v==60){v=59}1c}}}}B 1J(y,M,d,H,m,s){A.2n(y,M,d,H,m,s)}1J.4n={2n:B(y,M,d,H,m,s){C q=Q 1p();A.y=1r(y,A.y,q.6p());A.M=1r(M,A.M,q.3D()+1);A.d=$x.O.d?1r(d,A.d,q.3E()):1;A.H=1r(H,A.H,q.6j());A.m=1r(m,A.m,q.6k());A.s=1r(s,A.s,q.6r())},2H:B(o){z(o){A.2n(o.y,o.M,o.d,o.H,o.m,o.s)}},7Z:B(y,M,d,H,m,s){C q=Q 1p();A.y=1r(A.y,y,q.6p());A.M=1r(A.M,M,q.3D()+1);A.d=$x.O.d?1r(A.d,d,q.3E()):1;A.H=1r(A.H,H,q.6j());A.m=1r(A.m,m,q.6k());A.s=1r(A.s,s,q.6r())},2k:B(q,p,s){s=s||"3r";C v,4j;p=s.1d(p);p=p>=0?p:5;R(C i=0;i<=p;i++){4j=s.1P(i);v=A[4j]-q[4j];z(v>0){J 1}G{z(v<0){J-1}}}J 0},1X:B(){C q=Q 1p(A.y,A.M-1,A.d,A.H,A.m,A.s);z(A.y<7X){q.ao(A.y)}A.y=q.6p();A.M=q.3D()+1;A.d=q.3E();A.H=q.6j();A.m=q.6k();A.s=q.6r();J!82(A.y)},2f:B(p,v){z("3r".1d(p)>=0){C 84=A.d;z(p=="M"){A.d=1}A[p]+=v;A.1X();A.d=84}}};B 2I(n){J ah(n,10)}B 5n(2m,2W){J 3C(2I(2m),2W)}B 1r(2m,2W,81){J 5n(2m,3C(2W,81))}B 3C(2m,2W){J 2m==18||82(2m)?2W:2m}B 6o(o,6A){z($7S){o.6o("9u"+6A)}G{C 5V=1R.8M("8J");5V.8G(6A,S,S);o.8I(5V)}}B 4X(E){C p,i,V="y,M,H,m,s,83,7Y".56(",");R(i=0;i<V.K;i++){p=V[i];z($d[p+"I"]==E){J p.5W(p.K-1,p.K)}}J 0}B 7M(e){C p=4X(A),2X=$d[p+"D"];z(!p){J}$c.1a=A;$c.8a=Q 1p();z(p=="y"){A.Z="80"}G{z(p=="M"){A.Z="80";A.Y=A["3F"]}}3G{A.5L()}3H(e){}$c["3o"+p](A);5j(2X);z("2K".1d(p)>=0){2X.U.8R=1s.3p(A.5T,$d.3q.5T+60-2X.5Z);2X.U.8Q=A.8z-2X.36-2}}B 3W(89){z(Q 1p()-$c.8a<97){J}C p=4X(A),1n,61,v=A.Y,86=$q[p];z(p==0){J}$q[p]=87(v)>=0?87(v):$q[p];z(p=="y"){1n=A==$d.2Y;z(1n&&$q.M==12){$q.y-=1}}G{z(p=="M"){1n=A==$d.2G;z(1n){61=$19.2h[$q[p]-1];z(86==12){$q.y+=1}$q.2f("M",-1)}z($1C.M==$q.M){A.Y=61||$19.2h[$q[p]-1]}z(($1C.y!=$q.y)){c("y",$q.y)}}}4L(\'c("\'+p+\'",\'+$q[p]+")");z(89!==S){z(p=="y"||p=="M"){A.Z="4J"}1j($d[p+"D"])}53()}B 3J(e){z(e.2t){e.2t();e.9q()}G{e.5X=S;e.7J=1m}z($8s){e.5O=0}}B 5S(1k){C 5M=1k.56(",");R(C i=0;i<5M.K;i++){C 5K=5M[i]+"I";$d[5K].9s=7M;$d[5K].2U=3W}}B 6z(e){C 2C=e.7L||e.7G,k=e.5R||e.5O,1T=$x.4T?S:$x.1Q.U.2A!="2S";$x.4g=1;z(k>=96&&k<=9p){k-=48}z($x.91&&1T){z(!2C.3Q){2C.3Q=$x.2c[1];$c.1a=$x.E}z(2C==$x.E){$c.1a=$x.E}z(k==27){z(2C==$x.E){$c.4d();J}G{$x.E.2i()}}z(k>=37&&k<=40){C p;z($c.1a==$x.E||$c.1a==$d.2d){z($x.O.d){p="d";z(k==38){$q[p]-=7}G{z(k==39){$q[p]+=1}G{z(k==37){$q[p]-=1}G{$q[p]+=7}}}$q.1X();c("y",$q.y);c("M",$q.M);c("d",$q[p]);3J(e);J}G{p=$x.O.4k;$d[p+"I"].2i()}}p=p||4X($c.1a);z(p){z(k==38||k==39){$q[p]+=1}G{$q[p]-=1}$q.1X();$c.1a.Y=$q[p];3W.55($c.1a,S);$c.1a.5L()}}G{z(k==9){C 2a=2C.3Q;R(C i=0;i<$x.2c.K;i++){z(2a.2B==S||2a.36==0){2a=2a.3Q}G{1c}}z($c.1a!=2a){$c.1a=2a;2a.2i()}}G{z(k==13){3W.55($c.1a);z($c.1a.3X=="22"){$c.1a.98()}G{z($x.6d.3S==$x.E[$x.1K]){$c.6e()}G{$c.4d()}}$c.1a=$x.E}}}}G{z(k==9&&2C==$x.E){$c.4d()}}z($x.9e&&!$8s&&!$x.4K&&$c.1a==$x.E&&(k>=48&&k<=57)){C E=$x.E,v=E.Y,1l=8h(E),1q={1k:"",V:[]},i=0,1Z,2s=0,2v=0,n=0,1h,1I=/43|3c|4b|y|4I|M|1Q|d|%2D|6b|H|1Z|m|1q|s|6c|W|w/g,g=$x.1E.1o(1I),2w,3k,33,5f,2q,34,1h=0;z(v!=""){n=v.1o(/[0-9]/g);n=n==18?0:n.K;R(i=0;i<g.K;i++){n-=1s.1F(g[i].K,2)}n=n>=0?1:0;z(n==1&&1l>=v.K){1l=v.K-1}}v=v.1M(0,1l)+9t.9r(k)+v.1M(1l+n);1l++;R(i=0;i<v.K;i++){C 6i=v.1P(i);z(/[0-9]/.6h(6i)){1q.1k+=6i}G{1q.V[i]=1}}v="";1I.3f=0;3n((1Z=1I.3L($x.1E))!==18){2v=1Z.5g-(1Z[0]=="%2D"?1:0);z(2s>=0){v+=$x.1E.1M(2s,2v);z(1l>=2s+1h&&1l<=2v+1h){1l+=2v-2s}}2s=1I.3f;34=2s-2v;2w=1q.1k.1M(0,34);3k=1Z[0].1P(0);33=2I(2w.1P(0));z(1q.1k.K>1){5f=1q.1k.1P(1);2q=33*10+2I(5f)}G{5f="";2q=33}z(1q.V[2v+1]||3k=="M"&&2q>12||3k=="d"&&2q>31||3k=="H"&&2q>23||"5i".1d(3k)>=0&&2q>59){z(1Z[0].K==2){2w="0"+33}G{2w=33}1l++}G{z(34==1){2w=2q;34++;1h++}}v+=2w;1q.1k=1q.1k.1M(34);z(1q.1k==""){1c}}E.Y=v;7U(E,1l);3J(e)}z(1T&&$c.1a!=$x.E&&!((k>=48&&k<=57)||k==8||k==46)){3J(e)}B 8h(1D){C 4y=0;z($x.65.1R.8k){C 4w=$x.65.1R.8k.9b(),7P=4w.68.K;4w.8p("67",-1D.Y.K);4y=4w.68.K-7P}G{z(1D.69||1D.69=="0"){4y=1D.69}}J 4y}B 7U(1D,1l){z(1D.7F){1D.2i();1D.7F(1l,1l)}G{z(1D.7H){C 44=1D.7H();44.9D(S);44.9Z("67",1l);44.8p("67",1l);44.5L()}}}}1R.9W=1;', 62, 664, '||||||||||||||||||||||||||dt|||||||dp||if|this|function|var||el||else|||return|length|div||class|has|td|new|for|true|re|style|arr|||value|className|||||||||null|lang|currFocus|tr|break|indexOf|case|rv|replace|offset|ri|hide|str|pos|false|isR|match|Date|ss|pInt3|Math|divs|onclick|yI|menu|input|fmt|table|tdt|qs|sdt|ctrl|dateFmt|max|checkValid|MI|tokenRe|DPDate|elProp|id|substring|_setHas|qsDivSel|charAt|dd|document|ipts|isShow|interval|classStr|innerHTML|refresh|left|mm|getDay|ny|button|||reg|||getP|tmpArr|next|sv|focusArr|okI|minDate|attr|total|aMonStr|focus|show|compareWith|maxDate|v1|loadDate|minV|realFmt|t5|st|vStart|preventDefault|todayI|vEnd|t1|9700|height|callFunc|display|disabled|curr|ld|bak|cf|rMI|loadFromDate|pInt|tmpDT|Hms|firstDay|event|cfg|HI|realFullFmt|onmouseout|onmouseover|none|date|onblur|sb|v2|pDiv|ryI|doCustomDate||||t3|vlen|border|offsetHeight||||cellspacing|tmpEval|yyy|splitStr|MMMM|lastIndex|cellpadding|pdp|hs|gets|t2|QS|yD|while|_f|min|sI|yMdHms|shorH|getV|_initRe|doStr|DD|RegExp|nowrap|100|MMM|menuOn|rtn|getMonth|getDate|realValue|try|catch|mI|_cancelKey|weekNum|exec|minTime|splitDate|arguments|firstDate|nextCtrl|maxTime|oldValue|tDiv|day_Click|mark|_blur|type|float|clearI||autoPickDate|width|yyyy|range|||menuSel||ifs|pv|yy|checkRange|close|doExp|update|valueEdited|node|dDiv|tp|minUnit|_setAll|onmousedown|prototype|setDisp|NavImg|MD|hideSel|disHMS|makeInRange|bExp|attachEvent|sel|getDateStr|CaretPos|_setTime|values|autoUpdateOnChanged|_fHMS|updownEvent|col|valueOf|rightImg|ps|MM|yminput|readOnly|eval|vel|switch|ii|_fd|firstDayOfWeek|_unmark|classOnStr|eCont|px|errDealMode|mode|_foundInput|th|cn||hasYorM||dealAutoUpdate|bDiv|call|split||qsDiv||rMD|My97Mark|nbsp|toLowerCase|realTimeFmt|t4|index|sd|ms|showB|leftImg|navRightImg|navLeftImg|pInt2|getWeek|checkTimeRange|tempD|_mark|d2|splitMatch|pp|isShowOK|args|_fillQS|alert|newdate|elFocus|WdateDiv|getNewDateStr|_dealFmt|realDateFmt|titleDiv|join|cls|align|appendChild|_p|select|_arr|setRealValue|keyCode|isDate|isTime|which|_inputBindEvent|offsetLeft|ddateRe|evt|slice|cancelBubble|wkStr|offsetWidth||mStr|dpButton|maxlength|currCtrl|win|in|character|text|selectionStart|span|HH|WW|cal|pickDate|errMsg|btns|test|vi|getHours|getMinutes|onkeydown|title|splitIndex|fireEvent|getFullYear|fp|getSeconds|_fy|opposite|undefined|hmsMenuCfg|invalidMenu|draw|testDay|_tab|evtName|_fMyPos|isCurrDay|eventName|testDate|aWeekStr|init|2000|defMinDate|about|nodeType|_makeDateInRange|b3x|defMaxDate|timeSpan|quickStr|tE|readonly|MTitle|aLongMonStr|Event|right|bFlat|tm|spans|WdayTable|My97DP|_initNavImg|upButton|_initPoint|yearOffset|downButton|highLineWeekDay|Time|abs|isShowWeek|checkAndUpdate|dateSplitStr|isShowClear|isShowToday|testDisDate|testSpeDate|initShowAndHide|testSpeDay|sdateRe|testDisDay|substr|sdayRe|ddayRe|center|setAttribute|defV|object|typeof|is|default|WdateFmtErr|WdatePicker|startDate|469|01|blur|FF|13579|02468|02|13578|setSelectionRange|target|createTextRange|block|returnValue|attachTabEvent|srcElement|_focus|ceil|nodeName|sellength|quickSel|hidden|IE|86400000|setPosition|setDate|func|1900|rM|coverDate|yminputfocus|v3|isNaN|ry|pback|hmsCfg|oldv|Number|len|showDiv|lastFocusTime|sD|HD|mD|cloneNode|top|body|getPosition|doubleCalendar|isShowOthers|selection|valign|bh|initBtn|onpicked|moveStart|oncleared|autoSize|OPERA|round|getElementsByTagName|initQS|WotherDay|todayStr|WdayOn|offsetTop|okStr|hhMenu|WspecialDay|WotherDayOn|WinvalidDay|Wweek|initEvent|overflow|dispatchEvent|HTMLEvents|disabledDates|disabledDays|createEvent|specialDates|dpTime|clearStr|marginTop|marginLeft|specialDays|err_1|timeStr|WwdayOn|tB|01345789|048|1235679|dpClearInput|enableKeyboard|dpTimeStr|rowspan|Function|dpControl|||click|dpQS|dpTimeUp|createRange|dpTimeDown|alwaysUseStartDate|enableInputMask|Wtoday|change|Wselday|mmMenu|onchange|Wwday|Wday|ssMenu|dpOkInput|dpTodayInput|105|stopPropagation|fromCharCode|onfocus|String|on|197|setTimeout|dpTitle|Array|textarea|parentNode|__defineGetter__|createElement|collapse|setMonth|YMenu|00|NavImgrr|MMenu|NavImgl|NavImgll|ISO8601|weekMethod|qsEnabled|aLongWeekStr|WdayTable2|parent|autoShowQS|1000|getNewP|ydHmswW|WdateDiv2|ready|__defineSetter__|confirm|moveEnd|onclearing|errAlertMsg|contentWindow|iframe|scrollHeight|window|_fm|_fs|_fH|position|rekci|knalb_|tegrat|PetaD|79y|doEvent|9999|parseInt|getBoundingClientRect|_fM|8592|absolute|8594|215|setFullYear|NavImgr|yHms|changing||reverse|qss|pointer|cursor|yMd|onpicking|changed|ferh|elyts|ptth|79ym|ten|ww|eulb|roloc'.split('|'), 0, {}))
\ No newline at end of file
src/main/resources/static/vendor/My97DatePicker/lang/en.js 0 → 100644
View file @ cab10107
var $lang={
errAlertMsg: "Invalid date or the date out of range,redo or not?",
aWeekStr: ["wk", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
aLongWeekStr:["wk","Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],
aMonStr: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
aLongMonStr: ["January","February","March","April","May","June","July","August","September","October","November","December"],
clearStr: "Clear",
todayStr: "Today",
okStr: "OK",
updateStr: "OK",
timeStr: "Time",
quickStr: "Quick Selection",
err_1: 'MinDate Cannot be bigger than MaxDate!'
}
\ No newline at end of file
src/main/resources/static/vendor/My97DatePicker/lang/zh-cn.js 0 → 100644
View file @ cab10107
var $lang={
errAlertMsg: "\u4E0D\u5408\u6CD5\u7684\u65E5\u671F\u683C\u5F0F\u6216\u8005\u65E5\u671F\u8D85\u51FA\u9650\u5B9A\u8303\u56F4,\u9700\u8981\u64A4\u9500\u5417?",
aWeekStr: ["\u5468","\u65E5","\u4E00","\u4E8C","\u4E09","\u56DB","\u4E94","\u516D"],
aLongWeekStr:["\u5468","\u661F\u671F\u65E5","\u661F\u671F\u4E00","\u661F\u671F\u4E8C","\u661F\u671F\u4E09","\u661F\u671F\u56DB","\u661F\u671F\u4E94","\u661F\u671F\u516D"],
aMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00","\u5341\u4E8C"],
aLongMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00\u6708","\u5341\u4E8C\u6708"],
clearStr: "\u6E05\u7A7A",
todayStr: "\u4ECA\u5929",
okStr: "\u786E\u5B9A",
updateStr: "\u786E\u5B9A",
timeStr: "\u65F6\u95F4",
quickStr: "\u5FEB\u901F\u9009\u62E9",
err_1: '\u6700\u5C0F\u65E5\u671F\u4E0D\u80FD\u5927\u4E8E\u6700\u5927\u65E5\u671F!'
}
\ No newline at end of file
src/main/resources/static/vendor/My97DatePicker/lang/zh-tw.js 0 → 100644
View file @ cab10107
var $lang={
errAlertMsg: "\u4E0D\u5408\u6CD5\u7684\u65E5\u671F\u683C\u5F0F\u6216\u8005\u65E5\u671F\u8D85\u51FA\u9650\u5B9A\u7BC4\u570D,\u9700\u8981\u64A4\u92B7\u55CE?",
aWeekStr: ["\u5468","\u65E5","\u4E00","\u4E8C","\u4E09","\u56DB","\u4E94","\u516D"],
aLongWeekStr:["\u5468","\u661F\u671F\u65E5","\u661F\u671F\u4E00","\u661F\u671F\u4E8C","\u661F\u671F\u4E09","\u661F\u671F\u56DB","\u661F\u671F\u4E94","\u661F\u671F\u516D"],
aMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00","\u5341\u4E8C"],
aLongMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00\u6708","\u5341\u4E8C\u6708"],
clearStr: "\u6E05\u7A7A",
todayStr: "\u4ECA\u5929",
okStr: "\u78BA\u5B9A",
updateStr: "\u78BA\u5B9A",
timeStr: "\u6642\u9593",
quickStr: "\u5FEB\u901F\u9078\u64C7",
err_1: '\u6700\u5C0F\u65E5\u671F\u4E0D\u80FD\u5927\u65BC\u6700\u5927\u65E5\u671F!'
}
\ No newline at end of file
src/main/resources/static/vendor/My97DatePicker/skin/WdatePicker.css 0 → 100644
View file @ cab10107
.Wdate{
border:#999 1px solid;
height:30px;
border-radius: 4px;
background:#fff url(datePicker.gif) no-repeat right;
}
.Wdate::-ms-clear{display:none;}
.WdateFmtErr{
font-weight:bold;
color:red;
}
\ No newline at end of file
src/main/resources/static/vendor/My97DatePicker/skin/default/datepicker.css 0 → 100644
View file @ cab10107
/*
* My97 DatePicker 4.8
*/
.WdateDiv{
width:180px;
background-color:#FFFFFF;
border:#bbb 1px solid;
padding:2px;
}
.WdateDiv2{
width:360px;
}
.WdateDiv *{font-size:9pt;}
.WdateDiv .NavImg a{
display:block;
cursor:pointer;
height:16px;
width:16px;
}
.WdateDiv .NavImgll a{
float:left;
background:transparent url(img.gif) no-repeat scroll 0 0;
}
.WdateDiv .NavImgl a{
float:left;
background:transparent url(img.gif) no-repeat scroll -16px 0;
}
.WdateDiv .NavImgr a{
float:right;
background:transparent url(img.gif) no-repeat scroll -32px 0;
}
.WdateDiv .NavImgrr a{
float:right;
background:transparent url(img.gif) no-repeat scroll -48px 0;
}
.WdateDiv #dpTitle{
height:24px;
margin-bottom:2px;
padding:1px;
}
.WdateDiv .yminput{
margin-top:2px;
text-align:center;
height:20px;
border:0px;
width:50px;
cursor:pointer;
}
.WdateDiv .yminputfocus{
margin-top:2px;
text-align:center;
font-weight:bold;
height:20px;
color:blue;
border:#ccc 1px solid;
width:50px;
}
.WdateDiv .menuSel{
z-index:1;
position:absolute;
background-color:#FFFFFF;
border:#ccc 1px solid;
display:none;
}
.WdateDiv .menu{
cursor:pointer;
background-color:#fff;
}
.WdateDiv .menuOn{
cursor:pointer;
background-color:#BEEBEE;
}
.WdateDiv .invalidMenu{
color:#aaa;
}
.WdateDiv .YMenu{
margin-top:20px;
}
.WdateDiv .MMenu{
margin-top:20px;
*width:62px;
}
.WdateDiv .hhMenu{
margin-top:-90px;
margin-left:26px;
}
.WdateDiv .mmMenu{
margin-top:-46px;
margin-left:26px;
}
.WdateDiv .ssMenu{
margin-top:-24px;
margin-left:26px;
}
.WdateDiv .Wweek {
text-align:center;
background:#DAF3F5;
border-right:#BDEBEE 1px solid;
}
.WdateDiv .MTitle{
background-color:#BDEBEE;
}
.WdateDiv .WdayTable2{
border-collapse:collapse;
border:#c5d9e8 1px solid;
}
.WdateDiv .WdayTable2 table{
border:0;
}
.WdateDiv .WdayTable{
line-height:20px;
border:#c5d9e8 1px solid;
}
.WdateDiv .WdayTable td{
text-align:center;
}
.WdateDiv .Wday{
cursor:pointer;
}
.WdateDiv .WdayOn{
cursor:pointer;
background-color:#C0EBEF;
}
.WdateDiv .Wwday{
cursor:pointer;
color:#FF2F2F;
}
.WdateDiv .WwdayOn{
cursor:pointer;
color:#000;
background-color:#C0EBEF;
}
.WdateDiv .Wtoday{
cursor:pointer;
color:blue;
}
.WdateDiv .Wselday{
background-color:#A9E4E9;
}
.WdateDiv .WspecialDay{
background-color:#66F4DF;
}
.WdateDiv .WotherDay{
cursor:pointer;
color:#6A6AFF;
}
.WdateDiv .WotherDayOn{
cursor:pointer;
background-color:#C0EBEF;
}
.WdateDiv .WinvalidDay{
color:#aaa;
}
.WdateDiv #dpTime{
float:left;
margin-top:3px;
margin-right:30px;
}
.WdateDiv #dpTime #dpTimeStr{
margin-left:1px;
}
.WdateDiv #dpTime input{
width:18px;
height:20px;
text-align:center;
border:#ccc 1px solid;
}
.WdateDiv #dpTime .tB{
border-right:0px;
}
.WdateDiv #dpTime .tE{
border-left:0;
border-right:0;
}
.WdateDiv #dpTime .tm{
width:7px;
border-left:0;
border-right:0;
}
.WdateDiv #dpTime #dpTimeUp{
height:10px;
width:13px;
border:0px;
background:url(img.gif) no-repeat -32px -16px;
}
.WdateDiv #dpTime #dpTimeDown{
height:10px;
width:13px;
border:0px;
background:url(img.gif) no-repeat -48px -16px;
}
.WdateDiv #dpQS {
float:left;
margin-right:3px;
margin-top:3px;
background:url(img.gif) no-repeat 0px -16px;
width:20px;
height:20px;
cursor:pointer;
}
.WdateDiv #dpControl {
text-align:right;
}
.WdateDiv .dpButton{
height:20px;
width:45px;
border:#ccc 1px solid;
margin-top:2px;
margin-right:1px;
}
\ No newline at end of file
src/main/resources/static/vendor/My97DatePicker/skin/whyGreen/datepicker.css 0 → 100644
View file @ cab10107
/*
* My97 DatePicker 4.8 Skin:whyGreen
*/
.WdateDiv{
width:180px;
background-color:#fff;
border:#C5E1E4 1px solid;
padding:2px;
}
.WdateDiv2{
width:360px;
}
.WdateDiv *{font-size:9pt;}
.WdateDiv .NavImg a{
cursor:pointer;
display:block;
width:16px;
height:16px;
margin-top:1px;
}
.WdateDiv .NavImgll a{
float:left;
background:url(img.gif) no-repeat;
}
.WdateDiv .NavImgl a{
float:left;
background:url(img.gif) no-repeat -16px 0px;
}
.WdateDiv .NavImgr a{
float:right;
background:url(img.gif) no-repeat -32px 0px;
}
.WdateDiv .NavImgrr a{
float:right;
background:url(img.gif) no-repeat -48px 0px;
}
.WdateDiv #dpTitle{
height:24px;
padding:1px;
border:#c5d9e8 1px solid;
background:url(bg.jpg);
margin-bottom:2px;
}
.WdateDiv .yminput{
margin-top:2px;
text-align:center;
border:0px;
height:20px;
width:50px;
color:#034c50;
background-color:transparent;
cursor:pointer;
}
.WdateDiv .yminputfocus{
margin-top:2px;
text-align:center;
border:#939393 1px solid;
font-weight:bold;
color:#034c50;
height:20px;
width:50px;
}
.WdateDiv .menuSel{
z-index:1;
position:absolute;
background-color:#FFFFFF;
border:#A3C6C8 1px solid;
display:none;
}
.WdateDiv .menu{
cursor:pointer;
background-color:#fff;
color:#11777C;
}
.WdateDiv .menuOn{
cursor:pointer;
background-color:#BEEBEE;
}
.WdateDiv .invalidMenu{
color:#aaa;
}
.WdateDiv .YMenu{
margin-top:20px;
}
.WdateDiv .MMenu{
margin-top:20px;
*width:62px;
}
.WdateDiv .hhMenu{
margin-top:-90px;
margin-left:26px;
}
.WdateDiv .mmMenu{
margin-top:-46px;
margin-left:26px;
}
.WdateDiv .ssMenu{
margin-top:-24px;
margin-left:26px;
}
.WdateDiv .Wweek {
text-align:center;
background:#DAF3F5;
border-right:#BDEBEE 1px solid;
}
.WdateDiv .MTitle{
color:#13777e;
background-color:#bdebee;
}
.WdateDiv .WdayTable2{
border-collapse:collapse;
border:#BEE9F0 1px solid;
}
.WdateDiv .WdayTable2 table{
border:0;
}
.WdateDiv .WdayTable{
line-height:20px;
color:#13777e;
background-color:#edfbfb;
border:#BEE9F0 1px solid;
}
.WdateDiv .WdayTable td{
text-align:center;
}
.WdateDiv .Wday{
cursor:pointer;
}
.WdateDiv .WdayOn{
cursor:pointer;
background-color:#74d2d9 ;
}
.WdateDiv .Wwday{
cursor:pointer;
color:#ab1e1e;
}
.WdateDiv .WwdayOn{
cursor:pointer;
background-color:#74d2d9;
}
.WdateDiv .Wtoday{
cursor:pointer;
color:blue;
}
.WdateDiv .Wselday{
background-color:#A7E2E7;
}
.WdateDiv .WspecialDay{
background-color:#66F4DF;
}
.WdateDiv .WotherDay{
cursor:pointer;
color:#0099CC;
}
.WdateDiv .WotherDayOn{
cursor:pointer;
background-color:#C0EBEF;
}
.WdateDiv .WinvalidDay{
color:#aaa;
}
.WdateDiv #dpTime{
float:left;
margin-top:3px;
margin-right:30px;
}
.WdateDiv #dpTime #dpTimeStr{
margin-left:1px;
color:#497F7F;
}
.WdateDiv #dpTime input{
height:20px;
width:18px;
text-align:center;
color:#333;
border:#61CAD0 1px solid;
}
.WdateDiv #dpTime .tB{
border-right:0px;
}
.WdateDiv #dpTime .tE{
border-left:0;
border-right:0;
}
.WdateDiv #dpTime .tm{
width:7px;
border-left:0;
border-right:0;
}
.WdateDiv #dpTime #dpTimeUp{
height:10px;
width:13px;
border:0px;
background:url(img.gif) no-repeat -32px -16px;
}
.WdateDiv #dpTime #dpTimeDown{
height:10px;
width:13px;
border:0px;
background:url(img.gif) no-repeat -48px -16px;
}
.WdateDiv #dpQS {
float:left;
margin-right:3px;
margin-top:3px;
background:url(img.gif) no-repeat 0px -16px;
width:20px;
height:20px;
cursor:pointer;
}
.WdateDiv #dpControl {
text-align:right;
margin-top:3px;
}
.WdateDiv .dpButton{
height:20px;
width:45px;
margin-top:2px;
border:#38B1B9 1px solid;
background-color:#CFEBEE;
color:#08575B;
}
\ No newline at end of file
src/main/resources/static/vendor/My97DatePicker/开发包/lang/en.js 0 → 100644
View file @ cab10107
var $lang={
errAlertMsg: "Invalid date or the date out of range,redo or not?",
aWeekStr: ["wk", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
aLongWeekStr:["wk","Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],
aMonStr: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
aLongMonStr: ["January","February","March","April","May","June","July","August","September","October","November","December"],
clearStr: "Clear",
todayStr: "Today",
okStr: "OK",
updateStr: "OK",
timeStr: "Time",
quickStr: "Quick Selection",
err_1: 'MinDate Cannot be bigger than MaxDate!'
}
\ No newline at end of file
src/main/resources/static/vendor/My97DatePicker/开发包/lang/zh-cn.js 0 → 100644
View file @ cab10107
var $lang={
errAlertMsg: "不合法的日期格式或者日期超出限定范围,需要撤销吗?",
aWeekStr: ["周","日","一","二","三","四","五","六"],
aLongWeekStr:["周","星期日","星期一","星期二","星期三","星期四","星期五","星期六"],
aMonStr: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一","十二"],
aLongMonStr: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
clearStr: "清空",
todayStr: "今天",
okStr: "确定",
updateStr: "确定",
timeStr: "时间",
quickStr: "快速选择",
err_1: '最小日期不能大于最大日期!'
}
\ No newline at end of file
src/main/resources/static/vendor/My97DatePicker/开发包/lang/zh-tw.js 0 → 100644
View file @ cab10107
var $lang={
errAlertMsg: "不合法的日期格式或者日期超出限定範圍,需要撤銷嗎?",
aWeekStr: ["周","日","一","二","三","四","五","六"],
aLongWeekStr:["周","星期日","星期一","星期二","星期三","星期四","星期五","星期六"],
aMonStr: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一","十二"],
aLongMonStr: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
clearStr: "清空",
todayStr: "今天",
okStr: "確定",
updateStr: "確定",
timeStr: "時間",
quickStr: "快速選擇",
err_1: '最小日期不能大於最大日期!'
}
\ No newline at end of file
src/main/resources/static/vendor/My97DatePicker/开发包/readme.txt 0 → 100644
View file @ cab10107
��ʽ����ʱ,�ɽ����ļ���ɾȥ
src/main/resources/static/vendor/My97DatePicker/开发包/skin/WdatePicker.css 0 → 100644
View file @ cab10107
.Wdate{
border:#999 1px solid;
height:20px;
background:#fff url(datePicker.gif) no-repeat right;
}
.cityName{
border:#999 1px solid;
height:20px;
}
.cityName::-ms-clear{display:none;}
.Wdate::-ms-clear{display:none;}
.WdateFmtErr{
font-weight:bold;
color:red;
}
\ No newline at end of file
src/main/resources/static/vendor/My97DatePicker/开发包/skin/default/datepicker.css 0 → 100644
View file @ cab10107
/*
* My97 DatePicker 4.8
* 皮肤名称:default
*/
/* 日期选择容器 DIV */
.WdateDiv{
width:180px;
background-color:#FFFFFF;
border:#bbb 1px solid;
padding:2px;
}
/* 双月日历的宽度 */
.WdateDiv2{
width:360px;
}
.WdateDiv *{font-size:9pt;}
/****************************
* 导航图标 全部是A标签
***************************/
.WdateDiv .NavImg a{
display:block;
cursor:pointer;
height:16px;
width:16px;
}
.WdateDiv .NavImgll a{
float:left;
background:transparent url(img.gif) no-repeat scroll 0 0;
}
.WdateDiv .NavImgl a{
float:left;
background:transparent url(img.gif) no-repeat scroll -16px 0;
}
.WdateDiv .NavImgr a{
float:right;
background:transparent url(img.gif) no-repeat scroll -32px 0;
}
.WdateDiv .NavImgrr a{
float:right;
background:transparent url(img.gif) no-repeat scroll -48px 0;
}
/****************************
* 年份月份相关
***************************/
/* 年份月份栏 DIV */
.WdateDiv #dpTitle{
height:24px;
margin-bottom:2px;
padding:1px;
}
/* 年份月份输入框 INPUT */
.WdateDiv .yminput{
margin-top:2px;
text-align:center;
height:20px;
border:0px;
width:50px;
cursor:pointer;
}
/* 年份月份输入框获得焦点时的样式 INPUT */
.WdateDiv .yminputfocus{
margin-top:2px;
text-align:center;
font-weight:bold;
height:20px;
color:blue;
border:#ccc 1px solid;
width:50px;
}
/* 菜单选择框 DIV */
.WdateDiv .menuSel{
z-index:1;
position:absolute;
background-color:#FFFFFF;
border:#ccc 1px solid;
display:none;
}
/* 菜单的样式 TD */
.WdateDiv .menu{
cursor:pointer;
background-color:#fff;
}
/* 菜单的mouseover样式 TD */
.WdateDiv .menuOn{
cursor:pointer;
background-color:#BEEBEE;
}
/* 菜单无效时的样式 TD */
.WdateDiv .invalidMenu{
color:#aaa;
}
/* 年选择框的偏移 DIV */
.WdateDiv .YMenu{
margin-top:20px;
}
/* 月选择框的偏移 DIV */
.WdateDiv .MMenu{
margin-top:20px;
*width:62px;
}
/* 时选择框的位置 DIV */
.WdateDiv .hhMenu{
margin-top:-90px;
margin-left:26px;
}
/* 分选择框的位置 DIV */
.WdateDiv .mmMenu{
margin-top:-46px;
margin-left:26px;
}
/* 秒选择框的位置 DIV */
.WdateDiv .ssMenu{
margin-top:-24px;
margin-left:26px;
}
/****************************
* 周相关
***************************/
.WdateDiv .Wweek {
text-align:center;
background:#DAF3F5;
border-right:#BDEBEE 1px solid;
}
/****************************
* 星期,日期相关
***************************/
/* 星期栏 TR */
.WdateDiv .MTitle{
background-color:#BDEBEE;
}
.WdateDiv .WdayTable2{
border-collapse:collapse;
border:#c5d9e8 1px solid;
}
.WdateDiv .WdayTable2 table{
border:0;
}
/* 日期栏表格 TABLE */
.WdateDiv .WdayTable{
line-height:20px;
border:#c5d9e8 1px solid;
}
.WdateDiv .WdayTable td{
text-align:center;
}
/* 日期格的样式 TD */
.WdateDiv .Wday{
cursor:pointer;
}
/* 日期格的mouseover样式 TD */
.WdateDiv .WdayOn{
cursor:pointer;
background-color:#C0EBEF;
}
/* 周末日期格的样式 TD */
.WdateDiv .Wwday{
cursor:pointer;
color:#FF2F2F;
}
/* 周末日期格的mouseover样式 TD */
.WdateDiv .WwdayOn{
cursor:pointer;
color:#000;
background-color:#C0EBEF;
}
.WdateDiv .Wtoday{
cursor:pointer;
color:blue;
}
.WdateDiv .Wselday{
background-color:#A9E4E9;
}
.WdateDiv .WspecialDay{
background-color:#66F4DF;
}
/* 其他月份的日期 */
.WdateDiv .WotherDay{
cursor:pointer;
color:#6A6AFF;
}
/* 其他月份的日期mouseover样式 */
.WdateDiv .WotherDayOn{
cursor:pointer;
background-color:#C0EBEF;
}
/* 无效日期的样式,即在日期范围以外日期格的样式,不能选择的日期 */
.WdateDiv .WinvalidDay{
color:#aaa;
}
/****************************
* 时间相关
***************************/
/* 时间栏 DIV */
.WdateDiv #dpTime{
float:left;
margin-top:3px;
margin-right:30px;
}
/* 时间文字 SPAN */
.WdateDiv #dpTime #dpTimeStr{
margin-left:1px;
}
/* 时间输入框 INPUT */
.WdateDiv #dpTime input{
width:18px;
height:20px;
text-align:center;
border:#ccc 1px solid;
}
/* 时间 时 INPUT */
.WdateDiv #dpTime .tB{
border-right:0px;
}
/* 时间 分和间隔符 ':' INPUT */
.WdateDiv #dpTime .tE{
border-left:0;
border-right:0;
}
/* 时间 秒 INPUT */
.WdateDiv #dpTime .tm{
width:7px;
border-left:0;
border-right:0;
}
/* 时间右边的向上按钮 BUTTON */
.WdateDiv #dpTime #dpTimeUp{
height:10px;
width:13px;
border:0px;
background:url(img.gif) no-repeat -32px -16px;
}
/* 时间右边的向下按钮 BUTTON */
.WdateDiv #dpTime #dpTimeDown{
height:10px;
width:13px;
border:0px;
background:url(img.gif) no-repeat -48px -16px;
}
/****************************
* 其他
***************************/
.WdateDiv #dpQS {
float:left;
margin-right:3px;
margin-top:3px;
background:url(img.gif) no-repeat 0px -16px;
width:20px;
height:20px;
cursor:pointer;
}
.WdateDiv #dpControl {
text-align:right;
}
.WdateDiv .dpButton{
height:20px;
width:45px;
border:#ccc 1px solid;
margin-top:2px;
margin-right:1px;
}
\ No newline at end of file
src/main/resources/static/vendor/My97DatePicker/开发包/skin/whyGreen/datepicker.css 0 → 100644
View file @ cab10107
/*
* My97 DatePicker 4.8
* 皮肤名称:whyGreen
*/
/* 日期选择容器 DIV */
.WdateDiv{
width:180px;
background-color:#fff;
border:#C5E1E4 1px solid;
padding:2px;
}
/* 双月日历的宽度 */
.WdateDiv2{
width:360px;
}
.WdateDiv *{font-size:9pt;}
/****************************
* 导航图标 全部是A标签
***************************/
.WdateDiv .NavImg a{
cursor:pointer;
display:block;
width:16px;
height:16px;
margin-top:1px;
}
.WdateDiv .NavImgll a{
float:left;
background:url(img.gif) no-repeat;
}
.WdateDiv .NavImgl a{
float:left;
background:url(img.gif) no-repeat -16px 0px;
}
.WdateDiv .NavImgr a{
float:right;
background:url(img.gif) no-repeat -32px 0px;
}
.WdateDiv .NavImgrr a{
float:right;
background:url(img.gif) no-repeat -48px 0px;
}
/****************************
* 年份月份相关
***************************/
/* 年份月份栏 DIV */
.WdateDiv #dpTitle{
height:24px;
padding:1px;
border:#c5d9e8 1px solid;
background:url(bg.jpg);
margin-bottom:2px;
}
/* 年份月份输入框 INPUT */
.WdateDiv .yminput{
margin-top:2px;
text-align:center;
border:0px;
height:20px;
width:50px;
color:#034c50;
background-color:transparent;
cursor:pointer;
}
/* 年份月份输入框获得焦点时的样式 INPUT */
.WdateDiv .yminputfocus{
margin-top:2px;
text-align:center;
border:#939393 1px solid;
font-weight:bold;
color:#034c50;
height:20px;
width:50px;
}
/* 菜单选择框 DIV */
.WdateDiv .menuSel{
z-index:1;
position:absolute;
background-color:#FFFFFF;
border:#A3C6C8 1px solid;
display:none;
}
/* 菜单的样式 TD */
.WdateDiv .menu{
cursor:pointer;
background-color:#fff;
color:#11777C;
}
/* 菜单的mouseover样式 TD */
.WdateDiv .menuOn{
cursor:pointer;
background-color:#BEEBEE;
}
/* 菜单无效时的样式 TD */
.WdateDiv .invalidMenu{
color:#aaa;
}
/* 年选择框的偏移 DIV */
.WdateDiv .YMenu{
margin-top:20px;
}
/* 月选择框的偏移 DIV */
.WdateDiv .MMenu{
margin-top:20px;
*width:62px;
}
/* 时选择框的位置 DIV */
.WdateDiv .hhMenu{
margin-top:-90px;
margin-left:26px;
}
/* 分选择框的位置 DIV */
.WdateDiv .mmMenu{
margin-top:-46px;
margin-left:26px;
}
/* 秒选择框的位置 DIV */
.WdateDiv .ssMenu{
margin-top:-24px;
margin-left:26px;
}
/****************************
* 周相关
***************************/
.WdateDiv .Wweek {
text-align:center;
background:#DAF3F5;
border-right:#BDEBEE 1px solid;
}
/****************************
* 星期,日期相关
***************************/
/* 星期栏 TR */
.WdateDiv .MTitle{
color:#13777e;
background-color:#bdebee;
}
.WdateDiv .WdayTable2{
border-collapse:collapse;
border:#BEE9F0 1px solid;
}
.WdateDiv .WdayTable2 table{
border:0;
}
/* 日期栏表格 TABLE */
.WdateDiv .WdayTable{
line-height:20px;
color:#13777e;
background-color:#edfbfb;
border:#BEE9F0 1px solid;
}
.WdateDiv .WdayTable td{
text-align:center;
}
/* 日期格的样式 TD */
.WdateDiv .Wday{
cursor:pointer;
}
/* 日期格的mouseover样式 TD */
.WdateDiv .WdayOn{
cursor:pointer;
background-color:#74d2d9 ;
}
/* 周末日期格的样式 TD */
.WdateDiv .Wwday{
cursor:pointer;
color:#ab1e1e;
}
/* 周末日期格的mouseover样式 TD */
.WdateDiv .WwdayOn{
cursor:pointer;
background-color:#74d2d9;
}
.WdateDiv .Wtoday{
cursor:pointer;
color:blue;
}
.WdateDiv .Wselday{
background-color:#A7E2E7;
}
.WdateDiv .WspecialDay{
background-color:#66F4DF;
}
/* 其他月份的日期 */
.WdateDiv .WotherDay{
cursor:pointer;
color:#0099CC;
}
/* 其他月份的日期mouseover样式 */
.WdateDiv .WotherDayOn{
cursor:pointer;
background-color:#C0EBEF;
}
/* 无效日期的样式,即在日期范围以外日期格的样式,不能选择的日期 */
.WdateDiv .WinvalidDay{
color:#aaa;
}
/****************************
* 时间相关
***************************/
/* 时间栏 DIV */
.WdateDiv #dpTime{
float:left;
margin-top:3px;
margin-right:30px;
}
/* 时间文字 SPAN */
.WdateDiv #dpTime #dpTimeStr{
margin-left:1px;
color:#497F7F;
}
/* 时间输入框 INPUT */
.WdateDiv #dpTime input{
height:20px;
width:18px;
text-align:center;
color:#333;
border:#61CAD0 1px solid;
}
/* 时间 时 INPUT */
.WdateDiv #dpTime .tB{
border-right:0px;
}
/* 时间 分和间隔符 ':' INPUT */
.WdateDiv #dpTime .tE{
border-left:0;
border-right:0;
}
/* 时间 秒 INPUT */
.WdateDiv #dpTime .tm{
width:7px;
border-left:0;
border-right:0;
}
/* 时间右边的向上按钮 BUTTON */
.WdateDiv #dpTime #dpTimeUp{
height:10px;
width:13px;
border:0px;
background:url(img.gif) no-repeat -32px -16px;
}
/* 时间右边的向下按钮 BUTTON */
.WdateDiv #dpTime #dpTimeDown{
height:10px;
width:13px;
border:0px;
background:url(img.gif) no-repeat -48px -16px;
}
/****************************
* 其他
***************************/
.WdateDiv #dpQS {
float:left;
margin-right:3px;
margin-top:3px;
background:url(img.gif) no-repeat 0px -16px;
width:20px;
height:20px;
cursor:pointer;
}
.WdateDiv #dpControl {
text-align:right;
margin-top:3px;
}
.WdateDiv .dpButton{
height:20px;
width:45px;
margin-top:2px;
border:#38B1B9 1px solid;
background-color:#CFEBEE;
color:#08575B;
}
\ No newline at end of file
src/test/java/com/yxproject/start/service/impl/selectTest.java 0 → 100644
View file @ cab10107
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图.pdb 0 → 100644
View file @ cab10107
This source diff could not be displayed because it is too large. You can view the blob instead.
制证项目E-R图.pdm
View file @ cab10107
<?xml version="1.0" encoding="UTF-8"?> <?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 --> <!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object"> <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
...@@ -1628,8 +1628,8 @@ Shadow=0</a:DisplayPreferences> ...@@ -1628,8 +1628,8 @@ Shadow=0</a:DisplayPreferences>
<c:Symbols> <c:Symbols>
<o:ReferenceSymbol Id="o5"> <o:ReferenceSymbol Id="o5">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((-60811,-84790), (-60361,-76015))</a:Rect> <a:Rect>((-60595,-84693), (-60145,-76015))</a:Rect>
<a:ListOfPoints>((-60586,-76015),(-60586,-84790))</a:ListOfPoints> <a:ListOfPoints>((-60370,-76015),(-60370,-84693))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -1649,8 +1649,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -1649,8 +1649,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o9"> <o:ReferenceSymbol Id="o9">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((16771,15791), (26181,45639))</a:Rect> <a:Rect>((16771,15791), (26789,45417))</a:Rect>
<a:ListOfPoints>((26181,45639),(26181,40989),(23385,40989),(23385,27791),(16996,27791),(16996,15791))</a:ListOfPoints> <a:ListOfPoints>((26789,45417),(26789,40989),(23385,40989),(23385,27791),(16996,27791),(16996,15791))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -1670,8 +1670,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -1670,8 +1670,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o13"> <o:ReferenceSymbol Id="o13">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((12311,37577), (12882,45639))</a:Rect> <a:Rect>((12273,37386), (13447,45417))</a:Rect>
<a:ListOfPoints>((12882,45639),(12882,40989),(12536,40989),(12536,37577))</a:ListOfPoints> <a:ListOfPoints>((12273,45417),(12273,40989),(13222,40989),(13222,37386))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -1691,8 +1691,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -1691,8 +1691,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o16"> <o:ReferenceSymbol Id="o16">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((49091,12492), (50065,31203))</a:Rect> <a:Rect>((49091,12972), (49601,31203))</a:Rect>
<a:ListOfPoints>((49091,31203),(49091,27791),(49840,27791),(49840,12492))</a:ListOfPoints> <a:ListOfPoints>((49091,31203),(49091,27791),(49376,27791),(49376,12972))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -1733,8 +1733,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -1733,8 +1733,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o22"> <o:ReferenceSymbol Id="o22">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((27207,15791), (64889,31203))</a:Rect> <a:Rect>((27207,15791), (63975,30945))</a:Rect>
<a:ListOfPoints>((64889,31203),(64889,21791),(27432,21791),(27432,15791))</a:ListOfPoints> <a:ListOfPoints>((63975,30945),(63975,21791),(27432,21791),(27432,15791))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -1754,8 +1754,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -1754,8 +1754,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o25"> <o:ReferenceSymbol Id="o25">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((85093,8830), (88173,31203))</a:Rect> <a:Rect>((86007,8830), (88173,30945))</a:Rect>
<a:ListOfPoints>((85093,31203),(85093,27791),(87948,27791),(87948,8830))</a:ListOfPoints> <a:ListOfPoints>((86007,30945),(86007,27791),(87948,27791),(87948,8830))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -1775,8 +1775,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -1775,8 +1775,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o28"> <o:ReferenceSymbol Id="o28">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((60015,12492), (74991,31203))</a:Rect> <a:Rect>((60479,12972), (74991,30945))</a:Rect>
<a:ListOfPoints>((74991,31203),(74991,18791),(60240,18791),(60240,12492))</a:ListOfPoints> <a:ListOfPoints>((74991,30945),(74991,18791),(60704,18791),(60704,12972))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -1796,8 +1796,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -1796,8 +1796,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o30"> <o:ReferenceSymbol Id="o30">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((11624,15448), (12074,37182))</a:Rect> <a:Rect>((11624,15448), (12323,37015))</a:Rect>
<a:ListOfPoints>((11712,37182),(11712,23497),(11849,23497),(11849,15448))</a:ListOfPoints> <a:ListOfPoints>((12323,37015),(12323,23497),(11849,23497),(11849,15448))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -1818,8 +1818,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -1818,8 +1818,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o32"> <o:ReferenceSymbol Id="o32">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((-55208,36390), (-27034,43989))</a:Rect> <a:Rect>((-55208,36390), (-27974,43619))</a:Rect>
<a:ListOfPoints>((-27034,43989),(-27034,40989),(-54983,40989),(-54983,36390))</a:ListOfPoints> <a:ListOfPoints>((-27974,43619),(-27974,40989),(-54983,40989),(-54983,36390))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -1839,8 +1839,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -1839,8 +1839,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o36"> <o:ReferenceSymbol Id="o36">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((-6313,37577), (-2391,43989))</a:Rect> <a:Rect>((-5373,37386), (-3077,43619))</a:Rect>
<a:ListOfPoints>((-6313,43989),(-6313,40989),(-2616,40989),(-2616,37577))</a:ListOfPoints> <a:ListOfPoints>((-5373,43619),(-5373,40989),(-3302,40989),(-3302,37386))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -1860,8 +1860,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -1860,8 +1860,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o38"> <o:ReferenceSymbol Id="o38">
<a:ModificationDate>1542266763</a:ModificationDate> <a:ModificationDate>1542266763</a:ModificationDate>
<a:Rect>((-16673,15791), (6786,43989))</a:Rect> <a:Rect>((-16673,15791), (6786,43619))</a:Rect>
<a:ListOfPoints>((-16673,43989),(-16673,40989),(-13464,40989),(-13464,27791),(6561,27791),(6561,15791))</a:ListOfPoints> <a:ListOfPoints>((-16673,43619),(-16673,40989),(-13464,40989),(-13464,27791),(6561,27791),(6561,15791))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -1880,9 +1880,9 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -1880,9 +1880,9 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</c:Object> </c:Object>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o40"> <o:ReferenceSymbol Id="o40">
<a:ModificationDate>1542330939</a:ModificationDate> <a:ModificationDate>1545205413</a:ModificationDate>
<a:Rect>((-70707,15791), (-3651,22920))</a:Rect> <a:Rect>((-60585,15791), (-3651,22624))</a:Rect>
<a:ListOfPoints>((-70707,22920),(-70707,21791),(-3876,21791),(-3876,15791))</a:ListOfPoints> <a:ListOfPoints>((-60585,22624),(-60585,21791),(-3876,21791),(-3876,15791))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -1901,9 +1901,9 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -1901,9 +1901,9 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</c:Object> </c:Object>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o43"> <o:ReferenceSymbol Id="o43">
<a:ModificationDate>1542330939</a:ModificationDate> <a:ModificationDate>1545205413</a:ModificationDate>
<a:Rect>((-78531,9130), (-77190,30111))</a:Rect> <a:Rect>((-77583,9314), (-69097,30406))</a:Rect>
<a:ListOfPoints>((-78531,30111),(-78531,16025),(-77415,16025),(-77415,9130))</a:ListOfPoints> <a:ListOfPoints>((-69097,30406),(-69097,16025),(-77358,16025),(-77358,9314))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -1924,8 +1924,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -1924,8 +1924,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o46"> <o:ReferenceSymbol Id="o46">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((-24664,15791), (1567,31203))</a:Rect> <a:Rect>((-24162,15791), (1567,30945))</a:Rect>
<a:ListOfPoints>((-24664,31203),(-24664,24791),(1342,24791),(1342,15791))</a:ListOfPoints> <a:ListOfPoints>((-24162,30945),(-24162,24791),(1342,24791),(1342,15791))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -1945,8 +1945,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -1945,8 +1945,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o49"> <o:ReferenceSymbol Id="o49">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((-41869,-13192), (-38176,34433))</a:Rect> <a:Rect>((-42871,-13192), (-38704,34436))</a:Rect>
<a:ListOfPoints>((-41869,34433),(-41869,-5131),(-38401,-5131),(-38401,-13192))</a:ListOfPoints> <a:ListOfPoints>((-42871,34436),(-42871,-5131),(-38929,-5131),(-38929,-13192))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -1967,8 +1967,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -1967,8 +1967,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o52"> <o:ReferenceSymbol Id="o52">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((-79219,-84793), (-69730,-76015))</a:Rect> <a:Rect>((-78872,-84793), (-70136,-76015))</a:Rect>
<a:ListOfPoints>((-69730,-76015),(-69730,-81793),(-78994,-81793),(-78994,-84793))</a:ListOfPoints> <a:ListOfPoints>((-70136,-76015),(-70136,-81793),(-78647,-81793),(-78647,-84793))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -1988,8 +1988,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -1988,8 +1988,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o55"> <o:ReferenceSymbol Id="o55">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((-87368,-84793), (-86853,-78793))</a:Rect> <a:Rect>((-87650,-84793), (-87200,-79015))</a:Rect>
<a:ListOfPoints>((-87368,-78793),(-87368,-81793),(-87078,-81793),(-87078,-84793))</a:ListOfPoints> <a:ListOfPoints>((-87368,-79015),(-87368,-81793),(-87425,-81793),(-87425,-84793))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -2009,8 +2009,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -2009,8 +2009,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o58"> <o:ReferenceSymbol Id="o58">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((-39370,-66826), (-31857,-59176))</a:Rect> <a:Rect>((-38742,-66642), (-32446,-59176))</a:Rect>
<a:ListOfPoints>((-31857,-59176),(-31857,-62176),(-39145,-62176),(-39145,-66826))</a:ListOfPoints> <a:ListOfPoints>((-32446,-59176),(-32446,-62176),(-38517,-62176),(-38517,-66642))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -2030,8 +2030,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -2030,8 +2030,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o62"> <o:ReferenceSymbol Id="o62">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((-18945,-65176), (-12301,-59176))</a:Rect> <a:Rect>((-18356,-64844), (-12301,-59176))</a:Rect>
<a:ListOfPoints>((-18945,-59176),(-18945,-62176),(-12526,-62176),(-12526,-65176))</a:ListOfPoints> <a:ListOfPoints>((-18356,-59176),(-18356,-62176),(-12526,-62176),(-12526,-64844))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -2051,8 +2051,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -2051,8 +2051,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o65"> <o:ReferenceSymbol Id="o65">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((-81413,-66001), (-73514,-59176))</a:Rect> <a:Rect>((-81413,-65743), (-74065,-59176))</a:Rect>
<a:ListOfPoints>((-73514,-59176),(-73514,-62176),(-81188,-62176),(-81188,-66001))</a:ListOfPoints> <a:ListOfPoints>((-74065,-59176),(-74065,-62176),(-81188,-62176),(-81188,-65743))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -2072,8 +2072,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -2072,8 +2072,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o69"> <o:ReferenceSymbol Id="o69">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:Rect>((-61374,-66826), (-52606,-59176))</a:Rect> <a:Rect>((-60823,-66642), (-53234,-59176))</a:Rect>
<a:ListOfPoints>((-61374,-59176),(-61374,-62176),(-52831,-62176),(-52831,-66826))</a:ListOfPoints> <a:ListOfPoints>((-60823,-59176),(-60823,-62176),(-53459,-62176),(-53459,-66642))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -2157,8 +2157,8 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -2157,8 +2157,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
</o:ReferenceSymbol> </o:ReferenceSymbol>
<o:ReferenceSymbol Id="o79"> <o:ReferenceSymbol Id="o79">
<a:ModificationDate>1542267060</a:ModificationDate> <a:ModificationDate>1542267060</a:ModificationDate>
<a:Rect>((-23363,-14586), (-6455,-2131))</a:Rect> <a:Rect>((-22575,-14586), (-6455,-2131))</a:Rect>
<a:ListOfPoints>((-6455,-2131),(-6455,-14361),(-23363,-14361))</a:ListOfPoints> <a:ListOfPoints>((-6455,-2131),(-6455,-14361),(-22575,-14361))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle> <a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle> <a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor> <a:LineColor>12615680</a:LineColor>
...@@ -2201,7 +2201,7 @@ DESTINATION 0 新宋体,8,N</a:FontList> ...@@ -2201,7 +2201,7 @@ DESTINATION 0 新宋体,8,N</a:FontList>
<o:TableSymbol Id="o67"> <o:TableSymbol Id="o67">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2233,7 +2233,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2233,7 +2233,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o85"> <o:TableSymbol Id="o85">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2333,7 +2333,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2333,7 +2333,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o66"> <o:TableSymbol Id="o66">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2365,7 +2365,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2365,7 +2365,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o59"> <o:TableSymbol Id="o59">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2397,7 +2397,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2397,7 +2397,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o60"> <o:TableSymbol Id="o60">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2429,7 +2429,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2429,7 +2429,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o63"> <o:TableSymbol Id="o63">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2461,7 +2461,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2461,7 +2461,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o56"> <o:TableSymbol Id="o56">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2493,7 +2493,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2493,7 +2493,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o6"> <o:TableSymbol Id="o6">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2525,7 +2525,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2525,7 +2525,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o53"> <o:TableSymbol Id="o53">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2557,7 +2557,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2557,7 +2557,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o7"> <o:TableSymbol Id="o7">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2589,7 +2589,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2589,7 +2589,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o10"> <o:TableSymbol Id="o10">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2621,7 +2621,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2621,7 +2621,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o98"> <o:TableSymbol Id="o98">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2653,7 +2653,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2653,7 +2653,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o100"> <o:TableSymbol Id="o100">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2753,7 +2753,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2753,7 +2753,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o23"> <o:TableSymbol Id="o23">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2785,7 +2785,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2785,7 +2785,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o14"> <o:TableSymbol Id="o14">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2817,7 +2817,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2817,7 +2817,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o18"> <o:TableSymbol Id="o18">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2849,7 +2849,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2849,7 +2849,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o34"> <o:TableSymbol Id="o34">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2881,7 +2881,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2881,7 +2881,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o33"> <o:TableSymbol Id="o33">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2911,9 +2911,9 @@ Table.Comment 0</a:SymbolContent> ...@@ -2911,9 +2911,9 @@ Table.Comment 0</a:SymbolContent>
</c:Object> </c:Object>
</o:TableSymbol> </o:TableSymbol>
<o:TableSymbol Id="o41"> <o:TableSymbol Id="o41">
<a:ModificationDate>1542330939</a:ModificationDate> <a:ModificationDate>1545205413</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -2945,7 +2945,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -2945,7 +2945,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o44"> <o:TableSymbol Id="o44">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -3043,7 +3043,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -3043,7 +3043,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o50"> <o:TableSymbol Id="o50">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -3075,7 +3075,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -3075,7 +3075,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o47"> <o:TableSymbol Id="o47">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -3107,7 +3107,7 @@ Table.Comment 0</a:SymbolContent> ...@@ -3107,7 +3107,7 @@ Table.Comment 0</a:SymbolContent>
<o:TableSymbol Id="o26"> <o:TableSymbol Id="o26">
<a:ModificationDate>1542330866</a:ModificationDate> <a:ModificationDate>1542330866</a:ModificationDate>
<a:IconMode>-1</a:IconMode> <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:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor> <a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor> <a:ShadowColor>12632256</a:ShadowColor>
...@@ -4534,7 +4534,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -4534,7 +4534,7 @@ tablespace USERS</a:PhysicalOptions>
<a:Code>GROUP_NO</a:Code> <a:Code>GROUP_NO</a:Code>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542271363</a:ModificationDate> <a:ModificationDate>1545204276</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<a:Comment>组号列表 主表的附属表</a:Comment> <a:Comment>组号列表 主表的附属表</a:Comment>
<a:PhysicalOptions>pctfree 10 <a:PhysicalOptions>pctfree 10
...@@ -4554,18 +4554,6 @@ logging ...@@ -4554,18 +4554,6 @@ logging
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:Columns> <c:Columns>
<o:Column Id="o194"> <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:ObjectID>6E7C9818-6A5D-4ED2-AADA-44DBCC3B16ED</a:ObjectID>
<a:Name>受理组号</a:Name> <a:Name>受理组号</a:Name>
<a:Code>GROUP_NO</a:Code> <a:Code>GROUP_NO</a:Code>
...@@ -4578,7 +4566,7 @@ logging ...@@ -4578,7 +4566,7 @@ logging
<a:Length>8</a:Length> <a:Length>8</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o196"> <o:Column Id="o195">
<a:ObjectID>0215DC4B-4259-4C34-8568-62E525CBD868</a:ObjectID> <a:ObjectID>0215DC4B-4259-4C34-8568-62E525CBD868</a:ObjectID>
<a:Name>任务单ID</a:Name> <a:Name>任务单ID</a:Name>
<a:Code>TASK_ID</a:Code> <a:Code>TASK_ID</a:Code>
...@@ -4590,7 +4578,7 @@ logging ...@@ -4590,7 +4578,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o197"> <o:Column Id="o196">
<a:ObjectID>470B6BF3-6929-42E1-A4B7-6176D656DF37</a:ObjectID> <a:ObjectID>470B6BF3-6929-42E1-A4B7-6176D656DF37</a:ObjectID>
<a:Name>合格数量</a:Name> <a:Name>合格数量</a:Name>
<a:Code>VAILD_COUNT</a:Code> <a:Code>VAILD_COUNT</a:Code>
...@@ -4602,7 +4590,7 @@ logging ...@@ -4602,7 +4590,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o198"> <o:Column Id="o197">
<a:ObjectID>41BBC3C8-2638-427D-88BD-A2451B98D1FC</a:ObjectID> <a:ObjectID>41BBC3C8-2638-427D-88BD-A2451B98D1FC</a:ObjectID>
<a:Name>不合格数量</a:Name> <a:Name>不合格数量</a:Name>
<a:Code>INVALID_COUNT</a:Code> <a:Code>INVALID_COUNT</a:Code>
...@@ -4615,7 +4603,7 @@ logging ...@@ -4615,7 +4603,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o199"> <o:Column Id="o198">
<a:ObjectID>0D7ECEA7-43BB-4643-B007-13DF9C6695FC</a:ObjectID> <a:ObjectID>0D7ECEA7-43BB-4643-B007-13DF9C6695FC</a:ObjectID>
<a:Name>特殊证件数量（包含快、余、退证）</a:Name> <a:Name>特殊证件数量（包含快、余、退证）</a:Name>
<a:Code>SPECIAL_CARD_COUNT</a:Code> <a:Code>SPECIAL_CARD_COUNT</a:Code>
...@@ -4630,7 +4618,7 @@ logging ...@@ -4630,7 +4618,7 @@ logging
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o200"> <o:Key Id="o199">
<a:ObjectID>35B39FDD-686A-4360-AB73-0ACCB385DBFA</a:ObjectID> <a:ObjectID>35B39FDD-686A-4360-AB73-0ACCB385DBFA</a:ObjectID>
<a:Name>GROUP_NO_PK</a:Name> <a:Name>GROUP_NO_PK</a:Name>
<a:Code>GROUP_NO_PK</a:Code> <a:Code>GROUP_NO_PK</a:Code>
...@@ -4651,7 +4639,7 @@ logging ...@@ -4651,7 +4639,7 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:ConstraintName>GROUP_NO_PK</a:ConstraintName> <a:ConstraintName>GROUP_NO_PK</a:ConstraintName>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o201"> <o:ExtendedCollection Id="o200">
<a:ObjectID>1C772FCC-2466-41D5-A72A-C097E3796323</a:ObjectID> <a:ObjectID>1C772FCC-2466-41D5-A72A-C097E3796323</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -4662,7 +4650,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -4662,7 +4650,7 @@ tablespace USERS</a:PhysicalOptions>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o195"/> <o:Column Ref="o194"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
...@@ -4670,7 +4658,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -4670,7 +4658,7 @@ tablespace USERS</a:PhysicalOptions>
<o:User Ref="o117"/> <o:User Ref="o117"/>
</c:Owner> </c:Owner>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o200"/> <o:Key Ref="o199"/>
</c:PrimaryKey> </c:PrimaryKey>
</o:Table> </o:Table>
<o:Table Id="o104"> <o:Table Id="o104">
...@@ -4698,7 +4686,7 @@ logging ...@@ -4698,7 +4686,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:Columns> <c:Columns>
<o:Column Id="o202"> <o:Column Id="o201">
<a:ObjectID>BA432D72-5A92-46CB-834F-F336C058BDE3</a:ObjectID> <a:ObjectID>BA432D72-5A92-46CB-834F-F336C058BDE3</a:ObjectID>
<a:Name>派出所申领表ID</a:Name> <a:Name>派出所申领表ID</a:Name>
<a:Code>POLICE_STATION_APPLY_REASON_ID</a:Code> <a:Code>POLICE_STATION_APPLY_REASON_ID</a:Code>
...@@ -4710,7 +4698,7 @@ logging ...@@ -4710,7 +4698,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o203"> <o:Column Id="o202">
<a:ObjectID>EC686365-CB0E-4CEF-8D6B-91E8B041D819</a:ObjectID> <a:ObjectID>EC686365-CB0E-4CEF-8D6B-91E8B041D819</a:ObjectID>
<a:Name>保存时间</a:Name> <a:Name>保存时间</a:Name>
<a:Code>SAVE_DATE</a:Code> <a:Code>SAVE_DATE</a:Code>
...@@ -4723,7 +4711,7 @@ logging ...@@ -4723,7 +4711,7 @@ logging
<a:DataType>DATE</a:DataType> <a:DataType>DATE</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o204"> <o:Column Id="o203">
<a:ObjectID>C99FC391-2FE2-4CFC-A486-2193587B3B2F</a:ObjectID> <a:ObjectID>C99FC391-2FE2-4CFC-A486-2193587B3B2F</a:ObjectID>
<a:Name>循环单流水号</a:Name> <a:Name>循环单流水号</a:Name>
<a:Code>TASK_ID</a:Code> <a:Code>TASK_ID</a:Code>
...@@ -4735,7 +4723,7 @@ logging ...@@ -4735,7 +4723,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o205"> <o:Column Id="o204">
<a:ObjectID>70674C59-8B82-4AF1-BE12-8056474BE062</a:ObjectID> <a:ObjectID>70674C59-8B82-4AF1-BE12-8056474BE062</a:ObjectID>
<a:Name>派出所代码</a:Name> <a:Name>派出所代码</a:Name>
<a:Code>POLICE_STATION_CODE</a:Code> <a:Code>POLICE_STATION_CODE</a:Code>
...@@ -4748,7 +4736,7 @@ logging ...@@ -4748,7 +4736,7 @@ logging
<a:Length>8</a:Length> <a:Length>8</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o206"> <o:Column Id="o205">
<a:ObjectID>DC13606F-AE25-4280-B11D-9A6C9AA622A3</a:ObjectID> <a:ObjectID>DC13606F-AE25-4280-B11D-9A6C9AA622A3</a:ObjectID>
<a:Name>申领原因</a:Name> <a:Name>申领原因</a:Name>
<a:Code>APPLY_CODE</a:Code> <a:Code>APPLY_CODE</a:Code>
...@@ -4760,7 +4748,7 @@ logging ...@@ -4760,7 +4748,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o207"> <o:Column Id="o206">
<a:ObjectID>CA938E06-5478-42AF-808A-ED812F2A2E37</a:ObjectID> <a:ObjectID>CA938E06-5478-42AF-808A-ED812F2A2E37</a:ObjectID>
<a:Name>申领数量</a:Name> <a:Name>申领数量</a:Name>
<a:Code>APPLY_COUNT</a:Code> <a:Code>APPLY_COUNT</a:Code>
...@@ -4774,7 +4762,7 @@ logging ...@@ -4774,7 +4762,7 @@ logging
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o208"> <o:Key Id="o207">
<a:ObjectID>8C2E6CFF-F71D-402D-8B39-ED3FE5A08127</a:ObjectID> <a:ObjectID>8C2E6CFF-F71D-402D-8B39-ED3FE5A08127</a:ObjectID>
<a:Name>POLICE_STATION_APPLY_REASO_PK</a:Name> <a:Name>POLICE_STATION_APPLY_REASO_PK</a:Name>
<a:Code>POLICE_STATION_APPLY_REASO_PK</a:Code> <a:Code>POLICE_STATION_APPLY_REASO_PK</a:Code>
...@@ -4795,7 +4783,7 @@ logging ...@@ -4795,7 +4783,7 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:ConstraintName>POLICE_STATION_APPLY_REASO_PK</a:ConstraintName> <a:ConstraintName>POLICE_STATION_APPLY_REASO_PK</a:ConstraintName>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o209"> <o:ExtendedCollection Id="o208">
<a:ObjectID>D0FE1901-4E85-4E98-A9EA-9A90637CD0E2</a:ObjectID> <a:ObjectID>D0FE1901-4E85-4E98-A9EA-9A90637CD0E2</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -4806,7 +4794,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -4806,7 +4794,7 @@ tablespace USERS</a:PhysicalOptions>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o202"/> <o:Column Ref="o201"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
...@@ -4814,7 +4802,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -4814,7 +4802,7 @@ tablespace USERS</a:PhysicalOptions>
<o:User Ref="o117"/> <o:User Ref="o117"/>
</c:Owner> </c:Owner>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o208"/> <o:Key Ref="o207"/>
</c:PrimaryKey> </c:PrimaryKey>
</o:Table> </o:Table>
<o:Table Id="o103"> <o:Table Id="o103">
...@@ -4842,7 +4830,7 @@ logging ...@@ -4842,7 +4830,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:Columns> <c:Columns>
<o:Column Id="o210"> <o:Column Id="o209">
<a:ObjectID>D2E6DEFD-2122-4088-951A-83651ABAFE54</a:ObjectID> <a:ObjectID>D2E6DEFD-2122-4088-951A-83651ABAFE54</a:ObjectID>
<a:Name>派出所合格表ID</a:Name> <a:Name>派出所合格表ID</a:Name>
<a:Code>POLICE_STATION_VAILED_ID</a:Code> <a:Code>POLICE_STATION_VAILED_ID</a:Code>
...@@ -4854,7 +4842,7 @@ logging ...@@ -4854,7 +4842,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o211"> <o:Column Id="o210">
<a:ObjectID>80C0EE89-AF3E-4702-AB53-7DE1367505B0</a:ObjectID> <a:ObjectID>80C0EE89-AF3E-4702-AB53-7DE1367505B0</a:ObjectID>
<a:Name>任务单流水号</a:Name> <a:Name>任务单流水号</a:Name>
<a:Code>TASK_ID</a:Code> <a:Code>TASK_ID</a:Code>
...@@ -4866,7 +4854,7 @@ logging ...@@ -4866,7 +4854,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o212"> <o:Column Id="o211">
<a:ObjectID>F1668619-45DC-4A54-A81B-DDB0A9CC9981</a:ObjectID> <a:ObjectID>F1668619-45DC-4A54-A81B-DDB0A9CC9981</a:ObjectID>
<a:Name>派出所代码</a:Name> <a:Name>派出所代码</a:Name>
<a:Code>POLICE_STATION_CODE</a:Code> <a:Code>POLICE_STATION_CODE</a:Code>
...@@ -4879,7 +4867,7 @@ logging ...@@ -4879,7 +4867,7 @@ logging
<a:Length>8</a:Length> <a:Length>8</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o213"> <o:Column Id="o212">
<a:ObjectID>2B8D18B3-D611-4357-A10B-212C5BC011D4</a:ObjectID> <a:ObjectID>2B8D18B3-D611-4357-A10B-212C5BC011D4</a:ObjectID>
<a:Name>合格数</a:Name> <a:Name>合格数</a:Name>
<a:Code>VAILED_COUNT</a:Code> <a:Code>VAILED_COUNT</a:Code>
...@@ -4891,7 +4879,7 @@ logging ...@@ -4891,7 +4879,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o214"> <o:Column Id="o213">
<a:ObjectID>DF21E498-5E73-46C8-8FA2-E5438003B40E</a:ObjectID> <a:ObjectID>DF21E498-5E73-46C8-8FA2-E5438003B40E</a:ObjectID>
<a:Name>不合格数</a:Name> <a:Name>不合格数</a:Name>
<a:Code>INVALID_COUNT</a:Code> <a:Code>INVALID_COUNT</a:Code>
...@@ -4903,7 +4891,7 @@ logging ...@@ -4903,7 +4891,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o215"> <o:Column Id="o214">
<a:ObjectID>643444E6-2AEF-4000-BD99-C659608E510C</a:ObjectID> <a:ObjectID>643444E6-2AEF-4000-BD99-C659608E510C</a:ObjectID>
<a:Name>保存时间</a:Name> <a:Name>保存时间</a:Name>
<a:Code>SAVA_DATE</a:Code> <a:Code>SAVA_DATE</a:Code>
...@@ -4918,7 +4906,7 @@ logging ...@@ -4918,7 +4906,7 @@ logging
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o216"> <o:Key Id="o215">
<a:ObjectID>F31AAADA-0EA3-4216-8629-44592AF75B19</a:ObjectID> <a:ObjectID>F31AAADA-0EA3-4216-8629-44592AF75B19</a:ObjectID>
<a:Name>POLICE_STATION_VAILED_PK</a:Name> <a:Name>POLICE_STATION_VAILED_PK</a:Name>
<a:Code>POLICE_STATION_VAILED_PK</a:Code> <a:Code>POLICE_STATION_VAILED_PK</a:Code>
...@@ -4928,12 +4916,12 @@ logging ...@@ -4928,12 +4916,12 @@ logging
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<a:ConstraintName>POLICE_STATION_VAILED_PK</a:ConstraintName> <a:ConstraintName>POLICE_STATION_VAILED_PK</a:ConstraintName>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o210"/> <o:Column Ref="o209"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
<c:Indexes> <c:Indexes>
<o:Index Id="o217"> <o:Index Id="o216">
<a:ObjectID>67438D52-208D-43CD-A8E5-8E545BCF0EB1</a:ObjectID> <a:ObjectID>67438D52-208D-43CD-A8E5-8E545BCF0EB1</a:ObjectID>
<a:Name>POLICE_STATION_VAILED_INFO_PK</a:Name> <a:Name>POLICE_STATION_VAILED_INFO_PK</a:Name>
<a:Code>POLICE_STATION_VAILED_INFO_PK</a:Code> <a:Code>POLICE_STATION_VAILED_INFO_PK</a:Code>
...@@ -4955,17 +4943,17 @@ logging ...@@ -4955,17 +4943,17 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:Unique>1</a:Unique> <a:Unique>1</a:Unique>
<c:LinkedObject> <c:LinkedObject>
<o:Key Ref="o216"/> <o:Key Ref="o215"/>
</c:LinkedObject> </c:LinkedObject>
<c:IndexColumns> <c:IndexColumns>
<o:IndexColumn Id="o218"> <o:IndexColumn Id="o217">
<a:ObjectID>4F6827CC-A656-4CD4-9C0C-5D1B6E900446</a:ObjectID> <a:ObjectID>4F6827CC-A656-4CD4-9C0C-5D1B6E900446</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Column> <c:Column>
<o:Column Ref="o210"/> <o:Column Ref="o209"/>
</c:Column> </c:Column>
</o:IndexColumn> </o:IndexColumn>
</c:IndexColumns> </c:IndexColumns>
...@@ -4978,7 +4966,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -4978,7 +4966,7 @@ tablespace USERS</a:PhysicalOptions>
<o:User Ref="o117"/> <o:User Ref="o117"/>
</c:Owner> </c:Owner>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o216"/> <o:Key Ref="o215"/>
</c:PrimaryKey> </c:PrimaryKey>
</o:Table> </o:Table>
<o:Table Id="o102"> <o:Table Id="o102">
...@@ -4999,7 +4987,7 @@ logging ...@@ -4999,7 +4987,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:Columns> <c:Columns>
<o:Column Id="o219"> <o:Column Id="o218">
<a:ObjectID>2847F42E-4EBF-4EE9-B948-C910BBACA98D</a:ObjectID> <a:ObjectID>2847F42E-4EBF-4EE9-B948-C910BBACA98D</a:ObjectID>
<a:Name>打印机ID</a:Name> <a:Name>打印机ID</a:Name>
<a:Code>PRINTER_ID</a:Code> <a:Code>PRINTER_ID</a:Code>
...@@ -5011,7 +4999,7 @@ logging ...@@ -5011,7 +4999,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o220"> <o:Column Id="o219">
<a:ObjectID>4C6A8590-98D3-4C89-B168-7034D2A84CFE</a:ObjectID> <a:ObjectID>4C6A8590-98D3-4C89-B168-7034D2A84CFE</a:ObjectID>
<a:Name>打印机名称</a:Name> <a:Name>打印机名称</a:Name>
<a:Code>PRINTER_NAME</a:Code> <a:Code>PRINTER_NAME</a:Code>
...@@ -5026,7 +5014,7 @@ logging ...@@ -5026,7 +5014,7 @@ logging
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o221"> <o:Key Id="o220">
<a:ObjectID>2946E470-8AFF-4BA1-997F-79794FD15906</a:ObjectID> <a:ObjectID>2946E470-8AFF-4BA1-997F-79794FD15906</a:ObjectID>
<a:Name>PRINTER_DIC_PK</a:Name> <a:Name>PRINTER_DIC_PK</a:Name>
<a:Code>PRINTER_DIC_PK</a:Code> <a:Code>PRINTER_DIC_PK</a:Code>
...@@ -5040,7 +5028,7 @@ logging ...@@ -5040,7 +5028,7 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:ConstraintName>PRINTER_DIC_PK</a:ConstraintName> <a:ConstraintName>PRINTER_DIC_PK</a:ConstraintName>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o222"> <o:ExtendedCollection Id="o221">
<a:ObjectID>B666C31E-F3D6-4EC4-BE8D-78D905216039</a:ObjectID> <a:ObjectID>B666C31E-F3D6-4EC4-BE8D-78D905216039</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -5051,7 +5039,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -5051,7 +5039,7 @@ tablespace USERS</a:PhysicalOptions>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o219"/> <o:Column Ref="o218"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
...@@ -5059,7 +5047,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -5059,7 +5047,7 @@ tablespace USERS</a:PhysicalOptions>
<o:User Ref="o117"/> <o:User Ref="o117"/>
</c:Owner> </c:Owner>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o221"/> <o:Key Ref="o220"/>
</c:PrimaryKey> </c:PrimaryKey>
</o:Table> </o:Table>
<o:Table Id="o101"> <o:Table Id="o101">
...@@ -5086,7 +5074,7 @@ logging ...@@ -5086,7 +5074,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o223"> <o:ExtendedCollection Id="o222">
<a:ObjectID>C90FE17A-1C8A-47F1-923D-DAAD7E63995B</a:ObjectID> <a:ObjectID>C90FE17A-1C8A-47F1-923D-DAAD7E63995B</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -5097,7 +5085,7 @@ logging ...@@ -5097,7 +5085,7 @@ logging
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Columns> <c:Columns>
<o:Column Id="o224"> <o:Column Id="o223">
<a:ObjectID>E7AEC94D-DFD4-4B7F-8D02-5CD1D4FE2393</a:ObjectID> <a:ObjectID>E7AEC94D-DFD4-4B7F-8D02-5CD1D4FE2393</a:ObjectID>
<a:Name>对应地址</a:Name> <a:Name>对应地址</a:Name>
<a:Code>URL</a:Code> <a:Code>URL</a:Code>
...@@ -5109,7 +5097,7 @@ logging ...@@ -5109,7 +5097,7 @@ logging
<a:DataType>VARCHAR2(20)</a:DataType> <a:DataType>VARCHAR2(20)</a:DataType>
<a:Length>20</a:Length> <a:Length>20</a:Length>
</o:Column> </o:Column>
<o:Column Id="o225"> <o:Column Id="o224">
<a:ObjectID>1EC2CAFE-D01D-49A4-BEF9-138C2FECB6AA</a:ObjectID> <a:ObjectID>1EC2CAFE-D01D-49A4-BEF9-138C2FECB6AA</a:ObjectID>
<a:Name>角色表ID</a:Name> <a:Name>角色表ID</a:Name>
<a:Code>ROLE_URL_INFO_ID</a:Code> <a:Code>ROLE_URL_INFO_ID</a:Code>
...@@ -5123,7 +5111,7 @@ logging ...@@ -5123,7 +5111,7 @@ logging
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o226"> <o:Key Id="o225">
<a:ObjectID>8C41A9D5-1B2B-499E-B202-CF8DD30B40C5</a:ObjectID> <a:ObjectID>8C41A9D5-1B2B-499E-B202-CF8DD30B40C5</a:ObjectID>
<a:Name>ROLE_URL_INFO_PK</a:Name> <a:Name>ROLE_URL_INFO_PK</a:Name>
<a:Code>ROLE_URL_INFO_PK</a:Code> <a:Code>ROLE_URL_INFO_PK</a:Code>
...@@ -5144,7 +5132,7 @@ logging ...@@ -5144,7 +5132,7 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:ConstraintName>ROLE_URL_INFO_PK</a:ConstraintName> <a:ConstraintName>ROLE_URL_INFO_PK</a:ConstraintName>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o227"> <o:ExtendedCollection Id="o226">
<a:ObjectID>D8231908-9217-4957-AD20-6E369A0BCC6E</a:ObjectID> <a:ObjectID>D8231908-9217-4957-AD20-6E369A0BCC6E</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -5155,7 +5143,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -5155,7 +5143,7 @@ tablespace USERS</a:PhysicalOptions>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o225"/> <o:Column Ref="o224"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
...@@ -5163,7 +5151,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -5163,7 +5151,7 @@ tablespace USERS</a:PhysicalOptions>
<o:User Ref="o117"/> <o:User Ref="o117"/>
</c:Owner> </c:Owner>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o226"/> <o:Key Ref="o225"/>
</c:PrimaryKey> </c:PrimaryKey>
</o:Table> </o:Table>
<o:Table Id="o99"> <o:Table Id="o99">
...@@ -5190,7 +5178,7 @@ logging ...@@ -5190,7 +5178,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o228"> <o:ExtendedCollection Id="o227">
<a:ObjectID>B9B8BF74-7E30-4950-8D3F-DDADF23457AC</a:ObjectID> <a:ObjectID>B9B8BF74-7E30-4950-8D3F-DDADF23457AC</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -5201,7 +5189,7 @@ logging ...@@ -5201,7 +5189,7 @@ logging
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Columns> <c:Columns>
<o:Column Id="o229"> <o:Column Id="o228">
<a:ObjectID>2E2DB575-36CA-4213-A603-69E0F75EE804</a:ObjectID> <a:ObjectID>2E2DB575-36CA-4213-A603-69E0F75EE804</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>GAJG_DM</a:Code> <a:Code>GAJG_DM</a:Code>
...@@ -5212,7 +5200,7 @@ logging ...@@ -5212,7 +5200,7 @@ logging
<a:DataType>VARCHAR2(20)</a:DataType> <a:DataType>VARCHAR2(20)</a:DataType>
<a:Length>20</a:Length> <a:Length>20</a:Length>
</o:Column> </o:Column>
<o:Column Id="o230"> <o:Column Id="o229">
<a:ObjectID>402F48AE-3414-4F26-9F28-1C60BEDD5E7C</a:ObjectID> <a:ObjectID>402F48AE-3414-4F26-9F28-1C60BEDD5E7C</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>SLH_GAJG_DM</a:Code> <a:Code>SLH_GAJG_DM</a:Code>
...@@ -5253,7 +5241,7 @@ logging ...@@ -5253,7 +5241,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:Columns> <c:Columns>
<o:Column Id="o231"> <o:Column Id="o230">
<a:ObjectID>302D4459-DCCB-42EE-891E-468CCDC59176</a:ObjectID> <a:ObjectID>302D4459-DCCB-42EE-891E-468CCDC59176</a:ObjectID>
<a:Name>受理号表ID</a:Name> <a:Name>受理号表ID</a:Name>
<a:Code>SPECIAL_CARD_ID</a:Code> <a:Code>SPECIAL_CARD_ID</a:Code>
...@@ -5265,7 +5253,7 @@ logging ...@@ -5265,7 +5253,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o232"> <o:Column Id="o231">
<a:ObjectID>7AE57708-9AC4-4E58-A504-E56389FBF760</a:ObjectID> <a:ObjectID>7AE57708-9AC4-4E58-A504-E56389FBF760</a:ObjectID>
<a:Name>受理号</a:Name> <a:Name>受理号</a:Name>
<a:Code>ACCEPT_NO</a:Code> <a:Code>ACCEPT_NO</a:Code>
...@@ -5278,7 +5266,7 @@ logging ...@@ -5278,7 +5266,7 @@ logging
<a:Length>10</a:Length> <a:Length>10</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o233"> <o:Column Id="o232">
<a:ObjectID>A36C0D3A-A870-497F-B2EB-2F52E4F004A1</a:ObjectID> <a:ObjectID>A36C0D3A-A870-497F-B2EB-2F52E4F004A1</a:ObjectID>
<a:Name>任务单ID</a:Name> <a:Name>任务单ID</a:Name>
<a:Code>TASK_ID</a:Code> <a:Code>TASK_ID</a:Code>
...@@ -5290,7 +5278,7 @@ logging ...@@ -5290,7 +5278,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o234"> <o:Column Id="o233">
<a:ObjectID>6486E565-DF73-4FB7-A420-536F17F773E3</a:ObjectID> <a:ObjectID>6486E565-DF73-4FB7-A420-536F17F773E3</a:ObjectID>
<a:Name>受理类型（0余证1快证2退证）</a:Name> <a:Name>受理类型（0余证1快证2退证）</a:Name>
<a:Code>SPECIAL_TYPE</a:Code> <a:Code>SPECIAL_TYPE</a:Code>
...@@ -5302,7 +5290,7 @@ logging ...@@ -5302,7 +5290,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o235"> <o:Column Id="o234">
<a:ObjectID>1C7BBB1D-FEAE-44D5-A773-85D62D6D775B</a:ObjectID> <a:ObjectID>1C7BBB1D-FEAE-44D5-A773-85D62D6D775B</a:ObjectID>
<a:Name>受理组号</a:Name> <a:Name>受理组号</a:Name>
<a:Code>GROUP_NO</a:Code> <a:Code>GROUP_NO</a:Code>
...@@ -5317,7 +5305,7 @@ logging ...@@ -5317,7 +5305,7 @@ logging
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o236"> <o:Key Id="o235">
<a:ObjectID>93297D3C-4916-4BA5-ADDB-310B3836CC4A</a:ObjectID> <a:ObjectID>93297D3C-4916-4BA5-ADDB-310B3836CC4A</a:ObjectID>
<a:Name>SPECIAL_CARD_PK</a:Name> <a:Name>SPECIAL_CARD_PK</a:Name>
<a:Code>SPECIAL_CARD_PK</a:Code> <a:Code>SPECIAL_CARD_PK</a:Code>
...@@ -5331,7 +5319,7 @@ logging ...@@ -5331,7 +5319,7 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:ConstraintName>SPECIAL_CARD_PK</a:ConstraintName> <a:ConstraintName>SPECIAL_CARD_PK</a:ConstraintName>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o237"> <o:ExtendedCollection Id="o236">
<a:ObjectID>CB829C82-EF57-49E2-98DD-2B9814A28D49</a:ObjectID> <a:ObjectID>CB829C82-EF57-49E2-98DD-2B9814A28D49</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -5342,7 +5330,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -5342,7 +5330,7 @@ tablespace USERS</a:PhysicalOptions>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o231"/> <o:Column Ref="o230"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
...@@ -5350,7 +5338,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -5350,7 +5338,7 @@ tablespace USERS</a:PhysicalOptions>
<o:User Ref="o117"/> <o:User Ref="o117"/>
</c:Owner> </c:Owner>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o236"/> <o:Key Ref="o235"/>
</c:PrimaryKey> </c:PrimaryKey>
</o:Table> </o:Table>
<o:Table Id="o96"> <o:Table Id="o96">
...@@ -5377,7 +5365,7 @@ logging ...@@ -5377,7 +5365,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o238"> <o:ExtendedCollection Id="o237">
<a:ObjectID>2CC0112F-6062-4BA7-B421-030C0FC0BD6D</a:ObjectID> <a:ObjectID>2CC0112F-6062-4BA7-B421-030C0FC0BD6D</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -5388,7 +5376,7 @@ logging ...@@ -5388,7 +5376,7 @@ logging
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Columns> <c:Columns>
<o:Column Id="o239"> <o:Column Id="o238">
<a:ObjectID>E1579F50-350C-4C95-8F83-F2EA664F591D</a:ObjectID> <a:ObjectID>E1579F50-350C-4C95-8F83-F2EA664F591D</a:ObjectID>
<a:Name>角色表ID</a:Name> <a:Name>角色表ID</a:Name>
<a:Code>MENU_ID</a:Code> <a:Code>MENU_ID</a:Code>
...@@ -5400,7 +5388,7 @@ logging ...@@ -5400,7 +5388,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o240"> <o:Column Id="o239">
<a:ObjectID>11EED76D-96D2-40A2-89A6-B14C668230CD</a:ObjectID> <a:ObjectID>11EED76D-96D2-40A2-89A6-B14C668230CD</a:ObjectID>
<a:Name>对应地址</a:Name> <a:Name>对应地址</a:Name>
<a:Code>MENU</a:Code> <a:Code>MENU</a:Code>
...@@ -5412,7 +5400,7 @@ logging ...@@ -5412,7 +5400,7 @@ logging
<a:DataType>VARCHAR2(40)</a:DataType> <a:DataType>VARCHAR2(40)</a:DataType>
<a:Length>40</a:Length> <a:Length>40</a:Length>
</o:Column> </o:Column>
<o:Column Id="o241"> <o:Column Id="o240">
<a:ObjectID>BCE060C9-DC9B-4061-A08C-C363B7539D37</a:ObjectID> <a:ObjectID>BCE060C9-DC9B-4061-A08C-C363B7539D37</a:ObjectID>
<a:Name>菜单名称</a:Name> <a:Name>菜单名称</a:Name>
<a:Code>MENU_NAME</a:Code> <a:Code>MENU_NAME</a:Code>
...@@ -5426,7 +5414,7 @@ logging ...@@ -5426,7 +5414,7 @@ logging
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o242"> <o:Key Id="o241">
<a:ObjectID>CB12045D-1667-458E-A0D1-297E09822751</a:ObjectID> <a:ObjectID>CB12045D-1667-458E-A0D1-297E09822751</a:ObjectID>
<a:Name>SYSTEM_MENU_PK</a:Name> <a:Name>SYSTEM_MENU_PK</a:Name>
<a:Code>SYSTEM_MENU_PK</a:Code> <a:Code>SYSTEM_MENU_PK</a:Code>
...@@ -5447,7 +5435,7 @@ logging ...@@ -5447,7 +5435,7 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:ConstraintName>SYSTEM_MENU_PK</a:ConstraintName> <a:ConstraintName>SYSTEM_MENU_PK</a:ConstraintName>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o243"> <o:ExtendedCollection Id="o242">
<a:ObjectID>49CE061E-D76C-4B9C-AA9F-9B7E8F4DDE90</a:ObjectID> <a:ObjectID>49CE061E-D76C-4B9C-AA9F-9B7E8F4DDE90</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -5458,7 +5446,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -5458,7 +5446,7 @@ tablespace USERS</a:PhysicalOptions>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o239"/> <o:Column Ref="o238"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
...@@ -5466,7 +5454,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -5466,7 +5454,7 @@ tablespace USERS</a:PhysicalOptions>
<o:User Ref="o117"/> <o:User Ref="o117"/>
</c:Owner> </c:Owner>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o242"/> <o:Key Ref="o241"/>
</c:PrimaryKey> </c:PrimaryKey>
</o:Table> </o:Table>
<o:Table Id="o95"> <o:Table Id="o95">
...@@ -5493,7 +5481,7 @@ logging ...@@ -5493,7 +5481,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o244"> <o:ExtendedCollection Id="o243">
<a:ObjectID>05D2CA1E-DF0D-41AF-8631-E2C65A3D7867</a:ObjectID> <a:ObjectID>05D2CA1E-DF0D-41AF-8631-E2C65A3D7867</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -5504,7 +5492,7 @@ logging ...@@ -5504,7 +5492,7 @@ logging
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Columns> <c:Columns>
<o:Column Id="o245"> <o:Column Id="o244">
<a:ObjectID>42717CFF-A53D-4F33-81E3-07465E3F18FF</a:ObjectID> <a:ObjectID>42717CFF-A53D-4F33-81E3-07465E3F18FF</a:ObjectID>
<a:Name>角色ID</a:Name> <a:Name>角色ID</a:Name>
<a:Code>ROLE_ID</a:Code> <a:Code>ROLE_ID</a:Code>
...@@ -5516,7 +5504,7 @@ logging ...@@ -5516,7 +5504,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o246"> <o:Column Id="o245">
<a:ObjectID>14B16DBB-BF5A-465C-9AC6-1D4BC124F725</a:ObjectID> <a:ObjectID>14B16DBB-BF5A-465C-9AC6-1D4BC124F725</a:ObjectID>
<a:Name>角色名</a:Name> <a:Name>角色名</a:Name>
<a:Code>ROLE_NAME</a:Code> <a:Code>ROLE_NAME</a:Code>
...@@ -5530,7 +5518,7 @@ logging ...@@ -5530,7 +5518,7 @@ logging
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o247"> <o:Key Id="o246">
<a:ObjectID>E0390190-9644-4589-8F90-E153949F90CE</a:ObjectID> <a:ObjectID>E0390190-9644-4589-8F90-E153949F90CE</a:ObjectID>
<a:Name>SYSTEM_ROLE_PK</a:Name> <a:Name>SYSTEM_ROLE_PK</a:Name>
<a:Code>SYSTEM_ROLE_PK</a:Code> <a:Code>SYSTEM_ROLE_PK</a:Code>
...@@ -5551,7 +5539,7 @@ logging ...@@ -5551,7 +5539,7 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:ConstraintName>SYSTEM_ROLE_PK</a:ConstraintName> <a:ConstraintName>SYSTEM_ROLE_PK</a:ConstraintName>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o248"> <o:ExtendedCollection Id="o247">
<a:ObjectID>A634E2CD-E406-40F1-8075-FE16AAC56931</a:ObjectID> <a:ObjectID>A634E2CD-E406-40F1-8075-FE16AAC56931</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -5562,7 +5550,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -5562,7 +5550,7 @@ tablespace USERS</a:PhysicalOptions>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o245"/> <o:Column Ref="o244"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
...@@ -5570,7 +5558,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -5570,7 +5558,7 @@ tablespace USERS</a:PhysicalOptions>
<o:User Ref="o117"/> <o:User Ref="o117"/>
</c:Owner> </c:Owner>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o247"/> <o:Key Ref="o246"/>
</c:PrimaryKey> </c:PrimaryKey>
</o:Table> </o:Table>
<o:Table Id="o94"> <o:Table Id="o94">
...@@ -5597,7 +5585,7 @@ logging ...@@ -5597,7 +5585,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o249"> <o:ExtendedCollection Id="o248">
<a:ObjectID>703BF8F7-7121-4018-93A8-864BED51C332</a:ObjectID> <a:ObjectID>703BF8F7-7121-4018-93A8-864BED51C332</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -5608,7 +5596,7 @@ logging ...@@ -5608,7 +5596,7 @@ logging
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Columns> <c:Columns>
<o:Column Id="o250"> <o:Column Id="o249">
<a:ObjectID>85B50558-E0AB-4443-9FD1-E20853EE452F</a:ObjectID> <a:ObjectID>85B50558-E0AB-4443-9FD1-E20853EE452F</a:ObjectID>
<a:Name>对应表ID</a:Name> <a:Name>对应表ID</a:Name>
<a:Code>ROLE_ID</a:Code> <a:Code>ROLE_ID</a:Code>
...@@ -5619,7 +5607,7 @@ logging ...@@ -5619,7 +5607,7 @@ logging
<a:Comment>对应表ID</a:Comment> <a:Comment>对应表ID</a:Comment>
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o251"> <o:Column Id="o250">
<a:ObjectID>EE442EB2-8F8E-483A-9496-3FD70EDD5A75</a:ObjectID> <a:ObjectID>EE442EB2-8F8E-483A-9496-3FD70EDD5A75</a:ObjectID>
<a:Name>角色表ID</a:Name> <a:Name>角色表ID</a:Name>
<a:Code>ROLE_MENU_ID</a:Code> <a:Code>ROLE_MENU_ID</a:Code>
...@@ -5630,7 +5618,7 @@ logging ...@@ -5630,7 +5618,7 @@ logging
<a:Comment>角色表ID</a:Comment> <a:Comment>角色表ID</a:Comment>
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o252"> <o:Column Id="o251">
<a:ObjectID>0DA4E4B6-5C95-4A65-B3A1-F064C05CA4BF</a:ObjectID> <a:ObjectID>0DA4E4B6-5C95-4A65-B3A1-F064C05CA4BF</a:ObjectID>
<a:Name>ID</a:Name> <a:Name>ID</a:Name>
<a:Code>SYSTEM_ROLE_MENU_ID</a:Code> <a:Code>SYSTEM_ROLE_MENU_ID</a:Code>
...@@ -5644,7 +5632,7 @@ logging ...@@ -5644,7 +5632,7 @@ logging
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o253"> <o:Key Id="o252">
<a:ObjectID>899D0784-29AF-4102-BA26-69928A91B73A</a:ObjectID> <a:ObjectID>899D0784-29AF-4102-BA26-69928A91B73A</a:ObjectID>
<a:Name>SYSTEM_ROLE_MENU_PK</a:Name> <a:Name>SYSTEM_ROLE_MENU_PK</a:Name>
<a:Code>SYSTEM_ROLE_MENU_PK</a:Code> <a:Code>SYSTEM_ROLE_MENU_PK</a:Code>
...@@ -5665,7 +5653,7 @@ logging ...@@ -5665,7 +5653,7 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:ConstraintName>SYSTEM_ROLE_MENU_PK</a:ConstraintName> <a:ConstraintName>SYSTEM_ROLE_MENU_PK</a:ConstraintName>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o254"> <o:ExtendedCollection Id="o253">
<a:ObjectID>1A72D3A6-B0BD-4DE4-82A4-8D499B768889</a:ObjectID> <a:ObjectID>1A72D3A6-B0BD-4DE4-82A4-8D499B768889</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -5676,7 +5664,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -5676,7 +5664,7 @@ tablespace USERS</a:PhysicalOptions>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o252"/> <o:Column Ref="o251"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
...@@ -5684,7 +5672,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -5684,7 +5672,7 @@ tablespace USERS</a:PhysicalOptions>
<o:User Ref="o117"/> <o:User Ref="o117"/>
</c:Owner> </c:Owner>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o253"/> <o:Key Ref="o252"/>
</c:PrimaryKey> </c:PrimaryKey>
</o:Table> </o:Table>
<o:Table Id="o93"> <o:Table Id="o93">
...@@ -5714,7 +5702,7 @@ logging ...@@ -5714,7 +5702,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o255"> <o:ExtendedCollection Id="o254">
<a:ObjectID>A7E7F67E-6BCC-4470-BFD5-FEB9E3FB347A</a:ObjectID> <a:ObjectID>A7E7F67E-6BCC-4470-BFD5-FEB9E3FB347A</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -5725,7 +5713,7 @@ logging ...@@ -5725,7 +5713,7 @@ logging
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Columns> <c:Columns>
<o:Column Id="o256"> <o:Column Id="o255">
<a:ObjectID>6916D391-8289-4BF5-ABF0-916209949A65</a:ObjectID> <a:ObjectID>6916D391-8289-4BF5-ABF0-916209949A65</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>ID</a:Code> <a:Code>ID</a:Code>
...@@ -5736,7 +5724,7 @@ logging ...@@ -5736,7 +5724,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o257"> <o:Column Id="o256">
<a:ObjectID>CC700EFA-B250-42CB-B67B-8739574E4AC3</a:ObjectID> <a:ObjectID>CC700EFA-B250-42CB-B67B-8739574E4AC3</a:ObjectID>
<a:Name>对应表ID</a:Name> <a:Name>对应表ID</a:Name>
<a:Code>ROLE_ID</a:Code> <a:Code>ROLE_ID</a:Code>
...@@ -5747,7 +5735,7 @@ logging ...@@ -5747,7 +5735,7 @@ logging
<a:Comment>对应表ID</a:Comment> <a:Comment>对应表ID</a:Comment>
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o258"> <o:Column Id="o257">
<a:ObjectID>37FBAA12-27F6-4B4D-AE09-4F173F4EBDE2</a:ObjectID> <a:ObjectID>37FBAA12-27F6-4B4D-AE09-4F173F4EBDE2</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>USERNAME</a:Code> <a:Code>USERNAME</a:Code>
...@@ -5758,7 +5746,7 @@ logging ...@@ -5758,7 +5746,7 @@ logging
<a:DataType>VARCHAR2(100)</a:DataType> <a:DataType>VARCHAR2(100)</a:DataType>
<a:Length>100</a:Length> <a:Length>100</a:Length>
</o:Column> </o:Column>
<o:Column Id="o259"> <o:Column Id="o258">
<a:ObjectID>50C8740B-057D-483C-A77D-F4B68600075E</a:ObjectID> <a:ObjectID>50C8740B-057D-483C-A77D-F4B68600075E</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>PASSWORD</a:Code> <a:Code>PASSWORD</a:Code>
...@@ -5769,7 +5757,7 @@ logging ...@@ -5769,7 +5757,7 @@ logging
<a:DataType>VARCHAR2(100)</a:DataType> <a:DataType>VARCHAR2(100)</a:DataType>
<a:Length>100</a:Length> <a:Length>100</a:Length>
</o:Column> </o:Column>
<o:Column Id="o260"> <o:Column Id="o259">
<a:ObjectID>8EE8BA9D-61FF-4392-98F2-6096349987B6</a:ObjectID> <a:ObjectID>8EE8BA9D-61FF-4392-98F2-6096349987B6</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>WORKSHOP</a:Code> <a:Code>WORKSHOP</a:Code>
...@@ -5782,7 +5770,7 @@ logging ...@@ -5782,7 +5770,7 @@ logging
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o261"> <o:Key Id="o260">
<a:ObjectID>87ED81CD-428A-49AF-BBAF-91B517ACCC64</a:ObjectID> <a:ObjectID>87ED81CD-428A-49AF-BBAF-91B517ACCC64</a:ObjectID>
<a:Name>SYSTEM_USER_PK</a:Name> <a:Name>SYSTEM_USER_PK</a:Name>
<a:Code>SYSTEM_USER_PK</a:Code> <a:Code>SYSTEM_USER_PK</a:Code>
...@@ -5803,7 +5791,7 @@ logging ...@@ -5803,7 +5791,7 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:ConstraintName>SYSTEM_USER_PK</a:ConstraintName> <a:ConstraintName>SYSTEM_USER_PK</a:ConstraintName>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o262"> <o:ExtendedCollection Id="o261">
<a:ObjectID>B54FFB0F-7E18-4EDA-99ED-BFC31B7C906C</a:ObjectID> <a:ObjectID>B54FFB0F-7E18-4EDA-99ED-BFC31B7C906C</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -5814,7 +5802,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -5814,7 +5802,7 @@ tablespace USERS</a:PhysicalOptions>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o256"/> <o:Column Ref="o255"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
...@@ -5822,7 +5810,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -5822,7 +5810,7 @@ tablespace USERS</a:PhysicalOptions>
<o:User Ref="o117"/> <o:User Ref="o117"/>
</c:Owner> </c:Owner>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o261"/> <o:Key Ref="o260"/>
</c:PrimaryKey> </c:PrimaryKey>
</o:Table> </o:Table>
<o:Table Id="o92"> <o:Table Id="o92">
...@@ -5849,7 +5837,7 @@ logging ...@@ -5849,7 +5837,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o263"> <o:ExtendedCollection Id="o262">
<a:ObjectID>F685BEC4-9007-48C3-B470-CB1CDEF16D81</a:ObjectID> <a:ObjectID>F685BEC4-9007-48C3-B470-CB1CDEF16D81</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -5860,7 +5848,7 @@ logging ...@@ -5860,7 +5848,7 @@ logging
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Columns> <c:Columns>
<o:Column Id="o264"> <o:Column Id="o263">
<a:ObjectID>E36237FC-B5E3-4324-855E-9CCC53A1EEFC</a:ObjectID> <a:ObjectID>E36237FC-B5E3-4324-855E-9CCC53A1EEFC</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>ID</a:Code> <a:Code>ID</a:Code>
...@@ -5872,7 +5860,7 @@ logging ...@@ -5872,7 +5860,7 @@ logging
<a:Length>10</a:Length> <a:Length>10</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o265"> <o:Column Id="o264">
<a:ObjectID>DD37D7AD-51A7-4B84-AA0E-B2BBC0821C9B</a:ObjectID> <a:ObjectID>DD37D7AD-51A7-4B84-AA0E-B2BBC0821C9B</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>AVAILABLE</a:Code> <a:Code>AVAILABLE</a:Code>
...@@ -5883,7 +5871,7 @@ logging ...@@ -5883,7 +5871,7 @@ logging
<a:DataType>NUMBER(1)</a:DataType> <a:DataType>NUMBER(1)</a:DataType>
<a:Length>1</a:Length> <a:Length>1</a:Length>
</o:Column> </o:Column>
<o:Column Id="o266"> <o:Column Id="o265">
<a:ObjectID>A7AF5D91-3C05-48D6-BD6E-4889992620D6</a:ObjectID> <a:ObjectID>A7AF5D91-3C05-48D6-BD6E-4889992620D6</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>NAME</a:Code> <a:Code>NAME</a:Code>
...@@ -5894,7 +5882,7 @@ logging ...@@ -5894,7 +5882,7 @@ logging
<a:DataType>VARCHAR2(255 char)</a:DataType> <a:DataType>VARCHAR2(255 char)</a:DataType>
<a:Length>255</a:Length> <a:Length>255</a:Length>
</o:Column> </o:Column>
<o:Column Id="o267"> <o:Column Id="o266">
<a:ObjectID>BCD6CB78-D38A-4366-BE48-240C723C4CAD</a:ObjectID> <a:ObjectID>BCD6CB78-D38A-4366-BE48-240C723C4CAD</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>PARENT_ID</a:Code> <a:Code>PARENT_ID</a:Code>
...@@ -5905,7 +5893,7 @@ logging ...@@ -5905,7 +5893,7 @@ logging
<a:DataType>NUMBER(19)</a:DataType> <a:DataType>NUMBER(19)</a:DataType>
<a:Length>19</a:Length> <a:Length>19</a:Length>
</o:Column> </o:Column>
<o:Column Id="o268"> <o:Column Id="o267">
<a:ObjectID>9CF15020-D2C0-4D18-B131-41B4695AFB76</a:ObjectID> <a:ObjectID>9CF15020-D2C0-4D18-B131-41B4695AFB76</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>PARENT_IDS</a:Code> <a:Code>PARENT_IDS</a:Code>
...@@ -5916,7 +5904,7 @@ logging ...@@ -5916,7 +5904,7 @@ logging
<a:DataType>VARCHAR2(255 char)</a:DataType> <a:DataType>VARCHAR2(255 char)</a:DataType>
<a:Length>255</a:Length> <a:Length>255</a:Length>
</o:Column> </o:Column>
<o:Column Id="o269"> <o:Column Id="o268">
<a:ObjectID>BDA46010-21EF-49FC-9037-ABB8391DDE4B</a:ObjectID> <a:ObjectID>BDA46010-21EF-49FC-9037-ABB8391DDE4B</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>PERMISSION</a:Code> <a:Code>PERMISSION</a:Code>
...@@ -5927,7 +5915,7 @@ logging ...@@ -5927,7 +5915,7 @@ logging
<a:DataType>VARCHAR2(255 char)</a:DataType> <a:DataType>VARCHAR2(255 char)</a:DataType>
<a:Length>255</a:Length> <a:Length>255</a:Length>
</o:Column> </o:Column>
<o:Column Id="o270"> <o:Column Id="o269">
<a:ObjectID>A5639155-6BCC-4153-AA77-4CE7A6AE083C</a:ObjectID> <a:ObjectID>A5639155-6BCC-4153-AA77-4CE7A6AE083C</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>RESOURCE_TYPE</a:Code> <a:Code>RESOURCE_TYPE</a:Code>
...@@ -5938,7 +5926,7 @@ logging ...@@ -5938,7 +5926,7 @@ logging
<a:DataType>VARCHAR2(255 char)</a:DataType> <a:DataType>VARCHAR2(255 char)</a:DataType>
<a:Length>255</a:Length> <a:Length>255</a:Length>
</o:Column> </o:Column>
<o:Column Id="o271"> <o:Column Id="o270">
<a:ObjectID>51FD55AF-6887-401C-BE4C-EED7EFC822CE</a:ObjectID> <a:ObjectID>51FD55AF-6887-401C-BE4C-EED7EFC822CE</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>URL</a:Code> <a:Code>URL</a:Code>
...@@ -5951,7 +5939,7 @@ logging ...@@ -5951,7 +5939,7 @@ logging
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o272"> <o:Key Id="o271">
<a:ObjectID>9A74CF90-1E66-4C90-ACE8-D0EA2832822B</a:ObjectID> <a:ObjectID>9A74CF90-1E66-4C90-ACE8-D0EA2832822B</a:ObjectID>
<a:Name>SYS_C0012307</a:Name> <a:Name>SYS_C0012307</a:Name>
<a:Code>SYS_C0012307</a:Code> <a:Code>SYS_C0012307</a:Code>
...@@ -5972,7 +5960,7 @@ logging ...@@ -5972,7 +5960,7 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:ConstraintName>SYS_C0012307</a:ConstraintName> <a:ConstraintName>SYS_C0012307</a:ConstraintName>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o273"> <o:ExtendedCollection Id="o272">
<a:ObjectID>4605D5C6-CD8A-4106-B9BC-8291E34902F5</a:ObjectID> <a:ObjectID>4605D5C6-CD8A-4106-B9BC-8291E34902F5</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -5983,7 +5971,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -5983,7 +5971,7 @@ tablespace USERS</a:PhysicalOptions>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o264"/> <o:Column Ref="o263"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
...@@ -5991,7 +5979,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -5991,7 +5979,7 @@ tablespace USERS</a:PhysicalOptions>
<o:User Ref="o117"/> <o:User Ref="o117"/>
</c:Owner> </c:Owner>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o272"/> <o:Key Ref="o271"/>
</c:PrimaryKey> </c:PrimaryKey>
</o:Table> </o:Table>
<o:Table Id="o91"> <o:Table Id="o91">
...@@ -6018,7 +6006,7 @@ logging ...@@ -6018,7 +6006,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o274"> <o:ExtendedCollection Id="o273">
<a:ObjectID>D4CE666D-70CE-419E-90C4-A40A2884A908</a:ObjectID> <a:ObjectID>D4CE666D-70CE-419E-90C4-A40A2884A908</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -6029,7 +6017,7 @@ logging ...@@ -6029,7 +6017,7 @@ logging
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Columns> <c:Columns>
<o:Column Id="o275"> <o:Column Id="o274">
<a:ObjectID>F78EF420-3C18-42C5-B6F7-96A1C8F313AA</a:ObjectID> <a:ObjectID>F78EF420-3C18-42C5-B6F7-96A1C8F313AA</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>ID</a:Code> <a:Code>ID</a:Code>
...@@ -6041,7 +6029,7 @@ logging ...@@ -6041,7 +6029,7 @@ logging
<a:Length>10</a:Length> <a:Length>10</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o276"> <o:Column Id="o275">
<a:ObjectID>C470784B-9EFA-4FF4-A0E3-53AA81DB52D8</a:ObjectID> <a:ObjectID>C470784B-9EFA-4FF4-A0E3-53AA81DB52D8</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>AVAILABLE</a:Code> <a:Code>AVAILABLE</a:Code>
...@@ -6052,7 +6040,7 @@ logging ...@@ -6052,7 +6040,7 @@ logging
<a:DataType>NUMBER(1)</a:DataType> <a:DataType>NUMBER(1)</a:DataType>
<a:Length>1</a:Length> <a:Length>1</a:Length>
</o:Column> </o:Column>
<o:Column Id="o277"> <o:Column Id="o276">
<a:ObjectID>FEF2A56E-84C7-4A32-A88E-21D98BFC3FA5</a:ObjectID> <a:ObjectID>FEF2A56E-84C7-4A32-A88E-21D98BFC3FA5</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>DESCRIPTION</a:Code> <a:Code>DESCRIPTION</a:Code>
...@@ -6063,7 +6051,7 @@ logging ...@@ -6063,7 +6051,7 @@ logging
<a:DataType>VARCHAR2(255 char)</a:DataType> <a:DataType>VARCHAR2(255 char)</a:DataType>
<a:Length>255</a:Length> <a:Length>255</a:Length>
</o:Column> </o:Column>
<o:Column Id="o278"> <o:Column Id="o277">
<a:ObjectID>1FDAEFDF-5716-44E2-A26F-F7114A5D4868</a:ObjectID> <a:ObjectID>1FDAEFDF-5716-44E2-A26F-F7114A5D4868</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>ROLE</a:Code> <a:Code>ROLE</a:Code>
...@@ -6076,7 +6064,7 @@ logging ...@@ -6076,7 +6064,7 @@ logging
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o279"> <o:Key Id="o278">
<a:ObjectID>83551291-CD75-4CDA-BA7E-CC11205A39E1</a:ObjectID> <a:ObjectID>83551291-CD75-4CDA-BA7E-CC11205A39E1</a:ObjectID>
<a:Name>SYS_C0012309</a:Name> <a:Name>SYS_C0012309</a:Name>
<a:Code>SYS_C0012309</a:Code> <a:Code>SYS_C0012309</a:Code>
...@@ -6097,7 +6085,7 @@ logging ...@@ -6097,7 +6085,7 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:ConstraintName>SYS_C0012309</a:ConstraintName> <a:ConstraintName>SYS_C0012309</a:ConstraintName>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o280"> <o:ExtendedCollection Id="o279">
<a:ObjectID>F65D08F7-C491-49AB-86DE-B037E612A819</a:ObjectID> <a:ObjectID>F65D08F7-C491-49AB-86DE-B037E612A819</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -6108,7 +6096,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -6108,7 +6096,7 @@ tablespace USERS</a:PhysicalOptions>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o275"/> <o:Column Ref="o274"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
...@@ -6116,7 +6104,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -6116,7 +6104,7 @@ tablespace USERS</a:PhysicalOptions>
<o:User Ref="o117"/> <o:User Ref="o117"/>
</c:Owner> </c:Owner>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o279"/> <o:Key Ref="o278"/>
</c:PrimaryKey> </c:PrimaryKey>
</o:Table> </o:Table>
<o:Table Id="o90"> <o:Table Id="o90">
...@@ -6143,7 +6131,7 @@ logging ...@@ -6143,7 +6131,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o281"> <o:ExtendedCollection Id="o280">
<a:ObjectID>F9E5117D-2389-4506-8308-4AA25A748015</a:ObjectID> <a:ObjectID>F9E5117D-2389-4506-8308-4AA25A748015</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -6154,7 +6142,7 @@ logging ...@@ -6154,7 +6142,7 @@ logging
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Columns> <c:Columns>
<o:Column Id="o282"> <o:Column Id="o281">
<a:ObjectID>509A1110-A2F2-40FC-9610-8CF2A0A414FB</a:ObjectID> <a:ObjectID>509A1110-A2F2-40FC-9610-8CF2A0A414FB</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>ROLE_ID</a:Code> <a:Code>ROLE_ID</a:Code>
...@@ -6166,7 +6154,7 @@ logging ...@@ -6166,7 +6154,7 @@ logging
<a:Length>10</a:Length> <a:Length>10</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o283"> <o:Column Id="o282">
<a:ObjectID>12DAC3CE-8F98-46C9-BAA2-D3B283A581F8</a:ObjectID> <a:ObjectID>12DAC3CE-8F98-46C9-BAA2-D3B283A581F8</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>PERMISSION_ID</a:Code> <a:Code>PERMISSION_ID</a:Code>
...@@ -6207,7 +6195,7 @@ logging ...@@ -6207,7 +6195,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o284"> <o:ExtendedCollection Id="o283">
<a:ObjectID>7B6B2F1A-98DE-495B-A69B-75D2147D0DAE</a:ObjectID> <a:ObjectID>7B6B2F1A-98DE-495B-A69B-75D2147D0DAE</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -6218,7 +6206,7 @@ logging ...@@ -6218,7 +6206,7 @@ logging
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Columns> <c:Columns>
<o:Column Id="o285"> <o:Column Id="o284">
<a:ObjectID>74053DBF-DC18-4808-B08E-BBC9FE6A81C9</a:ObjectID> <a:ObjectID>74053DBF-DC18-4808-B08E-BBC9FE6A81C9</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>USER_ID</a:Code> <a:Code>USER_ID</a:Code>
...@@ -6230,7 +6218,7 @@ logging ...@@ -6230,7 +6218,7 @@ logging
<a:Length>10</a:Length> <a:Length>10</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o286"> <o:Column Id="o285">
<a:ObjectID>1A7CBBF6-1D07-4E35-9BB0-BBB4AE7D76CA</a:ObjectID> <a:ObjectID>1A7CBBF6-1D07-4E35-9BB0-BBB4AE7D76CA</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>ROLE_ID</a:Code> <a:Code>ROLE_ID</a:Code>
...@@ -6272,7 +6260,7 @@ logging ...@@ -6272,7 +6260,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o287"> <o:ExtendedCollection Id="o286">
<a:ObjectID>5EEDFD21-D565-4B12-8DC0-073C5131DFCB</a:ObjectID> <a:ObjectID>5EEDFD21-D565-4B12-8DC0-073C5131DFCB</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -6283,7 +6271,7 @@ logging ...@@ -6283,7 +6271,7 @@ logging
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Columns> <c:Columns>
<o:Column Id="o288"> <o:Column Id="o287">
<a:ObjectID>6784A384-E68E-4873-B428-623BE920FF13</a:ObjectID> <a:ObjectID>6784A384-E68E-4873-B428-623BE920FF13</a:ObjectID>
<a:Name>任务单ID</a:Name> <a:Name>任务单ID</a:Name>
<a:Code>TASK_ID</a:Code> <a:Code>TASK_ID</a:Code>
...@@ -6295,7 +6283,7 @@ logging ...@@ -6295,7 +6283,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o289"> <o:Column Id="o288">
<a:ObjectID>F575D27C-F9D9-4573-B1AC-DB515C15E5CC</a:ObjectID> <a:ObjectID>F575D27C-F9D9-4573-B1AC-DB515C15E5CC</a:ObjectID>
<a:Name>制证类型</a:Name> <a:Name>制证类型</a:Name>
<a:Code>CARD_TYPE</a:Code> <a:Code>CARD_TYPE</a:Code>
...@@ -6307,7 +6295,7 @@ logging ...@@ -6307,7 +6295,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o290"> <o:Column Id="o289">
<a:ObjectID>0F5E1A28-958E-484E-B7C4-64C3CC01E4B5</a:ObjectID> <a:ObjectID>0F5E1A28-958E-484E-B7C4-64C3CC01E4B5</a:ObjectID>
<a:Name>原制证类型</a:Name> <a:Name>原制证类型</a:Name>
<a:Code>OLD_CARD_TYPE</a:Code> <a:Code>OLD_CARD_TYPE</a:Code>
...@@ -6318,7 +6306,7 @@ logging ...@@ -6318,7 +6306,7 @@ logging
<a:Comment>原制证类型</a:Comment> <a:Comment>原制证类型</a:Comment>
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o291"> <o:Column Id="o290">
<a:ObjectID>A441B19E-03B2-47FF-9C25-38C91027DF58</a:ObjectID> <a:ObjectID>A441B19E-03B2-47FF-9C25-38C91027DF58</a:ObjectID>
<a:Name>城市代码</a:Name> <a:Name>城市代码</a:Name>
<a:Code>CITYCODE</a:Code> <a:Code>CITYCODE</a:Code>
...@@ -6331,7 +6319,7 @@ logging ...@@ -6331,7 +6319,7 @@ logging
<a:Length>6</a:Length> <a:Length>6</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o292"> <o:Column Id="o291">
<a:ObjectID>8FB62867-DEF6-4B35-B475-4C364F9238C9</a:ObjectID> <a:ObjectID>8FB62867-DEF6-4B35-B475-4C364F9238C9</a:ObjectID>
<a:Name>提交生成时间</a:Name> <a:Name>提交生成时间</a:Name>
<a:Code>SUBMIT_DATE</a:Code> <a:Code>SUBMIT_DATE</a:Code>
...@@ -6343,7 +6331,7 @@ logging ...@@ -6343,7 +6331,7 @@ logging
<a:DefaultValue>SYSDATE</a:DefaultValue> <a:DefaultValue>SYSDATE</a:DefaultValue>
<a:DataType>DATE</a:DataType> <a:DataType>DATE</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o293"> <o:Column Id="o292">
<a:ObjectID>353FA01A-D8C4-47B2-8882-5FECC5FEEDF9</a:ObjectID> <a:ObjectID>353FA01A-D8C4-47B2-8882-5FECC5FEEDF9</a:ObjectID>
<a:Name>下发任务单时间</a:Name> <a:Name>下发任务单时间</a:Name>
<a:Code>ISSUED_DATE</a:Code> <a:Code>ISSUED_DATE</a:Code>
...@@ -6354,7 +6342,7 @@ logging ...@@ -6354,7 +6342,7 @@ logging
<a:Comment>下发任务单时间</a:Comment> <a:Comment>下发任务单时间</a:Comment>
<a:DataType>DATE</a:DataType> <a:DataType>DATE</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o294"> <o:Column Id="o293">
<a:ObjectID>E30E2565-1203-4D54-BAE6-A0DFCE19A0A3</a:ObjectID> <a:ObjectID>E30E2565-1203-4D54-BAE6-A0DFCE19A0A3</a:ObjectID>
<a:Name>打印状态(1正面打印2反面打印3打印完成)</a:Name> <a:Name>打印状态(1正面打印2反面打印3打印完成)</a:Name>
<a:Code>PRINT_STATE</a:Code> <a:Code>PRINT_STATE</a:Code>
...@@ -6366,7 +6354,7 @@ logging ...@@ -6366,7 +6354,7 @@ logging
<a:DefaultValue>0</a:DefaultValue> <a:DefaultValue>0</a:DefaultValue>
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o295"> <o:Column Id="o294">
<a:ObjectID>3B0B912B-C7D6-4EE3-89F1-06570DA61BC8</a:ObjectID> <a:ObjectID>3B0B912B-C7D6-4EE3-89F1-06570DA61BC8</a:ObjectID>
<a:Name>卸载时间</a:Name> <a:Name>卸载时间</a:Name>
<a:Code>DOWNLOAD_DATE</a:Code> <a:Code>DOWNLOAD_DATE</a:Code>
...@@ -6377,7 +6365,7 @@ logging ...@@ -6377,7 +6365,7 @@ logging
<a:Comment>卸载时间</a:Comment> <a:Comment>卸载时间</a:Comment>
<a:DataType>DATE</a:DataType> <a:DataType>DATE</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o296"> <o:Column Id="o295">
<a:ObjectID>09B0A790-F080-4E07-95BE-EAADE61973FD</a:ObjectID> <a:ObjectID>09B0A790-F080-4E07-95BE-EAADE61973FD</a:ObjectID>
<a:Name>打印转出时间</a:Name> <a:Name>打印转出时间</a:Name>
<a:Code>PRINT_OUT_DATE</a:Code> <a:Code>PRINT_OUT_DATE</a:Code>
...@@ -6388,7 +6376,7 @@ logging ...@@ -6388,7 +6376,7 @@ logging
<a:Comment>打印转出时间</a:Comment> <a:Comment>打印转出时间</a:Comment>
<a:DataType>DATE</a:DataType> <a:DataType>DATE</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o297"> <o:Column Id="o296">
<a:ObjectID>10A45F9D-6337-4E86-BF1A-ACF5AAC09323</a:ObjectID> <a:ObjectID>10A45F9D-6337-4E86-BF1A-ACF5AAC09323</a:ObjectID>
<a:Name>预订位时间</a:Name> <a:Name>预订位时间</a:Name>
<a:Code>POSITION_DATE</a:Code> <a:Code>POSITION_DATE</a:Code>
...@@ -6399,7 +6387,7 @@ logging ...@@ -6399,7 +6387,7 @@ logging
<a:Comment>预订位时间</a:Comment> <a:Comment>预订位时间</a:Comment>
<a:DataType>DATE</a:DataType> <a:DataType>DATE</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o298"> <o:Column Id="o297">
<a:ObjectID>8C978601-9B05-42C3-8BC6-DE07C70A9A38</a:ObjectID> <a:ObjectID>8C978601-9B05-42C3-8BC6-DE07C70A9A38</a:ObjectID>
<a:Name>车间转出时间</a:Name> <a:Name>车间转出时间</a:Name>
<a:Code>OUT_WORKSHOP_DATE</a:Code> <a:Code>OUT_WORKSHOP_DATE</a:Code>
...@@ -6410,7 +6398,7 @@ logging ...@@ -6410,7 +6398,7 @@ logging
<a:Comment>车间转出时间</a:Comment> <a:Comment>车间转出时间</a:Comment>
<a:DataType>DATE</a:DataType> <a:DataType>DATE</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o299"> <o:Column Id="o298">
<a:ObjectID>08A28BC6-5537-49C0-9401-29A789CFA4E4</a:ObjectID> <a:ObjectID>08A28BC6-5537-49C0-9401-29A789CFA4E4</a:ObjectID>
<a:Name>质检人姓名</a:Name> <a:Name>质检人姓名</a:Name>
<a:Code>QUALITY_PEOPLE_NAME</a:Code> <a:Code>QUALITY_PEOPLE_NAME</a:Code>
...@@ -6422,7 +6410,7 @@ logging ...@@ -6422,7 +6410,7 @@ logging
<a:DataType>VARCHAR2(20)</a:DataType> <a:DataType>VARCHAR2(20)</a:DataType>
<a:Length>20</a:Length> <a:Length>20</a:Length>
</o:Column> </o:Column>
<o:Column Id="o300"> <o:Column Id="o299">
<a:ObjectID>385B1308-C249-4655-8373-C36FEA53CBA4</a:ObjectID> <a:ObjectID>385B1308-C249-4655-8373-C36FEA53CBA4</a:ObjectID>
<a:Name>人工质检时间</a:Name> <a:Name>人工质检时间</a:Name>
<a:Code>QUALITY_TEST_DATE</a:Code> <a:Code>QUALITY_TEST_DATE</a:Code>
...@@ -6433,7 +6421,7 @@ logging ...@@ -6433,7 +6421,7 @@ logging
<a:Comment>人工质检时间</a:Comment> <a:Comment>人工质检时间</a:Comment>
<a:DataType>DATE</a:DataType> <a:DataType>DATE</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o301"> <o:Column Id="o300">
<a:ObjectID>08889DDB-C73A-42C1-BE40-6BE4D4CB43ED</a:ObjectID> <a:ObjectID>08889DDB-C73A-42C1-BE40-6BE4D4CB43ED</a:ObjectID>
<a:Name>异常信息</a:Name> <a:Name>异常信息</a:Name>
<a:Code>EXCEPTION_INFORMATION</a:Code> <a:Code>EXCEPTION_INFORMATION</a:Code>
...@@ -6445,7 +6433,7 @@ logging ...@@ -6445,7 +6433,7 @@ logging
<a:DataType>VARCHAR2(120)</a:DataType> <a:DataType>VARCHAR2(120)</a:DataType>
<a:Length>120</a:Length> <a:Length>120</a:Length>
</o:Column> </o:Column>
<o:Column Id="o302"> <o:Column Id="o301">
<a:ObjectID>8D6DF373-73FF-4103-B481-DCA7A0684F96</a:ObjectID> <a:ObjectID>8D6DF373-73FF-4103-B481-DCA7A0684F96</a:ObjectID>
<a:Name>出库时间</a:Name> <a:Name>出库时间</a:Name>
<a:Code>OUT_STORAGE_DATE</a:Code> <a:Code>OUT_STORAGE_DATE</a:Code>
...@@ -6456,7 +6444,7 @@ logging ...@@ -6456,7 +6444,7 @@ logging
<a:Comment>出库时间</a:Comment> <a:Comment>出库时间</a:Comment>
<a:DataType>DATE</a:DataType> <a:DataType>DATE</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o303"> <o:Column Id="o302">
<a:ObjectID>1D41D157-E313-43B8-95C2-506442485D6C</a:ObjectID> <a:ObjectID>1D41D157-E313-43B8-95C2-506442485D6C</a:ObjectID>
<a:Name>入库时间</a:Name> <a:Name>入库时间</a:Name>
<a:Code>IN_STORAGE_DATE</a:Code> <a:Code>IN_STORAGE_DATE</a:Code>
...@@ -6467,7 +6455,7 @@ logging ...@@ -6467,7 +6455,7 @@ logging
<a:Comment>入库时间</a:Comment> <a:Comment>入库时间</a:Comment>
<a:DataType>DATE</a:DataType> <a:DataType>DATE</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o304"> <o:Column Id="o303">
<a:ObjectID>1CA84D7C-1780-46EF-9BC5-13585F71C89D</a:ObjectID> <a:ObjectID>1CA84D7C-1780-46EF-9BC5-13585F71C89D</a:ObjectID>
<a:Name>任务单状态</a:Name> <a:Name>任务单状态</a:Name>
<a:Code>TASK_STATE_ID</a:Code> <a:Code>TASK_STATE_ID</a:Code>
...@@ -6479,7 +6467,7 @@ logging ...@@ -6479,7 +6467,7 @@ logging
<a:DefaultValue>0</a:DefaultValue> <a:DefaultValue>0</a:DefaultValue>
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o305"> <o:Column Id="o304">
<a:ObjectID>CD2F8A58-DEF5-4737-BA28-B5155449F34A</a:ObjectID> <a:ObjectID>CD2F8A58-DEF5-4737-BA28-B5155449F34A</a:ObjectID>
<a:Name>异常状态 0正常 1 异常</a:Name> <a:Name>异常状态 0正常 1 异常</a:Name>
<a:Code>IS_EXCEPTION</a:Code> <a:Code>IS_EXCEPTION</a:Code>
...@@ -6490,7 +6478,7 @@ logging ...@@ -6490,7 +6478,7 @@ logging
<a:Comment>异常状态 0正常 1 异常</a:Comment> <a:Comment>异常状态 0正常 1 异常</a:Comment>
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
</o:Column> </o:Column>
<o:Column Id="o306"> <o:Column Id="o305">
<a:ObjectID>06B07ACB-D356-40AF-A21D-1817F806484E</a:ObjectID> <a:ObjectID>06B07ACB-D356-40AF-A21D-1817F806484E</a:ObjectID>
<a:Name>打印机ID</a:Name> <a:Name>打印机ID</a:Name>
<a:Code>PRINTER_ID</a:Code> <a:Code>PRINTER_ID</a:Code>
...@@ -6503,7 +6491,7 @@ logging ...@@ -6503,7 +6491,7 @@ logging
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o307"> <o:Key Id="o306">
<a:ObjectID>A32670E6-1CC4-4621-8F91-983598851C0F</a:ObjectID> <a:ObjectID>A32670E6-1CC4-4621-8F91-983598851C0F</a:ObjectID>
<a:Name>TASK_PK</a:Name> <a:Name>TASK_PK</a:Name>
<a:Code>TASK_PK</a:Code> <a:Code>TASK_PK</a:Code>
...@@ -6524,7 +6512,7 @@ logging ...@@ -6524,7 +6512,7 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:ConstraintName>TASK_PK</a:ConstraintName> <a:ConstraintName>TASK_PK</a:ConstraintName>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o308"> <o:ExtendedCollection Id="o307">
<a:ObjectID>0FAD199B-C0F3-4240-93AD-94064BC874DF</a:ObjectID> <a:ObjectID>0FAD199B-C0F3-4240-93AD-94064BC874DF</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -6535,7 +6523,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -6535,7 +6523,7 @@ tablespace USERS</a:PhysicalOptions>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o288"/> <o:Column Ref="o287"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
...@@ -6543,7 +6531,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -6543,7 +6531,7 @@ tablespace USERS</a:PhysicalOptions>
<o:User Ref="o117"/> <o:User Ref="o117"/>
</c:Owner> </c:Owner>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o307"/> <o:Key Ref="o306"/>
</c:PrimaryKey> </c:PrimaryKey>
</o:Table> </o:Table>
<o:Table Id="o87"> <o:Table Id="o87">
...@@ -6571,7 +6559,7 @@ logging ...@@ -6571,7 +6559,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:Columns> <c:Columns>
<o:Column Id="o309"> <o:Column Id="o308">
<a:ObjectID>1BF84519-B6CE-4BB9-8F6C-AC1888E0D063</a:ObjectID> <a:ObjectID>1BF84519-B6CE-4BB9-8F6C-AC1888E0D063</a:ObjectID>
<a:Name>状态ID</a:Name> <a:Name>状态ID</a:Name>
<a:Code>TASK_STATE_ID</a:Code> <a:Code>TASK_STATE_ID</a:Code>
...@@ -6583,7 +6571,7 @@ logging ...@@ -6583,7 +6571,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o310"> <o:Column Id="o309">
<a:ObjectID>C84B449B-405F-4AB5-98B1-65AEC8A5BFEA</a:ObjectID> <a:ObjectID>C84B449B-405F-4AB5-98B1-65AEC8A5BFEA</a:ObjectID>
<a:Name>状态名称</a:Name> <a:Name>状态名称</a:Name>
<a:Code>TASK_STATE</a:Code> <a:Code>TASK_STATE</a:Code>
...@@ -6598,7 +6586,7 @@ logging ...@@ -6598,7 +6586,7 @@ logging
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o311"> <o:Key Id="o310">
<a:ObjectID>CF71938F-719F-40F3-9155-E8CCD21369C4</a:ObjectID> <a:ObjectID>CF71938F-719F-40F3-9155-E8CCD21369C4</a:ObjectID>
<a:Name>TASK_STATE_DIC_PK</a:Name> <a:Name>TASK_STATE_DIC_PK</a:Name>
<a:Code>TASK_STATE_DIC_PK</a:Code> <a:Code>TASK_STATE_DIC_PK</a:Code>
...@@ -6619,7 +6607,7 @@ logging ...@@ -6619,7 +6607,7 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:ConstraintName>TASK_STATE_DIC_PK</a:ConstraintName> <a:ConstraintName>TASK_STATE_DIC_PK</a:ConstraintName>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o312"> <o:ExtendedCollection Id="o311">
<a:ObjectID>8834A09D-09A5-464C-864B-9CE77CCB5C12</a:ObjectID> <a:ObjectID>8834A09D-09A5-464C-864B-9CE77CCB5C12</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -6630,7 +6618,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -6630,7 +6618,7 @@ tablespace USERS</a:PhysicalOptions>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o309"/> <o:Column Ref="o308"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
...@@ -6638,7 +6626,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -6638,7 +6626,7 @@ tablespace USERS</a:PhysicalOptions>
<o:User Ref="o117"/> <o:User Ref="o117"/>
</c:Owner> </c:Owner>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o311"/> <o:Key Ref="o310"/>
</c:PrimaryKey> </c:PrimaryKey>
</o:Table> </o:Table>
<o:Table Id="o84"> <o:Table Id="o84">
...@@ -6665,7 +6653,7 @@ logging ...@@ -6665,7 +6653,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o313"> <o:ExtendedCollection Id="o312">
<a:ObjectID>66147AA8-2A12-4347-9667-99D720513E90</a:ObjectID> <a:ObjectID>66147AA8-2A12-4347-9667-99D720513E90</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -6676,7 +6664,7 @@ logging ...@@ -6676,7 +6664,7 @@ logging
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Columns> <c:Columns>
<o:Column Id="o314"> <o:Column Id="o313">
<a:ObjectID>3979E5BA-2849-4DA2-A7FB-267338034BA6</a:ObjectID> <a:ObjectID>3979E5BA-2849-4DA2-A7FB-267338034BA6</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>ID</a:Code> <a:Code>ID</a:Code>
...@@ -6688,7 +6676,7 @@ logging ...@@ -6688,7 +6676,7 @@ logging
<a:Length>10</a:Length> <a:Length>10</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o315"> <o:Column Id="o314">
<a:ObjectID>A8C9B0F8-D4D1-4591-9569-11C9265F1DBD</a:ObjectID> <a:ObjectID>A8C9B0F8-D4D1-4591-9569-11C9265F1DBD</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>NAME</a:Code> <a:Code>NAME</a:Code>
...@@ -6699,7 +6687,7 @@ logging ...@@ -6699,7 +6687,7 @@ logging
<a:DataType>VARCHAR2(255 char)</a:DataType> <a:DataType>VARCHAR2(255 char)</a:DataType>
<a:Length>255</a:Length> <a:Length>255</a:Length>
</o:Column> </o:Column>
<o:Column Id="o316"> <o:Column Id="o315">
<a:ObjectID>EB244AF2-D641-425D-A569-6B3B04B57FB5</a:ObjectID> <a:ObjectID>EB244AF2-D641-425D-A569-6B3B04B57FB5</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>PASSWORD</a:Code> <a:Code>PASSWORD</a:Code>
...@@ -6710,7 +6698,7 @@ logging ...@@ -6710,7 +6698,7 @@ logging
<a:DataType>VARCHAR2(255 char)</a:DataType> <a:DataType>VARCHAR2(255 char)</a:DataType>
<a:Length>255</a:Length> <a:Length>255</a:Length>
</o:Column> </o:Column>
<o:Column Id="o317"> <o:Column Id="o316">
<a:ObjectID>8600FC0A-FFD6-4F96-A879-617ABBD5B908</a:ObjectID> <a:ObjectID>8600FC0A-FFD6-4F96-A879-617ABBD5B908</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>SALT</a:Code> <a:Code>SALT</a:Code>
...@@ -6721,7 +6709,7 @@ logging ...@@ -6721,7 +6709,7 @@ logging
<a:DataType>VARCHAR2(255 char)</a:DataType> <a:DataType>VARCHAR2(255 char)</a:DataType>
<a:Length>255</a:Length> <a:Length>255</a:Length>
</o:Column> </o:Column>
<o:Column Id="o318"> <o:Column Id="o317">
<a:ObjectID>97D9A740-AD8D-4D70-AFE3-20717FC05FF6</a:ObjectID> <a:ObjectID>97D9A740-AD8D-4D70-AFE3-20717FC05FF6</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>STATE</a:Code> <a:Code>STATE</a:Code>
...@@ -6733,7 +6721,7 @@ logging ...@@ -6733,7 +6721,7 @@ logging
<a:Length>3</a:Length> <a:Length>3</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o319"> <o:Column Id="o318">
<a:ObjectID>7859394A-C26D-40AD-A1A3-52452D40B27E</a:ObjectID> <a:ObjectID>7859394A-C26D-40AD-A1A3-52452D40B27E</a:ObjectID>
<a:Name> </a:Name> <a:Name> </a:Name>
<a:Code>USERNAME</a:Code> <a:Code>USERNAME</a:Code>
...@@ -6746,7 +6734,7 @@ logging ...@@ -6746,7 +6734,7 @@ logging
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o320"> <o:Key Id="o319">
<a:ObjectID>E59AF24D-D2F6-4837-A4B9-2E843F11F12F</a:ObjectID> <a:ObjectID>E59AF24D-D2F6-4837-A4B9-2E843F11F12F</a:ObjectID>
<a:Name>UK_F2KSD6H8HSJTD57IPFQ9MYR64</a:Name> <a:Name>UK_F2KSD6H8HSJTD57IPFQ9MYR64</a:Name>
<a:Code>UK_F2KSD6H8HSJTD57IPFQ9MYR64</a:Code> <a:Code>UK_F2KSD6H8HSJTD57IPFQ9MYR64</a:Code>
...@@ -6767,7 +6755,7 @@ logging ...@@ -6767,7 +6755,7 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:ConstraintName>UK_F2KSD6H8HSJTD57IPFQ9MYR64</a:ConstraintName> <a:ConstraintName>UK_F2KSD6H8HSJTD57IPFQ9MYR64</a:ConstraintName>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o321"> <o:ExtendedCollection Id="o320">
<a:ObjectID>DAEFC681-D78E-4169-BA19-BE6D865056BA</a:ObjectID> <a:ObjectID>DAEFC681-D78E-4169-BA19-BE6D865056BA</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -6778,10 +6766,10 @@ tablespace USERS</a:PhysicalOptions> ...@@ -6778,10 +6766,10 @@ tablespace USERS</a:PhysicalOptions>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o319"/> <o:Column Ref="o318"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
<o:Key Id="o322"> <o:Key Id="o321">
<a:ObjectID>EB8A77BC-5D32-45E4-A5FD-CCC58A980754</a:ObjectID> <a:ObjectID>EB8A77BC-5D32-45E4-A5FD-CCC58A980754</a:ObjectID>
<a:Name>SYS_C0012316</a:Name> <a:Name>SYS_C0012316</a:Name>
<a:Code>SYS_C0012316</a:Code> <a:Code>SYS_C0012316</a:Code>
...@@ -6802,7 +6790,7 @@ logging ...@@ -6802,7 +6790,7 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:ConstraintName>SYS_C0012316</a:ConstraintName> <a:ConstraintName>SYS_C0012316</a:ConstraintName>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o323"> <o:ExtendedCollection Id="o322">
<a:ObjectID>4D49DF7B-A05C-46D8-B62D-0E8CEDABC377</a:ObjectID> <a:ObjectID>4D49DF7B-A05C-46D8-B62D-0E8CEDABC377</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -6813,7 +6801,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -6813,7 +6801,7 @@ tablespace USERS</a:PhysicalOptions>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o314"/> <o:Column Ref="o313"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
...@@ -6821,7 +6809,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -6821,7 +6809,7 @@ tablespace USERS</a:PhysicalOptions>
<o:User Ref="o117"/> <o:User Ref="o117"/>
</c:Owner> </c:Owner>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o322"/> <o:Key Ref="o321"/>
</c:PrimaryKey> </c:PrimaryKey>
</o:Table> </o:Table>
<o:Table Id="o86"> <o:Table Id="o86">
...@@ -6848,7 +6836,7 @@ logging ...@@ -6848,7 +6836,7 @@ logging
noparallel</a:PhysicalOptions> noparallel</a:PhysicalOptions>
<a:TotalSavingCurrency/> <a:TotalSavingCurrency/>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o324"> <o:ExtendedCollection Id="o323">
<a:ObjectID>08801EC4-3DDA-4869-A690-A39F5648A54D</a:ObjectID> <a:ObjectID>08801EC4-3DDA-4869-A690-A39F5648A54D</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -6859,7 +6847,7 @@ logging ...@@ -6859,7 +6847,7 @@ logging
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Columns> <c:Columns>
<o:Column Id="o325"> <o:Column Id="o324">
<a:ObjectID>4AF7CCBD-8E80-4CC2-B85A-BA492FB8E4FA</a:ObjectID> <a:ObjectID>4AF7CCBD-8E80-4CC2-B85A-BA492FB8E4FA</a:ObjectID>
<a:Name>接收类型</a:Name> <a:Name>接收类型</a:Name>
<a:Code>REPORTYPE</a:Code> <a:Code>REPORTYPE</a:Code>
...@@ -6871,7 +6859,7 @@ logging ...@@ -6871,7 +6859,7 @@ logging
<a:DataType>NUMBER</a:DataType> <a:DataType>NUMBER</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory> <a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column> </o:Column>
<o:Column Id="o326"> <o:Column Id="o325">
<a:ObjectID>E883B16F-FCDF-4DEC-963A-64D02F6FFA11</a:ObjectID> <a:ObjectID>E883B16F-FCDF-4DEC-963A-64D02F6FFA11</a:ObjectID>
<a:Name>接收名称</a:Name> <a:Name>接收名称</a:Name>
<a:Code>REPORNAME</a:Code> <a:Code>REPORNAME</a:Code>
...@@ -6885,7 +6873,7 @@ logging ...@@ -6885,7 +6873,7 @@ logging
</o:Column> </o:Column>
</c:Columns> </c:Columns>
<c:Keys> <c:Keys>
<o:Key Id="o327"> <o:Key Id="o326">
<a:ObjectID>82975234-C197-414A-8D88-0EB1B4DD19AE</a:ObjectID> <a:ObjectID>82975234-C197-414A-8D88-0EB1B4DD19AE</a:ObjectID>
<a:Name>WORKSHOPREPORINFOTYPE_DIC_PK</a:Name> <a:Name>WORKSHOPREPORINFOTYPE_DIC_PK</a:Name>
<a:Code>WORKSHOPREPORINFOTYPE_DIC_PK</a:Code> <a:Code>WORKSHOPREPORINFOTYPE_DIC_PK</a:Code>
...@@ -6906,7 +6894,7 @@ logging ...@@ -6906,7 +6894,7 @@ logging
tablespace USERS</a:PhysicalOptions> tablespace USERS</a:PhysicalOptions>
<a:ConstraintName>WORKSHOPREPORINFOTYPE_DIC_PK</a:ConstraintName> <a:ConstraintName>WORKSHOPREPORINFOTYPE_DIC_PK</a:ConstraintName>
<c:ExtendedCollections> <c:ExtendedCollections>
<o:ExtendedCollection Id="o328"> <o:ExtendedCollection Id="o327">
<a:ObjectID>E1238B03-D361-404B-875C-593A1E77E7E9</a:ObjectID> <a:ObjectID>E1238B03-D361-404B-875C-593A1E77E7E9</a:ObjectID>
<a:Name>Related Columns</a:Name> <a:Name>Related Columns</a:Name>
<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName> <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
...@@ -6917,7 +6905,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -6917,7 +6905,7 @@ tablespace USERS</a:PhysicalOptions>
</o:ExtendedCollection> </o:ExtendedCollection>
</c:ExtendedCollections> </c:ExtendedCollections>
<c:Key.Columns> <c:Key.Columns>
<o:Column Ref="o325"/> <o:Column Ref="o324"/>
</c:Key.Columns> </c:Key.Columns>
</o:Key> </o:Key>
</c:Keys> </c:Keys>
...@@ -6925,7 +6913,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -6925,7 +6913,7 @@ tablespace USERS</a:PhysicalOptions>
<o:User Ref="o117"/> <o:User Ref="o117"/>
</c:Owner> </c:Owner>
<c:PrimaryKey> <c:PrimaryKey>
<o:Key Ref="o327"/> <o:Key Ref="o326"/>
</c:PrimaryKey> </c:PrimaryKey>
</o:Table> </o:Table>
</c:Tables> </c:Tables>
...@@ -6954,7 +6942,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -6954,7 +6942,7 @@ tablespace USERS</a:PhysicalOptions>
<o:Key Ref="o133"/> <o:Key Ref="o133"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o329"> <o:ReferenceJoin Id="o328">
<a:ObjectID>82CC0A68-5410-4A5E-BA68-FDC918EEAEF1</a:ObjectID> <a:ObjectID>82CC0A68-5410-4A5E-BA68-FDC918EEAEF1</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
...@@ -6990,17 +6978,17 @@ tablespace USERS</a:PhysicalOptions> ...@@ -6990,17 +6978,17 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o115"/> <o:Table Ref="o115"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o307"/> <o:Key Ref="o306"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o330"> <o:ReferenceJoin Id="o329">
<a:ObjectID>6B5855A3-8AEE-40F3-A9A3-6C851EE7A1C7</a:ObjectID> <a:ObjectID>6B5855A3-8AEE-40F3-A9A3-6C851EE7A1C7</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o288"/> <o:Column Ref="o287"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o126"/> <o:Column Ref="o126"/>
...@@ -7032,7 +7020,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7032,7 +7020,7 @@ tablespace USERS</a:PhysicalOptions>
<o:Key Ref="o149"/> <o:Key Ref="o149"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o331"> <o:ReferenceJoin Id="o330">
<a:ObjectID>B5BBFDB5-6EC0-4C23-8B7C-58707E47BE06</a:ObjectID> <a:ObjectID>B5BBFDB5-6EC0-4C23-8B7C-58707E47BE06</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
...@@ -7068,17 +7056,17 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7068,17 +7056,17 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o109"/> <o:Table Ref="o109"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o307"/> <o:Key Ref="o306"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o332"> <o:ReferenceJoin Id="o331">
<a:ObjectID>D45846BB-EF50-4996-BC21-DDE3E4683401</a:ObjectID> <a:ObjectID>D45846BB-EF50-4996-BC21-DDE3E4683401</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o288"/> <o:Column Ref="o287"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o153"/> <o:Column Ref="o153"/>
...@@ -7107,17 +7095,17 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7107,17 +7095,17 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o108"/> <o:Table Ref="o108"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o307"/> <o:Key Ref="o306"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o333"> <o:ReferenceJoin Id="o332">
<a:ObjectID>755AD0E4-11B8-4DA8-90DD-F6574B0D5428</a:ObjectID> <a:ObjectID>755AD0E4-11B8-4DA8-90DD-F6574B0D5428</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o288"/> <o:Column Ref="o287"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o164"/> <o:Column Ref="o164"/>
...@@ -7146,17 +7134,17 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7146,17 +7134,17 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o108"/> <o:Table Ref="o108"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o200"/> <o:Key Ref="o199"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o334"> <o:ReferenceJoin Id="o333">
<a:ObjectID>0E1DFD26-E9BE-4BAF-98E0-9624C82195E2</a:ObjectID> <a:ObjectID>0E1DFD26-E9BE-4BAF-98E0-9624C82195E2</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o195"/> <o:Column Ref="o194"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o163"/> <o:Column Ref="o163"/>
...@@ -7188,7 +7176,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7188,7 +7176,7 @@ tablespace USERS</a:PhysicalOptions>
<o:Key Ref="o175"/> <o:Key Ref="o175"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o335"> <o:ReferenceJoin Id="o334">
<a:ObjectID>078F6BCF-C5B0-47A8-A110-CFF5B5BDF624</a:ObjectID> <a:ObjectID>078F6BCF-C5B0-47A8-A110-CFF5B5BDF624</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
...@@ -7224,20 +7212,20 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7224,20 +7212,20 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o105"/> <o:Table Ref="o105"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o307"/> <o:Key Ref="o306"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o336"> <o:ReferenceJoin Id="o335">
<a:ObjectID>EB6600A7-5337-4313-9638-561D38A614E3</a:ObjectID> <a:ObjectID>EB6600A7-5337-4313-9638-561D38A614E3</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o288"/> <o:Column Ref="o287"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o196"/> <o:Column Ref="o195"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7266,7 +7254,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7266,7 +7254,7 @@ tablespace USERS</a:PhysicalOptions>
<o:Key Ref="o190"/> <o:Key Ref="o190"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o337"> <o:ReferenceJoin Id="o336">
<a:ObjectID>6B48DCD7-1986-4277-A221-9C04983557E8</a:ObjectID> <a:ObjectID>6B48DCD7-1986-4277-A221-9C04983557E8</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
...@@ -7276,7 +7264,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7276,7 +7264,7 @@ tablespace USERS</a:PhysicalOptions>
<o:Column Ref="o179"/> <o:Column Ref="o179"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o205"/> <o:Column Ref="o204"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7305,7 +7293,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7305,7 +7293,7 @@ tablespace USERS</a:PhysicalOptions>
<o:Key Ref="o120"/> <o:Key Ref="o120"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o338"> <o:ReferenceJoin Id="o337">
<a:ObjectID>9F88CF94-E919-4E35-8B5C-683774DE0A5D</a:ObjectID> <a:ObjectID>9F88CF94-E919-4E35-8B5C-683774DE0A5D</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
...@@ -7315,7 +7303,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7315,7 +7303,7 @@ tablespace USERS</a:PhysicalOptions>
<o:Column Ref="o118"/> <o:Column Ref="o118"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o206"/> <o:Column Ref="o205"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7342,20 +7330,20 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7342,20 +7330,20 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o104"/> <o:Table Ref="o104"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o307"/> <o:Key Ref="o306"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o339"> <o:ReferenceJoin Id="o338">
<a:ObjectID>8CD1C7D8-FE5A-42C1-BDB4-7E91A63B1827</a:ObjectID> <a:ObjectID>8CD1C7D8-FE5A-42C1-BDB4-7E91A63B1827</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o288"/> <o:Column Ref="o287"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o204"/> <o:Column Ref="o203"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7381,20 +7369,20 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7381,20 +7369,20 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o103"/> <o:Table Ref="o103"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o307"/> <o:Key Ref="o306"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o340"> <o:ReferenceJoin Id="o339">
<a:ObjectID>AB6028AB-159A-4958-9BB0-C3CFCF3FB0E3</a:ObjectID> <a:ObjectID>AB6028AB-159A-4958-9BB0-C3CFCF3FB0E3</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o288"/> <o:Column Ref="o287"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o211"/> <o:Column Ref="o210"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7423,7 +7411,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7423,7 +7411,7 @@ tablespace USERS</a:PhysicalOptions>
<o:Key Ref="o190"/> <o:Key Ref="o190"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o341"> <o:ReferenceJoin Id="o340">
<a:ObjectID>21DF597B-245A-4D2F-9CF3-906BA91AC12E</a:ObjectID> <a:ObjectID>21DF597B-245A-4D2F-9CF3-906BA91AC12E</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
...@@ -7433,7 +7421,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7433,7 +7421,7 @@ tablespace USERS</a:PhysicalOptions>
<o:Column Ref="o179"/> <o:Column Ref="o179"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o212"/> <o:Column Ref="o211"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7459,20 +7447,20 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7459,20 +7447,20 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o97"/> <o:Table Ref="o97"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o200"/> <o:Key Ref="o199"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o342"> <o:ReferenceJoin Id="o341">
<a:ObjectID>D740AF41-D977-4A95-900B-91FACD51CFE8</a:ObjectID> <a:ObjectID>D740AF41-D977-4A95-900B-91FACD51CFE8</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o195"/> <o:Column Ref="o194"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o235"/> <o:Column Ref="o234"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7498,20 +7486,20 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7498,20 +7486,20 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o97"/> <o:Table Ref="o97"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o307"/> <o:Key Ref="o306"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o343"> <o:ReferenceJoin Id="o342">
<a:ObjectID>5375CE4B-7FCF-4DEA-AA48-BE588316A1EC</a:ObjectID> <a:ObjectID>5375CE4B-7FCF-4DEA-AA48-BE588316A1EC</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o288"/> <o:Column Ref="o287"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o233"/> <o:Column Ref="o232"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7537,20 +7525,20 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7537,20 +7525,20 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o94"/> <o:Table Ref="o94"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o242"/> <o:Key Ref="o241"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o344"> <o:ReferenceJoin Id="o343">
<a:ObjectID>AD9CFD4C-42B8-4EBD-89A6-3D6A5A1D1E9D</a:ObjectID> <a:ObjectID>AD9CFD4C-42B8-4EBD-89A6-3D6A5A1D1E9D</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o239"/> <o:Column Ref="o238"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o251"/> <o:Column Ref="o250"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7576,20 +7564,20 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7576,20 +7564,20 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o94"/> <o:Table Ref="o94"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o247"/> <o:Key Ref="o246"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o345"> <o:ReferenceJoin Id="o344">
<a:ObjectID>1DE5AEE7-F57A-4FC2-B6FB-42BD82926470</a:ObjectID> <a:ObjectID>1DE5AEE7-F57A-4FC2-B6FB-42BD82926470</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o245"/> <o:Column Ref="o244"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o250"/> <o:Column Ref="o249"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7615,20 +7603,20 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7615,20 +7603,20 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o93"/> <o:Table Ref="o93"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o247"/> <o:Key Ref="o246"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o346"> <o:ReferenceJoin Id="o345">
<a:ObjectID>2ECB0BEE-A99D-402C-9E53-BBA694950614</a:ObjectID> <a:ObjectID>2ECB0BEE-A99D-402C-9E53-BBA694950614</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o245"/> <o:Column Ref="o244"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o257"/> <o:Column Ref="o256"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7654,20 +7642,20 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7654,20 +7642,20 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o90"/> <o:Table Ref="o90"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o279"/> <o:Key Ref="o278"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o347"> <o:ReferenceJoin Id="o346">
<a:ObjectID>3A349B3D-2B2D-4867-ADA1-0F2A9DF29D9B</a:ObjectID> <a:ObjectID>3A349B3D-2B2D-4867-ADA1-0F2A9DF29D9B</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o275"/> <o:Column Ref="o274"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o282"/> <o:Column Ref="o281"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7693,20 +7681,20 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7693,20 +7681,20 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o90"/> <o:Table Ref="o90"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o272"/> <o:Key Ref="o271"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o348"> <o:ReferenceJoin Id="o347">
<a:ObjectID>E3E932A1-3F8C-4310-8F1D-77CB63FDC13D</a:ObjectID> <a:ObjectID>E3E932A1-3F8C-4310-8F1D-77CB63FDC13D</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o264"/> <o:Column Ref="o263"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o283"/> <o:Column Ref="o282"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7732,20 +7720,20 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7732,20 +7720,20 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o89"/> <o:Table Ref="o89"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o322"/> <o:Key Ref="o321"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o349"> <o:ReferenceJoin Id="o348">
<a:ObjectID>98B2407D-632F-49AF-8708-B13D93266371</a:ObjectID> <a:ObjectID>98B2407D-632F-49AF-8708-B13D93266371</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o314"/> <o:Column Ref="o313"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o285"/> <o:Column Ref="o284"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7771,20 +7759,20 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7771,20 +7759,20 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o89"/> <o:Table Ref="o89"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o279"/> <o:Key Ref="o278"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o350"> <o:ReferenceJoin Id="o349">
<a:ObjectID>D235B270-BD7A-484D-A130-675DBF0F498D</a:ObjectID> <a:ObjectID>D235B270-BD7A-484D-A130-675DBF0F498D</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o275"/> <o:Column Ref="o274"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o286"/> <o:Column Ref="o285"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7810,20 +7798,20 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7810,20 +7798,20 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o88"/> <o:Table Ref="o88"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o311"/> <o:Key Ref="o310"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o351"> <o:ReferenceJoin Id="o350">
<a:ObjectID>51A45B28-C944-42DF-A638-037021311434</a:ObjectID> <a:ObjectID>51A45B28-C944-42DF-A638-037021311434</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o309"/> <o:Column Ref="o308"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o304"/> <o:Column Ref="o303"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7852,7 +7840,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7852,7 +7840,7 @@ tablespace USERS</a:PhysicalOptions>
<o:Key Ref="o137"/> <o:Key Ref="o137"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o352"> <o:ReferenceJoin Id="o351">
<a:ObjectID>C6D38A59-F81C-46C2-9AFC-2A5C746ECA9B</a:ObjectID> <a:ObjectID>C6D38A59-F81C-46C2-9AFC-2A5C746ECA9B</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
...@@ -7862,7 +7850,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7862,7 +7850,7 @@ tablespace USERS</a:PhysicalOptions>
<o:Column Ref="o135"/> <o:Column Ref="o135"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o291"/> <o:Column Ref="o290"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7891,7 +7879,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7891,7 +7879,7 @@ tablespace USERS</a:PhysicalOptions>
<o:Key Ref="o133"/> <o:Key Ref="o133"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o353"> <o:ReferenceJoin Id="o352">
<a:ObjectID>BE3B7B60-10E7-4EFA-8DBA-4AD9BE648C56</a:ObjectID> <a:ObjectID>BE3B7B60-10E7-4EFA-8DBA-4AD9BE648C56</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
...@@ -7901,7 +7889,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7901,7 +7889,7 @@ tablespace USERS</a:PhysicalOptions>
<o:Column Ref="o132"/> <o:Column Ref="o132"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o290"/> <o:Column Ref="o289"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7930,7 +7918,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7930,7 +7918,7 @@ tablespace USERS</a:PhysicalOptions>
<o:Key Ref="o133"/> <o:Key Ref="o133"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o354"> <o:ReferenceJoin Id="o353">
<a:ObjectID>359156FC-9C48-425C-8CA4-598639020732</a:ObjectID> <a:ObjectID>359156FC-9C48-425C-8CA4-598639020732</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
...@@ -7940,7 +7928,7 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7940,7 +7928,7 @@ tablespace USERS</a:PhysicalOptions>
<o:Column Ref="o132"/> <o:Column Ref="o132"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o289"/> <o:Column Ref="o288"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
...@@ -7966,27 +7954,27 @@ tablespace USERS</a:PhysicalOptions> ...@@ -7966,27 +7954,27 @@ tablespace USERS</a:PhysicalOptions>
<o:Table Ref="o88"/> <o:Table Ref="o88"/>
</c:ChildTable> </c:ChildTable>
<c:ParentKey> <c:ParentKey>
<o:Key Ref="o221"/> <o:Key Ref="o220"/>
</c:ParentKey> </c:ParentKey>
<c:Joins> <c:Joins>
<o:ReferenceJoin Id="o355"> <o:ReferenceJoin Id="o354">
<a:ObjectID>7ACAE0DA-EF71-4E68-AF94-C8D8C5FE4E93</a:ObjectID> <a:ObjectID>7ACAE0DA-EF71-4E68-AF94-C8D8C5FE4E93</a:ObjectID>
<a:CreationDate>1542263934</a:CreationDate> <a:CreationDate>1542263934</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263934</a:ModificationDate> <a:ModificationDate>1542263934</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<c:Object1> <c:Object1>
<o:Column Ref="o219"/> <o:Column Ref="o218"/>
</c:Object1> </c:Object1>
<c:Object2> <c:Object2>
<o:Column Ref="o306"/> <o:Column Ref="o305"/>
</c:Object2> </c:Object2>
</o:ReferenceJoin> </o:ReferenceJoin>
</c:Joins> </c:Joins>
</o:Reference> </o:Reference>
</c:References> </c:References>
<c:DefaultGroups> <c:DefaultGroups>
<o:Group Id="o356"> <o:Group Id="o355">
<a:ObjectID>5AF85F90-9460-49A3-B908-BFC7D1E7EB5F</a:ObjectID> <a:ObjectID>5AF85F90-9460-49A3-B908-BFC7D1E7EB5F</a:ObjectID>
<a:Name>PUBLIC</a:Name> <a:Name>PUBLIC</a:Name>
<a:Code>PUBLIC</a:Code> <a:Code>PUBLIC</a:Code>
...@@ -8000,18 +7988,18 @@ tablespace USERS</a:PhysicalOptions> ...@@ -8000,18 +7988,18 @@ tablespace USERS</a:PhysicalOptions>
</o:Group> </o:Group>
</c:DefaultGroups> </c:DefaultGroups>
<c:TargetModels> <c:TargetModels>
<o:TargetModel Id="o357"> <o:TargetModel Id="o356">
<a:ObjectID>9250A867-C3EB-4B64-A40C-34FE4E3C9ED8</a:ObjectID> <a:ObjectID>9250A867-C3EB-4B64-A40C-34FE4E3C9ED8</a:ObjectID>
<a:Name>ORACLE Version 11g</a:Name> <a:Name>ORACLE Version 11g</a:Name>
<a:Code>ORA11GR1</a:Code> <a:Code>ORA11GR1</a:Code>
<a:CreationDate>1542263555</a:CreationDate> <a:CreationDate>1542263555</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1542263555</a:ModificationDate> <a:ModificationDate>1545203978</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier> <a:Modifier>Administrator</a:Modifier>
<a:TargetModelURL>file:///%_DBMS%/ora11g.xdb</a:TargetModelURL> <a:TargetModelURL>file:///%_DBMS%/ora11g.xdb</a:TargetModelURL>
<a:TargetModelID>BAE632F3-AC04-4059-9893-259ABA89351C</a:TargetModelID> <a:TargetModelID>BAE632F3-AC04-4059-9893-259ABA89351C</a:TargetModelID>
<a:TargetModelClassID>4BA9F647-DAB1-11D1-9944-006097355D9B</a:TargetModelClassID> <a:TargetModelClassID>4BA9F647-DAB1-11D1-9944-006097355D9B</a:TargetModelClassID>
<a:TargetModelLastModificationDate>1537522101</a:TargetModelLastModificationDate> <a:TargetModelLastModificationDate>1355934917</a:TargetModelLastModificationDate>
<c:SessionShortcuts> <c:SessionShortcuts>
<o:Shortcut Ref="o3"/> <o:Shortcut Ref="o3"/>
</c:SessionShortcuts> </c:SessionShortcuts>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment