Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/customerBuler-crm/src/App.vue

@@ -3,12 +3,32 @@
 </template>
 
 <script setup lang="ts">
+import { onMounted, ref, provide, inject } from 'vue'
 import { useStore } from '@/store/index'
+import { ElNotification } from 'element-plus'
 const { setAsyncRoutesMark } = useStore()
 window.addEventListener('beforeunload', () => beforeunloadFn())
 const beforeunloadFn = (() => {
   setAsyncRoutesMark(false)
 })
+
+provide<GlobalPopup>('globalPopup', {
+  showSuccess: (msg: string, time: number, icon: string) => { notificationTiop }, //!SECTION 成功
+  showError: (msg: string, time: number, icon: string) => { notificationTiop }, //!SECTION 失败
+  showWarning: (msg: string, time: number, icon: string) => { notificationTiop }, //!SECTION 警告
+  showInfo: (msg: string, time: number, icon: string) => { notificationTiop }, //!SECTION 文本
+})
+
+const notificationTiop = (msg: string, time: number, icon: string, type: string) => {
+  let obj: any = {}
+  obj.title = '提示'
+  obj.message = msg
+  time ? obj.duration = time : obj.duration = 2000
+  icon ? obj.iconClass = icon : obj.iconClass = ''
+  type ? obj.type = type : obj.type = 'success'
+  ElNotification(obj)
+}
+
 </script>
 
 <style>

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/api.ts

@@ -1 +1,3 @@
-export const SENDVCODE = "/user/sendVcode"; //发送验证码
+export const SENDVCODE = "/user/sendVcode";     //发送验证码
+export const REGISTER = "/user/insertCompany";  //注册
+export const LOGIN = "/user/loginAdmin";        //登录

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/home.vue

@@ -8,8 +8,12 @@
                 <el-aside class="home-el-aside" width="220px">
                     <el-menu default-active="1" class="el-menu-vertical-demo">
                         <el-menu-item :index="(index + 1) + ''" v-for="(item, index) in 10" :key="index">
-                            <el-icon><setting /></el-icon>
-                            <span>第{{ index + 1 }}个</span>
+                            <div class="relativeElem">
+                                <el-icon>
+                                    <setting />
+                                </el-icon>
+                                <span>第{{ index + 1 }}个</span>
+                            </div>
                         </el-menu-item>
 
                         <el-sub-menu index="11">
@@ -20,8 +24,10 @@
                                 <span>第十一个</span>
                             </template>
                             <el-menu-item :index="'11'">
-                                <el-icon><icon-menu /></el-icon>
-                                <span>第11-1个</span>
+                                <div class="relativeElem">
+                                    <el-icon><icon-menu /></el-icon>
+                                    <span>第11-1个</span>
+                                </div>
                             </el-menu-item>
                         </el-sub-menu>
                     </el-menu>
@@ -39,13 +45,39 @@
 </script>
 <style scoped lang="scss">
 .common-layout {
+    .relativeElem {
+        position: relative;
+        z-index: 2;
+        display: flex;
+        align-items: center;
+    }
+
     .el-header {
         background: $darkBlue;
     }
 
     .el-menu-vertical-demo {
         height: 100%;
+        background: $ashen;
+
+        .is-active {
+            position: relative;
+            color: $modena;
+
+            &:before {
+                content: '';
+                position: absolute;
+                right: 0;
+                top: 8px;
+                width: 95%;
+                height: 40px;
+                background: $backColor;
+                border-top-left-radius: 20px;
+                border-bottom-left-radius: 20px;
+            }
+        }
     }
+
     .el-main {
         padding: 0 20px;
         background: $backColor;

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/login.vue

@@ -7,8 +7,8 @@
       <h2 class="text-xl text-center pt-4 font-bold">客户管家</h2>
       <el-form class="pt-4" ref="ruleFormRef" :model="ruleForm" :rules="rules">
         <el-form-item prop="username">
-          <el-input clearable :prefix-icon="UserFilled" size="large" class="mt-2" v-model="ruleForm.username" autocomplete="off"
-            placeholder="账号/手机号" />
+          <el-input clearable :prefix-icon="UserFilled" size="large" class="mt-2" v-model="ruleForm.username"
+            autocomplete="off" placeholder="账号/手机号" />
         </el-form-item>
         <el-form-item prop="password">
           <el-input clearable :prefix-icon="Lock" show-password size="large" class="mt-4" v-model="ruleForm.password"
@@ -40,15 +40,18 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref } from "vue";
+import { reactive, ref, inject } from "vue";
 import { useRouter } from "vue-router";
 import loginLogo from "@/assets/login/login_logo.png";
 import qiyeweixin from "@/assets/login/qiyeweixin.png";
 import { UserFilled, Lock } from '@element-plus/icons-vue'
-import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
 import { useStore } from '@/store/index'
+import { post } from "@/utils/request";
+import { LOGIN } from "./api";
 const { setRouters } = useStore()
 const router = useRouter();
+const globalPopup = inject<GlobalPopup>('globalPopup')
 const ruleFormRef = ref<FormInstance>();
 const ruleForm = ref({
   username: "",
@@ -71,8 +74,34 @@ const login = (formEl: FormInstance | undefined) => {
     }
     loginLoading.value = true;
     console.log(ruleForm.value);
+    post(LOGIN, { ...ruleForm.value }).then(res => {
+      console.log(res);
+      globalPopup?.showSuccess('登录成功', 1000, '')
+      // if(res.code == 'error') {
+      //   ElMessage.error({
+      //     message: "登录失败",
+      //     type: "error",
+      //     duration: 2000,
+      //   })
+      //   loginLoading.value = false;
+      //   return
+      // }
+      // ElMessage.success({
+      //   message: "登录成功",
+      //   type: "success",
+      //   duration: 2000,
+      // })
+      // setTimeout(() => {
+      //   loginLoading.value = false;
+      // }, 1000)
+      // loginLoading.value = false;
+    }).catch(err => {
+      console.log(err)
+      loginLoading.value = false;
+    })
+    return
     let newRouter = [
-      { 
+      {
         path: '/thread',
         name: 'thread'
       }

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/register.vue

@@ -53,7 +53,7 @@ import { HomeFilled, UserFilled, Lock, Iphone, Tickets } from '@element-plus/ico
 import { ElNotification, ElMessage, type FormInstance, type FormRules } from 'element-plus'
 import { isValueEmpty } from "@/utils/tools";
 import { post } from "@/utils/request";
-import { SENDVCODE } from "./api";
+import { REGISTER, SENDVCODE } from "./api";
 const router = useRouter();
 const route = useRoute();
 const ruleFormRef = ref<FormInstance>();
@@ -118,19 +118,19 @@ const sendVcode = () => {
     })
     return
   }
-  // post(SENDVCODE, {
-  //   mobile: ruleForm.value.phone
-  // }).then(res => {
-  //   if (res.code == "ok") { 
-  //     ElMessage.success({
-  //       message: "发送成功",
-  //       type: "success",
-  //       duration: 2000,
-  //     })
-  //     showTimer.value = true;
-  //   countDown();
-  //   }
-  // })
+  post(SENDVCODE, {
+    mobile: ruleForm.value.phone
+  }).then(res => {
+    if (res.code == "ok") {
+      ElMessage.success({
+        message: "发送成功",
+        type: "success",
+        duration: 2000,
+      })
+      showTimer.value = true;
+      countDown();
+    }
+  })
 }
 const register = (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -145,27 +145,45 @@ const register = (formEl: FormInstance | undefined) => {
     let params = {
       ...ruleForm.value,
     }
+    /* 如果地址栏有参数，就带上 */
     if (!isValueEmpty(route.query)) {
       params = {
         ...params,
         ...route.query
       }
     }
-    console.log(params);
-    // if (res.code == "ok") { 
-    //   ElNotification.success({
-    //     title: "注册成功",
-    //     message: "注册成功",
-    //     type: "success",
-    //     duration: 1000,
-    //     onClose: () => {
-    //       router.push('/login')
-    //     }
-    //   })
-    // }
-
+    // console.log(params);
+    post(REGISTER, params).then(res => {
+      if (res.code == "ok") {
+        ElNotification.success({
+          title: "提示",
+          message: "注册成功",
+          type: "success",
+          duration:3000,
+          onClose: () => {
+            registerLoading.value = false;
+            router.back()
+          }
+        })
+      } else {
+        ElNotification.error({
+          title: "提示",
+          message: res.message || res.msg,
+          type: "success",
+          duration: 3000,
+        })
+        registerLoading.value = false;
+      }
+    }).catch(err => {
+      ElNotification.error({
+        title: "提示",
+        message: err.message || err.msg,
+        type: "success",
+        duration: 3000,
+      })
+      registerLoading.value = false;
+    })
 
-    registerLoading.value = false;
   })
 
 };

fhKeeper/formulahousekeeper/customerBuler-crm/src/styles/global.scss

@@ -4,6 +4,7 @@ $backColor: #EEF3F6;
 $black: #000;
 $fontBlack: #333;
 $fontGray: #999;
+$modena: #6F4AFE;
 
 .text-gray{
     color : $fontGray

fhKeeper/formulahousekeeper/customerBuler-crm/src/type.d.ts

@@ -0,0 +1,6 @@
+type GlobalPopup = {
+  showSuccess: (msg: string, time: number, icon: string) => void;
+  showError: (msg: string, time: number, icon: string) => void;
+  showWarning: (msg: string, time: number, icon: string) => void;
+  showInfo: (msg: string, time: number, icon: string) => void;
+};

fhKeeper/formulahousekeeper/customerBuler-crm/src/utils/request.ts

@@ -2,7 +2,7 @@ import axios from "axios";
 import { showMessage } from "./errorStatusCode"; // 引入状态码文件
 import type { AxiosRequestConfig, AxiosResponse, AxiosError } from "axios";
 import { ElNotification } from "element-plus";
-const baseURL='/api'
+const baseURL = "/api";
 // 创建axios实例
 const instance = axios.create({
   baseURL, // 设置API的基础URL
@@ -42,9 +42,9 @@ instance.interceptors.response.use(
 );
 
 // 封装GET请求
-export async function get<T>(url: string, params?: any): Promise<T> {
+export async function get(url: string, params?: any): Promise<any> {
   return instance
-    .get<T>(url, { params })
+    .get(url, { params })
     .then((response) => response.data)
     .catch((error) => {
       throw error;
@@ -52,9 +52,9 @@ export async function get<T>(url: string, params?: any): Promise<T> {
 }
 
 // 封装POST请求
-export async function post<T>(url: string, data?: any): Promise<T> {
+export async function post(url: string, data?: any): Promise<any> {
   return instance
-    .post<T>(url, data, {
+    .post(url, data, {
       headers: {
         "Content-type": " application/x-www-form-urlencoded; charset=UTF-8",
       },

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/ClueController.java

@@ -1,8 +1,14 @@
 package com.management.platform.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.Clue;
+import com.management.platform.entity.SysDict;
+import com.management.platform.entity.User;
+import com.management.platform.mapper.SysDictMapper;
+import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ClueService;
+import com.management.platform.service.UserService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -11,7 +17,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,17 +35,55 @@ import java.util.List;
 public class ClueController {
     @Resource
     private ClueService clueService;
+    @Resource
+    private UserMapper userMapper;
+
+    @Resource
+    private SysDictMapper sysDictMapper;
 
-//    @RequestMapping("listClue")
-//    public Object list(@RequestBody Clue clue){
-//        clueService.getList(clue);
-//        return
-//    }
-    @RequestMapping("/inserANdUpdate")
-    public Object inserANdUpdate(@RequestBody Clue clue){
+
+    @RequestMapping("getClueSources")
+    public Object getClueSources(){
+        QueryWrapper<SysDict> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("code", "ClueSources");
+        return sysDictMapper.selectList(queryWrapper);
+    }
+    @RequestMapping("getDetail")
+    public Object getDetail(@RequestBody Clue clue){
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.setData(clueService.getInfo(clue));
+        return msg;
+    }
+    @RequestMapping("listClue")
+    public Object list(@RequestBody Clue clue, HttpServletRequest request){
+        //TODO token待定
+        // User user = userMapper.selectById(request.getHeader(  "Token"));
+        // clue.setCompanyId(user.getCompanyId());
+        List<Clue> list =  clueService.getList(clue);
+        HashMap<Object, Object> map = new HashMap<>();
+        map.put("data",list);
+        map.put("total",clueService.getTotal(clue));
+        return map;
+    }
+    @RequestMapping("listDeleterClue")
+    public Object listDeleterClue(@RequestBody Clue clue, HttpServletRequest request){
+        //TODO token待定
+        // User user = userMapper.selectById(request.getHeader(  "Token"));
+        // clue.setCompanyId(user.getCompanyId());
+        List<Clue> list =  clueService.getDeleterList(clue);
+        HashMap<Object, Object> map = new HashMap<>();
+        map.put("data",list);
+        map.put("total",clueService.getDeleterTotal(clue));
+        return map;
+    }
+    @RequestMapping("/insertAndUpdate")
+    public Object inserANdUpdate(@RequestBody Clue clue, HttpServletRequest request){
         HttpRespMsg msg = new HttpRespMsg();
         //操作前校验
-        if (null == clue.getClueName() || "" == clue.getClueName()){
+        //TODO token待定
+        // User user = userMapper.selectById(request.getHeader(  "Token"));
+        // Integer companyId = user.getCompanyId();
+        if (null == clue.getClueName() || "".equals(clue.getClueName())){
             msg.setError("线索名称不能为空");
             return msg;
         }
@@ -51,7 +98,12 @@ public class ClueController {
             msg.setMsg("操作成功");
         }else {
             //新增
+            //TODO token待定
+            // clue.setCompanyId(companyId);
+            // clue.setCreateId(user.getId());
+
             clueService.insert(clue);
+
             msg.setMsg("操作成功");
         }
         return  msg;
@@ -66,5 +118,23 @@ public class ClueController {
         return msg;
     }
 
+    @RequestMapping("rollback")
+    public Object rollback(@RequestBody List<Integer> ids){
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.setMsg("操作成功");
+        clueService.isRollback(ids);
+        return msg;
+    }
+    @RequestMapping("deleterDelete")
+    public Object deleterDelete(@RequestBody List<Integer> ids){
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.setMsg("操作成功");
+        clueService.deleterDelete(ids);
+        return msg;
+    }
+
+
+
+
 }
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/ClueLogController.java

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+@RestController
+@RequestMapping("/clue-log")
+public class ClueLogController {
+
+}
+

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/SysDictController.java

@@ -1,10 +1,26 @@
 package com.management.platform.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.management.platform.entity.Clue;
+import com.management.platform.entity.Custom;
+import com.management.platform.entity.SysDict;
+import com.management.platform.entity.SysForm;
+import com.management.platform.mapper.UserMapper;
+import com.management.platform.service.ClueService;
+import com.management.platform.service.CustomService;
+import com.management.platform.service.SysDictService;
+import com.management.platform.service.SysFormService;
+import com.management.platform.util.HttpRespMsg;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
  *  前端控制器
@@ -16,6 +32,97 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/sys-dict")
 public class SysDictController {
+    @Resource
+    private SysDictService sysDictService;
+    @Resource
+    private HttpServletRequest request;
+    @Resource
+    private UserMapper userMapper;
+    @Resource
+    private ClueService clueService;
+    @Resource
+    private CustomService customService;
+
+
+    @RequestMapping("/list")
+    public HttpRespMsg list(){
+        HttpRespMsg msg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        List<SysDict> list = sysDictService.list(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCompanyId, companyId));
+        msg.setData(list);
+        return msg;
+    }
+
+    @RequestMapping("/getListByCode")
+    public HttpRespMsg getListByCode(@RequestParam String code){
+        HttpRespMsg msg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        List<SysDict> sysDictList = sysDictService.list(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCompanyId, companyId).eq(SysDict::getCode, code).orderByAsc(SysDict::getSeq));
+        msg.setData(sysDictList);
+        return msg;
+    }
+
+    @RequestMapping("addOrUpdate")
+    public HttpRespMsg addOrUpdate(SysDict sysDict){
+        HttpRespMsg msg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        sysDict.setCompanyId(companyId);
+        Integer count;
+        if(sysDict.getId()==null){
+            count = sysDictService.count(new LambdaQueryWrapper<SysDict>().eq(SysDict::getCode, sysDict.getCode()).eq(SysDict::getName,sysDict.getName()).eq(SysDict::getCompanyId, companyId));
+        }else {
+            count = sysDictService.count(new LambdaQueryWrapper<SysDict>().ne(sysDict.getId()!=null,SysDict::getId, sysDict.getId()).eq(SysDict::getName,sysDict.getName()).eq(SysDict::getCode, sysDict.getCode()).eq(SysDict::getCompanyId, companyId));
+        }
+        if(count>0){
+            msg.setError("名称为["+sysDict.getName()+"]的自定义配置名称已存在");
+            return msg;
+        }
+
+        if(!sysDictService.saveOrUpdate(sysDict)){
+            msg.setError("验证失败");
+        };
+        return msg;
+    }
 
+    @RequestMapping("/delete")
+    public HttpRespMsg delete(Integer id,String code){
+        HttpRespMsg msg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        int count;
+        switch (code){
+            case "ClueSources":
+                count= clueService.count(new LambdaQueryWrapper<Clue>().eq(Clue::getCompanyId, companyId).eq(Clue::getClueSourceId, id));
+                if(count>0){
+                    msg.setError("当前线索来源数据已被使用无法删除");
+                    return msg;
+                }
+                break;
+            case "CustomLevel":
+                count = customService.count(new LambdaQueryWrapper<Custom>().eq(Custom::getCompanyId, companyId).eq(Custom::getCustomerLevelId, id));
+                if(count>0){
+                    msg.setError("当前客户级别数据已被使用无法删除");
+                    return msg;
+                }
+                break;
+            case "CustomSources":
+                count = customService.count(new LambdaQueryWrapper<Custom>().eq(Custom::getCompanyId, companyId).eq(Custom::getCustomSourceId, id));
+                if(count>0){
+                    msg.setError("当前客户来源数据已被使用无法删除");
+                    return msg;
+                }
+                break;
+            case "CustomIndustry":
+                count = customService.count(new LambdaQueryWrapper<Custom>().eq(Custom::getCompanyId, companyId).eq(Custom::getCustomerIndustryId, id));
+                if(count>0){
+                    msg.setError("当前客户行业数据已被使用无法删除");
+                    return msg;
+                }
+                break;
+        }
+        if(!sysDictService.removeById(id)){
+            msg.setError("验证失败");
+        }
+        return msg;
+    }
 }
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/SysFormController.java

@@ -0,0 +1,86 @@
+package com.management.platform.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.management.platform.entity.SysForm;
+import com.management.platform.mapper.UserMapper;
+import com.management.platform.service.SysFormService;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Priority;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+@RestController
+@RequestMapping("/sys-form")
+public class SysFormController {
+    @Resource
+    private SysFormService sysFormService;
+    @Resource
+    private HttpServletRequest request;
+    @Resource
+    private UserMapper userMapper;
+
+
+    @RequestMapping("/list")
+    public HttpRespMsg list(){
+        HttpRespMsg msg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        List<SysForm> list = sysFormService.list(new LambdaQueryWrapper<SysForm>().eq(SysForm::getCompanyId, companyId));
+        msg.setData(list);
+        return msg;
+    }
+
+    @RequestMapping("/getListByCode")
+    public HttpRespMsg getListByCode(@RequestParam String code){
+        HttpRespMsg msg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        List<SysForm> sysFormList = sysFormService.list(new LambdaQueryWrapper<SysForm>().eq(SysForm::getCompanyId, companyId).eq(SysForm::getCode, code));
+        msg.setData(sysFormList);
+        return msg;
+    }
+
+    @RequestMapping("addOrUpdate")
+    public HttpRespMsg addOrUpdate(SysForm sysForm){
+        HttpRespMsg msg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        sysForm.setCompanyId(companyId);
+        Integer count;
+        if(sysForm.getId()==null){
+            count = sysFormService.count(new LambdaQueryWrapper<SysForm>().eq(SysForm::getCode, sysForm.getCode()).eq(SysForm::getName,sysForm.getName()).eq(SysForm::getCompanyId, companyId));
+        }else {
+            count = sysFormService.count(new LambdaQueryWrapper<SysForm>().ne(sysForm.getId()!=null,SysForm::getId, sysForm.getId()).eq(SysForm::getName,sysForm.getName()).eq(SysForm::getCode, sysForm.getCode()).eq(SysForm::getCompanyId, companyId));
+        }
+        if(count>0){
+            msg.setError("名称为["+sysForm.getName()+"]的自定义模板配置已存在");
+            return msg;
+        }
+        if(!sysFormService.saveOrUpdate(sysForm)){
+            msg.setError("验证失败");
+        };
+        return msg;
+    }
+
+    @RequestMapping("/delete")
+    public HttpRespMsg delete(Integer id){
+        HttpRespMsg msg=new HttpRespMsg();
+        if(!sysFormService.removeById(id)){
+            msg.setError("验证失败");
+        }
+        return msg;
+    }
+}
+

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/Clue.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -34,6 +35,9 @@ public class Clue extends Model<Clue> {
      */
     @TableField("company_id")
     private Integer companyId;
+    //创建人
+    @TableField("create_id")
+    private String createId;
 
     /**
      * 线索名称
@@ -41,6 +45,8 @@ public class Clue extends Model<Clue> {
     @TableField("clue_name")
     private String clueName;
 
+    private String companyName;
+
     /**
      * 线索来源
      */
@@ -130,6 +136,14 @@ public class Clue extends Model<Clue> {
      */
     @TableField("create_time")
     private Date createTime;
+    private Date startTime;
+    private Date endTime;
+
+    private Integer pageIndex;
+    private Integer pageFrom;
+
+    private List<ClueLog> clueLogList;
+
 
 
     @Override

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/ClueLog.java

@@ -0,0 +1,56 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ClueLog extends Model<ClueLog> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId("id")
+    private Long id;
+
+    @TableField("clue_id")
+    private Integer clueId;
+
+    /**
+     * 操作时间
+     */
+    @TableField("creat_time")
+    private Date creatTime;
+
+    /**
+     * 操作内容
+     */
+    @TableField("name")
+    private String name;
+
+    @TableField("user_id")
+    private String userId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/SysDict.java

@@ -1,5 +1,6 @@
 package com.management.platform.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -14,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2024-02-28
+ * @since 2024-03-04
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -23,17 +24,14 @@ public class SysDict extends Model<SysDict> {
 
     private static final long serialVersionUID=1L;
 
-    /**
-     * 字典代码
-     */
-    @TableId("code")
-    private String code;
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
 
     /**
-     * 字典值
+     * 字典编码
      */
-    @TableField("id")
-    private String id;
+    @TableField("code")
+    private String code;
 
     /**
      * 名字
@@ -53,7 +51,7 @@ public class SysDict extends Model<SysDict> {
 
     @Override
     protected Serializable pkVal() {
-        return this.code;
+        return this.id;
     }
 
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/SysForm.java

@@ -0,0 +1,70 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysForm extends Model<SysForm> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 表单对应模块路由
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 模板名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 公司ID
+     */
+    @TableField("company_id")
+    private Integer companyId;
+
+    /**
+     * 配置详情
+     */
+    @TableField("config")
+    private String config;
+
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 是否为当前模板 0-否 1-是
+     */
+    @TableField("is_current")
+    private Integer isCurrent;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/ClueLogMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.ClueLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+public interface ClueLogMapper extends BaseMapper<ClueLog> {
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/ClueMapper.java

@@ -3,6 +3,8 @@ package com.management.platform.mapper;
 import com.management.platform.entity.Clue;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +15,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ClueMapper extends BaseMapper<Clue> {
 
+    List<Clue> list(Clue clue);
+    List<Clue> Deleterlist(Clue clue);
+
+    Integer getTotal(Clue clue);
+    Integer getDeleterTotal(Clue clue);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/SysFormMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.SysForm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+public interface SysFormMapper extends BaseMapper<SysForm> {
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ClueLogService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.ClueLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+public interface ClueLogService extends IService<ClueLog> {
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ClueService.java

@@ -3,6 +3,7 @@ package com.management.platform.service;
 import com.management.platform.entity.Clue;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -19,4 +20,16 @@ public interface ClueService extends IService<Clue> {
     void update(Clue clue);
 
     void isDelete(List<Integer> ids);
+
+    List<Clue> getList(Clue clue);
+    List<Clue> getDeleterList(Clue clue);
+
+    Integer getTotal(Clue clue);
+    Integer getDeleterTotal(Clue clue);
+
+    Clue getInfo(Clue clue);
+
+    void isRollback(List<Integer> ids);
+
+    void deleterDelete(List<Integer> ids);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/SysFormService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.SysForm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+public interface SysFormService extends IService<SysForm> {
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ClueLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.ClueLog;
+import com.management.platform.mapper.ClueLogMapper;
+import com.management.platform.service.ClueLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+@Service
+public class ClueLogServiceImpl extends ServiceImpl<ClueLogMapper, ClueLog> implements ClueLogService {
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ClueServiceImpl.java

@@ -3,6 +3,8 @@ package com.management.platform.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.management.platform.entity.Clue;
+import com.management.platform.entity.ClueLog;
+import com.management.platform.mapper.ClueLogMapper;
 import com.management.platform.mapper.ClueMapper;
 import com.management.platform.service.ClueService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -11,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.beans.Transient;
 import java.util.Date;
 import java.util.List;
@@ -30,6 +33,8 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
     private SysFunctionService sysFunctionService;
     @Autowired
     private ClueMapper clueMapper;
+    @Autowired
+    private ClueLogMapper clueLogMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -37,7 +42,13 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
         setNull(clue);
         clue.setCreateTime(new Date());
         clueMapper.insert(clue);
-
+        Integer id = clue.getId();
+        ClueLog clueLog = new ClueLog();
+        clueLog.setClueId(id);
+        clueLog.setName("创建了线索");
+//        clueLog.setUserId(clue.getCreateId());
+        clueLog.setCreatTime(new Date());
+        clueLogMapper.insert(clueLog);
     }
 
     @Override
@@ -45,6 +56,12 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
     public void update(Clue clue) {
         setNull(clue);
         clueMapper.updateById(clue);
+        ClueLog clueLog = new ClueLog();
+        clueLog.setClueId(clue.getId());
+        clueLog.setName("编辑了线索");
+//        clueLog.setUserId(clue.getCreateId());
+        clueLog.setCreatTime(new Date());
+        clueLogMapper.insert(clueLog);
     }
 
     private Clue setNull(Clue clue) {
@@ -75,4 +92,51 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
         clue.setIsDelete(1);
         clueMapper.update(clue, updateWrapper);
     }
+
+    @Override
+    public List<Clue> getList(Clue clue) {
+        return clueMapper.list(clue);
+    }
+
+    @Override
+    public List<Clue> getDeleterList(Clue clue) {
+        return clueMapper.Deleterlist(clue);
+    }
+
+    @Override
+    public Integer getTotal(Clue clue) {
+        return clueMapper.getTotal(clue);
+    }
+    @Override
+    public Integer getDeleterTotal(Clue clue) {
+        return clueMapper.getDeleterTotal(clue);
+    }
+
+    @Override
+    public Clue getInfo(Clue clue) {
+        Clue clue1 = clueMapper.selectById(clue.getId());
+        QueryWrapper<ClueLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("clue_id",clue.getId());
+        List<ClueLog> logs = clueLogMapper.selectList(queryWrapper);
+        clue1.setClueLogList(logs);
+        return clue1;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void isRollback(List<Integer> ids) {
+        UpdateWrapper<Clue> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", ids);
+        Clue clue = new Clue();
+        clue.setIsDelete(0);
+        clueMapper.update(clue, updateWrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleterDelete(List<Integer> ids) {
+        clueMapper.deleteBatchIds(ids);
+    }
+
+
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/SysFormServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.SysForm;
+import com.management.platform.mapper.SysFormMapper;
+import com.management.platform.service.SysFormService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+@Service
+public class SysFormServiceImpl extends ServiceImpl<SysFormMapper, SysForm> implements SysFormService {
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -625,30 +625,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             }
             moduleList.add(findIndex,centerManageModule);
         }
-        //组装层级关系，默认只有两级
-        List<SysModule> menuList = new ArrayList<>();
-        for (SysModule module : moduleList) {
-            if (module.getParentId() == null) {
-                menuList.add(module);
-            }
-            if(timeType.getProjectCustom()==0){
-                if(module.getName().equals("项目表单设置")){
-                    continue;
-                }
-            }
-        }
-        for (SysModule mainMenu : menuList) {
-            List<SysModule> list = moduleList.stream().filter(mod -> mainMenu.getId().equals(mod.getParentId())).collect(Collectors.toList());
-            if(timeType.getProjectCustom()==0){
-                Optional<SysModule> first = list.stream().filter(l -> l.getName().equals("项目表单设置")).findFirst();
-                if(first.isPresent()){
-                    list.remove(first.get());
-                }
-            }
-            mainMenu.setChildren(list);
-        }
-
-        user.setModuleList(menuList);
         //此处返回权限集合
         List<Integer> functionIdList = new ArrayList<>();
         //获取角色所有的功能id
@@ -660,6 +636,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         //获取当前公司开启了得报表
         List<CompanyReport> companyReportList = companyReportMapper.selectList(new QueryWrapper<CompanyReport>().eq("company_id", company.getId()));
         List<Integer> formIds = companyReportList.stream().map(CompanyReport::getReportFormId).collect(Collectors.toList());
+        List<SysFunction> functionList=new ArrayList<>();
         if (functionIdList.size() > 0) {
             //根据功能id获取可用的操作代码
             if (formIds.size() == 0) {
@@ -704,12 +681,36 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 return wrapper;
             });
             functionQueryWrapper.orderByAsc("seq");
-            List<SysFunction> functionList = sysFunctionMapper.selectList(functionQueryWrapper);
+            functionList = sysFunctionMapper.selectList(functionQueryWrapper);
             functionList = functionList.stream().filter(f->functionIdList.contains(f.getId())).collect(Collectors.toList());
             user.setFunctionList(functionList);
-        } else {
-            user.setFunctionList(new ArrayList<>());
         }
+        //组装层级关系，默认只有两级
+        List<SysModule> menuList = new ArrayList<>();
+        for (SysModule module : moduleList) {
+            if (module.getParentId() == null) {
+                menuList.add(module);
+            }
+            if(timeType.getProjectCustom()==0){
+                if(module.getName().equals("项目表单设置")){
+                    continue;
+                }
+            }
+            //赋予菜单对应功能列表
+            module.setFunctionList(functionList.stream().filter(item -> item.getModuleId().equals(module.getId())).collect(Collectors.toList()));
+        }
+        for (SysModule mainMenu : menuList) {
+            List<SysModule> list = moduleList.stream().filter(mod -> mainMenu.getId().equals(mod.getParentId())).collect(Collectors.toList());
+            if(timeType.getProjectCustom()==0){
+                Optional<SysModule> first = list.stream().filter(l -> l.getName().equals("项目表单设置")).findFirst();
+                if(first.isPresent()){
+                    list.remove(first.get());
+                }
+            }
+            mainMenu.setChildren(list);
+        }
+
+        user.setModuleList(menuList);
     }
 
     private boolean judgeIsLeader(String userId) {
@@ -1272,7 +1273,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 //                task.setGroupId(taskGroup.getId());
 //                task.setSeq(0);
 //                task.setName(MessageUtils.message("Stages.example"));
-                taskMapper.insert(task);
+//                taskMapper.insert(task);
                 httpRespMsg.data = user;
             }
         }

fhKeeper/formulahousekeeper/management-crm/src/main/resources/logback.xml

@@ -14,11 +14,11 @@
 	
 	<!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/workTime.log</file>
+	    <file>${log.path}/crm.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
-			<fileNamePattern>${log.path}/workTime.%d{yyyy-MM-dd}.log.gz</fileNamePattern>
+			<fileNamePattern>${log.path}/crm.%d{yyyy-MM-dd}.log.gz</fileNamePattern>
 			<!-- 日志最大的历史 2天 -->
 			<maxHistory>7</maxHistory>
 		</rollingPolicy>

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/ClueLogMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.ClueLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ClueLog">
+        <id column="id" property="id" />
+        <result column="clue_id" property="clueId" />
+        <result column="creat_time" property="creatTime" />
+        <result column="name" property="name" />
+        <result column="user_id" property="userId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, clue_id, creat_time, name, user_id
+    </sql>
+
+</mapper>

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/ClueMapper.xml

@@ -8,7 +8,8 @@
         <result column="company_id" property="companyId" />
         <result column="clue_name" property="clueName" />
         <result column="clue_source_id" property="clueSourceId" />
-        <result column="contact_information" property="contactInformation" />
+        <result column="phone" property="phone" />
+        <result column="email" property="email" />
         <result column="customer_industry_id" property="customerIndustryId" />
         <result column="customer_level_id" property="customerLevelId" />
         <result column="address" property="address" />
@@ -20,11 +21,126 @@
         <result column="plate3" property="plate3" />
         <result column="plate4" property="plate4" />
         <result column="plate5" property="plate5" />
+        <result column="company_name" property="companyName" />
+        <result column="create_time" property="createTime" />
+        <result column="create_id" property="createId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_id, clue_name, clue_source_id, contact_information, customer_industry_id, customer_level_id, address, incharger_id, remark, is_delete, plate1, plate2, plate3, plate4, plate5
+        id, company_id, clue_name, clue_source_id, phone , email, customer_industry_id, customer_level_id, address, incharger_id, remark, is_delete, plate1, plate2, plate3, plate4, plate5,create_time,createId
     </sql>
+    <select id="list" resultType="com.management.platform.entity.Clue">
+        select c.id,
+               c.company_id,
+               (select company_name from company where company_id = c.id) companyName,
+               c.clue_name,
+               c.clue_source_id,
+               c.phone,
+               c.email,
+               c.customer_industry_id,
+               c.customer_level_id,
+               c.address,
+               c.incharger_id,
+               c.remark,
+               c.is_delete,
+               c.plate1,
+               c.plate2,
+               c.plate3,
+               c.plate4,
+               c.plate5,
+               c.create_time,
+               c.create_id
+        from Clue c
+        where
+            c.company_id = #{companyId} and is_delete = 0
+        <if test="startTime != null and endTime != null ">
+        and  c.create_time BETWEEN  #{startTime} and #{endTime}
+        </if>
+        <if test="clueName != null and clueName != '' ">
+        and  c.clue_name =  #{clueName}
+        </if>
+        <if test="clueSourceId != null">
+        and  c.clue_source_id =  #{clueSourceId}
+        </if>
+        <if test="customerIndustryId != null">
+        and  c.customer_industry_id =  #{customerIndustryId}
+        </if>
+        limit #{pageIndex},#{pageFrom}
+    </select>
+    <select id="Deleterlist" resultType="com.management.platform.entity.Clue">
+        select c.id,
+               c.company_id,
+               (select company_name from company where company_id = c.id) companyName,
+               c.clue_name,
+               c.clue_source_id,
+               c.phone,
+               c.email,
+               c.customer_industry_id,
+               c.customer_level_id,
+               c.address,
+               c.incharger_id,
+               c.remark,
+               c.is_delete,
+               c.plate1,
+               c.plate2,
+               c.plate3,
+               c.plate4,
+               c.plate5,
+               c.create_time,
+               c.create_id
+        from Clue c
+        where
+            c.company_id = #{companyId} and is_delete = 1
+        <if test="startTime != null and endTime != null ">
+        and  c.create_time BETWEEN  #{startTime} and #{endTime}
+        </if>
+        <if test="clueName != null and clueName != '' ">
+        and  c.clue_name =  #{clueName}
+        </if>
+        <if test="clueSourceId != null">
+        and  c.clue_source_id =  #{clueSourceId}
+        </if>
+        <if test="customerIndustryId != null">
+        and  c.customer_industry_id =  #{customerIndustryId}
+        </if>
+        limit #{pageIndex},#{pageFrom}
+    </select>
+    <select id="getTotal" resultType="java.lang.Integer">
+        select count(*)
+        from Clue c
+        where
+        c.company_id = #{companyId} and is_delete = 0
+        <if test="startTime != null and endTime != null ">
+            and  c.create_time BETWEEN  #{startTime} and #{endTime}
+        </if>
+        <if test="clueName != null and clueName != '' ">
+            and  c.clue_name =  #{clueName}
+        </if>
+        <if test="clueSourceId != null">
+            and  c.clue_source_id =  #{clueSourceId}
+        </if>
+        <if test="customerIndustryId != null">
+            and  c.customer_industry_id =  #{customerIndustryId}
+        </if>
+    </select>
+    <select id="getDeleterTotal" resultType="java.lang.Integer">
+        select count(*)
+        from Clue c
+        where
+        c.company_id = #{companyId} and is_delete = 1
+        <if test="startTime != null and endTime != null ">
+            and  c.create_time BETWEEN  #{startTime} and #{endTime}
+        </if>
+        <if test="clueName != null and clueName != '' ">
+            and  c.clue_name =  #{clueName}
+        </if>
+        <if test="clueSourceId != null">
+            and  c.clue_source_id =  #{clueSourceId}
+        </if>
+        <if test="customerIndustryId != null">
+            and  c.customer_industry_id =  #{customerIndustryId}
+        </if>
+    </select>
 
 </mapper>

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/SysDictMapper.xml

@@ -4,8 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.management.platform.entity.SysDict">
-        <id column="code" property="code" />
-        <result column="id" property="id" />
+        <id column="id" property="id" />
+        <result column="code" property="code" />
         <result column="name" property="name" />
         <result column="seq" property="seq" />
         <result column="company_id" property="companyId" />
@@ -13,7 +13,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        code, id, name, seq, company_id
+        id, code, name, seq, company_id
     </sql>
 
 </mapper>

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/SysFormMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.SysFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.SysForm">
+        <id column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="name" property="name" />
+        <result column="company_id" property="companyId" />
+        <result column="config" property="config" />
+        <result column="create_time" property="createTime" />
+        <result column="is_current" property="isCurrent" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, code, name, company_id, config, create_time, is_current
+    </sql>
+
+</mapper>

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectController.java

@@ -1260,8 +1260,8 @@ public class ProjectController {
 
     //FTE报表
     @RequestMapping("/getFTEData")
-    public HttpRespMsg getFTEData(@RequestParam Integer pageIndex, @RequestParam Integer pageSize,String monthStart,String monthEnd,String area,String sortProp, Integer sortOrder,HttpServletRequest request){
-        return projectService.getFTEData(pageIndex,pageSize,monthStart,monthEnd,area,sortProp,sortOrder,request);
+    public HttpRespMsg getFTEData(@RequestParam Integer pageIndex, @RequestParam Integer pageSize,String monthStart,String monthEnd,String area,String userId,String sortProp, Integer sortOrder,HttpServletRequest request){
+        return projectService.getFTEData(pageIndex,pageSize,monthStart,monthEnd,area,userId,sortProp,sortOrder,request);
     }
 
     //导出FTE报表

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProjectMapper.java

@@ -160,7 +160,7 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     List<Project> selectNearProject(String userId);
 
-    List<Map<String, Object>> getFTEData(Integer companyId, String startDate, String endDate, Integer start, Integer size, String area,String sortProp, Integer sortOrder, List<Integer> branchDepartment, List<Integer> deptIds);
+    List<Map<String, Object>> getFTEData(Integer companyId, String startDate, String endDate, Integer start, Integer size, String area,String userId,String sortProp, Integer sortOrder, List<Integer> branchDepartment, List<Integer> deptIds);
 
     List<Map<String, Object>> getTimeCostByToken(Integer companyId, String startDate, String endDate);
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProjectService.java

@@ -243,7 +243,7 @@ public interface ProjectService extends IService<Project> {
 
     HttpRespMsg nearProject(HttpServletRequest request);
 
-    HttpRespMsg getFTEData(Integer pageIndex, Integer pageSize,String monthStart,String monthEnd, String area,String sortProp, Integer sortOrder, HttpServletRequest request);
+    HttpRespMsg getFTEData(Integer pageIndex, Integer pageSize,String monthStart,String monthEnd, String area,String userId,String sortProp, Integer sortOrder, HttpServletRequest request);
 
     HttpRespMsg exportFTEData(String monthStart,String monthEnd, String area, HttpServletRequest request);
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -11289,7 +11289,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
     //获取FTE报表数据
     @Override
-    public HttpRespMsg getFTEData(Integer pageIndex, Integer pageSize,String monthStart,String monthEnd, String area,String sortProp, Integer sortOrder, HttpServletRequest request) {
+    public HttpRespMsg getFTEData(Integer pageIndex, Integer pageSize,String monthStart,String monthEnd, String area,String userId,String sortProp, Integer sortOrder, HttpServletRequest request) {
         HttpRespMsg httpRespMsg =new HttpRespMsg();
         User targetUser = userMapper.selectById(request.getHeader("token"));
         List<SysRichFunction> functionAllList = sysFunctionMapper.getRoleFunctions(targetUser.getRoleId(), "全部部门FTE报表");
@@ -11327,10 +11327,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         if(pageIndex!=null&&pageSize!=null){
             Integer size=pageSize;
             Integer start=(pageIndex-1)*size;
-            resultList=projectMapper.getFTEData(targetUser.getCompanyId(),startDate,endDate,start,size,area,sortProp,sortOrder,null,deptIds);
-            total=projectMapper.getFTEData(targetUser.getCompanyId(),startDate,endDate,null,null,area,sortProp,sortOrder,null,deptIds).size();
+            resultList=projectMapper.getFTEData(targetUser.getCompanyId(),startDate,endDate,start,size,area,userId,sortProp,sortOrder,null,deptIds);
+            total=projectMapper.getFTEData(targetUser.getCompanyId(),startDate,endDate,null,null,area,userId,sortProp,sortOrder,null,deptIds).size();
         }else{
-            resultList=projectMapper.getFTEData(targetUser.getCompanyId(),startDate,endDate,null,null,area,sortProp,sortOrder,null,deptIds);
+            resultList=projectMapper.getFTEData(targetUser.getCompanyId(),startDate,endDate,null,null,area,userId,sortProp,sortOrder,null,deptIds);
         }
         //固定月工时数 163.125
         double regularMonthTime=163.125;
@@ -11366,7 +11366,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         if (userCustoms.size() != 0){
             customName = userCustoms.get(0).getName();
         }
-        HttpRespMsg fteData = getFTEData(null, null, monthStart,monthEnd, area,null,null, request);
+        HttpRespMsg fteData = getFTEData(null, null, monthStart,monthEnd, area,null,null,null, request);
         LocalDate timeStart = LocalDate.parse(monthStart, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         LocalDate timeEnd = LocalDate.parse(monthEnd, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         timeStart=timeStart.with(TemporalAdjusters.firstDayOfMonth());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -8315,7 +8315,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     break;
                 }
             }
-            item.put("userName",(String) map.get("name"));
+            item.put("userName",(String) map.get("realName"));
             item.put("departmentName",departmentService.getSupDepartment(dept,departments));
             item.put("departmentId",dept.getCorpwxDeptid());
             item.put("projectCode",(String) map.get("projectCode"));

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -1744,6 +1744,9 @@
         <if test="area!=null and area != '' ">
             and u.plate1 = #{area}
         </if>
+        <if test="userId!=null and userId != '' ">
+            and u.id = #{userId}
+        </if>
         <if test="branchDepartment!=null and branchDepartment.size()>0">
             and u.department_id in
             <foreach collection="branchDepartment" open="(" close=")" separator="," item="item">

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -62,7 +62,7 @@
     </sql>
     <!--根据日期获取全部报告信息-->
     <select id="getAllReportByDate" resultType="java.util.Map">
-        SELECT a.id, c.name,c.job_number as jobNumber,c.corpwx_userid as corpwxUserId,c.corpwx_deptid as corpwxDeptId, b.project_name AS project,b.project_code as projectCode,b.category_name as categoryName, a.working_time AS duration, a.content, a.create_time   AS time,a.create_date as createDate,
+        SELECT a.id, c.name,uwb.name as realName,c.job_number as jobNumber,c.corpwx_userid as corpwxUserId,c.corpwx_deptid as corpwxDeptId, b.project_name AS project,b.project_code as projectCode,b.category_name as categoryName, a.working_time AS duration, a.content, a.create_time   AS time,a.create_date as createDate,
         a.state, a.time_type as timeType, a.cost, a.report_time_type as reportTimeType,a.start_time as startTime,u.job_number as jobNumber,
         a.end_time  as endTime, d.name as subProjectName,d.code as subProjectCode,a.task_id as taskId, task.name as taskName, a.is_overtime as isOvertime,a.progress as progress,
         a.department_audit_state as departmentAuditState, a.stage, a.pic_str as picStr, multi_worktime as multiWorktime,a.is_dept_audit as isDeptAudit,a.group_audit_state as groupAuditState,task_group.incharger_id as inchargerId,a.project_audit_state as projectAuditState,a.audit_dept_managerid as deptAuditorName
@@ -75,6 +75,7 @@
         JOIN project AS b ON a.project_id=b.id
         LEFT JOIN project_separate AS ps on b.id=ps.id
         LEFT JOIN user AS c ON a.creator_id=c.id
+        LEFT JOIN user_with_beisen AS uwb ON c.job_number=c.job_number
         left join sub_project as d on d.id = a.sub_project_id
         left join task on task.id = a.task_id
         left join report_extra_degree on report_extra_degree.id = a.degree_id
@@ -118,7 +119,7 @@
     </select>
 
     <select id="getAllReportByDateWithReportLog" resultType="java.util.Map">
-        SELECT a.id, c.name,c.job_number as jobNumber,c.corpwx_userid as corpwxUserId,c.corpwx_deptid as corpwxDeptId, b.project_name AS project,b.project_code as projectCode,b.category_name as categoryName, a.working_time AS duration, a.content, a.create_time   AS time,a.create_date as createDate,
+        SELECT a.id, c.name,uwb.name as realName,c.job_number as jobNumber,c.corpwx_userid as corpwxUserId,c.corpwx_deptid as corpwxDeptId, b.project_name AS project,b.project_code as projectCode,b.category_name as categoryName, a.working_time AS duration, a.content, a.create_time   AS time,a.create_date as createDate,
         a.state, a.time_type as timeType, a.cost, a.report_time_type as reportTimeType,a.start_time as startTime,u.job_number as jobNumber,
         a.end_time  as endTime, d.name as subProjectName,d.code as subProjectCode,a.task_id as taskId, task.name as taskName, a.is_overtime as isOvertime,a.progress as progress,
         a.department_audit_state as departmentAuditState, a.stage, a.pic_str as picStr, multi_worktime as multiWorktime,a.is_dept_audit as isDeptAudit,a.group_audit_state as groupAuditState,task_group.incharger_id as inchargerId,a.project_audit_state as projectAuditState,a.audit_dept_managerid as deptAuditorName
@@ -131,6 +132,7 @@
         JOIN project AS b ON a.project_id=b.id
         LEFT JOIN project_separate AS ps on b.id=ps.id
         LEFT JOIN user AS c ON a.creator_id=c.id
+        LEFT JOIN user_with_beisen AS uwb ON c.job_number=c.job_number
         left join sub_project as d on d.id = a.sub_project_id
         left join task on task.id = a.task_id
         left join report_extra_degree on report_extra_degree.id = a.degree_id
@@ -1063,8 +1065,9 @@
         ps.contract_code as contractCode,ps.project_category_sub as projectCategorySub,ps.region,DATE_FORMAT(p.create_date,'%Y-%m-%d') as createDate,DATE_FORMAT(ps.warranty_start_date,'%Y-%m-%d') as warrantyStartDate,
         DATE_FORMAT(ps.warranty_end_date,'%Y-%m-%d') as warrantyEndDate,DATE_FORMAT(p.finish_date,'%Y-%m-%d') as finishDate,ps.bu,IFNULL(p.man_day*8,0) as planTime,IFNULL(SUM(r.working_time),0) as realityTime,
         case  when p.man_day*8-SUM(r.working_time) &gt;= 0 then '否' else '是' end as isOver ,case when p.man_day*8-SUM(r.working_time) &gt; 0 then (p.man_day*8-SUM(r.working_time)) else '0' end as remaining,
-        (select GROUP_CONCAT(CONCAT(u.job_number,'/',u.name)) from participation pa
+        (select GROUP_CONCAT(CONCAT(u.job_number,'/',uwb.name)) from participation pa
         left join user u on pa.user_id=u.id
+        left join user_with_beisen uwb on u.job_number=uwb.job_number
         where pa.project_id=p.id ) as participations
         from project p
         left join project_main pm on p.project_main_id=pm.id
@@ -1096,12 +1099,14 @@
 
     <select id="getTaskGroupPlanTime" resultType="java.util.Map">
         select tg.project_id as projectId,tg.task_group_code as taskGroupCode,tg.name,tg.wbs_code as wbsCode,IFNULL(tg.man_day*8,0) as planTime,tg.id as groupId,
-        CONCAT(uu.job_number,'/',uu.name) as incahrgerName,
-        (select GROUP_CONCAT(CONCAT(u.job_number,'/',u.name)) from group_participator gp
+        CONCAT(uu.job_number,'/',uwb2.name) as incahrgerName,
+        (select GROUP_CONCAT(CONCAT(u.job_number,'/',uwb1.name)) from group_participator gp
         left join user u on gp.user_id=u.id
+        left join user_with_beisen uwb1 on u.job_number=uwb1.job_number
         where gp.group_id=tg.id ) as participations
         from task_group tg
         left join user uu on uu.id=tg.incharger_id
+        left join user_with_beisen uwb2 on uu.job_number=uwb2.job_number
         <where>
             tg.project_id in
             <foreach collection="list" open="(" close=")" separator="," item="item">

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -82,9 +82,9 @@
         <!-- 时间段筛选 ins == 6 || ins == 8 || ins == 9 || ins == 10 || ins == 11 || ins == 12 || ins == 5 || ins == 16 || ins == 17 || ins == 18 || ins == 20 || ins == 21 || ins == 22 -->
         <template v-if="screeningCondition.timePeriod.includes(ins)">
           <span>
-            <span class="demonstration" style="color:#999;padding:0 10px">
+            <!-- <span class="demonstration" style="color:#999;padding:0 10px">
               {{ ins == 15 ? $t('xiang-mu-chuang-jian-shi-jian-duan') : $t('message.period') }}
-            </span>
+            </span> -->
             <el-date-picker v-model="rangeDatas" type="daterange" value-format="yyyy-MM-dd" :placeholder="$t('selectstartdate')" @change="picks()" :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')" :end-placeholder="$t('time.endDate')" style="width:300px" :clearable="ins == 15" size="small"> </el-date-picker>
           </span>
         </template>
@@ -2495,6 +2495,7 @@ export default {
         monthStart: this.monthRange[0]+"-01",
         monthEnd: this.monthRange[1]+"-01",
         area: this.areaName || null,
+        userId:this.userId,
         pageIndex: this.page,
         pageSize: this.size
       }

fhKeeper/formulahousekeeper/timesheet_h5/src/views/task/editask.vue

@@ -151,6 +151,9 @@
                         <div class="popupSearch" v-if="user.userNameNeedTranslate != '1'">
                             <van-search v-model="executor.searchText" placeholder="输入员工姓名搜索" @search="onSearch" shape="round" background="#F4F4F4"></van-search>
                         </div>
+                        <div class="popupSearch" v-if="user.userNameNeedTranslate == '1'">
+                            <van-search v-model="executor.searchText" placeholder="输入员工姓名搜索" @search="getOnSearch(executor.searchText)" shape="round" background="#F4F4F4"></van-search>
+                        </div>
 
                         <div class="popupCon conBorder">
                             <van-radio-group v-model="executor.item" class="popupItem marginNone borderNone">
@@ -421,7 +424,9 @@ export default {
             this.finishDateShow = false
         },
         
-        executorChange(item,index){           // 选择执行人
+        executorChange(item,index){  // 选择执行人
+            this.executor.searchText = ''
+            this.getOnSearch('')
             this.executor.show = true
             this.executor.index = index
             this.executor.searchList.forEach(u=>{if (u.id == item.executorId) {