1.1.23 新增关联框架合同、框架合同有效期、关联框架合同字段。查询框架合同列表接口

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractInfoController.java

@@ -50,6 +50,14 @@ public class ErpContractInfoController extends BaseController {
         return erpContractInfoService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 查询框架合同列表
+     */
+    @GetMapping("/framework/list")
+    public TableDataInfo<ErpContractInfoVo> frameworkList(ErpContractInfoBo bo, PageQuery pageQuery) {
+        return erpContractInfoService.queryFrameworkPageList(bo, pageQuery);
+    }
+
     /**
      * 导出合同信息列表
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java

@@ -277,4 +277,19 @@ public class ErpContractInfo extends TenantEntity {
      */
     private Long originalContractId;
 
+    /**
+     * 是否关联框架合同（1是 0否）
+     */
+    private String isFrameworkContract;
+
+    /**
+     * 关联框架合同ID
+     */
+    private Long frameworkContractId;
+
+    /**
+     * 框架合同有效期
+     */
+    private Date frameworkValidPeriod;
+
 }

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java

@@ -280,6 +280,21 @@ public class ErpContractInfoBo extends BaseEntity {
      */
     private Long originalContractId;
 
+    /**
+     * 是否关联框架合同（1是 0否）
+     */
+    private String isFrameworkContract;
+
+    /**
+     * 关联框架合同ID
+     */
+    private Long frameworkContractId;
+
+    /**
+     * 框架合同有效期
+     */
+    private Date frameworkValidPeriod;
+
     /**
      * 流程定义编码
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java

@@ -355,6 +355,36 @@ public class ErpContractInfoVo implements Serializable {
      */
     private Long originalContractId;
 
+    /**
+     * 是否关联框架合同（1是 0否）
+     */
+    @ExcelProperty(value = "是否关联框架合同")
+    private String isFrameworkContract;
+
+    /**
+     * 关联框架合同ID
+     */
+    @ExcelProperty(value = "关联框架合同ID")
+    private Long frameworkContractId;
+
+    /**
+     * 关联框架合同编号（展示用）
+     */
+    @ExcelProperty(value = "关联框架合同编号")
+    private String frameworkContractCode;
+
+    /**
+     * 关联框架合同名称（展示用）
+     */
+    @ExcelProperty(value = "关联框架合同名称")
+    private String frameworkContractName;
+
+    /**
+     * 框架合同有效期
+     */
+    @ExcelProperty(value = "框架合同有效期")
+    private Date frameworkValidPeriod;
+
     /**
      * 甲方办公地
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractInfoService.java

@@ -33,6 +33,15 @@ public interface IErpContractInfoService {
      */
     TableDataInfo<ErpContractInfoVo> queryPageList(ErpContractInfoBo bo, PageQuery pageQuery);
 
+    /**
+     * 分页查询框架合同列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 合同信息分页列表
+     */
+    TableDataInfo<ErpContractInfoVo> queryFrameworkPageList(ErpContractInfoBo bo, PageQuery pageQuery);
+
     /**
      * 查询符合条件的合同信息列表
      *

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java

@@ -170,6 +170,24 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
     @Override
     public TableDataInfo<ErpContractInfoVo> queryPageList(ErpContractInfoBo bo, PageQuery pageQuery) {
         MPJLambdaWrapper<ErpContractInfo> lqw = buildQueryWrapper(bo);
+        lqw.orderByDesc(ErpContractInfo::getCreateTime);
+        Page<ErpContractInfoVo> result = baseMapper.selectCustomErpContractInfoVoList(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 分页查询框架合同列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 合同信息分页列表
+     */
+    @Override
+    public TableDataInfo<ErpContractInfoVo> queryFrameworkPageList(ErpContractInfoBo bo, PageQuery pageQuery) {
+        MPJLambdaWrapper<ErpContractInfo> lqw = buildQueryWrapper(bo);
+        // 框架合同弹窗 合同大类=3
+        lqw.eq(ErpContractInfo::getContractCategory, "3");
+        lqw.orderByDesc(ErpContractInfo::getFrameworkValidPeriod);
         Page<ErpContractInfoVo> result = baseMapper.selectCustomErpContractInfoVoList(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
@@ -183,6 +201,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
     @Override
     public List<ErpContractInfoVo> queryList(ErpContractInfoBo bo) {
         MPJLambdaWrapper<ErpContractInfo> lqw = buildQueryWrapper(bo);
+        lqw.orderByDesc(ErpContractInfo::getCreateTime);
         return baseMapper.selectCustomErpContractInfoVoList(lqw);
     }
 
@@ -223,9 +242,11 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
                         bo.getCapitalizedAmount())
                 .eq(StringUtils.isNotBlank(bo.getContractTemplateFlag()), ErpContractInfo::getContractTemplateFlag,
                         bo.getContractTemplateFlag())
+                .eq(StringUtils.isNotBlank(bo.getIsFrameworkContract()), ErpContractInfo::getIsFrameworkContract, bo.getIsFrameworkContract())
+                .eq(bo.getFrameworkContractId() != null, ErpContractInfo::getFrameworkContractId, bo.getFrameworkContractId())
+                .eq(bo.getFrameworkValidPeriod() != null, ErpContractInfo::getFrameworkValidPeriod, bo.getFrameworkValidPeriod())
                 .eq("t.del_flag", "0")
                 .eq("t.active_flag", "1");
-        lqw.orderByDesc(ErpContractInfo::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml

@@ -52,6 +52,9 @@
                t.capitalized_amount,
                t.contract_template_flag,
                t.original_contract_id,
+               t.is_framework_contract,
+               t.framework_contract_id,
+               t.framework_valid_period,
                t.del_flag,
                t.create_dept,
                t.create_by,
@@ -71,11 +74,14 @@
                c2.business_contact_phone  twoBusinessContactPhone,
                c2.technical_contact       twoTechnicalContact,
                c2.technical_contact_phone twoTechnicalContactPhone,
-               c3.customer_name      finalCustomerName
+               c3.customer_name      finalCustomerName,
+               fc.contract_code      frameworkContractCode,
+               fc.contract_name      frameworkContractName
         from erp_contract_info t
                  left join crm_customer_info c1 on t.one_customer_id = c1.customer_id
                  left join crm_customer_info c2 on t.two_customer_id = c2.customer_id
                  left join crm_customer_info c3 on t.final_customer_id = c3.customer_id
+                 left join erp_contract_info fc on t.framework_contract_id = fc.contract_id and fc.del_flag = '0'
                  left join sys_dept d on d.dept_id = t.contract_dept_id
                  left join sys_user u on u.user_id = t.contract_manager_id
             ${ew.getCustomSqlSegment}