diff --git a/src/main/java/com/biutag/supervision/controller/system/PoliceController.java b/src/main/java/com/biutag/supervision/controller/system/PoliceController.java index 29b1254..b8c1419 100644 --- a/src/main/java/com/biutag/supervision/controller/system/PoliceController.java +++ b/src/main/java/com/biutag/supervision/controller/system/PoliceController.java @@ -12,8 +12,6 @@ import com.alibaba.excel.read.listener.ReadListener; import com.alibaba.excel.read.metadata.ReadSheet; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.biutag.supervision.constants.enums.DepartLevelEnum; -import com.biutag.supervision.constants.enums.InitialPetition; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.domain.PoliceAuth; import com.biutag.supervision.pojo.dto.PoliceImport; diff --git a/src/main/java/com/biutag/supervision/controller/work/NegativeController.java b/src/main/java/com/biutag/supervision/controller/work/NegativeController.java index 9563408..d46a6d6 100644 --- a/src/main/java/com/biutag/supervision/controller/work/NegativeController.java +++ b/src/main/java/com/biutag/supervision/controller/work/NegativeController.java @@ -84,6 +84,8 @@ public class NegativeController { .set(Negative::getThingDesc, negativeDto.getThingDesc()) .set(Negative::getSpecialSupervision, negativeDto.getSpecialSupervision()) .set(Negative::getReportNumber, negativeDto.getReportNumber()) + .set(Negative::getInvolveDepartId, negativeDto.getInvolveDepartId()) + .set(Negative::getInvolveDepartName, negativeDto.getResponderName()) .set(Negative::getUpdTime, LocalDateTime.now()); negativeService.update(updateWrapper); return Result.success(); diff --git a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java b/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java index 673942b..288c744 100644 --- a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java +++ b/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java @@ -58,6 +58,7 @@ public class ApplyCompletionAction implements Action { addApprove(negative); LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper() + .eq(Negative::getId, actionDto.getNegativeId()) .set(Negative::getFlowKey, negative.getIsSecondHandle() ? FlowNodeEnum.FIRST_APPROVE.getKey() : FlowNodeEnum.SECOND_APPROVE.getKey()) // 当前处理对象 .set(Negative::getCurrentProcessingObject, negative.getIsSecondHandle() ? "市局专班" : String.format("%s专班", negative.getHandleSecondDepartName())); diff --git a/src/main/java/com/biutag/supervision/pojo/entity/AlarmNotification.java b/src/main/java/com/biutag/supervision/pojo/entity/AlarmNotification.java index a1a2733..702907e 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/AlarmNotification.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/AlarmNotification.java @@ -35,7 +35,7 @@ public class AlarmNotification implements Serializable { * 预警时间 */ @TableField("`alarm_time`") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8") LocalDateTime alarmTime; @TableField("`alarm_type_id`") diff --git a/src/main/java/com/biutag/supervision/pojo/entity/NegativeCountersign.java b/src/main/java/com/biutag/supervision/pojo/entity/NegativeCountersign.java index 298f8c1..c839416 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/NegativeCountersign.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/NegativeCountersign.java @@ -3,6 +3,7 @@ package com.biutag.supervision.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; @@ -42,7 +43,7 @@ public class NegativeCountersign { @TableField("depart_name") private String departName; - // + @JsonFormat(pattern = "YYYY-MM-dd HH:mm") @TableField("create_time") private LocalDateTime createTime; diff --git a/src/main/java/com/biutag/supervision/pojo/model/NegativeFavModel.java b/src/main/java/com/biutag/supervision/pojo/model/NegativeFavModel.java index 6e3d5ef..c9f6f73 100644 --- a/src/main/java/com/biutag/supervision/pojo/model/NegativeFavModel.java +++ b/src/main/java/com/biutag/supervision/pojo/model/NegativeFavModel.java @@ -28,6 +28,8 @@ public class NegativeFavModel { // 问题内容 private String thingDesc; + private String responderName; + // 联系电话 private String contactPhone; @@ -57,4 +59,11 @@ public class NegativeFavModel { // 办理状态 private String processingStatus; + private String involveProblem; + + @JsonFormat(pattern = "YYYY-MM-dd HH:mm") + private LocalDateTime crtTime; + + + } diff --git a/src/main/java/com/biutag/supervision/service/NegativeService.java b/src/main/java/com/biutag/supervision/service/NegativeService.java index d68e544..cc2ad49 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeService.java @@ -33,7 +33,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.management.relation.Role; import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.atomic.AtomicReference; @@ -243,7 +242,7 @@ public class NegativeService extends ServiceImpl { .setTimeLimit(TimeLimitEnum.WORK_137.getValue()) .setMaxSignDuration(TimeLimitEnum.WORK_137.getMaxSignDuration()) .setMaxHandleDuration(TimeLimitEnum.WORK_137.getMaxHandleDuration()) - .setMaxExtensionDuration(TimeLimitEnum.WORK_137.getMaxHandleDuration()) + .setMaxExtensionDuration(TimeLimitEnum.WORK_137.getMaxExtensionDuration()) .setApprovalFlow(ApprovalFlowEnum.SECOND_APPROVAL.getValue()) // 下发时间 .setFirstDistributeTime(now) @@ -272,6 +271,8 @@ public class NegativeService extends ServiceImpl { .setHandleSecondDepartId(parentDepart.getId()) .setHandleSecondDepartName(parentDepart.getShortName()); } + } else { + negative.setFlowKey(FlowNodeEnum.FIRST_DISTRIBUTE.getKey()); } save(negative); // 新增work