ganzi/ganzi-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

企业注册审核

Browse Source
This commit is contained in:
mythxb 2023-07-19 15:50:10 +08:00
parent 9db8e58402
commit 546a4c6cf3
7 changed files with 98 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
inventory-dao/src/main/java/com/rzyc/enums/AuditStatusEnum.java Normal file
View File

@ -0,0 +1,27 @@
package com.rzyc.enums;
/**
* @author dong
* @date 2023-07-19 15:32
* @Version V1.0
*/
public enum AuditStatusEnum {
PASS(1),
NOT_PASS(2),
AUDITING(3);
private Integer state;
AuditStatusEnum(Integer state) {
this.state = state;
}
public Integer getState() {
return state;
}
public void setState(Integer state) {
this.state = state;
}
}

3
inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java
View File

@ -119,7 +119,8 @@ public interface SysEnterpriseMapper extends BaseMapper<SysEnterprise> {
@Param("riskLevel")String riskLevel,
@Param("isAdmin") Integer isAdmin,
@Param("baseinclassid") String baseinclassid,
@Param("inherentRisks") List<Integer> inherentRisks);
@Param("inherentRisks") List<Integer> inherentRisks,
@Param("auditStatus") Integer auditStatus);
/*企业数量*/
Integer countCompany(@Param("areaCode") String areaCode,

4
inventory-dao/src/main/java/com/rzyc/model/ent/SysEnterprise.java
View File

@ -299,15 +299,17 @@ public class SysEnterprise implements Serializable {
private String state = "启用";
/**
* 审核状态 1、审核通过 2、未审核通过
* 审核状态 1、审核通过 2、未审核通过 3、审核中
*/
@TableField("audit_status")
@ApiModelProperty("审核状态 1、审核通过 2、驳回 3、审核中")
private Integer auditStatus;
/**
* 审核备注
*/
@TableField("audit_remarks")
@ApiModelProperty("驳回理由")
private String auditRemarks;
/**

3
inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml
View File

@ -848,6 +848,9 @@
<if test="null != baseinclassid and '' != baseinclassid">
and sys.work_class_id = #{baseinclassid}
</if>
<if test="null != auditStatus">
and sys.audit_status = #{auditStatus}
</if>
order by sys.ModifiedOn desc , sys.SysEnterpriseId desc
</select>

7
inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java
View File

@ -18,6 +18,7 @@ import com.rzyc.bean.check.dto.TalkAddDto;
import com.rzyc.bean.ent.*;
import com.rzyc.bean.user.dto.LoginDto;
import com.rzyc.config.MethodAnnotation;
import com.rzyc.enums.AuditStatusEnum;
import com.rzyc.model.Accident;
import com.rzyc.model.DangerStatistic;
import com.rzyc.model.EntCertificates;
@ -636,7 +637,7 @@ public class PcCompanyController extends BaseController{
List<SysEnterprise> sysEnterprises = sysEnterpriseMapper.selectPCList(areaCode,companiesExcelDto.getEntName(),companiesExcelDto.getRiskLevel(),isAdmin,companiesExcelDto.getBaseinclassid(),inherentRisks);
List<SysEnterprise> sysEnterprises = sysEnterpriseMapper.selectPCList(areaCode,companiesExcelDto.getEntName(),companiesExcelDto.getRiskLevel(),isAdmin,companiesExcelDto.getBaseinclassid(),inherentRisks, AuditStatusEnum.PASS.getState());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
String date = simpleDateFormat.format(new Date());
if(null != sysEnterprises && sysEnterprises.size() > 0){
@ -1082,7 +1083,7 @@ public class PcCompanyController extends BaseController{
SysEnterprise sysEnterprise = sysEnterpriseMapper.findByEnt(enterprise.getEntname(),enterprise.getOrgpassno());
if(null != sysEnterprise){
if(1 == sysEnterprise.getAuditStatus()){
if(AuditStatusEnum.PASS.getState() == sysEnterprise.getAuditStatus()){
result.setCode(Code.ERROR.getCode());
result.setMessage("企业已存在，可直接登录。");
}else{
@ -1095,7 +1096,7 @@ public class PcCompanyController extends BaseController{
enterprise.setCreatedon(new Date());
enterprise.setModifiedon(new Date());
enterprise.setState("启用");
enterprise.setAuditStatus(2);
enterprise.setAuditStatus(AuditStatusEnum.AUDITING.getState());
enterprise.setDynamicRiskLevel("100");//新建企业默认100分数
enterprise.setQrCode(entQrCode(enterprise.getSysenterpriseid()));

3
inventory-gov/src/main/java/com/rzyc/controller/ExportContorller.java
View File

@ -18,6 +18,7 @@ import com.rzyc.bean.house.vo.HouseListVo;
import com.rzyc.bean.organization.dto.DangerDetaiManagerExportDto;
import com.rzyc.bean.organization.vo.DangerDetaiManagerlExportVo;
import com.rzyc.bean.organization.vo.EnterpriseInfoForOrgzationEportVo;
import com.rzyc.enums.AuditStatusEnum;
import com.rzyc.enums.DelState;
import com.rzyc.model.*;
import com.rzyc.model.check.ChkBillDetailWithBLOBs;
@ -568,7 +569,7 @@ public class ExportContorller extends com.rzyc.controller.BaseController {
}
List<SysEnterprise> enterprises = sysEnterpriseMapper.selectPCList(orgCode,companyName,riskLevel,null,baseinclassid,inherentRisks);
List<SysEnterprise> enterprises = sysEnterpriseMapper.selectPCList(orgCode,companyName,riskLevel,null,baseinclassid,inherentRisks, AuditStatusEnum.PASS.getState());
for (SysEnterprise enterprise : enterprises){
if(StringUtils.isNotBlank(enterprise.getQrCode())){
System.out.println(enterprise.getQrCode());

60
inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java
View File

@ -16,6 +16,7 @@ import com.rzyc.bean.check.dto.LawAddDto;
import com.rzyc.bean.check.dto.TalkAddDto;
import com.rzyc.bean.ent.*;
import com.rzyc.bean.user.dto.WeChartLoginDto;
import com.rzyc.enums.AuditStatusEnum;
import com.rzyc.enums.RiskLevel;
import com.rzyc.model.*;
import com.rzyc.model.check.*;
@ -102,7 +103,60 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
PageHelper.startPage(companiesDto.getPage(), companiesDto.getPageSize());
Page<SysEnterprise> object = (Page<SysEnterprise>)sysEnterpriseMapper.selectPCList(areaCode,companiesDto.getEntName(),companiesDto.getRiskLevel(),isAdmin,companiesDto.getBaseinclassid(),inherentRisks);
Page<SysEnterprise> object = (Page<SysEnterprise>)sysEnterpriseMapper.selectPCList(areaCode,companiesDto.getEntName(),companiesDto.getRiskLevel(),isAdmin,companiesDto.getBaseinclassid(),inherentRisks, AuditStatusEnum.PASS.getState());
getDatePage(pager,object);
if (object != null){
for(SysEnterprise enterprise : pager.getRows()){
enterprise.setOrgName(enterprise.getAreaName());
}
singleResult.setMessage(Message.SUCCESS);
singleResult.setData(pager);
singleResult.setCode(Code.SUCCESS.getCode());
}else {
singleResult.setMessage(Message.ERROR);
singleResult.setCode(Code.ERROR.getCode());
}
return singleResult;
}
/**
* PC待审核企业列表
* @version v1.0
* @author dong
* @date 2022/12/30 10:38
*/
@ApiOperation(value = "PC待审核企业列表", notes = "PC待审核企业列表")
@PostMapping("/companiesAudit")
@ResponseBody
public SingleResult<Pager<SysEnterprise>> companiesAudit(@Valid CompaniesDto companiesDto)throws Exception {
SingleResult singleResult = new SingleResult();
Pager<SysEnterprise> pager = new Pager<>();
String userId = getUserId();
//是否为管理员账号 1:是 2：否
Integer isAdmin = 2;
if(ADMIN_ID.equals(userId)){
isAdmin = 1;
}
String areaCode = companiesDto.getOrgCode();
if(StringUtils.isBlank(areaCode)){
areaCode = getUserArea(userId);
}
List<Integer> inherentRisks = new ArrayList<>();
//风险等级
if(StringUtils.isNotBlank(companiesDto.getInherentRiskStr())){
for (String str : companiesDto.getInherentRiskStr().split(",")){
inherentRisks.add(TypeConversion.StringToInteger(str));
}
}
PageHelper.startPage(companiesDto.getPage(), companiesDto.getPageSize());
Page<SysEnterprise> object = (Page<SysEnterprise>)sysEnterpriseMapper.selectPCList(areaCode,companiesDto.getEntName(),companiesDto.getRiskLevel(),isAdmin,companiesDto.getBaseinclassid(),inherentRisks, AuditStatusEnum.NOT_PASS.getState());
getDatePage(pager,object);
if (object != null){
for(SysEnterprise enterprise : pager.getRows()){
@ -808,7 +862,7 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
List<SysEnterprise> sysEnterprises = sysEnterpriseMapper.selectPCList(areaCode,companiesExcelDto.getEntName(),companiesExcelDto.getRiskLevel(),isAdmin,companiesExcelDto.getBaseinclassid(),inherentRisks);
List<SysEnterprise> sysEnterprises = sysEnterpriseMapper.selectPCList(areaCode,companiesExcelDto.getEntName(),companiesExcelDto.getRiskLevel(),isAdmin,companiesExcelDto.getBaseinclassid(),inherentRisks, AuditStatusEnum.PASS.getState());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
String date = simpleDateFormat.format(new Date());
if(null != sysEnterprises && sysEnterprises.size() > 0){
@ -1381,7 +1435,7 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
orgCode = areaCode;
}
List<SysEnterprise> enterprises = sysEnterpriseMapper.selectPCList(orgCode,companyName,riskLevel,null,baseinclassid,inherentRisks);
List<SysEnterprise> enterprises = sysEnterpriseMapper.selectPCList(orgCode,companyName,riskLevel,null,baseinclassid,inherentRisks, AuditStatusEnum.PASS.getState());
for (SysEnterprise enterprise : enterprises){
if(StringUtils.isNotBlank(enterprise.getQrCode())){
System.out.println(enterprise.getQrCode());