From c37b0940eb9e8e96855e1cc557f4cec66d34c7ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Thu, 30 Sep 2021 11:53:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=88=91=E7=9A=84=E5=90=88=E5=90=8C=E6=8E=A5=E5=8F=A3=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayIncomeContractController.java | 27 +++++++++++++++++++ .../contract/entity/PayIncomeContract.java | 6 +++++ .../mapper/PayIncomeContractMapper.java | 10 +++++++ .../mapper/xml/PayIncomeContractMapper.xml | 12 +++++++++ .../service/IPayIncomeContractService.java | 11 ++++++++ .../impl/PayIncomeContractServiceImpl.java | 5 ++++ .../xml/PayWorkingGroupSubItemMapper.xml | 4 +-- 7 files changed, 73 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index f92cc913..44911305 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -13,6 +13,7 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; import com.jero.common.util.oConvertUtils; import com.jero.contract.common.PayIncomeContractCommon; @@ -25,11 +26,13 @@ import com.jero.contract.service.IPayIncomeContractAuditService; import com.jero.contract.service.IPayIncomeContractInstallmentService; import com.jero.contract.service.IPayIncomeContractService; import com.jero.contract.vo.*; +import com.jero.temporary.entity.PayCompanyManagementTemporary; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.def.MapExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -102,6 +105,30 @@ public class PayIncomeContractController extends JeroController pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus,projectName,startTime,endTime); return Result.OK(pageList); } + + + /** + * 企业端-分页列表查询 + * + * @param payIncomeContract 收入合同 + * @param pageNo 页码 + * @param pageSize 条数 + */ + @ApiOperation(value="收入合同-企业端-分页列表查询", notes="收入合同-企业端-分页列表查询") + @GetMapping(value = "/queryCompanyPageList") + public Result queryCompanyPageList(PayIncomeContract payIncomeContract, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(Objects.isNull(sysUser)){ + return Result.error("没有查到用户信息！"); + } + payIncomeContract.setSignedContactsId(sysUser.getId()); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payIncomeContractService.queryCompanyPageList(page, payIncomeContract); + return Result.OK(pageList); + } /** * 添加 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java index 604cbc61..4ac0ed2c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java @@ -215,4 +215,10 @@ public class PayIncomeContract implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "关联项目") private String associatedProject; + /** + * 邮寄状态 + */ + @TableField(exist = false) + @ApiModelProperty(value = "邮寄状态") + private Integer postStatus; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractMapper.java index 208364f1..fe3fb4f4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractMapper.java @@ -30,6 +30,16 @@ public interface PayIncomeContractMapper extends BaseMapper { @Param("chargeStatus") String chargeStatus,@Param("projectName") String projectName, @Param("startTime") String startTime, @Param("endTime") String endTime); + /** + * @Description 企业端-查询我的合同列表 + * @Author lqt + * @Date 2021/9/30 + * @Param + * @Return + * @Exception + */ + IPage queryCompanyPageList(Page page,@Param("payIncomeContract") PayIncomeContract payIncomeContract); + /** * @Description 关联项目列表 * @Author lqt diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml index f08bdce3..f582186d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml @@ -186,4 +186,16 @@ ) a ORDER BY createTime,projectId DESC + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java index 43fd0bb3..a44cce15 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java @@ -31,6 +31,17 @@ public interface IPayIncomeContractService extends IService { * @Exception */ IPage queryPageList(Page page, PayIncomeContract payIncomeContract, String chargeStatus,String projectName, String startTime, String endTime); + + /** + * @Description 企业端-查询我的合同列表 + * @Author lqt + * @Date 2021/9/30 + * @Param + * @Return + * @Exception + */ + IPage queryCompanyPageList(Page page,PayIncomeContract payIncomeContract); + /** * @Description 添加 * @Author lqt diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index 923b7b49..d7194db0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -122,6 +122,11 @@ public class PayIncomeContractServiceImpl extends ServiceImpl queryCompanyPageList(Page page, PayIncomeContract payIncomeContract) { + return payIncomeContractMapper.queryCompanyPageList(page,payIncomeContract); + } + @Override @Transactional public PayIncomeContract addPayIncomeContractInput(PayIncomeContractInput input) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index cba0dd1c..e170290d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -134,10 +134,10 @@ AND pwg.working_group_project like concat('%',concat(#{payWorkingGroupSubItem.chargeProject},'%')) - + AND pwgs.pack = #{payWorkingGroupSubItem.pack} - + AND pwgs.need_invoice = #{payWorkingGroupSubItem.needInvoice}