优化费用项

WebService/src/main/resources/components/feePackage/add-feeConfig/addFeeConfig.html

@@ -1,4 +1,5 @@
-<div id = "addFeeConfigModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="addFeeConfigModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -20,70 +21,77 @@
                             </div>-->
 
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">费用类型</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="addFeeConfigInfo.feeTypeCd">
-         <option selected  disabled value="">必填，请选择费用类型</option>
-         <option  value="888800010001">物业费</option>
-<option  value="888800010002">地上出售车位费</option>
-<option  value="888800010003">地下出售车位费</option>
-<option  value="888800010004">地上出租车位费</option>
-<option  value="888800010005">地下出租车位费</option>
-<option  value="888800010007">临时车费用</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">收费项目</label>
-         <div class="col-sm-10">
-           <input v-model="addFeeConfigInfo.feeName"                   type="text" placeholder="必填，请填写收费项目" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">费用标识</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="addFeeConfigInfo.feeFlag">
-         <option selected  disabled value="">必填，请选择费用标识</option>
-         <option  value="1003006">周期性费用</option>
-<option  value="2006012">一次性费用</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">计费起始时间</label>
-         <div class="col-sm-10">
-           <input v-model="addFeeConfigInfo.startTime"                   type="text" placeholder="必填，请填写计费起始时间" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">计费终止时间</label>
-         <div class="col-sm-10">
-           <input v-model="addFeeConfigInfo.endTime"                   type="text" placeholder="必填，请填写计费终止时间" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">计算公式</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="addFeeConfigInfo.computingFormula">
-         <option selected  disabled value="">必填，请选择计算公式</option>
-         <option  value="1001">面积*单价+附加费</option>
-<option  value="2002">固定费用</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">计费单价</label>
-         <div class="col-sm-10">
-           <input v-model="addFeeConfigInfo.squarePrice"                   type="text" placeholder="必填，请填写计费单价" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">附加费用</label>
-         <div class="col-sm-10">
-           <input v-model="addFeeConfigInfo.additionalAmount"                   type="text" placeholder="必填，请填写附加费用" class="form-control">
-         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">费用类型</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="addFeeConfigInfo.feeTypeCd">
+                                        <option selected disabled value="">必填，请选择费用类型</option>
+                                        <option v-for="(item,index) in addFeeConfigInfo.feeTypeCds" :key="index"
+                                                v-bind:value="item.statusCd">{{item.name}}
+                                        </option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">收费项目</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addFeeConfigInfo.feeName" type="text" placeholder="必填，请填写收费项目"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">费用标识</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="addFeeConfigInfo.feeFlag">
+                                        <option selected disabled value="">必填，请选择费用标识</option>
+                                        <option value="1003006">周期性费用</option>
+                                        <option value="2006012">一次性费用</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">计费起始时间</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addFeeConfigInfo.startTime" type="text" placeholder="必填，请填写计费起始时间"
+                                           class="form-control addFeeConfigStartTime">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">计费终止时间</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addFeeConfigInfo.endTime" type="text" placeholder="必填，请填写计费终止时间"
+                                           class="form-control addFeeConfigEndTime">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">计算公式</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="addFeeConfigInfo.computingFormula">
+                                        <option selected disabled value="">必填，请选择计算公式</option>
+                                        <option v-for="(item,index) in addFeeConfigInfo.computingFormulas" :key="index"
+                                                v-bind:value="item.statusCd">{{item.name}}
+                                        </option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row" v-if="addFeeConfigInfo.computingFormula != '2002'">
+                                <label class="col-sm-2 col-form-label">计费单价</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addFeeConfigInfo.squarePrice" type="text" placeholder="必填，请填写计费单价"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">{{addFeeConfigInfo.computingFormula == '1001' ?'附加费用':'固定费用'}}</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addFeeConfigInfo.additionalAmount" type="text"
+                                           placeholder="必填，请填写附加费用" class="form-control">
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="saveFeeConfigInfo()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="saveFeeConfigInfo()"><i class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>

WebService/src/main/resources/components/feePackage/add-feeConfig/addFeeConfig.js

@@ -17,12 +17,19 @@
                 computingFormula: '',
                 squarePrice: '',
                 additionalAmount: '',
-
+                feeTypeCds:[],
+                computingFormulas:[]
             }
         },
         _initMethod: function() {
-
-},
+            vc.component._initAddFeeConfigDateInfo();
+            vc.getDict('pay_fee_config',"fee_type_cd",function(_data){
+                vc.component.addFeeConfigInfo.feeTypeCds = _data;
+            });
+            vc.getDict('pay_fee_config',"computing_formula",function(_data){
+                vc.component.addFeeConfigInfo.computingFormulas = _data;
+            });
+        },
         _initEvent: function() {
             vc.on('addFeeConfig', 'openAddFeeConfigModal',
             function() {
@@ -30,6 +37,36 @@
             });
         },
         methods: {
+            _initAddFeeConfigDateInfo: function () {
+                vc.component.addFeeConfigInfo.startTime = vc.dateFormat(new Date().getTime());
+                $('.addFeeConfigStartTime').datetimepicker({
+                    language: 'zh-CN',
+                    format: 'yyyy-mm-dd hh:ii:ss',
+                    initTime: true,
+                    initialDate: new Date(),
+                    autoClose: 1,
+                    todayBtn: true
+
+                });
+                $('.addFeeConfigStartTime').datetimepicker()
+                    .on('changeDate', function (ev) {
+                        var value = $(".addFeeConfigStartTime").val();
+                        vc.component.addFeeConfigInfo.startTime = value;
+                    });
+                $('.addFeeConfigEndTime').datetimepicker({
+                    language: 'zh-CN',
+                    format: 'yyyy-mm-dd hh:ii:ss',
+                    initTime: true,
+                    initialDate: new Date(),
+                    autoClose: 1,
+                    todayBtn: true
+                });
+                $('.addFeeConfigEndTime').datetimepicker()
+                    .on('changeDate', function (ev) {
+                        var value = $(".addFeeConfigEndTime").val();
+                        vc.component.addFeeConfigInfo.endTime = value;
+                    });
+            },
             addFeeConfigValidate() {
                 return vc.validate.validate({
                     addFeeConfigInfo: vc.component.addFeeConfigInfo
@@ -127,6 +164,10 @@
                 });
             },
             saveFeeConfigInfo: function() {
+                //固定费用
+                if(vc.component.addFeeConfigInfo.computingFormula == '2002'){
+                   vc.component.addFeeConfigInfo.squarePrice = "0.00";
+                }
                 if (!vc.component.addFeeConfigValidate()) {
                     vc.toast(vc.validate.errInfo);
 

WebService/src/main/resources/components/feePackage/edit-feeConfig/editFeeConfig.html

@@ -1,4 +1,5 @@
-<div id = "editFeeConfigModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="editFeeConfigModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -7,70 +8,77 @@
                     <div>
                         <div>
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">费用类型</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="editFeeConfigInfo.feeTypeCd">
-         <option selected  disabled value="">必填，请选择费用类型</option>
-         <option  value="888800010001">物业费</option>
-<option  value="888800010002">地上出售车位费</option>
-<option  value="888800010003">地下出售车位费</option>
-<option  value="888800010004">地上出租车位费</option>
-<option  value="888800010005">地下出租车位费</option>
-<option  value="888800010007">临时车费用</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">收费项目</label>
-         <div class="col-sm-10">
-           <input v-model="editFeeConfigInfo.feeName"                   type="text" placeholder="必填，请填写收费项目" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">费用标识</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="editFeeConfigInfo.feeFlag">
-         <option selected  disabled value="">必填，请选择费用标识</option>
-         <option  value="1003006">周期性费用</option>
-<option  value="2006012">一次性费用</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">计费起始时间</label>
-         <div class="col-sm-10">
-           <input v-model="editFeeConfigInfo.startTime"                   type="text" placeholder="必填，请填写计费起始时间" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">计费终止时间</label>
-         <div class="col-sm-10">
-           <input v-model="editFeeConfigInfo.endTime"                   type="text" placeholder="必填，请填写计费终止时间" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">计算公式</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="editFeeConfigInfo.computingFormula">
-         <option selected  disabled value="">必填，请选择计算公式</option>
-         <option  value="1001">面积*单价+附加费</option>
-<option  value="2002">固定费用</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">计费单价</label>
-         <div class="col-sm-10">
-           <input v-model="editFeeConfigInfo.squarePrice"                   type="text" placeholder="必填，请填写计费单价" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">附加费用</label>
-         <div class="col-sm-10">
-           <input v-model="editFeeConfigInfo.additionalAmount"                   type="text" placeholder="必填，请填写附加费用" class="form-control">
-         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">费用类型</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-bind:disabled = "editFeeConfigInfo.isDefault=='T'" v-model="editFeeConfigInfo.feeTypeCd">
+                                        <option selected disabled value="">必填，请选择费用类型</option>
+                                        <option v-for="(item,index) in editFeeConfigInfo.feeTypeCds" :key="index"
+                                                v-bind:value="item.statusCd">{{item.name}}
+                                        </option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">收费项目</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editFeeConfigInfo.feeName" v-bind:disabled = "editFeeConfigInfo.isDefault=='T'" type="text" placeholder="必填，请填写收费项目"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">费用标识</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-bind:disabled = "editFeeConfigInfo.isDefault=='T'" v-model="editFeeConfigInfo.feeFlag">
+                                        <option selected disabled value="">必填，请选择费用标识</option>
+                                        <option value="1003006">周期性费用</option>
+                                        <option value="2006012">一次性费用</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">计费起始时间</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editFeeConfigInfo.startTime" type="text" placeholder="必填，请填写计费起始时间"
+                                           class="form-control editFeeConfigStartTime">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">计费终止时间</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editFeeConfigInfo.endTime" type="text" placeholder="必填，请填写计费终止时间"
+                                           class="form-control editFeeConfigEndTime">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">计算公式</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-bind:disabled = "editFeeConfigInfo.isDefault=='T'" v-model="editFeeConfigInfo.computingFormula">
+                                        <option selected disabled value="">必填，请选择计算公式</option>
+                                        <option v-for="(item,index) in editFeeConfigInfo.computingFormulas" :key="index"
+                                                v-bind:value="item.statusCd">{{item.name}}
+                                        </option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row" v-if="addFeeConfigInfo.computingFormula != '2002'">
+                                <label class="col-sm-2 col-form-label">计费单价</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editFeeConfigInfo.squarePrice" type="text" placeholder="必填，请填写计费单价"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">{{addFeeConfigInfo.computingFormula == '1001' ?'附加费用':'固定费用'}}</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editFeeConfigInfo.additionalAmount" type="text"
+                                           placeholder="必填，请填写附加费用" class="form-control">
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editFeeConfig()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button" v-on:click="editFeeConfig()">
+                                    <i class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>

WebService/src/main/resources/components/feePackage/edit-feeConfig/editFeeConfig.js

@@ -12,12 +12,20 @@
                 computingFormula: '',
                 squarePrice: '',
                 additionalAmount: '0.00',
-
+                isDefault:'',
+                feeTypeCds:[],
+                computingFormulas:[]
             }
         },
         _initMethod: function() {
-
-},
+            vc.component._initEditFeeConfigDateInfo();
+            vc.getDict('pay_fee_config',"fee_type_cd",function(_data){
+                vc.component.editFeeConfigInfo.feeTypeCds = _data;
+            });
+            vc.getDict('pay_fee_config',"computing_formula",function(_data){
+                vc.component.editFeeConfigInfo.computingFormulas = _data;
+            });
+        },
         _initEvent: function() {
             vc.on('editFeeConfig', 'openEditFeeConfigModal',
             function(_params) {
@@ -28,6 +36,36 @@
             });
         },
         methods: {
+            _initEditFeeConfigDateInfo: function () {
+                vc.component.editFeeConfigInfo.startTime = vc.dateFormat(new Date().getTime());
+                $('.editFeeConfigStartTime').datetimepicker({
+                    language: 'zh-CN',
+                    format: 'yyyy-mm-dd hh:ii:ss',
+                    initTime: true,
+                    initialDate: new Date(),
+                    autoClose: 1,
+                    todayBtn: true
+
+                });
+                $('.editFeeConfigStartTime').datetimepicker()
+                    .on('changeDate', function (ev) {
+                        var value = $(".editFeeConfigStartTime").val();
+                        vc.component.editFeeConfigInfo.startTime = value;
+                    });
+                $('.editFeeConfigEndTime').datetimepicker({
+                    language: 'zh-CN',
+                    format: 'yyyy-mm-dd hh:ii:ss',
+                    initTime: true,
+                    initialDate: new Date(),
+                    autoClose: 1,
+                    todayBtn: true
+                });
+                $('.editFeeConfigEndTime').datetimepicker()
+                    .on('changeDate', function (ev) {
+                        var value = $(".editFeeConfigEndTime").val();
+                        vc.component.editFeeConfigInfo.endTime = value;
+                    });
+            },
             editFeeConfigValidate: function() {
                 return vc.validate.validate({
                     editFeeConfigInfo: vc.component.editFeeConfigInfo
@@ -130,6 +168,10 @@
                 });
             },
             editFeeConfig: function() {
+            //固定费用
+                if(vc.component.editFeeConfigValidate.computingFormula == '2002'){
+                   vc.component.addFeeConfigInfo.squarePrice = "0.00";
+                }
                 if (!vc.component.editFeeConfigValidate()) {
                     vc.toast(vc.validate.errInfo);
                     return;
@@ -165,7 +207,7 @@
                     computingFormula: '',
                     squarePrice: '',
                     additionalAmount: '',
-
+                    isDefault:''
                 }
             }
         }

WebService/src/main/resources/components/feePackage/feeConfig-manage/feeConfigManage.html

@@ -25,12 +25,7 @@
                         <div class="col-sm-3">
                             <select class="custom-select" v-model="feeConfigManageInfo.conditions.feeTypeCd">
                                 <option selected value="">请选择费用类型</option>
-                                <option value="888800010001">物业费</option>
-                                <option value="888800010002">地上出售车位费</option>
-                                <option value="888800010003">地下出售车位费</option>
-                                <option value="888800010004">地上出租车位费</option>
-                                <option value="888800010005">地下出租车位费</option>
-                                <option value="888800010007">临时车费用</option>
+                                <option v-for="(item,index) in feeConfigManageInfo.feeTypeCds" :key="index" v-bind:value="item.statusCd">{{item.name}}</option>
                             </select></div>
                         <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryFeeConfigMethod()">
@@ -52,7 +47,7 @@
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddFeeConfigModal()">
                             <i class="glyphicon glyphicon-plus"></i>
-                            添加费用项
+                            添加
                         </button>
                     </div>
                 </div>
@@ -79,20 +74,20 @@
                         <tbody>
                         <tr v-for="feeConfig in feeConfigManageInfo.feeConfigs">
                             <td class="text-center">{{feeConfig.configId}}</td>
-                            <td class="text-center">{{feeConfig.feeTypeCd}}</td>
+                            <td class="text-center">{{feeConfig.feeTypeCdName}}</td>
                             <td class="text-center">{{feeConfig.feeName}}</td>
-                            <td class="text-center">{{feeConfig.feeFlag}}</td>
+                            <td class="text-center">{{feeConfig.feeFlagName}}</td>
                             <td class="text-center">{{feeConfig.startTime}}</td>
                             <td class="text-center">{{feeConfig.endTime}}</td>
-                            <td class="text-center">{{feeConfig.squarePrice}}</td>
-                            <td class="text-center">{{feeConfig.additionalAmount}}</td>
+                            <td class="text-center">{{feeConfig.squarePrice}}元</td>
+                            <td class="text-center">{{feeConfig.additionalAmount}}元</td>
                             <td class="text-center">
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs"
                                             v-on:click="_openEditFeeConfigModel(feeConfig)">修改
                                     </button>
                                 </div>
-                                <div class="btn-group" v-if="feeConfig.isDefault='F'">
+                                <div class="btn-group" v-if="feeConfig.isDefault=='F'">
                                     <button class="btn-white btn btn-xs"
                                             v-on:click="_openDeleteFeeConfigModel(feeConfig)">删除
                                     </button>

WebService/src/main/resources/components/feePackage/feeConfig-manage/feeConfigManage.js

@@ -12,6 +12,7 @@
                 records: 1,
                 moreCondition: false,
                 feeName: '',
+                feeTypeCds:[],
                 conditions: {
                     feeFlag: '',
                     feeName: '',
@@ -22,6 +23,10 @@
         },
         _initMethod: function() {
             vc.component._listFeeConfigs(DEFAULT_PAGE, DEFAULT_ROWS);
+
+            vc.getDict('pay_fee_config',"fee_type_cd",function(_data){
+                vc.component.feeConfigManageInfo.feeTypeCds = _data;
+            });
         },
         _initEvent: function() {
 
@@ -81,7 +86,6 @@
                     vc.component.feeConfigManageInfo.moreCondition = true;
                 }
             }
-
         }
     });
 })(window.vc);

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

@@ -26,6 +26,8 @@ public class FeeConfigDto extends PageDto implements Serializable {
     private String startTime;
     private String endTime;
     private String communityId;
+    private String feeTypeCdName;
+    private String feeFlagName;
 
 
     private Date createTime;
@@ -137,4 +139,20 @@ public class FeeConfigDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getFeeTypeCdName() {
+        return feeTypeCdName;
+    }
+
+    public void setFeeTypeCdName(String feeTypeCdName) {
+        this.feeTypeCdName = feeTypeCdName;
+    }
+
+    public String getFeeFlagName() {
+        return feeFlagName;
+    }
+
+    public void setFeeFlagName(String feeFlagName) {
+        this.feeFlagName = feeFlagName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/feeConfig/ApiFeeConfigDataVo.java

@@ -6,69 +6,111 @@ import java.util.Date;
 public class ApiFeeConfigDataVo implements Serializable {
 
     private String configId;
-private String feeTypeCd;
-private String feeName;
-private String feeFlag;
-private String startTime;
-private String endTime;
-private String computingFormula;
-private String squarePrice;
-private String additionalAmount;
-public String getConfigId() {
+    private String feeTypeCd;
+    private String feeName;
+    private String feeFlag;
+    private String startTime;
+    private String endTime;
+    private String computingFormula;
+    private String squarePrice;
+    private String additionalAmount;
+    private String feeTypeCdName;
+    private String feeFlagName;
+    private String isDefault;
+
+    public String getConfigId() {
         return configId;
     }
-public void setConfigId(String configId) {
+
+    public void setConfigId(String configId) {
         this.configId = configId;
     }
-public String getFeeTypeCd() {
+
+    public String getFeeTypeCd() {
         return feeTypeCd;
     }
-public void setFeeTypeCd(String feeTypeCd) {
+
+    public void setFeeTypeCd(String feeTypeCd) {
         this.feeTypeCd = feeTypeCd;
     }
-public String getFeeName() {
+
+    public String getFeeName() {
         return feeName;
     }
-public void setFeeName(String feeName) {
+
+    public void setFeeName(String feeName) {
         this.feeName = feeName;
     }
-public String getFeeFlag() {
+
+    public String getFeeFlag() {
         return feeFlag;
     }
-public void setFeeFlag(String feeFlag) {
+
+    public void setFeeFlag(String feeFlag) {
         this.feeFlag = feeFlag;
     }
-public String getStartTime() {
+
+    public String getStartTime() {
         return startTime;
     }
-public void setStartTime(String startTime) {
+
+    public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
-public String getEndTime() {
+
+    public String getEndTime() {
         return endTime;
     }
-public void setEndTime(String endTime) {
+
+    public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
-public String getComputingFormula() {
+
+    public String getComputingFormula() {
         return computingFormula;
     }
-public void setComputingFormula(String computingFormula) {
+
+    public void setComputingFormula(String computingFormula) {
         this.computingFormula = computingFormula;
     }
-public String getSquarePrice() {
+
+    public String getSquarePrice() {
         return squarePrice;
     }
-public void setSquarePrice(String squarePrice) {
+
+    public void setSquarePrice(String squarePrice) {
         this.squarePrice = squarePrice;
     }
-public String getAdditionalAmount() {
+
+    public String getAdditionalAmount() {
         return additionalAmount;
     }
-public void setAdditionalAmount(String additionalAmount) {
+
+    public void setAdditionalAmount(String additionalAmount) {
         this.additionalAmount = additionalAmount;
     }
 
+    public String getFeeTypeCdName() {
+        return feeTypeCdName;
+    }
 
+    public void setFeeTypeCdName(String feeTypeCdName) {
+        this.feeTypeCdName = feeTypeCdName;
+    }
 
+    public String getFeeFlagName() {
+        return feeFlagName;
+    }
+
+    public void setFeeFlagName(String feeFlagName) {
+        this.feeFlagName = feeFlagName;
+    }
+
+    public String getIsDefault() {
+        return isDefault;
+    }
+
+    public void setIsDefault(String isDefault) {
+        this.isDefault = isDefault;
+    }
 }

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

@@ -120,9 +120,16 @@
         computingFormula,t.additional_amount,t.additional_amount additionalAmount,t.status_cd,t.status_cd
         statusCd,t.square_price,t.square_price squarePrice,t.is_default,t.is_default isDefault,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
-        from pay_fee_config t
+        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
+        from pay_fee_config t,t_dict td1,t_dict td2
         where 1 =1
+        and t.fee_type_cd = td1.status_cd
+        and td1.table_name = 'pay_fee_config'
+        and td1.table_columns = 'fee_type_cd'
+        and t.fee_flag = td2.status_cd
+        and td2.table_name = 'pay_fee_config'
+        and td2.table_columns = 'fee_flag'
         <if test="feeTypeCd !=null and feeTypeCd != ''">
             and t.fee_type_cd= #{feeTypeCd}
         </if>
@@ -219,8 +226,14 @@
     <!-- 查询费用配置数量 add by wuxw 2018-07-03 -->
     <select id="queryFeeConfigsCount" parameterType="Map" resultType="Map">
         select count(1) count
-        from pay_fee_config t
+        from pay_fee_config t,t_dict td1,t_dict td2
         where 1 =1
+        and t.fee_type_cd = td1.status_cd
+        and td1.table_name = 'pay_fee_config'
+        and td1.table_columns = 'fee_type_cd'
+        and t.fee_flag = td2.status_cd
+        and td2.table_name = 'pay_fee_config'
+        and td2.table_columns = 'fee_flag'
         <if test="feeTypeCd !=null and feeTypeCd != ''">
             and t.fee_type_cd= #{feeTypeCd}
         </if>

java110-front/src/main/java/com/java110/front/components/CoreComponent.java

@@ -0,0 +1,39 @@
+package com.java110.front.components;
+
+import com.java110.core.context.IPageData;
+import com.java110.front.smo.dict.IDictServiceSMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+/**
+ * @ClassName CoreComponent
+ * @Description TODO
+ * @Author wuxw
+ * @Date 2020/1/30 17:23
+ * @Version 1.0
+ * add by wuxw 2020/1/30
+ **/
+@Component("core")
+public class CoreComponent {
+    @Autowired
+    private IDictServiceSMO dictServiceSMOImpl;
+
+    /**
+     * 查询活动列表
+     *
+     * @param pd 页面数据封装
+     * @return 返回 ResponseEntity 对象
+     */
+    public ResponseEntity<String> list(IPageData pd) {
+        return dictServiceSMOImpl.listDict(pd);
+    }
+
+    public IDictServiceSMO getDictServiceSMOImpl() {
+        return dictServiceSMOImpl;
+    }
+
+    public void setDictServiceSMOImpl(IDictServiceSMO dictServiceSMOImpl) {
+        this.dictServiceSMOImpl = dictServiceSMOImpl;
+    }
+}

WebService/src/main/java/com/java110/web/smo/dict/IDictServiceSMO.java

@@ -1,4 +1,4 @@
-package com.java110.web.smo.dict;
+package com.java110.front.smo.dict;
 
 import com.java110.core.context.IPageData;
 import org.springframework.http.ResponseEntity;

WebService/src/main/java/com/java110/web/smo/dict/impl/DictServiceSMOImpl.java

@@ -1,21 +1,15 @@
-package com.java110.web.smo.dict.impl;
+package com.java110.front.smo.dict.impl;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.component.BaseComponentSMO;
 import com.java110.core.context.IPageData;
-import com.java110.utils.constant.PrivilegeCodeConstant;
-import com.java110.utils.constant.ResponseConstant;
+import com.java110.front.smo.dict.IDictServiceSMO;
 import com.java110.utils.constant.ServiceConstant;
-import com.java110.utils.exception.SMOException;
 import com.java110.utils.util.Assert;
-import com.java110.web.smo.ICarServiceSMO;
-import com.java110.web.smo.dict.IDictServiceSMO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
@@ -36,15 +30,14 @@ public class DictServiceSMOImpl extends BaseComponentSMO implements IDictService
     private RestTemplate restTemplate;
 
 
-
     @Override
     public ResponseEntity<String> listDict(IPageData pd) {
         validate(pd);
         //获取请求参数
         JSONObject reqParam = JSONObject.parseObject(pd.getReqData());
         //拉取数据
-        String url=ServiceConstant.SERVICE_API_URL.concat("/api/dict.queryDict").concat(mapToUrlParam(reqParam));
-        ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",url , HttpMethod.GET);
+        String url = ServiceConstant.SERVICE_API_URL.concat("/api/dict.queryDict").concat(mapToUrlParam(reqParam));
+        ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "", url, HttpMethod.GET);
         return responseEntity;
     }
 

java110-front/src/main/resources/static/js/core.js

@@ -362,6 +362,28 @@
         return vc.map[_key];
     };
 
+    vc.getDict = function(_name,_type,_callFun){
+        var param = {
+            params: {
+                name:_name,
+                type:_type
+            }
+        };
+
+        //发送get请求
+        vc.http.get('core', 'list', param,
+        function(json, res) {
+            if(res.status == 200){
+                var _dictInfo = JSON.parse(json);
+                _callFun(_dictInfo);
+                return ;
+            }
+        },
+        function(errInfo, error) {
+            console.log('请求失败处理');
+        });
+    }
+
 
 })(window.vc);