diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index e5be869..7c1e48f 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/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 - username: root - password: Kfcx@1234 + url: jdbc:mysql://116.62.17.81:53306/loan_pricing?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: znsj + password: Znsj@123456 # 从库数据源 slave: # 从数据源开关/默认关闭 enabled: false url: username: - password: + password: # 初始连接数 initialSize: 5 # 最小连接池数量 diff --git a/ruoyi-loan-pricing/src/test/java/com/ruoyi/loanpricing/domain/vo/LoanPricingWorkflowListVOTest.java b/ruoyi-loan-pricing/src/test/java/com/ruoyi/loanpricing/domain/vo/LoanPricingWorkflowListVOTest.java index be1271c..03d5f8d 100644 --- a/ruoyi-loan-pricing/src/test/java/com/ruoyi/loanpricing/domain/vo/LoanPricingWorkflowListVOTest.java +++ b/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()); diff --git a/ruoyi-loan-pricing/src/test/java/com/ruoyi/loanpricing/mapper/LoanPricingWorkflowMapperXmlTest.java b/ruoyi-loan-pricing/src/test/java/com/ruoyi/loanpricing/mapper/LoanPricingWorkflowMapperXmlTest.java index 7f2f2fc..e0f89a3 100644 --- a/ruoyi-loan-pricing/src/test/java/com/ruoyi/loanpricing/mapper/LoanPricingWorkflowMapperXmlTest.java +++ b/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 diff --git a/ruoyi-ui/tests/workflow-index-refresh.test.js b/ruoyi-ui/tests/workflow-index-refresh.test.js index 8bf3e73..a5c3270 100644 --- a/ruoyi-ui/tests/workflow-index-refresh.test.js +++ b/ruoyi-ui/tests/workflow-index-refresh.test.js @@ -55,6 +55,14 @@ assert(source.includes('icon="el-icon-edit"') && source.includes('>编辑 source.indexOf('label="创建者"'), '机构号列应位于创建者列之后') let refreshCount = 0 component.activated.call({