gx

@@ -91,7 +91,7 @@ class BaseController extends Controller
                 break;
                 break;
             case "end_at":
             case "end_at":
                 $this->_btw[1] = $v;
                 $this->_btw[1] = $v;
-                $this->map['updated_at'] = ['between', $this->_btw];
+                $this->map['created_at'] = ['between', $this->_btw];
                 break;
                 break;
             default:
             default:
                 if (!empty($v) || $v == 0) {
                 if (!empty($v) || $v == 0) {

@@ -13,6 +13,8 @@ use App\Models\Product\CategoryRelated;
 use App\Models\Product\Keyword;
 use App\Models\Product\Keyword;
 use App\Models\Product\KeywordRelated;
 use App\Models\Product\KeywordRelated;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
+use App\Models\Template\BSetting;
+use App\Models\Template\BTemplate;
 use App\Models\User\User;
 use App\Models\User\User;
 use App\Rules\Ids;
 use App\Rules\Ids;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
@@ -51,6 +53,7 @@ class ProductController extends BaseController
             foreach ($lists['list'] as $k=>$v){
             foreach ($lists['list'] as $k=>$v){
                 //处理参数
                 //处理参数
                 $v = $this->handleParam($v);
                 $v = $this->handleParam($v);
+                $v['is_renovation']  =  $this->getProductIsRenovation($v['id']);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }
@@ -58,6 +61,32 @@ class ProductController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :查看产品是否已装修
+     * @name   :getProductIsRenovation
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/13 14:02
+     */
+    public function getProductIsRenovation($id){
+        $templateSettingModel = new BSetting();
+        $info = $templateSettingModel->read(['project_id'=>$this->user['project_id']]);
+        if($info !== false){
+            $webTemplateModel = new BTemplate();
+            $param = [
+                'source'=>2,
+                'project_id'=>$this->user['project_id'],
+                'source_id'=>$id,
+                'template_id'=>$info['template_id']
+            ];
+            $templateInfo = $webTemplateModel->read($param);
+            if($templateInfo !== false){
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    /**
      * @remark :处理列表参数
      * @remark :处理列表参数
      * @name   :handleParam
      * @name   :handleParam
      * @author :lyh
      * @author :lyh

@@ -260,11 +260,9 @@ class ProjectLogic extends BaseLogic
      */
      */
     public function setTypeSevenEdit($param){
     public function setTypeSevenEdit($param){
         $info = $this->model->read(['id'=>$param['id']]);
         $info = $this->model->read(['id'=>$param['id']]);
-
         if($info['delete_status'] == 0){
         if($info['delete_status'] == 0){
             //删除原始项目
             //删除原始项目
             $this->edit(['delete_status' => 1], ['id' => $param['id']]);
             $this->edit(['delete_status' => 1], ['id' => $param['id']]);
-
             //添加到续费单
             //添加到续费单
             $data = [
             $data = [
                 'title' => '【续费单】' . $param['title'],
                 'title' => '【续费单】' . $param['title'],
@@ -277,7 +275,6 @@ class ProjectLogic extends BaseLogic
                 'cooperate_date' => $param['cooperate_date'],
                 'cooperate_date' => $param['cooperate_date'],
                 'service_duration' => $param['deploy_build']['service_duration'],
                 'service_duration' => $param['deploy_build']['service_duration'],
                 'plan' => $param['deploy_build']['plan'],
                 'plan' => $param['deploy_build']['plan'],
-//            'api_no' => $param['id'],  //改手动填
                 'amount' => $param['payment']['amount'],
                 'amount' => $param['payment']['amount'],
                 'contract' => json_encode($param['payment']['contract']),
                 'contract' => json_encode($param['payment']['contract']),
                 'bill' => json_encode($param['payment']['bill']),
                 'bill' => json_encode($param['payment']['bill']),
@@ -285,7 +282,6 @@ class ProjectLogic extends BaseLogic
             $renewModel = new ProjectRenew();
             $renewModel = new ProjectRenew();
             $renewModel->add($data);
             $renewModel->add($data);
         }
         }
-
         return $this->success();
         return $this->success();
     }
     }