From 577a605f5c649f6bbabb239e52a885f472f16660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Tue, 7 Sep 2021 17:32:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C-=E5=AF=BC?= =?UTF-8?q?=E5=87=BAexcel=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayIncomeContractController.java | 5 +- .../PaySpendingContractController.java | 64 ++++++++++++------- .../mapper/xml/PayIncomeContractMapper.xml | 38 ++++++----- 3 files changed, 61 insertions(+), 46 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index 15a70092..c75d93fa 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -97,9 +97,6 @@ public class PayIncomeContractController extends JeroController 50){ return Result.error("合同名称长度不能大于50个字符!"); } - if(!StringUtils.isBlank(projectName) && projectName.length() > 50){ - return Result.error("关联项目长度不能大于50个字符!"); - } // todo 缺少会议，会员项目，标协会员 Page page = new Page<>(pageNo, pageSize); IPage pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus,projectName,startTime,endTime); @@ -377,6 +374,8 @@ public class PayIncomeContractController extends JeroController{ String str = JSON.toJSONString(p); Map map = JSONObject.parseObject(str,Map.class); + map.put("contractDate",DateUtils.date2Str(p.getContractDate(),new SimpleDateFormat("yyyy-MM-dd"))); + map.put("terminationDate",DateUtils.date2Str(p.getTerminationDate(),new SimpleDateFormat("yyyy-MM-dd"))); map.put("opening",sysBaseAPI.translateDict("yn",String.valueOf(p.getOpening()))); map.put("accountStatus",sysBaseAPI.translateDict("revenue_contract_account_status",String.valueOf(p.getAccountStatus()))); map.put("pack",sysBaseAPI.translateDict("yn",String.valueOf(p.getPack()))); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java index d055c01e..eea95784 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java @@ -1,6 +1,7 @@ package com.jero.contract.controller; import java.util.Arrays; +import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -12,9 +13,13 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.entity.PaySpendingContract; import com.jero.contract.service.IPaySpendingContractService; +import com.jero.contract.vo.PayIncomeContractOutput; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -22,12 +27,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; /** - * @Description: pay_spending_contract + * @Description: 支出合同 * @Author: jeecg-boot * @Date: 2021-09-07 * @Version: V1.0 */ -@Api(tags="pay_spending_contract") +@Api(tags="支出合同") @RestController @RequestMapping("/contract/paySpendingContract") @Slf4j @@ -38,23 +43,36 @@ public class PaySpendingContractController extends JeroController queryPageList(PaySpendingContract paySpendingContract, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(paySpendingContract, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = paySpendingContractService.page(page, queryWrapper); - return Result.OK(pageList); + @RequestParam(name="startTime",required = false) String startTime, + @RequestParam(name="endTime",required = false) String endTime) { + if(!StringUtils.isBlank(paySpendingContract.getContractNum()) && paySpendingContract.getContractNum().length() > 50){ + return Result.error("合同编号长度不能大于50个字符!"); + } + if(!StringUtils.isBlank(paySpendingContract.getContractName()) && paySpendingContract.getContractName().length() > 50){ + return Result.error("合同名称长度不能大于50个字符!"); + } +// Page page = new Page<>(pageNo, pageSize); +// IPage pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus,projectName,startTime,endTime); +// if(!CollectionUtils.isEmpty(pageList.getRecords())){ +// List list = pageList.getRecords(); +// list.forEach(p->{ +// +// }); +// } + return Result.OK(null); } /** @@ -63,8 +81,8 @@ public class PaySpendingContractController extends JeroController add(@RequestBody PaySpendingContract paySpendingContract) { paySpendingContractService.save(paySpendingContract); @@ -77,8 +95,8 @@ public class PaySpendingContractController extends JeroController edit(@RequestBody PaySpendingContract paySpendingContract) { paySpendingContractService.updateById(paySpendingContract); @@ -91,8 +109,8 @@ public class PaySpendingContractController extends JeroController delete(@RequestParam(name="id",required=true) String id) { paySpendingContractService.removeById(id); @@ -105,8 +123,8 @@ public class PaySpendingContractController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.paySpendingContractService.removeByIds(Arrays.asList(ids.split(","))); @@ -119,8 +137,8 @@ public class PaySpendingContractController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { PaySpendingContract paySpendingContract = paySpendingContractService.getById(id); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml index 7406dd95..94890de4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml @@ -55,29 +55,27 @@ left join pay_working_group pwg ON pwg.id = pwgs.working_group_id WHERE pwg.working_group_project is not null and pwg.working_group_project!='' ) project ON project.id = pica.project_id - - - AND pic.contract_num LIKE CONCAT('%',CONCAT(#{payIncomeContract.contractNum},'%')) - - - AND pic.contract_name LIKE CONCAT('%',CONCAT(#{payIncomeContract.contractName},'%')) - - - AND pic.create_time >= #{startTime} - - - AND pic.create_time <= #{endTime} - - - AND pic.status = #{payIncomeContract.status} - - - AND pic.chargeStatus = #{chargeStatus} - - GROUP BY pic.id ) aa + + AND aa.contractNum LIKE CONCAT('%',CONCAT(#{payIncomeContract.contractNum},'%')) + + + AND aa.contractName LIKE CONCAT('%',CONCAT(#{payIncomeContract.contractName},'%')) + + + AND DATE_FORMAT(aa.createTime,'%Y-%m-%d') >= #{startTime} + + + AND DATE_FORMAT(aa.createTime,'%Y-%m-%d') <= #{endTime} + + + AND aa.status = #{payIncomeContract.status} + + + AND aa.chargeStatus = #{chargeStatus} + AND aa.associatedProject LIKE CONCAT('%',CONCAT(#{projectName},'%'))