1

application/index/service/AmercementService.php

@@ -120,16 +120,16 @@ class AmercementService
         return $str;
     }
 
-    public function getStatusName($status,$is_settlement)
+    public function getStatusName($status, $is_settlement)
     {
         switch ($status) {
             case 0 :
                 $str = '待支付';
                 break;
             case 1 :
-                if($is_settlement > 0){
+                if ($is_settlement > 0) {
                     $str = '已支付-已结算';
-                }else{
+                } else {
                     $str = '已支付-未结算';
                 }
 
@@ -292,7 +292,7 @@ class AmercementService
 
         $redis_cache                 = new RedisCacheService();
         $result['type_name']         = $this->getTypeName($result['type']);
-        $result['status_name']       = $this->getStatusName($result['status'],$result['is_settlement']);
+        $result['status_name']       = $this->getStatusName($result['status'], $result['is_settlement']);
         $agent_data                  = $redis_cache->getRedisCache(2, $result['submit_agent_id']);
         $result['submit_agent_name'] = $agent_data['name'];
         $agent_data                  = $redis_cache->getRedisCache(2, $result['agent_id']);
@@ -490,7 +490,7 @@ class AmercementService
                 $this->updateAmercement($val['id'], ['money_sum' => $money_sum]);
             }
             $result[$key]['type_name']   = $this->getTypeName($val['type']);
-            $result[$key]['status_name'] = $this->getStatusName($val['status'],$val['is_settlement']);
+            $result[$key]['status_name'] = $this->getStatusName($val['status'], $val['is_settlement']);
 
             $agent_data                        = $redis_cache->getRedisCache(2, $val['submit_agent_id']);
             $result[$key]['submit_agent_name'] = $agent_data['name'];
@@ -556,7 +556,7 @@ class AmercementService
                 $result[$key]['forfeit_penalty'] = $forfeit_penalty;
             }
             $result[$key]['type_name']         = $this->getTypeName($val['type']);
-            $result[$key]['status_name']       = $this->getStatusName($val['status'],$val['is_settlement']);
+            $result[$key]['status_name']       = $this->getStatusName($val['status'], $val['is_settlement']);
             $agent_data                        = $redis_cache->getRedisCache(2, $val['submit_agent_id']);
             $result[$key]['submit_agent_name'] = $agent_data['name'];
             $agent_data                        = $redis_cache->getRedisCache(2, $val['agent_id']);
@@ -604,9 +604,18 @@ class AmercementService
 
         //状态
         if (isset($params['status']) && is_numeric($params["status"])) {
+            if ($params['status'] == 1) {
+                $conditions["status"]        = 1;
+                $conditions["is_settlement"] = 0;
+            } else if ($params['status'] == 3) {
+                $conditions["status"]        = 1;
+                $conditions["is_settlement"] = 1;
+            } else {
                 $conditions["status"] = $params["status"];
             }
 
+        }
+
         //项目
         if (isset($params['type']) && is_numeric($params["type"])) {
             $conditions["type"] = $params["type"];

application/index/view/finance/fineMoney.html

@@ -187,7 +187,8 @@
 														<select class="form-control btn4 margin-top-ld state-pay">
 															<option value="">状态</option>
 															<option value="0">待支付</option>
-															<option value="1">已支付</option>
+															<option value="1">已支付-未结算</option>
+															<option value="3">已支付-已结算</option>
 															<option value="2">已取消</option>
 														</select>
 														<select class="form-control btn4 margin-top-ld fine-item">