Commit 1143bb28 authored by xixinzhao's avatar xixinzhao

防火监督更新

parent 809b6dfb
...@@ -12,7 +12,7 @@ public enum PlanStatusEnum { ...@@ -12,7 +12,7 @@ public enum PlanStatusEnum {
EXAMINE_TWO("二级待审核",2), EXAMINE_TWO("二级待审核",2),
EXAMINE_THREE("三级待审核",3), EXAMINE_THREE("三级待审核",3),
EXAMINE_FORMULATE("已审核/检查内容未制定",4), EXAMINE_FORMULATE("已审核/检查内容未制定",4),
EXAMINE_DEVELOPED("已审核/检查内容已制定",5); EXAMINE_DEVELOPED("检查内容已制定/未执行",5);
/** /**
* 名称 * 名称
......
package com.yeejoin.amos.supervision.core.common.dto;
import lombok.Data;
/**
* @author xixinzhao
*/
@Data
public class DangerDto {
/**
* 检查项记录id
*/
private Long checkInputId;
/**
* 隐患级别
*/
private String dangerLevel;
/**
* 隐患id
*/
private Long dangerId;
/**
* 隐患名称
*/
private String name;
/**
* 状态
*/
private Long state;
/**
* 是否删除
* 0:未删除 1:已删除
*/
private String deleted;
}
package com.yeejoin.amos.supervision.dao.entity; package com.yeejoin.amos.supervision.dao.entity;
import com.yeejoin.amos.supervision.core.common.dto.DangerDto;
import javax.persistence.*; import javax.persistence.*;
import java.util.List; import java.util.List;
...@@ -121,6 +123,8 @@ public class CheckInput extends BasicEntity { ...@@ -121,6 +123,8 @@ public class CheckInput extends BasicEntity {
@Column(name="major_danger_num") @Column(name="major_danger_num")
private int majorDangerNum; private int majorDangerNum;
private List<DangerDto> dangerDtoList;
@Transient @Transient
public List<CheckShot> getCheckShotList() { public List<CheckShot> getCheckShotList() {
return checkShotList; return checkShotList;
...@@ -291,4 +295,13 @@ public class CheckInput extends BasicEntity { ...@@ -291,4 +295,13 @@ public class CheckInput extends BasicEntity {
public void setSafetyDangerNum(int safetyDangerNum) { public void setSafetyDangerNum(int safetyDangerNum) {
this.safetyDangerNum = safetyDangerNum; this.safetyDangerNum = safetyDangerNum;
} }
@Transient
public List<DangerDto> getDangerDtoList() {
return dangerDtoList;
}
public void setDangerDtoList(List<DangerDto> dangerDtoList) {
this.dangerDtoList = dangerDtoList;
}
} }
\ No newline at end of file
package com.yeejoin.amos.supervision.dao.entity;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @author xixinzhao
*/
@Data
@Entity
@Table(name="p_hidden_danger")
public class HiddenDanger extends BasicEntity {
private static final long serialVersionUID = 1L;
/**
* 隐患id
*/
@Column(name="latent_danger_id")
private Long latentDangerId;
/**
* 检查记录id
*/
@Column(name="check_id")
private Long checkId;
/**
* 检查项记录id
*/
@Column(name="check_input_id")
private Long checkInputId;
/**
* 计划id
*/
@Column(name="plan_id")
private Long planId;
/**
* 点id
*/
@Column(name="point_id")
private Long pointId;
/**
* 隐患类型(1-防火监督检查;2-自行检查)
*/
@Column(name="danger_type")
private Long dangerType;
/**
* 隐患类型名称
*/
@Column(name="danger_type_name")
private Long dangerTypeName;
}
...@@ -222,10 +222,10 @@ public class InputItem extends BasicEntity { ...@@ -222,10 +222,10 @@ public class InputItem extends BasicEntity {
private Integer itemStart; private Integer itemStart;
/** /**
* 扩展属性 * 检查类别IDS
*/ */
// @Transient @Column(name = "item_type_classify_ids")
// private String ext; private Integer itemTypeClassifyIds;
public Integer getItemStart() { public Integer getItemStart() {
return itemStart; return itemStart;
...@@ -514,4 +514,12 @@ public class InputItem extends BasicEntity { ...@@ -514,4 +514,12 @@ public class InputItem extends BasicEntity {
public void setCheckTypeId(String checkTypeId) { public void setCheckTypeId(String checkTypeId) {
this.checkTypeId = checkTypeId; this.checkTypeId = checkTypeId;
} }
public Integer getItemTypeClassifyIds() {
return itemTypeClassifyIds;
}
public void setItemTypeClassifyIds(Integer itemTypeClassifyIds) {
this.itemTypeClassifyIds = itemTypeClassifyIds;
}
} }
\ No newline at end of file
...@@ -422,9 +422,9 @@ public class OrgUsrController extends BaseController { ...@@ -422,9 +422,9 @@ public class OrgUsrController extends BaseController {
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/getLoginUserDetails", method = RequestMethod.GET) @RequestMapping(value = "/getLoginUserDetails/{userId}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取登陆人绑定的人员关系", notes = "获取登陆人绑定的人员关系") @ApiOperation(httpMethod = "GET", value = "获取登陆人绑定的人员关系", notes = "获取登陆人绑定的人员关系")
public ResponseModel<List<Map<String, Object>>> getLoginUserDetails(@RequestParam(value = "userId", required = false) String userId) { public ResponseModel<List<Map<String, Object>>> getLoginUserDetails(@PathVariable String userId) {
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
String userIds = userId; String userIds = userId;
if (StringUtils.isEmpty(userIds)) { if (StringUtils.isEmpty(userIds)) {
......
package com.yeejoin.amos.supervision.business.dao.mapper;
/**
* @author DELL
*/
public interface HiddenDangerMapper extends BaseMapper {
}
...@@ -16,6 +16,6 @@ public interface JCSFeignClient { ...@@ -16,6 +16,6 @@ public interface JCSFeignClient {
* @param userId 用户id * @param userId 用户id
* @return ResponseModel<ReginParams.PersonIdentity> * @return ResponseModel<ReginParams.PersonIdentity>
*/ */
@GetMapping(value = "jcs/org-usr/getLoginUserDetails?userId={userId}") @GetMapping(value = "jcs/org-usr/getLoginUserDetails/{userId}")
FeignClientResult getUserUnit(@PathVariable String userId); FeignClientResult getUserUnit(@PathVariable String userId);
} }
package com.yeejoin.amos.supervision.business.param; package com.yeejoin.amos.supervision.business.param;
import com.yeejoin.amos.supervision.core.common.dto.DangerDto;
import com.yeejoin.amos.supervision.dao.entity.CheckShot; import com.yeejoin.amos.supervision.dao.entity.CheckShot;
import lombok.Data; import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/**
* @author DELL
*/
@Data @Data
public class CheckInputParam { public class CheckInputParam {
private Long id; private Long id;
...@@ -21,4 +25,8 @@ public class CheckInputParam { ...@@ -21,4 +25,8 @@ public class CheckInputParam {
private String depName; private String depName;
private List<CheckShot> checkInputShot = new ArrayList<>(); private List<CheckShot> checkInputShot = new ArrayList<>();
/**
* 隐患列表
*/
private List<DangerDto> dangerList = new ArrayList<>();
} }
package com.yeejoin.amos.supervision.business.service.impl;
import com.yeejoin.amos.supervision.business.service.intfc.IHiddenDangerService;
/**
* @author DELL
*/
public class HiddenDangerServiceImpl implements IHiddenDangerService {
}
package com.yeejoin.amos.supervision.business.service.intfc;
/**
* @author DELL
*/
public interface IHiddenDangerService {
}
<?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="com.yeejoin.amos.supervision.business.dao.mapper.HiddenDangerMapper">
</mapper>
\ No newline at end of file
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<if test="itemClassify != null ">item_classify=#{itemClassify},</if> <if test="itemClassify != null ">item_classify=#{itemClassify},</if>
<if test="itemTypeClassify != null ">item_type_classify=#{itemTypeClassify},</if> <if test="itemTypeClassify != null ">item_type_classify=#{itemTypeClassify},</if>
<if test="itemLevel != null ">item_level=#{itemLevel},</if> <if test="itemLevel != null ">item_level=#{itemLevel},</if>
<if test="itemTypeClassifyIds != null ">item_type_classify_ids=#{itemTypeClassifyIds},</if>
</trim> </trim>
WHERE id=#{id} WHERE id=#{id}
</update> </update>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment