提交合同后端

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

@@ -79,7 +79,9 @@ public class ContractDao {
 		String contractState = contractStatisticsQuery.getContractState();
 		UUID projectId = contractStatisticsQuery.getProjectId();
 		UUID purchaseSandUnitId = contractStatisticsQuery.getPurchaseSandUnitId();
-		Date signDate = contractStatisticsQuery.getSignDate();
+		Date signDateStart = contractStatisticsQuery.getSignStartDate();
+		Date signDateEnd = contractStatisticsQuery.getSignEndDate();
+		Integer approveState = contractStatisticsQuery.getApproveState();
 		
 		StringBuilder hql = new StringBuilder("select ");
 		hql.append("count(DISTINCT m.contractId), ");//合同总数
@@ -88,11 +90,14 @@ public class ContractDao {
 		hql.append("sum(case when m.contractState='COMPLETED' then 1 else 0 end) ");//已完成
 //		hql.append("sum(case when m.contract_state=\"MODIFIED\" then 1 else 0 end) ");//已变更
 		hql.append("from ").append(ContractConstant.ENTITY_CONTRACT).append(" as m where 1=1 ");
+		hql.append("and (discard is null or discard = 0) ");
 		if(contractName!=null)	hql.append("and contractName like :contractName ");
 		if(contractState!=null)	hql.append("and contractState =:contractState ");
 		if(projectId!=null)	hql.append("and projectId =:projectId ");
 		if(purchaseSandUnitId!=null)	hql.append("and purchaseSandUnitId =:purchaseSandUnitId ");
-		if(signDate!=null)	hql.append("and signDate =:signDate ");
+		if(signDateStart!=null)	hql.append("and signDateStart >=:signDateStart ");
+		if(signDateEnd!=null)	hql.append("and signDateEnd <=:signDateEnd ");
+		if(approveState!=null)	hql.append("and approveState <=:approveState ");
 		return template.execute(session -> {
 			
 			Query<Tuple> query = session.createQuery(hql.toString(), Tuple.class);
@@ -100,7 +105,9 @@ public class ContractDao {
 			if(contractState!=null)	query.setParameter("contractState", contractState);
 			if(projectId!=null)	query.setParameter("projectId", projectId);
 			if(purchaseSandUnitId!=null)	query.setParameter("purchaseSandUnitId", purchaseSandUnitId);
-			if(signDate!=null)	query.setParameter("signDate", signDate);
+			if(signDateStart!=null)	query.setParameter("signDateStart", signDateStart);
+			if(signDateEnd!=null)	query.setParameter("signDateEnd", signDateEnd);
+			if(approveState!=null)	query.setParameter("approveState", approveState);
 			
 			List<Tuple> list = query.list();
 			JSONObject jsonObject = new JSONObject();
@@ -108,9 +115,9 @@ public class ContractDao {
 			Tuple tuple = list.get(0);
  
 			long totalCount = tuple.get(0, Long.class);
-			long unExecuteCount = tuple.get(1, Long.class);
-			long executingCount = tuple.get(2, Long.class);
-			long completedCount = tuple.get(3, Long.class);
+			long unExecuteCount = totalCount>0?tuple.get(1, Long.class):0;
+			long executingCount = totalCount>0?tuple.get(2, Long.class):0;
+			long completedCount = totalCount>0?tuple.get(3, Long.class):0;
 			
 			jsonObject.put("totalCount", totalCount);
 			jsonObject.put("unExecuteCount", unExecuteCount);

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

@@ -9,8 +9,9 @@ public class ContractStatisticsQuery {
 	private UUID purchaseSandUnitId;
 	private String contractName;
 	private String contractState;
-	private Date signDate;
-	
+	private Date signStartDate;
+	private Date signEndDate;
+	private Integer approveState;
 	
 	public UUID getProjectId() {
 		return projectId;
@@ -36,13 +37,23 @@ public class ContractStatisticsQuery {
 	public void setContractState(String contractState) {
 		this.contractState = contractState;
 	}
-	public Date getSignDate() {
-		return signDate;
+	public Date getSignStartDate() {
+		return signStartDate;
 	}
-	public void setSignDate(Date signDate) {
-		this.signDate = signDate;
+	public void setSignStartDate(Date signStartDate) {
+		this.signStartDate = signStartDate;
+	}
+	public Date getSignEndDate() {
+		return signEndDate;
+	}
+	public void setSignEndDate(Date signEndDate) {
+		this.signEndDate = signEndDate;
+	}
+	public Integer getApproveState() {
+		return approveState;
+	}
+	public void setApproveState(int approveState) {
+		this.approveState = approveState;
 	}
 	
-	
-
 }

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

@@ -134,7 +134,7 @@ public class ContractController {
 	}
 
 	// 统计查询:合同数量, 未执行,执行中,已完成
-	@PostMapping("/contract/statistics")
+	@PostMapping("/contract/count")
 	public String statisticsQuery(@RequestBody ContractStatisticsQuery contractStatisticsQuery) {
 		// 
 		JSONObject statisticsQuery = contractDao.statisticsQuery(contractStatisticsQuery);

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

@@ -22,12 +22,6 @@
         <defaultExecute></defaultExecute>
         <hide></hide>
       </innerScene>
-      <innerScene title='默认部分'>
-        <id>cb80f579-e0d1-49b2-9528-8dff2466aef6</id>
-        <javaImplement>com.xyst.dinas.contract.internal.scene.ContractListDefaultScene</javaImplement>
-        <defaultExecute>true</defaultExecute>
-        <hide>true</hide>
-      </innerScene>
       <field title='id'>
         <name>id</name>
         <type>uuid</type>

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

@@ -27,13 +27,6 @@
 					<m:defaultExecute></m:defaultExecute>
 					<m:hide></m:hide>
 				</m:innerScene>
-				<m:innerScene>
-					<m:id>cb80f579-e0d1-49b2-9528-8dff2466aef6</m:id>
-					<m:title>默认部分</m:title>
-					<m:javaImplement>com.xyst.dinas.contract.internal.scene.ContractListDefaultScene</m:javaImplement>
-					<m:defaultExecute>true</m:defaultExecute>
-					<m:hide>true</m:hide>
-				</m:innerScene>
 			</m:innerScenes>
 			<m:fields>
 				<m:field>