From e7acba8aaaa91a067728d4769b4af5a9dd6ac189 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 31 五月 2023 19:03:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 253 +++++++++++++++++++++++--------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java | 44 +++--
ruoyi-project/src/main/java/com/ruoyi/project/domain/FunddetailReqVo.java | 46 +++++
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFunddetailMapper.java | 4
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java | 10 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java | 69 +++++---
6 files changed, 310 insertions(+), 116 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
index 8478697..7c749f2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
@@ -6,10 +6,13 @@
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.ServiceFund;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
+import io.lettuce.core.dynamic.annotation.Param;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -34,15 +37,14 @@
/**
* 璐圭敤鐢宠鏄庣粏Controller
- *
+ *
* @author ruoyi
* @date 2022-01-25
*/
@Api("璐圭敤鐢宠鏄庣粏")
@RestController
@RequestMapping("/project/funddetail")
-public class ServiceFunddetailController extends BaseController
-{
+public class ServiceFunddetailController extends BaseController {
@Autowired
private IServiceFunddetailService serviceFunddetailService;
@@ -53,8 +55,7 @@
@ApiOperation("鏌ヨ璐圭敤鐢宠鏄庣粏鍒楄〃")
//@PreAuthorize("@ss.hasPermi('project:funddetail:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceFunddetail serviceFunddetail)
- {
+ public TableDataInfo list(ServiceFunddetail serviceFunddetail) {
startPage();
//List<ServiceFunddetail> list = serviceFunddetailService.queryList(serviceFunddetail);
List<ServiceFunddetail> list = serviceFunddetailService.selectServiceFunddetailList(serviceFunddetail);
@@ -68,8 +69,7 @@
//@PreAuthorize("@ss.hasPermi('project:funddetail:export')")
@Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceFunddetail serviceFunddetail)
- {
+ public AjaxResult export(ServiceFunddetail serviceFunddetail) {
List<ServiceFunddetail> list = serviceFunddetailService.queryList(serviceFunddetail);
ExcelUtil<ServiceFunddetail> util = new ExcelUtil<ServiceFunddetail>(ServiceFunddetail.class);
return util.exportExcel(list, "璐圭敤鐢宠鏄庣粏鏁版嵁");
@@ -81,8 +81,7 @@
@ApiOperation("鑾峰彇璐圭敤鐢宠鏄庣粏璇︾粏淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:funddetail:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceFunddetailService.getById(id));
}
@@ -94,8 +93,7 @@
@Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceFunddetail serviceFunddetail)
- {
+ public AjaxResult add(@RequestBody ServiceFunddetail serviceFunddetail) {
return toAjax(serviceFunddetailService.save(serviceFunddetail));
}
@@ -106,9 +104,8 @@
//@PreAuthorize("@ss.hasPermi('project:funddetail:edit')")
@Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.UPDATE)
@PutMapping
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceFunddetail serviceFunddetail)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceFunddetail serviceFunddetail) {
return toAjax(serviceFunddetailService.updateById(serviceFunddetail));
}
@@ -119,8 +116,7 @@
//@PreAuthorize("@ss.hasPermi('project:funddetail:remove')")
@Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceFunddetailService.removeByIds(Arrays.asList(ids)));
}
@@ -131,12 +127,22 @@
@ApiOperation("鍒犻櫎鎶ラ攢鐢宠鏄庣粏骞朵慨鏀归噾棰�")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.DELETE)
@DeleteMapping("/deleteDetail/{id}")
- public AjaxResult deleteDetail(@PathVariable Long id)
- {
+ public AjaxResult deleteDetail(@PathVariable Long id) {
return AjaxResult.success(serviceFunddetailService.deleteDetail(id));
}
-
+ /**
+ * 鏍规嵁鍙楃泭浜虹紪鍙疯幏鍙栬垂鐢ㄧ敵璇锋槑缁嗕俊鎭�
+ */
+ @ApiOperation("鏍规嵁鍙楃泭浜虹紪鍙疯幏鍙栬垂鐢ㄧ敵璇锋槑缁嗕俊鎭�")
+ @PostMapping("/getDataBybeneficiaryNo")
+ public AjaxResult getDataBybeneficiaryNo(@RequestBody FunddetailReqVo funddetailReqVo) {
+// if (StringUtils.isEmpty(funddetailReqVo.getBeneficiaryNo())) {
+// return AjaxResult.error("鍙楃泭浜虹紪鍙蜂笉鑳戒负绌�");
+// }
+ List<ServiceFunddetail> dataBybeneficiaryNo = serviceFunddetailService.getDataBybeneficiaryNo(funddetailReqVo);
+ return AjaxResult.success(dataBybeneficiaryNo);
+ }
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/FunddetailReqVo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/FunddetailReqVo.java
new file mode 100644
index 0000000..b475b3e
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/FunddetailReqVo.java
@@ -0,0 +1,46 @@
+package com.ruoyi.project.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 璐圭敤鐢宠鏌ヨVO
+ *
+ * @author ls
+ * @date 2023-05-30
+ */
+@Data
+@ApiModel("璐圭敤鐢宠鏄庣粏")
+public class FunddetailReqVo extends BaseEntity {
+
+
+ /**
+ * 鏈嶅姟瀵硅薄鍚嶇О
+ */
+ @ApiModelProperty("鍙楃泭浜虹紪鍙�")
+ private String beneficiaryNo;
+
+ /**
+ * 鐢宠寮�濮嬫椂闂�
+ */
+ @ApiModelProperty("鐢宠寮�濮嬫椂闂�")
+ private String starttime;
+
+
+ /**
+ * 鐢宠寮�濮嬫椂闂�
+ */
+ @ApiModelProperty("鐢宠缁撴潫鏃堕棿")
+ private String endtime;
+
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFunddetailMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFunddetailMapper.java
index 2f6cd57..f7099c6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFunddetailMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFunddetailMapper.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
+
+import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.ServiceFunddetail;
import org.apache.ibatis.annotations.Param;
@@ -37,4 +39,6 @@
List<ServiceFunddetail> getAllDetailsByFDIDLWF(Long id);
int countItem(@Param("fundid") Long fundid, @Param("itemid") Long itemid);
+
+ public List<ServiceFunddetail> getDataBybeneficiaryNo(FunddetailReqVo funddetailReqVo);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
index 3cd75e7..1d18a27 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
@@ -2,7 +2,10 @@
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.ServiceFunddetail;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* 璐圭敤鐢宠鏄庣粏Service鎺ュ彛
@@ -19,7 +22,12 @@
* @param serviceFunddetail 璐圭敤鐢宠鏄庣粏
* @return 璐圭敤鐢宠鏄庣粏闆嗗悎
*/
- public List<ServiceFunddetail> queryList(ServiceFunddetail serviceFunddetail);
+ List<ServiceFunddetail> queryList(ServiceFunddetail serviceFunddetail);
+
+ /**
+ * 鏍规嵁鍙楃泭浜虹紪鍙疯幏鍙栬垂鐢ㄧ敵璇锋槑缁嗕俊鎭�
+ */
+ List<ServiceFunddetail> getDataBybeneficiaryNo(FunddetailReqVo funddetailReqVo);
List<ServiceFunddetail> getAllDetailsByFDIDLW(Long id);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
index 1c94fde..35637c2 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
@@ -1,10 +1,10 @@
package com.ruoyi.project.service.impl;
+import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
import java.util.List;
-import com.ruoyi.project.domain.ServiceFund;
-import com.ruoyi.project.domain.ServiceReimbursement;
-import com.ruoyi.project.domain.ServiceReimbursementdetail;
+import com.ruoyi.project.domain.*;
import com.ruoyi.project.mapper.ServiceFundMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -13,18 +13,16 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.mapper.ServiceFunddetailMapper;
-import com.ruoyi.project.domain.ServiceFunddetail;
import com.ruoyi.project.service.IServiceFunddetailService;
/**
* 璐圭敤鐢宠鏄庣粏Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2022-01-25
*/
@Service
-public class ServiceFunddetailServiceImpl extends ServiceImpl<ServiceFunddetailMapper, ServiceFunddetail> implements IServiceFunddetailService
-{
+public class ServiceFunddetailServiceImpl extends ServiceImpl<ServiceFunddetailMapper, ServiceFunddetail> implements IServiceFunddetailService {
@Autowired
ServiceFunddetailMapper serviceFunddetailMapper;
@@ -35,47 +33,62 @@
/**
* 鏌ヨ璐圭敤鐢宠鏄庣粏鍒楄〃
- *
+ *
* @param serviceFunddetail 璐圭敤鐢宠鏄庣粏
* @return 璐圭敤鐢宠鏄庣粏
*/
@Override
public List<ServiceFunddetail> queryList(ServiceFunddetail serviceFunddetail) {
LambdaQueryWrapper<ServiceFunddetail> wrappers = Wrappers.lambdaQuery();
- if (StringUtils.isNotBlank(serviceFunddetail.getBeneficiaryname())){
- wrappers.like(ServiceFunddetail::getBeneficiaryname ,serviceFunddetail.getBeneficiaryname());
+ if (StringUtils.isNotBlank(serviceFunddetail.getBeneficiaryname())) {
+ wrappers.like(ServiceFunddetail::getBeneficiaryname, serviceFunddetail.getBeneficiaryname());
}
- if (StringUtils.isNotBlank(serviceFunddetail.getUnitname())){
- wrappers.like(ServiceFunddetail::getUnitname ,serviceFunddetail.getUnitname());
+ if (StringUtils.isNotBlank(serviceFunddetail.getUnitname())) {
+ wrappers.like(ServiceFunddetail::getUnitname, serviceFunddetail.getUnitname());
}
- if (StringUtils.isNotBlank(serviceFunddetail.getApplytype())){
- wrappers.eq(ServiceFunddetail::getApplytype ,serviceFunddetail.getApplytype());
+ if (StringUtils.isNotBlank(serviceFunddetail.getApplytype())) {
+ wrappers.eq(ServiceFunddetail::getApplytype, serviceFunddetail.getApplytype());
}
- if (StringUtils.isNotBlank(serviceFunddetail.getItemname())){
- wrappers.like(ServiceFunddetail::getItemname ,serviceFunddetail.getItemname());
+ if (StringUtils.isNotBlank(serviceFunddetail.getItemname())) {
+ wrappers.like(ServiceFunddetail::getItemname, serviceFunddetail.getItemname());
}
- if (StringUtils.isNotBlank(serviceFunddetail.getItemtype())){
- wrappers.eq(ServiceFunddetail::getItemtype ,serviceFunddetail.getItemtype());
+ if (StringUtils.isNotBlank(serviceFunddetail.getItemtype())) {
+ wrappers.eq(ServiceFunddetail::getItemtype, serviceFunddetail.getItemtype());
}
- if (StringUtils.isNotBlank(serviceFunddetail.getRecordstatus())){
- wrappers.eq(ServiceFunddetail::getRecordstatus ,serviceFunddetail.getRecordstatus());
+ if (StringUtils.isNotBlank(serviceFunddetail.getRecordstatus())) {
+ wrappers.eq(ServiceFunddetail::getRecordstatus, serviceFunddetail.getRecordstatus());
}
- if (StringUtils.isNotBlank(serviceFunddetail.getCreateBy())){
- wrappers.eq(ServiceFunddetail::getCreateBy ,serviceFunddetail.getCreateBy());
+ if (StringUtils.isNotBlank(serviceFunddetail.getCreateBy())) {
+ wrappers.eq(ServiceFunddetail::getCreateBy, serviceFunddetail.getCreateBy());
}
- if (serviceFunddetail.getCreateTime() != null){
- wrappers.eq(ServiceFunddetail::getCreateTime ,serviceFunddetail.getCreateTime());
+ if (serviceFunddetail.getCreateTime() != null) {
+ wrappers.eq(ServiceFunddetail::getCreateTime, serviceFunddetail.getCreateTime());
}
- if (StringUtils.isNotBlank(serviceFunddetail.getUploadflag())){
- wrappers.eq(ServiceFunddetail::getUploadflag ,serviceFunddetail.getUploadflag());
+ if (StringUtils.isNotBlank(serviceFunddetail.getUploadflag())) {
+ wrappers.eq(ServiceFunddetail::getUploadflag, serviceFunddetail.getUploadflag());
}
- if (serviceFunddetail.getUploadtime() != null){
- wrappers.eq(ServiceFunddetail::getUploadtime ,serviceFunddetail.getUploadtime());
+ if (serviceFunddetail.getUploadtime() != null) {
+ wrappers.eq(ServiceFunddetail::getUploadtime, serviceFunddetail.getUploadtime());
}
return this.list(wrappers);
}
@Override
+ public List<ServiceFunddetail> getDataBybeneficiaryNo(FunddetailReqVo funddetailReqVo) {
+ if (StringUtils.isEmpty(funddetailReqVo.getStarttime())) {
+ // 鑾峰彇褰撴湀绗竴澶╂棩鏈�
+ funddetailReqVo.setStarttime(LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).toString());
+ }
+ if (StringUtils.isEmpty(funddetailReqVo.getEndtime())) {
+ // 鑾峰彇褰撴湀鏈�鍚庝竴澶╂棩鏈�
+ funddetailReqVo.setEndtime(LocalDate.now().with(TemporalAdjusters.lastDayOfMonth()).toString());
+ }
+ List<ServiceFunddetail> dataBybeneficiaryNo = serviceFunddetailMapper.getDataBybeneficiaryNo(funddetailReqVo);
+
+ return dataBybeneficiaryNo;
+ }
+
+ @Override
public List<ServiceFunddetail> getAllDetailsByFDIDLW(Long id) {
return serviceFunddetailMapper.getAllDetailsByFDIDLW(id);
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index 5753b0a..3090737 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -1,80 +1,132 @@
<?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">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceFunddetailMapper">
-
- <resultMap type="ServiceFunddetail" id="ServiceFunddetailResult">
- <result property="id" column="ID" />
- <result property="fundid" column="fundID" />
- <result property="beneficiaryname" column="BeneficiaryName" />
- <result property="beneficiaryno" column="BeneficiaryNo" />
- <result property="unitname" column="UnitName" />
- <result property="unitno" column="UnitNo" />
- <result property="unituserno" column="UnitUserNo" />
- <result property="title" column="Title" />
- <result property="idcardtype" column="IDCardType" />
- <result property="idcardno" column="IDCardNo" />
- <result property="sex" column="Sex" />
- <result property="familyrelations" column="FamilyRelations" />
- <result property="phone" column="Phone" />
- <result property="depositbank" column="DepositBank" />
- <result property="bankcardno" column="BankCardNo" />
- <result property="branchbankname" column="BranchBankName" />
- <result property="annexbankcard" column="AnnexBankCard" />
- <result property="annexregistform" column="AnnexRegistForm" />
- <result property="applytype" column="ApplyType" />
- <result property="applytypename" column="ApplyTypeName" />
- <result property="itemid" column="ItemID" />
- <result property="itemname" column="ItemName" />
- <result property="itemtype" column="ItemType" />
- <result property="amount" column="Amount" />
- <result property="prepaidamount" column="PrepaidAmount" />
- <result property="taxamount" column="TaxAmount" />
- <result property="invoicecount" column="InvoiceCount" />
- <result property="taxedamount" column="TaxedAmount" />
- <result property="attachcount" column="AttachCount" />
- <result property="remark" column="Remark" />
- <result property="recordstatus" column="RecordStatus" />
- <result property="price" column="Price" />
- <result property="quantity" column="Quantity" />
- <result property="del_flag" column="del_flag" />
- <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="uploadflag" column="uploadflag" />
- <result property="uploadtime" column="uploadtime" />
- <result property="infoid" column="InfoId" />
- <result property="donorno" column="DonorNo" />
- <result property="donorname" column="DonorName" />
- <result property="servicesscope" column="SERVICESSCOPE" />
- <result property="servicesscopename" column="SERVICESSCOPENAME" />
- <result property="servicetype" column="SERVICETYPE" />
- <result property="servicetypename" column="SERVICETYPENAME" />
- <result property="orderno" column="OrderNo" />
- <result property="itemcode" column="ItemCode" />
+
+ <resultMap type="com.ruoyi.project.domain.ServiceFunddetail" id="ServiceFunddetailResult">
+ <result property="id" column="ID"/>
+ <result property="fundid" column="fundID"/>
+ <result property="beneficiaryname" column="BeneficiaryName"/>
+ <result property="beneficiaryno" column="BeneficiaryNo"/>
+ <result property="unitname" column="UnitName"/>
+ <result property="unitno" column="UnitNo"/>
+ <result property="unituserno" column="UnitUserNo"/>
+ <result property="title" column="Title"/>
+ <result property="idcardtype" column="IDCardType"/>
+ <result property="idcardno" column="IDCardNo"/>
+ <result property="sex" column="Sex"/>
+ <result property="familyrelations" column="FamilyRelations"/>
+ <result property="phone" column="Phone"/>
+ <result property="depositbank" column="DepositBank"/>
+ <result property="bankcardno" column="BankCardNo"/>
+ <result property="branchbankname" column="BranchBankName"/>
+ <result property="annexbankcard" column="AnnexBankCard"/>
+ <result property="annexregistform" column="AnnexRegistForm"/>
+ <result property="applytype" column="ApplyType"/>
+ <result property="applytypename" column="ApplyTypeName"/>
+ <result property="itemid" column="ItemID"/>
+ <result property="itemname" column="ItemName"/>
+ <result property="itemtype" column="ItemType"/>
+ <result property="amount" column="Amount"/>
+ <result property="prepaidamount" column="PrepaidAmount"/>
+ <result property="taxamount" column="TaxAmount"/>
+ <result property="invoicecount" column="InvoiceCount"/>
+ <result property="taxedamount" column="TaxedAmount"/>
+ <result property="attachcount" column="AttachCount"/>
+ <result property="remark" column="Remark"/>
+ <result property="recordstatus" column="RecordStatus"/>
+ <result property="price" column="Price"/>
+ <result property="quantity" column="Quantity"/>
+ <result property="del_flag" column="del_flag"/>
+ <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="uploadflag" column="uploadflag"/>
+ <result property="uploadtime" column="uploadtime"/>
+ <result property="infoid" column="InfoId"/>
+ <result property="donorno" column="DonorNo"/>
+ <result property="donorname" column="DonorName"/>
+ <result property="servicesscope" column="SERVICESSCOPE"/>
+ <result property="servicesscopename" column="SERVICESSCOPENAME"/>
+ <result property="servicetype" column="SERVICETYPE"/>
+ <result property="servicetypename" column="SERVICETYPENAME"/>
+ <result property="orderno" column="OrderNo"/>
+ <result property="itemcode" column="ItemCode"/>
</resultMap>
<sql id="selectServiceFunddetailVo">
- select ID, fundID, InfoId, DonorNo, DonorName, BeneficiaryName, BeneficiaryNo, UnitName, UnitNo, UnitUserNo, Title, OrderNo, ItemCode, IDCardType, IDCardNo, Sex, FamilyRelations, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexRegistForm, ApplyType,ApplyTypeName, ItemID, ItemName, ItemType, Amount, PrepaidAmount, TaxAmount, InvoiceCount, TaxedAmount, AttachCount, Quantity, Price, Remark, RecordStatus, del_flag, create_by, create_time, update_by, update_time, uploadflag, uploadtime,SERVICESSCOPE,SERVICESSCOPENAME,SERVICETYPE,SERVICETYPENAME from service_funddetail
+ select ID,
+ fundID,
+ InfoId,
+ DonorNo,
+ DonorName,
+ BeneficiaryName,
+ BeneficiaryNo,
+ UnitName,
+ UnitNo,
+ UnitUserNo,
+ Title,
+ OrderNo,
+ ItemCode,
+ IDCardType,
+ IDCardNo,
+ Sex,
+ FamilyRelations,
+ Phone,
+ DepositBank,
+ BankCardNo,
+ BranchBankName,
+ AnnexBankCard,
+ AnnexRegistForm,
+ ApplyType,
+ ApplyTypeName,
+ ItemID,
+ ItemName,
+ ItemType,
+ Amount,
+ PrepaidAmount,
+ TaxAmount,
+ InvoiceCount,
+ TaxedAmount,
+ AttachCount,
+ Quantity,
+ Price,
+ Remark,
+ RecordStatus,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ uploadflag,
+ uploadtime,
+ SERVICESSCOPE,
+ SERVICESSCOPENAME,
+ SERVICETYPE,
+ SERVICETYPENAME
+ from service_funddetail
</sql>
- <select id="selectServiceFunddetailList" parameterType="ServiceFunddetail" resultMap="ServiceFunddetailResult">
+ <select id="selectServiceFunddetailList" parameterType="com.ruoyi.project.domain.ServiceFunddetail"
+ resultMap="ServiceFunddetailResult">
<include refid="selectServiceFunddetailVo"/>
<where>
del_flag = '0'
- <if test="beneficiaryname != null and beneficiaryname != ''"> and BeneficiaryName like concat('%', #{beneficiaryname}, '%')</if>
- <if test="unitname != null and unitname != ''"> and UnitName like concat('%', #{unitname}, '%')</if>
- <if test="applytype != null and applytype != ''"> and ApplyType = #{applytype}</if>
- <if test="itemname != null and itemname != ''"> and ItemName like concat('%', #{itemname}, '%')</if>
- <if test="itemtype != null and itemtype != ''"> and ItemType = #{itemtype}</if>
- <if test="recordstatus != null and recordstatus != ''"> and RecordStatus = #{recordstatus}</if>
- <if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
- <if test="createTime != null "> and create_time = #{createTime}</if>
- <if test="uploadflag != null and uploadflag != ''"> and uploadflag = #{uploadflag}</if>
- <if test="uploadtime != null "> and uploadtime = #{uploadtime}</if>
- <if test="fundid != null and fundid != '' "> and fundID = #{fundid}</if>
+ <if test="beneficiaryname != null and beneficiaryname != ''">and BeneficiaryName like concat('%',
+ #{beneficiaryname}, '%')
+ </if>
+ <if test="unitname != null and unitname != ''">and UnitName like concat('%', #{unitname}, '%')</if>
+ <if test="applytype != null and applytype != ''">and ApplyType = #{applytype}</if>
+ <if test="itemname != null and itemname != ''">and ItemName like concat('%', #{itemname}, '%')</if>
+ <if test="itemtype != null and itemtype != ''">and ItemType = #{itemtype}</if>
+ <if test="recordstatus != null and recordstatus != ''">and RecordStatus = #{recordstatus}</if>
+ <if test="createBy != null and createBy != ''">and create_by = #{createBy}</if>
+ <if test="createTime != null ">and create_time = #{createTime}</if>
+ <if test="uploadflag != null and uploadflag != ''">and uploadflag = #{uploadflag}</if>
+ <if test="uploadtime != null ">and uploadtime = #{uploadtime}</if>
+ <if test="fundid != null and fundid != '' ">and fundID = #{fundid}</if>
</where>
</select>
@@ -109,8 +161,73 @@
where fundID = #{id} and ItemType = "12"
</select>
<select id="countItem" resultType="java.lang.Integer">
- select count(*) from service_funddetail
- where ItemID = #{itemid} and fundID = #{fundid} and del_flag = '0'
+ select count(*)
+ from service_funddetail
+ where ItemID = #{itemid}
+ and fundID = #{fundid}
+ and del_flag = '0'
</select>
+ <select id="getDataBybeneficiaryNo" parameterType="com.ruoyi.project.domain.FunddetailReqVo"
+ resultMap="ServiceFunddetailResult">
+ select a.ID,
+ a.fundID,
+ a.InfoId,
+ a.DonorNo,
+ a.DonorName,
+ a.BeneficiaryName,
+ a.BeneficiaryNo,
+ a.UnitName,
+ a.UnitNo,
+ a.UnitUserNo,
+ a.Title,
+ a.OrderNo,
+ a.ItemCode,
+ a.IDCardType,
+ a.IDCardNo,
+ a.Sex,
+ a.FamilyRelations,
+ a.Phone,
+ a.DepositBank,
+ a.BankCardNo,
+ a.BranchBankName,
+ a.AnnexBankCard,
+ a.AnnexRegistForm,
+ a.ApplyType,
+ a.ApplyTypeName,
+ a.ItemID,
+ a.ItemName,
+ a.ItemType,
+ a.Amount,
+ a.PrepaidAmount,
+ a.TaxAmount,
+ a.InvoiceCount,
+ a.TaxedAmount,
+ a.AttachCount,
+ a.Quantity,
+ a.Price,
+ a.Remark,
+ a.RecordStatus,
+ a.del_flag,
+ a.create_by,
+ a.create_time,
+ a.update_by,
+ a.update_time,
+ a.uploadflag,
+ a.uploadtime,
+ a.SERVICESSCOPE,
+ a.SERVICESSCOPENAME,
+ a.SERVICETYPE,
+ a.SERVICETYPENAME
+ from service_funddetail a,
+ service_fund b
+ where a.del_flag = '0'
+ and a.fundID = b.id
+ <if test="beneficiaryNo != null and beneficiaryNo != '' ">and a.beneficiaryNo = #{beneficiaryNo}</if>
+ and b.create_time >= #{starttime}
+ and b.create_time <= #{endtime}
+
+ </select>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3