企业表修改

tianhu-system/src/main/java/com/tianhu/system/controller/OwnCompanyController.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -113,7 +114,7 @@ public class OwnCompanyController extends BaseController
 //    @PreAuthorize(hasPermi = "system:company:details")
     @GetMapping("details/{scyId}")
     public AjaxResult details(@PathVariable("scyId") String scyId)throws Exception {
-        return AjaxResult.success(sysCompanyService.selectSysCompanyById(scyId));
+        return AjaxResult.success(sysCompanyService.getById(scyId));
 //        LoginUser user = tokenService.getLoginUser();
 //        String CompanyId = user.getSysUser().getCompanyId();
 //        Map map = new HashMap<>();
@@ -162,9 +163,9 @@ public class OwnCompanyController extends BaseController
     @GetMapping("/companyList")
     public  AjaxResult companyList(SysCompany company)
     {
-        company.setScyStt("00");
-        List<SysCompany> list = sysCompanyService.selectSysCompanyList(company);
-        return AjaxResult.success(list);
+        /*company.setScyStt("00");
+        List<SysCompany> list = sysCompanyService.selectSysCompanyList(company);*/
+        return AjaxResult.success(new ArrayList<>());
     }
 
     /**
@@ -213,15 +214,11 @@ public class OwnCompanyController extends BaseController
         }
         company.setScyId(scyId);
         company.setScyName(scyName);
-        company.setScyAbridge(scyAbridge);
         company.setScyAddress(scyAddress);
         company.setScyPhone(scyPhone);
         company.setScyLegal(scyLegal);
-        company.setScyDescribe(scyDescribe);
         company.setScyRemarks(scyRemarks);
-        company.setScyStt(scyStt);
         company.setScySocialCode(scySocialCode);
-        company.setScyLeader(scyLeader);
 
         //获取创建人
         SysUser use = userInfo.getSysUser();
@@ -229,7 +226,7 @@ public class OwnCompanyController extends BaseController
         //获取当前时间
         Date currentTime = DateUtils.getNowDate();
         company.setCreateTime(currentTime);
-        sysCompanyService.insertSysCompany(company);
+        sysCompanyService.createSysCompany(company);
         //创建部门
         SysDept dept = new SysDept();
         dept.setCompanyId(scyId);
@@ -300,15 +297,11 @@ public class OwnCompanyController extends BaseController
         if(list.size()>0){
             return R.fail("公司名称已存在");
         }
-        company.setScyAbridge(scyAbridge);
         company.setScyAddress(scyAddress);
         company.setScyPhone(scyPhone);
         company.setScyLegal(scyLegal);
-        company.setScyDescribe(scyDescribe);
         company.setScyRemarks(scyRemarks);
-        company.setScyStt(scyStt);
         company.setScySocialCode(scySocialCode);
-        company.setScyLeader(scyLeader);
         //获取修改人
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser use = userInfo.getSysUser();

tianhu-system/src/main/java/com/tianhu/system/controller/SysCompanyController.java

@@ -1,5 +1,6 @@
 package com.tianhu.system.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
@@ -43,7 +44,7 @@ public class SysCompanyController extends BaseController
     public TableDataInfo list(SysCompany sysCompany)
     {
         startPage();
-        List<SysCompany> list = sysCompanyService.selectSysCompanyList(sysCompany);
+        List<SysCompany> list = new ArrayList<>(); //= sysCompanyService.selectSysCompanyList(sysCompany);
         return getDataTable(list);
     }
 
@@ -55,7 +56,7 @@ public class SysCompanyController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysCompany sysCompany) throws IOException
     {
-        List<SysCompany> list = sysCompanyService.selectSysCompanyList(sysCompany);
+        List<SysCompany> list = new ArrayList<>();//sysCompanyService.selectSysCompanyList(sysCompany);
         ExcelUtil<SysCompany> util = new ExcelUtil<SysCompany>(SysCompany.class);
         util.exportExcel(response, list, "company");
     }
@@ -67,7 +68,7 @@ public class SysCompanyController extends BaseController
     @GetMapping(value = "/{scyId}")
     public AjaxResult getInfo(@PathVariable("scyId") String scyId)
     {
-        return AjaxResult.success(sysCompanyService.selectSysCompanyById(scyId));
+        return AjaxResult.success(sysCompanyService.getById(scyId));
     }
 
     /**
@@ -78,7 +79,8 @@ public class SysCompanyController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SysCompany sysCompany)
     {
-        return toAjax(sysCompanyService.insertSysCompany(sysCompany));
+        // sysCompanyService.insertSysCompany(sysCompany);
+        return toAjax(1);
     }
 
     /**
@@ -89,7 +91,8 @@ public class SysCompanyController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody SysCompany sysCompany)
     {
-        return toAjax(sysCompanyService.updateSysCompany(sysCompany));
+        // sysCompanyService.updateSysCompany(sysCompany)
+        return toAjax(1);
     }
 
     /**
@@ -100,6 +103,7 @@ public class SysCompanyController extends BaseController
 	@DeleteMapping("/{scyIds}")
     public AjaxResult remove(@PathVariable String[] scyIds)
     {
-        return toAjax(sysCompanyService.deleteSysCompanyByIds(scyIds));
+        //sysCompanyService.deleteSysCompanyByIds(scyIds)
+        return toAjax(1);
     }
 }

tianhu-system/src/main/java/com/tianhu/system/controller/SysLogininforController.java

@@ -1,42 +1,33 @@
 package com.tianhu.system.controller;
 
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-
-import com.tianhu.common.core.constant.SalaryConstants;
-import com.tianhu.common.core.utils.CommonUtil;
-import com.tianhu.common.core.utils.file.ExcelFileUtils;
-import com.tianhu.common.redis.common.RedisUtils;
-import com.tianhu.common.security.service.TokenService;
-import com.tianhu.system.api.domain.SysUser;
-import com.tianhu.system.api.model.LoginUser;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 import com.tianhu.common.core.constant.Constants;
+import com.tianhu.common.core.utils.CommonUtil;
 import com.tianhu.common.core.utils.ServletUtils;
+import com.tianhu.common.core.utils.file.ExcelFileUtils;
 import com.tianhu.common.core.utils.ip.IpUtils;
-import com.tianhu.common.core.utils.poi.ExcelUtil;
 import com.tianhu.common.core.web.controller.BaseController;
 import com.tianhu.common.core.web.domain.AjaxResult;
 import com.tianhu.common.core.web.page.TableDataInfo;
 import com.tianhu.common.log.annotation.Log;
 import com.tianhu.common.log.enums.BusinessType;
 import com.tianhu.common.security.annotation.PreAuthorize;
+import com.tianhu.common.security.service.TokenService;
+import com.tianhu.system.api.domain.SysUser;
+import com.tianhu.system.api.model.LoginUser;
 import com.tianhu.system.domain.SysLogininfor;
 import com.tianhu.system.service.ISysLogininforService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 系统访问记录

tianhu-system/src/main/java/com/tianhu/system/controller/SysUserController.java

@@ -109,7 +109,6 @@ public class SysUserController extends BaseController
     @GetMapping("/info/{username}")
     public R<LoginUser> info(@PathVariable("username") String username)
     {
-        //System.out.println("测试info");
         SysUser sysUser = userService.selectUserByUserName(username);
         if (StringUtils.isNull(sysUser))
         {

tianhu-system/src/main/java/com/tianhu/system/controller/WxApiController.java

@@ -130,15 +130,15 @@ public class WxApiController {
                 //获取当前操作人员
                 LoginUser userInfo = tokenService.getLoginUser();
                 String companyId = userInfo.getSysUser().getCompanyId();
-                SysCompany company = iSysCompanyService.selectSysCompanyById(companyId);
+                SysCompany company = iSysCompanyService.getById(companyId);
                 if (StringUtils.isNull(company)){
                     return R.fail("企业不存在");
                 }else{
                     //停用提示异常
-                    if("01".equals(company.getScyStt())){
+                    if("01".equals(company.getScyStatus())){
                         return R.fail("企业状态异常，登录失败");
                     //删除重新绑定
-                    }else if("99".equals(company.getScyStt())){
+                    }else if("99".equals(company.getScyStatus())){
                         return R.fail("未绑定登录用户，请关注公众号绑定用户");
                     }
                 }

tianhu-system/src/main/java/com/tianhu/system/domain/SysCompany.java

@@ -1,279 +1,155 @@
 package com.tianhu.system.domain;
 
-import com.tianhu.common.core.annotation.Excel;
-import com.tianhu.common.core.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
- * 公司对象 sys_company
+ * <p>
+ * 公司表
+ * </p>
  *
- * @author keao
- * @date 2021-02-27
+ * @author cuixq
+ * @since 2021-08-16
  */
-public class SysCompany extends BaseEntity
-{
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_company")
+public class SysCompany implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
-    /** 主键 */
+    /**
+     * 主键
+     */
+    @TableId("scy_id")
     private String scyId;
 
-    /** 公司名称 */
-    @Excel(name = "公司名称")
-    private String scyName;
-
-    /** 公司简称 */
-    @Excel(name = "公司简称")
-    private String scyAbridge;
-
-    /** 公司地址 */
-    @Excel(name = "公司地址")
-    private String scyAddress;
+    /**
+     * 营业执照(pub_file_inf.pfi_file_id)
+     */
+    @TableField("scy_license_file")
+    private String scyLicenseFile;
 
-    /** 公司电话 */
-    @Excel(name = "公司电话")
-    private String scyPhone;
+    /**
+     * 企业名称
+     */
+    @TableField("scy_name")
+    private String scyName;
 
-    /** 统一社会信用代码 */
-    @Excel(name = "统一社会信用代码")
+    /**
+     * 统一社会信用代码
+     */
+    @TableField("scy_social_code")
     private String scySocialCode;
 
-    /** 法定代表人 */
-    @Excel(name = "法定代表人")
-    private String scyLegal;
-
-    /** 营业执照 */
-    @Excel(name = "营业执照")
-    private String scyLicense;
-
-    /** 有效期结束时间 */
-    @Excel(name = "有效期结束时间")
-    private String scyEndTime;
-
-    /** 公司说明描述 */
-    @Excel(name = "公司说明描述")
-    private String scyDescribe;
-
-    /** 备注 */
-    @Excel(name = "备注")
-    private String scyRemarks;
-
-    /** 00:正常 01:停用 99:删除 */
-    @Excel(name = "00:正常 01:停用 99:删除")
-    private String scyStt;
-
-    /** 有效期开始时间 */
-    @Excel(name = "有效期开始时间")
+    /**
+     * 证件注册日
+     */
+    @TableField("scy_start_time")
     private String scyStartTime;
 
-    /** 编号 */
-    @Excel(name = "编号")
-    private String scyCode;
-
-    /** 用户员工绑定状态0不绑定1绑定 */
-    @Excel(name = "用户员工绑定状态0不绑定1绑定")
-    private String scyUserStaffBinding;
-
-    /** 是否集团（0否1是） */
-    @Excel(name = "是否集团", readConverterExp = "0=否1是")
-    private String scyIsGroup;
-
-    /** 集团ID */
-    @Excel(name = "集团ID")
-    private String scyParentId;
-
-    /** 负责人 */
-    @Excel(name = "负责人")
-    private String scyLeader;
-
-    public void setScyId(String scyId)
-    {
-        this.scyId = scyId;
-    }
-
-    public String getScyId()
-    {
-        return scyId;
-    }
-    public void setScyName(String scyName)
-    {
-        this.scyName = scyName;
-    }
-
-    public String getScyName()
-    {
-        return scyName;
-    }
-    public void setScyAbridge(String scyAbridge)
-    {
-        this.scyAbridge = scyAbridge;
-    }
-
-    public String getScyAbridge()
-    {
-        return scyAbridge;
-    }
-    public void setScyAddress(String scyAddress)
-    {
-        this.scyAddress = scyAddress;
-    }
-
-    public String getScyAddress()
-    {
-        return scyAddress;
-    }
-    public void setScyPhone(String scyPhone)
-    {
-        this.scyPhone = scyPhone;
-    }
-
-    public String getScyPhone()
-    {
-        return scyPhone;
-    }
-    public void setScySocialCode(String scySocialCode)
-    {
-        this.scySocialCode = scySocialCode;
-    }
-
-    public String getScySocialCode()
-    {
-        return scySocialCode;
-    }
-    public void setScyLegal(String scyLegal)
-    {
-        this.scyLegal = scyLegal;
-    }
-
-    public String getScyLegal()
-    {
-        return scyLegal;
-    }
-    public void setScyLicense(String scyLicense)
-    {
-        this.scyLicense = scyLicense;
-    }
-
-    public String getScyLicense()
-    {
-        return scyLicense;
-    }
-    public void setScyEndTime(String scyEndTime)
-    {
-        this.scyEndTime = scyEndTime;
-    }
-
-    public String getScyEndTime()
-    {
-        return scyEndTime;
-    }
-    public void setScyDescribe(String scyDescribe)
-    {
-        this.scyDescribe = scyDescribe;
-    }
-
-    public String getScyDescribe()
-    {
-        return scyDescribe;
-    }
-    public void setScyRemarks(String scyRemarks)
-    {
-        this.scyRemarks = scyRemarks;
-    }
-
-    public String getScyRemarks()
-    {
-        return scyRemarks;
-    }
-    public void setScyStt(String scyStt)
-    {
-        this.scyStt = scyStt;
-    }
-
-    public String getScyStt()
-    {
-        return scyStt;
-    }
-    public void setScyStartTime(String scyStartTime)
-    {
-        this.scyStartTime = scyStartTime;
-    }
-
-    public String getScyStartTime()
-    {
-        return scyStartTime;
-    }
-    public void setScyCode(String scyCode)
-    {
-        this.scyCode = scyCode;
-    }
+    /**
+     * 证件到期日(长期)
+     */
+    @TableField("scy_end_time")
+    private String scyEndTime;
 
-    public String getScyCode()
-    {
-        return scyCode;
-    }
-    public void setScyUserStaffBinding(String scyUserStaffBinding)
-    {
-        this.scyUserStaffBinding = scyUserStaffBinding;
-    }
+    /**
+     * 企业地址
+     */
+    @TableField("scy_address")
+    private String scyAddress;
 
-    public String getScyUserStaffBinding()
-    {
-        return scyUserStaffBinding;
-    }
-    public void setScyIsGroup(String scyIsGroup)
-    {
-        this.scyIsGroup = scyIsGroup;
-    }
+    /**
+     * 电话号码
+     */
+    @TableField("scy_phone")
+    private String scyPhone;
 
-    public String getScyIsGroup()
-    {
-        return scyIsGroup;
-    }
-    public void setScyParentId(String scyParentId)
-    {
-        this.scyParentId = scyParentId;
-    }
+    /**
+     * 法人证件(pub_file_inf.pfi_file_id)
+     */
+    @TableField("scy_legal_file")
+    private String scyLegalFile;
 
-    public String getScyParentId()
-    {
-        return scyParentId;
-    }
-    public void setScyLeader(String scyLeader)
-    {
-        this.scyLeader = scyLeader;
-    }
+    /**
+     * 法定姓名
+     */
+    @TableField("scy_legal")
+    private String scyLegal;
 
-    public String getScyLeader()
-    {
-        return scyLeader;
-    }
+    /**
+     * 法人证件号码
+     */
+    @TableField("scy_legal_id")
+    private String scyLegalId;
+
+    /**
+     * 法人授权书(pub_file_inf.pfi_file_id)
+     */
+    @TableField("scy_authorization_file")
+    private String scyAuthorizationFile;
+
+    /**
+     * 数字证书授权与承诺书(pub_file_inf.pfi_file_id)
+     */
+    @TableField("scy_commitment_file")
+    private String scyCommitmentFile;
+
+    /**
+     * 其他附件(pub_file_inf.pfi_file_id)
+     */
+    @TableField("scy_appendix_file")
+    private String scyAppendixFile;
+
+    /**
+     * 企业类型 00:平台,01:核心企业,02:供应商,03:资方
+     */
+    @TableField("scy_type")
+    private String scyType;
+
+    /**
+     * 备注
+     */
+    @TableField("scy_remarks")
+    private String scyRemarks;
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("scyId", getScyId())
-                .append("scyName", getScyName())
-                .append("scyAbridge", getScyAbridge())
-                .append("scyAddress", getScyAddress())
-                .append("scyPhone", getScyPhone())
-                .append("scySocialCode", getScySocialCode())
-                .append("scyLegal", getScyLegal())
-                .append("scyLicense", getScyLicense())
-                .append("scyEndTime", getScyEndTime())
-                .append("scyDescribe", getScyDescribe())
-                .append("scyRemarks", getScyRemarks())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("scyStt", getScyStt())
-                .append("scyStartTime", getScyStartTime())
-                .append("scyCode", getScyCode())
-                .append("scyUserStaffBinding", getScyUserStaffBinding())
-                .append("scyIsGroup", getScyIsGroup())
-                .append("scyParentId", getScyParentId())
-                .append("scyLeader", getScyLeader())
-                .toString();
-    }
-}
+    /**
+     * 状态 00:正常 01:停用 99:删除
+     */
+    @TableField("scy_status")
+    private String scyStatus;
+
+    /**
+     * 创建人
+     */
+    @TableField("create_by")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 修改人
+     */
+    @TableField("update_by")
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

tianhu-system/src/main/java/com/tianhu/system/mapper/SysCompanyMapper.java

@@ -1,61 +1,16 @@
 package com.tianhu.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.tianhu.system.domain.SysCompany;
 
 /**
- * 公司Mapper接口
- * 
- * @author keao
- * @date 2021-02-25
+ * <p>
+ * 公司表 Mapper 接口
+ * </p>
+ *
+ * @author cuixq
+ * @since 2021-08-16
  */
-public interface SysCompanyMapper 
-{
-    /**
-     * 查询公司
-     * 
-     * @param scyId 公司ID
-     * @return 公司
-     */
-    public SysCompany selectSysCompanyById(String scyId);
+public interface SysCompanyMapper extends BaseMapper<SysCompany> {
 
-    /**
-     * 查询公司列表
-     * 
-     * @param sysCompany 公司
-     * @return 公司集合
-     */
-    public List<SysCompany> selectSysCompanyList(SysCompany sysCompany);
-
-    /**
-     * 新增公司
-     * 
-     * @param sysCompany 公司
-     * @return 结果
-     */
-    public int insertSysCompany(SysCompany sysCompany);
-
-    /**
-     * 修改公司
-     * 
-     * @param sysCompany 公司
-     * @return 结果
-     */
-    public int updateSysCompany(SysCompany sysCompany);
-
-    /**
-     * 删除公司
-     * 
-     * @param scyId 公司ID
-     * @return 结果
-     */
-    public int deleteSysCompanyById(String scyId);
-
-    /**
-     * 批量删除公司
-     * 
-     * @param scyIds 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteSysCompanyByIds(String[] scyIds);
 }

tianhu-system/src/main/java/com/tianhu/system/service/ISysCompanyService.java

@@ -1,61 +1,57 @@
 package com.tianhu.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
 import com.tianhu.system.domain.SysCompany;
 
+import java.util.List;
+
 /**
- * 公司Service接口
- * 
- * @author keao
- * @date 2021-02-25
+ * ClassName: ISysCompanyService<br>
+ * Description: SysCompanyService接口 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-08-16  cuixq    由Generator自动创建
  */
-public interface ISysCompanyService 
-{
-    /**
-     * 查询公司
-     * 
-     * @param scyId 公司ID
-     * @return 公司
-     */
-    public SysCompany selectSysCompanyById(String scyId);
-
+public interface ISysCompanyService extends IService<SysCompany> {
     /**
-     * 查询公司列表
-     * 
-     * @param sysCompany 公司
-     * @return 公司集合
+     * 查询（分页）
+     *
+     * @param request QueryRequest
+     * @param wrapper LambdaQueryWrapper<SysCompany>
+     * @return IPage<SysCompany>
      */
-    public List<SysCompany> selectSysCompanyList(SysCompany sysCompany);
+    IPage<SysCompany> findSysCompanys(QueryRequest request, LambdaQueryWrapper<SysCompany> wrapper);
 
     /**
-     * 新增公司
-     * 
-     * @param sysCompany 公司
-     * @return 结果
+     * 查询（所有）
+     *
+     * @param wrapper LambdaQueryWrapper<SysCompany>
+     * @return List<SysCompany>
      */
-    public int insertSysCompany(SysCompany sysCompany);
+    List<SysCompany> findSysCompanys(LambdaQueryWrapper<SysCompany> wrapper);
 
     /**
-     * 修改公司
-     * 
-     * @param sysCompany 公司
-     * @return 结果
+     * 新增
+     *
+     * @param sysCompany sysCompany
      */
-    public int updateSysCompany(SysCompany sysCompany);
+    void createSysCompany(SysCompany sysCompany);
 
     /**
-     * 批量删除公司
-     * 
-     * @param scyIds 需要删除的公司ID
-     * @return 结果
+     * 修改
+     *
+     * @param sysCompany sysCompany
      */
-    public int deleteSysCompanyByIds(String[] scyIds);
+    void updateSysCompany(SysCompany sysCompany);
 
     /**
-     * 删除公司信息
-     * 
-     * @param scyId 公司ID
-     * @return 结果
+     * 删除
+     *
+     * @param wrapper LambdaQueryWrapper<SysCompany>
      */
-    public int deleteSysCompanyById(String scyId);
+    void deleteSysCompany(LambdaQueryWrapper<SysCompany> wrapper);
 }

tianhu-system/src/main/java/com/tianhu/system/service/impl/SysCompanyServiceImpl.java

@@ -1,96 +1,61 @@
 package com.tianhu.system.service.impl;
 
-import java.util.List;
-import com.tianhu.common.core.utils.DateUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
 import com.tianhu.system.domain.SysCompany;
 import com.tianhu.system.mapper.SysCompanyMapper;
 import com.tianhu.system.service.ISysCompanyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
- * 公司Service业务层处理
- * 
- * @author keao
- * @date 2021-02-25
+ * ClassName: SysCompanyServiceImpl<br>
+ * Description: ISysCompanyService实现 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-08-16  cuixq    由Generator自动创建
  */
 @Service
-public class SysCompanyServiceImpl implements ISysCompanyService
-{
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class SysCompanyServiceImpl extends ServiceImpl<SysCompanyMapper, SysCompany> implements ISysCompanyService {
+
     @Autowired
     private SysCompanyMapper sysCompanyMapper;
 
-    /**
-     * 查询公司
-     * 
-     * @param scyId 公司ID
-     * @return 公司
-     */
     @Override
-    public SysCompany selectSysCompanyById(String scyId)
-    {
-        return sysCompanyMapper.selectSysCompanyById(scyId);
+    public IPage<SysCompany> findSysCompanys(QueryRequest request, LambdaQueryWrapper<SysCompany> wrapper) {
+        Page<SysCompany> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return this.page(page, wrapper);
     }
 
-    /**
-     * 查询公司列表
-     * 
-     * @param sysCompany 公司
-     * @return 公司
-     */
     @Override
-    public List<SysCompany> selectSysCompanyList(SysCompany sysCompany)
-    {
-        return sysCompanyMapper.selectSysCompanyList(sysCompany);
+    public List<SysCompany> findSysCompanys(LambdaQueryWrapper<SysCompany> wrapper) {
+		return this.list(wrapper);
     }
 
-    /**
-     * 新增公司
-     * 
-     * @param sysCompany 公司
-     * @return 结果
-     */
     @Override
-    public int insertSysCompany(SysCompany sysCompany)
-    {
-        sysCompany.setCreateTime(DateUtils.getNowDate());
-        return sysCompanyMapper.insertSysCompany(sysCompany);
+    @Transactional(rollbackFor = Exception.class)
+    public void createSysCompany(SysCompany sysCompany) {
+        this.save(sysCompany);
     }
 
-    /**
-     * 修改公司
-     * 
-     * @param sysCompany 公司
-     * @return 结果
-     */
     @Override
-    public int updateSysCompany(SysCompany sysCompany)
-    {
-        sysCompany.setUpdateTime(DateUtils.getNowDate());
-        return sysCompanyMapper.updateSysCompany(sysCompany);
+    @Transactional(rollbackFor = Exception.class)
+    public void updateSysCompany(SysCompany sysCompany) {
+        this.saveOrUpdate(sysCompany);
     }
 
-    /**
-     * 批量删除公司
-     * 
-     * @param scyIds 需要删除的公司ID
-     * @return 结果
-     */
     @Override
-    public int deleteSysCompanyByIds(String[] scyIds)
-    {
-        return sysCompanyMapper.deleteSysCompanyByIds(scyIds);
-    }
-
-    /**
-     * 删除公司信息
-     * 
-     * @param scyId 公司ID
-     * @return 结果
-     */
-    @Override
-    public int deleteSysCompanyById(String scyId)
-    {
-        return sysCompanyMapper.deleteSysCompanyById(scyId);
-    }
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteSysCompany(LambdaQueryWrapper<SysCompany> wrapper) {
+	    this.remove(wrapper);
+	}
 }

tianhu-system/src/main/resources/mapper/system/SysCompanyMapper.xml

@@ -1,155 +1,30 @@
-<?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">
+<?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.tianhu.system.mapper.SysCompanyMapper">
 
-    <resultMap type="SysCompany" id="SysCompanyResult">
-        <result property="scyId"    column="scy_id"    />
-        <result property="scyName"    column="scy_name"    />
-        <result property="scyAbridge"    column="scy_abridge"    />
-        <result property="scyAddress"    column="scy_address"    />
-        <result property="scyPhone"    column="scy_phone"    />
-        <result property="scySocialCode"    column="scy_social_code"    />
-        <result property="scyLegal"    column="scy_legal"    />
-        <result property="scyLicense"    column="scy_license"    />
-        <result property="scyEndTime"    column="scy_end_time"    />
-        <result property="scyDescribe"    column="scy_describe"    />
-        <result property="scyRemarks"    column="scy_remarks"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="scyStt"    column="scy_STT"    />
-        <result property="scyStartTime"    column="scy_start_time"    />
-        <result property="scyCode"    column="scy_code"    />
-        <result property="scyUserStaffBinding"    column="scy_user_staff_binding"    />
-        <result property="scyIsGroup"    column="scy_is_group"    />
-        <result property="scyParentId"    column="scy_parent_id"    />
-        <result property="scyLeader"    column="scy_leader"    />
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.tianhu.system.domain.SysCompany">
+        <id column="scy_id" property="scyId" />
+        <result column="scy_license_file" property="scyLicenseFile" />
+        <result column="scy_name" property="scyName" />
+        <result column="scy_social_code" property="scySocialCode" />
+        <result column="scy_start_time" property="scyStartTime" />
+        <result column="scy_end_time" property="scyEndTime" />
+        <result column="scy_address" property="scyAddress" />
+        <result column="scy_phone" property="scyPhone" />
+        <result column="scy_legal_file" property="scyLegalFile" />
+        <result column="scy_legal" property="scyLegal" />
+        <result column="scy_legal_id" property="scyLegalId" />
+        <result column="scy_authorization_file" property="scyAuthorizationFile" />
+        <result column="scy_commitment_file" property="scyCommitmentFile" />
+        <result column="scy_appendix_file" property="scyAppendixFile" />
+        <result column="scy_type" property="scyType" />
+        <result column="scy_remarks" property="scyRemarks" />
+        <result column="scy_status" property="scyStatus" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
     </resultMap>
 
-    <sql id="selectSysCompanyVo">
-        select scy_id, scy_name, scy_abridge, scy_address, scy_phone, scy_social_code, scy_legal, scy_license, scy_end_time, scy_describe, scy_remarks, create_by, create_time, update_by, update_time, scy_STT, scy_start_time, scy_code, scy_user_staff_binding, scy_is_group, scy_parent_id, scy_leader from sys_company
-    </sql>
-
-    <select id="selectSysCompanyList" parameterType="SysCompany" resultMap="SysCompanyResult">
-        <include refid="selectSysCompanyVo"/>
-        <where>
-            <if test="scyName != null  and scyName != ''"> and scy_name = #{scyName}</if>
-            <if test="scyAbridge != null  and scyAbridge != ''"> and scy_abridge = #{scyAbridge}</if>
-            <if test="scyAddress != null  and scyAddress != ''"> and scy_address = #{scyAddress}</if>
-            <if test="scyPhone != null  and scyPhone != ''"> and scy_phone = #{scyPhone}</if>
-            <if test="scySocialCode != null  and scySocialCode != ''"> and scy_social_code = #{scySocialCode}</if>
-            <if test="scyLegal != null  and scyLegal != ''"> and scy_legal = #{scyLegal}</if>
-            <if test="scyLicense != null  and scyLicense != ''"> and scy_license = #{scyLicense}</if>
-            <if test="scyEndTime != null  and scyEndTime != ''"> and scy_end_time = #{scyEndTime}</if>
-            <if test="scyDescribe != null  and scyDescribe != ''"> and scy_describe = #{scyDescribe}</if>
-            <if test="scyRemarks != null  and scyRemarks != ''"> and scy_remarks = #{scyRemarks}</if>
-            <if test="scyStt != null  and scyStt != ''"> and scy_STT = #{scyStt}</if>
-            <if test="scyStartTime != null  and scyStartTime != ''"> and scy_start_time = #{scyStartTime}</if>
-            <if test="scyCode != null  and scyCode != ''"> and scy_code = #{scyCode}</if>
-            <if test="scyUserStaffBinding != null  and scyUserStaffBinding != ''"> and scy_user_staff_binding = #{scyUserStaffBinding}</if>
-            <if test="scyIsGroup != null  and scyIsGroup != ''"> and scy_is_group = #{scyIsGroup}</if>
-            <if test="scyParentId != null  and scyParentId != ''"> and scy_parent_id = #{scyParentId}</if>
-            <if test="scyLeader != null  and scyLeader != ''"> and scy_leader = #{scyLeader}</if>
-        </where>
-    </select>
-
-    <select id="selectSysCompanyById" parameterType="String" resultMap="SysCompanyResult">
-        <include refid="selectSysCompanyVo"/>
-        where scy_id = #{scyId}
-    </select>
-
-    <insert id="insertSysCompany" parameterType="SysCompany">
-        insert into sys_company
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="scyId != null">scy_id,</if>
-            <if test="scyName != null">scy_name,</if>
-            <if test="scyAbridge != null">scy_abridge,</if>
-            <if test="scyAddress != null">scy_address,</if>
-            <if test="scyPhone != null">scy_phone,</if>
-            <if test="scySocialCode != null">scy_social_code,</if>
-            <if test="scyLegal != null">scy_legal,</if>
-            <if test="scyLicense != null">scy_license,</if>
-            <if test="scyEndTime != null">scy_end_time,</if>
-            <if test="scyDescribe != null">scy_describe,</if>
-            <if test="scyRemarks != null">scy_remarks,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="scyStt != null">scy_STT,</if>
-            <if test="scyStartTime != null">scy_start_time,</if>
-            <if test="scyCode != null">scy_code,</if>
-            <if test="scyUserStaffBinding != null">scy_user_staff_binding,</if>
-            <if test="scyIsGroup != null">scy_is_group,</if>
-            <if test="scyParentId != null">scy_parent_id,</if>
-            <if test="scyLeader != null">scy_leader,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="scyId != null">#{scyId},</if>
-            <if test="scyName != null">#{scyName},</if>
-            <if test="scyAbridge != null">#{scyAbridge},</if>
-            <if test="scyAddress != null">#{scyAddress},</if>
-            <if test="scyPhone != null">#{scyPhone},</if>
-            <if test="scySocialCode != null">#{scySocialCode},</if>
-            <if test="scyLegal != null">#{scyLegal},</if>
-            <if test="scyLicense != null">#{scyLicense},</if>
-            <if test="scyEndTime != null">#{scyEndTime},</if>
-            <if test="scyDescribe != null">#{scyDescribe},</if>
-            <if test="scyRemarks != null">#{scyRemarks},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="scyStt != null">#{scyStt},</if>
-            <if test="scyStartTime != null">#{scyStartTime},</if>
-            <if test="scyCode != null">#{scyCode},</if>
-            <if test="scyUserStaffBinding != null">#{scyUserStaffBinding},</if>
-            <if test="scyIsGroup != null">#{scyIsGroup},</if>
-            <if test="scyParentId != null">#{scyParentId},</if>
-            <if test="scyLeader != null">#{scyLeader},</if>
-        </trim>
-    </insert>
-
-    <update id="updateSysCompany" parameterType="SysCompany">
-        update sys_company
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="scyName != null">scy_name = #{scyName},</if>
-            <if test="scyAbridge != null">scy_abridge = #{scyAbridge},</if>
-            <if test="scyAddress != null">scy_address = #{scyAddress},</if>
-            <if test="scyPhone != null">scy_phone = #{scyPhone},</if>
-            <if test="scySocialCode != null">scy_social_code = #{scySocialCode},</if>
-            <if test="scyLegal != null">scy_legal = #{scyLegal},</if>
-            <if test="scyLicense != null">scy_license = #{scyLicense},</if>
-            <if test="scyEndTime != null">scy_end_time = #{scyEndTime},</if>
-            <if test="scyDescribe != null">scy_describe = #{scyDescribe},</if>
-            <if test="scyRemarks != null">scy_remarks = #{scyRemarks},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="scyStt != null">scy_STT = #{scyStt},</if>
-            <if test="scyStartTime != null">scy_start_time = #{scyStartTime},</if>
-            <if test="scyCode != null">scy_code = #{scyCode},</if>
-            <if test="scyUserStaffBinding != null">scy_user_staff_binding = #{scyUserStaffBinding},</if>
-            <if test="scyIsGroup != null">scy_is_group = #{scyIsGroup},</if>
-            <if test="scyParentId != null">scy_parent_id = #{scyParentId},</if>
-            <if test="scyLeader != null">scy_leader = #{scyLeader},</if>
-        </trim>
-        where scy_id = #{scyId}
-    </update>
-
-    <delete id="deleteSysCompanyById" parameterType="String">
-        delete from sys_company where scy_id = #{scyId}
-    </delete>
-
-    <delete id="deleteSysCompanyByIds" parameterType="String">
-        delete from sys_company where scy_id in
-        <foreach item="scyId" collection="array" open="(" separator="," close=")">
-            #{scyId}
-        </foreach>
-    </delete>
-
-</mapper>
+</mapper>