diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c7983ef..8026b99 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,7 @@ - - - - - - - - @@ -21,26 +13,14 @@ - - - - - - - - - - - - @@ -165,15 +145,15 @@ - + - + - - + + - + @@ -195,65 +175,65 @@ - - + + - + - - + + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -303,15 +283,4 @@ - - - - - file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java - 280 - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java index a43ff00..42eb4ee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java @@ -284,8 +284,8 @@ public class ExpensesController extends BaseController return error("该账户:"+getUsername()+"在OA中不存在"); } - sysOaExpenses.setUserId(oauser.getUserId());//申请人OA ID - sysOaExpenses.setDepartmentId(oauser.getDepartmentId());//申请部门 + sysOaExpenses.setUserId(oauser.getUserId());//办理人OA ID + sysOaExpenses.setDepartmentId(oauser.getDepartmentId());//办理部门 sysOaExpenses.setSubmissionTime(DateUtils.getDate());//提交时间 sysOaExpenses.setExpId(UUID.fastUUID().toString()); @@ -304,8 +304,10 @@ public class ExpensesController extends BaseController sysOaExpenses.setExpExpenditureDate(expenses.getExpExpenditureDate());//支出时间 sysOaExpenses.setExpStaffTureorfales(expenses.getExpStaffTureorfales());//内勤审核（默认否，0-是、1-否） sysOaExpenses.setExpBackOfficeId(expenses.getExpBackOfficeId());//选择内勤 - sysOaExpenses.setExpSalesmanName(expenses.getExpSalesmanName());//申请人 - sysOaExpenses.setExpSalesmanDeptName(expenses.getExpSalesmanDeptName());//申请部门 + + SysOaExpenses oauser2 = expensesService.selectOAUserByUserName(expenses.getExpSalesmanCode());// 查询OA用户 + sysOaExpenses.setOaUserId(oauser2.getUserId());//申请人 + sysOaExpenses.setOaDepartmentId(oauser2.getDepartmentId());//申请部门 sysOaExpenses.setExpAccountName(expenses.getExpAccountName());//账户名 sysOaExpenses.setExpAccountNumber(expenses.getExpAccountNumber());//账号 sysOaExpenses.setExpDepositBank(expenses.getExpDepositBank());//开户银行 diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/expenses/ExpensesController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/expenses/ExpensesController.class index 67f08e1..cdf0ac1 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/web/controller/expenses/ExpensesController.class and b/ruoyi-admin/target/classes/com/ruoyi/web/controller/expenses/ExpensesController.class differ diff --git a/ruoyi-admin/target/maven-archiver/pom.properties b/ruoyi-admin/target/maven-archiver/pom.properties index 6793bff..1e9073b 100644 --- a/ruoyi-admin/target/maven-archiver/pom.properties +++ b/ruoyi-admin/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Aug 13 15:44:25 CST 2024 +#Tue Aug 13 16:30:12 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-admin diff --git a/ruoyi-admin/target/ruoyi-admin.jar b/ruoyi-admin/target/ruoyi-admin.jar index 2ed5d02..37c691b 100644 Binary files a/ruoyi-admin/target/ruoyi-admin.jar and b/ruoyi-admin/target/ruoyi-admin.jar differ diff --git a/ruoyi-admin/target/ruoyi-admin.jar.original b/ruoyi-admin/target/ruoyi-admin.jar.original index 47e6e17..5497cd2 100644 Binary files a/ruoyi-admin/target/ruoyi-admin.jar.original and b/ruoyi-admin/target/ruoyi-admin.jar.original differ diff --git a/ruoyi-common/target/maven-archiver/pom.properties b/ruoyi-common/target/maven-archiver/pom.properties index 882f5c3..3d9f30d 100644 --- a/ruoyi-common/target/maven-archiver/pom.properties +++ b/ruoyi-common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Aug 13 15:43:38 CST 2024 +#Tue Aug 13 16:27:01 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-common diff --git a/ruoyi-common/target/ruoyi-common-3.8.7.jar b/ruoyi-common/target/ruoyi-common-3.8.7.jar index 1bf937f..1125430 100644 Binary files a/ruoyi-common/target/ruoyi-common-3.8.7.jar and b/ruoyi-common/target/ruoyi-common-3.8.7.jar differ diff --git a/ruoyi-framework/target/maven-archiver/pom.properties b/ruoyi-framework/target/maven-archiver/pom.properties index 3598958..0b2f606 100644 --- a/ruoyi-framework/target/maven-archiver/pom.properties +++ b/ruoyi-framework/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Aug 13 15:43:46 CST 2024 +#Tue Aug 13 16:27:08 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-framework diff --git a/ruoyi-framework/target/ruoyi-framework-3.8.7.jar b/ruoyi-framework/target/ruoyi-framework-3.8.7.jar index 4e318f4..3956770 100644 Binary files a/ruoyi-framework/target/ruoyi-framework-3.8.7.jar and b/ruoyi-framework/target/ruoyi-framework-3.8.7.jar differ diff --git a/ruoyi-generator/target/maven-archiver/pom.properties b/ruoyi-generator/target/maven-archiver/pom.properties index 618cac4..8e3d2a0 100644 --- a/ruoyi-generator/target/maven-archiver/pom.properties +++ b/ruoyi-generator/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Aug 13 15:43:48 CST 2024 +#Tue Aug 13 16:27:11 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-generator diff --git a/ruoyi-generator/target/ruoyi-generator-3.8.7.jar b/ruoyi-generator/target/ruoyi-generator-3.8.7.jar index f8d15a6..1d9510f 100644 Binary files a/ruoyi-generator/target/ruoyi-generator-3.8.7.jar and b/ruoyi-generator/target/ruoyi-generator-3.8.7.jar differ diff --git a/ruoyi-quartz/target/maven-archiver/pom.properties b/ruoyi-quartz/target/maven-archiver/pom.properties index f29d769..a37920f 100644 --- a/ruoyi-quartz/target/maven-archiver/pom.properties +++ b/ruoyi-quartz/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Aug 13 15:43:47 CST 2024 +#Tue Aug 13 16:27:10 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-quartz diff --git a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar index cbcf0a0..e9f9560 100644 Binary files a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar and b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar differ diff --git a/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/SysOaExpenses.java b/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/SysOaExpenses.java index ef99871..191dd69 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/SysOaExpenses.java +++ b/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/SysOaExpenses.java @@ -12,6 +12,10 @@ import com.ruoyi.common.core.domain.BaseEntity; */ public class SysOaExpenses extends Expenses { + /** oa申请人id */ + private Integer oaUserId; + /** oa申请人id */ + private Integer oaDepartmentId; /** oa办理人id */ private Integer userId; /** oa办理部门ID */ @@ -23,6 +27,14 @@ public class SysOaExpenses extends Expenses /** 费用支出附件*/ private String fileAddress; + public Integer getOaUserId() { return oaUserId; } + + public void setOaUserId(Integer oaUserId) { this.oaUserId = oaUserId; } + + public Integer getOaDepartmentId() { return oaDepartmentId; } + + public void setOaDepartmentId(Integer oaDepartmentId) { this.oaDepartmentId = oaDepartmentId; } + public Integer getUserId() { return userId; } diff --git a/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml b/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml index b6943f5..4a26459 100644 --- a/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml @@ -216,8 +216,8 @@ exp_expenditure_date, exp_staff_tureorfales, exp_back_office_id, - exp_salesman_name, - exp_salesman_dept_name, + exp_oa_userId, + exp_oa_departmentId, exp_account_name, exp_account_number, exp_deposit_bank, @@ -252,8 +252,8 @@ #{expExpenditureDate}, #{expStaffTureorfales}, #{expBackOfficeId}, - #{expSalesmanName}, - #{expSalesmanDeptName}, + #{oaUserId}, + #{oaDepartmentId}, #{expAccountName}, #{expAccountNumber}, #{expDepositBank}, diff --git a/ruoyi-system/target/classes/com/ruoyi/expenses/domain/SysOaExpenses.class b/ruoyi-system/target/classes/com/ruoyi/expenses/domain/SysOaExpenses.class index 3559af7..0f7e935 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/expenses/domain/SysOaExpenses.class and b/ruoyi-system/target/classes/com/ruoyi/expenses/domain/SysOaExpenses.class differ diff --git a/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml b/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml index b6943f5..4a26459 100644 --- a/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml +++ b/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml @@ -216,8 +216,8 @@ exp_expenditure_date, exp_staff_tureorfales, exp_back_office_id, - exp_salesman_name, - exp_salesman_dept_name, + exp_oa_userId, + exp_oa_departmentId, exp_account_name, exp_account_number, exp_deposit_bank, @@ -252,8 +252,8 @@ #{expExpenditureDate}, #{expStaffTureorfales}, #{expBackOfficeId}, - #{expSalesmanName}, - #{expSalesmanDeptName}, + #{oaUserId}, + #{oaDepartmentId}, #{expAccountName}, #{expAccountNumber}, #{expDepositBank}, diff --git a/ruoyi-system/target/maven-archiver/pom.properties b/ruoyi-system/target/maven-archiver/pom.properties index 25ebb61..d488ff5 100644 --- a/ruoyi-system/target/maven-archiver/pom.properties +++ b/ruoyi-system/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Aug 13 15:43:42 CST 2024 +#Tue Aug 13 16:27:05 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-system diff --git a/ruoyi-system/target/ruoyi-system-3.8.7.jar b/ruoyi-system/target/ruoyi-system-3.8.7.jar index 683f3dd..24c47d8 100644 Binary files a/ruoyi-system/target/ruoyi-system-3.8.7.jar and b/ruoyi-system/target/ruoyi-system-3.8.7.jar differ