dev配置

ruoyi-admin/src/main/resources/application-dev.yml

@@ -25,16 +25,16 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://116.62.17.81:3307/loan-pricing?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://116.62.17.81:53306/loan_pricing?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
+                username: znsj
-                password: Kfcx@1234
+                password: Znsj@123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
                 url: 
                 username: 
-                password: 
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量

ruoyi-loan-pricing/src/test/java/com/ruoyi/loanpricing/domain/vo/LoanPricingWorkflowListVOTest.java

@@ -10,10 +10,12 @@ class LoanPricingWorkflowListVOTest
     void shouldExposeCalculateRateAndExecuteRateFields()
     {
         LoanPricingWorkflowListVO vo = new LoanPricingWorkflowListVO();
+        vo.setDeptId(100L);
         vo.setCustIsn("CUST001");
         vo.setCalculateRate("6.15");
         vo.setExecuteRate("5.80");
 
+        assertEquals(100L, vo.getDeptId());
         assertEquals("CUST001", vo.getCustIsn());
         assertEquals("6.15", vo.getCalculateRate());
         assertEquals("5.80", vo.getExecuteRate());

ruoyi-loan-pricing/src/test/java/com/ruoyi/loanpricing/mapper/LoanPricingWorkflowMapperXmlTest.java

@@ -19,6 +19,7 @@ class LoanPricingWorkflowMapperXmlTest
 
         assertTrue(xml.contains("WHEN lpw.cust_type = '个人' THEN mr.final_calculate_rate"));
         assertTrue(xml.contains("WHEN lpw.cust_type = '企业' THEN mc.final_calculate_rate"));
+        assertTrue(xml.contains("lpw.dept_id AS deptId"));
         assertTrue(xml.contains("lpw.create_by = #{query.dataScopeCreateBy}"));
         assertTrue(xml.contains("lpw.dept_id IN"));
         assertTrue(xml.contains("find_in_set(#{query.dataScopeDeptId}, ancestors)"));
@@ -27,6 +28,10 @@ class LoanPricingWorkflowMapperXmlTest
         assertTrue(xml.contains("lpw.cust_isn LIKE CONCAT('%', #{query.custIsn}, '%')"));
         assertTrue(xml.contains("lpw.id_num LIKE CONCAT('%', #{query.custIsn}, '%')"));
         assertTrue(xml.contains("lpw.cust_name LIKE CONCAT('%', #{query.custIsn}, '%')"));
+        assertTrue(xml.contains("lpw.cust_type = #{query.custType}"));
+        assertTrue(xml.contains("lpw.guar_type = #{query.guarType}"));
+        assertTrue(xml.contains("lpw.create_time >= #{query.beginCreateTime}"));
+        assertTrue(xml.contains("lpw.create_time <= #{query.endCreateTime}"));
     }
 
     @Test

ruoyi-ui/tests/workflow-index-refresh.test.js

@@ -55,6 +55,14 @@ assert(source.includes('icon="el-icon-edit"') && source.includes('>编辑</el-bu
 assert(source.includes('v-if="canEdit(scope.row)"'), '流程列表编辑按钮应只对可编辑行显示')
 assert(source.includes('row.createBy === this.currentCreateBy'), '流程列表应按创建者判断编辑按钮权限')
 assert(source.includes('getWorkflowEdit(row.serialNum)'), '编辑操作应先查询编辑数据')
+assert(source.includes('v-model="queryParams.custType"'), '流程列表应包含客户类型筛选')
+assert(source.includes('v-model="queryParams.guarType"'), '流程列表应包含担保方式筛选')
+assert(source.includes('v-model="dateRange"'), '流程列表应包含创建时间范围筛选')
+assert(source.includes('value-format="yyyy-MM-dd"'), '流程列表创建时间筛选应使用日期值')
+assert(source.includes('beginCreateTime: hasDateRange ? `${this.dateRange[0]} 00:00:00` : undefined'), '流程列表应传递当天零点的顶层创建时间起始参数')
+assert(source.includes('endCreateTime: hasDateRange ? `${this.dateRange[1]} 23:59:59` : undefined'), '流程列表应传递当天末秒的顶层创建时间结束参数')
+assert(source.includes('label="机构号"') && source.includes('prop="deptId"'), '流程列表应展示机构号')
+assert(source.indexOf('label="机构号"') > source.indexOf('label="创建者"'), '机构号列应位于创建者列之后')
 
 let refreshCount = 0
 component.activated.call({