新增分公司的总公司工商信息管理

Administrator

2021-12-25 497df0adf57c8a076596fa763cdbe5a554b96b5b

新增分公司的总公司工商信息管理

 src/main/java/org/springblade/modules/business/controller/BusinessController.java

New file
@@ -0,0 +1,101 @@
package org.springblade.modules.business.controller;

import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.business.entity.Business;
import org.springblade.modules.business.service.BusinessService;
import org.springblade.modules.business.vo.BusinessVo;
import org.springframework.web.bind.annotation.*;

/**
 * @author zhongrj
 * @time 2021-12-25
 * @desc 工商信息控制层
 */
@RestController
@AllArgsConstructor
@RequestMapping("/business")
public class BusinessController {

    private final BusinessService businessService;


//    /**
//     * 自定义分页
//     * @param query page,size
//     * @param business 工商信息信息对象
//     */
//    @GetMapping("/page")
//    public R<IPage<SecurityPaperVo>> page(SecurityPaperVo business, Query query) {
//        IPage<SecurityPaperVo> pages = businessService.selectSecurityPaperPage(Condition.getPage(query), business);
//        return R.data(pages);
//    }

    /**
     * 新增
     * @param business 工商信息信息对象
     */
    @PostMapping("/save")
    @ApiOperation(value = "新增", notes = "传入business")
    public R save(@RequestBody Business business){
        return R.data(businessService.save(business));
    }


    /**
     * 修改
     * @param business 工商信息信息对象
     */
    @PostMapping("/update")
    public R update(@RequestBody Business business){
        return R.status(businessService.updateById(business));
    }

    /**
     * 新增或修改
     * @param business 工商信息信息对象
     */
    @PostMapping("/submit")
    public R submit(@RequestBody Business business){
        if (null==business.getId()){
            businessService.save(business);
        }else {
            businessService.updateById(business);
        }
        return R.data(business);
    }

    /**
     * 删除
     * @param ids 工商信息信息ids 数组
     */
    @PostMapping("/remove")
    public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
        return R.status(businessService.removeByIds(Func.toLongList(ids)));
    }

    /**
     * 详情
     * @param business 工商信息信息对象
     */
    @GetMapping("/detail")
    @ApiOperation(value = "详情", notes = "传入business")
    public R<Business> detail(Business business) {
        Business detail = businessService.getOne(Condition.getQueryWrapper(business));
        return R.data(detail);
    }

    /**
     * 详情(包含分公司工商信息)
     * @param business 工商信息信息对象
     */
    @GetMapping("/getBusinessInfo")
    public R<BusinessVo> getBusinessInfo(Business business) {
        return R.data(businessService.getBusinessInfo(business));
    }

}

 src/main/java/org/springblade/modules/business/entity/Business.java

New file
@@ -0,0 +1,70 @@
package org.springblade.modules.business.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

/**
 * 工商信息实体类
 * @author zhongrj
 * @time 2021-12-25
 */
@Data
@TableName("sys_business")
public class Business implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * 工商信息主键id,非自增
     */
    @TableId(value = "id",type = IdType.AUTO)
    private Integer id;


    /**
     * 统一社会信用代码
     */
    @TableField("social_credit_code")
    private String socialCreditCode;

    /**
     * 注册时间
     */
    @TableField("register_time")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date registerTime;



    /**
     * 注册资本
     */
    private String capital;

    /**
     * 经营范围
     */
    @TableField("business_scope")
    private String businessScope;


    /**
     * 营业执照url
     */
    private String trading;

    /**
     * 公司id
     */
    @TableField("dept_id")
    private String deptId;

}

 src/main/java/org/springblade/modules/business/mapper/BusinessMapper.java

New file
@@ -0,0 +1,20 @@
package org.springblade.modules.business.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.business.entity.Business;
import org.springblade.modules.business.vo.BusinessVo;


/**
 * 工商信息Mapper 接口
 * @author zhongrj
 */
public interface BusinessMapper extends BaseMapper<Business> {

    /**
     * 详情(包含分公司工商信息)
     * @param business 工商信息信息对象
     */
    BusinessVo getBusinessInfo(@Param("business") Business business);
}

 src/main/java/org/springblade/modules/business/mapper/BusinessMapper.xml

New file
@@ -0,0 +1,23 @@
<?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="org.springblade.modules.business.mapper.BusinessMapper">

    <!--工商信息详情-->
    <select id="getBusinessInfo" resultType="org.springblade.modules.business.vo.BusinessVo">
        select
        sb.*,
        si.establishTime establishtime,
        si.registeredCapital registeredcapital,
        si.creditCode creditcode,
        si.business,
        si.business_License businessLicense
            from
        sys_business sb
            right join
        sys_information si
            on
        sb.dept_id = si.departmentid
            where si.departmentid = #{business.deptId}
    </select>

</mapper>

 src/main/java/org/springblade/modules/business/service/BusinessService.java

New file
@@ -0,0 +1,19 @@
package org.springblade.modules.business.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.business.entity.Business;
import org.springblade.modules.business.vo.BusinessVo;

/**
 * 工商信息服务类
 * @author zhongrj
 */
public interface BusinessService extends IService<Business> {

    /**
     * 详情(包含分公司工商信息)
     * @param business 工商信息信息对象
     */
    BusinessVo getBusinessInfo(Business business);
}

 src/main/java/org/springblade/modules/business/service/impl/BusinessServiceImpl.java

New file
@@ -0,0 +1,28 @@

package org.springblade.modules.business.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import org.springblade.modules.business.entity.Business;
import org.springblade.modules.business.mapper.BusinessMapper;
import org.springblade.modules.business.service.BusinessService;
import org.springblade.modules.business.vo.BusinessVo;
import org.springframework.stereotype.Service;

/**
 * 保安员证管理服务实现类
 * @author zhongrj
 * @since 2021-12-25
 */
@Service
@AllArgsConstructor
public class BusinessServiceImpl extends ServiceImpl<BusinessMapper, Business> implements BusinessService {
    /**
     * 详情(包含分公司工商信息)
     * @param business 工商信息信息对象
     */
    @Override
    public BusinessVo getBusinessInfo(Business business) {
        return baseMapper.getBusinessInfo(business);
    }
}

 src/main/java/org/springblade/modules/business/vo/BusinessVo.java

New file
@@ -0,0 +1,49 @@
package org.springblade.modules.business.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springblade.modules.business.entity.Business;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

/**
 * 工商信息vo
 * @author zhongrj
 * @since 2021-12-25
 */
@Data
public class BusinessVo extends Business implements Serializable {

    /**
     * 分公司统一社会信用代码
     */
    private String creditcode;

    /**
     * 分公司成立日期
     */
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date establishtime;


    /**
     * 分公司注册资本
     */
    private String registeredcapital;

    /**
     * 分公司经营范围
     */
    private String business;

    /**
     * 分公司营业执照 url
     */
    private String businessLicense;

}

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -64,6 +64,8 @@
import org.springblade.modules.experience.service.IExperienceService;
import org.springblade.modules.jurisdiction.entity.Jurisdiction;
import org.springblade.modules.jurisdiction.service.JurisdictionService;
import org.springblade.modules.securitypaper.entity.SecurityPaper;
import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springblade.modules.signinrecords.entity.SignInRecords;
import org.springblade.modules.signinrecords.service.SignInRecordsService;
import org.springblade.modules.system.entity.Dept;
@@ -129,6 +131,9 @@
    private final TrainingRegistrationService trainingRegistrationService;

    private final AccreditationRecordsService accreditationRecordsService;


    private final SecurityPaperService securityPaperService;

    /**
     * 查询单条
@@ -306,6 +311,28 @@
                url = split[1];
            }
        }

        //判断是否持证
//        if (user.getHold().equals("1") && null!=user.getSecuritynumber() && !user.getSecuritynumber().equals("")){
//            //持证，校验保安证编号是否合法
//            SecurityPaper securityPaper = new SecurityPaper();
//            securityPaper.setIdCardNo(user.getCardid());
//            List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
//            if (securityPaperList.size()>0){
//                boolean status = false;
//                //遍历
//                for (SecurityPaper paper : securityPaperList) {
//                    if (paper.getNumber().equals(user.getSecuritynumber())){
//                        status = true;
//                    }
//                }
//                if (!status){
//                    throw new ServiceException("保安证编号不匹配,请核实!");
//                }
//            }else {
//                throw new ServiceException("保安证编号不匹配,请核实!");
//            }
//        }

        //如果是离职
        if (null!=user.getStatus()){
@@ -1071,7 +1098,6 @@
        user.setExaminationType("0");
        user.setAccount(user.getCardid());

//        Integer userCount = userService.selectCount(user.getAccount());
        User user1 = new User();
        user1.setIsDeleted(0);
        user1.setStatus(1);
@@ -1108,6 +1134,28 @@
            }
        }

        //判断是否持证
//        if (user.getHold().equals("1")){
//            //持证，校验保安证编号是否合法
//            SecurityPaper securityPaper = new SecurityPaper();
//            securityPaper.setIdCardNo(user.getCardid());
//            List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
//            if (securityPaperList.size()>0){
//                boolean status = false;
//                //遍历
//                for (SecurityPaper paper : securityPaperList) {
//                    if (paper.getNumber().equals(user.getSecuritynumber())){
//                        status = true;
//                    }
//                }
//                if (!status){
//                    throw new ServiceException("保安证编号不匹配,请核实!");
//                }
//            }else {
//                throw new ServiceException("保安证编号不匹配,请核实!");
//            }
//        }

        String url = "";
        if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
            if (user.getFingerprint().length()>100) {
@@ -1117,16 +1165,7 @@
                url = split[1];
            }
        }
//            }
        //未持证
//            if (user.getHold().equals("2")){
//                //分配未持证保安角色
//                Role role = new Role();
//                role.setRoleAlias("未持证保安");
//                Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
//                user.setRoleId(oneRole.getId().toString());
//            }
//        }

        //密码加密
        if (Func.isNotEmpty(user.getCardid())) {
//            user.setPassword(DigestUtil.encrypt(user.getPassword()));

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -909,6 +909,8 @@
                    throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
                }
                user.setCreateTime(new Date());
                user.setDispatch("1");
                user.setExaminationType("0");
                //新增
//                this.save(user);
                //加入集合