From f31e74dad6ec9d1e078b1add0dffd7464cc163ea Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Mon, 13 Dec 2021 10:20:36 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=9C=A8=E7=A0=94=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayResearchProjectController.java | 155 ++++++++++++++++++ .../jero/data/entity/PayResearchProject.java | 66 ++++++++ .../data/mapper/PayResearchProjectMapper.java | 14 ++ .../xml/PayCaseCouncilSubitemMapper.xml | 4 +- .../xml/PayDistributionRecordMapper.xml | 4 +- .../xml/PayFileDownloadRecordMapper.xml | 4 +- .../mapper/xml/PayResearchProjectMapper.xml | 5 + .../service/IPayResearchProjectService.java | 14 ++ .../impl/PayResearchProjectServiceImpl.java | 19 +++ .../entity/PayWorkGroupSubletStatistics.java | 2 +- .../entity/AllProjectStatistics.java | 2 +- .../entity/CompanyComeMoneyDetail.java | 2 +- .../entity/PrincipalPeopleDetail.java | 2 +- 13 files changed, 283 insertions(+), 10 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayResearchProjectController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayResearchProject.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayResearchProjectMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayResearchProjectMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayResearchProjectService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayResearchProjectServiceImpl.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayResearchProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayResearchProjectController.java new file mode 100644 index 00000000..32108008 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayResearchProjectController.java @@ -0,0 +1,155 @@ +package com.jero.data.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +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.data.entity.PayResearchProject; +import com.jero.data.service.IPayResearchProjectService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + + /** + * @Description: pay_research_project + * @Author: jeecg-boot + * @Date: 2021-12-13 + * @Version: V1.0 + */ +@Api(tags="pay_research_project") +@RestController +@RequestMapping("/payResearchProject/payResearchProject") +@Slf4j +public class PayResearchProjectController extends JeroController { + @Autowired + private IPayResearchProjectService payResearchProjectService; + + /** + * 分页列表查询 + * + * @param payResearchProject + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "pay_research_project-分页列表查询") + @ApiOperation(value="pay_research_project-分页列表查询", notes="pay_research_project-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PayResearchProject payResearchProject, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payResearchProject, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = payResearchProjectService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param payResearchProject + * @return + */ + @AutoLog(value = "pay_research_project-添加") + @ApiOperation(value="pay_research_project-添加", notes="pay_research_project-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayResearchProject payResearchProject) { + payResearchProjectService.save(payResearchProject); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param payResearchProject + * @return + */ + @AutoLog(value = "pay_research_project-编辑") + @ApiOperation(value="pay_research_project-编辑", notes="pay_research_project-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody PayResearchProject payResearchProject) { + payResearchProjectService.updateById(payResearchProject); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "pay_research_project-通过id删除") + @ApiOperation(value="pay_research_project-通过id删除", notes="pay_research_project-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + payResearchProjectService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "pay_research_project-批量删除") + @ApiOperation(value="pay_research_project-批量删除", notes="pay_research_project-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.payResearchProjectService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "pay_research_project-通过id查询") + @ApiOperation(value="pay_research_project-通过id查询", notes="pay_research_project-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PayResearchProject payResearchProject = payResearchProjectService.getById(id); + if(payResearchProject==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payResearchProject); + } + + /** + * 导出excel + * + * @param request + * @param payResearchProject + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PayResearchProject payResearchProject) { + return super.exportXls(request, payResearchProject, PayResearchProject.class, "pay_research_project"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PayResearchProject.class); + } + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayResearchProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayResearchProject.java new file mode 100644 index 00000000..e081b32e --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayResearchProject.java @@ -0,0 +1,66 @@ +package com.jero.data.entity; + +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: pay_research_project + * @Author: jeecg-boot + * @Date: 2021-12-13 + * @Version: V1.0 + */ +@Data +@TableName("pay_research_project") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_research_project对象", description="pay_research_project") +public class PayResearchProject implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**项目名称*/ + @Excel(name = "项目名称", width = 15) + @ApiModelProperty(value = "项目名称") + private java.lang.String projectName; + /**主要起草单位*/ + @Excel(name = "主要起草单位", width = 15) + @ApiModelProperty(value = "主要起草单位") + private java.lang.String draftCompany; + /**过程文件*/ + @Excel(name = "过程文件", width = 15) + @ApiModelProperty(value = "过程文件") + private java.lang.String files; + /**项目进度*/ + @Excel(name = "项目进度", width = 15) + @ApiModelProperty(value = "项目进度") + private java.lang.String projectSchedule; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建时间") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新时间") + private java.util.Date updateTime; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayResearchProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayResearchProjectMapper.java new file mode 100644 index 00000000..502c4be4 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayResearchProjectMapper.java @@ -0,0 +1,14 @@ +package com.jero.data.mapper; + +import com.jero.data.entity.PayResearchProject; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: pay_research_project + * @Author: jeecg-boot + * @Date: 2021-12-13 + * @Version: V1.0 + */ +public interface PayResearchProjectMapper extends BaseMapper { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml index 402e6e5d..d055cd52 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml @@ -14,7 +14,7 @@