diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ent/AuditChangeDto.java b/inventory-dao/src/main/java/com/rzyc/bean/ent/AuditChangeDto.java new file mode 100644 index 0000000..da0bf73 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/ent/AuditChangeDto.java @@ -0,0 +1,50 @@ +package com.rzyc.bean.ent; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.NotNull; + +/** + * @author dong + * @date 2023-07-19 16:02 + * @Version V1.0 + */ +@ApiModel("") +public class AuditChangeDto { + + @NotNull(message = "企业不能为空") + @ApiModelProperty(value = "企业id 多个逗号隔开",required = true) + private String sysenterpriseid; + + @NotNull(message = "请选择审核状态") + @ApiModelProperty(value = "审核状态 1、审核通过 2、驳回",required = true) + private Integer auditStatus; + + @ApiModelProperty(value = "审核备注") + private String auditRemarks; + + public String getAuditRemarks() { + return auditRemarks; + } + + public void setAuditRemarks(String auditRemarks) { + this.auditRemarks = auditRemarks; + } + + public String getSysenterpriseid() { + return sysenterpriseid; + } + + public void setSysenterpriseid(String sysenterpriseid) { + this.sysenterpriseid = sysenterpriseid; + } + + public Integer getAuditStatus() { + return auditStatus; + } + + public void setAuditStatus(Integer auditStatus) { + this.auditStatus = auditStatus; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangePerformDto.java b/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangePerformDto.java index 099b514..b6bcc24 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangePerformDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangePerformDto.java @@ -1,5 +1,6 @@ package com.rzyc.bean.user.dto; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -35,6 +36,17 @@ public class ChangePerformDto { @ApiModelProperty("工作分工") private String workdivision; + @ApiModelProperty("地区id") + private String areaCode; + + public String getAreaCode() { + return areaCode; + } + + public void setAreaCode(String areaCode) { + this.areaCode = areaCode; + } + public String getListperformid() { return listperformid; } diff --git a/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangeUserDto.java b/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangeUserDto.java index ec177a2..a1c164d 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangeUserDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangeUserDto.java @@ -30,8 +30,7 @@ public class ChangeUserDto { @ApiModelProperty("监管地区id 多个逗号隔开") private String superviseAreaId; - @NotNull(message = "部门不能为空") - @ApiModelProperty(value = "部门id",required = true) + @ApiModelProperty(value = "部门id") private String sysunitorentid; @NotNull(message = "用户名不能为空") @@ -67,8 +66,7 @@ public class ChangeUserDto { @ApiModelProperty(value = "操作人用户id",required = true) private String userId; - @NotNull(message = "用户类型不能为空") - @ApiModelProperty(value = "用户类型 1：区级用户 2：镇正领导 3:镇副领导 4：驻村干部 5：社区 6：其他",required = true) + @ApiModelProperty(value = "用户类型 1：区级用户 2：镇正领导 3:镇副领导 4：驻村干部 5：社区 6：其他") private Integer memberType = 6; public String getAreaCode() { diff --git a/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml b/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml index 0550814..8774f93 100644 --- a/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml +++ b/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml @@ -158,6 +158,11 @@ performName, parent_path, parent_name, + area_code, + area_path, + area_path_name, + position_type, + SupClassCode, viewJurisdiction,SupClassName, CreatedOn, CreatedBy, ModifiedOn, ModifiedBy, WorkDivision) @@ -168,6 +173,10 @@ #{performName,jdbcType=VARCHAR}, #{parentPath,jdbcType=VARCHAR}, #{parentName,jdbcType=VARCHAR}, + #{areaCode,jdbcType=VARCHAR}, + #{areaPath,jdbcType=VARCHAR}, + #{areaPathName,jdbcType=VARCHAR}, + #{positionType,jdbcType=INTEGER}, #{supclasscode,jdbcType=VARCHAR}, #{viewJurisdiction,jdbcType=VARCHAR}, #{supclassname,jdbcType=VARCHAR}, @@ -652,6 +661,10 @@ performName = #{record.performName,jdbcType=VARCHAR}, parent_path = #{record.parentPath,jdbcType=VARCHAR}, parent_name = #{record.parentName,jdbcType=VARCHAR}, + area_code = #{record.areaCode,jdbcType=VARCHAR}, + area_path = #{record.areaPath,jdbcType=VARCHAR}, + position_type = #{record.positionType,jdbcType=INTEGER}, + area_path_name = #{record.areaPathName,jdbcType=VARCHAR}, SupClassCode = #{record.supclasscode,jdbcType=VARCHAR}, viewJurisdiction = #{record.viewJurisdiction,jdbcType=VARCHAR}, WorkDivision = #{record.workdivision,jdbcType=VARCHAR}, diff --git a/inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java b/inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java index 9a5fbc2..6a41be3 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java @@ -1087,8 +1087,15 @@ public class PcCompanyController extends BaseController{ result.setCode(Code.ERROR.getCode()); result.setMessage("企业已存在，可直接登录。"); }else{ - result.setCode(Code.ERROR.getCode()); - result.setMessage("企业审核中。"); + if(AuditStatusEnum.NOT_PASS.getState() == sysEnterprise.getAuditStatus() ){ + //重新提交申请 + enterprise.setSysenterpriseid(sysEnterprise.getSysenterpriseid()); + enterprise.setAuditStatus(AuditStatusEnum.AUDITING.getState()); + sysEnterpriseMapper.updateById(enterprise); + }else{ + result.setCode(Code.ERROR.getCode()); + result.setMessage("企业审核中。"); + } } }else{ enterprise.setSysenterpriseid(RandomNumber.getUUid()); diff --git a/inventory-ent/src/main/resources/application-test.yml b/inventory-ent/src/main/resources/application-test.yml index c74bd3d..70cc969 100644 --- a/inventory-ent/src/main/resources/application-test.yml +++ b/inventory-ent/src/main/resources/application-test.yml @@ -70,7 +70,7 @@ logging: #文件上传的配置 onstants: #上传文件存放地址 - file_location: /static/resource/inventory/uploadFile/ + file_location: C:/mnt/resource/inventory/uploadFile/ #上传文件公共地址 file_header: /static/resource/inventory/uploadFile/ #上传文件基础路径 @@ -80,7 +80,7 @@ onstants: #动态详情基础地址 html_header: http://172.27.181.247:8018/ #logourl - logo_url: http://172.27.181.247:8010/static/resource/inventory/citysafe_logo.png + logo_url: http://182.132.59.28:8010/static/resource/inventory/citysafe_logo.png #政府端帮助文档url help_url: http://172.27.181.247:8018/appGovHelp #企业端帮助文档url diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java index 969534d..74ad871 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java @@ -970,6 +970,15 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { sysUser.setModifiedon(new Date()); sysUser.setCreatedon(new Date()); sysUser.setUsertype(UserType.GOV.getType()); + + String areaCode = constantsConfigure.getSuperiorOrgCode(); + ListPerform listPerform = listPerformMapper.selectByPrimaryKey(changeUserDto.getSystitle()); + if(null != listPerform && StringUtils.isNotBlank(listPerform.getAreaCode())){ + areaCode = listPerform.getAreaCode(); + } + + + //监管地区 sysUser.setSuperviseArea(changeUserDto.getSuperviseAreaId()); SysUser user = sysUserMapper.findById(sysUser.getSysuserid()); @@ -987,9 +996,9 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { user = sysUserMapper.findOtherUesr(sysUser.getSysusername(),sysUser.getSysuserid()); if(null == user){ - getUserAreaCode(changeUserDto.getAreaCode(),sysUser); + getUserAreaCode(areaCode,sysUser); getUserPost(changeUserDto.getSystitle(),sysUser); - getUserUnit(sysUser.getSysunitorentid(),sysUser); +// getUserUnit(sysUser.getSysunitorentid(),sysUser); sysUserMapper.changeUser(sysUser); //处理监管地区 changeSuperviseArea(sysUser.getSysuserid(),changeUserDto.getSuperviseAreaId(),operator.getChinaname()); @@ -1006,8 +1015,8 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { String passwd = PasswdFactory.encryptPasswd(sysUser.getSysuserid(), sysUser.getSysusername(), sysUser.getSyspassword()); sysUser.setSyspassword(passwd); getUserPost(changeUserDto.getSystitle(),sysUser); - getUserAreaCode(changeUserDto.getAreaCode(),sysUser); - getUserUnit(sysUser.getSysunitorentid(),sysUser); + getUserAreaCode(areaCode,sysUser); +// getUserUnit(sysUser.getSysunitorentid(),sysUser); sysUserMapper.insert(sysUser); //处理监管地区 changeSuperviseArea(sysUser.getSysuserid(),changeUserDto.getSuperviseAreaId(),operator.getChinaname()); @@ -1687,6 +1696,17 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { Integer level = getPerformLevel(changePerformDto.getSupclassid()); listPerform.setSyslevel(level); + String areaCode = changePerformDto.getAreaCode(); + if(StringUtils.isBlank(areaCode)){ + areaCode = constantsConfigure.getSuperiorOrgCode(); + } + SysOrg sysOrg = sysOrgMapper.selectById(areaCode); + if(null != sysOrg){ + listPerform.setAreaCode(areaCode); + listPerform.setAreaPath(sysOrg.getParentPath()); + listPerform.setAreaPathName(sysOrg.getParentName()); + } + ListPerform perform = listPerformMapper.selectByPrimaryKey(listPerform.getListperformid()); if(null != perform){ getPerformPath(listPerform.getSupclassid(),listPerform); diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java index fd4fa67..147e266 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java @@ -156,7 +156,7 @@ public class PcCompanyController extends com.rzyc.controller.BaseController { PageHelper.startPage(companiesDto.getPage(), companiesDto.getPageSize()); - Page object = (Page)sysEnterpriseMapper.selectPCList(areaCode,companiesDto.getEntName(),companiesDto.getRiskLevel(),isAdmin,companiesDto.getBaseinclassid(),inherentRisks, AuditStatusEnum.NOT_PASS.getState()); + Page object = (Page)sysEnterpriseMapper.selectPCList(areaCode,companiesDto.getEntName(),companiesDto.getRiskLevel(),isAdmin,companiesDto.getBaseinclassid(),inherentRisks, AuditStatusEnum.AUDITING.getState()); getDatePage(pager,object); if (object != null){ for(SysEnterprise enterprise : pager.getRows()){ @@ -174,6 +174,29 @@ public class PcCompanyController extends com.rzyc.controller.BaseController { } + /** + * 企业审核 + * @version v1.0 + * @author dong + * @date 2023/7/19 16:04 + */ + @ApiOperation(value = "企业审核", notes = "企业审核") + @PostMapping("/companiesAuditChange") + @ResponseBody + public SingleResult companiesAuditChange(@Valid @RequestBody AuditChangeDto auditChangeDto)throws Exception{ + SingleResult result = new SingleResult<>(); + String[] entIds = auditChangeDto.getSysenterpriseid().split(","); + for (String str : entIds){ + SysEnterprise enterprise = new SysEnterprise(); + enterprise.setSysenterpriseid(str); + enterprise.setAuditRemarks(auditChangeDto.getAuditRemarks()); + enterprise.setAuditStatus(auditChangeDto.getAuditStatus()); + sysEnterpriseMapper.updateById(enterprise); + } + return result; + } + + /** * 企业数量统计 * @version v1.0 diff --git a/inventory-gov/src/main/resources/application-test.yml b/inventory-gov/src/main/resources/application-test.yml index 126597f..ad92695 100644 --- a/inventory-gov/src/main/resources/application-test.yml +++ b/inventory-gov/src/main/resources/application-test.yml @@ -69,7 +69,7 @@ onstants: #动态详情基础地址 html_header: http://172.27.181.247:8018/ #logourl - logo_url: http://172.27.181.247:8010/static/resource/inventory/citysafe_logo.png + logo_url: http://182.132.59.28:8010/static/resource/inventory/citysafe_logo.png #政府端帮助文档url help_url: http://172.27.181.247:8018/appGovHelp #企业端帮助文档url