出差申请接口完善

ruoyi-psa/src/main/java/com/ruoyi/controller/FyglTripApplicationController.java

@@ -4,14 +4,13 @@ import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.domain.dto.FyglProjectCostDTO;
 import com.ruoyi.domain.dto.FyglTripApplicationDTO;
+import com.ruoyi.domain.vo.FyglDailyReimbursementVo;
 import com.ruoyi.domain.vo.FyglTripApplicationVo;
 import com.ruoyi.service.IFyglTripApplicationService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -42,4 +41,25 @@ public class FyglTripApplicationController extends BaseController {
     {
         return success(fyglTripApplicationService.selectFyglTripApplicationById(id));
     }
+    
+    //新增出差申请
+    @PostMapping("/insert")
+    public AjaxResult insertFyglTripApplication(@RequestBody FyglTripApplicationDTO fyglTripApplicationDTO)
+    {
+        return AjaxResult.success(fyglTripApplicationService.insertFyglTripApplication(fyglTripApplicationDTO));
+    }
+    
+    //修改出差申请
+    @PutMapping("/update")
+    public AjaxResult updateFyglTripApplication(@RequestBody FyglTripApplicationDTO fyglTripApplicationDTO)
+    {
+        return AjaxResult.success(fyglTripApplicationService.updateFyglTripApplication(fyglTripApplicationDTO));
+    }
+    
+    //删除出差申请
+    @DeleteMapping("/{id}")
+    public AjaxResult deleteFyglTripApplication(@PathVariable Long id)
+    {
+        return toAjax(fyglTripApplicationService.deleteFyglTripApplicationById(id));
+    }
 }

ruoyi-psa/src/main/java/com/ruoyi/domain/dto/FyglTripApplicationDTO.java

 package com.ruoyi.domain.dto;
 
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 
 @Data
-public class FyglTripApplicationDTO {
+public class FyglTripApplicationDTO extends BaseEntity {
     private Long id;
+    //项目id
+    private Long projectId;
     //项目编号
     private String projectNumber;
     //项目名称
@@ -19,6 +22,8 @@ public class FyglTripApplicationDTO {
     private String tripStartDate;
     //预计结束时间
     private String tripEndDate;
+    //出差天数
+    private double days;
     //项目经理
     private String projectUserName;
     //审批状态

ruoyi-psa/src/main/java/com/ruoyi/mapper/FyglTripApplicationMapper.java

 package com.ruoyi.mapper;
 
 import com.ruoyi.domain.dto.FyglTripApplicationDTO;
+import com.ruoyi.domain.vo.FyglDailyReimbursementVo;
 import com.ruoyi.domain.vo.FyglTripApplicationVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -15,16 +16,41 @@ import java.util.List;
 @Mapper
 public interface FyglTripApplicationMapper {
     /**
-     * 查询日常报销
+     * 查询出差申请
      *
-     * @param id 日常报销主键
-     * @return 日常报销
+     * @param id 出差申请主键
+     * @return 出差申请
      */
     public FyglTripApplicationDTO selectFyglTripApplicationById(Long id);
+    
     /**
      * 查询出差申请列表
      *
      * @return 出差申请集合
      */
     public List<FyglTripApplicationDTO> selectTripApplicationList(FyglTripApplicationVo fyglTripApplicationVO);
+    
+    /**
+     * 新增出差申请
+     *
+     * @param fyglTripApplicationDTO 出差申请
+     * @return 结果
+     */
+    public int insertFyglTripApplication(FyglTripApplicationDTO fyglTripApplicationDTO);
+    
+    /**
+     * 修改日常报销
+     *
+     * @param fyglTripApplicationDTO 出差申请
+     * @return 结果
+     */
+    public int updateFyglTripApplication(FyglTripApplicationDTO fyglTripApplicationDTO);
+    
+    /**
+     * 删除出差申请
+     *
+     * @param id 出差申请主键
+     * @return 结果
+     */
+    public int deleteFyglTripApplicationById(Long id);
 }

ruoyi-psa/src/main/java/com/ruoyi/service/IFyglTripApplicationService.java

@@ -23,23 +23,22 @@ public interface IFyglTripApplicationService {
      * @return 出差申请集合
      */
     public List<FyglTripApplicationDTO> selectFyglTripApplicationList(FyglTripApplicationVo fyglTripApplicationVO);
-    FyglProjectDTO getProjectDetail(Long pid);
+    
     /**
      * 新增出差申请
      *
-     * @param fyglDailyReimbursement 出差申请
+     * @param fyglTripApplicationDTO 出差申请
      * @return 结果
      */
-    public int insertFyglTripApplication(FyglDailyReimbursement fyglDailyReimbursement);
+    public int insertFyglTripApplication(FyglTripApplicationDTO fyglTripApplicationDTO);
     
-    List<FyglProjectList> getProjectList();
     /**
      * 修改日常报销
      *
-     * @param fyglDailyReimbursement 日常报销
+     * @param fyglTripApplicationDTO 日常报销
      * @return 结果
      */
-    public int updateFyglTripApplication(FyglDailyReimbursement fyglDailyReimbursement);
+    public int updateFyglTripApplication(FyglTripApplicationDTO fyglTripApplicationDTO);
     
     /**
      * 批量删除日常报销

ruoyi-psa/src/main/java/com/ruoyi/service/impl/FyglTripApplicationServiceImpl.java

 package com.ruoyi.service.impl;
 
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.domain.FyglDailyReimbursement;
 import com.ruoyi.domain.dto.*;
 import com.ruoyi.domain.vo.FyglTripApplicationVo;
@@ -8,6 +10,7 @@ import com.ruoyi.service.IFyglTripApplicationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -44,23 +47,22 @@ public class FyglTripApplicationServiceImpl implements IFyglTripApplicationServi
     }
     
     @Override
-    public FyglProjectDTO getProjectDetail(Long pid) {
-        return null;
+    public int insertFyglTripApplication(FyglTripApplicationDTO fyglTripApplicationDTO) {
+        fyglTripApplicationDTO.setCreateBy(SecurityUtils.getUsername());
+        Date nowDate = DateUtils.getNowDate();
+        fyglTripApplicationDTO.setCreateTime(nowDate);
+        fyglTripApplicationDTO.setUpdateBy(SecurityUtils.getUsername());
+        fyglTripApplicationDTO.setUpdateTime(nowDate);
+        //设置1未通过2审批中3已通过
+        fyglTripApplicationDTO.setStatus(2);
+        return fyglTripApplicationMapper.insertFyglTripApplication(fyglTripApplicationDTO);
     }
     
     @Override
-    public int insertFyglTripApplication(FyglDailyReimbursement fyglDailyReimbursement) {
-        return 0;
-    }
-    
-    @Override
-    public List<FyglProjectList> getProjectList() {
-        return null;
-    }
-    
-    @Override
-    public int updateFyglTripApplication(FyglDailyReimbursement fyglDailyReimbursement) {
-        return 0;
+    public int updateFyglTripApplication(FyglTripApplicationDTO fyglTripApplicationDTO) {
+        fyglTripApplicationDTO.setUpdateBy(SecurityUtils.getUsername());
+        fyglTripApplicationDTO.setUpdateTime(DateUtils.getNowDate());
+        return fyglTripApplicationMapper.updateFyglTripApplication(fyglTripApplicationDTO);
     }
     
     @Override
@@ -70,6 +72,6 @@ public class FyglTripApplicationServiceImpl implements IFyglTripApplicationServi
     
     @Override
     public int deleteFyglTripApplicationById(Long id) {
-        return 0;
+        return fyglTripApplicationMapper.deleteFyglTripApplicationById(id);
     }
 }

ruoyi-psa/src/main/resources/mapper/tripApplication/FyglTripApplicationMapper.xml

@@ -6,6 +6,7 @@
 
     <resultMap type="com.ruoyi.domain.dto.FyglTripApplicationDTO" id="FyglTripApplicationDTOResult">
         <result property="id"    column="id"    />
+        <result property="projectId"  column="project_id"/>
         <result property="projectName"    column="project_name"    />
         <result property="projectUserName"    column="project_manager_name"    />
         <result property="projectType"  column="project_type"/>
@@ -39,7 +40,6 @@
             <if test="projectType != null  and projectType != ''"> and p.project_type = #{projectType}</if>
             <if test="tripStartDate != null  and tripStartDate != ''"> and ftr.travel_start_date = #{tripStartDate}</if>
             <if test="status != null  and status != ''"> and ftr.status = #{status}</if>
-<!--            <if test="reimbursement != null and reimbursement != ''">and fdr.reimbursement = #{reimbursement}</if>-->
             <if test="projectName != null  and projectName != ''"> and p.project_name LIKE CONCAT('%', #{projectName}, '%')</if>
         </where>
         GROUP BY ftr.id
@@ -48,6 +48,7 @@
     <select id="selectFyglTripApplicationById" parameterType="Long" resultMap="FyglTripApplicationDTOResult">
         SELECT
         ftr.id,
+        ftr.project_id,
         p.project_number,
         p.project_name,
         p.project_type,
@@ -64,4 +65,55 @@
         WHERE
             ftr.id = #{id}
     </select>
+
+    <insert id="insertFyglTripApplication" parameterType="com.ruoyi.domain.dto.FyglTripApplicationDTO">
+        insert into fygl_travel_request
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="tripAddress != null">travel_address,</if>
+            <if test="tripReason != null">travel_cause,</if>
+            <if test="tripStartDate != null">travel_start_date,</if>
+            <if test="tripEndDate != null">travel_end_date,</if>
+            <if test="days != null">days,</if>
+            <if test="status != null">status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="tripAddress != null">#{tripAddress},</if>
+            <if test="tripReason != null">#{tripReason},</if>
+            <if test="tripStartDate != null">#{tripStartDate},</if>
+            <if test="tripEndDate  != null">#{tripEndDate},</if>
+            <if test="days != null">#{days},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark}</if>
+        </trim>
+    </insert>
+
+    <update id="updateFyglTripApplication" parameterType="com.ruoyi.domain.dto.FyglTripApplicationDTO">
+        update fygl_travel_request
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="tripAddress != null">travel_address = #{tripAddress},</if>
+            <if test="tripReason != null">travel_cause = #{tripReason},</if>
+            <if test="tripStartDate != null">travel_start_date = #{tripStartDate},</if>
+            <if test="tripEndDate != null">travel_end_date = #{tripEndDate},</if>
+            <if test="days != null">days = #{days},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFyglTripApplicationById" parameterType="Long">
+        delete from fygl_travel_request where id = #{id}
+    </delete>
 </mapper>
\ No newline at end of file