文件名称修改

applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/controller/CustomerFedBackController.java → applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/controller/CustomerFeedBackController.java

@@ -4,8 +4,8 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
-import com.usoftchina.saas.operation.po.CustomerFedBack;
-import com.usoftchina.saas.operation.service.CustomerFedBackService;
+import com.usoftchina.saas.operation.po.CustomerFeedBack;
+import com.usoftchina.saas.operation.service.CustomerFeedBackService;
 import com.usoftchina.saas.page.PageDefault;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,22 +16,22 @@ import org.springframework.web.bind.annotation.*;
  * @author: guq
  * @create: 2019-01-04 17:52
  **/
-@RequestMapping("/customerFedBack")
+@RequestMapping("/customerFeedBack")
 @RestController
-public class CustomerFedBackController {
+public class CustomerFeedBackController {
 
     @Autowired
-    private CustomerFedBackService customerFedBackService;
+    private CustomerFeedBackService customerFeedBackService;
 
     @GetMapping("/list")
-    public Result<PageInfo<CustomerFedBack>> getListData(@PageDefault(size = 10) PageRequest page, ListReqDTO req) {
-        PageInfo<CustomerFedBack> listData = customerFedBackService.getListData(page, req);
+    public Result<PageInfo<CustomerFeedBack>> getListData(@PageDefault(size = 10) PageRequest page, ListReqDTO req) {
+        PageInfo<CustomerFeedBack> listData = customerFeedBackService.getListData(page, req);
         return Result.success(listData);
     }
 
     @RequestMapping("/save")
-    public Result<DocBaseDTO> save(@RequestBody CustomerFedBack fedBack) {
-        DocBaseDTO save = customerFedBackService.save(fedBack);
+    public Result<DocBaseDTO> save(@RequestBody CustomerFeedBack feedBack) {
+        DocBaseDTO save = customerFeedBackService.save(feedBack);
         return Result.success(save);
     }
 

applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/dto/CompanyDTO.java

@@ -17,7 +17,7 @@ public class CompanyDTO implements Serializable{
      * 商业登记证号
 
      */
-    private String business_Code;
+    private String business_code;
     private String address;
     private String tel;
     private String fax;
@@ -34,12 +34,12 @@ public class CompanyDTO implements Serializable{
         this.name = name;
     }
 
-    public String getBusiness_Code() {
-        return business_Code;
+    public String getBusiness_code() {
+        return business_code;
     }
 
-    public void setBusiness_Code(String business_Code) {
-        this.business_Code = business_Code;
+    public void setBusiness_code(String business_code) {
+        this.business_code = business_code;
     }
 
     public String getAddress() {

applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/mapper/CustomerfedbackMapper.java

@@ -1,21 +0,0 @@
-package com.usoftchina.saas.operation.mapper;
-
-import com.usoftchina.saas.operation.po.CustomerFedBack;
-
-import java.util.List;
-
-public interface CustomerfedbackMapper {
-    int deleteByPrimaryKey(Integer cf_id);
-
-    int insert(CustomerFedBack record);
-
-    int insertSelective(CustomerFedBack record);
-
-    CustomerFedBack selectByPrimaryKey(Integer cf_id);
-
-    int updateByPrimaryKeySelective(CustomerFedBack record);
-
-    int updateByPrimaryKey(CustomerFedBack record);
-
-    List<CustomerFedBack> selectByCondition(String con);
-}

applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/mapper/CustomerfeedbackMapper.java

@@ -0,0 +1,21 @@
+package com.usoftchina.saas.operation.mapper;
+
+import com.usoftchina.saas.operation.po.CustomerFeedBack;
+
+import java.util.List;
+
+public interface CustomerfeedbackMapper {
+    int deleteByPrimaryKey(Integer cf_id);
+
+    int insert(CustomerFeedBack record);
+
+    int insertSelective(CustomerFeedBack record);
+
+    CustomerFeedBack selectByPrimaryKey(Integer cf_id);
+
+    int updateByPrimaryKeySelective(CustomerFeedBack record);
+
+    int updateByPrimaryKey(CustomerFeedBack record);
+
+    List<CustomerFeedBack> selectByCondition(String con);
+}

applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/po/CustomerFedBack.java → applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/po/CustomerFeedBack.java

@@ -6,7 +6,7 @@ import java.util.Date;
  * @author: guq
  * @create: 2019-01-04 18:18
  **/
-public class CustomerFedBack {
+public class CustomerFeedBack {
 
     private Long cf_id;
 

applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/service/CustomerFedBackService.java → applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/service/CustomerFeedBackService.java

@@ -3,11 +3,11 @@ package com.usoftchina.saas.operation.service;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
-import com.usoftchina.saas.operation.po.CustomerFedBack;
+import com.usoftchina.saas.operation.po.CustomerFeedBack;
 import com.usoftchina.saas.page.PageRequest;
 
-public interface CustomerFedBackService {
-    DocBaseDTO save(CustomerFedBack fedBack);
+public interface CustomerFeedBackService {
+    DocBaseDTO save(CustomerFeedBack fedBack);
 
-    PageInfo<CustomerFedBack> getListData(PageRequest page, ListReqDTO req);
+    PageInfo<CustomerFeedBack> getListData(PageRequest page, ListReqDTO req);
 }

applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/service/impl/CustomerFedBackServiceImpl.java

@@ -8,9 +8,9 @@ import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
-import com.usoftchina.saas.operation.mapper.CustomerfedbackMapper;
-import com.usoftchina.saas.operation.po.CustomerFedBack;
-import com.usoftchina.saas.operation.service.CustomerFedBackService;
+import com.usoftchina.saas.operation.mapper.CustomerfeedbackMapper;
+import com.usoftchina.saas.operation.po.CustomerFeedBack;
+import com.usoftchina.saas.operation.service.CustomerFeedBackService;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,13 +24,13 @@ import java.util.List;
  * @create: 2019-01-04 18:29
  **/
 @Service
-public class CustomerFedBackServiceImpl implements CustomerFedBackService{
+public class CustomerFedBackServiceImpl implements CustomerFeedBackService {
 
     @Autowired
-    private CustomerfedbackMapper customerfedbackMapper;
+    private CustomerfeedbackMapper customerfedbackMapper;
 
     @Override
-    public DocBaseDTO save(CustomerFedBack fedBack) {
+    public DocBaseDTO save(CustomerFeedBack fedBack) {
         if (StringUtils.isEmpty(fedBack)){
             throw new BizException(BizExceptionCode.EMPTY_DATA);
         }
@@ -44,14 +44,14 @@ public class CustomerFedBackServiceImpl implements CustomerFedBackService{
     }
 
     @Override
-    public PageInfo<CustomerFedBack> getListData(PageRequest page, ListReqDTO req) {
+    public PageInfo<CustomerFeedBack> getListData(PageRequest page, ListReqDTO req) {
         PageHelper.startPage(page.getNumber(), page.getSize());
         String con = req.getFinalCondition();
         if (null == con) {
             con = "1=1";
         }
-        List<CustomerFedBack> list = customerfedbackMapper.selectByCondition(con);
-        PageInfo<CustomerFedBack> fedbacks = new PageInfo<CustomerFedBack>(list);
+        List<CustomerFeedBack> list = customerfedbackMapper.selectByCondition(con);
+        PageInfo<CustomerFeedBack> fedbacks = new PageInfo<CustomerFeedBack>(list);
         return fedbacks;
     }
 }

applications/operation/operation-server/src/main/resources/mapper/CompanyMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.usoftchina.saas.operation.mapper.CompanyMapper">
     <resultMap id="baseMap" type="com.usoftchina.saas.operation.dto.CompanyDTO">
         <result column="name" property="name" jdbcType="VARCHAR" />
-        <result column="business_Code" property="business_Code" jdbcType="VARCHAR" />
+        <result column="business_code" property="business_code" jdbcType="VARCHAR" />
         <result column="address" property="address" jdbcType="VARCHAR" />
         <result column="tel" property="tel" jdbcType="VARCHAR" />
         <result column="fax" property="fax" jdbcType="VARCHAR" />
@@ -14,7 +14,7 @@
     </resultMap>
 
     <select id="findCompanyByCondition" parameterType="string" resultMap="baseMap">
-         select name,business_Code,address,tel,fax,realname,mobile,ac_company.create_time,ac_company.uu from saas_account.ac_company
+         select name,business_code,address,tel,fax,realname,mobile,ac_company.create_time,ac_company.uu from saas_account.ac_company
         left join saas_account.ac_account on ac_account.id = ac_company.creator_id where #{con}
     </select>
 </mapper>

applications/operation/operation-server/src/main/resources/mapper/CustomerfedbackMapper.xml → applications/operation/operation-server/src/main/resources/mapper/CustomerfeedbackMapper.xml

@@ -1,7 +1,7 @@
 <?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.usoftchina.saas.operation.mapper.CustomerfedbackMapper" >
-  <resultMap id="BaseResultMap" type="com.usoftchina.saas.operation.po.CustomerFedBack" >
+<mapper namespace="com.usoftchina.saas.operation.mapper.CustomerfeedbackMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.operation.po.CustomerFeedBack" >
     <id column="cf_id" property="cf_id" jdbcType="INTEGER" />
     <result column="cf_creator" property="cf_creator" jdbcType="VARCHAR" />
     <result column="cf_creatime" property="cf_creatime" jdbcType="TIMESTAMP" />
@@ -26,7 +26,7 @@
     delete from customerfedback
     where cf_id = #{cf_id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.usoftchina.saas.operation.po.CustomerFedBack" >
+  <insert id="insert" parameterType="com.usoftchina.saas.operation.po.CustomerFeedBack" >
     insert into customerfedback (cf_id, cf_creator, cf_creatime, 
       cf_creatorid, cf_content, cf_status, 
       cf_companyid, cf_company, cf_remark
@@ -36,11 +36,11 @@
       #{cf_companyid,jdbcType=INTEGER}, #{cf_company,jdbcType=VARCHAR}, #{cf_remark,jdbcType=VARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.usoftchina.saas.operation.po.CustomerFedBack" >
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.operation.po.CustomerFeedBack" >
     <selectKey  resultType="java.lang.Long" keyProperty="cf_id">
       SELECT LAST_INSERT_ID() AS cf_id
     </selectKey>
-    insert into customerfedback
+    insert into saas_manage.customerfedback
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="cf_creator != null" >
         cf_creator,
@@ -94,7 +94,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.operation.po.CustomerFedBack" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.operation.po.CustomerFeedBack" >
     update customerfedback
     <set >
       <if test="cf_creator != null" >
@@ -124,7 +124,7 @@
     </set>
     where cf_id = #{cf_id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.operation.po.CustomerFedBack" >
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.operation.po.CustomerFeedBack" >
     update customerfedback
     set cf_creator = #{cf_creator,jdbcType=VARCHAR},
       cf_creatime = #{cf_creatime,jdbcType=TIMESTAMP},
@@ -136,4 +136,7 @@
       cf_remark = #{cf_remark,jdbcType=VARCHAR}
     where cf_id = #{cf_id,jdbcType=INTEGER}
   </update>
+  <select id="selectByCondition" parameterType="string" resultMap="BaseResultMap">
+      select * from saas_manage.customerfedback where #{con}
+  </select>
 </mapper>