Browse Source

企业注册增加来源字段:官网,360, 钉钉,企业微信

seyason 2 years ago
parent
commit
f8dce4821c

+ 2 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java

@@ -143,8 +143,8 @@ public class UserController {
     @RequestMapping("/insertCompany")
     @RequestMapping("/insertCompany")
     public HttpRespMsg insertCompany(
     public HttpRespMsg insertCompany(
             @RequestParam String companyName, @RequestParam String name, @RequestParam String phone,
             @RequestParam String companyName, @RequestParam String name, @RequestParam String phone,
-            String vcode, String password, @RequestParam(required = false, defaultValue = "2") Integer type) {
-        return userService.insertCompany(companyName, name, phone, vcode, password, type);
+            String vcode, String password, @RequestParam(required = false, defaultValue = "2") Integer type, String from) {
+        return userService.insertCompany(companyName, name, phone, vcode, password, type, from);
     }
     }
 
 
     /**
     /**

+ 4 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -1322,6 +1322,8 @@ public class WeiXinCorpController {
                                 .setExpirationDate(LocalDateTime.now().plusDays(15));
                                 .setExpirationDate(LocalDateTime.now().plusDays(15));
                         company.setPackageProject(1);
                         company.setPackageProject(1);
                         company.setPackageExpense(1);
                         company.setPackageExpense(1);
+                        //设置来源
+                        company.setFrom("企业微信");
                         companyMapper.insert(company);
                         companyMapper.insert(company);
                         //生成项目的成本基线默认条目
                         //生成项目的成本基线默认条目
                         String[] array = Constant.DEFAULT_BASE_COST_ITEMS;
                         String[] array = Constant.DEFAULT_BASE_COST_ITEMS;
@@ -3505,6 +3507,8 @@ public class WeiXinCorpController {
                     Company company = new Company().setCompanyName(wxCorpInfo.getCorpName())
                     Company company = new Company().setCompanyName(wxCorpInfo.getCorpName())
                             .setExpirationDate(LocalDateTime.now().plusDays(15));
                             .setExpirationDate(LocalDateTime.now().plusDays(15));
                     company.setPackageWorktime(1);
                     company.setPackageWorktime(1);
+                    //设置来源
+                    company.setFrom("企业微信");
                     companyMapper.insert(company);
                     companyMapper.insert(company);
                     wxCorpInfo.setCompanyId(company.getId());
                     wxCorpInfo.setCompanyId(company.getId());
                     wxCorpInfoMapper.updateById(wxCorpInfo);
                     wxCorpInfoMapper.updateById(wxCorpInfo);

+ 13 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Company.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  * </p>
  *
  *
  * @author Seyason
  * @author Seyason
- * @since 2022-09-15
+ * @since 2023-04-09
  */
  */
 @Data
 @Data
 @EqualsAndHashCode(callSuper = false)
 @EqualsAndHashCode(callSuper = false)
@@ -127,6 +127,18 @@ public class Company extends Model<Company> {
     @TableField("is_international")
     @TableField("is_international")
     private Integer isInternational;
     private Integer isInternational;
 
 
+    /**
+     * 创建日期
+     */
+    @TableField("create_date")
+    private LocalDateTime createDate;
+
+    /**
+     * 注册来源
+     */
+    @TableField("from")
+    private String from;
+
 
 
     @Override
     @Override
     protected Serializable pkVal() {
     protected Serializable pkVal() {

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/UserService.java

@@ -30,7 +30,7 @@ public interface UserService extends IService<User> {
 
 
     HttpRespMsg editPassword(String originPassword, String newPassword, HttpServletRequest request);
     HttpRespMsg editPassword(String originPassword, String newPassword, HttpServletRequest request);
 
 
-    HttpRespMsg insertCompany(String companyName, String name, String phone, String vcode, String pwd, Integer type);
+    HttpRespMsg insertCompany(String companyName, String name, String phone, String vcode, String pwd, Integer type, String from);
 
 
     HttpRespMsg insertUser(String id, String name, String phone, Integer roleId, Double monthCost, Double cost, Integer departmentId,
     HttpRespMsg insertUser(String id, String name, String phone, Integer roleId, Double monthCost, Double cost, Integer departmentId,
                            Integer salaryType, String costApplyDate, String position, String certJson,
                            Integer salaryType, String costApplyDate, String position, String certJson,

+ 4 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DingDingServiceImpl.java

@@ -180,6 +180,8 @@ public class DingDingServiceImpl implements DingDingService {
                 company.setPackageExpense(1);
                 company.setPackageExpense(1);
                 company.setPackageCustomer(1);
                 company.setPackageCustomer(1);
                 company.setPackageOa(1);
                 company.setPackageOa(1);
+                //设置来源
+                company.setFrom("钉钉");
                 companyMapper.insert(company);
                 companyMapper.insert(company);
                 dingding.setCompanyId(company.getId());
                 dingding.setCompanyId(company.getId());
                 companyDingdingMapper.updateById(dingding);
                 companyDingdingMapper.updateById(dingding);
@@ -377,6 +379,8 @@ public class DingDingServiceImpl implements DingDingService {
             company.setPackageExpense(1);
             company.setPackageExpense(1);
             company.setPackageCustomer(1);
             company.setPackageCustomer(1);
             company.setPackageOa(1);
             company.setPackageOa(1);
+            //设置来源
+            company.setFrom("钉钉");
             companyMapper.insert(company);
             companyMapper.insert(company);
 
 
             //生成工作时长
             //生成工作时长

+ 6 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -1000,7 +1000,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
 
     //新增公司和负责人
     //新增公司和负责人
     @Override
     @Override
-    public HttpRespMsg insertCompany(String companyName, String name, String phone, String vcode, String password, Integer type) {
+    public HttpRespMsg insertCompany(String companyName, String name, String phone, String vcode, String password, Integer type, String from) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         //检查验证码是否正确
         //检查验证码是否正确
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime now = LocalDateTime.now();
@@ -1048,6 +1048,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 company.setPackageCustomer(1);
                 company.setPackageCustomer(1);
                 company.setPackageEngineering(1);
                 company.setPackageEngineering(1);
             }
             }
+            //设置来源
+            if (from == null) {
+                from = "官网";
+            }
+            company.setFrom(from);
             companyMapper.insert(company);
             companyMapper.insert(company);
 
 
             //生成工作时长
             //生成工作时长

+ 3 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/CompanyMapper.xml

@@ -21,11 +21,13 @@
         <result column="package_finance" property="packageFinance" />
         <result column="package_finance" property="packageFinance" />
         <result column="package_provider" property="packageProvider" />
         <result column="package_provider" property="packageProvider" />
         <result column="is_international" property="isInternational" />
         <result column="is_international" property="isInternational" />
+        <result column="create_date" property="createDate" />
+        <result column="from" property="from" />
     </resultMap>
     </resultMap>
 
 
     <!-- 通用查询结果列 -->
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
-        id, company_name, staff_count_max, expiration_date, set_meal, package_worktime, package_project, package_contract, package_oa, package_etimecard, package_expense, package_customer, package_engineering, package_simple, package_finance, package_provider, is_international
+        id, company_name, staff_count_max, expiration_date, set_meal, package_worktime, package_project, package_contract, package_oa, package_etimecard, package_expense, package_customer, package_engineering, package_simple, package_finance, package_provider, is_international, create_date, from
     </sql>
     </sql>
 
 
 </mapper>
 </mapper>