客户信息系统

watero-rst-interface/src/main/java/com/iamberry/rst/faces/customer/CustomerBasicService.java

@@ -1,7 +1,5 @@
 package com.iamberry.rst.faces.customer;
 
-import com.iamberry.rst.core.cm.ComplaintMaintenanceInfo;
-import com.iamberry.rst.core.cm.CustomerInfo;
 import com.iamberry.rst.core.customer.CustomerBasicInfo;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;

watero-rst-service/src/main/java/com/iamberry/rst/service/customer/CustomerBasicServiceImpl.java

@@ -1,16 +1,14 @@
 package com.iamberry.rst.service.customer;
 
-import com.alibaba.dubbo.config.annotation.Service;
 import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.cm.ComplaintMaintenanceInfo;
 import com.iamberry.rst.core.customer.CustomerBasicInfo;
 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.faces.customer.CustomerBasicService;
 import com.iamberry.rst.service.customer.mapper.CustomerBasicMapper;
 import com.iamberry.rst.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 

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

@@ -21,8 +21,8 @@
       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_address_province ap on ap.division_code = bi.customer_province_code
+      LEFT JOIN tb_rst_address_city ac on ac.division_code = 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!='' ">

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

@@ -1,17 +1,17 @@
 package com.iamberry.rst.controllers.customer;
 
-import com.iamberry.rst.core.cm.ComplaintDetectInfo;
+import com.iamberry.rst.controllers.cm.AdminCustomerController;
 import com.iamberry.rst.core.customer.CustomerBasicInfo;
-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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.List;
+
 
 /**
  * Created by Administrator on 2018/4/20.
@@ -27,6 +27,8 @@ import java.util.List;
 @Controller
 @RequestMapping("/admin/customerBasic")
 public class CustomerBasicController {
+
+
     @Autowired
     private CustomerBasicService customerBasicService;
     @Autowired

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

@@ -128,7 +128,7 @@
 						</tr>
 					</#list>
                 <#else>
-                <tr><td id="noMachineTr" colspan="11" class="td-manage text-c" >暂时没有机器，请添加！</td></tr>
+                <tr><td id="noMachineTr" colspan="11" class="td-manage text-c" >暂时没有客户信息，请添加！</td></tr>
                 </#if>
 				</tbody>
 			</table>