From 61747a14819075bf6da2c1597b6c22e22e026686 Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期一, 15 四月 2024 14:25:11 +0800
Subject: [PATCH] 4-15修改提交

---
 src/main/java/com/flow/service/impl/CompanyServiceImpl.java |   97 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 92 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/flow/service/impl/CompanyServiceImpl.java b/src/main/java/com/flow/service/impl/CompanyServiceImpl.java
index 41ebc3e..022d161 100644
--- a/src/main/java/com/flow/service/impl/CompanyServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/CompanyServiceImpl.java
@@ -8,13 +8,18 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.flow.mapper.CompanyMapper;
-import com.flow.pojo.Card;
-import com.flow.pojo.Company;
+import com.flow.mapper.ManagerMapper;
+import com.flow.mapper.TbFuwuqiMapper;
+import com.flow.pojo.*;
 import com.flow.service.CompanyService;
+import com.flow.service.OperationLogService;
 import com.flow.util.DESUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +30,11 @@
     @Autowired
     CompanyMapper companyMapper;
 
+    @Autowired
+    ManagerMapper managerMapper;
+
+    @Autowired
+    OperationLogService operationLogService;
     public CompanyServiceImpl() {
     }
 
@@ -47,6 +57,12 @@
         queryWrapper.eq("companyId", companyId);
         Company company = new Company();
         company.setNone("1");
+        Company company1 = (Company)((CompanyMapper)this.baseMapper).selectOne(queryWrapper);
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("鍒犻櫎");
+        operationLog.setCaozuocontent("鍒犻櫎鍏徃锛�"+company1.getCompanyname());
+        operationLog.setCaozuoname(company1.getCaozuoname());
+        operationLogService.addOperationLog(operationLog);
         return ((CompanyMapper)this.baseMapper).update(company, queryWrapper);
     }
 
@@ -92,9 +108,19 @@
         company1.setCompanyabbname(company.getCompanyabbname());
         company1.setCompanyname(company.getCompanyname());
         company1.setPhone(DESUtil.encrypt(company.getPhone(), this.key));
+        company1.setLoginphone(DESUtil.encrypt(company.getLoginphone(), this.key));
         company1.setAccountbank(DESUtil.encrypt(company.getAccountbank(), this.key));
         company1.setShuinum(DESUtil.encrypt(company.getShuinum(), this.key));
         System.out.println(company1);
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("淇敼");
+        operationLog.setCaozuocontent("淇敼鍏徃锛�"+company.getCompanyname());
+        operationLog.setCaozuoname(company.getCaozuoname());
+
+        operationLogService.addOperationLog(operationLog);
+        Date date = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        company1.setEnterdate(formatter.format(date));
         return ((CompanyMapper)this.baseMapper).update(company1, queryWrapper);
     }
 
@@ -108,10 +134,20 @@
         company.setLoginphone(DESUtil.encrypt(company.getLoginphone(), this.key));
         company.setAccountbank(DESUtil.encrypt(company.getAccountbank(), this.key));
         company.setShuinum(DESUtil.encrypt(company.getShuinum(), this.key));
+//        Company company1 = (Company)((CompanyMapper)this.baseMapper).selectOne(queryWrapper);
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("鏂板");
+        operationLog.setCaozuocontent("鏂板鍏徃锛�"+company.getCompanyname());
+        operationLog.setCaozuoname(company.getCaozuoname());
+
+        operationLogService.addOperationLog(operationLog);
+        Date date = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        company.setEnterdate(formatter.format(date));
         return ((CompanyMapper)this.baseMapper).insert(company);
     }
 
-    public Company findUser(Company company) {
+    public Company findUser(Company company) throws Exception {
         QueryWrapper queryWrapper = new QueryWrapper();
         if (company.getPassword()!=null){
             queryWrapper.eq("password", company.getPassword());
@@ -120,7 +156,32 @@
         }
 
         queryWrapper.eq("loginPhone", company.getLoginphone());
-        Company user = (Company)((CompanyMapper)this.baseMapper).selectOne(queryWrapper);
+        Company user = new Company();
+         user = (Company)((CompanyMapper)this.baseMapper).selectOne(queryWrapper);
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.eq("phone", DESUtil.decrypt(company.getLoginphone(), DESUtil.key));
+        Manager manager = managerMapper.selectOne(queryWrapper1);
+        if (user==null){
+
+            if (manager!=null){
+                QueryWrapper queryWrapper2 = new QueryWrapper();
+                queryWrapper2.eq("company", "鍖椾含鍗庢槦鍖楁枟鏅烘帶鎶�鏈湁闄愬叕鍙�");
+                user = (Company)((CompanyMapper)this.baseMapper).selectOne(queryWrapper2);
+                if (manager.getJuese().equals("璁垮")){
+                    user.setRudq("璁垮");
+                }else if (manager.getJuese().equals("鏅�氱鐞嗗憳")){
+                    user.setRudq(manager.getJuese()+","+manager.getUadd()+","+manager.getUupdate()+","+manager.getUdelete()+","+manager.getName());
+
+                }else{
+                    user.setRudq(manager.getJuese()+","+manager.getUadd()+","+manager.getUupdate()+","+manager.getUdelete()+","+manager.getName()+",");
+
+                }
+            }
+        }else{
+            if (manager!=null){
+                user.setRudq(manager.getJuese()+","+manager.getUadd()+","+manager.getUupdate()+","+manager.getUdelete()+","+manager.getName());
+            }
+        }
         return user;
     }
 
@@ -168,18 +229,44 @@
     public Company HuoPhone(Company company) throws Exception {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("loginPhone", DESUtil.encrypt(company.getLoginphone(), DESUtil.key));
-        return (Company)((CompanyMapper)this.baseMapper).selectOne(queryWrapper);
+        Company company1=new Company();
+         company1= companyMapper.selectOne(queryWrapper);
+        if (company1==null){
+            Company company2=new Company();
+            QueryWrapper queryWrapper1 = new QueryWrapper();
+            queryWrapper1.eq("phone", company.getLoginphone());
+            Manager manager = managerMapper.selectOne(queryWrapper1);
+            if (manager!=null){
+                if (manager.getJuese().equals("璁垮")){
+                    company2.setCompany("璁垮");
+                    company2.setCompanyabbname("璁垮");
+                }else{
+                    company2.setCompanyname("鍖椾含鍗庢槦鍖楁枟鏅烘帶鎶�鏈湁闄愬叕鍙�");
+                    company2.setCompanyabbname("鍗庢槦鏅烘帶");
+                }
+
+            }
+            return company2;
+        }else{
+            return company1;
+        }
+
+//
+
     }
 
     public Company findC(String companyName) throws Exception {
+        System.out.println(companyName);
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("company", companyName);
         Company company = (Company)((CompanyMapper)this.baseMapper).selectOne(queryWrapper);
+        System.out.println(company);
         company.setAccount(DESUtil.decrypt(company.getAccount(), DESUtil.key));
         company.setAccountbank(DESUtil.decrypt(company.getAccountbank(), DESUtil.key));
         company.setAddress(DESUtil.decrypt(company.getAddress(), DESUtil.key));
         company.setShuinum(DESUtil.decrypt(company.getShuinum(), DESUtil.key));
         company.setPhone(DESUtil.decrypt(company.getPhone(), DESUtil.key));
+        System.out.println(company);
         return company;
     }
 

--
Gitblit v1.9.3