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

风险代码调整

Browse Source
This commit is contained in:
韩国东 2023-03-24 17:02:29 +08:00
parent 7f5fa55478
commit 0f3de011a3
5 changed files with 58 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
inventory-dao/src/main/java/com/rzyc/model/RkSources.java
View File

@ -52,6 +52,18 @@ public class RkSources implements Serializable {
@TableField("community_code")
private String communityCode;
@ApiModelProperty(value = "社区id")
@TableField("area_code")
private String areaCode;
@ApiModelProperty(value = "社区id")
@TableField("area_path")
private String areaPath;
@ApiModelProperty(value = "社区id")
@TableField("area_name")
private String areaName;
@ApiModelProperty(value = "经度")
@TableField("lon")
private String lon;
@ -170,6 +182,30 @@ public class RkSources implements Serializable {
@TableField("del_state")
private Integer delState;
public String getAreaCode() {
return areaCode;
}
public void setAreaCode(String areaCode) {
this.areaCode = areaCode;
}
public String getAreaPath() {
return areaPath;
}
public void setAreaPath(String areaPath) {
this.areaPath = areaPath;
}
public String getAreaName() {
return areaName;
}
public void setAreaName(String areaName) {
this.areaName = areaName;
}
public String getDocumentId() {
return documentId;
}

11
inventory-dao/src/main/resources/mapper/RkSourcesMapper.xml
View File

@ -10,6 +10,9 @@
<result column="orgcode" property="orgcode" />
<result column="street_code" property="streetCode" />
<result column="community_code" property="communityCode" />
<result column="area_code" property="areaCode" />
<result column="area_path" property="areaPath" />
<result column="area_name" property="areaName" />
<result column="lon" property="lon" />
<result column="lat" property="lat" />
<result column="xindex" property="xindex" />
@ -43,7 +46,13 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
source_id, enterprise_id, EntName, orgcode, street_code, community_code, lon, lat, xindex, yindex,document_id, BaseInClassId, palce, rk_source_id, type_id, hurt_type_id, is_harmful_gas, is_influential, details, personnel_num, price, possibility, seriousness, risk_grade, engineering, measures, created, modified, modify_time, create_time, controlled, status, infrastructure
source_id, enterprise_id, EntName, orgcode, street_code, community_code,
area_code,area_path,area_name,
lon, lat, xindex, yindex,document_id, BaseInClassId, palce, rk_source_id,
type_id, hurt_type_id, is_harmful_gas, is_influential, details,
personnel_num, price, possibility, seriousness, risk_grade, engineering,
measures, created, modified, modify_time, create_time,
controlled, status, infrastructure
</sql>
<!--风险源列表-->

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

@ -62,7 +62,12 @@
</resultMap>
<sql id="Base_Column_List">
SysEnterpriseId, OrgCode, street_code,community_code,SuperiorEnterpriseId, LowOrgCode,
SysEnterpriseId, OrgCode, street_code,
community_code,SuperiorEnterpriseId,
LowOrgCode,
area_code,
area_path,
area_name,
EntName,
isHide,
state,

6
inventory-ent/src/main/java/com/rzyc/controller/RiskController.java
View File

@ -453,9 +453,9 @@ public class RiskController extends BaseController {
SysEnterprise enterprise = sysEnterpriseMapper.selectByPrimaryKey(sourcesAddDto.getEnterpriseId());
if (null != enterprise) {
sources.setEntName(enterprise.getEntname());
sources.setOrgcode(enterprise.getOrgcode());
sources.setStreetCode(enterprise.getStreetCode());
sources.setCommunityCode(enterprise.getCommunityCode());
sources.setAreaCode(enterprise.getAreaCode());
sources.setAreaName(enterprise.getAreaName());
sources.setAreaPath(enterprise.getAreaPath());
//最新工作单元行业id
sources.setBaseInclassId(enterprise.getWorkClassId());
}

9
inventory-gov/src/main/java/com/rzyc/controller/ent/RiskController.java
View File

@ -62,7 +62,6 @@ public class RiskController extends BaseController {
Page<RkCompanyDiagnosis> emergencyEquipments = (Page<RkCompanyDiagnosis>) rkCompanyDiagnosisMapper.selectQueryCompanyDiagnosis(rkCompanyDiagnosis);
getDatePage(pager,emergencyEquipments);
singleResult.setData(pager);
return singleResult;
}
@ -83,7 +82,6 @@ public class RiskController extends BaseController {
public MultiResult<RkSensitiveType> getRkSensitiveType(@PathVariable String enterpriseId)throws Exception{
MultiResult<RkSensitiveType> singleResult = new MultiResult<>();
List<RkSensitiveType> rkSensitiveTypes = rkSensitiveTypeMapper.selectExample(enterpriseId);
if (rkSensitiveTypes.size()>0){
singleResult.setMessage(Message.SUCCESS);
singleResult.setCode(Code.SUCCESS.getCode());
@ -94,7 +92,6 @@ public class RiskController extends BaseController {
singleResult.setMessage(Message.ERROR);
singleResult.setCode(Code.ERROR.getCode());
}
return singleResult;
}
@ -455,9 +452,9 @@ public class RiskController extends BaseController {
SysEnterprise enterprise = sysEnterpriseMapper.selectByPrimaryKey(sourcesAddDto.getEnterpriseId());
if (null != enterprise) {
sources.setEntName(enterprise.getEntname());
sources.setOrgcode(enterprise.getOrgcode());
sources.setStreetCode(enterprise.getStreetCode());
sources.setCommunityCode(enterprise.getCommunityCode());
sources.setAreaCode(enterprise.getAreaCode());
sources.setAreaName(enterprise.getAreaName());
sources.setAreaPath(enterprise.getAreaPath());
//最新工作单元行业id
sources.setBaseInclassId(enterprise.getWorkClassId());
}