添加vo

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/ContingencyInstanceInfoMapper.java

 package com.yeejoin.amos.fas.business.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.fas.business.vo.ContingencyInstanceInfoVO;
 import com.yeejoin.amos.fas.business.vo.ContingencyPlanInstanceVO;
 import com.yeejoin.amos.fas.dao.entity.ContingencyInstanceInfo;
 import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
@@ -13,7 +14,7 @@ import java.util.List;
 @Repository
 public interface ContingencyInstanceInfoMapper extends BaseMapper<ContingencyInstanceInfo> {
 
-    ContingencyInstanceInfo selectDisposalDetails(@Param("id") String id);
+    ContingencyInstanceInfoVO selectDisposalDetails(@Param("id") String id);
 
     Boolean addDisposalDetails(@Param("dto") ContingencyInstanceInfo contingencyInstanceInfo);
 
@@ -21,7 +22,7 @@ public interface ContingencyInstanceInfoMapper extends BaseMapper<ContingencyIns
 
     int selectCount(@Param("orgCode") String orgCode);
 
-    List<ContingencyInstanceInfo> selectDisposalListPage(@Param("current") int current, @Param("size") int size, @Param("orgCode") String orgCode);
+    List<ContingencyInstanceInfoVO> selectDisposalListPage(@Param("current") int current, @Param("size") int size, @Param("orgCode") String orgCode);
 
     List<ContingencyPlanInstanceVO> selectDisposalActionPage(@Param("current") int current, @Param("size") int size,@Param("type") String type, @Param("status") String status,@Param("list") List<String> roles ,@Param("batchNo") String batchNo);
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyInstanceInfoServiceImpl.java

@@ -3,8 +3,11 @@ package com.yeejoin.amos.fas.business.service.impl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.fas.business.dao.mapper.ContingencyInstanceInfoMapper;
 import com.yeejoin.amos.fas.business.service.intfc.ContingencyInstanceInfoService;
+import com.yeejoin.amos.fas.business.vo.ContingencyInstanceInfoVO;
+import com.yeejoin.amos.fas.business.vo.ContingencyPlanInstanceVO;
 import com.yeejoin.amos.fas.core.util.DateUtil;
 import com.yeejoin.amos.fas.dao.entity.ContingencyInstanceInfo;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -21,8 +24,8 @@ public class ContingencyInstanceInfoServiceImpl implements ContingencyInstanceIn
 
 
     @Override
-    public ContingencyInstanceInfo selectDisposalDetails(String disposalId) {
-        ContingencyInstanceInfo instanceInfo = contingencyInstanceInfoMapper.selectDisposalDetails(disposalId);
+    public ContingencyInstanceInfoVO selectDisposalDetails(String disposalId) {
+        ContingencyInstanceInfoVO instanceInfo = contingencyInstanceInfoMapper.selectDisposalDetails(disposalId);
         if (!ObjectUtils.isEmpty(instanceInfo.getStartTime()) && !ObjectUtils.isEmpty(instanceInfo.getEndTime())){
             String datePoorToMin = getDatePoorToMin(instanceInfo.getEndTime(), instanceInfo.getStartTime());
             instanceInfo.setDuration(datePoorToMin);
@@ -31,8 +34,8 @@ public class ContingencyInstanceInfoServiceImpl implements ContingencyInstanceIn
     }
 
     @Override
-    public Page<ContingencyInstanceInfo> selectDisposalListPage(int current, int size, String orgCode) {
-        Page<ContingencyInstanceInfo> page = new Page<>(current, size);
+    public Page<ContingencyInstanceInfoVO> selectDisposalListPage(int current, int size, String orgCode) {
+        Page<ContingencyInstanceInfoVO> page = new Page<>(current, size);
         int total = contingencyInstanceInfoMapper.selectCount(orgCode);
         page.setTotal(total);
         long start = (page.getCurrent() - 1) * page.getSize();
@@ -43,8 +46,8 @@ public class ContingencyInstanceInfoServiceImpl implements ContingencyInstanceIn
                 page.setCurrent(1);
                 start = 0;
             }
-            List<ContingencyInstanceInfo> infoList = contingencyInstanceInfoMapper.selectDisposalListPage((int) start, size, orgCode);
-            for (ContingencyInstanceInfo instanceInfo : infoList) {
+            List<ContingencyInstanceInfoVO> infoList = contingencyInstanceInfoMapper.selectDisposalListPage((int) start, size, orgCode);
+            for (ContingencyInstanceInfoVO instanceInfo : infoList) {
                 if (!ObjectUtils.isEmpty(instanceInfo.getStartTime()) && !ObjectUtils.isEmpty(instanceInfo.getEndTime())){
                     String datePoorToMin = getDatePoorToMin(instanceInfo.getEndTime(), instanceInfo.getStartTime());
                     instanceInfo.setDuration(datePoorToMin);
@@ -69,7 +72,9 @@ public class ContingencyInstanceInfoServiceImpl implements ContingencyInstanceIn
 
     @Override
     public Boolean updateEndTimeById(String id) {
-        ContingencyInstanceInfo instanceInfo = selectDisposalDetails(id);
+        ContingencyInstanceInfoVO instanceInfoVO = selectDisposalDetails(id);
+        ContingencyInstanceInfo instanceInfo = new ContingencyInstanceInfo();
+        BeanUtils.copyProperties(instanceInfoVO, instanceInfo);
         if (instanceInfo != null) {
             instanceInfo.setEndTime(new Date());
             return contingencyInstanceInfoMapper.updateDisposalDetails(instanceInfo);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java

@@ -851,7 +851,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
         if (!CollectionUtils.isEmpty(recordList)) {
             PlanOperationRecord record = recordList.get(0);
             String batchNo = record.getBatchNo();
-            ContingencyInstanceInfo instanceInfo = contingencyInstanceInfoService.selectDisposalDetails(batchNo);
+            ContingencyInstanceInfoVO instanceInfo = contingencyInstanceInfoService.selectDisposalDetails(batchNo);
             if (instanceInfo != null) {
                 map.put("planName", instanceInfo.getName());
                 map.put("batchNo", batchNo);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/ContingencyInstanceInfoService.java

 package com.yeejoin.amos.fas.business.service.intfc;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.fas.business.vo.ContingencyInstanceInfoVO;
 import com.yeejoin.amos.fas.dao.entity.ContingencyInstanceInfo;
 
 public interface ContingencyInstanceInfoService {
 
 
-    ContingencyInstanceInfo selectDisposalDetails(String batchNo);
+    ContingencyInstanceInfoVO selectDisposalDetails(String batchNo);
 
-    Page<ContingencyInstanceInfo> selectDisposalListPage(int current, int size, String orgCode);
+    Page<ContingencyInstanceInfoVO> selectDisposalListPage(int current, int size, String orgCode);
 
     Boolean addDisposalDetails(ContingencyInstanceInfo contingencyInstanceInfo);
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/ContingencyInstanceInfoVO.java

 package com.yeejoin.amos.fas.business.vo;
 
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.yeejoin.amos.fas.dao.entity.ContingencyInstanceInfo;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 import java.util.Date;
 
 
 @Data
-@TableName("contingency_instance_info")
 @ApiModel(value = "应急预案执行记录实例", description = "应急预案执行记录实例")
 public class ContingencyInstanceInfoVO {
 
-
     private String id;
 
     private String name;
@@ -42,7 +31,6 @@ public class ContingencyInstanceInfoVO {
 
     private String orgCode;
 
-    @TableField
     private String duration;
 
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/ContingencyPlanInstanceVO.java

 package com.yeejoin.amos.fas.business.vo;
 
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.fas.dao.entity.BusinessEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
-import javax.persistence.Column;
 import java.util.Date;
 
 

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/ContingencyInstanceInfoMapper.xml

@@ -20,11 +20,11 @@
 
     </update>
 
-    <select id="selectDisposalDetails" resultType="com.yeejoin.amos.fas.dao.entity.ContingencyInstanceInfo">
+    <select id="selectDisposalDetails" resultType="com.yeejoin.amos.fas.business.vo.ContingencyInstanceInfoVO">
         select * from contingency_instance_info where  id=#{id}
     </select>
 
-    <select id="selectDisposalListPage" resultType="com.yeejoin.amos.fas.dao.entity.ContingencyInstanceInfo">
+    <select id="selectDisposalListPage" resultType="com.yeejoin.amos.fas.business.vo.ContingencyInstanceInfoVO">
         select * from contingency_instance_info where  is_delete = 0
         and org_code = #{orgCode}
         ORDER BY create_date DESC