行程上报

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java

@@ -25,6 +25,8 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.GetTripInfoFormDTO;
+import com.elink.esua.epdc.dto.SaveTripInfoFormDTO;
 import com.elink.esua.epdc.dto.TripReportDTO;
 import com.elink.esua.epdc.modules.epidemic.excel.TripReportExcel;
 import com.elink.esua.epdc.modules.epidemic.service.TripReportService;
@@ -91,4 +93,52 @@ public class TripReportController {
         ExcelUtils.exportExcelToTarget(response, null, list, TripReportExcel.class);
     }
 
+    /**
+     * @describe: 行程上报
+     * @author wangtong
+     * @date 2021/10/13 10:50
+     * @params [userDetail, formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @PostMapping("saveTripInfo")
+    public Result saveTripInfo( @RequestBody SaveTripInfoFormDTO formDto) {
+        return tripReportService.saveTripInfo(formDto);
+    }
+
+    /**
+     * @describe: 我的上报列表
+     * @author wangtong
+     * @date 2021/10/13 13:37
+     * @params [userDetail, formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @GetMapping("getTripInfoList")
+    public Result getTripInfoList(@RequestBody GetTripInfoFormDTO formDto) {
+        return tripReportService.getTripInfoList(formDto);
+    }
+
+    /**
+     * @describe: 上报详情
+     * @author wangtong
+     * @date 2021/10/13 13:37
+     * @params [userDetail, formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @GetMapping("getTripInfoDetail")
+    public Result getTripInfoDetail(@RequestBody GetTripInfoFormDTO formDto) {
+        return tripReportService.getTripInfoDetail(formDto);
+    }
+
+    /**
+     * @describe: 删除上报信息
+     * @author wangtong
+     * @date 2021/10/13 14:17
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @DeleteMapping("deleteTripById")
+    public Result deleteTripById(@RequestBody GetTripInfoFormDTO formDto) {
+        return tripReportService.deleteTripById(formDto);
+    }
+
 }

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/TripReportDao.java

@@ -18,9 +18,13 @@
 package com.elink.esua.epdc.modules.epidemic.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.GetTripInfoFormDTO;
+import com.elink.esua.epdc.dto.TripListDTO;
 import com.elink.esua.epdc.modules.epidemic.entity.TripReportEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 行程上报信息
  *
@@ -29,5 +33,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TripReportDao extends BaseDao<TripReportEntity> {
-	
+
+    /**
+    * @describe: 我的上报列表
+    * @author wangtong
+    * @date 2021/10/13 16:58
+    * @params [formDto]
+    * @return java.util.List<com.elink.esua.epdc.dto.TripListDTO>
+    */
+    List<TripListDTO> getTripInfoList(GetTripInfoFormDTO formDto);
 }

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java

@@ -19,6 +19,9 @@ package com.elink.esua.epdc.modules.epidemic.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.GetTripInfoFormDTO;
+import com.elink.esua.epdc.dto.SaveTripInfoFormDTO;
 import com.elink.esua.epdc.dto.TripReportDTO;
 import com.elink.esua.epdc.modules.epidemic.entity.TripReportEntity;
 
@@ -92,4 +95,40 @@ public interface TripReportService extends BaseService<TripReportEntity> {
      * @date 2021-10-13
      */
     void delete(String[] ids);
+
+    /**
+     * @describe: 行程上报
+     * @author wangtong
+     * @date 2021/10/13 10:50
+     * @params [userDetail, formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result saveTripInfo(SaveTripInfoFormDTO formDto);
+
+    /**
+     * @describe: 我的上报列表
+     * @author wangtong
+     * @date 2021/10/13 13:37
+     * @params [userDetail, formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getTripInfoList(GetTripInfoFormDTO formDto);
+
+    /**
+     * @describe: 上报详情
+     * @author wangtong
+     * @date 2021/10/13 13:37
+     * @params [userDetail, formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getTripInfoDetail(GetTripInfoFormDTO formDto);
+
+    /**
+     * @describe: 删除上报信息
+     * @author wangtong
+     * @date 2021/10/13 14:17
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result deleteTripById(GetTripInfoFormDTO formDto);
 }

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java

@@ -21,13 +21,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.GetTripInfoFormDTO;
+import com.elink.esua.epdc.dto.SaveTripInfoFormDTO;
+import com.elink.esua.epdc.dto.TripListDTO;
 import com.elink.esua.epdc.dto.TripReportDTO;
 import com.elink.esua.epdc.modules.epidemic.dao.TripReportDao;
 import com.elink.esua.epdc.modules.epidemic.entity.TripReportEntity;
 import com.elink.esua.epdc.modules.epidemic.redis.TripReportRedis;
 import com.elink.esua.epdc.modules.epidemic.service.TripReportService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,6 +49,7 @@ import java.util.Map;
  * @author qu qu@elink-cn.com
  * @since v1.0.0 2021-10-13
  */
+@Slf4j
 @Service
 public class TripReportServiceImpl extends BaseServiceImpl<TripReportDao, TripReportEntity> implements TripReportService {
 
@@ -101,4 +108,37 @@ public class TripReportServiceImpl extends BaseServiceImpl<TripReportDao, TripRe
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public Result saveTripInfo(SaveTripInfoFormDTO formDto) {
+        TripReportEntity entity = ConvertUtils.sourceToTarget(formDto, TripReportEntity.class);
+        insert(entity);
+        return new Result().ok("操作成功！");
+    }
+
+    @Override
+    public Result getTripInfoList(GetTripInfoFormDTO formDto) {
+        int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
+        formDto.setPageIndex(pageIndex);
+        List<TripListDTO> result = baseDao.getTripInfoList(formDto);
+        return new Result().ok(result);
+    }
+
+    @Override
+    public Result getTripInfoDetail(GetTripInfoFormDTO formDto) {
+        TripReportEntity entity = selectById(formDto.getId());
+        return new Result().ok(entity);
+    }
+
+    @Override
+    public Result deleteTripById(GetTripInfoFormDTO formDto) {
+        Boolean result = deleteById(formDto.getId());
+        if(result){
+            return new Result().ok("操作成功！");
+        }else{
+            log.info("formDto"+formDto);
+            return new Result().ok("操作失败，请联系管理员");
+        }
+
+    }
+
 }

epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml

@@ -33,6 +33,17 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
         <result property="delFlag" column="DEL_FLAG"/>
     </resultMap>
+    <select id="getTripInfoList" resultType="com.elink.esua.epdc.dto.TripListDTO">
+        select id,
+             name,
+             REPLACE(COME_ADDRESS_NAME,',','/') as comeAddressName,
+             date_format(CREATED_TIME,'%Y-%m-%d %H:%i') as createdTime
+        from epdc_trip_report
+        where DEL_FLAG='0'
+              and USER_ID=#{userId}
+        order by CREATED_TIME desc
+        LIMIT #{pageIndex},#{pageSize}
+    </select>
 
 
 </mapper>