From cabf2cffb64e98401d87c2e03537720390e2f4ea Mon Sep 17 00:00:00 2001
From: xinyb <574600396@qq.com>
Date: 星期四, 05 九月 2024 10:01:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/com/yc/crm/clues/action/CluesController.java |  109 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 93 insertions(+), 16 deletions(-)

diff --git a/src/com/yc/crm/clues/action/CluesController.java b/src/com/yc/crm/clues/action/CluesController.java
index f62c99f..84bed6c 100644
--- a/src/com/yc/crm/clues/action/CluesController.java
+++ b/src/com/yc/crm/clues/action/CluesController.java
@@ -1,7 +1,10 @@
 package com.yc.crm.clues.action;
 
 import com.yc.action.BaseAction;
+import com.yc.crm.clues.entity.AssignCluesEntity;
+import com.yc.crm.clues.entity.CluesRequestEntity;
 import com.yc.crm.clues.entity.T481101Entity;
+import com.yc.crm.clues.entity.T481104Entity;
 import com.yc.crm.clues.service.CluesServiceIfc;
 import com.yc.exception.CallBackMessage;
 import com.yc.multiData.SpObserver;
@@ -19,29 +22,102 @@
 public class CluesController extends BaseAction {
     @Autowired
     CluesServiceIfc cluesServiceIfc;
-
     /**
-     * 杈撳嚭涓嬫媺鐩稿叧鏁版嵁
-     * 锛�-48013000锛氬叕鍙哥被鍨�
-     * 2锛�-48013001锛氶噰璐剰鍚�
-     * 3锛�-48013002锛氬勾閲囪喘棰�
-     * 4锛�-48013003锛氭椂鍖�
-     * 5锛�-48013004锛氳妯�
-     * 6锛�-48013005锛氳闂潵婧�
-     * 6锛�-48013006锛氳闂甀P鎵�鍦ㄥ湴
-     * 7锛�-48013007锛氱ぞ浜ゅ钩鍙�
-     * 8锛�-48013008锛氱數璇濆尯鍙�
-     * 9锛�-48013009锛氳亴绾�
-     * @param clues
+     * 鍒嗛厤绾跨储
      * @param request
      * @return
      */
-    @RequestMapping("/baseInfo.do")
-    public @ResponseBody Object saveClues( HttpServletRequest request){
+    @RequestMapping("/assign.do")
+    public @ResponseBody Object assign(@RequestBody AssignCluesEntity assignClues, HttpServletRequest request){
         CallBackMessage callBackMessage = new CallBackMessage();
         try {
             SpObserver.setDBtoInstance("_" + request.getSession().getAttribute(SessionKey.DATA_BASE_ID));
-            callBackMessage.setInfo(cluesServiceIfc.getBaseInfo());
+           cluesServiceIfc.assign(assignClues);
+            callBackMessage.sendSuccessMessageByDefault();
+            return callBackMessage.toJSONObject();
+        }catch (Exception e){
+            callBackMessage.sendErrorMessage(this.getErrorMsg(e));
+            return callBackMessage.toJSONObject();
+        }finally {
+            SpObserver.setDBtoInstance();
+        }
+    }
+    /**
+     * 鏀瑰彉绾跨储鐘舵��
+     * @param request
+     * @return
+     */
+    @RequestMapping("/changeStatus.do")
+    public @ResponseBody Object changeStatus(@RequestBody T481104Entity entity, HttpServletRequest request){
+        CallBackMessage callBackMessage = new CallBackMessage();
+        try {
+            SpObserver.setDBtoInstance("_" + request.getSession().getAttribute(SessionKey.DATA_BASE_ID));
+            entity.setOwnerCode(request.getSession().getAttribute(SessionKey.USERCODE)+"");
+            cluesServiceIfc.changeStatus(entity);
+            callBackMessage.sendSuccessMessageByDefault();
+            return callBackMessage.toJSONObject();
+        }catch (Exception e){
+            callBackMessage.sendErrorMessage(this.getErrorMsg(e));
+            return callBackMessage.toJSONObject();
+        }finally {
+            SpObserver.setDBtoInstance();
+        }
+    }
+    /**
+     * 鍏虫敞绾跨储
+     * @param request
+     * @return
+     */
+    @RequestMapping("/attention.do")
+    public @ResponseBody Object attention(@RequestBody CluesRequestEntity cluesRequest, HttpServletRequest request){
+        CallBackMessage callBackMessage = new CallBackMessage();
+        try {
+            SpObserver.setDBtoInstance("_" + request.getSession().getAttribute(SessionKey.DATA_BASE_ID));
+            cluesRequest.setCreateUsercode(request.getSession().getAttribute(SessionKey.USERCODE)+"");//鎸囧畾鏇存柊褰撳墠鐢ㄦ埛
+            cluesServiceIfc.attention(cluesRequest);
+            callBackMessage.sendSuccessMessageByDefault();
+            return callBackMessage.toJSONObject();
+        }catch (Exception e){
+            callBackMessage.sendErrorMessage(this.getErrorMsg(e));
+            return callBackMessage.toJSONObject();
+        }finally {
+            SpObserver.setDBtoInstance();
+        }
+    }
+    /**
+     * 鍒犻櫎鑱旂郴浜�
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping("/contact/del.do")
+    public @ResponseBody Object scheduleDel(Integer id, HttpServletRequest request) {
+        CallBackMessage callBackMessage = new CallBackMessage();
+        try {
+            SpObserver.setDBtoInstance("_" + request.getSession().getAttribute(SessionKey.DATA_BASE_ID));
+            cluesServiceIfc.contactDel(id);
+            callBackMessage.sendSuccessMessageByDefault();
+            return callBackMessage.toJSONObject();
+        } catch (Exception e) {
+            callBackMessage.sendErrorMessage(this.getErrorMsg(e));
+            return callBackMessage.toJSONObject();
+        } finally {
+            SpObserver.setDBtoInstance();
+        }
+    }
+    /**
+     * 绾跨储鍒楄〃
+     * @param request
+     * @return
+     */
+    @RequestMapping("/list.do")
+    public @ResponseBody Object list(@RequestBody CluesRequestEntity cluesRequest, HttpServletRequest request){
+        CallBackMessage callBackMessage = new CallBackMessage();
+        try {
+            SpObserver.setDBtoInstance("_" + request.getSession().getAttribute(SessionKey.DATA_BASE_ID));
+            cluesRequest.setDbid(request.getSession().getAttribute(SessionKey.DATA_BASE_ID)+"");
+            cluesRequest.setFormId(481101);
+            callBackMessage.setInfo(cluesServiceIfc.getAllClues(cluesRequest));
             callBackMessage.sendSuccessMessageByDefault();
             return callBackMessage.toJSONObject();
         }catch (Exception e){
@@ -67,6 +143,7 @@
             clues.setCompanyname(request.getSession().getAttribute(SessionKey.COMPANY_NAME)+"");
             clues.setCreateUsercode(request.getSession().getAttribute(SessionKey.USERCODE)+"");
             clues.setCreateUserName(request.getSession().getAttribute(SessionKey.USERNAME)+"");
+            clues.setFormId(481101);
                 cluesServiceIfc.save(clues);
             callBackMessage.sendSuccessMessageByDefault();
             return callBackMessage.toJSONObject();

--
Gitblit v1.8.0