资料维护开发

jero-boot-incoming-payment/pom.xml

@@ -28,10 +28,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-velocity</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

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<PayCaseCommittee,
 	 @Autowired
 	 private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
 
-	 @Autowired
+
-	 private PayCaseCommitteeSubitemMapper payCaseCommitteeSubitemMapper;
 	
 	/**
 	 * 分页列表查询
@@ -84,24 +84,24 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
 	/**
 	 *   添加
 	 *
-	 * @param payCaseCommitteeDTO
+	 *
-	 * @return
 	 */
+	@Transactional
 	@AutoLog(value = "分标委表-添加")
 	@ApiOperation(value="分标委表-添加", notes="分标委表-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add( @Valid @RequestBody PayCaseCommitteeDTO payCaseCommitteeDTO) {
 		LambdaQueryWrapper<PayCaseCommittee> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(PayCaseCommittee::getName,payCaseCommitteeDTO.getName());
-		PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper);
+			PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper,false);
-		if (ObjectUtils.isEmpty(one)) {
+			if (ObjectUtils.isEmpty(one)) {
-			PayCaseCommittee payCaseCommittee = new PayCaseCommittee();
+				PayCaseCommittee payCaseCommittee = new PayCaseCommittee();
-			BeanUtils.copyProperties(payCaseCommitteeDTO, payCaseCommittee);
+				BeanUtils.copyProperties(payCaseCommitteeDTO, payCaseCommittee);
-			payCaseCommitteeService.save(payCaseCommittee);
+				payCaseCommitteeService.save(payCaseCommittee);
-			return Result.OK("添加成功！");
+				return Result.OK("添加成功！");
-		}else {
+			}else {
-			return Result.error("分标委表名已存在");
+				return Result.error("分标委表名已存在");
-		}
+			}
 
 	}
 
@@ -110,43 +110,42 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
 	/**
 	 *  编辑
 	 *
-	 * @param payCaseCommitteeUpdateDTO
-	 * @return
 	 */
+	@Transactional
 	@AutoLog(value = "分标委表-编辑")
 	@ApiOperation(value="分标委表-编辑", notes="分标委表-编辑")
 	@PostMapping(value = "/edit")
 	public Result<?> edit( @Valid @RequestBody PayCaseCommitteeUpdateDTO payCaseCommitteeUpdateDTO) {
 		LambdaQueryWrapper<PayCaseCommittee> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(PayCaseCommittee::getName,payCaseCommitteeUpdateDTO.getName());
-		PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper);
+
-		if (ObjectUtils.isEmpty(one)) {
+			PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper,false);
-			PayCaseCommittee payCaseCommittee = new PayCaseCommittee();
+			if (ObjectUtils.isEmpty(one)) {
-			BeanUtils.copyProperties(payCaseCommitteeUpdateDTO,payCaseCommittee);
+				PayCaseCommittee payCaseCommittee = new PayCaseCommittee();
-			payCaseCommitteeService.updateById(payCaseCommittee);
+				BeanUtils.copyProperties(payCaseCommitteeUpdateDTO,payCaseCommittee);
-			return Result.OK("编辑成功!");
+				payCaseCommitteeService.updateById(payCaseCommittee);
-		}else {
+				return Result.OK("编辑成功!");
-			return Result.error("分标委表名已存在");
+			}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<PayCaseCommitteeSubitem> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(PayCaseCommitteeSubitem::getCommitteeId,id);
-		List<PayCaseCommitteeSubitem> payCaseCommitteeSubitems = payCaseCommitteeSubitemMapper.selectList(queryWrapper);
+		List<PayCaseCommitteeSubitem> payCaseCommitteeSubitems = payCaseCommitteeSubitemService.selectList(queryWrapper);
 		if(payCaseCommitteeSubitems.size()>0){
 			return Result.error("群组下还有数据，不可删除!");
-		}
+		}payCaseCommitteeService.removeById(id);
-		boolean b = payCaseCommitteeService.removeById(id);
 		return Result.OK("删除成功!");
 	}
 
@@ -159,8 +158,8 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
 	 @ApiOperation(value="分标委表-导出", notes="分标委表-导出")
 	 @GetMapping(value = "/exportXls",produces = "text/text;charset=utf-8")
 	 public ModelAndView customExportXlsList() {
-		 QueryWrapper<PayCaseCommitteeSubitem> queryWrapper = Wrappers.query();
+		 QueryWrapper<PayCaseCommitteeExcel> queryWrapper = Wrappers.query();
-		 List<PayCaseCommitteeExcel> list = payCaseCommitteeSubitemMapper.listExcel(queryWrapper);
+		 List<PayCaseCommitteeExcel> list = payCaseCommitteeSubitemService.listExcel(queryWrapper);
 		 // Step.3 AutoPoi 导出Excel
 		 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
 		 mv.addObject(NormalExcelConstants.FILE_NAME, "分标委表"); //此处设置的filename无效 ,前端会重更新设置一下

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<PayCaseCom
 	@Autowired
 	private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
 
-	 @Resource
+
-	 private PayCaseCommitteeSubitemMapper payCaseCommitteeSubitemMapper;
 
 
 	/**
@@ -69,7 +69,7 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 				.like(StringUtils.isNotBlank(companyName), "pm.company_name", companyName)
 				.like(StringUtils.isNotBlank(fenBiaoWeiName), "pe.name", fenBiaoWeiName);
 		Page<PayCaseCommitteeSubitem> page = new Page<>(pageNo, pageSize);
-		IPage<FindByName> pageList = payCaseCommitteeSubitemMapper.list(page, queryWrapper);
+		IPage<FindByName> pageList = payCaseCommitteeSubitemService.list3(page, queryWrapper);
 		List<FindByName> records = pageList.getRecords();
 		if (!CollectionUtils.isEmpty(records)) {
 			try {
@@ -99,7 +99,7 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 	public Result<?> queryPageList(@RequestParam(name="id") String id) {
 		QueryWrapper<PayCaseCommitteeSubitem> queryWrapper = Wrappers.query();
 		queryWrapper.eq("pm.committee_id", id);
-		List<payCaseCommitteeSubitemVO> list = payCaseCommitteeSubitemMapper.list2(queryWrapper);
+		List<payCaseCommitteeSubitemVO> list = payCaseCommitteeSubitemService.list2(queryWrapper);
 		if (!CollectionUtils.isEmpty(list)) {
 			try {
 				list.forEach(p -> {
@@ -137,6 +137,7 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 	/**
 	 *   添加
 	 */
+	@Transactional
 	@AutoLog(value = "分标委成员表-添加")
 	@ApiOperation(value="分标委成员表-添加", notes="分标委成员表-添加")
 	@PostMapping(value = "/add")
@@ -150,6 +151,7 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 	 /**
 	  *   通过id删除
 	  */
+	 @Transactional
 	 @AutoLog(value = "分标委成员表-通过id删除")
 	 @ApiOperation(value="分标委成员表-通过id删除", notes="分标委成员表-通过id删除")
 	 @GetMapping(value = "/delete")
@@ -162,6 +164,7 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 	  *  批量删除
 	  *
 	  */
+	 @Transactional
 	 @AutoLog(value = "分标委成员表-批量删除")
 	 @ApiOperation(value="分标委成员表-批量删除", notes="分标委成员表-批量删除")
 	 @GetMapping(value = "/deleteBatch")

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java

@@ -24,6 +24,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
@@ -98,6 +99,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
 	  * @param payDataDirectoryDTO
 	  * @return
 	  */
+	 @Transactional
 	 @AutoLog(value = "资料目录管理-新增")
 	 @ApiOperation(value = "资料目录管理-新增", notes = "资料目录管理-新增")
 	 @PostMapping(value = "/add")
@@ -125,6 +127,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
 	  * @param ids
 	  * @return
 	  */
+	 @Transactional
 	 @AutoLog(value = "资料目录管理-批量删除")
 	 @ApiOperation(value = "资料目录管理-批量删除", notes = "资料目录管理-批量删除")
 	 @GetMapping(value = "/deleteBatch")
@@ -247,6 +250,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
 	  * @param payDataDirectoryDTO
 	  * @return
 	  */
+	 @Transactional
 	 @AutoLog(value = "资料目录管理-编辑")
 	 @ApiOperation(value="资料目录管理-编辑", notes="资料目录管理-编辑")
 	 @PostMapping(value = "/edit")
@@ -258,7 +262,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
 	 }
 
 	 /**
-	  *   通过id删除
+	  *   通过id查询
 	  *
 	  * @param id
 	  * @return
@@ -266,7 +270,7 @@ public class PayDataDirectoryController extends JeroController<PayDataDirectory,
 	 @AutoLog(value = "资料目录管理-通过id查询")
 	 @ApiOperation(value="资料目录管理-通过id查询", notes="资料目录管理-通过id查询")
 	 @GetMapping(value = "/getOne")
-	 public Result<?> 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);
 	 }

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<PayDataFile, IPayDataF
 	@Autowired
 	private IPayDataFileService payDataFileService;
 
-	@Resource
-	private PayDataFileMapper payDataFileMapper;
 
 	@Resource
 	private IOSSFileService iossFileService;
@@ -100,7 +93,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 		queryWrapper.eq("pd.type",1);
 		queryWrapper.orderByDesc("pf.create_time");
 		Page<PayDataFile> page = new Page<>(pageNo, pageSize);
-		IPage<QueryFileList2> pageList = payDataFileMapper.pageData(page, queryWrapper);
+		IPage<QueryFileList2> pageList = payDataFileService.pageData(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 
@@ -131,7 +124,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 //		queryWrapper.orderByDesc("pf.create_time");
 //		queryWrapper.eq("pd.type",2);
 //		Page<PayDataFile> page = new Page<>(pageNo, pageSize);
-		IPage<QueryFileList> pageList = payDataFileMapper.pageDataMeeting(page,queryWrapper);
+		IPage<QueryFileList> pageList = payDataFileService.pageDataMeeting(page,queryWrapper);
 		return Result.OK(pageList);
 	}
 
@@ -225,6 +218,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 	 *  批量删除
 	 *
 	 */
+	@Transactional
 	@AutoLog(value = "资料维护(资料和会议)-批量删除")
 	@ApiOperation(value="资料维护(资料和会议)-批量删除", notes="资料维护(资料和会议)-批量删除")
 	@GetMapping(value = "/deleteBatch")
@@ -274,7 +268,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 		QueryWrapper<queryPeopleByCompanyIdAndMeetingId> QueryWrapper = new QueryWrapper<>();
 		QueryWrapper.eq("ps.company_id", companyId);
 		QueryWrapper.eq("ps.meeting_id", meetingId);
-		List<queryPeopleByCompanyIdAndMeetingId> list = payDataFileMapper.queryPeopleByCompanyIdAndMeetingId(QueryWrapper);
+		List<queryPeopleByCompanyIdAndMeetingId> list = payDataFileService.queryPeopleByCompanyIdAndMeetingId(QueryWrapper);
 		if (!CollectionUtils.isEmpty(list)) {
 			try {
 				list.forEach(p -> {
@@ -384,7 +378,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 
 	/**
 	 * 打包下载
-	 * @param paths 目前处理是文件绝对路径， TODO 此处可以改成 List<File> 去处理 或者网络图片下载流
+	 * @param paths 目前处理是文件绝对路径.
 	 */
 	public static void zipFileDownload(List<String> paths){
 		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java

@@ -122,7 +122,7 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
 		 // Step.3 AutoPoi 导出Excel
 		 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
 		 mv.addObject(NormalExcelConstants.FILE_NAME, "资料下载记录"); //此处设置的filename无效 ,前端会重更新设置一下
-		 mv.addObject(NormalExcelConstants.CLASS, PayCaseCommitteeExcel.class);
+		 mv.addObject(NormalExcelConstants.CLASS, PayFileDownloadRecord.class);
 		 //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
 		 ExportParams exportParams=new ExportParams("资料下载记录", "资料下载记录");
 		 exportParams.setImageBasePath(upLoadPath);

jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayFileDownloadRecord.java

@@ -57,8 +57,10 @@ public class PayFileDownloadRecord implements Serializable {
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
 	/**创建时间*/
+
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
+    @Excel(name = "下载时间", width = 15,exportFormat = "yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
 	/**更新人*/

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java

@@ -24,11 +24,11 @@ import java.util.List;
  */
 public interface PayCaseCommitteeSubitemMapper extends BaseMapper<PayCaseCommitteeSubitem> {
 
-    Page<FindByName> list (IPage<PayCaseCommitteeSubitem> page, @Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
+    Page<FindByName> list3 (IPage<PayCaseCommitteeSubitem> page, @Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
 
     List<payCaseCommitteeSubitemVO> list2 (@Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
 
-    List<PayCaseCommitteeExcel> listExcel(@Param(Constants.WRAPPER) QueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
+    List<PayCaseCommitteeExcel> listExcel(@Param(Constants.WRAPPER) QueryWrapper<PayCaseCommitteeExcel> queryWrapper);
 
 }
 

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml

@@ -12,7 +12,7 @@
             <result property="peopleName" column="peopleName"></result>
         </collection>
     </resultMap>
-    <select id="list"  resultMap="people">
+    <select id="list3"  resultMap="people">
        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

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<PayCaseCommitteeSubitem> {
 
 
+    List<PayCaseCommitteeSubitem> selectList(LambdaQueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
+
+    List<PayCaseCommitteeExcel> listExcel(QueryWrapper<PayCaseCommitteeExcel> queryWrapper);
+
+    List<payCaseCommitteeSubitemVO> list2(QueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
+
+    IPage<FindByName> list3(Page<PayCaseCommitteeSubitem> page, QueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
 }

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.*;
-import com.jero.data.entity.QueryFileList2;
+
+import java.util.List;
 
 /**
  * @Description: pay_data_file
@@ -17,4 +18,9 @@ import com.jero.data.entity.QueryFileList2;
 public interface IPayDataFileService extends IService<PayDataFile> {
 
 
+    IPage<QueryFileList2> pageData(Page<PayDataFile> page, QueryWrapper<QueryFileList2> queryWrapper);
+
+    IPage<QueryFileList> pageDataMeeting(Page<PayDataFile> page, QueryWrapper<QueryFileListBySearch> queryWrapper);
+
+    List<queryPeopleByCompanyIdAndMeetingId> queryPeopleByCompanyIdAndMeetingId(QueryWrapper<queryPeopleByCompanyIdAndMeetingId> queryWrapper);
 }

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<PayCaseCommitteeSubitemMapper, PayCaseCommitteeSubitem> implements IPayCaseCommitteeSubitemService {
 
+    @Autowired
+    private PayCaseCommitteeSubitemMapper payCaseCommitteeSubitemMapper;
 
+    @Override
+    public List<PayCaseCommitteeSubitem> selectList(LambdaQueryWrapper<PayCaseCommitteeSubitem> queryWrapper) {
+        return payCaseCommitteeSubitemMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public List<PayCaseCommitteeExcel> listExcel(QueryWrapper<PayCaseCommitteeExcel> queryWrapper) {
+        return payCaseCommitteeSubitemMapper.listExcel(queryWrapper);
+    }
+
+    @Override
+    public List<payCaseCommitteeSubitemVO> list2(QueryWrapper<PayCaseCommitteeSubitem> queryWrapper) {
+        return payCaseCommitteeSubitemMapper.list2(queryWrapper);
+    }
+
+    @Override
+    public IPage<FindByName> list3(Page<PayCaseCommitteeSubitem> page, QueryWrapper<PayCaseCommitteeSubitem> queryWrapper) {
+        return payCaseCommitteeSubitemMapper.list3(page, queryWrapper);
+    }
 }

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<PayDataFileMapper, PayDataFile> implements IPayDataFileService {
+    @Autowired
+    private PayDataFileMapper payDataFileMapper;
+    @Override
+    public IPage<QueryFileList2> pageData(Page<PayDataFile> page, QueryWrapper<QueryFileList2> queryWrapper) {
+        return payDataFileMapper.pageData(page,queryWrapper);
+    }
 
+    @Override
+    public IPage<QueryFileList> pageDataMeeting(Page<PayDataFile> page, QueryWrapper<QueryFileListBySearch> queryWrapper) {
+        return payDataFileMapper.pageDataMeeting(page,queryWrapper);
+    }
+
+    @Override
+    public List<queryPeopleByCompanyIdAndMeetingId> queryPeopleByCompanyIdAndMeetingId(QueryWrapper<queryPeopleByCompanyIdAndMeetingId> queryWrapper) {
+        return payDataFileMapper.queryPeopleByCompanyIdAndMeetingId(queryWrapper);
+    }
 }