diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a3a2157..33d21ce 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,10 @@ - + + + + @@ -14,10 +17,24 @@ - + + + + + + + + + + + + - + + + + @@ -127,16 +145,16 @@ - - + + - - - + + + - + @@ -147,46 +165,46 @@ - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + @@ -227,16 +245,16 @@ - - + + - - + + - + diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination index 98f74ea..96bd6c5 100644 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -1,7 +1,7 @@ #for tests only ! -#Fri Aug 09 14:26:27 CST 2024 +#Mon Aug 12 13:58:32 CST 2024 jco.client.lang=ZH -jco.client.passwd=654321 +jco.client.passwd=vAHHLPyr/O(DD#l(USpypoVFsBd}{mL?hFwfR/oNp/RvS,LI jco.client.sysnr=00 jco.destination.pool_capacity=10 jco.client.client=800 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 6cc01ab..542addf 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 @@ -2,6 +2,14 @@ package com.ruoyi.web.controller.expenses; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.uuid.UUID; +import com.ruoyi.framework.changeRecord.ChangeRecordLog; +import com.ruoyi.system.service.ISysDeptService; +import com.ruoyi.system.service.ISysUserService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -34,6 +42,36 @@ public class ExpensesController extends BaseController @Autowired private IExpensesService expensesService; + @Autowired + private ISysUserService userService; + + @Autowired + private ISysDeptService deptService; + + /** + * 分派 + */ + @PreAuthorize("@ss.hasPermi('expenses:expenses:assign')") + @ChangeRecordLog(serviceImplclass = "com.ruoyi.expenses.service.impl.ExpensesServiceImpl", + serviceImplMethod="selectExpensesByExpId", + tableId = "expId",codeName = "expCode",title = "费用支出单据分派") + @PostMapping("/expAssign") + public AjaxResult expAssign(@RequestBody Expenses expenses) + { + String[] expIds = expenses.getExpIds(); + String expReceiveUserId = expenses.getExpReceiveUserId(); + for(String expId:expIds){ + Expenses entity = expensesService.selectExpensesByExpId(expId); + if(!"1".equals(entity.getExpApprovalStatus())){ + return error("费用支出信息:"+entity.getExpCode()+" 当前状态不是协助中"); + } + entity.setExpDispatchStatus("1");//更新 是否已分派 为已分派 + entity.setExpReceiveUserId(expReceiveUserId); + expensesService.updateExpenses(entity); + } + return success(); + } + /** * 查询费用支出列表 */ @@ -42,6 +80,14 @@ public class ExpensesController extends BaseController public TableDataInfo list(Expenses expenses) { startPage(); + + Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID_BSZZY")||SecurityUtils.hasRole("BID_ZHGLY"); + Boolean adminRoleFlag = SecurityUtils.hasRole("admin"); + if(bidJlRoleFlag&&!adminRoleFlag){ + expenses.setExpDispatchStatus("1");//查询已分派的单据 + expenses.setExpReceiveUserId(getUserId()+""); + } + List list = expensesService.selectExpensesList(expenses); return getDataTable(list); } @@ -50,7 +96,6 @@ public class ExpensesController extends BaseController * 导出费用支出列表 */ @PreAuthorize("@ss.hasPermi('expenses:expenses:export')") - @Log(title = "费用支出", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, Expenses expenses) { @@ -73,24 +118,126 @@ public class ExpensesController extends BaseController * 新增费用支出 */ @PreAuthorize("@ss.hasPermi('expenses:expenses:add')") - @Log(title = "费用支出", businessType = BusinessType.INSERT) + @ChangeRecordLog(serviceImplclass = "com.ruoyi.expenses.service.impl.ExpensesServiceImpl", + serviceImplMethod="selectExpensesByExpId", + tableId = "expId",codeName = "expCode",title = "费用支出新增") @PostMapping public AjaxResult add(@RequestBody Expenses expenses) { - return toAjax(expensesService.insertExpenses(expenses)); + expenses.setExpId(UUID.fastUUID().toString()); + String bidCode = expensesService.getCode("TBFYZC"); + expenses.setExpCode(bidCode); + + // 获取用户角色 --判断是否有新建权限 + Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_BSZZY")||SecurityUtils.hasRole("BID_ZHGLY"); + if(bidJlRoleFlag){ + Long deptId = userService.selectUserByUserName(expenses.getExpSalesmanCode()).getDeptId(); + expenses.setExpSalesmanDeptId(String.valueOf(deptId)); + SysDept sysDept = deptService.selectDeptById(deptId); + expenses.setExpSalesmanDeptName(sysDept.getDeptName()); + + //获取用户ID + String userId = String.valueOf(userService.selectUserByUserName(expenses.getExpSalesmanCode()).getUserId()); + expenses.setCreateBy(userId); + expenses.setUpdateBy(userId); + }else{ + expenses.setCreateBy(String.valueOf(getUserId())); + expenses.setUpdateBy(String.valueOf(getUserId())); + } + + expensesService.insertExpenses(expenses); + return success(expenses); } /** * 修改费用支出 */ @PreAuthorize("@ss.hasPermi('expenses:expenses:edit')") - @Log(title = "费用支出", businessType = BusinessType.UPDATE) + @ChangeRecordLog(serviceImplclass = "com.ruoyi.expenses.service.impl.ExpensesServiceImpl", + serviceImplMethod="selectExpensesByExpId", + tableId = "expId",codeName = "expCode",title = "费用支出新增") @PutMapping public AjaxResult edit(@RequestBody Expenses expenses) { + // 获取用户角色 --判断是否有新建权限 + Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_BSZZY")||SecurityUtils.hasRole("BID_ZHGLY"); + if(bidJlRoleFlag){ + Long deptId = userService.selectUserByUserName(expenses.getExpSalesmanCode()).getDeptId(); + expenses.setExpSalesmanDeptId(String.valueOf(deptId)); + SysDept sysDept = deptService.selectDeptById(deptId); + expenses.setExpSalesmanDeptName(sysDept.getDeptName()); + + //获取用户ID + String userId = String.valueOf(userService.selectUserByUserName(expenses.getExpSalesmanCode()).getUserId()); + expenses.setCreateBy(userId); + expenses.setUpdateBy(userId); + }else{ + expenses.setUpdateBy(String.valueOf(getUserId())); + } return toAjax(expensesService.updateExpenses(expenses)); } + /** + * 提交投标办按钮 + */ + @PreAuthorize("@ss.hasPermi('expenses:expenses:commit')") + @ChangeRecordLog(serviceImplclass = "com.ruoyi.expenses.service.impl.ExpensesServiceImpl", + serviceImplMethod="selectExpensesByExpId", + tableId = "expId",codeName = "expCode",title = "业务员提交投标办") + @PostMapping("/commitExp") + public AjaxResult commitExp(@RequestBody Expenses expenses) + { + try{ + expenses.setExpApprovalStatus("1"); + Long deptId = getLoginUser().getUser().getDeptId(); + // 获取用户角色 --判断是否有新建权限 + Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_BSZZY")||SecurityUtils.hasRole("BID_ZHGLY"); + if(bidJlRoleFlag){ + deptId = userService.selectUserByUserName(expenses.getExpSalesmanCode()).getDeptId(); + } + SysDept sysDept = deptService.selectDeptById(deptId); + + String doa_id = expenses.getExpId(); + String doaNumber = expensesService.getCodeExp("FZ"); + expenses.setExpNumber(doaNumber); + + if(StringUtils.isEmpty(doa_id)){ + expenses.setExpId(UUID.fastUUID().toString()); + String doaCode = expensesService.getCode("TBFYZC"); + expenses.setExpCode(doaCode); + + if(bidJlRoleFlag){ + expenses.setExpSalesmanDeptId(String.valueOf(deptId)); + expenses.setExpSalesmanDeptName(sysDept.getDeptName()); + + String userId = String.valueOf(userService.selectUserByUserName(expenses.getExpSalesmanCode()).getUserId()); + expenses.setCreateBy(userId); + }else{ + expenses.setCreateBy(String.valueOf(getUserId())); + } + expensesService.insertExpenses(expenses); + return success(); + }else{ + if(bidJlRoleFlag){ + expenses.setExpSalesmanDeptId(String.valueOf(deptId)); + expenses.setExpSalesmanDeptName(sysDept.getDeptName()); + + String userId = String.valueOf(userService.selectUserByUserName(expenses.getExpSalesmanCode()).getUserId()); + expenses.setCreateBy(userId); + expenses.setUpdateBy(userId); + }else{ + expenses.setUpdateBy(String.valueOf(getUserId())); + } + + expenses.setExpReturnRemark("");//驳回后再次提交清除驳回原因 + expensesService.updateExpenses(expenses); + return success(); + } + }catch (Exception e){ + return error("系统异常"); + } + } + /** * 删除费用支出 */ 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 8c5c50b..6f1d4fc 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 7704d64..e5e9748 100644 --- a/ruoyi-admin/target/maven-archiver/pom.properties +++ b/ruoyi-admin/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Mon Aug 12 08:02:54 CST 2024 +#Mon Aug 12 14:13:40 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 ffd261d..ee6864b 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 171d14f..4091153 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 c58b26f..cfd9df4 100644 --- a/ruoyi-common/target/maven-archiver/pom.properties +++ b/ruoyi-common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Mon Aug 12 08:02:41 CST 2024 +#Mon Aug 12 14:13:23 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 e02cc2e..fd90294 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 3b3ce5c..a8c64cc 100644 --- a/ruoyi-framework/target/maven-archiver/pom.properties +++ b/ruoyi-framework/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Mon Aug 12 08:02:48 CST 2024 +#Mon Aug 12 14:13:31 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 6b496b3..eb4fc3f 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 9851f5e..115e903 100644 --- a/ruoyi-generator/target/maven-archiver/pom.properties +++ b/ruoyi-generator/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Mon Aug 12 08:02:49 CST 2024 +#Mon Aug 12 14:13:34 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 232a10c..3ce0fd8 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 4918088..550ad2d 100644 --- a/ruoyi-quartz/target/maven-archiver/pom.properties +++ b/ruoyi-quartz/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Mon Aug 12 08:02:49 CST 2024 +#Mon Aug 12 14:13:33 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 49895bd..bfe2863 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/Expenses.java b/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/Expenses.java index 8952a8d..b4042e6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/Expenses.java +++ b/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/Expenses.java @@ -1,5 +1,6 @@ package com.ruoyi.expenses.domain; +import com.ruoyi.common.annotation.DataName; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -17,20 +18,30 @@ public class Expenses extends BaseEntity /** */ private String expId; + private String[] expIds; /** 支出编号 */ - @Excel(name = "支出编号") + @DataName(name = "费用支出单号") + @Excel(name = "费用支出单号") private String expCode; + /** 标书编号 */ + @DataName(name = "费用支出编号") + @Excel(name = "费用支出编号") + private String expNumber; + /** 资格预审编号 */ + @DataName(name = "资格预审编号") @Excel(name = "资格预审编号") private String expPqCode; /** 标书编号 */ + @DataName(name = "标书编号") @Excel(name = "标书编号") private String expBidCode; /** 支出形式 */ + @DataName(name = "支出形式") @Excel(name = "支出形式") private String expExpenditureMode; @@ -38,41 +49,52 @@ public class Expenses extends BaseEntity private String expCustomerBm; /** 客户名称(必选) */ + @DataName(name = "客户名称") @Excel(name = "客户名称") private String expCustomerName; /** 支出人 */ + @DataName(name = "支出人") @Excel(name = "支出人") private String expExpenditurePeople; /** 项目名称 */ + @DataName(name = "项目名称") private String expProject; /** 预计归还日期 */ + @DataName(name = "预计归还日期") private String expReturnDate; /** 支出类别 */ + @DataName(name = "支出类别") @Excel(name = "支出类别") private String expExpenditureType; /** 支出金额 */ + @DataName(name = "支出金额") @Excel(name = "支出金额") private Long expExpenditureAmount; /** 投标区域 */ + @DataName(name = "投标区域") private String expBidArea; /** 支出时间 */ + @DataName(name = "支出时间") @Excel(name = "支出时间") private String expExpenditureDate; /** 支出金额 (大写) */ + @DataName(name = "支出金额 (大写)") private String expExpenditureAmountUppercase; /** 是否有内勤 */ + @DataName(name = "是否有内勤",readConverterExp="0=是,1=否") private String expStaffTureorfales; /** 选择内勤 */ + @DataName(name = "选择内勤") private String expBackOffice; /** 业务员账号 */ @@ -82,6 +104,7 @@ public class Expenses extends BaseEntity private String expSalesmanBm; /** 业务员 */ + @DataName(name = "业务员") @Excel(name = "业务员") private String expSalesmanName; @@ -89,47 +112,72 @@ public class Expenses extends BaseEntity private String expSalesmanDeptId; /** 部门名 */ + @DataName(name = "部门") private String expSalesmanDeptName; /** 分派状态 */ - @Excel(name = "分派状态") + @DataName(name = "分派状态",readConverterExp="0=未分派,1=已分派") + @Excel(name = "分派状态",dictType = "exp_dispatch_status") private String expDispatchStatus; /** 账户名 */ + @DataName(name = "账户名") private String expAccountName; /** 账号 */ + @DataName(name = "账号") private String expAccountNumber; /** 开户银行 */ + @DataName(name = "开户银行") private String expDepositBank; /** 行号及其他 */ + @DataName(name = "行号及其他") private String expLineNumberAndOthres; /** 申请说明 */ + @DataName(name = "申请说明") private String expRequestRemark; - /** OA返回备注 */ + /** OA反馈说明 */ + @DataName(name = "OA反馈说明") + private String expOaRemark; + + /** 驳回原因 */ + @DataName(name = "驳回原因") private String expReturnRemark; /** 业务员提交状态 */ - @Excel(name = "提交状态") + @DataName(name = "提交状态",readConverterExp="0=待提交,1=协助中,2=已完成,3=已驳回") + @Excel(name = "提交状态",dictType = "exp_approval_status") private String expApprovalStatus; /** OA审批状态 */ - @Excel(name = "OA审批状态") + @DataName(name = "OA审批状态",readConverterExp="0=待提交,1=审批中,2=已通过,3=已驳回") + @Excel(name = "OA审批状态",dictType = "exp_oa_approval_status") private String expOaApprovalStatus; + + /** 分派接收人ID */ + private String expReceiveUserId; + + /** 分派接收人 */ + @DataName(name = "分派接收人") + private String expReceiveUserNickName; + public void setExpId(String expId) { this.expId = expId; } - public String getExpId() { return expId; } + + public String[] getExpIds() { return expIds; } + public void setExpIds(String[] expIds) { this.expIds = expIds; } + public void setExpCode(String expCode) { this.expCode = expCode; @@ -139,6 +187,9 @@ public class Expenses extends BaseEntity { return expCode; } + public String getExpNumber() { return expNumber; } + + public void setExpNumber(String expNumber) { this.expNumber = expNumber; } public void setExpPqCode(String expPqCode) { this.expPqCode = expPqCode; @@ -355,15 +406,15 @@ public class Expenses extends BaseEntity { return expDepositBank; } - public void setExpLineNumberAndOthres(String expLineNumberAndOthres) - { - this.expLineNumberAndOthres = expLineNumberAndOthres; - } + public void setExpLineNumberAndOthres(String expLineNumberAndOthres) { this.expLineNumberAndOthres = expLineNumberAndOthres; } public String getExpLineNumberAndOthres() { return expLineNumberAndOthres; } + public String getExpOaRemark() { return expOaRemark; } + + public void setExpOaRemark(String expOaRemark) { this.expOaRemark = expOaRemark; } public void setExpRequestRemark(String expRequestRemark) { this.expRequestRemark = expRequestRemark; @@ -400,45 +451,10 @@ public class Expenses extends BaseEntity { return expOaApprovalStatus; } + public String getExpReceiveUserId() { return expReceiveUserId; } - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("expId", getExpId()) - .append("expCode", getExpCode()) - .append("expPqCode", getExpPqCode()) - .append("expBidCode", getExpBidCode()) - .append("expExpenditureMode", getExpExpenditureMode()) - .append("expCustomerBm", getExpCustomerBm()) - .append("expCustomerName", getExpCustomerName()) - .append("expExpenditurePeople", getExpExpenditurePeople()) - .append("expProject", getExpProject()) - .append("expReturnDate", getExpReturnDate()) - .append("expExpenditureType", getExpExpenditureType()) - .append("expExpenditureAmount", getExpExpenditureAmount()) - .append("expBidArea", getExpBidArea()) - .append("expExpenditureDate", getExpExpenditureDate()) - .append("expExpenditureAmountUppercase", getExpExpenditureAmountUppercase()) - .append("expStaffTureorfales", getExpStaffTureorfales()) - .append("expBackOffice", getExpBackOffice()) - .append("expSalesmanCode", getExpSalesmanCode()) - .append("expSalesmanBm", getExpSalesmanBm()) - .append("expSalesmanName", getExpSalesmanName()) - .append("expSalesmanDeptId", getExpSalesmanDeptId()) - .append("expSalesmanDeptName", getExpSalesmanDeptName()) - .append("expDispatchStatus", getExpDispatchStatus()) - .append("expAccountName", getExpAccountName()) - .append("expAccountNumber", getExpAccountNumber()) - .append("expDepositBank", getExpDepositBank()) - .append("expLineNumberAndOthres", getExpLineNumberAndOthres()) - .append("expRequestRemark", getExpRequestRemark()) - .append("expReturnRemark", getExpReturnRemark()) - .append("expApprovalStatus", getExpApprovalStatus()) - .append("expOaApprovalStatus", getExpOaApprovalStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } + public void setExpReceiveUserId(String expReceiveUserId) { this.expReceiveUserId = expReceiveUserId; } + public String getExpReceiveUserNickName() { return expReceiveUserNickName; } + + public void setExpReceiveUserNickName(String expReceiveUserNickName) { this.expReceiveUserNickName = expReceiveUserNickName; } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/expenses/mapper/ExpensesMapper.java b/ruoyi-system/src/main/java/com/ruoyi/expenses/mapper/ExpensesMapper.java index 3291833..32cc0b9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/expenses/mapper/ExpensesMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/expenses/mapper/ExpensesMapper.java @@ -1,19 +1,21 @@ package com.ruoyi.expenses.mapper; import java.util.List; + +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.expenses.domain.Expenses; /** * 费用支出Mapper接口 - * + * * @author ruoyi * @date 2024-07-30 */ -public interface ExpensesMapper +public interface ExpensesMapper { /** * 查询费用支出 - * + * * @param expId 费用支出主键 * @return 费用支出 */ @@ -21,7 +23,7 @@ public interface ExpensesMapper /** * 查询费用支出列表 - * + * * @param expenses 费用支出 * @return 费用支出集合 */ @@ -29,7 +31,7 @@ public interface ExpensesMapper /** * 新增费用支出 - * + * * @param expenses 费用支出 * @return 结果 */ @@ -37,7 +39,7 @@ public interface ExpensesMapper /** * 修改费用支出 - * + * * @param expenses 费用支出 * @return 结果 */ @@ -45,7 +47,7 @@ public interface ExpensesMapper /** * 删除费用支出 - * + * * @param expId 费用支出主键 * @return 结果 */ @@ -53,9 +55,23 @@ public interface ExpensesMapper /** * 批量删除费用支出 - * + * * @param expIds 需要删除的数据主键集合 * @return 结果 */ public int deleteExpensesByExpIds(String[] expIds); + + /** + * 获取系统单据编号 + * @param type + * @return + */ + String getCode(String type); + + /** + * 获取系统单据业务编号 + * @param type + * @return + */ + String getCodeExp(String type); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/expenses/service/IExpensesService.java b/ruoyi-system/src/main/java/com/ruoyi/expenses/service/IExpensesService.java index b3202b9..d1c65a6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/expenses/service/IExpensesService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/expenses/service/IExpensesService.java @@ -1,19 +1,21 @@ package com.ruoyi.expenses.service; import java.util.List; + +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.expenses.domain.Expenses; /** * 费用支出Service接口 - * + * * @author ruoyi * @date 2024-07-30 */ -public interface IExpensesService +public interface IExpensesService { /** * 查询费用支出 - * + * * @param expId 费用支出主键 * @return 费用支出 */ @@ -21,7 +23,7 @@ public interface IExpensesService /** * 查询费用支出列表 - * + * * @param expenses 费用支出 * @return 费用支出集合 */ @@ -29,7 +31,7 @@ public interface IExpensesService /** * 新增费用支出 - * + * * @param expenses 费用支出 * @return 结果 */ @@ -37,7 +39,7 @@ public interface IExpensesService /** * 修改费用支出 - * + * * @param expenses 费用支出 * @return 结果 */ @@ -45,7 +47,7 @@ public interface IExpensesService /** * 批量删除费用支出 - * + * * @param expIds 需要删除的费用支出主键集合 * @return 结果 */ @@ -53,9 +55,23 @@ public interface IExpensesService /** * 删除费用支出信息 - * + * * @param expId 费用支出主键 * @return 结果 */ public int deleteExpensesByExpId(String expId); + + /** + * 获取系统单据编号 + * @param type + * @return + */ + String getCode(String type); + + /** + * 获取系统单据业务编号 + * @param type + * @return + */ + String getCodeExp(String type); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.java index 8dea8d8..8733336 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.java @@ -1,28 +1,32 @@ package com.ruoyi.expenses.service.impl; import java.util.List; + +import com.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.expenses.mapper.ExpensesMapper; import com.ruoyi.expenses.domain.Expenses; import com.ruoyi.expenses.service.IExpensesService; +import org.springframework.transaction.annotation.Transactional; /** * 费用支出Service业务层处理 - * + * * @author ruoyi * @date 2024-07-30 */ @Service -public class ExpensesServiceImpl implements IExpensesService +public class ExpensesServiceImpl implements IExpensesService { @Autowired private ExpensesMapper expensesMapper; /** * 查询费用支出 - * + * * @param expId 费用支出主键 * @return 费用支出 */ @@ -34,10 +38,11 @@ public class ExpensesServiceImpl implements IExpensesService /** * 查询费用支出列表 - * + * * @param expenses 费用支出 * @return 费用支出 */ + @DataScope(deptAlias = "d", userAlias = "u") @Override public List selectExpensesList(Expenses expenses) { @@ -46,10 +51,11 @@ public class ExpensesServiceImpl implements IExpensesService /** * 新增费用支出 - * + * * @param expenses 费用支出 * @return 结果 */ + @Transactional @Override public int insertExpenses(Expenses expenses) { @@ -59,10 +65,11 @@ public class ExpensesServiceImpl implements IExpensesService /** * 修改费用支出 - * + * * @param expenses 费用支出 * @return 结果 */ + @Transactional @Override public int updateExpenses(Expenses expenses) { @@ -72,7 +79,7 @@ public class ExpensesServiceImpl implements IExpensesService /** * 批量删除费用支出 - * + * * @param expIds 需要删除的费用支出主键 * @return 结果 */ @@ -84,7 +91,7 @@ public class ExpensesServiceImpl implements IExpensesService /** * 删除费用支出信息 - * + * * @param expId 费用支出主键 * @return 结果 */ @@ -93,4 +100,24 @@ public class ExpensesServiceImpl implements IExpensesService { return expensesMapper.deleteExpensesByExpId(expId); } + + /** + * 获取系统单据编号 + * @param type + * @return + */ + @Override + public String getCode(String type) { + return expensesMapper.getCode(type); + } + + /** + * 获取系统单据业务编号 + * @param type + * @return + */ + @Override + public String getCodeExp(String type) { + return expensesMapper.getCodeExp(type); + } } diff --git a/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml b/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml index b62cb4e..8bbe912 100644 --- a/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml @@ -71,7 +71,7 @@ and doa_power_attorney_purpose = #{doaPowerAttorneyPurpose} and doa_approval_status = #{doaApprovalStatus} and doa_standardizer like concat('%', #{doaStandardizer}, '%') - + ${params.dataScope} diff --git a/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml b/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml index 93472db..d982cae 100644 --- a/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml @@ -5,60 +5,86 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + left join sys_user u on u.user_id=a.create_by + left join sys_user u2 on u2.user_id=a.exp_receive_user_id + left join sys_dept d on u.dept_id = d.dept_id + + - select exp_id, exp_code, exp_pq_code, exp_bid_code, exp_expenditure_mode, exp_customer_bm, exp_customer_name, exp_expenditure_people, exp_project, exp_return_date, exp_expenditure_type, exp_expenditure_amount, exp_bid_area, exp_expenditure_date, exp_expenditure_amount_uppercase, exp_staff_tureorfales, exp_back_office, exp_salesman_code, exp_salesman_bm, exp_salesman_name, exp_salesman_dept_id, exp_salesman_dept_name, exp_dispatch_status, exp_account_name, exp_account_number, exp_deposit_bank, exp_line_number_and_othres, exp_request_remark, exp_return_remark, exp_approval_status, exp_oa_approval_status, create_by, create_time, update_by, update_time from expenses + select a.exp_id, a.exp_code, a.exp_pq_code, a.exp_number, a.exp_bid_code, a.exp_expenditure_mode, a.exp_customer_bm, + a.exp_customer_name, a.exp_expenditure_people, a.exp_project, a.exp_return_date, + a.exp_expenditure_type, a.exp_expenditure_amount, a.exp_bid_area, a.exp_expenditure_date, + a.exp_expenditure_amount_uppercase, a.exp_staff_tureorfales, a.exp_back_office, + a.exp_salesman_code, a.exp_salesman_bm, a.exp_salesman_name, a.exp_salesman_dept_id, + a.exp_salesman_dept_name, a.exp_dispatch_status, a.exp_account_name, a.exp_account_number, + a.exp_deposit_bank, a.exp_line_number_and_othres, a.exp_request_remark, a.exp_return_remark, + a.exp_approval_status, a.exp_oa_approval_status,a.exp_oa_remark, a.exp_receive_user_id, u2.nick_name exp_receive_user_nick_name, + a.create_by, a.create_time, a.update_by, a.update_time + from expenses a + @@ -70,118 +96,133 @@ insert into expenses - exp_id, - exp_code, - exp_pq_code, - exp_bid_code, - exp_expenditure_mode, - exp_customer_bm, - exp_customer_name, - exp_expenditure_people, - exp_project, - exp_return_date, - exp_expenditure_type, - exp_expenditure_amount, - exp_bid_area, - exp_expenditure_date, - exp_expenditure_amount_uppercase, - exp_staff_tureorfales, - exp_back_office, - exp_salesman_code, - exp_salesman_bm, - exp_salesman_name, - exp_salesman_dept_id, - exp_salesman_dept_name, - exp_dispatch_status, - exp_account_name, - exp_account_number, - exp_deposit_bank, - exp_line_number_and_othres, - exp_request_remark, - exp_return_remark, - exp_approval_status, - exp_oa_approval_status, - create_by, - create_time, - update_by, - update_time, + exp_id, + exp_code, + exp_number, + exp_pq_code, + exp_bid_code, + exp_expenditure_mode, + exp_customer_bm, + exp_customer_name, + exp_expenditure_people, + exp_project, + exp_return_date, + exp_expenditure_type, + exp_expenditure_amount, + exp_bid_area, + exp_expenditure_date, + exp_expenditure_amount_uppercase, + exp_staff_tureorfales, + exp_back_office, + exp_salesman_code, + exp_salesman_bm, + exp_salesman_name, + exp_salesman_dept_id, + exp_salesman_dept_name, + exp_dispatch_status, + exp_account_name, + exp_account_number, + exp_deposit_bank, + exp_line_number_and_othres, + exp_request_remark, + exp_return_remark, + exp_approval_status, + exp_oa_approval_status, + exp_oa_remark, + exp_receive_user_id, + exp_receive_user_nick_name, + + create_by, + create_time, + update_by, + update_time, - #{expId}, - #{expCode}, - #{expPqCode}, - #{expBidCode}, - #{expExpenditureMode}, - #{expCustomerBm}, - #{expCustomerName}, - #{expExpenditurePeople}, - #{expProject}, - #{expReturnDate}, - #{expExpenditureType}, - #{expExpenditureAmount}, - #{expBidArea}, - #{expExpenditureDate}, - #{expExpenditureAmountUppercase}, - #{expStaffTureorfales}, - #{expBackOffice}, - #{expSalesmanCode}, - #{expSalesmanBm}, - #{expSalesmanName}, - #{expSalesmanDeptId}, - #{expSalesmanDeptName}, - #{expDispatchStatus}, - #{expAccountName}, - #{expAccountNumber}, - #{expDepositBank}, - #{expLineNumberAndOthres}, - #{expRequestRemark}, - #{expReturnRemark}, - #{expApprovalStatus}, - #{expOaApprovalStatus}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, + #{expId}, + #{expCode}, + #{expNumber}, + #{expPqCode}, + #{expBidCode}, + #{expExpenditureMode}, + #{expCustomerBm}, + #{expCustomerName}, + #{expExpenditurePeople}, + #{expProject}, + #{expReturnDate}, + #{expExpenditureType}, + #{expExpenditureAmount}, + #{expBidArea}, + #{expExpenditureDate}, + #{expExpenditureAmountUppercase}, + #{expStaffTureorfales}, + #{expBackOffice}, + #{expSalesmanCode}, + #{expSalesmanBm}, + #{expSalesmanName}, + #{expSalesmanDeptId}, + #{expSalesmanDeptName}, + #{expDispatchStatus}, + #{expAccountName}, + #{expAccountNumber}, + #{expDepositBank}, + #{expLineNumberAndOthres}, + #{expRequestRemark}, + #{expReturnRemark}, + #{expApprovalStatus}, + #{expOaApprovalStatus}, + #{expOaRemark}, + #{expReceiveUserId}, + #{expReceiveUserNickName}, + + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, update expenses - exp_code = #{expCode}, - exp_pq_code = #{expPqCode}, - exp_bid_code = #{expBidCode}, - exp_expenditure_mode = #{expExpenditureMode}, - exp_customer_bm = #{expCustomerBm}, - exp_customer_name = #{expCustomerName}, - exp_expenditure_people = #{expExpenditurePeople}, - exp_project = #{expProject}, - exp_return_date = #{expReturnDate}, - exp_expenditure_type = #{expExpenditureType}, - exp_expenditure_amount = #{expExpenditureAmount}, - exp_bid_area = #{expBidArea}, - exp_expenditure_date = #{expExpenditureDate}, - exp_expenditure_amount_uppercase = #{expExpenditureAmountUppercase}, - exp_staff_tureorfales = #{expStaffTureorfales}, - exp_back_office = #{expBackOffice}, - exp_salesman_code = #{expSalesmanCode}, - exp_salesman_bm = #{expSalesmanBm}, - exp_salesman_name = #{expSalesmanName}, - exp_salesman_dept_id = #{expSalesmanDeptId}, - exp_salesman_dept_name = #{expSalesmanDeptName}, - exp_dispatch_status = #{expDispatchStatus}, - exp_account_name = #{expAccountName}, - exp_account_number = #{expAccountNumber}, - exp_deposit_bank = #{expDepositBank}, - exp_line_number_and_othres = #{expLineNumberAndOthres}, - exp_request_remark = #{expRequestRemark}, - exp_return_remark = #{expReturnRemark}, - exp_approval_status = #{expApprovalStatus}, - exp_oa_approval_status = #{expOaApprovalStatus}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, + exp_code = #{expCode}, + exp_pq_code = #{expPqCode}, + exp_number = #{expNumber}, + exp_bid_code = #{expBidCode}, + exp_expenditure_mode = #{expExpenditureMode}, + exp_customer_bm = #{expCustomerBm}, + exp_customer_name = #{expCustomerName}, + exp_expenditure_people = #{expExpenditurePeople}, + exp_project = #{expProject}, + exp_return_date = #{expReturnDate}, + exp_expenditure_type = #{expExpenditureType}, + exp_expenditure_amount = #{expExpenditureAmount}, + exp_bid_area = #{expBidArea}, + exp_expenditure_date = #{expExpenditureDate}, + exp_expenditure_amount_uppercase = #{expExpenditureAmountUppercase}, + exp_staff_tureorfales = #{expStaffTureorfales}, + exp_back_office = #{expBackOffice}, + exp_salesman_code = #{expSalesmanCode}, + exp_salesman_bm = #{expSalesmanBm}, + exp_salesman_name = #{expSalesmanName}, + exp_salesman_dept_id = #{expSalesmanDeptId}, + exp_salesman_dept_name = #{expSalesmanDeptName}, + exp_dispatch_status = #{expDispatchStatus}, + exp_account_name = #{expAccountName}, + exp_account_number = #{expAccountNumber}, + exp_deposit_bank = #{expDepositBank}, + exp_line_number_and_othres = #{expLineNumberAndOthres}, + exp_request_remark = #{expRequestRemark}, + exp_return_remark = #{expReturnRemark}, + exp_approval_status = #{expApprovalStatus}, + exp_oa_approval_status = #{expOaApprovalStatus}, + exp_oa_remark = #{expOaRemark}, + exp_receive_user_id = #{expReceiveUserId}, + exp_receive_user_nick_name = #{expReceiveUserNickName}, + + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, where exp_id = #{expId} @@ -196,4 +237,11 @@ #{expId} + + + diff --git a/ruoyi-system/target/classes/com/ruoyi/expenses/domain/Expenses.class b/ruoyi-system/target/classes/com/ruoyi/expenses/domain/Expenses.class index c456749..676e371 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/expenses/domain/Expenses.class and b/ruoyi-system/target/classes/com/ruoyi/expenses/domain/Expenses.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/expenses/mapper/ExpensesMapper.class b/ruoyi-system/target/classes/com/ruoyi/expenses/mapper/ExpensesMapper.class index 10f4d2f..550da2d 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/expenses/mapper/ExpensesMapper.class and b/ruoyi-system/target/classes/com/ruoyi/expenses/mapper/ExpensesMapper.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/expenses/service/IExpensesService.class b/ruoyi-system/target/classes/com/ruoyi/expenses/service/IExpensesService.class index c5bc05e..e2d43b2 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/expenses/service/IExpensesService.class and b/ruoyi-system/target/classes/com/ruoyi/expenses/service/IExpensesService.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.class b/ruoyi-system/target/classes/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.class index 8e1a495..0d8e85a 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.class and b/ruoyi-system/target/classes/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.class differ diff --git a/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml b/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml index b62cb4e..8bbe912 100644 --- a/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml +++ b/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml @@ -71,7 +71,7 @@ and doa_power_attorney_purpose = #{doaPowerAttorneyPurpose} and doa_approval_status = #{doaApprovalStatus} and doa_standardizer like concat('%', #{doaStandardizer}, '%') - + ${params.dataScope} diff --git a/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml b/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml index 93472db..d982cae 100644 --- a/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml +++ b/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml @@ -5,60 +5,86 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + left join sys_user u on u.user_id=a.create_by + left join sys_user u2 on u2.user_id=a.exp_receive_user_id + left join sys_dept d on u.dept_id = d.dept_id + + - select exp_id, exp_code, exp_pq_code, exp_bid_code, exp_expenditure_mode, exp_customer_bm, exp_customer_name, exp_expenditure_people, exp_project, exp_return_date, exp_expenditure_type, exp_expenditure_amount, exp_bid_area, exp_expenditure_date, exp_expenditure_amount_uppercase, exp_staff_tureorfales, exp_back_office, exp_salesman_code, exp_salesman_bm, exp_salesman_name, exp_salesman_dept_id, exp_salesman_dept_name, exp_dispatch_status, exp_account_name, exp_account_number, exp_deposit_bank, exp_line_number_and_othres, exp_request_remark, exp_return_remark, exp_approval_status, exp_oa_approval_status, create_by, create_time, update_by, update_time from expenses + select a.exp_id, a.exp_code, a.exp_pq_code, a.exp_number, a.exp_bid_code, a.exp_expenditure_mode, a.exp_customer_bm, + a.exp_customer_name, a.exp_expenditure_people, a.exp_project, a.exp_return_date, + a.exp_expenditure_type, a.exp_expenditure_amount, a.exp_bid_area, a.exp_expenditure_date, + a.exp_expenditure_amount_uppercase, a.exp_staff_tureorfales, a.exp_back_office, + a.exp_salesman_code, a.exp_salesman_bm, a.exp_salesman_name, a.exp_salesman_dept_id, + a.exp_salesman_dept_name, a.exp_dispatch_status, a.exp_account_name, a.exp_account_number, + a.exp_deposit_bank, a.exp_line_number_and_othres, a.exp_request_remark, a.exp_return_remark, + a.exp_approval_status, a.exp_oa_approval_status,a.exp_oa_remark, a.exp_receive_user_id, u2.nick_name exp_receive_user_nick_name, + a.create_by, a.create_time, a.update_by, a.update_time + from expenses a + @@ -70,118 +96,133 @@ insert into expenses - exp_id, - exp_code, - exp_pq_code, - exp_bid_code, - exp_expenditure_mode, - exp_customer_bm, - exp_customer_name, - exp_expenditure_people, - exp_project, - exp_return_date, - exp_expenditure_type, - exp_expenditure_amount, - exp_bid_area, - exp_expenditure_date, - exp_expenditure_amount_uppercase, - exp_staff_tureorfales, - exp_back_office, - exp_salesman_code, - exp_salesman_bm, - exp_salesman_name, - exp_salesman_dept_id, - exp_salesman_dept_name, - exp_dispatch_status, - exp_account_name, - exp_account_number, - exp_deposit_bank, - exp_line_number_and_othres, - exp_request_remark, - exp_return_remark, - exp_approval_status, - exp_oa_approval_status, - create_by, - create_time, - update_by, - update_time, + exp_id, + exp_code, + exp_number, + exp_pq_code, + exp_bid_code, + exp_expenditure_mode, + exp_customer_bm, + exp_customer_name, + exp_expenditure_people, + exp_project, + exp_return_date, + exp_expenditure_type, + exp_expenditure_amount, + exp_bid_area, + exp_expenditure_date, + exp_expenditure_amount_uppercase, + exp_staff_tureorfales, + exp_back_office, + exp_salesman_code, + exp_salesman_bm, + exp_salesman_name, + exp_salesman_dept_id, + exp_salesman_dept_name, + exp_dispatch_status, + exp_account_name, + exp_account_number, + exp_deposit_bank, + exp_line_number_and_othres, + exp_request_remark, + exp_return_remark, + exp_approval_status, + exp_oa_approval_status, + exp_oa_remark, + exp_receive_user_id, + exp_receive_user_nick_name, + + create_by, + create_time, + update_by, + update_time, - #{expId}, - #{expCode}, - #{expPqCode}, - #{expBidCode}, - #{expExpenditureMode}, - #{expCustomerBm}, - #{expCustomerName}, - #{expExpenditurePeople}, - #{expProject}, - #{expReturnDate}, - #{expExpenditureType}, - #{expExpenditureAmount}, - #{expBidArea}, - #{expExpenditureDate}, - #{expExpenditureAmountUppercase}, - #{expStaffTureorfales}, - #{expBackOffice}, - #{expSalesmanCode}, - #{expSalesmanBm}, - #{expSalesmanName}, - #{expSalesmanDeptId}, - #{expSalesmanDeptName}, - #{expDispatchStatus}, - #{expAccountName}, - #{expAccountNumber}, - #{expDepositBank}, - #{expLineNumberAndOthres}, - #{expRequestRemark}, - #{expReturnRemark}, - #{expApprovalStatus}, - #{expOaApprovalStatus}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, + #{expId}, + #{expCode}, + #{expNumber}, + #{expPqCode}, + #{expBidCode}, + #{expExpenditureMode}, + #{expCustomerBm}, + #{expCustomerName}, + #{expExpenditurePeople}, + #{expProject}, + #{expReturnDate}, + #{expExpenditureType}, + #{expExpenditureAmount}, + #{expBidArea}, + #{expExpenditureDate}, + #{expExpenditureAmountUppercase}, + #{expStaffTureorfales}, + #{expBackOffice}, + #{expSalesmanCode}, + #{expSalesmanBm}, + #{expSalesmanName}, + #{expSalesmanDeptId}, + #{expSalesmanDeptName}, + #{expDispatchStatus}, + #{expAccountName}, + #{expAccountNumber}, + #{expDepositBank}, + #{expLineNumberAndOthres}, + #{expRequestRemark}, + #{expReturnRemark}, + #{expApprovalStatus}, + #{expOaApprovalStatus}, + #{expOaRemark}, + #{expReceiveUserId}, + #{expReceiveUserNickName}, + + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, update expenses - exp_code = #{expCode}, - exp_pq_code = #{expPqCode}, - exp_bid_code = #{expBidCode}, - exp_expenditure_mode = #{expExpenditureMode}, - exp_customer_bm = #{expCustomerBm}, - exp_customer_name = #{expCustomerName}, - exp_expenditure_people = #{expExpenditurePeople}, - exp_project = #{expProject}, - exp_return_date = #{expReturnDate}, - exp_expenditure_type = #{expExpenditureType}, - exp_expenditure_amount = #{expExpenditureAmount}, - exp_bid_area = #{expBidArea}, - exp_expenditure_date = #{expExpenditureDate}, - exp_expenditure_amount_uppercase = #{expExpenditureAmountUppercase}, - exp_staff_tureorfales = #{expStaffTureorfales}, - exp_back_office = #{expBackOffice}, - exp_salesman_code = #{expSalesmanCode}, - exp_salesman_bm = #{expSalesmanBm}, - exp_salesman_name = #{expSalesmanName}, - exp_salesman_dept_id = #{expSalesmanDeptId}, - exp_salesman_dept_name = #{expSalesmanDeptName}, - exp_dispatch_status = #{expDispatchStatus}, - exp_account_name = #{expAccountName}, - exp_account_number = #{expAccountNumber}, - exp_deposit_bank = #{expDepositBank}, - exp_line_number_and_othres = #{expLineNumberAndOthres}, - exp_request_remark = #{expRequestRemark}, - exp_return_remark = #{expReturnRemark}, - exp_approval_status = #{expApprovalStatus}, - exp_oa_approval_status = #{expOaApprovalStatus}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, + exp_code = #{expCode}, + exp_pq_code = #{expPqCode}, + exp_number = #{expNumber}, + exp_bid_code = #{expBidCode}, + exp_expenditure_mode = #{expExpenditureMode}, + exp_customer_bm = #{expCustomerBm}, + exp_customer_name = #{expCustomerName}, + exp_expenditure_people = #{expExpenditurePeople}, + exp_project = #{expProject}, + exp_return_date = #{expReturnDate}, + exp_expenditure_type = #{expExpenditureType}, + exp_expenditure_amount = #{expExpenditureAmount}, + exp_bid_area = #{expBidArea}, + exp_expenditure_date = #{expExpenditureDate}, + exp_expenditure_amount_uppercase = #{expExpenditureAmountUppercase}, + exp_staff_tureorfales = #{expStaffTureorfales}, + exp_back_office = #{expBackOffice}, + exp_salesman_code = #{expSalesmanCode}, + exp_salesman_bm = #{expSalesmanBm}, + exp_salesman_name = #{expSalesmanName}, + exp_salesman_dept_id = #{expSalesmanDeptId}, + exp_salesman_dept_name = #{expSalesmanDeptName}, + exp_dispatch_status = #{expDispatchStatus}, + exp_account_name = #{expAccountName}, + exp_account_number = #{expAccountNumber}, + exp_deposit_bank = #{expDepositBank}, + exp_line_number_and_othres = #{expLineNumberAndOthres}, + exp_request_remark = #{expRequestRemark}, + exp_return_remark = #{expReturnRemark}, + exp_approval_status = #{expApprovalStatus}, + exp_oa_approval_status = #{expOaApprovalStatus}, + exp_oa_remark = #{expOaRemark}, + exp_receive_user_id = #{expReceiveUserId}, + exp_receive_user_nick_name = #{expReceiveUserNickName}, + + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, where exp_id = #{expId} @@ -196,4 +237,11 @@ #{expId} + + + diff --git a/ruoyi-system/target/maven-archiver/pom.properties b/ruoyi-system/target/maven-archiver/pom.properties index 5dd20ea..54df9f6 100644 --- a/ruoyi-system/target/maven-archiver/pom.properties +++ b/ruoyi-system/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Mon Aug 12 08:02:44 CST 2024 +#Mon Aug 12 14:13:27 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 280f845..a56ef7e 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 diff --git a/ruoyi-ui/src/api/expenses/expenses.js b/ruoyi-ui/src/api/expenses/expenses.js index 6813ca9..9cadeb2 100644 --- a/ruoyi-ui/src/api/expenses/expenses.js +++ b/ruoyi-ui/src/api/expenses/expenses.js @@ -1,5 +1,14 @@ import request from '@/utils/request' +// 分派 +export function expAssign(query) { + return request({ + url: '/expenses/expenses/expAssign', + method: 'post', + data: query + }) +} + // 查询费用支出列表 export function listExpenses(query) { return request({ @@ -42,3 +51,12 @@ export function delExpenses(expId) { method: 'delete' }) } + +//提交投标办按钮 +export function commitExp(data) { + return request({ + url: '/expenses/expenses/commitExp', + method: 'post', + data: data + }) +} diff --git a/ruoyi-ui/src/utils/number-cn.js b/ruoyi-ui/src/utils/number-cn.js new file mode 100644 index 0000000..20d5091 --- /dev/null +++ b/ruoyi-ui/src/utils/number-cn.js @@ -0,0 +1,51 @@ + /* + 数字转中文 + @number {Integer} 形如123的数字 + @return {String} 返回转换成的形如 一百二十三 的字符串 + */ + export function numberToChinese (number) { + /*单位*/ + const units = '个拾佰仟萬@#%億^&~'; + /*字符*/ + const chars = '零壹贰叁肆伍陆柒捌玖'; + + const a = (number + '').split(''), s = [], t = this; + if (a.length > 12) { + throw new Error('too big'); + } else { + for (var i = 0, j = a.length - 1; i <= j; i++) { + if (j == 1 || j == 5 || j == 9) {//两位数 处理特殊的 1* + if (i == 0) { + if (a[i] != '1') s.push(chars.charAt(a[i])); + } else { + s.push(chars.charAt(a[i])); + } + } else { + s.push(chars.charAt(a[i])); + } + if (i != j) { + s.push(units.charAt(j - i)); + } + } + } + //return s; + return s.join('').replace(/零([十百千万亿@#%^&~])/g, function (m, d, b) {//优先处理 零百 零千 等 + b = units.indexOf(d); + if (b != -1) { + if (d == '亿') return d; + if (d == '万') return d; + if (a[j - b] == '0') return '零'; + } + return ''; + }).replace(/零+/g, '零').replace(/零([万亿])/g, function (m, b) {// 零百 零千处理后 可能出现 零零相连的 再处理结尾为零的 + return b; + }).replace(/亿[万千百]/g, '亿').replace(/[零]$/, '').replace(/[@#%^&~]/g, function (m) { + return {'@': '十', '#': '百', '%': '千', '^': '十', '&': '百', '~': '千'}[m]; + }).replace(/([亿万])([一-九])/g, function (m, d, b, c) { + c = units.indexOf(d); + if (c != -1) { + if (a[j - c] == '0') return d + '零' + b; + } + return m; + }); + } diff --git a/ruoyi-ui/src/views/authorize/authorize/index.vue b/ruoyi-ui/src/views/authorize/authorize/index.vue index 0833fd5..704918c 100644 --- a/ruoyi-ui/src/views/authorize/authorize/index.vue +++ b/ruoyi-ui/src/views/authorize/authorize/index.vue @@ -565,8 +565,8 @@ export default { }, watch: { /** 授权期限日期控件 清空null转“ ” */ - "form.doaAuthorizationDuration"(newVal1) { - if (newVal1 == null) { + "form.doaAuthorizationDuration"(newVal) { + if (newVal == null) { this.form.doaAuthorizationDuration = ""; } } diff --git a/ruoyi-ui/src/views/components/Tools/PeopleSelect/index.vue b/ruoyi-ui/src/views/components/Tools/PeopleSelect/index.vue index 7a2fbec..e00254a 100644 --- a/ruoyi-ui/src/views/components/Tools/PeopleSelect/index.vue +++ b/ruoyi-ui/src/views/components/Tools/PeopleSelect/index.vue @@ -248,7 +248,8 @@ let result = []; uns.forEach(item => { if(this.allUserMap.has(item)) { - var json = {}; + const json = {}; + json.userId = this.allUserMap.get(item).userId || ''; json.userName = this.allUserMap.get(item).userName || ''; json.nickName = this.allUserMap.get(item).nickName || ''; json.sapUserBm = this.allUserMap.get(item).sapUserBm || ''; diff --git a/ruoyi-ui/src/views/expenses/expenses/index.vue b/ruoyi-ui/src/views/expenses/expenses/index.vue index be9245e..8042efc 100644 --- a/ruoyi-ui/src/views/expenses/expenses/index.vue +++ b/ruoyi-ui/src/views/expenses/expenses/index.vue @@ -3,7 +3,7 @@ 导出 + + 分派 + + + 变更记录 + @@ -146,7 +168,12 @@ - + + + + +