Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

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

@@ -43,8 +43,8 @@ public class ContractConstant {
 	public static final String SALE_DINAS_AMOUNT = "saleDinasAmount";
 	/** 变更原因 */
 	public static final String CHANGE_REASON = "changeReason";
-	
-	
+	/** 结束时间 */
+	public static final String endDate = "endDate";
 	/** 砂石种类 */
 	public static final String dinasType = "dinasType";
 	

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/warn/AdvanceBalanceWarningCalculator.java

 package com.xyst.dinas.contract.warn;
 
-import java.util.List;
-
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.beecode.bcp.type.KObject;
-import com.xyst.dinas.biz.constant.DinasTypeConstant;
 import com.xyst.dinas.biz.warn.IWarningCalculator;
 import com.xyst.dinas.biz.warn.WarnSetting;
 import com.xyst.dinas.contract.constant.ContractConstant;
@@ -35,7 +32,11 @@ public class AdvanceBalanceWarningCalculator  implements IWarningCalculator{
 		if(min==null || min.trim().length()==0) return false;
 		KObject contract = contractService.queryContract(warnSetting.getBillId());
 		advanceBalance = contract.getDouble(ContractConstant.ADVANCE_BALANCE);
-		
+		if (advanceBalance < Double.valueOf(min)) {
+			String contractCode = contract.getString(ContractConstant.CONTRACT_CODE);
+			warnMessage = "编号["+contractCode+"]"+"的合同"+target+"为"+advanceBalance+",已不足"+min+"!";
+			return true;
+		}
 		return false;
 	}
 

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/warn/ContractExpireWarningCalculator.java

 package com.xyst.dinas.contract.warn;
 
+import java.util.Date;
+
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.beecode.bcp.type.KObject;
@@ -17,7 +19,7 @@ import com.xyst.dinas.contract.service.ContractService;
 public class ContractExpireWarningCalculator  implements IWarningCalculator{
 
 	
-	private double advanceBalance;
+	private int days;
 	
 	private String warnMessage;
 	
@@ -30,9 +32,17 @@ public class ContractExpireWarningCalculator  implements IWarningCalculator{
 		String min = warnSetting.getMin();
 		String target = warnSetting.getTarget();
 		if(min==null || min.trim().length()==0) return false;
-		KObject contract = contractService.queryContract(warnSetting.getBillId());
-		advanceBalance = contract.getDouble(ContractConstant.ADVANCE_BALANCE);
 		
+		KObject contract = contractService.queryContract(warnSetting.getBillId());
+		Date endDate = contract.getDate(ContractConstant.endDate);
+		Date now = new Date();
+		int diff = now.compareTo(endDate);
+		if (diff > Integer.valueOf(min)) {
+			String contractCode = contract.getString(ContractConstant.CONTRACT_CODE);
+			
+//			warnMessage = "编号["+contractCode+"]"+"的合同"+target+"为"+advanceBalance+",已不足"+min+"!";
+			return true;
+		}
 		return false;
 	}
 
@@ -43,7 +53,7 @@ public class ContractExpireWarningCalculator  implements IWarningCalculator{
 
 	@Override
 	public String getActualValue() {
-		return advanceBalance+"";
+		return days+"";
 	}
 
 }

backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/processor/FinanceRefundProcessor.java

@@ -13,6 +13,7 @@ import com.xyst.dinas.biz.service.DinasOrganizationService;
 import com.xyst.dinas.finance.constant.FinanceRefundConstant;
 import com.xyst.dinas.finance.enumeration.FundTypeEnum;
 import com.xyst.dinas.finance.enumeration.RefundStatusEnum;
+import com.xyst.dinas.project.service.PurchaseSandCompanyService;
 
 /**
  * 退款申请查询处理
@@ -24,6 +25,8 @@ public class FinanceRefundProcessor implements DataProcessor {
 
 	@Autowired
 	private DinasOrganizationService orgService;
+//	@Autowired
+//	private PurchaseSandCompanyService purchaseSandCompanyService;
 	
 	@Override
 	public void process(DataProcessorContext context) {
@@ -34,6 +37,10 @@ public class FinanceRefundProcessor implements DataProcessor {
 			KObject regionalCompany = orgService.load(regionalCompanyId);
 			row.put("regionalCompanyName", regionalCompany.getString("name"));
 			
+//			UUID purchaseSandCompanyId = UUID.fromString(row.get("purchaseSandCompany.id").toString());
+//			KObject purchaseSandCompany = purchaseSandCompanyService.getById(purchaseSandCompanyId);
+//			row.put("purchaseSandCompanyName", purchaseSandCompany.getString("name"));
+			
 			String fundTypeName = null;
 			int fundType = Integer.valueOf(row.get(FinanceRefundConstant.fundType).toString());
 			if(FundTypeEnum.ADVANCE.getValue()==fundType) {

backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/FinanceRefund.mk

@@ -57,7 +57,15 @@
         </ref>
         <description></description>
       </field>
-
+      <field title='购砂单位名称'>
+        <name>purchaseSandCompany.name</name>
+        <type>string</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
       <field title='退款状态'>
         <name>refundState</name>
         <type>string</type>

backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/FinanceRefund.jmx

@@ -67,6 +67,16 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
+					<m:name>purchaseSandCompany.name</m:name>
+					<m:title>购砂单位名称</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
 					<m:name>refundState</m:name>
 					<m:title>退款状态</m:title>
 					<m:type>string</m:type>

backend/xyst.dinas.project/src/main/java/com/xyst/dinas/project/internal/service/PurchaseSandCompanyServiceImpl.java

@@ -33,5 +33,10 @@ public class PurchaseSandCompanyServiceImpl implements PurchaseSandCompanyServic
 	public KObject getById(String id) {
 		return purchaseSandCompanyDao.load(UUID.fromString(id));
 	}
+	
+	@Override
+	public KObject getById(UUID id) {
+		return purchaseSandCompanyDao.load(id);
+	}
 
 }

backend/xyst.dinas.project/src/main/java/com/xyst/dinas/project/service/PurchaseSandCompanyService.java

 package com.xyst.dinas.project.service;
 
+import java.util.UUID;
+
 import com.beecode.bcp.type.KObject;
 
 public interface PurchaseSandCompanyService {
@@ -7,5 +9,7 @@ public interface PurchaseSandCompanyService {
 	Boolean verifyName(String name);
 	
 	KObject getById(String id);
+	
+	KObject getById(UUID id);
 
 }

backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/NeedPlanAdvQuery.jmx

@@ -25,7 +25,10 @@
 				LEFT JOIN PlanningCycle AS planningCycle ON planningCycle.id = needPlan.planningCycle
 				LEFT JOIN SalesPlan AS salesPlan  ON salesPlan.planningCycle = needPlan.planningCycle
 				LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = needPlan.project
-			WHERE ( needPlan.DISCARD = FALSE OR needPlan.DISCARD IS NULL ) 
+			WHERE ( needPlan.DISCARD = FALSE OR needPlan.DISCARD IS NULL )
+			AND projectFiled.id = :?projectId
+			AND planningCycle.startTime >= :?planningCycleStartTime
+			AND planningCycle.EndTime <= :?planningCycleEndTime
 				</sql>
 		</template>
 	</content>

backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/NeedPlanQueryView.jmx

@@ -57,7 +57,7 @@
                     "table": {
                         "selectType": "MULTI",
                         "serialNumber": "series",
-                        "pageSize": 200,
+                        "pageSize": 10,
                         "orders":[
                            
                         ],

backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanAdvQuery.jmx

@@ -11,11 +11,29 @@
 		<template>
 			<sql-type>SQL</sql-type>
 			<sql>
-			SELECT
+		SELECT 
+			result.id AS id,
+			result.organization AS organization,
+			result.organizationId AS organizationId,
+			result.planningCycleTitle AS planningCycleTitle,
+			result.planningCycleStartTime AS planningCycleStartTime,
+			result.planningCycleEndTime AS planningCycleEndTime,
+			result.projectName AS projectName,
+			result.projectId AS projectId,
+			result.type AS type,
+			result.requiredTotalAmount AS requiredTotalAmount,
+			result.totalPlanAmount AS totalPlanAmount,
+			result.actualSaleTotalAmount AS actualSaleTotalAmount
+		FROM 
+		   (SELECT
 				salesPlan.id AS id,
 				xystorganization.NAME AS organization,
+				xystorganization.id AS organizationId,
 				planningCycle.title AS planningCycleTitle,
+				planningCycle.startTime AS planningCycleStartTime,
+				planningCycle.endTime AS planningCycleEndTime,
 				projectFiled.projectName AS projectName,
+				projectFiled.id AS projectId,
 				'销售计划' AS type,
 				salesPlan.requiredTotalAmount AS requiredTotalAmount,
 				salesPlan.planTotalAmount AS totalPlanAmount,
@@ -30,8 +48,12 @@
 			SELECT
 				salesPlanTemp.id AS id,
 				xystorganizationrTemp.NAME AS organization,
+				xystorganizationrTemp.id AS organizationId,
 				planningCycleTemp.title AS planningCycleTitle,
+				planningCycleTemp.startTime AS planningCycleStartTime,
+				planningCycleTemp.endTime AS planningCycleEndTime,
 				projectFiledTemp.projectName AS projectName,
+				projectFiledTemp.id AS projectId,
 				'临时销售计划' AS type,
 				needPlanTemp.needPlanTotalAmount AS requiredTotalAmount,
 				salesPlanTemp.totalPlanAmount AS totalPlanAmount,
@@ -42,7 +64,13 @@
 				LEFT JOIN PlanningCycleTemp AS planningCycleTemp ON planningCycleTemp.id = salesPlanTemp.planningCycle
 				LEFT JOIN ProjectFiledTemp AS projectFiledTemp ON projectFiledTemp.id = salesPlanTemp.project
 				LEFT JOIN NeedPlanTemp AS needPlanTemp ON needPlanTemp.planningCycle = salesPlanTemp.planningCycle
-			WHERE ( salesPlanTemp.DISCARD = FALSE OR salesPlanTemp.DISCARD IS NULL )
+			WHERE ( salesPlanTemp.DISCARD = FALSE OR salesPlanTemp.DISCARD IS NULL )) AS result 
+			WHERE result.type = :?type
+			AND result.organizationId = :?organizationId
+			AND result.projectId = :?projectId
+			AND result.organizationId = :?organizationId
+			AND result.planningCycleStartTime &gt;= :?planningCycleStartTime
+			AND result.planningCycleEndTime &lt;= :?planningCycleEndTime
 				</sql>
 		</template>
 	</content>

backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanQueryView.jmx

@@ -57,7 +57,7 @@
                     "table": {
                         "selectType": "MULTI",
                         "serialNumber": "series",
-                        "pageSize": 200,
+                        "pageSize": 10,
                         "orders":[
                            
                         ],