Skip to content

I
isoft_psa
Commit cc3b957c authored by 祁正's avatar 祁正
Browse files
Options

项目费用申请-待报销列表

parent 7845329d
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 13 deletions
ruoyi-psa/src/main/java/com/ruoyi/controller/ApprovalConfigurationController.java
View file @ cc3b957c
......@@ -20,7 +20,6 @@ public class ApprovalConfigurationController extends BaseController {
private IApprovalConfigurationService approvalConfigurationService;
//获取审批页面列表
@Anonymous
@GetMapping("/getList")
public TableDataInfo getList(ApprovalConfigurationDTO configurationDTO){
startPage();
......@@ -41,7 +40,6 @@ public class ApprovalConfigurationController extends BaseController {
}
//根据id获取详情-原始未转换数据
@Anonymous
@GetMapping("/getDetail/{id}")
public AjaxResult getMainDetailById(@PathVariable Integer id){
......
ruoyi-psa/src/main/java/com/ruoyi/controller/FyglProjectCostReimbursementController.java
View file @ cc3b957c
......@@ -4,14 +4,12 @@ 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.FyglProjectCostReimbursementDTO;
import com.ruoyi.domain.dto.FyglProjectDTO;
import com.ruoyi.domain.vo.FyglDailyReimbursementVo;
import com.ruoyi.service.IFyglProjectCostReimbursementService;
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;
......@@ -20,11 +18,11 @@ import java.util.List;
@RestController
@RequestMapping("/fyglprojectCostReimbursement")
public class FyglProjectCostReimbursementController extends BaseController {
@Autowired
private IFyglProjectCostReimbursementService reimbursementService;
@Anonymous
//获取报销列表
@GetMapping("/getList")
public TableDataInfo list() {
startPage();
......@@ -32,13 +30,29 @@ public class FyglProjectCostReimbursementController extends BaseController {
return getDataTable(list);
}
//根据项目id获取报销详情
//获取待报销列表
@Anonymous
@GetMapping("/approvestatus3List")
public TableDataInfo approvestatus3List(FyglProjectCostDTO fyglProjectCostDTO) {
startPage();
List<FyglProjectCostDTO> list = reimbursementService.approvestatus3List(fyglProjectCostDTO);
return getDataTable(list);
}
//根据项目id获取报销详情
@GetMapping("/reimbursementDetail/{id}")
public AjaxResult getDetail(@PathVariable("id") Integer id)
{
FyglProjectCostReimbursementDTO projectDetail = reimbursementService.getDetail(id);
return AjaxResult.success(projectDetail);
}
//新增
@PostMapping("/insertReimbursementDetail")
public AjaxResult insertReimbursementDetail(@RequestBody FyglDailyReimbursementVo reimbursementVo)
{
// todo 新增报销详情
return AjaxResult.success(null);
}
}
ruoyi-psa/src/main/java/com/ruoyi/controller/FyglProjectCostRequest.java
View file @ cc3b957c
package com.ruoyi.controller;
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;
......@@ -23,7 +22,7 @@ public class FyglProjectCostRequest extends BaseController {
private IFyglProjectCostService costService;
@Anonymous
//获取项目费用申请列表
@GetMapping("/list")
public TableDataInfo getProjectCostList(FyglProjectCostDTO fyglProjectCostDTO){
startPage();
......
ruoyi-psa/src/main/java/com/ruoyi/mapper/FyglProjectCostReimbursementMapper.java
View file @ cc3b957c
......@@ -3,6 +3,7 @@ package com.ruoyi.mapper;
import com.ruoyi.domain.dto.FyglProjectCostDTO;
import com.ruoyi.domain.dto.FyglProjectCostReimbursementDTO;
import com.ruoyi.domain.vo.FyglDailyReimbursementVo;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......@@ -15,4 +16,10 @@ public interface FyglProjectCostReimbursementMapper {
//获取详情
public FyglProjectCostReimbursementDTO getDetail(Integer id);
// todo 新增待做
public int insertReimbursement(FyglDailyReimbursementVo fyglDailyReimbursementVo);
//待报销接口
public List<FyglProjectCostDTO> approvestatus3List(FyglProjectCostDTO fyglProjectCostDTO);
}
ruoyi-psa/src/main/java/com/ruoyi/service/IFyglProjectCostReimbursementService.java
View file @ cc3b957c
......@@ -11,4 +11,5 @@ public interface IFyglProjectCostReimbursementService {
//获取详情
public FyglProjectCostReimbursementDTO getDetail(Integer id);
public List<FyglProjectCostDTO> approvestatus3List(FyglProjectCostDTO fyglProjectCostDTO);
}
ruoyi-psa/src/main/java/com/ruoyi/service/impl/IFyglProjectCostReimbursementServiceImpl.java
View file @ cc3b957c
package com.ruoyi.service.impl;
import com.ruoyi.domain.dto.FyglProjectCostDTO;
import com.ruoyi.domain.dto.FyglProjectCostReimbursementDTO;
import com.ruoyi.mapper.FyglProjectCostReimbursementMapper;
import com.ruoyi.service.IFyglProjectCostReimbursementService;
......@@ -25,4 +26,9 @@ public class IFyglProjectCostReimbursementServiceImpl implements IFyglProjectCos
public FyglProjectCostReimbursementDTO getDetail(Integer id) {
return reimbursementMapper.getDetail(id);
}
@Override
public List<FyglProjectCostDTO> approvestatus3List(FyglProjectCostDTO fyglProjectCostDTO) {
return reimbursementMapper.approvestatus3List(fyglProjectCostDTO);
}
}
ruoyi-psa/src/main/resources/mapper/FyglProjectCostReimbursement/FyglProjectCostReimbursementMapper.xml
View file @ cc3b957c
......@@ -25,6 +25,10 @@
</resultMap>
<insert id="insertReimbursement" parameterType="com.ruoyi.domain.vo.FyglDailyReimbursementVo">
</insert>
<select id="getList" resultMap="listDTO">
SELECT
......@@ -66,4 +70,66 @@
LEFT JOIN project_manage p ON p.id = r2.project_id
where r1.id = #{id}
</select>
<resultMap type="com.ruoyi.domain.dto.FyglProjectCostDTO" id="list1DTO">
<result property="id" column="id" />
<result property="projectNumber" column="project_number" />
<result property="projectName" column="project_name" />
<result property="projectType" column="project_type" />
<result property="userName" column="user_name" />
<result property="projectStatus" column="project_status" />
<result property="projectId" column="project_id" />
<result property="timeOfExpense" column="time_of_expense" />
<result property="costType" column="cost_type" />
<result property="sumMoney" column="sum_money" />
<result property="approveStatus" column="approve_status" />
<result property="amount" column="amount" />
<result property="unitPrice" column="unit_price" />
<result property="description" column="description" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
</resultMap>
<select id="approvestatus3List" resultMap="list1DTO">
SELECT
fp.id,
p.project_number,
p.project_name,
p.project_type,
u.user_name,
p.project_status,
fp.time_of_expense,
fp.cost_type,
fp.sum_money,
fp.approve_status,
fp.create_time,
fp.create_by,
fp.update_time,
fp.update_by
FROM
fygl_project_cost_request fp
LEFT JOIN project_manage p ON p.id = fp.project_id
LEFT JOIN sys_user u ON u.user_id = p.department_leader_id
<where>
and fp.approve_status = 3
<if test="projectName != null and projectName != ''"> and p.project_name LIKE CONCAT('%',#{projectName},'%') </if>
<if test="projectNumber != null and projectNumber != ''"> and p.project_number = #{projectNumber}</if>
<if test="userId != null and userId != ''"> and u.user_id = #{userId}</if>
<if test="projectType != null and projectType != ''"> and p.project_type = #{projectType}</if>
</where>
</select>
</mapper>
\ No newline at end of file
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