一起一档
This commit is contained in:
parent
6c53ff824b
commit
4bf0163c64
|
|
@ -20,4 +20,7 @@ public interface EntCertificatesMapper extends BaseMapper<EntCertificates> {
|
|||
|
||||
/*证件列表*/
|
||||
List<EntCertificates> certificatesList(@Param("enterpriseId") String enterpriseId);
|
||||
|
||||
List<EntCertificates> findAll();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
package com.rzyc.mapper.ent;
|
||||
|
||||
import com.rzyc.model.Risk.dto.RiskDto;
|
||||
import com.rzyc.model.Risk.vo.RiskVo;
|
||||
import com.rzyc.model.ent.EntRiskSource;
|
||||
import com.rzyc.model.ent.EntRiskSourceExample;
|
||||
import com.rzyc.model.ent.EntRiskSourceWithBLOBs;
|
||||
|
|
@ -39,4 +41,6 @@ public interface EntRiskSourceMapper {
|
|||
int updateByPrimaryKey(EntRiskSource record);
|
||||
|
||||
List<EntRiskSourceWithBLOBs> riskSourceList();
|
||||
|
||||
List<RiskVo> riskInformationList(@Param("riskDto") RiskDto riskDto);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
package com.rzyc.model.Risk.dto;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
/**
|
||||
* @版本号
|
||||
* @Author qcl
|
||||
* @date 2022/10/21&15:57
|
||||
*/
|
||||
|
||||
@ApiModel("风险管控传参")
|
||||
public class RiskDto {
|
||||
|
||||
@ApiModelProperty(value = "风险源id")
|
||||
@TableId("type_id")
|
||||
private String typeId;
|
||||
|
||||
public String getTypeId() {
|
||||
return typeId;
|
||||
}
|
||||
|
||||
public void setTypeId(String typeId) {
|
||||
this.typeId = typeId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "RiskDto{" +
|
||||
"typeId=" + typeId +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
102
inventory-dao/src/main/java/com/rzyc/model/Risk/vo/RiskVo.java
Normal file
102
inventory-dao/src/main/java/com/rzyc/model/Risk/vo/RiskVo.java
Normal file
|
|
@ -0,0 +1,102 @@
|
|||
package com.rzyc.model.Risk.vo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
/**
|
||||
* @版本号
|
||||
* @Author qcl
|
||||
* @date 2022/10/20&17:04
|
||||
*/
|
||||
|
||||
|
||||
@ApiModel(value = "风险信息返回参数显示")
|
||||
public class RiskVo {
|
||||
|
||||
@ApiModelProperty(value = "风险源名称")
|
||||
@TableId("name")
|
||||
private String name;
|
||||
|
||||
//TODO:事故分类字段不明
|
||||
@ApiModelProperty(value = "事故分类")
|
||||
@TableId("name")
|
||||
private String name1;
|
||||
|
||||
@ApiModelProperty(value = "风险等级")
|
||||
@TableId("risk_grade")
|
||||
private Integer riskGrade;
|
||||
|
||||
@ApiModelProperty(value = "场所")
|
||||
@TableId("palce")
|
||||
private String place;
|
||||
|
||||
@ApiModelProperty(value = "事故发生可能性")
|
||||
@TableId("possibility")
|
||||
private Integer possibility;
|
||||
|
||||
@ApiModelProperty(value = "事故后果严重性")
|
||||
@TableId("seriousness")
|
||||
private Integer seriousness;
|
||||
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getName1() {
|
||||
return name1;
|
||||
}
|
||||
|
||||
public void setName1(String name1) {
|
||||
this.name1 = name1;
|
||||
}
|
||||
|
||||
public Integer getRiskGrade() {
|
||||
return riskGrade;
|
||||
}
|
||||
|
||||
public void setRiskGrade(Integer riskGrade) {
|
||||
this.riskGrade = riskGrade;
|
||||
}
|
||||
|
||||
public String getPlace() {
|
||||
return place;
|
||||
}
|
||||
|
||||
public void setPlace(String place) {
|
||||
this.place = place;
|
||||
}
|
||||
|
||||
public Integer getPossibility() {
|
||||
return possibility;
|
||||
}
|
||||
|
||||
public void setPossibility(Integer possibility) {
|
||||
this.possibility = possibility;
|
||||
}
|
||||
|
||||
public Integer getSeriousness() {
|
||||
return seriousness;
|
||||
}
|
||||
|
||||
public void setSeriousness(Integer seriousness) {
|
||||
this.seriousness = seriousness;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "RiskVo{" +
|
||||
"name='" + name + '\'' +
|
||||
", name1='" + name1 + '\'' +
|
||||
", riskGrade=" + riskGrade +
|
||||
", place='" + place + '\'' +
|
||||
", possibility=" + possibility +
|
||||
", seriousness=" + seriousness +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
|
|
@ -28,4 +28,8 @@
|
|||
ORDER BY ec.`modify_time` DESC
|
||||
</select>
|
||||
|
||||
<select id="findAll" resultMap="BaseResultMap">
|
||||
select * from ent_certificates ec
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -531,4 +531,16 @@
|
|||
LEFT JOIN SysEnterprise se ON er.`SysEnterpriseId` = se.SysEnterpriseId
|
||||
ORDER BY er.`CreatedOn` DESC
|
||||
</select>
|
||||
|
||||
|
||||
<select id="riskInformationList" resultType="com.rzyc.model.Risk.vo.RiskVo">
|
||||
select rrt.name,
|
||||
rs.risk_grade,
|
||||
rs.palce,
|
||||
rs.possibility,
|
||||
rs.seriousness
|
||||
from rk_sources rs
|
||||
LEFT JOIN rk_risk_type rrt ON rrt.type_id = rs.type_id
|
||||
where rs.type_id = #{riskDto.typeId}
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -453,7 +453,11 @@ public class BaseController {
|
|||
@Autowired
|
||||
protected InListItemMapper inListItemMapper;
|
||||
|
||||
//
|
||||
//企业证照
|
||||
@Autowired
|
||||
protected EntCertificatesMapper entCertificatesMapper;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 岗位不需要的字符串
|
||||
|
|
|
|||
|
|
@ -0,0 +1,75 @@
|
|||
package com.rzyc.controller;
|
||||
|
||||
import com.common.utils.model.MultiResult;
|
||||
import com.common.utils.model.SingleResult;
|
||||
import com.rzyc.config.MethodAnnotation;
|
||||
import com.rzyc.mapper.EntCertificatesMapper;
|
||||
import com.rzyc.model.EntCertificates;
|
||||
import com.rzyc.model.Risk.dto.RiskDto;
|
||||
import com.rzyc.model.Risk.vo.RiskVo;
|
||||
import com.rzyc.model.RkSources;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import javax.xml.crypto.Data;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @版本号
|
||||
* @Author qcl
|
||||
* @date 2022/10/20&10:14
|
||||
*/
|
||||
|
||||
|
||||
@Api(tags = "一企一档")
|
||||
@CrossOrigin("*")
|
||||
@RequestMapping("EnterpriseRecord")
|
||||
@Validated
|
||||
@RestController
|
||||
public class EnterpriseRecordController extends BaseController {
|
||||
|
||||
|
||||
/**
|
||||
* 企业证照查询
|
||||
* @return
|
||||
*/
|
||||
|
||||
@ApiOperation(value = "企业证照", notes = "企业证照")
|
||||
@GetMapping("/entCertificates")
|
||||
@PreAuthorize("hasAnyAuthority('entCertificates','entCertificates:update')")
|
||||
@MethodAnnotation(authorizations = {"entCertificates","entCertificates:update"},name = "企业证照")
|
||||
@ResponseBody
|
||||
public MultiResult<EntCertificates> entCertificates(){
|
||||
|
||||
MultiResult<EntCertificates> result = new MultiResult<>();
|
||||
List<EntCertificates> entCertificatesList = entCertificatesMapper.findAll();
|
||||
result.setData(entCertificatesList);
|
||||
return result;
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 风险管控信息
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "风险管控信息", notes = "风险管控信息")
|
||||
@GetMapping("/riskInformation")
|
||||
@PreAuthorize("hasAnyAuthority('riskInformation','riskInformation:update')")
|
||||
@MethodAnnotation(authorizations = {"riskInformation","riskInformation:update"},name = "风险管控信息")
|
||||
@ResponseBody
|
||||
public MultiResult<RiskVo> riskInformation(@Valid @RequestBody RiskDto riskDto){
|
||||
|
||||
MultiResult<RiskVo> result = new MultiResult();
|
||||
List<RiskVo> riskVos = entRiskSourceMapper.riskInformationList(riskDto);
|
||||
result.setData(riskVos);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -96,6 +96,7 @@ public class IndustryListController extends BaseController{
|
|||
//前端数据拷贝至对象
|
||||
BeanUtils.copyProperties(inListAddDto,inList);
|
||||
//industryId设null表示共有清单
|
||||
|
||||
if(StringUtils.isBlank(inList.getListId())){
|
||||
//补全对象其余字段
|
||||
inList.setListId(RandomNumber.getUUid());
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user