LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:在研项目

Browse Source
This commit is contained in:
zhangqinlin
2021-12-13 10:20:36 +08:00
parent 444c161d54
commit f31e74dad6
13 changed files with 283 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayResearchProjectController.java
+155
View File
@@ -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<PayResearchProject, IPayResearchProjectService> {
@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<PayResearchProject> queryWrapper = QueryGenerator.initQueryWrapper(payResearchProject, req.getParameterMap());
Page<PayResearchProject> page = new Page<PayResearchProject>(pageNo, pageSize);
IPage<PayResearchProject> 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);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayResearchProject.java
+66
View File
@@ -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;
}
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayResearchProjectMapper.java
+14
View File
@@ -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<PayResearchProject> {
}
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
+2 -2
View File
@@ -14,7 +14,7 @@
</collection>
</resultMap>
<select id="listThree" resultMap="people">
SELECT pe.id as id,pe.name as name,pe.abbreviation,pe.remarks,#{companyNames} as companyName,#{contactsNames} as tname
SELECT pe.id as id,pe.name as name,pe.remarks,#{companyNames} as companyName,#{contactsNames} as tname
from
pay_case_council pe
left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id)
@@ -40,7 +40,7 @@
pay_case_council_subitem pm
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) left join pay_company_management pcm on(pm.company_id=pcm.id)
<where>
pm.committee_id = #{pid}
pm.council_id = #{pid}
<if test=" companyName!=null and companyName != ''">
AND pcm.company_name LIKE CONCAT('%',#{companyName},'%')
</if>
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayDistributionRecordMapper.xml
+2 -2
View File
@@ -1,5 +1,5 @@
<?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">
<mapper namespace="org.jeecg.modules.demo.payDistributionRecord.mapper.PayDistributionRecordMapper">
<mapper namespace="com.jero.data.mapper.PayDistributionRecordMapper">
</mapper>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayFileDownloadRecordMapper.xml
+2 -2
View File
@@ -1,5 +1,5 @@
<?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">
<mapper namespace="org.jeecg.modules.demo.fileDownloadRecord.mapper.PayFileDownloadRecordMapper">
<mapper namespace="com.jero.data.mapper.PayFileDownloadRecordMapper">
</mapper>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayResearchProjectMapper.xml
+5
View File
@@ -0,0 +1,5 @@
<?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">
<mapper namespace="com.jero.data.mapper.PayResearchProjectMapper">
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayResearchProjectService.java
+14
View File
@@ -0,0 +1,14 @@
package com.jero.data.service;
import com.jero.data.entity.PayResearchProject;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: pay_research_project
* @Author: jeecg-boot
* @Date: 2021-12-13
* @Version: V1.0
*/
public interface IPayResearchProjectService extends IService<PayResearchProject> {
}
jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayResearchProjectServiceImpl.java
+19
View File
@@ -0,0 +1,19 @@
package com.jero.data.service.impl;
import com.jero.data.entity.PayResearchProject;
import com.jero.data.mapper.PayResearchProjectMapper;
import com.jero.data.service.IPayResearchProjectService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: pay_research_project
* @Author: jeecg-boot
* @Date: 2021-12-13
* @Version: V1.0
*/
@Service
public class PayResearchProjectServiceImpl extends ServiceImpl<PayResearchProjectMapper, PayResearchProject> implements IPayResearchProjectService {
}
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class PayWorkGroupSubletStatistics {
private String chargeUse_text;
@ApiModelProperty(value = "打包")
private String pack;
private Integer pack;
@Excel(name = "打包", width = 15)
private String packText;
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class AllProjectStatistics {
@ApiModelProperty(value = "打包")
private String pack;
private Integer pack;
@TableField(exist = false)
@Excel(name = "打包", width = 15)
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class CompanyComeMoneyDetail {
private String chargeUse;
@ApiModelProperty(value = "打包")
private String pack;
private Integer pack;
@Excel(name = "打包")
@ApiModelProperty(value = "打包")
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class PrincipalPeopleDetail {
@ApiModelProperty(value = "实收总金额")
private String comeAllMoney;
@ApiModelProperty(value = "打包")
private String pack;
private Integer pack;
@Excel(name = "打包", width = 15)
@ApiModelProperty(value = "打包")
private String packText;