From c6e915a867b35d60fba4dd3ac00fa45a38a1c10b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A7=89=E5=8D=93?= Date: Mon, 29 Dec 2025 15:59:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/dto/LngContractFactPageDto.java | 5 ++ .../dto/UpdateLngContractFactDto.java | 4 +- .../contract/vo/LngContractFactPageVo.java | 60 ++++++++++++++++++- .../module/contract/vo/LngContractFactVo.java | 35 ++++++++++- .../module/sales/dto/LngApproPageDto.java | 12 ++++ .../module/sales/vo/LngApproPageVo.java | 35 +++++++++-- .../xjrsoft/module/sales/vo/LngApproVo.java | 6 ++ .../controller/ContractFactController.java | 30 +++------- .../mapper/LngContractApproRelMapper.java | 3 +- .../mapper/LngContractFactCpMapper.java | 3 +- .../mapper/LngContractFactMapper.java | 22 ++++++- .../service/impl/ContractFactServiceImpl.java | 13 +++- .../sales/controller/ApproController.java | 32 ++++++---- 13 files changed, 212 insertions(+), 48 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractFactPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractFactPageDto.java index 4f9773f..57653e8 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractFactPageDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractFactPageDto.java @@ -30,6 +30,11 @@ public class LngContractFactPageDto extends PageInput { */ @ApiModelProperty("合同名称") private String kName; + /** + * 关联类别(M-主合同/U-合同变更/C-确认函/A-补充协议/F-框架协议/R-续签合同/I-同一事项关联合同；以下不要：无/原合同补充协议/原合同续签合同/同一事项关联合同) + */ + @ApiModelProperty("关联类别(M-主合同/U-合同变更/C-确认函/A-补充协议/F-框架协议/R-续签合同/I-同一事项关联合同；以下不要：无/原合同补充协议/原合同续签合同/同一事项关联合同)") + private String relTypeCode; /** * 合同类别(日常采购/工程建设/人力资源/投资管理/金融保险/租赁/信息管理/咨询服务/综合服务/生产运营/天然气公司业务合同) */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactDto.java index 814d64f..4fc8d49 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactDto.java @@ -245,7 +245,7 @@ public class UpdateLngContractFactDto implements Serializable { @ApiModelProperty("lngContractFactCp子表") @LogJoin(name = "lngContractFactCp子表", columns = { - @LogJoinColumn(field = "kFactId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "kFactId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = UpdateLngContractFactCpDto.class, type = JoinType.MANY) private List lngContractFactCpList; @@ -255,7 +255,7 @@ public class UpdateLngContractFactDto implements Serializable { @ApiModelProperty("lngContractApproRel子表") @LogJoin(name = "lngContractApproRel子表", columns = { - @LogJoinColumn(field = "tableId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "tableId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = UpdateLngContractApproRelDto.class, type = JoinType.MANY) private List lngContractApproRelList; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactPageVo.java index dc0d766..56ffcd7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactPageVo.java @@ -27,7 +27,13 @@ public class LngContractFactPageVo { * 合同主体ID(天然气公司/惠贸) */ @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + @Trans(type = TransType.DEPT, transToFieldName = "comName") private Long comId; + /** + * 合同主体名称 + */ + @ApiModelProperty("合同主体名称") + private String comName; /** * 合同号 */ @@ -38,11 +44,27 @@ public class LngContractFactPageVo { */ @ApiModelProperty("合同名称") private String kName; + /** + * 关联类别(M-主合同/U-合同变更/C-确认函/A-补充协议/F-框架协议/R-续签合同/I-同一事项关联合同；以下不要：无/原合同补充协议/原合同续签合同/同一事项关联合同) + */ + @ApiModelProperty("关联类别(M-主合同/U-合同变更/C-确认函/A-补充协议/F-框架协议/R-续签合同/I-同一事项关联合同；以下不要：无/原合同补充协议/原合同续签合同/同一事项关联合同)") + @Trans(type = TransType.DIC, id = "2003815292742479874", transToFieldName = "relTypeName") + private String relTypeCode; + private String relTypeName; /** * 合同类别(日常采购/工程建设/人力资源/投资管理/金融保险/租赁/信息管理/咨询服务/综合服务/生产运营/天然气公司业务合同) */ @ApiModelProperty("合同类别(日常采购/工程建设/人力资源/投资管理/金融保险/租赁/信息管理/咨询服务/综合服务/生产运营/天然气公司业务合同)") + @Trans(type = TransType.DIC, id = "2003815931950215169", transToFieldName = "kTypeName1") private String kTypeCode1; + private String kTypeName1; + /** + * 二级类别(天然气购入/天然气销售/接收站加工/管道代输/槽车运输/船舶运输/其他；合同类别为天然气公司业务合同时，其他类别还有很多选项) + */ + @ApiModelProperty("二级类别(天然气购入/天然气销售/接收站加工/管道代输/槽车运输/船舶运输/其他；合同类别为天然气公司业务合同时，其他类别还有很多选项)") + @Trans(type = TransType.DIC, id = "2003816733997608961", transToFieldName = "kTypeName2") + private String kTypeCode2; + private String kTypeName2; /** * 相对方数量 */ @@ -52,7 +74,9 @@ public class LngContractFactPageVo { * 合同期限类型编码(Y-有固定期限/N-无固定期限) */ @ApiModelProperty("合同期限类型编码(Y-有固定期限/N-无固定期限)") + @Trans(type = TransType.DIC, id = "2003817739355500546", transToFieldName = "periodTypeName") private String periodTypeCode; + private String periodTypeName; /** * 有效期开始(有固定期限时录入) */ @@ -69,43 +93,69 @@ public class LngContractFactPageVo { * 币种编码 */ @ApiModelProperty("币种编码") - @Trans(type = TransType.API, id = "93d735dcb7364a0f8102188ec4d77ac7") + @Trans(type = TransType.API, id = "93d735dcb7364a0f8102188ec4d77ac7", transToFieldName = "curName") private String curCode; + private String curName; /** * 合同金额（万元）(固定总价/非固定金额时必须录入) */ @ApiModelProperty("合同金额（万元）(固定总价/非固定金额时必须录入)") private BigDecimal amount; + /** + * 合同金额类型(Y-固定总价/N-非固定金额/U-无金额) + */ + @ApiModelProperty("合同金额类型(Y-固定总价/N-非固定金额/U-无金额)") + @Trans(type = TransType.DIC, id = "2003818343192670209", transToFieldName = "amountTypeName") + private String amountTypeCode; + private String amountTypeName; + /** + * 结算类别(收款合同/付款合同/无金额) + */ + @ApiModelProperty("结算类别(收款合同/付款合同/无金额)") + @Trans(type = TransType.DIC, id = "2003818749167742977", transToFieldName = "settleTypeName") + private String settleTypeCode; + private String settleTypeName; /** * 是否招投标(Y-是/N-否/U-不适用) */ @ApiModelProperty("是否招投标(Y-是/N-否/U-不适用)") + @Trans(type = TransType.DIC, id = "2003819376161665026") private String bidSign; /** * 是否已获前置审批(Y-是/N-否/U-不适用) */ @ApiModelProperty("是否已获前置审批(Y-是/N-否/U-不适用)") + @Trans(type = TransType.DIC, id = "2003819376161665026") private String preApproSign; /** * 先行履行(Y-是/N-否/U-不适用) */ @ApiModelProperty("先行履行(Y-是/N-否/U-不适用)") + @Trans(type = TransType.DIC, id = "2003819376161665026") private String aheadSign; /** * 采用范本(Y-是/N-否/R-参考) */ @ApiModelProperty("采用范本(Y-是/N-否/R-参考)") + @Trans(type = TransType.DIC, id = "2003819644643258370") private String tempSign; /** * 是否属于重大事项所涉合同(Y-是，N-否) */ @ApiModelProperty("是否属于重大事项所涉合同(Y-是，N-否)") + @Trans(type = TransType.DIC, id = "1978056598125330433") private String impSign; /** * 我方联系人ID */ @ApiModelProperty("我方联系人ID") + @Trans(type = TransType.USER, transToFieldName = "empName") private Long empId; + /** + * 我方联系人名称 + */ + @ApiModelProperty("我方联系人名称") + private String empName; /** * 联系电话 */ @@ -115,7 +165,13 @@ public class LngContractFactPageVo { * 业务部门ID */ @ApiModelProperty("业务部门ID") + @Trans(type = TransType.DEPT, transToFieldName = "bDeptName") private Long bDeptId; + /** + * 业务部门名称 + */ + @ApiModelProperty("业务部门名称") + private String bDeptName; /** * 起草日期 */ @@ -126,7 +182,9 @@ public class LngContractFactPageVo { * 状态(未提交/审批中/已审批/已驳回) */ @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") private String approCode; + private String approName; /** * 合同说明 */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactVo.java index 29400b6..63154ad 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactVo.java @@ -1,5 +1,8 @@ package com.xjrsoft.module.contract.vo; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import com.xjrsoft.module.sales.vo.LngApproVo; import com.xjrsoft.module.system.vo.LngFileUploadVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -28,7 +31,15 @@ public class LngContractFactVo { * 合同主体ID(天然气公司/惠贸) */ @ApiModelProperty("合同主体ID(天然气公司/惠贸)") + @Trans(type = TransType.DEPT, transToFieldName = "comName") private Long comId; + + + /** + * 合同主体名称 + */ + @ApiModelProperty("合同主体名称") + private String comName; /** @@ -175,7 +186,14 @@ public class LngContractFactVo { * 我方联系人ID */ @ApiModelProperty("我方联系人ID") + @Trans(type = TransType.USER, transToFieldName = "empName") private Long empId; + + /** + * 我方联系人名称 + */ + @ApiModelProperty("我方联系人名称") + private String empName; /** @@ -189,8 +207,15 @@ public class LngContractFactVo { * 业务部门ID */ @ApiModelProperty("业务部门ID") + @Trans(type = TransType.DEPT, transToFieldName = "bDeptName") private Long bDeptId; - + + + /** + * 业务部门名称 + */ + @ApiModelProperty("业务部门名称") + private String bDeptName; /** * 起草日期 @@ -276,12 +301,20 @@ public class LngContractFactVo { */ @ApiModelProperty("lngContractFactCp子表") private List lngContractFactCpList; + /** * lngContractApproRel */ @ApiModelProperty("lngContractApproRel子表") private List lngContractApproRelList; + + /** + * lngApproVoList + */ + @ApiModelProperty("lngApproVoList子表") + private List lngApproVoList; + /** * lngFileUpload */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/LngApproPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/LngApproPageDto.java index 7c4c3fa..6eb0d68 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/LngApproPageDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/LngApproPageDto.java @@ -71,4 +71,16 @@ public class LngApproPageDto extends PageInput { @ApiModelProperty("内容摘要") private String content; + /** + * 拟稿日期开始时间 + */ + @ApiModelProperty("拟稿日期开始时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startDate; + /** + * 拟稿日期结束时间 + */ + @ApiModelProperty("拟稿日期结束时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endDate; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngApproPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngApproPageVo.java index b85330c..1393317 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngApproPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngApproPageVo.java @@ -2,9 +2,12 @@ package com.xjrsoft.module.sales.vo; import com.xjrsoft.common.annotation.Trans; import com.xjrsoft.common.enums.TransType; +import com.xjrsoft.module.system.vo.LngFileUploadVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @title: 分页列表出参 * @Author 管理员 @@ -18,13 +21,14 @@ public class LngApproPageVo { * 主键 */ @ApiModelProperty("主键") - private String id; + private Long id; /** * 签报类型(DJ-定价方案/XB-询比价销售方案/XS-双边协商谈判销售方案/YY-应邀报价销售方案/JP-竞拍销售方案/SJ-商机) */ @ApiModelProperty("签报类型(DJ-定价方案/XB-询比价销售方案/XS-双边协商谈判销售方案/YY-应邀报价销售方案/JP-竞拍销售方案/SJ-商机)") - @Trans(type = TransType.DIC, id = "2001500486723887105") + @Trans(type = TransType.DIC, id = "2001500486723887105", transToFieldName = "typeName") private String typeCode; + private String typeName; /** * 编号(自动生成) */ @@ -39,14 +43,16 @@ public class LngApproPageVo { * 密级(1-加密/9-普通) */ @ApiModelProperty("密级(1-加密/9-普通)") - @Trans(type = TransType.DIC, id = "2001501242533273602") + @Trans(type = TransType.DIC, id = "2001501242533273602", transToFieldName = "securityName") private String securityCode; + private String securityName; /** * 缓急(1-特急/2-紧急/9-普通) */ @ApiModelProperty("缓急(1-特急/2-紧急/9-普通)") - @Trans(type = TransType.DIC, id = "2001501562994876418") + @Trans(type = TransType.DIC, id = "2001501562994876418", transToFieldName = "urgencyName") private String urgencyCode; + private String urgencyName; /** * 内容摘要 */ @@ -56,23 +62,40 @@ public class LngApproPageVo { * 拟稿日期 */ @ApiModelProperty("拟稿日期") - @Trans(type = TransType.API, id = "93d735dcb7364a0f8102188ec4d77ac7") private String dateAppro; /** * 拟稿人(xjr_user.id) */ @ApiModelProperty("拟稿人(xjr_user.id)") + @Trans(type = TransType.USER, transToFieldName = "empName") private Long empId; + /** + * 拟稿人名称 + */ + @ApiModelProperty("拟稿人名称") + private String empName; /** * 业务部门(xjr_department.id) */ @ApiModelProperty("业务部门(xjr_department.id)") + @Trans(type = TransType.DEPT, transToFieldName = "bDeptName") private Long bDeptId; + /** + * 业务部门名称 + */ + @ApiModelProperty("业务部门名称") + private String bDeptName; /** * 审批状态(未提交/审批中/已审批/已驳回) */ @ApiModelProperty("审批状态(未提交/审批中/已审批/已驳回)") - @Trans(type = TransType.DIC, id = "1990669393069129729") + @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") private String approCode; + private String approName; + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + private List lngFileUploadList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngApproVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngApproVo.java index 01efa7e..716a5ad 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngApproVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngApproVo.java @@ -30,6 +30,12 @@ public class LngApproVo { */ @ApiModelProperty("签报类型(DJ-定价方案/XB-询比价销售方案/XS-双边协商谈判销售方案/YY-应邀报价销售方案/JP-竞拍销售方案/SJ-商机)") private String typeCode; + + /** + * 签报类型描述 + */ + @ApiModelProperty("签报类型描述") + private String typeName; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractFactController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractFactController.java index 4ab7e3c..4a08867 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractFactController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractFactController.java @@ -1,7 +1,6 @@ package com.xjrsoft.module.contract.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -49,34 +48,19 @@ public class ContractFactController { private final IContractFactService contractFactService; private final DatalogService dataService; -// @GetMapping(value = "/page") + @GetMapping(value = "/page") @ApiOperation(value="LngContractFact列表(分页)") @SaCheckPermission("contractFact:list") public R page(@Valid LngContractFactPageDto dto){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper - .like(StrUtil.isNotBlank(dto.getKNo()),LngContractFact::getKNo,dto.getKNo()) - .like(StrUtil.isNotBlank(dto.getKName()),LngContractFact::getKName,dto.getKName()) - .like(StrUtil.isNotBlank(dto.getKTypeCode1()),LngContractFact::getKTypeCode1,dto.getKTypeCode1()) - .eq(ObjectUtil.isNotNull(dto.getComId()),LngContractFact::getComId,dto.getComId()) - .between(ObjectUtil.isNotNull(dto.getDateDraftStart()) && ObjectUtil.isNotNull(dto.getDateDraftEnd()),LngContractFact::getDateDraft,dto.getDateDraftStart(),dto.getDateDraftEnd()) - .like(StrUtil.isNotBlank(dto.getPeriodTypeCode()),LngContractFact::getPeriodTypeCode,dto.getPeriodTypeCode()) - .between(ObjectUtil.isNotNull(dto.getDateFromStart()) && ObjectUtil.isNotNull(dto.getDateFromEnd()),LngContractFact::getDateFrom,dto.getDateFromStart(),dto.getDateFromEnd()) - .between(ObjectUtil.isNotNull(dto.getDateToStart()) && ObjectUtil.isNotNull(dto.getDateToEnd()),LngContractFact::getDateTo,dto.getDateToStart(),dto.getDateToEnd()) - .like(StrUtil.isNotBlank(dto.getCurCode()),LngContractFact::getCurCode,dto.getCurCode()) - .eq(ObjectUtil.isNotNull(dto.getAmount()),LngContractFact::getAmount,dto.getAmount()) - .eq(ObjectUtil.isNotNull(dto.getEmpId()),LngContractFact::getEmpId,dto.getEmpId()) - .like(StrUtil.isNotBlank(dto.getTel()),LngContractFact::getTel,dto.getTel()) - .eq(ObjectUtil.isNotNull(dto.getBDeptId()),LngContractFact::getBDeptId,dto.getBDeptId()) - .like(StrUtil.isNotBlank(dto.getBidSign()),LngContractFact::getBidSign,dto.getBidSign()) - .like(StrUtil.isNotBlank(dto.getPreApproSign()),LngContractFact::getPreApproSign,dto.getPreApproSign()) - .like(StrUtil.isNotBlank(dto.getAheadSign()),LngContractFact::getAheadSign,dto.getAheadSign()) - .like(StrUtil.isNotBlank(dto.getTempSign()),LngContractFact::getTempSign,dto.getTempSign()) - .like(StrUtil.isNotBlank(dto.getImpSign()),LngContractFact::getImpSign,dto.getImpSign()) - .like(StrUtil.isNotBlank(dto.getApproCode()),LngContractFact::getApproCode,dto.getApproCode()) - .like(StrUtil.isNotBlank(dto.getKDesc()),LngContractFact::getKDesc,dto.getKDesc()) - .like(StrUtil.isNotBlank(dto.getNote()),LngContractFact::getNote,dto.getNote()) + .and(StrUtil.isNotBlank(dto.getKName()), r -> + r.like(LngContractFact::getKNo, dto.getKName()) + .or() + .like(LngContractFact::getKName, dto.getKName()) + ) + .eq(StrUtil.isNotBlank(dto.getRelTypeCode()), LngContractFact::getRelTypeCode,dto.getRelTypeCode()) .orderByDesc(LngContractFact::getId) .select(LngContractFact.class,x -> VoToColumnUtil.fieldsToColumns(LngContractFactPageVo.class).contains(x.getProperty())); IPage page = contractFactService.page(ConventPage.getPage(dto), queryWrapper); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractApproRelMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractApproRelMapper.java index 819fc20..e251c08 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractApproRelMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractApproRelMapper.java @@ -1,5 +1,6 @@ package com.xjrsoft.module.contract.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.contract.entity.LngContractApproRel; import org.apache.ibatis.annotations.Mapper; @@ -11,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngContractApproRelMapper extends MPJBaseMapper { +public interface LngContractApproRelMapper extends MPJBaseMapper, BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactCpMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactCpMapper.java index 1ed344e..6c997c7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactCpMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactCpMapper.java @@ -1,5 +1,6 @@ package com.xjrsoft.module.contract.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.contract.entity.LngContractFactCp; import org.apache.ibatis.annotations.Mapper; @@ -11,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngContractFactCpMapper extends MPJBaseMapper { +public interface LngContractFactCpMapper extends MPJBaseMapper, BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactMapper.java index 3fc5d51..03cf9f3 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactMapper.java @@ -1,8 +1,12 @@ package com.xjrsoft.module.contract.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.contract.entity.LngContractFact; +import com.xjrsoft.module.sales.vo.LngApproVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @title: mapper @@ -11,6 +15,22 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngContractFactMapper extends MPJBaseMapper { +public interface LngContractFactMapper extends MPJBaseMapper, BaseMapper { + @Select("SELECT a.id, a.title, a.code, dd_qb.name as typeName," + + " u.name as empName, dept.name as bDeptName, a.date_appro AS dateAppro" + + " FROM lng_appro a" + + " LEFT JOIN xjr_dictionary_item di_qb on di_qb.code='LNG_QB'" + + " LEFT JOIN xjr_dictionary_detail dd_qb on dd_qb.item_id=di_qb.id AND dd_qb.code=a.type_code" + + " LEFT JOIN xjr_dictionary_item di_s on di_s.code='LNG_SECRET'" + + " LEFT JOIN xjr_dictionary_detail dd_s on dd_s.item_id=di_s.id AND dd_s.code=a.security_code" + + " LEFT JOIN xjr_dictionary_item di_u on di_u.code='LNG_URGEN'" + + " LEFT JOIN xjr_dictionary_detail dd_u on dd_u.item_id=di_u.id AND dd_u.code=a.urgency_code" + + " LEFT JOIN xjr_dictionary_item di_a on di_a.code='LNG_APPRO'" + + " LEFT JOIN xjr_dictionary_detail dd_a on dd_a.item_id=di_a.id AND dd_a.code=a.appro_code" + + " LEFT JOIN xjr_user u on u.id=a.emp_id" + + " LEFT JOIN xjr_department dept on dept.id=a.dept_id" + + " LEFT JOIN xjr_department com on com.id=a.com_id" + + " WHERE a.id = #{id}") + LngApproVo getLngApproVo(@Param("id") Long id); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractFactServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractFactServiceImpl.java index a6d0747..593a7a5 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractFactServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractFactServiceImpl.java @@ -3,6 +3,7 @@ package com.xjrsoft.module.contract.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.yulichang.base.MPJBaseServiceImpl; +import com.google.common.collect.Lists; import com.pictc.enums.BusinessCode; import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.module.contract.entity.LngContractApproRel; @@ -12,9 +13,9 @@ import com.xjrsoft.module.contract.mapper.LngContractApproRelMapper; import com.xjrsoft.module.contract.mapper.LngContractFactCpMapper; import com.xjrsoft.module.contract.mapper.LngContractFactMapper; import com.xjrsoft.module.contract.service.IContractFactService; -import com.xjrsoft.module.contract.vo.LngContractApproRelVo; import com.xjrsoft.module.contract.vo.LngContractFactCpVo; import com.xjrsoft.module.contract.vo.LngContractFactVo; +import com.xjrsoft.module.sales.vo.LngApproVo; import com.xjrsoft.module.system.client.IFileClient; import com.xjrsoft.module.system.vo.LngFileUploadVo; import lombok.AllArgsConstructor; @@ -55,7 +56,15 @@ public class ContractFactServiceImpl extends MPJBaseServiceImpl() .eq(LngContractApproRel::getTableId, lngContractFact.getId())); if (CollectionUtils.isNotEmpty(lngContractApproRelList)) { - vo.setLngContractApproRelList(BeanUtil.copyToList(lngContractApproRelList, LngContractApproRelVo.class)); + List approVoList = Lists.newArrayList(); + lngContractApproRelList.forEach(x -> { + LngApproVo approVo = this.baseMapper.getLngApproVo(x.getApproId()); + List fileList = fileClient.getTableFiles("lng_appro", + "lngFileUploadList", approVo.getId()); + approVo.setLngFileUploadList(fileList); + approVoList.add(approVo); + }); + vo.setLngApproVoList(approVoList); } List fileList = fileClient.getTableFiles("lng_contract_fact", "lngFileUploadList", vo.getId()); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/ApproController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/ApproController.java index 63a42cd..9f13955 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/ApproController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/ApproController.java @@ -25,9 +25,12 @@ import com.xjrsoft.module.sales.dto.UpdateLngApproDto; import com.xjrsoft.module.sales.entity.LngAppro; import com.xjrsoft.module.sales.service.IApproService; import com.xjrsoft.module.sales.vo.LngApproPageVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -48,27 +51,36 @@ public class ApproController { private final IApproService approService; private final DatalogService dataService; + private final IFileClient fileClient; -// @GetMapping(value = "/page") + @GetMapping(value = "/page") @ApiOperation(value="LngAppro列表(分页)") @SaCheckPermission("appro:list") public R page(@Valid LngApproPageDto dto){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper - .like(StrUtil.isNotBlank(dto.getCode()),LngAppro::getCode,dto.getCode()) - .like(StrUtil.isNotBlank(dto.getTitle()),LngAppro::getTitle,dto.getTitle()) - .like(StrUtil.isNotBlank(dto.getTypeCode()),LngAppro::getTypeCode,dto.getTypeCode()) - .like(StrUtil.isNotBlank(dto.getSecurityCode()),LngAppro::getSecurityCode,dto.getSecurityCode()) - .like(StrUtil.isNotBlank(dto.getUrgencyCode()),LngAppro::getUrgencyCode,dto.getUrgencyCode()) - .eq(ObjectUtil.isNotNull(dto.getEmpId()),LngAppro::getEmpId,dto.getEmpId()) - .eq(ObjectUtil.isNotNull(dto.getBDeptId()),LngAppro::getBDeptId,dto.getBDeptId()) - .like(StrUtil.isNotBlank(dto.getApproCode()),LngAppro::getApproCode,dto.getApproCode()) - .like(StrUtil.isNotBlank(dto.getContent()),LngAppro::getContent,dto.getContent()) + .between(ObjectUtil.isNotNull(dto.getStartDate()) && ObjectUtil.isNotNull(dto.getEndDate()), + LngAppro::getDateAppro, dto.getStartDate(), dto.getEndDate()) + .and(StrUtil.isNotBlank(dto.getTitle()), r -> + r.like(LngAppro::getCode, dto.getTitle()) + .or() + .like(LngAppro::getTitle, dto.getTitle()) + ) + .eq(StrUtil.isNotBlank(dto.getTypeCode()),LngAppro::getTypeCode,dto.getTypeCode()) + .eq(StrUtil.isNotBlank(dto.getApproCode()),LngAppro::getApproCode,dto.getApproCode()) .orderByDesc(LngAppro::getId) .select(LngAppro.class,x -> VoToColumnUtil.fieldsToColumns(LngApproPageVo.class).contains(x.getProperty())); IPage page = approService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngApproPageVo.class); + List list = pageOutput.list; + if (CollectionUtils.isNotEmpty(list)) { + list.forEach(x -> { + List fileList = fileClient.getTableFiles("lng_appro", + "lngFileUploadList", x.getId()); + x.setLngFileUploadList(fileList); + }); + } return R.ok(pageOutput); }