优化代码

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

@@ -46,6 +46,7 @@ public class PayFeeDetailDto extends PageDto implements Serializable {
     private String lateAmount;
     private String giftAmount;
 
+
     public String getDetailId() {
         return detailId;
     }

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

@@ -41,6 +41,8 @@ public class PayFeeConfigPo implements Serializable {
     private String units;
     private String prepaymentPeriod;
 
+    private String state;
+
     public String getConfigId() {
         return configId;
     }
@@ -212,4 +214,12 @@ public class PayFeeConfigPo implements Serializable {
     public void setPrepaymentPeriod(String prepaymentPeriod) {
         this.prepaymentPeriod = prepaymentPeriod;
     }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
 }

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

@@ -6,13 +6,13 @@
     <!-- 保存收费项目信息 add by wuxw 2018-07-03 -->
     <insert id="savePayFeeConfigInfo" parameterType="Map">
         insert into pay_fee_config(fee_type_cd, computing_formula, additional_amount, bill_type, computing_formula_text,
-                                   square_price, payment_cd, is_default, config_id, fee_flag, fee_name, payment_cycle,
-                                   start_time, end_time, community_id, deduct_from, pay_online, scale, decimal_place,
-                                   units, prepayment_period)
+        square_price, payment_cd, is_default, config_id, fee_flag, fee_name, payment_cycle,
+        start_time, end_time, community_id, deduct_from, pay_online, scale, decimal_place,
+        units, prepayment_period,state)
         values (#{feeTypeCd}, #{computingFormula}, #{additionalAmount}, #{billType}, #{computingFormulaText},
-                #{squarePrice}, #{paymentCd}, #{isDefault}, #{configId}, #{feeFlag}, #{feeName}, #{paymentCycle},
-                #{startTime}, #{endTime}, #{communityId}, #{deductFrom}, #{payOnline}, #{scale}, #{decimalPlace},
-                #{units}, #{prepaymentPeriod})
+        #{squarePrice}, #{paymentCd}, #{isDefault}, #{configId}, #{feeFlag}, #{feeName}, #{paymentCycle},
+        #{startTime}, #{endTime}, #{communityId}, #{deductFrom}, #{payOnline}, #{scale}, #{decimalPlace},
+        #{units}, #{prepaymentPeriod},#{state})
     </insert>
 
     <!-- 查询收费项目信息 add by wuxw 2018-07-03 -->
@@ -25,7 +25,8 @@
         feeName,t.payment_cycle,t.payment_cycle paymentCycle,t.start_time,t.start_time startTime,t.end_time,t.end_time
         endTime,t.community_id,t.community_id communityId,t.deduct_from,t.deduct_from deductFrom,
         t.pay_online payOnline,t.scale,t.decimal_place decimalPlace,t.units,t.prepayment_period,t.prepayment_period
-        prepaymentPeriod
+        prepaymentPeriod,
+        t.state
         from pay_fee_config t
         where 1 =1
         <if test="feeTypeCd !=null and feeTypeCd != ''">
@@ -92,6 +93,9 @@
         <if test="prepaymentPeriod !=null and prepaymentPeriod != ''">
             and t.prepayment_period = #{prepaymentPeriod}
         </if>
+        <if test="state !=null and state != ''">
+            and t.state = #{state}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -143,9 +147,7 @@
         <if test="endTime !=null and endTime != ''">
             , t.end_time= #{endTime}
         </if>
-        <if test="communityId !=null and communityId != ''">
-            , t.community_id= #{communityId}
-        </if>
+
         <if test="deductFrom !=null and deductFrom != ''">
             , t.deduct_from= #{deductFrom}
         </if>
@@ -161,11 +163,19 @@
         <if test="units !=null and units != ''">
             , t.units= #{units}
         </if>
-        , t.prepayment_period = #{prepaymentPeriod}
+        <if test="prepaymentPeriod !=null and prepaymentPeriod != ''">
+            , t.prepayment_period = #{prepaymentPeriod}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state = #{state}
+        </if>
         where 1=1
         <if test="configId !=null and configId != ''">
             and t.config_id= #{configId}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
     </update>
 
     <!-- 查询收费项目数量 add by wuxw 2018-07-03 -->
@@ -237,6 +247,9 @@
         <if test="prepaymentPeriod !=null and prepaymentPeriod != ''">
             and t.prepayment_period = #{prepaymentPeriod}
         </if>
+        <if test="state !=null and state != ''">
+            and t.state = #{state}
+        </if>
     </select>
 
     <!-- 查询收费项目数量 add by wuxw 2018-07-03 -->
@@ -248,7 +261,7 @@
         left join pay_fee_attrs pfa2 on t.fee_id = pfa2.fee_id and pfa2.status_cd = '0' and pfa2.spec_cd = '390009'
         where t.config_id = #{configId}
         <if test="payerObjType != null and payerObjType != ''">
-           and t.payer_obj_type= #{payerObjType}
+            and t.payer_obj_type= #{payerObjType}
         </if>
         and t.community_id= #{communityId}
     </select>
@@ -264,7 +277,7 @@
         where t.config_id = #{configId}
         and t.community_id= #{communityId}
         <if test="payerObjType != null and payerObjType != ''">
-           and t.payer_obj_type= #{payerObjType}
+            and t.payer_obj_type= #{payerObjType}
         </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">

service-fee/src/main/java/com/java110/fee/cmd/feeConfig/SaveFeeConfigCmd.java

@@ -36,6 +36,7 @@ public class SaveFeeConfigCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "billType", "未包含出账类型");
         Assert.hasKeyAndValue(reqJson, "paymentCd", "付费类型不能为空");
         Assert.hasKeyAndValue(reqJson, "paymentCycle", "缴费周期不能为空");
+        Assert.hasKeyAndValue(reqJson, "state", "状态不能为空");
 
         // todo 这里校验费用名称不能重复，因为很多物业建相同名字的费用后自己都分不清然后 随便删了一个导致系统有问题