xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xd:36cd82118cba7df5a591b2fa47dc272cdd0f44bc
Branches Tags
xd:main
..
compare: xd:6b2b20850c96ae9bd6c2298a792f1c6fe248e68f
Branches Tags
xd:main

No commits in common. "36cd82118cba7df5a591b2fa47dc272cdd0f44bc" and "6b2b20850c96ae9bd6c2298a792f1c6fe248e68f" have entirely different histories.
36cd82118c ... 6b2b20850c

4 changed files with 7 additions and 30 deletions
Show Stats Expand all files Collapse all files

12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
View File

@ -716,7 +716,7 @@ public class QuotController extends BaseController
}
}
}
quot.setQuotBzrUserNickname(getLoginUser().getUser().getNickName());//设置报价单编制人
quot.setQuotJswApprovalStatus("1");// 更新金思维提交状态为 协助中
quotService.updateQuot(quot);
return success();
@ -857,19 +857,17 @@ 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)
@ -879,11 +877,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)

12
ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java
View File

@ -410,12 +410,6 @@ 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;
@ -725,12 +719,6 @@ 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;

6
ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java
View File

@ -118,9 +118,6 @@ public class Quot extends BaseEntity
/** 金思维审核人 */
private String quotJswCheckUserNickname;
/** 报价单编制人 */
private String quotBzrUserNickname;
/** 提交状态 */
@Excel(name = "提交状态",dictType = "quot_approval_status")
private String quotApprovalStatus;
@ -361,9 +358,6 @@ 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; }

7
ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
View File

@ -29,7 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="quotCheckUserName" column="quot_check_user_name" />
<result property="quotCheckUserNickname" column="quot_check_user_nickname" />
<result property="quotJswCheckUserNickname" column="quot_jsw_check_user_nickname" />
<result property="quotBzrUserNickname" column="quot_bzr_user_nickname" />
<result property="quotApprovalStatus" column="quot_approval_status" />
<result property="quotMaterialsCount" column="quot_materials_count" />
<result property="quotRbDateUid" column="quot_rbDateUid" />
@ -119,7 +118,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_bzr_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_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,
@ -166,8 +165,7 @@ 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_bzr_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_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,
@ -410,7 +408,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="quotPrint != null and quotPrint != ''">quot_print = #{quotPrint},</if>
<if test="quotPrintUserName != null and quotPrintUserName != ''">quot_print_user_name = #{quotPrintUserName},</if>
<if test="quotJswCheckUserNickname != null and quotJswCheckUserNickname != ''">quot_jsw_check_user_nickname = #{quotJswCheckUserNickname},</if>
<if test="quotBzrUserNickname != null and quotBzrUserNickname != ''">quot_bzr_user_nickname = #{quotBzrUserNickname},</if>
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>