财务费用申请、付款申请

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyDetailsVo.java

@@ -50,10 +50,10 @@ import lombok.Data;
 public class FinCostapplyDetailsVo implements Vo {
 
     private static final long serialVersionUID = -954113101037446968L;
-    @ApiModelProperty("申请编号")
-    private String billNo;
     @ApiModelProperty("申请人姓名")
     private String name;
+    @ApiModelProperty(value = "申请日期")
+    private String createTime;
     @ApiModelProperty("费用类型Key,数据字典")
     private String costTypeKey;
     @ApiModelProperty("费用类型Value")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyDto.java

@@ -68,11 +68,11 @@ public class FinCostapplyDto implements Dto {
     private String useTypeKey;
     @ApiModelProperty("使用方式value")
     private String useTypeValue;
-    @ApiModelProperty("是否涉及车辆:1是，0否")
+    @ApiModelProperty(value = "是否涉及车辆:1是，0否",required = true)
     private Integer isVeh;
     @ApiModelProperty("是否需要出门:1是，0否.如果涉及车辆，则选择是否需要出门")
     private Integer isOutDoor;
-    @ApiModelProperty(value = "业务sid")
+    @ApiModelProperty(value = "业务sid",required = false)
     private String busSid;
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeign.java

@@ -25,15 +25,15 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.fincostapply;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
+import javax.validation.Valid;
 
 /**
  * Project: anrui-fin(财务) <br/>
@@ -48,7 +48,7 @@ import java.util.List;
  * @version 1.0
  * @since 1.0
  */
-@Api(tags = "fin_costapply")
+@Api(tags = "费用申请")
 @FeignClient(
         contextId = "anrui-fin-FinCostapply",
         name = "anrui-fin",
@@ -64,13 +64,13 @@ public interface FinCostapplyFeign {
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     @ResponseBody
-    public ResultBean save(@RequestBody FinCostapplyDto dto);
-        
+    public ResultBean save(@Valid @RequestBody FinCostapplyDto dto);
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyQuery.java

@@ -52,16 +52,14 @@ public class FinCostapplyQuery implements Query {
     private static final long serialVersionUID = 6824724313813615982L;
     @ApiModelProperty("费用类型Key,数据字典")
     private String costTypeKey;
-    @ApiModelProperty("费用类型Value")
-    private String costTypeValue;
     @ApiModelProperty("费用名称Key,数据字典")
     private String costTitleKey;
-    @ApiModelProperty("费用名称Value")
-    private String costTitleValue;
     @ApiModelProperty("使用方式key,先预支/先垫付，先预支的需要生成财务待支付记录。先垫付的，等报销时，在生成待支付记录。")
     private String useTypeKey;
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+    @ApiModelProperty(value = "报销状态：2已报销，1未报销")
+    private String state;
 
     @ApiModelProperty(value = "申请开始日期")
     private String applyStartDate;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyVo.java

@@ -49,37 +49,19 @@ import lombok.Data;
 @ApiModel(value = "fin_costapply 视图数据对象", description = "fin_costapply 视图数据对象")
 public class FinCostapplyVo implements Vo {
 
+    private static final long serialVersionUID = 8708055678633928645L;
     private String sid;
-
-	@ApiModelProperty("创建人接口")
-    private String createByName;
-	@ApiModelProperty("申请编号")
-    private String billNo;
-	@ApiModelProperty("申请人姓名")
-    private String name;
-	@ApiModelProperty("费用类型Key,数据字典")
-    private String costTypeKey;
-	@ApiModelProperty("费用类型Value")
+    @ApiModelProperty(value = "状态")
+    private String nodeState;
+    @ApiModelProperty(value = "申请日期")
+    private String createTime;
+    @ApiModelProperty("费用类型Value")
     private String costTypeValue;
-	@ApiModelProperty("费用名称Key,数据字典")
-    private String costTitleKey;
-	@ApiModelProperty("费用名称Value")
+    @ApiModelProperty("费用名称Value")
     private String costTitleValue;
-	@ApiModelProperty("申请费用,元，小数点2位")
-    private Integer cost;
-	@ApiModelProperty("使用方式key,先预支/先垫付，先预支的需要生成财务待支付记录。先垫付的，等报销时，在生成待支付记录。")
-    private String useTypeKey;
-	@ApiModelProperty("使用方式value")
-    private String useTypeValue;
-	@ApiModelProperty("是否涉及车辆:1是，0否")
-    private Integer isVeh;
-	@ApiModelProperty("是否需要出门:1是，0否.如果涉及车辆，则选择是否需要出门")
-    private Integer isOutDoor;
-	@ApiModelProperty("业务sid,可以为空")
-    private String busSid;
-	@ApiModelProperty("创建组织")
-    private String createOrgSid;
-	@ApiModelProperty("使用组织")
-    private String useOrgSid;
+    @ApiModelProperty("申请费用,元，小数点2位")
+    private String cost;
+    @ApiModelProperty(value = "报销状态：2已报销，1未报销")
+    private String state;
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinPaymentapply.java <br/>
@@ -50,37 +52,35 @@ import lombok.Data;
 public class FinPaymentapply extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("创建人接口")
-    private String createByName;
-	@ApiModelProperty("申请编号")
+    @ApiModelProperty("申请编号")
     private String billNo;
-	@ApiModelProperty("申请人姓名")
+    @ApiModelProperty("申请人姓名")
     private String name;
-	@ApiModelProperty("款项类别，数据字典")
+    @ApiModelProperty("款项类别，数据字典")
     private String costTypeKey;
-	@ApiModelProperty("款项类别")
+    @ApiModelProperty("款项类别")
     private String costTypeValue;
-	@ApiModelProperty("款项名称，数据字典")
+    @ApiModelProperty("款项名称，数据字典")
     private String costTitleKey;
-	@ApiModelProperty("款项名称")
+    @ApiModelProperty("款项名称")
     private String costTitleValue;
-	@ApiModelProperty("金额，小数点2位")
-    private Integer cost;
-	@ApiModelProperty("付款单位sid")
+    @ApiModelProperty("金额，小数点2位")
+    private BigDecimal cost;
+    @ApiModelProperty("付款单位sid")
     private String payCompanySid;
-	@ApiModelProperty("付款单位名称")
+    @ApiModelProperty("付款单位名称")
     private String payCompany;
-	@ApiModelProperty("收款单位名称")
+    @ApiModelProperty("收款单位名称")
     private String receiveCompany;
-	@ApiModelProperty("收款银行")
+    @ApiModelProperty("收款银行")
     private String receiveBank;
-	@ApiModelProperty("收款银行账号")
+    @ApiModelProperty("收款银行账号")
     private String receiveBankAccount;
-	@ApiModelProperty("关联业务sid")
+    @ApiModelProperty("关联业务sid")
     private String busSid;
-	@ApiModelProperty("创建组织")
+    @ApiModelProperty("创建组织")
     private String createOrgSid;
-	@ApiModelProperty("使用组织")
+    @ApiModelProperty("使用组织")
     private String useOrgSid;
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java

@@ -49,39 +49,35 @@ import lombok.Data;
 @ApiModel(value = "fin_paymentapply 数据传输对象", description = "fin_paymentapply 数据传输对象")
 public class FinPaymentapplyDto implements Dto {
 
+    private static final long serialVersionUID = 1943341584811865051L;
     private String sid;
-
-	@ApiModelProperty("创建人接口")
-   private String createByName;
-	@ApiModelProperty("申请编号")
-   private String billNo;
-	@ApiModelProperty("申请人姓名")
-   private String name;
-	@ApiModelProperty("款项类别，数据字典")
-   private String costTypeKey;
-	@ApiModelProperty("款项类别")
-   private String costTypeValue;
-	@ApiModelProperty("款项名称，数据字典")
-   private String costTitleKey;
-	@ApiModelProperty("款项名称")
-   private String costTitleValue;
-	@ApiModelProperty("金额，小数点2位")
-   private Integer cost;
-	@ApiModelProperty("付款单位sid")
-   private String payCompanySid;
-	@ApiModelProperty("付款单位名称")
-   private String payCompany;
-	@ApiModelProperty("收款单位名称")
-   private String receiveCompany;
-	@ApiModelProperty("收款银行")
-   private String receiveBank;
-	@ApiModelProperty("收款银行账号")
-   private String receiveBankAccount;
-	@ApiModelProperty("关联业务sid")
-   private String busSid;
-	@ApiModelProperty("创建组织")
-   private String createOrgSid;
-	@ApiModelProperty("使用组织")
-   private String useOrgSid;
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+    @ApiModelProperty("申请编号")
+    private String billNo;
+    @ApiModelProperty("申请人姓名")
+    private String name;
+    @ApiModelProperty("款项类别，数据字典")
+    private String costTypeKey;
+    @ApiModelProperty("款项类别")
+    private String costTypeValue;
+    @ApiModelProperty("款项名称，数据字典")
+    private String costTitleKey;
+    @ApiModelProperty("款项名称")
+    private String costTitleValue;
+    @ApiModelProperty("金额，小数点2位")
+    private String cost;
+    @ApiModelProperty("付款单位sid")
+    private String payCompanySid;
+    @ApiModelProperty("付款单位名称")
+    private String payCompany;
+    @ApiModelProperty("收款单位名称")
+    private String receiveCompany;
+    @ApiModelProperty("收款银行")
+    private String receiveBank;
+    @ApiModelProperty("收款银行账号")
+    private String receiveBankAccount;
+    @ApiModelProperty("关联业务sid")
+    private String busSid;
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java

@@ -25,15 +25,15 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finpaymentapply;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
+import javax.validation.Valid;
 
 /**
  * Project: anrui-fin(财务) <br/>
@@ -64,13 +64,13 @@ public interface FinPaymentapplyFeign {
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     @ResponseBody
-    public ResultBean save(@RequestBody FinPaymentapplyDto dto);
-        
+    public ResultBean save(@Valid @RequestBody FinPaymentapplyDto dto);
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeignFallback.java

@@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinPaymentapplyFeignFallback.java <br/>
@@ -48,25 +46,25 @@ import java.util.List;
 @Component
 public class FinPaymentapplyFeignFallback implements FinPaymentapplyFeign {
 
-	@Override
-	public ResultBean<PagerVo<FinPaymentapplyVo>> listPage(PagerQuery<FinPaymentapplyQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-fin/finpaymentapply/listPage无法访问");
-	}
+    @Override
+    public ResultBean<PagerVo<FinPaymentapplyVo>> listPage(PagerQuery<FinPaymentapplyQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-fin/finpaymentapply/listPage无法访问");
+    }
 
-	@Override
-	public ResultBean save(FinPaymentapplyDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-fin/finpaymentapply/save无法访问");
-	}
+    @Override
+    public ResultBean save(FinPaymentapplyDto dto) {
+        return ResultBean.fireFail().setMsg("接口anrui-fin/finpaymentapply/save无法访问");
+    }
 
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-fin/finpaymentapply/delBySids无法访问");
-	}
+    @Override
+    public ResultBean delBySids(String[] sids) {
+        return ResultBean.fireFail().setMsg("接口anrui-fin/finpaymentapply/delBySids无法访问");
+    }
 
-	@Override
-	public ResultBean<FinPaymentapplyDetailsVo> fetchDetailsBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-fin/finpaymentapply/fetchDetailsBySid无法访问");
-	}
+    @Override
+    public ResultBean<FinPaymentapplyDetailsVo> fetchDetailsBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-fin/finpaymentapply/fetchDetailsBySid无法访问");
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyQuery.java

@@ -48,38 +48,20 @@ import lombok.Data;
 @Data
 @ApiModel(value = "fin_paymentapply 查询条件", description = "fin_paymentapply 查询条件")
 public class FinPaymentapplyQuery implements Query {
-
-	@ApiModelProperty("创建人接口")
-    private String createByName;
-	@ApiModelProperty("申请编号")
-    private String billNo;
-	@ApiModelProperty("申请人姓名")
-    private String name;
-	@ApiModelProperty("款项类别，数据字典")
+    private static final long serialVersionUID = 5439345928016283101L;
+    @ApiModelProperty(value = "付款状态:1未付款，2已付款")
+    private String state;
+    @ApiModelProperty("款项类别，数据字典")
     private String costTypeKey;
-	@ApiModelProperty("款项类别")
-    private String costTypeValue;
-	@ApiModelProperty("款项名称，数据字典")
+    @ApiModelProperty("款项名称，数据字典")
     private String costTitleKey;
-	@ApiModelProperty("款项名称")
-    private String costTitleValue;
-	@ApiModelProperty("金额，小数点2位")
-    private Integer cost;
-	@ApiModelProperty("付款单位sid")
-    private String payCompanySid;
-	@ApiModelProperty("付款单位名称")
-    private String payCompany;
-	@ApiModelProperty("收款单位名称")
+    @ApiModelProperty("收款单位名称")
     private String receiveCompany;
-	@ApiModelProperty("收款银行")
-    private String receiveBank;
-	@ApiModelProperty("收款银行账号")
-    private String receiveBankAccount;
-	@ApiModelProperty("关联业务sid")
-    private String busSid;
-	@ApiModelProperty("创建组织")
-    private String createOrgSid;
-	@ApiModelProperty("使用组织")
-    private String useOrgSid;
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+    @ApiModelProperty(value = "申请开始时间")
+    private String applyStartDate;
+    @ApiModelProperty(value = "申请结束时间")
+    private String applyEndDate;
 
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.fin.api.fincostapply.FinCostapplyDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -52,14 +53,25 @@ import java.util.List;
  */
 @Mapper
 public interface FinCostapplyMapper extends BaseMapper<FinCostapply> {
+    /**
+     * 费用申请的分页列表
+     *
+     * @param page 分页
+     * @param qw   查询条件
+     * @return
+     */
+    IPage<FinCostapplyVo> selectPageVo(IPage<FinCostapply> page, @Param(Constants.WRAPPER) Wrapper<FinCostapply> qw);
 
-	//@Update("update fin_costapply set name=#{msg} where id=#{id}")
-	//IPage<FinCostapplyVo> voPage(IPage<FinCostapply> page, @Param(Constants.WRAPPER) QueryWrapper<FinCostapply> qw);
-	
-	IPage<FinCostapplyVo> selectPageVo(IPage<FinCostapply> page, @Param(Constants.WRAPPER) Wrapper<FinCostapply> qw);
-	
-	List<FinCostapplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinCostapply> qw);
-	
-	@Select("select * from fin_costapply")
-	List<FinCostapplyVo> selectListVo();
+    List<FinCostapplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinCostapply> qw);
+
+    @Select("select * from fin_costapply")
+    List<FinCostapplyVo> selectListVo();
+
+    /**
+     * 详情
+     *
+     * @param sid 费用申请sid
+     * @return
+     */
+    FinCostapplyDetailsVo fetchDetailsVoBySid(String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml

@@ -1,13 +1,44 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.fin.biz.fincostapply.FinCostapplyMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.fincostapply.FinCostapplyVo">
-		SELECT * FROM fin_costapply <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.fincostapply.FinCostapplyVo">
-		SELECT * FROM fin_costapply <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.fin.api.fincostapply.FinCostapplyVo">
+        SELECT fc.sid,
+               DATE_FORMAT(fc.createTime, '%Y-%m-%d') as createTime,
+               fc.costTypeValue,
+               fc.costTitleValue,
+               fc.cost,
+               case fc.state
+                   when 1 then '已报销'
+                   when 0 then '未报销' end              as state
+        FROM fin_costapply fc
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.fincostapply.FinCostapplyVo">
+        SELECT *
+        FROM fin_costapply
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="fetchDetailsVoBySid" resultType="com.yxt.anrui.fin.api.fincostapply.FinCostapplyDetailsVo">
+        select fc.name,
+               DATE_FORMAT(fc.createTime, '%Y-%m-%d') as createTime,
+               fc.costTitleKey,
+               fc.costTitleValue,
+               fc.costTypeKey,
+               fc.costTypeValue,
+               fc.cost,
+               fc.useTypeKey,
+               fc.useTypeValue,
+               fc.isVeh,
+               fc.isOutDoor
+        from fin_costapply fc
+        where fc.sid = #{sid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyRest.java

@@ -25,21 +25,15 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.fincostapply;
 
+import com.yxt.anrui.fin.api.fincostapply.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import com.yxt.anrui.fin.api.fincostapply.FinCostapply;
-import com.yxt.anrui.fin.api.fincostapply.FinCostapplyQuery;
-import com.yxt.anrui.fin.api.fincostapply.FinCostapplyVo;
-import com.yxt.anrui.fin.api.fincostapply.FinCostapplyDetailsVo;
-import com.yxt.anrui.fin.api.fincostapply.FinCostapplyDto;
-import com.yxt.anrui.fin.api.fincostapply.FinCostapplyFeign;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
  * Project: anrui-fin(财务) <br/>
@@ -54,47 +48,42 @@ import com.yxt.anrui.fin.api.fincostapply.FinCostapplyFeign;
  * @version 1.0
  * @since 1.0
  */
-@Api(tags = "fin_costapply")
-@RestController("com.yxt.anrui.fin.biz.fincostapply.FinCostapplyRest")
+@Controller
 @RequestMapping("v1/fincostapply")
 public class FinCostapplyRest implements FinCostapplyFeign {
 
-	@Autowired
-	private FinCostapplyService finCostapplyService;
+    @Autowired
+    private FinCostapplyService finCostapplyService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<FinCostapplyVo>> listPage(@RequestBody PagerQuery<FinCostapplyQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<FinCostapplyVo> pv = finCostapplyService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
+    @Override
+    public ResultBean<PagerVo<FinCostapplyVo>> listPage(@RequestBody PagerQuery<FinCostapplyQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<FinCostapplyVo> pv = finCostapplyService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
 
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody FinCostapplyDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		finCostapplyService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
+    @Override
+    public ResultBean save(@RequestBody FinCostapplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean resultBean = finCostapplyService.saveOrUpdateDto(dto);
+        return resultBean;
+    }
 
-	@Override
-	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		finCostapplyService.delBySids(sids);
-		return rb.success();
-	}
+    @Override
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        finCostapplyService.delBySids(sids);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<FinCostapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		FinCostapplyDetailsVo vo = finCostapplyService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
+    @Override
+    public ResultBean<FinCostapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean<FinCostapplyDetailsVo> rb = ResultBean.fireFail();
+        FinCostapply finCostapply = finCostapplyService.fetchBySid(sid);
+        if (finCostapply == null) {
+            return rb.setMsg("该费用申请不存在");
+        }
+        FinCostapplyDetailsVo vo = finCostapplyService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java

@@ -28,23 +28,15 @@ package com.yxt.anrui.fin.biz.fincostapply;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.commons.lang3.StringUtils;
+import com.yxt.anrui.fin.api.fincostapply.*;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.anrui.fin.api.fincostapply.FinCostapply;
-import com.yxt.anrui.fin.api.fincostapply.FinCostapplyQuery;
-import com.yxt.anrui.fin.api.fincostapply.FinCostapplyVo;
-import com.yxt.anrui.fin.api.fincostapply.FinCostapplyDetailsVo;
-import com.yxt.anrui.fin.api.fincostapply.FinCostapplyDto;
-import com.yxt.anrui.fin.api.fincostapply.FinCostapplyFeign;
-
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinCostapplyService.java <br/>
@@ -60,51 +52,62 @@ import java.util.List;
  */
 @Service
 public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper, FinCostapply> {
-	private QueryWrapper<FinCostapply> createQueryWrapper(FinCostapplyQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<FinCostapply> qw = new QueryWrapper<>();
-		return qw;
-	}
-	
-	public PagerVo<FinCostapplyVo> listPageVo(PagerQuery<FinCostapplyQuery> pq) {
-		FinCostapplyQuery query = pq.getParams();
-		QueryWrapper<FinCostapply> qw = createQueryWrapper(query);
-		IPage<FinCostapply> page = PagerUtil.queryToPage(pq);
-		IPage<FinCostapplyVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<FinCostapplyVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(FinCostapplyDto dto){
+
+    public PagerVo<FinCostapplyVo> listPageVo(PagerQuery<FinCostapplyQuery> pq) {
+        FinCostapplyQuery query = pq.getParams();
+        QueryWrapper<FinCostapply> qw = new QueryWrapper<>();
+        FinCostapplyQuery pageQuery = pq.getParams();
+        if (pageQuery != null) {
+            //报销状态：1已报销，0未报销
+            if (StringUtils.isNotBlank(pageQuery.getState())) {
+                qw.eq("fc.state", pageQuery.getState());
+            }
+            //费用类型
+            if (StringUtils.isNotBlank(pageQuery.getCostTypeKey())) {
+                qw.eq("fc.costTypeKey", pageQuery.getCostTypeKey());
+            }
+            //费用名称
+            if (StringUtils.isNotBlank(pageQuery.getCostTitleKey())) {
+                qw.eq("fc.costTitleKey", pageQuery.getCostTitleKey());
+            }
+            //使用方式
+            if (StringUtils.isNotBlank(pageQuery.getUseTypeKey())) {
+                qw.eq("fc.useTypeKey", pageQuery.getUseTypeKey());
+            }
+            //申请日期
+            qw.apply(StringUtils.isNotBlank(pageQuery.getApplyStartDate()), "date_format (fc.createTime,'%Y-%m-%d') >= date_format('" + pageQuery.getApplyStartDate() + "','%Y-%m-%d')").
+                    apply(StringUtils.isNotBlank(pageQuery.getApplyEndDate()), "date_format (fc.createTime,'%Y-%m-%d') <= date_format('" + pageQuery.getApplyEndDate() + "','%Y-%m-%d')"
+                    );
+            if (StringUtils.isNotBlank(pageQuery.getUserSid())) {
+                qw.eq("fc.createBySid", pageQuery.getUserSid());
+            }
+        }
+        IPage<FinCostapply> page = PagerUtil.queryToPage(pq);
+        IPage<FinCostapplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<FinCostapplyVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean saveOrUpdateDto(FinCostapplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(FinCostapplyDto dto){
-		FinCostapply entity = new FinCostapply();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public void updateByDto(FinCostapplyDto dto){
-          String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        } 
-		FinCostapply entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public FinCostapplyDetailsVo fetchDetailsVoBySid(String sid){
-		FinCostapply entity = fetchBySid(sid);
-		FinCostapplyDetailsVo vo = new FinCostapplyDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
+            //新增
+            FinCostapply finCostapply = new FinCostapply();
+            BeanUtil.copyProperties(dto, finCostapply, "sid");
+            baseMapper.insert(finCostapply);
+        } else {
+            FinCostapply finCostapply = fetchBySid(dtoSid);
+            if (finCostapply == null) {
+                return rb.setMsg("该费用申请不存在");
+            }
+            BeanUtil.copyProperties(dto, finCostapply);
+            baseMapper.updateById(finCostapply);
+        }
+        return rb.success();
+    }
+
+    public FinCostapplyDetailsVo fetchDetailsVoBySid(String sid) {
+        return baseMapper.fetchDetailsVoBySid(sid);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finpaymentapply;
 
+import com.yxt.anrui.fin.api.finpaymentapply.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -33,14 +34,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
-import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyQuery;
-import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyVo;
-import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyDetailsVo;
-import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyDto;
-import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyFeign;
-
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinPaymentapplyFeignFallback.java <br/>
@@ -59,42 +52,45 @@ import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyFeign;
 @RequestMapping("v1/finpaymentapply")
 public class FinPaymentapplyRest implements FinPaymentapplyFeign {
 
-	@Autowired
-	private FinPaymentapplyService finPaymentapplyService;
+    @Autowired
+    private FinPaymentapplyService finPaymentapplyService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<FinPaymentapplyVo>> listPage(@RequestBody PagerQuery<FinPaymentapplyQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<FinPaymentapplyVo> pv = finPaymentapplyService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<FinPaymentapplyVo>> listPage(@RequestBody PagerQuery<FinPaymentapplyQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<FinPaymentapplyVo> pv = finPaymentapplyService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
 
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody FinPaymentapplyDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		finPaymentapplyService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody FinPaymentapplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        return finPaymentapplyService.saveOrUpdateDto(dto);
+    }
 
-	@Override
-	@ApiOperation("根据sid批量删除")
+    @Override
+    @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		finPaymentapplyService.delBySids(sids);
-		return rb.success();
-	}
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        finPaymentapplyService.delBySids(sids);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据SID获取一条记录")
+    @Override
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<FinPaymentapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		FinPaymentapplyDetailsVo vo = finPaymentapplyService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
+    public ResultBean<FinPaymentapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        FinPaymentapply finPaymentapply = finPaymentapplyService.fetchBySid(sid);
+        if (finPaymentapply == null) {
+            return rb.setMsg("该付款申请不存在");
+        }
+        FinPaymentapplyDetailsVo vo = finPaymentapplyService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -28,23 +28,15 @@ package com.yxt.anrui.fin.biz.finpaymentapply;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.commons.lang3.StringUtils;
+import com.yxt.anrui.fin.api.finpaymentapply.*;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
-import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyQuery;
-import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyVo;
-import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyDetailsVo;
-import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyDto;
-import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyFeign;
-
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinPaymentapplyService.java <br/>
@@ -60,51 +52,68 @@ import java.util.List;
  */
 @Service
 public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMapper, FinPaymentapply> {
-	private QueryWrapper<FinPaymentapply> createQueryWrapper(FinPaymentapplyQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<FinPaymentapply> qw = new QueryWrapper<>();
-		return qw;
-	}
-	
-	public PagerVo<FinPaymentapplyVo> listPageVo(PagerQuery<FinPaymentapplyQuery> pq) {
-		FinPaymentapplyQuery query = pq.getParams();
-		QueryWrapper<FinPaymentapply> qw = createQueryWrapper(query);
-		IPage<FinPaymentapply> page = PagerUtil.queryToPage(pq);
-		IPage<FinPaymentapplyVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<FinPaymentapplyVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(FinPaymentapplyDto dto){
+
+
+    public PagerVo<FinPaymentapplyVo> listPageVo(PagerQuery<FinPaymentapplyQuery> pq) {
+        FinPaymentapplyQuery query = pq.getParams();
+        QueryWrapper<FinPaymentapply> qw = new QueryWrapper<>();
+        FinPaymentapplyQuery pageQuery = pq.getParams();
+        if (pageQuery != null) {
+            //付款状态
+            if (StringUtils.isNotBlank(pageQuery.getState())) {
+                qw.eq("pa.state", pageQuery.getState());
+            }
+            //款项类别
+            if (StringUtils.isNotBlank(pageQuery.getCostTypeKey())) {
+                qw.eq("pa.costTypekey", pageQuery.getCostTypeKey());
+            }
+            //款项名称
+            if (StringUtils.isNotBlank(pageQuery.getCostTitleKey())) {
+                qw.eq("pa.costTitleKey", pageQuery.getCostTitleKey());
+            }
+            //收款单位
+            if (StringUtils.isNotBlank(pageQuery.getReceiveCompany())) {
+                qw.like("pa.receiveCompany", pageQuery.getReceiveCompany());
+            }
+            //申请日期
+            qw.apply(StringUtils.isNotBlank(pageQuery.getApplyStartDate()), "date_format (pa.createTime,'%Y-%m-%d') >= date_format('" + pageQuery.getApplyStartDate() + "','%Y-%m-%d')").
+                    apply(StringUtils.isNotBlank(pageQuery.getApplyEndDate()), "date_format (pa.createTime,'%Y-%m-%d') <= date_format('" + pageQuery.getApplyEndDate() + "','%Y-%m-%d')"
+                    );
+            //申请人sid
+            if (StringUtils.isNotBlank(pageQuery.getUserSid())) {
+                qw.eq("pa.createBySid", pageQuery.getUserSid());
+            }
+
+        }
+        IPage<FinPaymentapply> page = PagerUtil.queryToPage(pq);
+        IPage<FinPaymentapplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<FinPaymentapplyVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean saveOrUpdateDto(FinPaymentapplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(FinPaymentapplyDto dto){
-		FinPaymentapply entity = new FinPaymentapply();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public void updateByDto(FinPaymentapplyDto dto){
-          String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        } 
-		FinPaymentapply entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public FinPaymentapplyDetailsVo fetchDetailsVoBySid(String sid){
-		FinPaymentapply entity = fetchBySid(sid);
-		FinPaymentapplyDetailsVo vo = new FinPaymentapplyDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
+            FinPaymentapply finPaymentapply = new FinPaymentapply();
+            BeanUtil.copyProperties(dto, finPaymentapply, "sid");
+            baseMapper.insert(finPaymentapply);
+            dtoSid = finPaymentapply.getSid();
+        } else {
+            FinPaymentapply finPaymentapply = fetchBySid(dtoSid);
+            if (finPaymentapply == null) {
+                return rb.setMsg("该付款申请不存在");
+            }
+            BeanUtil.copyProperties(dto, finPaymentapply);
+            baseMapper.updateById(finPaymentapply);
+        }
+        return rb.success().setData(dtoSid);
+    }
+
+    public FinPaymentapplyDetailsVo fetchDetailsVoBySid(String sid) {
+        FinPaymentapply entity = fetchBySid(sid);
+        FinPaymentapplyDetailsVo vo = new FinPaymentapplyDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
 }