From 8cc6b25e738f0a8284b48f2d9f7306baba5c6619 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Tue, 7 Sep 2021 11:09:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=96=99=E7=BB=B4=E6=8A=A4=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot-incoming-payment/pom.xml | 4 -- .../PayCaseCommitteeController.java | 63 +++++++++---------- .../PayCaseCommitteeSubitemController.java | 11 ++-- .../PayDataDirectoryController.java | 8 ++- .../controller/PayDataFileController.java | 16 ++--- .../PayFileDownloadRecordController.java | 2 +- .../data/entity/PayFileDownloadRecord.java | 2 + .../mapper/PayCaseCommitteeSubitemMapper.java | 4 +- .../xml/PayCaseCommitteeSubitemMapper.xml | 2 +- .../IPayCaseCommitteeSubitemService.java | 16 +++++ .../data/service/IPayDataFileService.java | 10 ++- .../PayCaseCommitteeSubitemServiceImpl.java | 31 +++++++++ .../service/impl/PayDataFileServiceImpl.java | 23 ++++++- 13 files changed, 132 insertions(+), 60 deletions(-) diff --git a/jero-boot-incoming-payment/pom.xml b/jero-boot-incoming-payment/pom.xml index d852f79e..bd3249df 100644 --- a/jero-boot-incoming-payment/pom.xml +++ b/jero-boot-incoming-payment/pom.xml @@ -28,10 +28,6 @@ org.springframework.boot spring-boot-starter-mail - - org.springframework.boot - spring-boot-starter-velocity - org.springframework.boot spring-boot-starter-test diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java index ab150c17..3b020afc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java @@ -30,6 +30,7 @@ import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -56,8 +57,7 @@ public class PayCaseCommitteeController extends JeroController add( @Valid @RequestBody PayCaseCommitteeDTO payCaseCommitteeDTO) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(PayCaseCommittee::getName,payCaseCommitteeDTO.getName()); - PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper); - if (ObjectUtils.isEmpty(one)) { - PayCaseCommittee payCaseCommittee = new PayCaseCommittee(); - BeanUtils.copyProperties(payCaseCommitteeDTO, payCaseCommittee); - payCaseCommitteeService.save(payCaseCommittee); - return Result.OK("添加成功！"); - }else { - return Result.error("分标委表名已存在"); - } + PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper,false); + if (ObjectUtils.isEmpty(one)) { + PayCaseCommittee payCaseCommittee = new PayCaseCommittee(); + BeanUtils.copyProperties(payCaseCommitteeDTO, payCaseCommittee); + payCaseCommitteeService.save(payCaseCommittee); + return Result.OK("添加成功！"); + }else { + return Result.error("分标委表名已存在"); + } } @@ -110,43 +110,42 @@ public class PayCaseCommitteeController extends JeroController edit( @Valid @RequestBody PayCaseCommitteeUpdateDTO payCaseCommitteeUpdateDTO) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(PayCaseCommittee::getName,payCaseCommitteeUpdateDTO.getName()); - PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper); - if (ObjectUtils.isEmpty(one)) { - PayCaseCommittee payCaseCommittee = new PayCaseCommittee(); - BeanUtils.copyProperties(payCaseCommitteeUpdateDTO,payCaseCommittee); - payCaseCommitteeService.updateById(payCaseCommittee); - return Result.OK("编辑成功!"); - }else { - return Result.error("分标委表名已存在"); - } + + PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper,false); + if (ObjectUtils.isEmpty(one)) { + PayCaseCommittee payCaseCommittee = new PayCaseCommittee(); + BeanUtils.copyProperties(payCaseCommitteeUpdateDTO,payCaseCommittee); + payCaseCommitteeService.updateById(payCaseCommittee); + return Result.OK("编辑成功!"); + }else { + return Result.error("分标委表名已存在"); + } + } /** * 通过id删除 * - * @param id - * @return */ + @Transactional @AutoLog(value = "分标委表-通过id删除") @ApiOperation(value="分标委表-通过id删除", notes="分标委表-通过id删除") @GetMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestParam(name="id") String id) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(PayCaseCommitteeSubitem::getCommitteeId,id); - List payCaseCommitteeSubitems = payCaseCommitteeSubitemMapper.selectList(queryWrapper); + List payCaseCommitteeSubitems = payCaseCommitteeSubitemService.selectList(queryWrapper); if(payCaseCommitteeSubitems.size()>0){ return Result.error("群组下还有数据，不可删除!"); - } - boolean b = payCaseCommitteeService.removeById(id); + }payCaseCommitteeService.removeById(id); return Result.OK("删除成功!"); } @@ -159,8 +158,8 @@ public class PayCaseCommitteeController extends JeroController queryWrapper = Wrappers.query(); - List list = payCaseCommitteeSubitemMapper.listExcel(queryWrapper); + QueryWrapper queryWrapper = Wrappers.query(); + List list = payCaseCommitteeSubitemService.listExcel(queryWrapper); // Step.3 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); mv.addObject(NormalExcelConstants.FILE_NAME, "分标委表"); //此处设置的filename无效 ,前端会重更新设置一下 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java index 05063e3a..2c7ef102 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java @@ -24,6 +24,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -46,8 +47,7 @@ public class PayCaseCommitteeSubitemController extends JeroController page = new Page<>(pageNo, pageSize); - IPage pageList = payCaseCommitteeSubitemMapper.list(page, queryWrapper); + IPage pageList = payCaseCommitteeSubitemService.list3(page, queryWrapper); List records = pageList.getRecords(); if (!CollectionUtils.isEmpty(records)) { try { @@ -99,7 +99,7 @@ public class PayCaseCommitteeSubitemController extends JeroController queryPageList(@RequestParam(name="id") String id) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("pm.committee_id", id); - List list = payCaseCommitteeSubitemMapper.list2(queryWrapper); + List list = payCaseCommitteeSubitemService.list2(queryWrapper); if (!CollectionUtils.isEmpty(list)) { try { list.forEach(p -> { @@ -137,6 +137,7 @@ public class PayCaseCommitteeSubitemController extends JeroController delete(@RequestParam(name="id",required=true) String id) { + public Result getOne(@RequestParam(name="id") String id) { PayDataDirectory payDataDirectory = payDataDirectoryService.getById(id); return Result.OK(payDataDirectory); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java index 706de8d6..70eb3aab 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java @@ -8,12 +8,10 @@ import java.util.List; import java.util.UUID; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import javax.activation.MimetypesFileTypeMap; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; @@ -37,14 +35,11 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.io.FileSystemResource; -import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -65,8 +60,6 @@ public class PayDataFileController extends JeroController page = new Page<>(pageNo, pageSize); - IPage pageList = payDataFileMapper.pageData(page, queryWrapper); + IPage pageList = payDataFileService.pageData(page, queryWrapper); return Result.OK(pageList); } @@ -131,7 +124,7 @@ public class PayDataFileController extends JeroController page = new Page<>(pageNo, pageSize); - IPage pageList = payDataFileMapper.pageDataMeeting(page,queryWrapper); + IPage pageList = payDataFileService.pageDataMeeting(page,queryWrapper); return Result.OK(pageList); } @@ -225,6 +218,7 @@ public class PayDataFileController extends JeroController QueryWrapper = new QueryWrapper<>(); QueryWrapper.eq("ps.company_id", companyId); QueryWrapper.eq("ps.meeting_id", meetingId); - List list = payDataFileMapper.queryPeopleByCompanyIdAndMeetingId(QueryWrapper); + List list = payDataFileService.queryPeopleByCompanyIdAndMeetingId(QueryWrapper); if (!CollectionUtils.isEmpty(list)) { try { list.forEach(p -> { @@ -384,7 +378,7 @@ public class PayDataFileController extends JeroController 去处理 或者网络图片下载流 + * @param paths 目前处理是文件绝对路径. */ public static void zipFileDownload(List paths){ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java index cc6540e6..0a446a31 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java @@ -122,7 +122,7 @@ public class PayFileDownloadRecordController extends JeroController { - Page list (IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); + Page list3 (IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); List list2 (@Param(Constants.WRAPPER) Wrapper wrapper); - List listExcel(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + List listExcel(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml index 522d376a..2b07988a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml @@ -12,7 +12,7 @@ - SELECT pe.id as id,pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pe.name as name,pm.id as childrenId from pay_case_committee pe diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java index 0ac2891f..56a8c777 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java @@ -1,8 +1,17 @@ package com.jero.data.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.data.entity.FindByName; +import com.jero.data.entity.PayCaseCommitteeExcel; import com.jero.data.entity.PayCaseCommitteeSubitem; +import com.jero.data.entity.VO.payCaseCommitteeSubitemVO; + +import java.util.List; /** * @Description: pay_case_committee_subitem @@ -13,4 +22,11 @@ import com.jero.data.entity.PayCaseCommitteeSubitem; public interface IPayCaseCommitteeSubitemService extends IService { + List selectList(LambdaQueryWrapper queryWrapper); + + List listExcel(QueryWrapper queryWrapper); + + List list2(QueryWrapper queryWrapper); + + IPage list3(Page page, QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayDataFileService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayDataFileService.java index 97e20178..fac77a4b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayDataFileService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayDataFileService.java @@ -5,8 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.data.entity.PayDataFile; -import com.jero.data.entity.QueryFileList2; +import com.jero.data.entity.*; + +import java.util.List; /** * @Description: pay_data_file @@ -17,4 +18,9 @@ import com.jero.data.entity.QueryFileList2; public interface IPayDataFileService extends IService { + IPage pageData(Page page, QueryWrapper queryWrapper); + + IPage pageDataMeeting(Page page, QueryWrapper queryWrapper); + + List queryPeopleByCompanyIdAndMeetingId(QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java index 7a2e1cb0..38b13ed2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java @@ -1,12 +1,22 @@ package com.jero.data.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.data.entity.FindByName; +import com.jero.data.entity.PayCaseCommitteeExcel; import com.jero.data.entity.PayCaseCommitteeSubitem; +import com.jero.data.entity.VO.payCaseCommitteeSubitemVO; import com.jero.data.mapper.PayCaseCommitteeSubitemMapper; import com.jero.data.service.IPayCaseCommitteeSubitemService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description: pay_case_committee_subitem @@ -17,5 +27,26 @@ import org.springframework.stereotype.Service; @Service public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl implements IPayCaseCommitteeSubitemService { + @Autowired + private PayCaseCommitteeSubitemMapper payCaseCommitteeSubitemMapper; + @Override + public List selectList(LambdaQueryWrapper queryWrapper) { + return payCaseCommitteeSubitemMapper.selectList(queryWrapper); + } + + @Override + public List listExcel(QueryWrapper queryWrapper) { + return payCaseCommitteeSubitemMapper.listExcel(queryWrapper); + } + + @Override + public List list2(QueryWrapper queryWrapper) { + return payCaseCommitteeSubitemMapper.list2(queryWrapper); + } + + @Override + public IPage list3(Page page, QueryWrapper queryWrapper) { + return payCaseCommitteeSubitemMapper.list3(page, queryWrapper); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayDataFileServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayDataFileServiceImpl.java index 4de3ddeb..81d3294b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayDataFileServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayDataFileServiceImpl.java @@ -1,12 +1,18 @@ package com.jero.data.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.data.entity.PayDataFile; +import com.jero.data.entity.*; import com.jero.data.mapper.PayDataFileMapper; import com.jero.data.service.IPayDataFileService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description: pay_data_file @@ -16,5 +22,20 @@ import org.springframework.stereotype.Service; */ @Service public class PayDataFileServiceImpl extends ServiceImpl implements IPayDataFileService { + @Autowired + private PayDataFileMapper payDataFileMapper; + @Override + public IPage pageData(Page page, QueryWrapper queryWrapper) { + return payDataFileMapper.pageData(page,queryWrapper); + } + @Override + public IPage pageDataMeeting(Page page, QueryWrapper queryWrapper) { + return payDataFileMapper.pageDataMeeting(page,queryWrapper); + } + + @Override + public List queryPeopleByCompanyIdAndMeetingId(QueryWrapper queryWrapper) { + return payDataFileMapper.queryPeopleByCompanyIdAndMeetingId(queryWrapper); + } }