完善接口:根据购砂单位ID 查询所有合同列表里的项目ID列表;

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-	<id>ac569325-c7e8-486b-8e51-48076332105b</id>
+	<id>bc8d9a39-a5ec-4b9e-99c5-0943cef8e89a</id>
 	<name>com.xyst.dinas.biz.bill.Organization$sequence</name>
 	<title>组织机构$sequence</title>
 	<description>组织机构</description>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-	<id>ffd811fc-211d-4cb9-a1b6-b6eaa0bf47e2</id>
+	<id>ba3c30a9-6740-4ef5-94bd-f7813a6b5a18</id>
 	<name>com.xyst.dinas.biz.bill.Organization$serial</name>
 	<title>组织机构$serial</title>
 	<description>组织机构</description>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-	<id>ca3deef8-6445-48e3-b658-9a46100c3194</id>
+	<id>d0afc8ec-00a9-441b-af1f-7dc0faacc8cb</id>
 	<name>com.xyst.dinas.biz.bill.Organization</name>
 	<title>组织机构</title>
 	<description>组织机构</description>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-	<id>81835d20-27a1-4491-97b3-d1115dd0891c</id>
+	<id>a3c621f0-ee3d-4d8c-894a-8490d569c8bf</id>
 	<name>com.xyst.dinas.biz.bill.Position$sequence</name>
 	<title>岗位$sequence</title>
 	<description>岗位</description>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-	<id>375bd2ab-87dc-4490-826f-c896b8b53fca</id>
+	<id>9b4f79f2-10f6-4edf-86a6-01ff7fe1e87e</id>
 	<name>com.xyst.dinas.biz.bill.Position$serial</name>
 	<title>岗位$serial</title>
 	<description>岗位</description>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-	<id>df4466df-e189-4329-89ad-37bf94f04cf3</id>
+	<id>1a14a0e5-9122-4080-ae05-428224dc321c</id>
 	<name>com.xyst.dinas.biz.bill.Position</name>
 	<title>岗位</title>
 	<description>岗位</description>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-	<id>87af8186-faee-4d71-b3cb-66e840658bcd</id>
+	<id>14b1baf2-6856-4fca-81a8-1cff30c4b73f</id>
 	<name>com.xyst.dinas.biz.bill.ShipInfo$sequence</name>
 	<title>船舶备案$sequence</title>
 	<description>船舶备案</description>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-	<id>4f87b62f-a731-4989-81c2-b7901076d614</id>
+	<id>c0a6a1e2-dc8a-4815-ba00-1da4686ae544</id>
 	<name>com.xyst.dinas.biz.bill.ShipInfo$serial</name>
 	<title>船舶备案$serial</title>
 	<description>船舶备案</description>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-	<id>eb8c565d-dd92-433c-b5f9-d86221c5bb96</id>
+	<id>b97bf78e-b7cc-408c-a2fc-710d8fa02de8</id>
 	<name>com.xyst.dinas.biz.bill.ShipInfo</name>
 	<title>船舶备案</title>
 	<description>船舶备案</description>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-	<id>0f21e647-97f8-4bcd-9eee-af21f84e0da5</id>
+	<id>4d399e2e-b519-46a2-95c5-e720fe4473a7</id>
 	<name>com.xyst.dinas.biz.bill.Station$sequence</name>
 	<title>场站$sequence</title>
 	<description>场站</description>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-	<id>91db4b70-17e0-444d-8167-70d65a436d43</id>
+	<id>aa047cf4-67d2-473b-8b94-081eacded787</id>
 	<name>com.xyst.dinas.biz.bill.Station$serial</name>
 	<title>场站$serial</title>
 	<description>场站</description>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-	<id>0af388fc-eb01-4361-b4b3-b4cd17ef98fe</id>
+	<id>f28290ba-9b0f-4a24-bfc2-7afcd5c97160</id>
 	<name>com.xyst.dinas.biz.bill.Station</name>
 	<title>场站</title>
 	<description>场站</description>

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/dao/ContractInfoDao.java

 package com.xyst.dinas.contract.internal.dao;
 
-import java.util.HashSet;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Set;
+import java.util.Map;
 import java.util.UUID;
 
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.query.Query;
+import org.json.JSONArray;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.orm.hibernate5.HibernateCallback;
 import org.springframework.orm.hibernate5.HibernateOperations;
 import org.springframework.stereotype.Repository;
 
 import com.beecode.bcp.type.KObject;
+import com.jiuqi.np.util.DateUtil;
 import com.xyst.dinas.contract.constant.ContractConstant;
+import com.xyst.dinas.contract.enumeration.ContractStateEnum;
 
 @Repository
 public class ContractInfoDao {
@@ -52,23 +56,66 @@ public class ContractInfoDao {
 		});
 	}
 	
-	public Set<String> getProjectListByPurSandId(UUID purchaseSandId) {
+	
+	private String QUERY_HQL = 
+			"from " + ContractConstant.ENTITY_CONTRACT + " where contractState =:contractState and purchaseSandUnit.id =:purchaseSandUnit ";
+	
+	public JSONArray getProjectListByPurSandId(UUID purchaseSandId,UUID projectType,String projectName) {
 		
-		HashSet<String> projectSet = new HashSet<>();
-		List<KObject> contracts = template.execute(new HibernateCallback<List<KObject>>() {
-			@Override
-			public List<KObject> doInHibernate(Session session) throws HibernateException {
-				Query<KObject> query = session.createQuery("from " + ContractConstant.ENTITY_CONTRACT + " where valid = 1 and purchaseSandUnit.id =:purchaseSandUnit", KObject.class);
-				query.setParameter("purchaseSandUnit", purchaseSandId);
-				return query.getResultList();
+		JSONArray result = 
+		template.execute(session -> {
+			
+			JSONArray jsonArray = new JSONArray();
+			StringBuilder hql = new StringBuilder(QUERY_HQL);
+			if(projectType!=null) hql.append(" and project.projectType.id =:projectType");
+			if(projectName!=null) hql.append(" and project.projectName like :projectName");
+			
+			Query<KObject> query = session.createQuery(hql.toString(), KObject.class);//KObject
+			query.setParameter("purchaseSandUnit", purchaseSandId);
+			query.setParameter("contractState", ContractStateEnum.EXECUTING.getCode());//只查询执行中状态的合同
+			if(projectType!=null) query.setParameter("projectType", projectType);
+			if(projectName!=null) query.setParameter("projectName", "%"+projectName+"%");
+			List<KObject> list = query.list();
+			
+			for (int i = 0; i < list.size(); i++) {
+				KObject contract = list.get(i);
+				KObject project = contract.get("project");
+				
+				UUID projectId = project.getUuid("id");
+				String projectNameWhole = project.getString("projectName");
+				Date createTime = project.getDate("createTime");
+				String projectNum = project.getString("projectNum");
+				String projectTypeName = project.get("projectType").getString("name");
+				
+				Map<String, Object> map = new HashMap<>();
+				map.put("projectId", projectId);
+				map.put("projectNameWhole", projectNameWhole);
+				map.put("projectTypeName", projectTypeName);
+				map.put("createTime", DateUtil.dateTime2String(createTime));
+				map.put("projectNum", projectNum);
+				jsonArray.put(map);
 			}
+			return jsonArray;
+		});
+		return result;
+	}
+	
+	public List<KObject> getProjectListByPurSand(UUID purchaseSandId,UUID projectType,String projectName) {
+		
+		return template.execute(session -> {
+			
+			StringBuilder hql = new StringBuilder(QUERY_HQL);
+			if(projectType!=null) hql.append(" and project.projectType.id =:projectType");
+			if(projectName!=null) hql.append(" and project.projectName like :projectName");
+			
+			Query<KObject> query = session.createQuery(hql.toString(), KObject.class);//KObject
+			query.setParameter("purchaseSandUnit", purchaseSandId);
+			query.setParameter("contractState", ContractStateEnum.EXECUTING.getCode());//只查询执行中状态的合同
+			if(projectType!=null) query.setParameter("projectType", projectType);
+			if(projectName!=null) query.setParameter("projectName", "%"+projectName+"%");
+			List<KObject> list = query.list();
+			return list;
 		});
-		if(contracts==null ||contracts.isEmpty()) return projectSet;
-		for (KObject contract : contracts) {
-			UUID projectId = contract.getUuid(ContractConstant.PROJECT);
-			projectSet.add(projectId.toString());
-		}
-		return projectSet;
 	}
 	
 	

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/service/ContractServiceImpl.java

 package com.xyst.dinas.contract.internal.service;
 
-import java.util.Set;
 import java.util.UUID;
 
+import org.json.JSONArray;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.beecode.bcp.type.KObject;
-import com.beecode.bcp.type.json.JSONObjectUtils;
 import com.beecode.inz.workflow.service.InzWorkflowService;
 import com.xyst.dinas.contract.constant.ContractConstant;
-import com.xyst.dinas.contract.entity.ContractInfoEntity;
 import com.xyst.dinas.contract.internal.dao.ContractInfoDao;
 import com.xyst.dinas.contract.service.ContractService;
 
@@ -63,9 +61,9 @@ public class ContractServiceImpl implements ContractService{
 	}
 	
 	@Override
-	public Set<String> getProjectListByPurSandId(UUID purchaseSandId) {
+	public JSONArray getProjectListByPurSandId(UUID purchaseSandId,UUID projectType,String projectName) {
 		
-		return contractInfoDao.getProjectListByPurSandId(purchaseSandId);
+		return contractInfoDao.getProjectListByPurSandId(purchaseSandId,projectType,projectName);
 	}
 	
 	public void bill() {

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/request/ProjectListQuery.java

+package com.xyst.dinas.contract.request;
+
+import java.util.UUID;
+
+public class ProjectListQuery {
+
+	
+	private UUID purchaseSandId;
+	private UUID projectType;
+	private String projectName;
+	
+	
+	public UUID getPurchaseSandId() {
+		return purchaseSandId;
+	}
+	public void setPurchaseSandId(UUID purchaseSandId) {
+		this.purchaseSandId = purchaseSandId;
+	}
+	public UUID getProjectType() {
+		return projectType;
+	}
+	public void setProjectType(UUID projectType) {
+		this.projectType = projectType;
+	}
+	public String getProjectName() {
+		return projectName;
+	}
+	public void setProjectName(String projectName) {
+		this.projectName = projectName;
+	}
+	
+	
+}

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/service/ContractService.java

 package com.xyst.dinas.contract.service;
 
-import java.util.Set;
 import java.util.UUID;
 
+import org.json.JSONArray;
+
 import com.beecode.bcp.type.KObject;
 
 public interface ContractService {
@@ -17,10 +18,13 @@ public interface ContractService {
 
 	void submitFlow(UUID id);
 
-	/**
+	 /**
 	 * 根据购砂单位ID 查询所有合同列表里的项目ID列表
+	 * 
 	 * @param purchaseSandId	购砂单位ID
+	 * @param projectType	项目类型
+	 * @param projectName	项目名称
 	 * @return
 	 */
-	Set<String> getProjectListByPurSandId(UUID purchaseSandId);
+	JSONArray getProjectListByPurSandId(UUID purchaseSandId,UUID projectType,String projectName);
 }

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/web/ContractController.java

 package com.xyst.dinas.contract.web;
 
-import java.util.Set;
+import java.util.List;
 import java.util.UUID;
 
-import org.json.JSONObject;
+import org.json.JSONArray;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +20,8 @@ import com.beecode.bcp.type.json.JSONObjectUtils;
 import com.xyst.dinas.contract.constant.ContractConstant;
 import com.xyst.dinas.contract.entity.BaseEntity;
 import com.xyst.dinas.contract.entity.CommonResult;
+import com.xyst.dinas.contract.internal.dao.ContractInfoDao;
+import com.xyst.dinas.contract.request.ProjectListQuery;
 import com.xyst.dinas.contract.service.ContractService;
 
 @RestController
@@ -29,7 +31,9 @@ public class ContractController {
 	
 	@Autowired
 	private ContractService contractService;
-
+	@Autowired
+	private ContractInfoDao contractInfoDao;
+	
 	@PostMapping("/contract/create")
 	public UUID create(@RequestBody String contractInfo) {
 		KClass type = Amino.getApplicationMetadataContext().getBean(ContractConstant.ENTITY_CONTRACT_INFO, KClass.class);
@@ -62,15 +66,29 @@ public class ContractController {
 	
 	
 	//根据购砂单位ID 查询所有合同列表里的项目ID列表
-	@GetMapping("/sand/user/projectList/{purchaseSandId}")
-	public String getProjectListByPurSandId(@PathVariable String purchaseSandId) {
+	@PostMapping("/sand/user/projectList")
+	public String getProjectListByPurSandId(@RequestBody ProjectListQuery projectListQuery) {
 		
-		UUID id = UUID.fromString(purchaseSandId);
-		Set<String> projectList = contractService.getProjectListByPurSandId(id);
-		JSONObject jsonObject = new JSONObject(projectList);
-		return jsonObject.toString();
+		JSONArray projectList = contractService.getProjectListByPurSandId(projectListQuery.getPurchaseSandId(),
+				projectListQuery.getProjectType(),projectListQuery.getProjectName());
+		return projectList.toString();
+	}
+	
+	@PostMapping("/sand/user/projectList2")
+	public List<KObject> getProjectListByPurSand(@RequestBody ProjectListQuery projectListQuery) {
+		
+		return contractInfoDao.getProjectListByPurSand(projectListQuery.getPurchaseSandId(),
+				projectListQuery.getProjectType(),projectListQuery.getProjectName());
 	}
 
+	//统计查询
+	@PostMapping("/contract/statistics")
+	public Object statisticsQuery(@RequestBody BaseEntity baseEntity) {
+		//TODO
+		//合同数量, 未执行,执行中,已完成 
+		
+		return baseEntity;
+	}
 
 	
 }
\ No newline at end of file

backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/datamodel/Contract.mk

@@ -107,7 +107,9 @@
 			<attribute id='0933ceb1-f327-4372-a316-cffa1c80991a' name='valid' columnName='valid' title='是否生效' type='boolean' default='' precision='' isArray='false'>
  				<annotation id='6f08f4ca-1f77-4ed4-a627-0fb8843959fa' attributeId='dfbeaa83-63dc-4638-b55a-8dda62d74dd4' name='length' value='1'></annotation>
 			</attribute>
-			
+       		<attribute id='c4154a1b-f727-48cf-9ef0-ad1bee512504' name='contractId' columnName='contract_id' title='合同表ID' type='uuid' default='' precision='' isArray='false'>
+        			<annotation id='00caecc1-35aa-4342-90c8-250f84609fe4' attributeId='55efd3f5-036a-4ac4-83c9-14e22cf5465a' name='length' value='undefined'></annotation>
+       		</attribute>
 			
        		<childModel id='57fa34cf-59f3-4be6-98bb-3e87853471ee' attributeId='06a76145-09c6-4e83-b91e-66aec616b9ca' refParentAttributeId='233c82e2-e7b6-49fc-96cc-bb947ba2cc99' 
        			name='ContractDetail' tableName='xyst_dinas_contract_detail' domainInherit='' title='合同子表' >

backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-	<id>017ee2aa-95b0-40ef-a7a3-73ab1e88cc8a</id>
+	<id>8fb38300-8294-43f5-99b8-42fd1a45cbdb</id>
 	<name>com.xyst.dinas.contract.bill.ContractBill$sequence</name>
 	<title>合同单据$sequence</title>
 	<description>合同单据</description>

backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-	<id>9ca34019-5db1-4ea3-bf06-4cd9dd1967c7</id>
+	<id>9f4808fa-6a5b-45a7-9945-409a61d8522e</id>
 	<name>com.xyst.dinas.contract.bill.ContractBill$serial</name>
 	<title>合同单据$serial</title>
 	<description>合同单据</description>

backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-	<id>2b049643-1cd9-49e7-bf36-4d56a351738a</id>
+	<id>52005496-bcfc-4787-b09b-375164114f82</id>
 	<name>com.xyst.dinas.contract.bill.ContractBill</name>
 	<title>合同单据</title>
 	<description>合同单据</description>

backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/Contract.jmx

@@ -375,6 +375,15 @@
 					<m:default></m:default>
 				</m:attribute>
 				<m:attribute>
+					<m:annotations/>
+					<m:id>c4154a1b-f727-48cf-9ef0-ad1bee512504</m:id>
+					<m:name>contractId</m:name>
+					<m:title>合同表ID</m:title>
+					<m:type>uuid</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<m:attribute>
 					<m:annotations>
 						<m:annotation>
 							<m:type>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</m:type>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-	<id>e9c775fb-370b-4a21-9875-043909487b3f</id>
+	<id>8b99fed2-9909-416e-b796-61bce8eb6c63</id>
 	<name>com.xyst.dinas.oa.bill.BusinessTripApply$sequence</name>
 	<title>出差申请$sequence</title>
 	<description>出差申请</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-	<id>7af59fc7-89f3-4c7c-923f-c7ed696c4d5a</id>
+	<id>47ebfa70-cf74-458d-9ffd-93c829e7cdac</id>
 	<name>com.xyst.dinas.oa.bill.BusinessTripApply$serial</name>
 	<title>出差申请$serial</title>
 	<description>出差申请</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-	<id>65851922-c35b-4e1e-9e4d-cb296c426d24</id>
+	<id>003acde0-aaf1-44fd-91ee-e1588819492b</id>
 	<name>com.xyst.dinas.oa.bill.BusinessTripApply</name>
 	<title>出差申请</title>
 	<description>出差申请</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-	<id>1f1c7ce5-552c-45e9-9abd-853950a0c79a</id>
+	<id>42d9db44-0200-49ea-9c57-f1b5ada53183</id>
 	<name>com.xyst.dinas.oa.bill.ProtocolDocument$sequence</name>
 	<title>拟文$sequence</title>
 	<description>拟文</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-	<id>fbf57700-a4b5-4e2e-9685-a057ab91a6ff</id>
+	<id>bd69df3d-fa95-4f50-8612-79f1ae487efe</id>
 	<name>com.xyst.dinas.oa.bill.ProtocolDocument$serial</name>
 	<title>拟文$serial</title>
 	<description>拟文</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-	<id>18b54902-5d46-498f-802a-70b89f9a9a8b</id>
+	<id>88978f1b-109b-4c65-9d92-10f18d3bd6f4</id>
 	<name>com.xyst.dinas.oa.bill.ProtocolDocument</name>
 	<title>拟文</title>
 	<description>拟文</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-	<id>5034633e-3e53-4e00-9914-e627e42230b0</id>
+	<id>c3a6773c-b5e4-4746-a8c6-438434edc7cd</id>
 	<name>com.xyst.dinas.oa.bill.SealBorrow$sequence</name>
 	<title>证章借出$sequence</title>
 	<description>证章借出</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-	<id>53441ac4-028f-4961-8213-e44965e9d3f8</id>
+	<id>1153438f-22f2-40d7-a87b-15881e1fa265</id>
 	<name>com.xyst.dinas.oa.bill.SealBorrow$serial</name>
 	<title>证章借出$serial</title>
 	<description>证章借出</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-	<id>c029c23d-2ac9-4e3d-b986-115820b3dcd8</id>
+	<id>374c0efa-6954-4679-8561-5415920e0278</id>
 	<name>com.xyst.dinas.oa.bill.SealBorrow</name>
 	<title>证章借出</title>
 	<description>证章借出</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-	<id>650ac720-bc98-46b8-aceb-b4ab3e727474</id>
+	<id>2628bbcb-3529-4b96-a475-75c4ff8fe02f</id>
 	<name>com.xyst.dinas.oa.bill.UseCarApply$sequence</name>
 	<title>用车申请$sequence</title>
 	<description>用车申请</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-	<id>52f5db03-d739-4549-bce6-0f6a43710bd9</id>
+	<id>b012dabe-baae-4bd3-b32a-a076aa78b97e</id>
 	<name>com.xyst.dinas.oa.bill.UseCarApply$serial</name>
 	<title>用车申请$serial</title>
 	<description>用车申请</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-	<id>1a9920f3-4560-44a0-9686-51afcf968383</id>
+	<id>28ea0206-30c7-4062-b100-3f826be962c8</id>
 	<name>com.xyst.dinas.oa.bill.UseCarApply</name>
 	<title>用车申请</title>
 	<description>用车申请</description>

backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/ProjectFiled$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-	<id>90ab6ca4-6658-415a-a90f-784d62e487eb</id>
+	<id>619a7df5-451a-4968-bf06-d0c556d929ff</id>
 	<name>com.xyst.dinas.project.bill.ProjectFiled$sequence</name>
 	<title>项目备案$sequence</title>
 	<description>项目备案</description>

backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/ProjectFiled$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-	<id>08dd6a22-2cd6-47eb-8682-7b9900a33eb9</id>
+	<id>3dd15f46-81ce-43ea-a3fd-52a17d10465c</id>
 	<name>com.xyst.dinas.project.bill.ProjectFiled$serial</name>
 	<title>项目备案$serial</title>
 	<description>项目备案</description>

backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/ProjectFiled.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-	<id>9c650372-bf78-405d-99d8-70ee12117093</id>
+	<id>26095486-e958-4d9e-bd16-a649c177237c</id>
 	<name>com.xyst.dinas.project.bill.ProjectFiled</name>
 	<title>项目备案</title>
 	<description>项目备案</description>

backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/PurchaseSandCompany$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-	<id>46c1d473-eac0-4c9a-8c44-6c4df153d5c2</id>
+	<id>6c6390e0-ce26-47cf-8d8a-586fa26f8f04</id>
 	<name>com.xyst.dinas.project.bill.PurchaseSandCompany$sequence</name>
 	<title>购砂单位$sequence</title>
 	<description>购砂单位</description>

backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/PurchaseSandCompany$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-	<id>3130db51-b022-47e0-bffc-6790d27f9355</id>
+	<id>1a5b9844-78c3-45dc-a1d4-df13ee4b73be</id>
 	<name>com.xyst.dinas.project.bill.PurchaseSandCompany$serial</name>
 	<title>购砂单位$serial</title>
 	<description>购砂单位</description>

backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/PurchaseSandCompany.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-	<id>5258ba71-bdb8-45eb-b9b0-54a0ce184c57</id>
+	<id>2883b05c-9100-48f8-bfb3-2e9767555f6b</id>
 	<name>com.xyst.dinas.project.bill.PurchaseSandCompany</name>
 	<title>购砂单位</title>
 	<description>购砂单位</description>