加入自定义公式功能

java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java

@@ -62,6 +62,7 @@ public class FeeConfigDto extends PageDto implements Serializable {
     private Date createTime;
 
     private String statusCd = "0";
+    private String computingFormulaText;
 
 
     public String getFeeTypeCd() {
@@ -233,4 +234,12 @@ public class FeeConfigDto extends PageDto implements Serializable {
     public void setValid(String valid) {
         this.valid = valid;
     }
+
+    public String getComputingFormulaText() {
+        return computingFormulaText;
+    }
+
+    public void setComputingFormulaText(String computingFormulaText) {
+        this.computingFormulaText = computingFormulaText;
+    }
 }

java110-bean/src/main/java/com/java110/po/fee/PayFeeConfigPo.java

@@ -25,6 +25,7 @@ public class PayFeeConfigPo implements Serializable {
     private String feeFlag;
     private String feeName;
     private String computingFormula;
+    private String computingFormulaText;
 
     private String billType;
 
@@ -143,4 +144,12 @@ public class PayFeeConfigPo implements Serializable {
     public void setPaymentCycle(String paymentCycle) {
         this.paymentCycle = paymentCycle;
     }
+
+    public String getComputingFormulaText() {
+        return computingFormulaText;
+    }
+
+    public void setComputingFormulaText(String computingFormulaText) {
+        this.computingFormulaText = computingFormulaText;
+    }
 }

java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml

@@ -8,10 +8,11 @@
     <insert id="saveBusinessFeeConfigInfo" parameterType="Map">
         insert into business_pay_fee_config(
         fee_type_cd,computing_formula,additional_amount,square_price,is_default,operate,config_id,fee_flag,fee_name,
-        start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle
+        start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle,computing_formula_text
         ) values (
         #{feeTypeCd},#{computingFormula},#{additionalAmount},#{squarePrice},#{isDefault},#{operate},#{configId},
-        #{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},#{bId},#{billType},#{paymentCd},#{paymentCycle}
+        #{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},#{bId},#{billType},#{paymentCd},#{paymentCycle},
+        #{computingFormulaText}
         )
     </insert>
 
@@ -22,7 +23,7 @@
         squarePrice,t.is_default,t.is_default isDefault,t.operate,t.config_id,t.config_id configId,t.fee_flag,t.fee_flag
         feeFlag,t.fee_name,t.fee_name feeName,t.start_time,t.start_time startTime,t.end_time,t.end_time
         endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.bill_type,t.bill_type billType,
-        t.payment_cd,t.payment_cycle
+        t.payment_cd,t.payment_cycle,t.computing_formula_text,t.computing_formula_text computingFormulaText
         from business_pay_fee_config t
         where 1 =1
         <if test="feeTypeCd !=null and feeTypeCd != ''">
@@ -73,11 +74,11 @@
     <insert id="saveFeeConfigInfoInstance" parameterType="Map">
         insert into pay_fee_config(
         fee_type_cd,computing_formula,additional_amount,status_cd,square_price,is_default,config_id,fee_flag,fee_name,
-        start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle
+        start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle,t.computing_formula_text
         ) select
         t.fee_type_cd,t.computing_formula,t.additional_amount,'0',t.square_price,t.is_default,t.config_id,t.fee_flag,t.fee_name,
         t.start_time,t.end_time,t.community_id,
-        t.b_id,t.bill_type,t.payment_cd,t.payment_cycle
+        t.b_id,t.bill_type,t.payment_cd,t.payment_cycle,t.computing_formula_text
         from business_pay_fee_config t where 1=1
         <if test="feeTypeCd !=null and feeTypeCd != ''">
             and t.fee_type_cd= #{feeTypeCd}
@@ -129,7 +130,8 @@
         configId,t.fee_flag,t.fee_flag feeFlag,t.fee_name,t.fee_name feeName,t.start_time,t.start_time
         startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
         td1.name feeTypeCdName,td2.name feeFlagName,t.bill_type billType,t.bill_type,td3.name billTypeName,
-        t.payment_cd,t.payment_cycle,t.payment_cd paymentCd,t.payment_cycle paymentCycle
+        t.payment_cd,t.payment_cycle,t.payment_cd paymentCd,t.payment_cycle paymentCycle,
+        t.computing_formula_text,t.computing_formula_text computingFormulaText
         from pay_fee_config t,t_dict td1,t_dict td2,t_dict td3
         where 1 =1
         and t.fee_type_cd = td1.status_cd
@@ -214,6 +216,9 @@
         <if test="computingFormula !=null and computingFormula != ''">
             , t.computing_formula= #{computingFormula}
         </if>
+        <if test="computingFormulaText !=null and computingFormulaText != ''">
+            , t.computing_formula_text= #{computingFormulaText}
+        </if>
         <if test="additionalAmount !=null and additionalAmount != '' or additionalAmount == 0">
             , t.additional_amount= #{additionalAmount}
         </if>
@@ -327,10 +332,10 @@
     <insert id="saveFeeConfig" parameterType="Map">
         insert into pay_fee_config(
         fee_type_cd,computing_formula,additional_amount,status_cd,square_price,is_default,config_id,fee_flag,fee_name,
-        start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle
+        start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle,computing_formula_text
         ) values (
         #{feeTypeCd},#{computingFormula},#{additionalAmount},'0',#{squarePrice},#{isDefault},#{configId},
-        #{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},'-1',#{billType},#{paymentCd},#{paymentCycle}
+        #{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},'-1',#{billType},#{paymentCd},#{paymentCycle},#{computingFormulaText}
         )
     </insert>
 </mapper>

service-common/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java

@@ -89,7 +89,7 @@ public class ComplaintUserInnerServiceSMOImpl extends BaseServiceSMO implements
         workflowDto.setCommunityId(communityId);
         List<WorkflowDto> workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
 
-        Assert.listOnlyOne(workflowDtos, "未找到 投诉建议流程或找到多条");
+        Assert.listOnlyOne(workflowDtos, "未找到 投诉建议流程或找到多条，请在物业账号系统管理下流程管理中配置流程");
 
         WorkflowDto tmpWorkflowDto = workflowDtos.get(0);
         if (StringUtil.isEmpty(tmpWorkflowDto.getProcessDefinitionKey())) {

service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java

@@ -103,7 +103,7 @@ public class GoodCollectionUserInnerServiceSMOImpl extends BaseServiceSMO implem
         workflowDto.setStoreId(storeId);
         List<WorkflowDto> workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
 
-        Assert.listOnlyOne(workflowDtos, "未找到 采购流程或找到多条");
+        Assert.listOnlyOne(workflowDtos, "未找到 投诉建议流程或找到多条，请在物业账号系统管理下流程管理中配置流程");
 
         WorkflowDto tmpWorkflowDto = workflowDtos.get(0);
         if (StringUtil.isEmpty(tmpWorkflowDto.getProcessDefinitionKey())) {

service-common/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java

@@ -99,7 +99,7 @@ public class PurchaseApplyUserInnerServiceSMOImpl extends BaseServiceSMO impleme
         workflowDto.setStoreId(storeId);
         List<WorkflowDto> workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
 
-        Assert.listOnlyOne(workflowDtos, "未找到 采购流程或找到多条");
+        Assert.listOnlyOne(workflowDtos, "未找到 投诉建议流程或找到多条，请在物业账号系统管理下流程管理中配置流程");
 
         WorkflowDto tmpWorkflowDto = workflowDtos.get(0);
         if (StringUtil.isEmpty(tmpWorkflowDto.getProcessDefinitionKey())) {

service-common/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java

@@ -185,7 +185,7 @@ public class ResourceEntryStoreInnerServiceSMOImpl extends BaseServiceSMO implem
         workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_PURCHASE);
         workflowDto.setStoreId(storeId);
         List<WorkflowDto> workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
-        Assert.listOnlyOne(workflowDtos, "未找到 采购流程或找到多条");
+        Assert.listOnlyOne(workflowDtos, "未找到 投诉建议流程或找到多条，请在物业账号系统管理下流程管理中配置流程");
 
         WorkflowDto tmpWorkflowDto = workflowDtos.get(0);
         if (StringUtil.isEmpty(tmpWorkflowDto.getProcessDefinitionKey())) {

service-fee/src/main/java/com/java110/fee/listener/config/AbstractFeeConfigBusinessServiceDataFlowListener.java

@@ -39,6 +39,7 @@ public abstract class AbstractFeeConfigBusinessServiceDataFlowListener extends A
         businessFeeConfigInfo.put("newBId", businessFeeConfigInfo.get("b_id"));
         businessFeeConfigInfo.put("feeTypeCd", businessFeeConfigInfo.get("fee_type_cd"));
         businessFeeConfigInfo.put("computingFormula", businessFeeConfigInfo.get("computing_formula"));
+        businessFeeConfigInfo.put("computingFormulaText", businessFeeConfigInfo.get("computing_formula_text"));
         businessFeeConfigInfo.put("additionalAmount", businessFeeConfigInfo.get("additional_amount"));
         businessFeeConfigInfo.put("squarePrice", businessFeeConfigInfo.get("square_price"));
         businessFeeConfigInfo.put("isDefault", businessFeeConfigInfo.get("is_default"));
@@ -78,6 +79,7 @@ public abstract class AbstractFeeConfigBusinessServiceDataFlowListener extends A
 
         currentFeeConfigInfo.put("feeTypeCd", currentFeeConfigInfo.get("fee_type_cd"));
         currentFeeConfigInfo.put("computingFormula", currentFeeConfigInfo.get("computing_formula"));
+        currentFeeConfigInfo.put("computingFormulaText", currentFeeConfigInfo.get("computing_formula_text"));
         currentFeeConfigInfo.put("additionalAmount", currentFeeConfigInfo.get("additional_amount"));
         currentFeeConfigInfo.put("squarePrice", currentFeeConfigInfo.get("square_price"));
         currentFeeConfigInfo.put("isDefault", currentFeeConfigInfo.get("is_default"));