新增接口:合同信息表;

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/constant/ContractConstant.java

@@ -8,6 +8,30 @@ public class ContractConstant {
 	/** 实体名:合同表  */
 	public static final String ENTITY_CONTRACT = "com.xyst.dinas.contract.datamodel.Contract";
 	
+	/** 项目  */
+	public static final String PROJECT = "project";
+	/** 项目编号  */
+	public static final String PROJECT_CODE = "projectCode";
+	/** 区域公司  */
+	public static final String REGION_COMPANY = "regionCompany";
+	/** 区域公司名称  */
+	public static final String REGION_COMPANY_NAME = "regionCompanyName";
+	/** 购砂单位 */
+	public static final String PURCHASE_SAND_UNIT = "purchaseSandUnit";
+	/** 购砂单位名称 */
+	public static final String PURCHASE_SAND_UNIT_NAME = "purchaseSandUnitName";
+	/** 合同名称 */
+	public static final String CONTRACT_NAME = "contractName";
+	/** 合同编号 */
+	public static final String CONTRACT_CODE = "contractCode";
+	/** 版本号 */
+	public static final String CURRENT_VERSION = "currentVersion";
+	/** 合同状态 */
+	public static final String CONTRACT_STATE = "contractState";
+	
+	
+	
+	/*********************** 工作流 *************************************/
 	
 	/**
 	 * 流程配置

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/pojo/BaseEntity.java → backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/entity/BaseEntity.java

-package com.xyst.dinas.contract.pojo;
+package com.xyst.dinas.contract.entity;
 
 import java.io.Serializable;
 

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/entity/CommonResult.java

+package com.xyst.dinas.contract.entity;
+/**
+ * 通用返回结果
+ *
+ * @author Jackpot
+ * @date 2021年3月31日
+ */
+public class CommonResult {
+	
+
+	private String code;
+	private String message;
+	
+	public static final CommonResult SUCCESS_RESULT = new CommonResult("200000", "success");
+	
+	public static final CommonResult FAIL_RESULT = new CommonResult("500000", "fail");
+	
+	public CommonResult(String code, String message) {
+		this.code = code;
+		this.message = message;
+	}
+	
+	public CommonResult(String message) {
+		this.message = message;
+	}
+	
+	public String getCode() {
+		return code;
+	}
+	public void setCode(String code) {
+		this.code = code;
+	}
+	public String getMessage() {
+		return message;
+	}
+	public void setMessage(String message) {
+		this.message = message;
+	}
+	
+}

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/entity/ContractInfoEntity.java

+package com.xyst.dinas.contract.entity;
+
+import java.util.UUID;
+
+import com.beecode.bcp.type.json.JSONObjectUtils;
+import com.fasterxml.jackson.databind.JsonNode;
+/**
+ * 合同信息表
+ *
+ * @author Jackpot
+ * @date 2021年3月31日
+ */
+public class ContractInfoEntity {
+
+	
+	/** 项目  */
+	private UUID  project;
+	/** 项目编号  */
+	private String projectCode;
+	/** 区域公司  */
+	private UUID regionCompany;
+	/** 区域公司名称  */
+	private String regionCompanyName;
+	/** 购砂单位 */
+	private UUID purchaseSandUnit;
+	/** 购砂单位名称 */
+	private String purchaseSandUnitName;
+	/** 合同名称 */
+	private String contractName;
+	/** 合同编号 */
+	private String contractCode;
+	/** 版本号 */
+	private Long currentVersion;
+	/** 合同状态 */
+	private String contractState;
+	
+	
+	public UUID getProject() {
+		return project;
+	}
+	public void setProject(UUID project) {
+		this.project = project;
+	}
+	public String getProjectCode() {
+		return projectCode;
+	}
+	public void setProjectCode(String projectCode) {
+		this.projectCode = projectCode;
+	}
+	public UUID getRegionCompany() {
+		return regionCompany;
+	}
+	public void setRegionCompany(UUID regionCompany) {
+		this.regionCompany = regionCompany;
+	}
+	public String getRegionCompanyName() {
+		return regionCompanyName;
+	}
+	public void setRegionCompanyName(String regionCompanyName) {
+		this.regionCompanyName = regionCompanyName;
+	}
+	public UUID getPurchaseSandUnit() {
+		return purchaseSandUnit;
+	}
+	public void setPurchaseSandUnit(UUID purchaseSandUnit) {
+		this.purchaseSandUnit = purchaseSandUnit;
+	}
+	public String getPurchaseSandUnitName() {
+		return purchaseSandUnitName;
+	}
+	public void setPurchaseSandUnitName(String purchaseSandUnitName) {
+		this.purchaseSandUnitName = purchaseSandUnitName;
+	}
+	public String getContractName() {
+		return contractName;
+	}
+	public void setContractName(String contractName) {
+		this.contractName = contractName;
+	}
+	public String getContractCode() {
+		return contractCode;
+	}
+	public void setContractCode(String contractCode) {
+		this.contractCode = contractCode;
+	}
+	public Long getCurrentVersion() {
+		return currentVersion;
+	}
+	public void setCurrentVersion(Long currentVersion) {
+		this.currentVersion = currentVersion;
+	}
+	public String getContractState() {
+		return contractState;
+	}
+	public void setContractState(String contractState) {
+		this.contractState = contractState;
+	}
+	
+	
+}

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

@@ -15,7 +15,6 @@ import org.springframework.stereotype.Repository;
 
 import com.beecode.bcp.type.KObject;
 import com.xyst.dinas.contract.constant.ContractConstant;
-import com.xyst.dinas.contract.pojo.ContractEntity;
 
 @Repository
 public class ContractInfoDao {
@@ -66,7 +65,7 @@ public class ContractInfoDao {
 		});
 		if(contracts==null ||contracts.isEmpty()) return projectSet;
 		for (KObject contract : contracts) {
-			UUID projectId = contract.getUuid(ContractEntity.PROJECT);
+			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

@@ -8,8 +8,10 @@ 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;
 
@@ -23,6 +25,23 @@ public class ContractServiceImpl implements ContractService{
 	@Autowired
 	private ContractInfoDao contractInfoDao;
 	
+
+	public UUID create(KObject kObject) {
+		return contractInfoDao.create(kObject);
+	}
+	
+	public void update(KObject kobject) {
+		contractInfoDao.update(kobject);
+	}
+
+	public KObject queryContractInfo(UUID id) {
+		
+		KObject obj = contractInfoDao.load(id);
+//		ContractInfoEntity contractInfoobject = obj.toObject(ContractInfoEntity.class);
+		return obj;
+	}
+
+	
 	@Override
 	public void submitFlow(UUID id) {
 		KObject kobject = contractInfoDao.load(id);

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/pojo/ContractEntity.java

-package com.xyst.dinas.contract.pojo;
-
-public class ContractEntity {
-
-	/** 实体名:合同表  */
-	public static final String ENTITY_CONTRACT = "com.xyst.dinas.contract.datamodel.Contract";
-	
-	/** 项目  */
-	public static final String PROJECT = "project";
-}

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

@@ -3,8 +3,18 @@ package com.xyst.dinas.contract.service;
 import java.util.Set;
 import java.util.UUID;
 
+import com.beecode.bcp.type.KObject;
+
 public interface ContractService {
 	
+	
+	UUID create(KObject kObject);
+	
+	void update(KObject kobject);
+
+	KObject queryContractInfo(UUID id);
+	
+
 	void submitFlow(UUID id);
 
 	/**

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

@@ -13,7 +13,13 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.xyst.dinas.contract.pojo.BaseEntity;
+import com.beecode.amino.core.Amino;
+import com.beecode.bcp.type.KClass;
+import com.beecode.bcp.type.KObject;
+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.service.ContractService;
 
 @RestController
@@ -24,6 +30,29 @@ public class ContractController {
 	@Autowired
 	private ContractService contractService;
 
+	@PostMapping("/contract/create")
+	public UUID create(@RequestBody String contractInfo) {
+		KClass type = Amino.getApplicationMetadataContext().getBean(ContractConstant.ENTITY_CONTRACT_INFO, KClass.class);
+		KObject kObject = JSONObjectUtils.toObject(contractInfo, type);
+		return contractService.create(kObject);
+	}
+	
+	@PostMapping("/contract/update")
+	public CommonResult update(@RequestBody String contractInfo) {
+		KClass type = Amino.getApplicationMetadataContext().getBean(ContractConstant.ENTITY_CONTRACT_INFO, KClass.class);
+		KObject kObject = JSONObjectUtils.toObject(contractInfo, type);
+		contractService.update(kObject);
+		return CommonResult.SUCCESS_RESULT;
+	}
+
+	@GetMapping("/contract/{contractId}")
+	public KObject queryContractInfo(@PathVariable UUID contractId) {
+		
+		KObject contractInfo = contractService.queryContractInfo(contractId);
+		return contractInfo;
+	}
+	
+	
 	@PostMapping("/contract/submitFlow")
 	public Object submitFlow(@RequestBody BaseEntity baseEntity) {
 		UUID id = UUID.fromString(baseEntity.getId());

backend/xyst.dinas.contract/src/main/resources/config/Contract.hbm.xml

@@ -9,7 +9,7 @@
 		<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
 		
         <id name="id" type="uuid-binary" column="id" length="16">
-            <generator class="assigned" />
+            <generator class="uuid2" />
         </id>
         <version name="version" type="int" column="version"/>
         <property name="createTime" type="timestamp" not-null="false">

backend/xyst.dinas.contract/src/main/resources/config/ContractInfo.hbm.xml

@@ -9,7 +9,7 @@
 		<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
 		
         <id name="id" type="uuid-binary" column="id" length="16">
-            <generator class="assigned" />
+            <generator class="uuid2" />
         </id>
         <version name="version" type="int" column="version"/>
         <property name="createTime" type="timestamp" not-null="false">