1

src/main/java/com/fdkankan/manage/controller/CompanyController.java

@@ -4,6 +4,7 @@ package com.fdkankan.manage.controller;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
+import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.manage.entity.Company;
 import com.fdkankan.manage.service.ICameraDetailService;
 import com.fdkankan.manage.service.ICompanyService;
@@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Date;
+
 /**
  *客户管理
  */
@@ -33,12 +36,15 @@ public class CompanyController {
 
     @PostMapping("/add")
     public ResultData add(@RequestBody Company param){
-        companyService.saveOrUpdate(param);
+        param.setUpdateTime(DateUtil.date2String(new Date(),DateUtil.DEFAULT_DATE_FORMAT));
+        param.setCreateTime(DateUtil.date2String(new Date(),DateUtil.DEFAULT_DATE_FORMAT));
+        companyService.save(param);
         return ResultData.ok();
     }
 
     @PostMapping("/update")
     public ResultData update(@RequestBody Company param){
+        param.setUpdateTime(DateUtil.date2String(new Date(),DateUtil.DEFAULT_DATE_FORMAT));
         companyService.saveOrUpdate(param);
         return ResultData.ok();
     }

src/main/java/com/fdkankan/manage/vo/response/CompanyVo.java

@@ -12,4 +12,8 @@ public class CompanyVo {
     private Long createUserId;              //创建人id
     private String createUserName;          //创建人名称
     private String createTime;              //创建时间
+    private String topLogo;
+    private String floorLogo;
+    private String qrLogo;
+    private Integer showLogo;               //是否显示初始logo，0隐藏，1显示
 }

src/main/resources/mapper/manage/CompanyMapper.xml

@@ -3,7 +3,8 @@
 <mapper namespace="com.fdkankan.manage.mapper.ICompanyMapper">
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.CompanyVo">
-        select c.id,c.company_name,c.company_desc ,c.manager_id as createUserId, u.user_name as createUserName,c.create_time
+        select c.id,c.company_name,c.company_desc ,c.manager_id as createUserId, u.user_name as createUserName,c.create_time,
+               c.top_logo,c.floor_logo,c.qr_logo,c.show_logo
         from  t_company c
         left join sys_user u on c.manager_id = u.id
         where c.rec_status = 'A'