1.0.82 合同变更连表查询

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

@@ -122,12 +122,22 @@ public class ErpContractChangeVo implements Serializable {
     @ExcelProperty(value = "承办部门")
     private Long undertakeDeptId;
 
+    /**
+     * 承办部门名称（连表查询）
+     */
+    private String undertakeDeptName;
+
     /**
      * 承办人
      */
     @ExcelProperty(value = "承办人")
     private Long undertakeBy;
 
+    /**
+     * 承办人姓名（连表查询）
+     */
+    private String undertakeByName;
+
     /**
      * 行业/大区
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractChangeMapper.java

@@ -5,6 +5,8 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.oa.erp.domain.ErpContractChange;
 import org.dromara.oa.erp.domain.vo.ErpContractChangeVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -24,6 +26,10 @@ public interface ErpContractChangeMapper extends BaseMapperPlus<ErpContractChang
      * @param queryWrapper 条件
      * @return 合同变更集合
      */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "t.create_dept"),
+            @DataColumn(key = "userName", value = "t.create_by")
+    })
     public Page<ErpContractChangeVo> selectCustomErpContractChangeVoList(@Param("page") Page<ErpContractChangeVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractChange> queryWrapper);
 
     /**
@@ -32,6 +38,10 @@ public interface ErpContractChangeMapper extends BaseMapperPlus<ErpContractChang
      * @param queryWrapper 条件
      * @return 合同变更集合
      */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "t.create_dept"),
+            @DataColumn(key = "userName", value = "t.create_by")
+    })
     public List<ErpContractChangeVo> selectCustomErpContractChangeVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractChange> queryWrapper);
 
 }

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

@@ -87,7 +87,7 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService {
     private static final String CHANGE_STATUS_AVAILABLE = "3";
 
     /**
-     * 根据主键查询合同变更（仅主表）
+     * 根据主键查询合同变更
      *
      * @param contractChangeId 主键
      * @return 合同变更 VO，不存在则 null
@@ -98,7 +98,7 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService {
     }
 
     /**
-     * 分页查询合同变更列表（条件同 queryList，带分页）
+     * 分页查询合同变更列表
      *
      * @param bo        查询条件
      * @param pageQuery 分页参数
@@ -107,12 +107,12 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService {
     @Override
     public TableDataInfo<ErpContractChangeVo> queryPageList(ErpContractChangeBo bo, PageQuery pageQuery) {
         MPJLambdaWrapper<ErpContractChange> lqw = buildQueryWrapper(bo);
-        Page<ErpContractChangeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<ErpContractChangeVo> result = baseMapper.selectCustomErpContractChangeVoList(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
     /**
-     * 根据条件查询合同变更列表（不分页，用于下拉等）
+     * 根据条件查询合同变更列表
      *
      * @param bo 查询条件
      * @return 列表，未逻辑删除的数据
@@ -120,7 +120,7 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService {
     @Override
     public List<ErpContractChangeVo> queryList(ErpContractChangeBo bo) {
         MPJLambdaWrapper<ErpContractChange> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        return baseMapper.selectCustomErpContractChangeVoList(lqw);
     }
 
     /**
@@ -151,7 +151,8 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService {
                 .eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpContractChange::getFlowStatus, bo.getFlowStatus())
                 .eq(StringUtils.isNotBlank(bo.getWriteBackFlag()), ErpContractChange::getWriteBackFlag, bo.getWriteBackFlag())
                 .eq(bo.getWriteBackTime() != null, ErpContractChange::getWriteBackTime, bo.getWriteBackTime())
-                .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractChange::getActiveFlag, bo.getActiveFlag());
+                .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractChange::getActiveFlag, bo.getActiveFlag())
+                .orderByDesc(ErpContractChange::getChangeCode);
     }
 
     // ======================= 主表增删改（单表） =======================

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

@@ -7,7 +7,12 @@
     </resultMap>
 
     <select id="selectCustomErpContractChangeVoList" resultMap="ErpContractChangeResult">
-        select contract_change_id, tenant_id, contract_id, change_code, change_type, change_contract_code, change_contract_name, customer_name, change_contract_amount, contract_code, contract_name, original_customer_name, original_contract_amount, change_reason, apply_time, undertake_dept_id, undertake_by, industry_region, seal_legal_entity, change_status, flow_status, write_back_flag, write_back_time, remark, active_flag, del_flag, create_dept, create_by, create_time, update_by, update_time from erp_contract_change t
+        select t.contract_change_id, t.tenant_id, t.contract_id, t.change_code, t.change_type, t.change_contract_code, t.change_contract_name, t.customer_name, t.change_contract_amount, t.contract_code, t.contract_name, t.original_customer_name, t.original_contract_amount, t.change_reason, t.apply_time, t.undertake_dept_id, t.undertake_by, t.industry_region, t.seal_legal_entity, t.change_status, t.flow_status, t.write_back_flag, t.write_back_time, t.remark, t.active_flag, t.del_flag, t.create_dept, t.create_by, t.create_time, t.update_by, t.update_time,
+               d.dept_name as undertake_dept_name,
+               u.nick_name as undertake_by_name
+        from erp_contract_change t
+        left join sys_dept d on d.dept_id = t.undertake_dept_id
+        left join sys_user u on u.user_id = t.undertake_by
             ${ew.getCustomSqlSegment}
     </select>