diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 597da68f..c0abfe53 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -26,6 +26,7 @@ import com.jero.company.service.IPayContactsManagementService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.ExcelImportCheckUtil; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.entity.ImportParams; @@ -79,9 +80,8 @@ public class PayContactsManagementController extends JeroController 11){ return Result.error("手机号长度应小于11个字符！"); } - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payContactsManagement, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - IPage pageList = payContactsManagementService.page(page, queryWrapper); + IPage pageList = payContactsManagementService.queryPageList(page, payContactsManagement); return Result.OK(pageList); } @@ -227,16 +227,16 @@ public class PayContactsManagementController extends JeroController queryByCompany(@RequestParam(name="companyName",required=true) String companyName) { + public Result queryByCompany(@RequestParam(name="companyId",required=true) String companyId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayContactsManagement::getCompanyName,companyName); + queryWrapper.eq(PayContactsManagement::getCompanyId,companyId); List list = payContactsManagementService.list(queryWrapper); return Result.OK(list); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java index 1b5a21c2..6dacf709 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java @@ -2,7 +2,10 @@ package com.jero.company.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.company.entity.PayContactsManagement; +import org.apache.ibatis.annotations.Param; /** * @Description: pay_contacts_management @@ -12,4 +15,14 @@ import com.jero.company.entity.PayContactsManagement; */ public interface PayContactsManagementMapper extends BaseMapper { + /** + * @Description 分页查询 + * @Author lqt + * @Date 2021/8/27 + * @Param + * @Return + * @Exception + */ + IPage queryPageList(Page page, @Param("payContactsManagement") PayContactsManagement payContactsManagement); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml index ea43f6dc..cf48a8d8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml @@ -2,4 +2,44 @@ + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java index a5f00c24..37871eeb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java @@ -1,6 +1,9 @@ package com.jero.company.service; +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.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; @@ -14,6 +17,16 @@ import java.util.List; * @Version: V1.0 */ public interface IPayContactsManagementService extends IService { + + /** + * @Description 分页查询 + * @Author lqt + * @Date 2021/8/27 + * @Param + * @Return + * @Exception + */ + IPage queryPageList(Page page,PayContactsManagement payContactsManagement); /** * @Description 更新数据 * @Author lqt diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java index 4cdbcea7..d1f66e42 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java @@ -1,6 +1,9 @@ package com.jero.company.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.company.entity.PayContactsManagement; import com.jero.company.mapper.PayContactsManagementMapper; @@ -10,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.List; /** @@ -23,6 +27,14 @@ public class PayContactsManagementServiceImpl extends ServiceImpl queryPageList(Page page, PayContactsManagement payContactsManagement) { + return payContactsManagementMapper.queryPageList(page,payContactsManagement); + } + @Override @Transactional public void updateContactsData(List listSigning, List list) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java new file mode 100644 index 00000000..6b9eccbf --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java @@ -0,0 +1,114 @@ +package com.jero.project.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_working_group + * @Author: jeecg-boot + * @Date: 2021-08-27 + * @Version: V1.0 + */ +@Data +@TableName("pay_working_group") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_working_group对象", description="pay_working_group") +public class PayWorkingGroup 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 workingGroupProject; + /**运行年份*/ + @Excel(name = "运行年份", width = 15) + @ApiModelProperty(value = "运行年份") + private java.lang.Integer year; + /**负责人Aid*/ + @Excel(name = "负责人Aid", width = 15) + @ApiModelProperty(value = "负责人Aid") + private java.lang.String principalIdA; + /**负责人名称A*/ + @Excel(name = "负责人名称A", width = 15) + @ApiModelProperty(value = "负责人名称A") + private java.lang.String principalNameA; + /**负责人Bid*/ + @Excel(name = "负责人Bid", width = 15) + @ApiModelProperty(value = "负责人Bid") + private java.lang.String principalIdB; + /**负责人名称B*/ + @Excel(name = "负责人名称B", width = 15) + @ApiModelProperty(value = "负责人名称B") + private java.lang.String principalNameB; + /**每年召开次数*/ + @Excel(name = "每年召开次数", width = 15) + @ApiModelProperty(value = "每年召开次数") + private java.lang.String convokeNum; + /**运行周期*/ + @Excel(name = "运行周期", width = 15) + @ApiModelProperty(value = "运行周期") + private java.lang.String operationCycle; + /**本年应收款A（元）*/ + @Excel(name = "本年应收款A（元）", width = 15) + @ApiModelProperty(value = "本年应收款A（元）") + private java.lang.Integer yearChargeA; + /**收费通知号A*/ + @Excel(name = "收费通知号A", width = 15) + @ApiModelProperty(value = "收费通知号A") + private java.lang.String chargeNoticeNoA; + /**收费通知文件Aid*/ + @Excel(name = "收费通知文件Aid", width = 15) + @ApiModelProperty(value = "收费通知文件Aid") + private java.lang.String chargeNoticeAId; + /**本年应收款B（元）*/ + @Excel(name = "本年应收款B（元）", width = 15) + @ApiModelProperty(value = "本年应收款B（元）") + private java.lang.Integer yearChargeB; + /**收费通知号B*/ + @Excel(name = "收费通知号B", width = 15) + @ApiModelProperty(value = "收费通知号B") + private java.lang.String chargeNoticeNoB; + /**收费通知文件Bid*/ + @Excel(name = "收费通知文件Bid", width = 15) + @ApiModelProperty(value = "收费通知文件Bid") + private java.lang.String chargeNoticeBId; + /**任务及目标*/ + @Excel(name = "任务及目标", width = 15) + @ApiModelProperty(value = "任务及目标") + private java.lang.String missionAndObjectives; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String remarks; + /**创建人*/ + @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; +}