fix: 党组织工作经费管理金额字段类型调整为小数

src/main/java/com/ghsc/partybuild/model/DjFundsbudget.java

@@ -9,9 +9,9 @@ public class DjFundsbudget {
 
     private Integer year;
 
-    private Integer activityfunds;
+    private Double activityfunds;
 
-    private Integer rewardfunds;
+    private Double rewardfunds;
 
     private Date createtime;
 
@@ -55,19 +55,19 @@ public class DjFundsbudget {
         this.year = year;
     }
 
-    public Integer getActivityfunds() {
+    public Double getActivityfunds() {
         return activityfunds;
     }
 
-    public void setActivityfunds(Integer activityfunds) {
+    public void setActivityfunds(Double activityfunds) {
         this.activityfunds = activityfunds;
     }
 
-    public Integer getRewardfunds() {
+    public Double getRewardfunds() {
         return rewardfunds;
     }
 
-    public void setRewardfunds(Integer rewardfunds) {
+    public void setRewardfunds(Double rewardfunds) {
         this.rewardfunds = rewardfunds;
     }
 

src/main/java/com/ghsc/partybuild/model/DjFundsuse.java

@@ -13,7 +13,7 @@ public class DjFundsuse {
 
     private Date expendtime;
 
-    private Integer expendmoney;
+    private Double expendmoney;
 
     private Integer expendscope;
 
@@ -77,11 +77,11 @@ public class DjFundsuse {
         this.expendtime = expendtime;
     }
 
-    public Integer getExpendmoney() {
+    public Double getExpendmoney() {
         return expendmoney;
     }
 
-    public void setExpendmoney(Integer expendmoney) {
+    public void setExpendmoney(Double expendmoney) {
         this.expendmoney = expendmoney;
     }
 

src/main/resources/static/app/main/partyTwoExt/fundsBudget/edit.html

@@ -34,14 +34,14 @@
                     <tr>
                         <th>活动经费（万元）<span style="color: red;">*</span></th>
                         <td ng-class="{ 'focused error' : this.editForm.activityfunds.$invalid &&  this.editForm.$submitted}">
-                            <input type="number" name="activityfunds" ng-model="dataModel.activityfunds" step="0.0001" ng-change="fundsChange()"
+                            <input type="number" name="activityfunds" ng-model="dataModel.activityfunds" step="0.00000000001" ng-change="fundsChange()"
                                    class="form-control" ng-required="true"/>
                             <label ng-show="this.editForm.activityfunds.$invalid &&  this.editForm.$submitted"
                                    class="error">必填.</label>
                         </td>
                         <th>“双创”经费（万元）<span style="color: red;">*</span></th>
                         <td ng-class="{ 'focused error' : this.editForm.rewardfunds.$invalid &&  this.editForm.$submitted}">
-                            <input type="number" name="rewardfunds" ng-model="dataModel.rewardfunds" step="0.0001"
+                            <input type="number" name="rewardfunds" ng-model="dataModel.rewardfunds" step="0.0000000001"
                                    class="form-control" ng-required="true" ng-change="fundsChange()"/>
                             <label ng-show="this.editForm.rewardfunds.$invalid &&  this.editForm.$submitted"
                                    class="error">必填.</label>
@@ -50,7 +50,7 @@
                     <tr>
                         <th>预算费用（万元）<span style="color: red;">*</span></th>
                         <td ng-class="{ 'focused error' : this.editForm.budgetfunds.$invalid &&  this.editForm.$submitted}">
-                            <input type="number" name="budgetfunds" ng-model="dataModel.budgetfunds" step="0.0001"
+                            <input type="number" name="budgetfunds" ng-model="dataModel.budgetfunds" step="0.0000000001"
                                    class="form-control" ng-required="true" readonly/>
                             <label ng-show="this.editForm.budgetfunds.$invalid &&  this.editForm.$submitted"
                                    class="error">必填.</label>

src/main/resources/static/app/main/partyTwoExt/fundsBudget/edit.js

@@ -93,7 +93,7 @@
         $scope.getNdList();
 
         $scope.fundsChange = function () {
-            $scope.dataModel.budgetfunds = Math.round(($scope.dataModel.activityfunds + $scope.dataModel.rewardfunds) * 10000) / 10000;
+            $scope.dataModel.budgetfunds = $scope.dataModel.activityfunds + $scope.dataModel.rewardfunds;
         }
         $scope.pagechange = function () {
             var inTab = $bsRouterState.$getRouteType() == 'tab';