Skip to content

A
amos-boot-biz
Commit b8bbe044 authored by tianbo's avatar tianbo
Browse files
Options

bug修改

parent 7ec739f7
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 71 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java
View file @ b8bbe044
......@@ -1829,8 +1829,10 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
if (LatentDangerBizTypeEnum.巡检.getCode().equals(danger.getBizType())) {
LatentDangerLevelEnum levelEnum = Arrays.stream(LatentDangerLevelEnum.values()).filter(l -> l.getCode().equals(danger.getDangerLevel())).findFirst().get();
danger.setDangerLevelName(levelEnum.getName());
LatentDangerReformTypeEnum reformTypeEnum = Arrays.stream(LatentDangerReformTypeEnum.values()).filter(l -> l.getCode().equals(danger.getReformType())).findFirst().get();
danger.setReformTypeName(reformTypeEnum.getName());
if (!ValidationUtil.isEmpty(danger.getReformType())) {
LatentDangerReformTypeEnum reformTypeEnum = Arrays.stream(LatentDangerReformTypeEnum.values()).filter(l -> l.getCode().equals(danger.getReformType())).findFirst().get();
danger.setReformTypeName(reformTypeEnum.getName());
}
LatentDangerState.PatrolDangerStateEnum patrolDangerStateEnum = Arrays.stream(LatentDangerState.PatrolDangerStateEnum.values()).filter(l -> l.getCode().equals(danger.getDangerState())).findFirst().get();
danger.setDangerStateName(patrolDangerStateEnum.getName());
}
......@@ -2021,6 +2023,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.待审核.getCode());
List<String> dangerState = stateEnums.stream().map(stateEnum -> stateEnum != null ?
stateEnum.getCode() : null).collect(Collectors.toList());
dangerState.add(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode());
// 审核状态
pageParam.put("dangerState", Joiner.on(",").join(dangerState));
} else if ("review".equals(type)) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/entity/mybatis/extend/LatentDangerBo.java
View file @ b8bbe044
......@@ -44,6 +44,8 @@ public class LatentDangerBo {
*/
private String dangerLevel;
private String dangerLevelName;
/**
* 隐患地点
*/
......@@ -54,6 +56,8 @@ public class LatentDangerBo {
*/
private String dangerType;
private String dangerTypeName;
/**
* 备注
*/
......@@ -64,6 +68,8 @@ public class LatentDangerBo {
*/
private String reformType;
private String reformTypeName;
/**
* 限制时间
*/
......@@ -78,6 +84,8 @@ public class LatentDangerBo {
*/
private String dangerState;
private String dangerStateName;
/**
* 发现人
*/
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/entity/mybatis/extend/LatentDangerFlowRecordBo.java
View file @ b8bbe044
......@@ -21,11 +21,11 @@ public class LatentDangerFlowRecordBo extends LatentDangerFlowRecordBoExtend {
private String flowTaskId;
private Integer excuteState;
private Integer executeState;
private String excuteUserId;
private String executeUserId;
private String excuteResult;
private String executeResult;
private String remark;
......@@ -46,5 +46,5 @@ public class LatentDangerFlowRecordBo extends LatentDangerFlowRecordBoExtend {
*/
private Date updateDate;
private String excuteDepartmentId;
private String executeDepartmentId;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java
View file @ b8bbe044
......@@ -415,8 +415,11 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
latentDangerBo.setOrgCode(orgCode);
latentDangerBo.setDangerName(dangerName);
latentDangerBo.setDangerLevel(level.toString());
latentDangerBo.setDangerLevelName(LatentDangerLevelEnum.getByCode(level).getName());
latentDangerBo.setDangerPosition(position);
latentDangerBo.setDangerType(dangerTypeEnum.getCode().toString());
latentDangerBo.setDangerTypeName(dangerTypeEnum.getName());
latentDangerBo.setDangerStateName(LatentDangerStateEnum.待评审.getName());
StringBuilder photoUrlsB = new StringBuilder();
if(org.apache.commons.lang3.StringUtils.isNotBlank(photoUrls)){
String[] photoUrlsList = photoUrls.split(",");
......@@ -441,8 +444,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
JSONObject flowJson, Long dangerId, RoleBo role, String executeResult,String remark) {
LatentDangerFlowRecordBo record = new LatentDangerFlowRecordBo();
record.setFlowTaskId(taskId);
record.setExcuteUserId(userId);
record.setExcuteDepartmentId(departmentId);
record.setExecuteUserId(userId);
record.setExecuteDepartmentId(departmentId);
if(flowJson != null && org.apache.commons.lang3.StringUtils.isNotBlank(flowJson.getString("photoUrls"))){
// flowJson.put("photoUrls",fileUrl+flowJson.getString("photoUrls"));
flowJson.put("photoUrls",flowJson.getString("photoUrls"));
......@@ -451,7 +454,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
record.setFlowTaskName(taskName);
record.setDangerId(dangerId);
// record.setExcuteUserId(RequestContext.getLoginId());
record.setExcuteResult(executeResult);
record.setExecuteResult(executeResult);
record.setDeleted(0);
record.setActionFlag(taskName);
record.setRemark(remark);
......@@ -473,10 +476,10 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
public void updateFlowRecord(LatentDangerFlowRecordBo flowRecord, LatentDangerExcuteTypeEnum excuteTypeEnum,
String userId, String departmentId, String remark, JSONObject flowJson) {
flowRecord.setExcuteState(excuteTypeEnum.getExcuteState().getCode());
flowRecord.setExcuteDepartmentId(departmentId);
flowRecord.setExcuteUserId(userId);
flowRecord.setExcuteResult(excuteTypeEnum.getName());
flowRecord.setExecuteState(excuteTypeEnum.getExcuteState().getCode());
flowRecord.setExecuteDepartmentId(departmentId);
flowRecord.setExecuteUserId(userId);
flowRecord.setExecuteResult(excuteTypeEnum.getName());
if (!StringUtils.isEmpty(remark)) {
flowRecord.setRemark(remark);
}
......@@ -908,10 +911,10 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
LatentDangerFlowRecordBo reviewRecordBo = latentDangerFlowRecordMapper.getByDangerIdAndActionFlag(latentDangerBo.getId(), "B_2");
LatentDangerFlowRecordBo reformRecordBo = latentDangerFlowRecordMapper.getByDangerIdAndActionFlag(latentDangerBo.getId(), "B_3");
if (reviewRecordBo != null) {
userIds.add(reviewRecordBo.getExcuteUserId());
userIds.add(reviewRecordBo.getExecuteUserId());
}
if (reformRecordBo != null) {
userIds.add(reformRecordBo.getExcuteUserId());
userIds.add(reformRecordBo.getExecuteUserId());
}
userIds.removeAll(Collections.singleton(null));
List<AgencyUserModel> userModels = remoteSecurityService.listUserByUserIds(Joiner.on(",").join(userIds));
......@@ -937,7 +940,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
}
dangerInfo.put("reformLimitDate", latentDangerBo.getReformLimitDate());
if (reformRecordBo != null) {
AgencyUserModel reformUser = userMap.get(reformRecordBo.getExcuteUserId());
AgencyUserModel reformUser = userMap.get(reformRecordBo.getExecuteUserId());
if (reformUser != null) {
dangerInfo.put("reformUserName", reformUser.getRealName());
}
......@@ -957,10 +960,10 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
}
}
if (reviewRecordBo != null) {
AgencyUserModel reviewUser = userMap.get(reviewRecordBo.getExcuteUserId());
AgencyUserModel reviewUser = userMap.get(reviewRecordBo.getExecuteUserId());
reviewInfo.put("reviewUserName", StringUtil.isNotEmpty(reviewUser) ? reviewUser.getRealName() : "");
reviewInfo.put("reviewDate", StringUtil.isNotEmpty(reviewUser) ? reviewRecordBo.getUpdateDate() : "");
reviewInfo.put("reviewResult", StringUtil.isNotEmpty(reviewUser) ? reviewRecordBo.getExcuteResult() : "");
reviewInfo.put("reviewResult", StringUtil.isNotEmpty(reviewUser) ? reviewRecordBo.getExecuteResult() : "");
}
result.put("baseInfo", baseInfo);
result.put("dangerInfo", dangerInfo);
......@@ -1132,11 +1135,11 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
Set<String> userIds = Sets.newHashSet();
Set<String> deptIds = Sets.newHashSet();
records.forEach(e -> {
if (!StringUtils.isEmpty(e.getExcuteUserId())) {
userIds.add(e.getExcuteUserId());
if (!StringUtils.isEmpty(e.getExecuteUserId())) {
userIds.add(e.getExecuteUserId());
}
if (!StringUtils.isEmpty(e.getExcuteDepartmentId())) {
deptIds.add(e.getExcuteDepartmentId());
if (!StringUtils.isEmpty(e.getExecuteDepartmentId())) {
deptIds.add(e.getExecuteDepartmentId());
}
});
List<DepartmentModel> departmentBos = remoteSecurityService.getlistDepartmentByDeptIds(token,product,appKey,Joiner.on(",").join(deptIds));
......@@ -1144,11 +1147,11 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
Map<String, AgencyUserModel> userMap = Maps.uniqueIndex(userModels, AgencyUserModel::getUserId);
Map<Long, DepartmentModel> departmentBoMap = Maps.uniqueIndex(departmentBos, DepartmentModel::getSequenceNbr);
for (LatentDangerFlowRecordBo recordBo : records) {
AgencyUserModel user = userMap.get(recordBo.getExcuteUserId());
AgencyUserModel user = userMap.get(recordBo.getExecuteUserId());
if (user != null) {
recordBo.setExecuteUserName(user.getRealName());
}
DepartmentModel departmentBo = departmentBoMap.get(recordBo.getExcuteDepartmentId());
DepartmentModel departmentBo = departmentBoMap.get(recordBo.getExecuteDepartmentId());
if (departmentBo != null) {
recordBo.setExecuteDepartmentName(departmentBo.getDepartmentName());
}
......@@ -1383,13 +1386,13 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
&& l.getDangerOvertimeState().equals(LatentDangerOvertimeStateEnum.已超时.getCode())) {
status = "治理逾期";
} else {
if (l.getExcuteResult().equals(LatentDangerExcuteTypeEnum.隐患评审通过.getName())) {
if (l.getExecuteResult().equals(LatentDangerExcuteTypeEnum.隐患评审通过.getName())) {
status = "隐患评审通过";
} else if (l.getExcuteResult().equals(LatentDangerExcuteTypeEnum.隐患评审拒绝.getName())) {
} else if (l.getExecuteResult().equals(LatentDangerExcuteTypeEnum.隐患评审拒绝.getName())) {
status = "隐患评审不通过";
} else if (l.getExcuteResult().equals(LatentDangerExcuteTypeEnum.隐患验证拒绝.getName())) {
} else if (l.getExecuteResult().equals(LatentDangerExcuteTypeEnum.隐患验证拒绝.getName())) {
status = "治理验证不通过";
} else if (l.getExcuteResult().equals(LatentDangerExcuteTypeEnum.隐患验证通过.getName())) {
} else if (l.getExecuteResult().equals(LatentDangerExcuteTypeEnum.隐患验证通过.getName())) {
status = "治理验证完成";
}
}
......
amos-boot-system-latentdanger/src/main/resources/application-dev.properties
View file @ b8bbe044
......@@ -91,4 +91,4 @@ iot.fegin.name=AMOS-API-IOT
control.fegin.name=JCS-API-CONTROL
supervision.feign.name=AMOS-SUPERVISION-API
jcs.fegin.name=JCS-tb
\ No newline at end of file
jcs.fegin.name=JCS
\ No newline at end of file
amos-boot-system-latentdanger/src/main/resources/db/changelog/changelog-master.xml
View file @ b8bbe044
......@@ -6,7 +6,7 @@
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
<include file="latent-danger-init-table.xml" relativeToChangelogFile="true"/>
<!-- <include file="latent-danger-init-table.xml" relativeToChangelogFile="true"/>-->
<include file="latent-danger-1.0.0.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>
\ No newline at end of file
amos-boot-system-patrol/src/main/resources/db/changelog/patrol-3.0.1.xml
View file @ b8bbe044
......@@ -229,9 +229,7 @@
<changeSet author="tb" id="tb-20211009-11">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="p_latent_danger" columnName="check_input_id"/>
</not>
<columnExists tableName="p_latent_danger" columnName="check_input_id"/>
</preConditions>
<comment>p_latent_danger CHANGE COLUMN check_input_id to biz_id '创建隐患的业务数据主键id'</comment>
<sql>
......
amos-boot-system-patrol/src/main/resources/db/mapper/LatentDangerFlowRecordMapper.xml
View file @ b8bbe044
......@@ -23,17 +23,17 @@
<if test="flowTaskId != null">
flow_task_id,
</if>
<if test="excuteState != null">
excute_state,
<if test="executeState != null">
execute_state,
</if>
<if test="excuteUserId != null">
excute_user_id,
<if test="executeUserId != null">
execute_user_id,
</if>
<if test="excuteDepartmentId != null">
excute_department_id,
<if test="executeDepartmentId != null">
execute_department_id,
</if>
<if test="excuteResult != null">
excute_result,
<if test="executeResult != null">
execute_result,
</if>
<if test="remark != null">
remark,
......@@ -67,17 +67,17 @@
<if test="flowTaskId != null">
#{flowTaskId},
</if>
<if test="excuteState != null">
#{excuteState},
<if test="executeState != null">
#{executeState},
</if>
<if test="excuteUserId != null">
#{excuteUserId},
<if test="executeUserId != null">
#{executeUserId},
</if>
<if test="excuteDepartmentId != null">
#{excuteDepartmentId},
<if test="executeDepartmentId != null">
#{executeDepartmentId},
</if>
<if test="excuteResult != null">
#{excuteResult},
<if test="executeResult != null">
#{executeResult},
</if>
<if test="remark != null">
#{remark},
......@@ -115,17 +115,17 @@
<if test="flowTaskId != null">
flow_task_id = #{flowTaskId},
</if>
<if test="excuteState != null">
excute_state = #{excuteState},
<if test="executeState != null">
execute_state = #{executeState},
</if>
<if test="excuteUserId != null">
excute_user_id = #{excuteUserId},
<if test="executeUserId != null">
execute_user_id = #{executeUserId},
</if>
<if test="excuteDepartmentId != null">
excute_department_id = #{excuteDepartmentId},
<if test="executeDepartmentId != null">
execute_department_id = #{executeDepartmentId},
</if>
<if test="excuteResult != null">
excute_result = #{excuteResult},
<if test="executeResult != null">
execute_result = #{executeResult},
</if>
<if test="remark != null">
remark = #{remark},
......@@ -171,7 +171,7 @@
and
danger_id = #{dangerId}
and
excute_state = 2
execute_state = 2
group by action_flag
)
</select>
......@@ -233,7 +233,7 @@
#{item}
</foreach>
and
excute_state in (2,3)
execute_state in (2,3)
group by danger_id
)
</select>
......@@ -248,8 +248,8 @@
<select id="listExecuteLog" resultType="com.yeejoin.amos.patrol.business.vo.DangerTimeAxisVo">
SELECT
pld.id AS dangerId,
pldfr.excute_user_id AS executeUserId,
pldfr.excute_result AS executeResult,
pldfr.execute_user_id AS executeUserId,
pldfr.execute_result AS executeResult,
pld.create_date AS createDate,
pld.update_date AS updateDate,
pld.danger_name AS dangerName,
......
amos-boot-system-patrol/src/main/resources/db/mapper/LatentDangerMapper.xml
View file @ b8bbe044
......@@ -498,12 +498,12 @@
f.action_flag actionFlag,
f.flow_task_name flowTaskName,
CASE
WHEN f.excute_state = 2 THEN
WHEN f.execute_state = 2 THEN
'通过'
WHEN f.excute_state = 3 THEN
WHEN f.execute_state = 3 THEN
'驳回'
END executeState,
f.excute_user_id executeUserId,
f.execute_user_id executeUserId,
f.update_date reViewDate,
ld.reform_limit_date reformLimitDate,
f.flow_json flowJson,
......@@ -527,7 +527,7 @@
WHERE
f.action_flag != 'B_1'
AND NOT ISNULL( f.update_date )
AND f.excute_state != 1
AND f.execute_state != 1
AND f.danger_id = #{dangerId}
</select>
<select id="dangerListByMap" resultType="com.yeejoin.amos.patrol.core.common.response.DangerListResponse">
......@@ -709,7 +709,7 @@
GROUP_CONCAT(
CASE
WHEN action_flag = 'B_3' THEN
excute_department_id
execute_department_id
ELSE
NULL
END
......@@ -717,7 +717,7 @@
GROUP_CONCAT(
CASE
WHEN action_flag = 'B_3' THEN
excute_user_id
execute_user_id
ELSE
NULL
END
......@@ -733,7 +733,7 @@
GROUP_CONCAT(
CASE
WHEN action_flag = 'B_4' THEN
excute_department_id
execute_department_id
ELSE
NULL
END
......@@ -741,7 +741,7 @@
GROUP_CONCAT(
CASE
WHEN action_flag = 'B_4' THEN
excute_user_id
execute_user_id
ELSE
NULL
END
......@@ -749,7 +749,7 @@
GROUP_CONCAT(
CASE
WHEN action_flag = 'B_4' THEN
pldfr.excute_result
pldfr.execute_result
ELSE
NULL
END
......
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