diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java index 7145fc8..2098c34 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java @@ -716,7 +716,7 @@ public class QuotController extends BaseController } } } - + quot.setQuotBzrUserNickname(getLoginUser().getUser().getNickName());//设置报价单编制人 quot.setQuotJswApprovalStatus("1");// 更新金思维提交状态为 协助中 quotService.updateQuot(quot); return success(); @@ -857,17 +857,19 @@ public class QuotController extends BaseController quot.setQuotQuotationDate(DateUtils.getNowDate());//报价单-报价日期设置为 当前日期 quot.setQuotApprovalStatus("2"); quot.setQuotCheckUserName(getUsername()); + //设置报价单编制人 如果已走金思维 则报价单编制人更新为提交金思维的人名 反之则更新为提交反馈的人名 + quot.setQuotBzrUserNickname(StringUtils.isEmpty(quot.getQuotBzrUserNickname())?getUsername():quot.getQuotBzrUserNickname()); quotService.updateQuot(quot); return success(); } /** - * 报价单生成-PC + * 生成报价单-PC * @param quot * @return */ - @Log(title = "报价单生成-PC", businessType = BusinessType.OTHER) + @Log(title = "生成报价单-PC", businessType = BusinessType.OTHER) @PostMapping("/madeQuot") @PreAuthorize("@ss.hasPermi('quot:quot:madeQuot')") public void madeQuot(HttpServletResponse response, @RequestBody Quot quot) @@ -877,11 +879,11 @@ public class QuotController extends BaseController } /** - * 报价单生成-Mobile + * 生成报价单-Mobile * @param quot * @return */ - @Log(title = "报价单生成-Mobile", businessType = BusinessType.OTHER) + @Log(title = "生成报价单-Mobile", businessType = BusinessType.OTHER) @PostMapping("/madeQuotMobile") @PreAuthorize("@ss.hasPermi('quot:quot:madeQuot')") public AjaxResult madeQuotMobile(HttpServletResponse response, @RequestBody Quot quot) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java index f4479b6..21928c0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java @@ -410,6 +410,12 @@ public class excelUtil { String QuotBzr = quot.getQuotCheckUserNickname();//编制人 QuotBzr = StringUtils.isEmpty(QuotBzr)?"":QuotBzr; + String QuotBzr2 = quot.getQuotBzrUserNickname();//报价单编制人 + QuotBzr2 = StringUtils.isEmpty(QuotBzr2)?"":QuotBzr2; + if(StringUtils.isNotEmpty(QuotBzr2)){ + QuotBzr = QuotBzr2; + } + String QuotShr = quot.getQuotJswCheckUserNickname();//审核人 QuotShr = StringUtils.isEmpty(QuotShr)?"":QuotShr; @@ -719,6 +725,12 @@ public class excelUtil { String QuotBzr = quot.getQuotCheckUserNickname();//编制人 QuotBzr = StringUtils.isEmpty(QuotBzr)?"":QuotBzr; + String QuotBzr2 = quot.getQuotBzrUserNickname();//报价单编制人 + QuotBzr2 = StringUtils.isEmpty(QuotBzr2)?"":QuotBzr2; + if(StringUtils.isNotEmpty(QuotBzr2)){ + QuotBzr = QuotBzr2; + } + String QuotShr = quot.getQuotJswCheckUserNickname();//审核人 QuotShr = StringUtils.isEmpty(QuotShr)?"":QuotShr; diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java index ba9e6b9..3742d79 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java @@ -118,6 +118,9 @@ public class Quot extends BaseEntity /** 金思维审核人 */ private String quotJswCheckUserNickname; + /** 报价单编制人 */ + private String quotBzrUserNickname; + /** 提交状态 */ @Excel(name = "提交状态",dictType = "quot_approval_status") private String quotApprovalStatus; @@ -358,6 +361,9 @@ public class Quot extends BaseEntity { return quotCheckUserName; } + public String getQuotBzrUserNickname() { return quotBzrUserNickname; } + + public void setQuotBzrUserNickname(String quotBzrUserNickname) { this.quotBzrUserNickname = quotBzrUserNickname; } public String getQuotJswCheckUserNickname() { return quotJswCheckUserNickname; } public void setQuotJswCheckUserNickname(String quotJswCheckUserNickname) { this.quotJswCheckUserNickname = quotJswCheckUserNickname; } diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index ec2986d..e5414cb 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -118,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.quot_customer_name,a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address, a.quot_contacts, a.quot_phone, a.quot_inquiry_date, a.quot_project, a.quot_quotation_date, a.quot_quotation_from, a.quot_quotation_require, a.quot_feedback_explanation, a.quot_quantity, a.quot_total_price, - a.quot_check_user_name, u2.nick_name quot_check_user_nickname,a.quot_jsw_check_user_nickname, a.quot_approval_status,a.quot_materials_count,a.quot_rbDateUid, + a.quot_check_user_name, u2.nick_name quot_check_user_nickname,a.quot_jsw_check_user_nickname,a.quot_bzr_user_nickname, a.quot_approval_status,a.quot_materials_count,a.quot_rbDateUid, a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_matprice_diff2,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName, a.create_by, a.create_time, a.update_by, a.update_time, u.nick_name create_name,a.quot_handle, @@ -165,7 +166,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select a.quot_id, a.quot_code,a.quot_jsw_code, a.quot_salesman_code, a.quot_salesman_bm, a.quot_salesman_name, a.quot_customer_bm,a.quot_customer_name, a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address, a.quot_contacts, a.quot_phone, a.quot_inquiry_date, a.quot_project, a.quot_quotation_date, a.quot_quotation_from, a.quot_quotation_require, a.quot_feedback_explanation, - a.quot_quantity, a.quot_total_price, a.quot_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_jsw_check_user_nickname,a.quot_approval_status,a.quot_rbDateUid, + a.quot_quantity, a.quot_total_price, a.quot_check_user_name, u2.nick_name quot_check_user_nickname, + a.quot_jsw_check_user_nickname,a.quot_bzr_user_nickname,a.quot_approval_status,a.quot_rbDateUid, a.quot_materials_count,a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_matprice_diff2,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName, a.create_by, a.create_time, a.update_by, a.update_time,a.quot_handle, @@ -408,6 +410,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_print = #{quotPrint}, quot_print_user_name = #{quotPrintUserName}, quot_jsw_check_user_nickname = #{quotJswCheckUserNickname}, + quot_bzr_user_nickname = #{quotBzrUserNickname}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy},