客户信息系统

watero-rst-core/src/main/java/com.iamberry.rst.core/customer/CustomerBasicInfo.java

@@ -23,6 +23,12 @@ public class CustomerBasicInfo implements Serializable{
     private Integer idCreateBy;//创建人Id
     private String customerRemarks;//备注信息
     private String adminName;//管理员姓名
+    private Integer provinceName;//客户所在省份名称
+    private String cityName;//客户所在城市姓名
+    private Integer isLookAll;//是否查看全部客户 1：查看全部 2：查看自己的
+    private String contactPhone;//联系人电话
+    private String contactEmail;//联系人邮箱
+    private Integer isSelectAll;//是否查看包括删除的客户信息 1 是 2 否
 
     public Integer getCustomerId() {
         return customerId;
@@ -135,4 +141,53 @@ public class CustomerBasicInfo implements Serializable{
     public void setAdminName(String adminName) {
         this.adminName = adminName;
     }
+
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getContactPhone() {
+        return contactPhone;
+    }
+
+    public void setContactPhone(String contactPhone) {
+        this.contactPhone = contactPhone;
+    }
+
+    public String getContactEmail() {
+        return contactEmail;
+    }
+
+    public void setContactEmail(String contactEmail) {
+        this.contactEmail = contactEmail;
+    }
+
+    public Integer getProvinceName() {
+        return provinceName;
+    }
+
+    public void setProvinceName(Integer provinceName) {
+        this.provinceName = provinceName;
+    }
+
+    public Integer getIsLookAll() {
+        return isLookAll;
+    }
+
+    public void setIsLookAll(Integer isLookAll) {
+        this.isLookAll = isLookAll;
+    }
+
+    public Integer getIsSelectAll() {
+        return isSelectAll;
+    }
+
+    public void setIsSelectAll(Integer isSelectAll) {
+        this.isSelectAll = isSelectAll;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/sys/Admin.java

@@ -22,7 +22,7 @@ public class Admin implements Serializable {
 
     private Integer adminId;
 
-    private Integer adminDept;              // 1:技术组 2:销售组(深圳销售部) 3:客服组(客服运营部) 4:运营组（广州销售部） 5:其他（财务部） 6工厂生产部
+    private Integer adminDept;              // 1:技术组 2:销售组(深圳销售部) 3:客服组(客服运营部) 4:运营组（广州销售部） 5:其他（财务部） 6工厂生产部 7.管理部
 
     @NotBlank(message="姓名不能为空")
     @Length(min=2,max=10,message="姓名必须由2~10个字组成")

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/visitMapper.xml

@@ -0,0 +1,140 @@
+<?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.iamberry.rst.service.cm.mapper.VisitMapper" >
+  <resultMap id="BaseResultMap" type="Visit" >
+    <id column="visit_id" property="visitId" jdbcType="INTEGER" />
+    <result column="customer_id" property="customerId" jdbcType="INTEGER" />
+    <result column="admin_id" property="adminId" jdbcType="INTEGER" />
+    <result column="visit_name" property="visitName" jdbcType="VARCHAR" />
+    <result column="visit_tel" property="visitTel" jdbcType="CHAR" />
+    <result column="visit_date" property="visitDate" jdbcType="DATE" />
+    <result column="visit_time_select" property="visitTimeSelect" jdbcType="BIT" />
+    <result column="visit_status" property="visitStatus" jdbcType="TINYINT" />
+    <result column="visit_complete_date" property="visitCompleteDate" jdbcType="DATE" />
+    <result column="visit_complete_name" property="visitCompleteName" jdbcType="VARCHAR" />
+    <result column="visit_complete_tel" property="visitCompleteTel" jdbcType="CHAR" />
+    <result column="visit_complete_remark" property="visitCompleteRemark" jdbcType="VARCHAR" />
+    <result column="visit_create_time" property="visitCreateTime" jdbcType="TIMESTAMP" />
+    <result column="visit_update_time" property="visitUpdateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+      visit_id,
+      customer_id,
+      admin_id,
+      designated_admin_id,
+      visit_name,
+      visit_tel,
+      visit_date,
+      visit_time_select,
+      visit_status,
+      visit_complete_date,
+      visit_complete_name,
+      visit_complete_tel,
+      visit_complete_remark,
+      visit_complete_sex,
+      visit_create_time,
+      visit_update_time
+  </sql>
+  <select id="getVisit" resultMap="BaseResultMap" parameterType="Visit" >
+    select 
+    <include refid="Base_Column_List" />
+    from tb_rst_visit
+    <where>
+      <if test="visitId != null" >
+        AND visit_id = #{visitId}
+      </if>
+      <if test="customerId != null" >
+        AND customer_id = #{customerId}
+      </if>
+    </where>
+  </select>
+
+  <!-- 查询回访列表 -->
+  <select id="listVisit" parameterType="Visit" resultType="Visit">
+    SELECT
+      v.*,
+      a.admin_name designatedAdminName,
+      sa.admin_name adminName
+    FROM
+      tb_rst_visit v
+    LEFT JOIN tb_rst_sys_admin a ON v.designated_admin_id = a.admin_id
+    LEFT JOIN tb_rst_sys_admin sa ON v.admin_id = sa.admin_id
+    <where>
+      customer_id = #{customerId}
+    </where>
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tb_rst_visit
+    <where>
+      customer_id = #{customerId}
+    </where>
+  </delete>
+
+  <!-- 添加客诉回访信息 -->
+  <insert id="addVisitInfo" parameterType="Visit" useGeneratedKeys="true"  keyProperty="visitId" >
+    insert into tb_rst_visit (visit_id, customer_id, admin_id, designated_admin_id,
+      visit_name, visit_tel, visit_date, 
+      visit_time_select, visit_status, visit_complete_date, 
+      visit_complete_name, visit_complete_tel, visit_complete_remark, 
+      visit_complete_sex)
+    values (#{visitId,jdbcType=INTEGER}, #{customerId,jdbcType=INTEGER}, #{adminId,jdbcType=INTEGER}, #{designatedAdminId,jdbcType=INTEGER},
+      #{visitName,jdbcType=VARCHAR}, #{visitTel,jdbcType=CHAR}, #{visitDate,jdbcType=DATE}, 
+      #{visitTimeSelect,jdbcType=BIT}, #{visitStatus,jdbcType=TINYINT}, #{visitCompleteDate,jdbcType=DATE}, 
+      #{visitCompleteName,jdbcType=VARCHAR}, #{visitCompleteTel,jdbcType=CHAR}, #{visitCompleteRemark,jdbcType=VARCHAR}, 
+      #{visitCompleteSex})
+  </insert>
+  <!-- 修改回访信息内容 -->
+  <update id="updateVisit" parameterType="Visit" >
+    update tb_rst_visit
+    <set >
+      <if test="adminId != null" >
+        admin_id = #{adminId},
+      </if>
+      <if test="visitName != null" >
+        visit_name = #{visitName},
+      </if>
+      <if test="visitTel != null" >
+        visit_tel = #{visitTel},
+      </if>
+      <if test="visitDate != null" >
+        visit_date = #{visitDate},
+      </if>
+      <if test="visitTimeSelect != null" >
+        visit_time_select = #{visitTimeSelect},
+      </if>
+      <if test="visitStatus != null" >
+        visit_status = #{visitStatus},
+      </if>
+      <if test="visitCompleteDate != null" >
+        visit_complete_date = #{visitCompleteDate},
+      </if>
+      <if test="visitCompleteName != null" >
+        visit_complete_name = #{visitCompleteName},
+      </if>
+      <if test="visitCompleteTel != null" >
+        visit_complete_tel = #{visitCompleteTel},
+      </if>
+      <if test="visitCompleteRemark != null" >
+        visit_complete_remark = #{visitCompleteRemark},
+      </if>
+      <if test="visitCreateTime != null" >
+        visit_create_time = #{visitCreateTime},
+      </if>
+      <if test="visitUpdateTime != null" >
+        visit_update_time = #{visitUpdateTime},
+      </if>
+      <if test="visitCompleteSex != null and visitCompleteSex != ''">
+        visit_complete_sex = #{visitCompleteSex},
+      </if>
+    </set>
+    <where>
+      <if test="visitId != null and visitId != ''">
+        visit_id = #{visitId}
+      </if>
+      <if test="customerId != null and customerId != ''">
+        and customer_id = #{customerId}
+      </if>
+    </where>
+  </update>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/customer/mapper/CustomerBasicMapper.xml

@@ -16,36 +16,50 @@
       bi.update_date updateDate,
       bi.id_create_by idCreateBy,
       bi.customer_remarks customerRemarks,
-      sa.admin_name adminName
+      sa.admin_name adminName,
+      ap.province provinceName,
+      sa.city cityName
       from tb_rst_customer_basic_info bi
       LEFT JOIN tb_rst_sys_admin sa on bi.id_create_by = sa.admin_id
+      LEFT JOIN tb_rst_address_provinces ap on ap.province_number = bi.customer_province_code
+      LEFT JOIN tb_rst_address_cities ac on ac.city_number = bi.customer_city_code
+      LEFT JOIN tb_rst_docked_contact_info ci on ci.customer_id = bi.customer_id
       <where>
         <if test="customerName != null and customerName!='' ">
-          customer_name like CONCAT('%',#{customerName},'%')
+            bi.customer_name like CONCAT('%',#{customerName},'%')
         </if>
         <if test="customerIndustry != null and customerIndustry!='' ">
-          AND customer_industry = #{customerIndustry}
+          AND bi.customer_industry = #{customerIndustry}
         </if>
         <if test="customerType != null and customerType!='' ">
-          AND customer_type = #{customerType}
+          AND bi.customer_type = #{customerType}
         </if>
         <if test="cooperativeState != null and cooperativeState!='' ">
-          AND cooperative_state = #{cooperativeState}
+          AND bi.cooperative_state = #{cooperativeState}
         </if>
         <if test="customerProvinceCode != null and customerProvinceCode!='' ">
-          AND customer_province_code = #{customerProvinceCode}
+          AND bi.customer_province_code = #{customerProvinceCode}
         </if>
         <if test="customerCityCode != null and customerCityCode!='' ">
-          AND customer_city_code = #{customerCityCode}
+          AND bi.customer_city_code = #{customerCityCode}
         </if>
         <if test="customerAddress != null and customerAddress!='' ">
-          AND customer_address = #{customerAddress}
+          AND bi.customer_address = #{customerAddress}
         </if>
         <if test="customerStatus != null and customerStatus!='' ">
-          AND customer_status = #{customerStatus}
+          AND bi.customer_status = #{customerStatus}
         </if>
         <if test="idCreateBy != null and idCreateBy!='' ">
-          AND id_create_by = #{idCreateBy}
+          AND bi.id_create_by = #{idCreateBy}
+        </if>
+        <if test="contactPhone != null and contactPhone!='' ">
+          AND ci.contact_phone = #{contactPhone}
+        </if>
+        <if test="contactEmail != null and contactEmail!='' ">
+          AND ci.contact_email = #{contactEmail}
+        </if>
+        <if test="isSelectAll != null and isSelectAll!='' ">
+          AND bi.customer_status = #{isSelectAll}
         </if>
       </where>
   </select>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/customer/CustomerBasicController.java

@@ -6,7 +6,9 @@ import com.iamberry.rst.core.order.ProductType;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.PtsMachine;
+import com.iamberry.rst.core.sys.Admin;
 import com.iamberry.rst.faces.customer.CustomerBasicService;
+import com.iamberry.rst.faces.sys.SysService;
 import com.iamberry.rst.utils.AdminUtils;
 import com.iamberry.rst.utils.StitchAttrUtil;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -23,10 +25,12 @@ import java.util.List;
  * Created by Administrator on 2018/4/20.
  */
 @Controller
-@RequestMapping("/admin/CustomerBasic")
+@RequestMapping("/admin/customerBasic")
 public class CustomerBasicController {
     @Autowired
     private CustomerBasicService customerBasicService;
+    @Autowired
+    private SysService sysService;
     /**
      * 查询客户基本信息列表
      *
@@ -34,7 +38,7 @@ public class CustomerBasicController {
      * @author LJK
      * @date 时间
      */
-    @RequiresPermissions("CustomerBasic:select_all:CustomerBasic")
+    @RequiresPermissions("customerBasic:select_all:customerBasic")
     @RequestMapping("/listCustomerBasic")
     public ModelAndView listCustomerBasic(HttpServletRequest request, CustomerBasicInfo customerBasicInfo,
                                        @RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
@@ -43,6 +47,17 @@ public class CustomerBasicController {
         ModelAndView mv = new ModelAndView("customer/customer_basic_list");
         //获取登录员工id
         Integer adminId = AdminUtils.getLoginAdminId();
+        Admin admin = new Admin();
+        admin.setAdminId(adminId);
+        admin = sysService.get(admin);
+        if(admin.getAdminDept() == 7 || admin.getAdminDept() == 5){//管理部以及财务部
+            customerBasicInfo.setIsSelectAll(1);
+        }else if(admin.getAdminDept() == 2){//销售部（业务员）
+            customerBasicInfo.setIsSelectAll(2);
+        }
+        if(customerBasicInfo.getIsLookAll() == null || customerBasicInfo.getIsLookAll() == 2){
+            customerBasicInfo.setIdCreateBy(adminId);
+        }
         // 封装请求数据
         PageRequest<CustomerBasicInfo> pageRequest = new PageRequest<>(customerBasicInfo, pageNO, pageSize, totalNum == 0);
         // 查询订单列表
@@ -50,7 +65,7 @@ public class CustomerBasicController {
         if (totalNum != 0) {
             result.setTotal(totalNum);
         }
-        StitchAttrUtil.setModelAndView(customerBasicInfo, mv, "/admin/CustomerBasic/listCustomerBasic", result);
+        StitchAttrUtil.setModelAndView(customerBasicInfo, mv, "/admin/customerBasic/listCustomerBasic", result);
         return mv;
     }
 }

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -160,7 +160,7 @@
 		<mapper resource="com/iamberry/rst/service/address/mapper/addressMapper.xml"/>
 
 		<mapper resource="com/iamberry/rst/service/sys/mapper/sysConfigMapper.xml"/>
-		<mapper resource="com/iamberry/rst/service/customer/mapper/CustomerBasicMapper.xml"/>
+		<mapper resource="com.iamberry.rst.service.customer.mapper.CustomerBasicMapper.xml"/>
 
 	</mappers>
 </configuration>

watero-rst-web/src/main/webapp/WEB-INF/views/customer/customer_basic_list.ftl

@@ -0,0 +1,161 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title></title>
+        <#include "/base/list_base.ftl">
+		<style>
+			*{padding: 0;margin: 0;}
+			.my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
+			/*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
+			.my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+			.my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
+            .barcodeImg{margin:10px 0px}
+            .table-bg thead th{background-color: #e2f6ff;}
+            input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+            input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+		</style>
+	</head>
+	<body>
+    <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+        <span class="c-gray en">&gt;</span> 客户信息管理
+        <span class="c-gray en">&gt;</span> 客户信息列表
+        <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+    </nav>
+		<div class="text-c" style="margin-top: 20px;">
+			<form action="${path}/admin/customerBasic/listCustomerBasic" method="post">
+					<select class="my-select" name="isLookAll">
+					<#if isLookAll??>
+						<option value ="1" <#if isLookAll == 1>selected</#if>>查看全部客户</option>
+						<option value ="2" <#if isLookAll == 2>selected</#if>>只看我的客户</option>
+					<#else >
+						<option value ="1">查看全部客户</option>
+						<option value ="2">只看我的客户</option>
+					</#if>
+					</select>
+                    <select class="my-select" name="customerType">
+                        <option value ="">所有客户类型</option>
+                        <#if customerType??>
+                         <option value ="1" <#if customerType == 1>selected</#if>>个人</option>
+                         <option value ="2" <#if customerType == 2>selected</#if>>企业</option>
+                        <#else >
+                            <option value ="1">个人</option>
+                            <option value ="2">企业</option>
+                        </#if>
+                    </select>
+                    <select class="my-select" name="cooperativeState">
+                        <option value ="1">合作状态</option>
+                    <#if cooperativeState??>
+                        <option value ="1" <#if cooperativeState == 1>selected</#if>>意向合作</option>
+                        <option value ="2" <#if cooperativeState == 2>selected</#if>>已经合作</option>
+                        <option value ="3" <#if cooperativeState == 3>selected</#if>>停止合作</option>
+                    <#else >
+                        <option value ="1">意向合作</option>
+                        <option value ="2">已经合作</option>
+                        <option value ="3">停止合作</option>
+                    </#if>
+                    </select>
+                    <input class="my-input" type="text" name="customerName" value="${customerName!''}" placeholder="请输入客户名称"/>
+                    <input class="my-input" type="text" name="contactPhone" value="${contactPhone!''}" placeholder="请输入客户电话"/>
+                    <input class="my-input" type="text" name="contactEmail" value="${contactEmail!''}" placeholder="请输入客户邮箱"/>
+					<button type="submit" style="cursor:pointer; " class="my-btn-search">搜索</button>
+			</form>
+		</div>
+		<div class="mt-20" style="margin: 20px;">
+			<table class="table table-border table-bordered table-bg table-hover table-sort">
+				<thead>
+				<tr class="text-c">
+                    <th width="100">状态</th>
+					<th width="100">合作状态</th>
+					<th width="100">业务员</th>
+					<th width="100">客户类型</th>
+					<th width="100">客户名称</th>
+					<th width="50">客户行业</th>
+                    <th width="40">所在区域</th>
+                    <th width="40">备注信息</th>
+                    <th width="40">添加日期</th>
+					<th width="150">操作</th>
+				</tr>
+				</thead>
+				<tbody id="listid">
+                <#if page.dataList?? &&  (page.dataList?size > 0) >
+					<#list page.dataList as list>
+						<tr>
+                            <td class="text-c" width="100">
+                                <#if list.customerStatus == 1>
+                                    已删除
+                                </#if>
+                                <#if list.customerStatus == 2>
+                                    正常
+                                </#if>
+                            </td>
+							<td class="text-c" width="100">
+                                <#if list.cooperativeState == 1>
+                                    意向合作
+                                </#if>
+                                <#if list.cooperativeState == 2>
+                                    已经合作
+                                </#if>
+                                <#if list.cooperativeState == 3>
+                                    停止合作
+                                </#if>
+                            </td>
+							<td class="text-c" width="100">${list.adminName!''}</td>
+                            <td class="text-c" width="100">
+                                <#if list.customerType == 1>
+                                        个人
+                                </#if>
+                                <#if list.customerType == 2>
+                                        企业
+                                </#if>
+                            </td>
+                            <td class="text-c" width="100">
+                                ${list.customerName!''}
+                            </td>
+                            <td class="text-c" width="100">
+                                ${list.customerIndustry!''}
+                            </td>
+                            <td class="text-c" width="100">
+                                ${list.provinceName!''}-${list.cityName!''}
+                            </td>
+                            <td class="text-c" width="50">${list.customerRemarks!''}</td>
+                            <td class="text-c" width="100">${(list.createDate?string("yyyy-MM-dd"))!''}</td>
+							<!-- 遍历操作 -->
+							<td class="td-manage text-c">
+                                <a onclick="machineLogs(${list.machineId});" title="生产流程" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe667;</i></a>
+                                <#--<a onclick="print('${list.machineBarcode }','${list.machineQrcode }','${list.machineId }','${list.machineProduceType }')" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>-->
+                            </td>
+						</tr>
+					</#list>
+                <#else>
+                <tr><td id="noMachineTr" colspan="11" class="td-manage text-c" >暂时没有机器，请添加！</td></tr>
+                </#if>
+				</tbody>
+			</table>
+		</div>
+		<#include "/base/page_util.ftl">
+
+        <#--jquery.PrintArea 2.4-->
+        <script type="text/javascript" src="${path}/common/lib/jquery.PrintArea/jquery.PrintArea.js"></script>
+        <script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery-barcode.js"></script>
+
+		<script type="text/javascript">
+
+
+
+
+
+
+            /*批量添加机器*/
+            function batch_add_machine(title,url,w,h){
+                layer_show(title,url,w,h);
+            }
+            /*批量添加机器*/
+            function add_renovationmachine(title,url,w,h){
+                layer_show(title,url,w,h);
+            }
+
+
+        </script>
+	</body>
+</html>