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 039294b..faf6de8 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 @@ -11,6 +11,8 @@ import com.ruoyi.common.utils.uuid.UUID; import com.ruoyi.customer.domain.Customer; import com.ruoyi.quot.domain.QuotFile; import com.ruoyi.quot.service.IQuotFileService; +import com.ruoyi.technicalConfirm.domain.QuotJsqr; +import com.ruoyi.technicalConfirm.service.IQuotJsqrService; import com.ruoyi.web.utils.IdUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -41,6 +43,10 @@ public class QuotController extends BaseController @Autowired private IQuotFileService quotFileService; + @Autowired + private IQuotJsqrService quotJsqrService; + + /** * 查询报价列表 */ @@ -87,9 +93,6 @@ public class QuotController extends BaseController quot.setQuotId(UUID.fastUUID().toString()); quot.setQuotCode(IdUtils.createNo("BJD_",2)); quot.setCreateBy(getUsername()); - - String quotJsxzGroup = quot.getQuotJsxzGroup(); - System.out.println(quotJsxzGroup); return toAjax(quotService.insertQuot(quot)); } @@ -182,10 +185,10 @@ public class QuotController extends BaseController } /** - * 提交报价单 + * 提交报价单至报价组 */ @PreAuthorize("@ss.hasPermi('customer:customer:commit')") - @Log(title = "报价单提交", businessType = BusinessType.OTHER) + @Log(title = "报价单提交报价组", businessType = BusinessType.OTHER) @PostMapping("/commitQuot") public AjaxResult commitQuot(@RequestBody Quot quot) { @@ -195,11 +198,13 @@ public class QuotController extends BaseController quot.setQuotCode(IdUtils.createNo("BJD_",2)); quot.setCreateBy(getUsername()); quot.setQuotApprovalStatus("1");//提交报价组 + quot.setQuotInquiryDate(DateUtils.getNowDate()); quotService.insertQuot(quot); return success(); }else{ quot.setUpdateBy(getUsername()); quot.setQuotApprovalStatus("1");//提交报价组 + quot.setQuotInquiryDate(DateUtils.getNowDate()); quotService.updateQuot(quot); return success(); } @@ -217,7 +222,16 @@ public class QuotController extends BaseController if(StringUtils.isEmpty(quotJsxzGroup)){ return error("请先选择分组"); }else{ + QuotJsqr quotJsqr = new QuotJsqr(); + String quotJsqrId = UUID.fastUUID().toString(); + quotJsqr.setQuotJsqrId(quotJsqrId); + quotJsqr.setQuotJsqrCode(IdUtils.createNo("BJD_JSQR_",2)); + quotJsqr.setCreateBy(getUsername()); + quotJsqrService.insertQuotJsqr(quotJsqr); + quot.setQuotJsxzConfirmId(quotJsqrId); + quot.setQuotJsxzApprovalStatus("1"); + quotService.updateQuot(quot); } return success(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java new file mode 100644 index 0000000..8dc7aeb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java @@ -0,0 +1,95 @@ +package com.ruoyi.web.controller.technicalConfirm; + +import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.technicalConfirm.domain.QuotJsqr; +import com.ruoyi.technicalConfirm.service.IQuotJsqrService; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.core.page.TableDataInfo; + +import java.util.List; + +/** + * 报价单-技术确认单Controller + * + * @author ruoyi + * @date 2024-04-07 + */ +@RestController +@RequestMapping("/jsqr/jsqr") +public class QuotJsqrController extends BaseController +{ + @Autowired + private IQuotJsqrService quotJsqrService; + + /** + * 查询报价单-技术确认单列表 + */ + @PreAuthorize("@ss.hasPermi('jsqr:jsqr:list')") + @GetMapping("/list") + public TableDataInfo list(QuotJsqr quotJsqr) + { + startPage(); + List list = quotJsqrService.selectQuotJsqrList(quotJsqr); + return getDataTable(list); + } + + /** + * 导出报价单-技术确认单列表 + */ + @PreAuthorize("@ss.hasPermi('jsqr:jsqr:export')") + @Log(title = "报价单-技术确认单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QuotJsqr quotJsqr) + { + List list = quotJsqrService.selectQuotJsqrList(quotJsqr); + ExcelUtil util = new ExcelUtil(QuotJsqr.class); + util.exportExcel(response, list, "报价单-技术确认单数据"); + } + + /** + * 获取报价单-技术确认单详细信息 + */ + @PreAuthorize("@ss.hasPermi('jsqr:jsqr:query')") + @GetMapping(value = "/{quotJsqrId}") + public AjaxResult getInfo(@PathVariable("quotJsqrId") String quotJsqrId) + { + return success(quotJsqrService.selectQuotJsqrByQuotJsqrId(quotJsqrId)); + } + + /** + * 修改报价单-技术确认单 + */ + @PreAuthorize("@ss.hasPermi('jsqr:jsqr:edit')") + @Log(title = "报价单-技术确认单查看", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QuotJsqr quotJsqr) + { + return toAjax(quotJsqrService.updateQuotJsqr(quotJsqr)); + } + + /** + * 删除报价单-技术确认单 + */ + @PreAuthorize("@ss.hasPermi('jsqr:jsqr:remove')") + @Log(title = "报价单-技术确认单", businessType = BusinessType.DELETE) + @DeleteMapping("/{quotJsqrIds}") + public AjaxResult remove(@PathVariable String[] quotJsqrIds) + { + return toAjax(quotJsqrService.deleteQuotJsqrByQuotJsqrIds(quotJsqrIds)); + } +} 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 c8a4a63..3371872 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 @@ -1,5 +1,6 @@ package com.ruoyi.quot.domain; +import java.util.Date; import java.util.List; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -50,7 +51,7 @@ public class Quot extends BaseEntity /** 询价日期 */ @Excel(name = "询价日期") - private String quotInquiryDate; + private Date quotInquiryDate; /** 项目名称 */ @Excel(name = "项目名称") @@ -58,7 +59,7 @@ public class Quot extends BaseEntity /** 报价日期 */ @Excel(name = "报价日期") - private String quotQuotationDate; + private Date quotQuotationDate; /** 报价来源 */ private String quotQuotationFrom; @@ -177,10 +178,7 @@ public class Quot extends BaseEntity { return quotSalesmanDeptId; } - public void setQuotSalesmanDeptName(String quotSalesmanDeptName) - { - this.quotSalesmanDeptName = quotSalesmanDeptName; - } + public void setQuotSalesmanDeptName(String quotSalesmanDeptName) { this.quotSalesmanDeptName = quotSalesmanDeptName; } public String getQuotSalesmanDeptName() { @@ -204,12 +202,9 @@ public class Quot extends BaseEntity { return quotPhone; } - public void setQuotInquiryDate(String quotInquiryDate) - { - this.quotInquiryDate = quotInquiryDate; - } + public void setQuotInquiryDate(Date quotInquiryDate) { this.quotInquiryDate = quotInquiryDate;} - public String getQuotInquiryDate() + public Date getQuotInquiryDate() { return quotInquiryDate; } @@ -222,12 +217,12 @@ public class Quot extends BaseEntity { return quotProject; } - public void setQuotQuotationDate(String quotQuotationDate) + public void setQuotQuotationDate(Date quotQuotationDate) { this.quotQuotationDate = quotQuotationDate; } - public String getQuotQuotationDate() + public Date getQuotQuotationDate() { return quotQuotationDate; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java new file mode 100644 index 0000000..887b2b6 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java @@ -0,0 +1,735 @@ +package com.ruoyi.technicalConfirm.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 报价单-技术确认单对象 quot_jsqr + * + * @author ruoyi + * @date 2024-04-07 + */ +public class QuotJsqr extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID */ + private String quotJsqrId; + + /** 技术确认单编号 */ + @Excel(name = "技术确认单编号") + private String quotJsqrCode; + + /** 特缆协助状态 */ + @Excel(name = "特缆协助状态") + private String quotJsqrTlApprovalStatus; + + /** 特缆操作人 */ + private String quotJsqrTlOperateUserName; + + /** 特缆操作状态 */ + private String quotJsqrTlOperateStatus; + + /** 特缆操作时间 */ + private String quotJsqrTlOperateTime; + + /** 特缆协助说明 */ + private String quotJsqrTlRemark; + + /** 特缆审核人 */ + private String quotJsqrTlCheckUserName; + + /** 特缆审核状态 */ + private String quotJsqrTlCheckState; + + /** 特缆审核时间 */ + private String quotJsqrTlCheckTime; + + /** 特缆审核意见 */ + private String quotJsqrTlCheckRemark; + + /** 特缆组长 */ + private String quotJsqrTlLeaderUserName; + + /** 特缆组长状态 */ + private String quotJsqrTlLeaderState; + + /** 特缆组长确认时间 */ + private String quotJsqrTlLeaderTime; + + /** 特缆组长确认意见 */ + private String quotJsqrTlLeaderRemark; + + /** 低压协助状态 */ + @Excel(name = "低压协助状态") + private String quotJsqrDyApprovalStatus; + + /** 低压操作人 */ + private String quotJsqrDyOperateUserName; + + /** 低压操作状态 */ + private String quotJsqrDyOperateStatus; + + /** 低压操作时间 */ + private String quotJsqrDyOperateTime; + + /** 低压协助说明 */ + private String quotJsqrDyRemark; + + /** 低压审核人 */ + private String quotJsqrDyCheckUserName; + + /** 低压审核状态 */ + private String quotJsqrDyCheckState; + + /** 低压审核时间 */ + private String quotJsqrDyCheckTime; + + /** 低压审核意见 */ + private String quotJsqrDyCheckRemark; + + /** 低压组长 */ + private String quotJsqrDyLeaderUserName; + + /** 低压组长状态 */ + private String quotJsqrDyLeaderState; + + /** 低压组长确认时间 */ + private String quotJsqrDyLeaderTime; + + /** 低压组长确认意见 */ + private String quotJsqrDyLeaderRemark; + + /** 中压协助状态 */ + @Excel(name = "中压协助状态") + private String quotJsqrZyApprovalStatus; + + /** 中压操作人 */ + private String quotJsqrZyOperateUserName; + + /** 中压操作状态 */ + private String quotJsqrZyOperateStatus; + + /** 中压操作时间 */ + private String quotJsqrZyOperateTime; + + /** 中压协助说明 */ + private String quotJsqrZyRemark; + + /** 中压审核人 */ + private String quotJsqrZyCheckUserName; + + /** 中压审核状态 */ + private String quotJsqrZyCheckState; + + /** 中压审核时间 */ + private String quotJsqrZyCheckTime; + + /** 中压审核意见 */ + private String quotJsqrZyCheckRemark; + + /** 中压组长 */ + private String quotJsqrZyLeaderUserName; + + /** 中压组长状态 */ + private String quotJsqrZyLeaderState; + + /** 中压组长确认时间 */ + private String quotJsqrZyLeaderTime; + + /** 中压组长确认意见 */ + private String quotJsqrZyLeaderRemark; + + /** 其他协助状态 */ + @Excel(name = "其他协助状态") + private String quotJsqrQtApprovalStatus; + + /** 其他操作人 */ + private String quotJsqrQtOperateUserName; + + /** 其他操作状态 */ + private String quotJsqrQtOperateStatus; + + /** 其他操作时间 */ + private String quotJsqrQtOperateTime; + + /** 其他协助说明 */ + private String quotJsqrQtRemark; + + /** 其他审核人 */ + private String quotJsqrQtCheckUserName; + + /** 其他审核状态 */ + private String quotJsqrQtCheckState; + + /** 其他审核时间 */ + private String quotJsqrQtCheckTime; + + /** 其他审核意见 */ + private String quotJsqrQtCheckRemark; + + /** 其他组长 */ + private String quotJsqrQtLeaderUserName; + + /** 其他组长状态 */ + private String quotJsqrQtLeaderState; + + /** 其他组长确认时间 */ + private String quotJsqrQtLeaderTime; + + /** 其他组长确认意见 */ + private String quotJsqrQtLeaderRemark; + + public void setQuotJsqrId(String quotJsqrId) + { + this.quotJsqrId = quotJsqrId; + } + + public String getQuotJsqrId() + { + return quotJsqrId; + } + public void setQuotJsqrCode(String quotJsqrCode) + { + this.quotJsqrCode = quotJsqrCode; + } + + public String getQuotJsqrCode() + { + return quotJsqrCode; + } + public void setQuotJsqrTlApprovalStatus(String quotJsqrTlApprovalStatus) + { + this.quotJsqrTlApprovalStatus = quotJsqrTlApprovalStatus; + } + + public String getQuotJsqrTlApprovalStatus() + { + return quotJsqrTlApprovalStatus; + } + public void setQuotJsqrTlOperateUserName(String quotJsqrTlOperateUserName) + { + this.quotJsqrTlOperateUserName = quotJsqrTlOperateUserName; + } + + public String getQuotJsqrTlOperateUserName() + { + return quotJsqrTlOperateUserName; + } + public void setQuotJsqrTlOperateStatus(String quotJsqrTlOperateStatus) + { + this.quotJsqrTlOperateStatus = quotJsqrTlOperateStatus; + } + + public String getQuotJsqrTlOperateStatus() + { + return quotJsqrTlOperateStatus; + } + public void setQuotJsqrTlOperateTime(String quotJsqrTlOperateTime) + { + this.quotJsqrTlOperateTime = quotJsqrTlOperateTime; + } + + public String getQuotJsqrTlOperateTime() + { + return quotJsqrTlOperateTime; + } + public void setQuotJsqrTlRemark(String quotJsqrTlRemark) + { + this.quotJsqrTlRemark = quotJsqrTlRemark; + } + + public String getQuotJsqrTlRemark() + { + return quotJsqrTlRemark; + } + public void setQuotJsqrTlCheckUserName(String quotJsqrTlCheckUserName) + { + this.quotJsqrTlCheckUserName = quotJsqrTlCheckUserName; + } + + public String getQuotJsqrTlCheckUserName() + { + return quotJsqrTlCheckUserName; + } + public void setQuotJsqrTlCheckState(String quotJsqrTlCheckState) + { + this.quotJsqrTlCheckState = quotJsqrTlCheckState; + } + + public String getQuotJsqrTlCheckState() + { + return quotJsqrTlCheckState; + } + public void setQuotJsqrTlCheckTime(String quotJsqrTlCheckTime) + { + this.quotJsqrTlCheckTime = quotJsqrTlCheckTime; + } + + public String getQuotJsqrTlCheckTime() + { + return quotJsqrTlCheckTime; + } + public void setQuotJsqrTlCheckRemark(String quotJsqrTlCheckRemark) + { + this.quotJsqrTlCheckRemark = quotJsqrTlCheckRemark; + } + + public String getQuotJsqrTlCheckRemark() + { + return quotJsqrTlCheckRemark; + } + public void setQuotJsqrTlLeaderUserName(String quotJsqrTlLeaderUserName) + { + this.quotJsqrTlLeaderUserName = quotJsqrTlLeaderUserName; + } + + public String getQuotJsqrTlLeaderUserName() + { + return quotJsqrTlLeaderUserName; + } + public void setQuotJsqrTlLeaderState(String quotJsqrTlLeaderState) + { + this.quotJsqrTlLeaderState = quotJsqrTlLeaderState; + } + + public String getQuotJsqrTlLeaderState() + { + return quotJsqrTlLeaderState; + } + public void setQuotJsqrTlLeaderTime(String quotJsqrTlLeaderTime) + { + this.quotJsqrTlLeaderTime = quotJsqrTlLeaderTime; + } + + public String getQuotJsqrTlLeaderTime() + { + return quotJsqrTlLeaderTime; + } + public void setQuotJsqrTlLeaderRemark(String quotJsqrTlLeaderRemark) + { + this.quotJsqrTlLeaderRemark = quotJsqrTlLeaderRemark; + } + + public String getQuotJsqrTlLeaderRemark() + { + return quotJsqrTlLeaderRemark; + } + public void setQuotJsqrDyApprovalStatus(String quotJsqrDyApprovalStatus) + { + this.quotJsqrDyApprovalStatus = quotJsqrDyApprovalStatus; + } + + public String getQuotJsqrDyApprovalStatus() + { + return quotJsqrDyApprovalStatus; + } + public void setQuotJsqrDyOperateUserName(String quotJsqrDyOperateUserName) + { + this.quotJsqrDyOperateUserName = quotJsqrDyOperateUserName; + } + + public String getQuotJsqrDyOperateUserName() + { + return quotJsqrDyOperateUserName; + } + public void setQuotJsqrDyOperateStatus(String quotJsqrDyOperateStatus) + { + this.quotJsqrDyOperateStatus = quotJsqrDyOperateStatus; + } + + public String getQuotJsqrDyOperateStatus() + { + return quotJsqrDyOperateStatus; + } + public void setQuotJsqrDyOperateTime(String quotJsqrDyOperateTime) + { + this.quotJsqrDyOperateTime = quotJsqrDyOperateTime; + } + + public String getQuotJsqrDyOperateTime() + { + return quotJsqrDyOperateTime; + } + public void setQuotJsqrDyRemark(String quotJsqrDyRemark) + { + this.quotJsqrDyRemark = quotJsqrDyRemark; + } + + public String getQuotJsqrDyRemark() + { + return quotJsqrDyRemark; + } + public void setQuotJsqrDyCheckUserName(String quotJsqrDyCheckUserName) + { + this.quotJsqrDyCheckUserName = quotJsqrDyCheckUserName; + } + + public String getQuotJsqrDyCheckUserName() + { + return quotJsqrDyCheckUserName; + } + public void setQuotJsqrDyCheckState(String quotJsqrDyCheckState) + { + this.quotJsqrDyCheckState = quotJsqrDyCheckState; + } + + public String getQuotJsqrDyCheckState() + { + return quotJsqrDyCheckState; + } + public void setQuotJsqrDyCheckTime(String quotJsqrDyCheckTime) + { + this.quotJsqrDyCheckTime = quotJsqrDyCheckTime; + } + + public String getQuotJsqrDyCheckTime() + { + return quotJsqrDyCheckTime; + } + public void setQuotJsqrDyCheckRemark(String quotJsqrDyCheckRemark) + { + this.quotJsqrDyCheckRemark = quotJsqrDyCheckRemark; + } + + public String getQuotJsqrDyCheckRemark() + { + return quotJsqrDyCheckRemark; + } + public void setQuotJsqrDyLeaderUserName(String quotJsqrDyLeaderUserName) + { + this.quotJsqrDyLeaderUserName = quotJsqrDyLeaderUserName; + } + + public String getQuotJsqrDyLeaderUserName() + { + return quotJsqrDyLeaderUserName; + } + public void setQuotJsqrDyLeaderState(String quotJsqrDyLeaderState) + { + this.quotJsqrDyLeaderState = quotJsqrDyLeaderState; + } + + public String getQuotJsqrDyLeaderState() + { + return quotJsqrDyLeaderState; + } + public void setQuotJsqrDyLeaderTime(String quotJsqrDyLeaderTime) + { + this.quotJsqrDyLeaderTime = quotJsqrDyLeaderTime; + } + + public String getQuotJsqrDyLeaderTime() + { + return quotJsqrDyLeaderTime; + } + public void setQuotJsqrDyLeaderRemark(String quotJsqrDyLeaderRemark) + { + this.quotJsqrDyLeaderRemark = quotJsqrDyLeaderRemark; + } + + public String getQuotJsqrDyLeaderRemark() + { + return quotJsqrDyLeaderRemark; + } + public void setQuotJsqrZyApprovalStatus(String quotJsqrZyApprovalStatus) + { + this.quotJsqrZyApprovalStatus = quotJsqrZyApprovalStatus; + } + + public String getQuotJsqrZyApprovalStatus() + { + return quotJsqrZyApprovalStatus; + } + public void setQuotJsqrZyOperateUserName(String quotJsqrZyOperateUserName) + { + this.quotJsqrZyOperateUserName = quotJsqrZyOperateUserName; + } + + public String getQuotJsqrZyOperateUserName() + { + return quotJsqrZyOperateUserName; + } + public void setQuotJsqrZyOperateStatus(String quotJsqrZyOperateStatus) + { + this.quotJsqrZyOperateStatus = quotJsqrZyOperateStatus; + } + + public String getQuotJsqrZyOperateStatus() + { + return quotJsqrZyOperateStatus; + } + public void setQuotJsqrZyOperateTime(String quotJsqrZyOperateTime) + { + this.quotJsqrZyOperateTime = quotJsqrZyOperateTime; + } + + public String getQuotJsqrZyOperateTime() + { + return quotJsqrZyOperateTime; + } + public void setQuotJsqrZyRemark(String quotJsqrZyRemark) + { + this.quotJsqrZyRemark = quotJsqrZyRemark; + } + + public String getQuotJsqrZyRemark() + { + return quotJsqrZyRemark; + } + public void setQuotJsqrZyCheckUserName(String quotJsqrZyCheckUserName) + { + this.quotJsqrZyCheckUserName = quotJsqrZyCheckUserName; + } + + public String getQuotJsqrZyCheckUserName() + { + return quotJsqrZyCheckUserName; + } + public void setQuotJsqrZyCheckState(String quotJsqrZyCheckState) + { + this.quotJsqrZyCheckState = quotJsqrZyCheckState; + } + + public String getQuotJsqrZyCheckState() + { + return quotJsqrZyCheckState; + } + public void setQuotJsqrZyCheckTime(String quotJsqrZyCheckTime) + { + this.quotJsqrZyCheckTime = quotJsqrZyCheckTime; + } + + public String getQuotJsqrZyCheckTime() + { + return quotJsqrZyCheckTime; + } + public void setQuotJsqrZyCheckRemark(String quotJsqrZyCheckRemark) + { + this.quotJsqrZyCheckRemark = quotJsqrZyCheckRemark; + } + + public String getQuotJsqrZyCheckRemark() + { + return quotJsqrZyCheckRemark; + } + public void setQuotJsqrZyLeaderUserName(String quotJsqrZyLeaderUserName) + { + this.quotJsqrZyLeaderUserName = quotJsqrZyLeaderUserName; + } + + public String getQuotJsqrZyLeaderUserName() + { + return quotJsqrZyLeaderUserName; + } + public void setQuotJsqrZyLeaderState(String quotJsqrZyLeaderState) + { + this.quotJsqrZyLeaderState = quotJsqrZyLeaderState; + } + + public String getQuotJsqrZyLeaderState() + { + return quotJsqrZyLeaderState; + } + public void setQuotJsqrZyLeaderTime(String quotJsqrZyLeaderTime) + { + this.quotJsqrZyLeaderTime = quotJsqrZyLeaderTime; + } + + public String getQuotJsqrZyLeaderTime() + { + return quotJsqrZyLeaderTime; + } + public void setQuotJsqrZyLeaderRemark(String quotJsqrZyLeaderRemark) + { + this.quotJsqrZyLeaderRemark = quotJsqrZyLeaderRemark; + } + + public String getQuotJsqrZyLeaderRemark() + { + return quotJsqrZyLeaderRemark; + } + public void setQuotJsqrQtApprovalStatus(String quotJsqrQtApprovalStatus) + { + this.quotJsqrQtApprovalStatus = quotJsqrQtApprovalStatus; + } + + public String getQuotJsqrQtApprovalStatus() + { + return quotJsqrQtApprovalStatus; + } + public void setQuotJsqrQtOperateUserName(String quotJsqrQtOperateUserName) + { + this.quotJsqrQtOperateUserName = quotJsqrQtOperateUserName; + } + + public String getQuotJsqrQtOperateUserName() + { + return quotJsqrQtOperateUserName; + } + public void setQuotJsqrQtOperateStatus(String quotJsqrQtOperateStatus) + { + this.quotJsqrQtOperateStatus = quotJsqrQtOperateStatus; + } + + public String getQuotJsqrQtOperateStatus() + { + return quotJsqrQtOperateStatus; + } + public void setQuotJsqrQtOperateTime(String quotJsqrQtOperateTime) + { + this.quotJsqrQtOperateTime = quotJsqrQtOperateTime; + } + + public String getQuotJsqrQtOperateTime() + { + return quotJsqrQtOperateTime; + } + public void setQuotJsqrQtRemark(String quotJsqrQtRemark) + { + this.quotJsqrQtRemark = quotJsqrQtRemark; + } + + public String getQuotJsqrQtRemark() + { + return quotJsqrQtRemark; + } + public void setQuotJsqrQtCheckUserName(String quotJsqrQtCheckUserName) + { + this.quotJsqrQtCheckUserName = quotJsqrQtCheckUserName; + } + + public String getQuotJsqrQtCheckUserName() + { + return quotJsqrQtCheckUserName; + } + public void setQuotJsqrQtCheckState(String quotJsqrQtCheckState) + { + this.quotJsqrQtCheckState = quotJsqrQtCheckState; + } + + public String getQuotJsqrQtCheckState() + { + return quotJsqrQtCheckState; + } + public void setQuotJsqrQtCheckTime(String quotJsqrQtCheckTime) + { + this.quotJsqrQtCheckTime = quotJsqrQtCheckTime; + } + + public String getQuotJsqrQtCheckTime() + { + return quotJsqrQtCheckTime; + } + public void setQuotJsqrQtCheckRemark(String quotJsqrQtCheckRemark) + { + this.quotJsqrQtCheckRemark = quotJsqrQtCheckRemark; + } + + public String getQuotJsqrQtCheckRemark() + { + return quotJsqrQtCheckRemark; + } + public void setQuotJsqrQtLeaderUserName(String quotJsqrQtLeaderUserName) + { + this.quotJsqrQtLeaderUserName = quotJsqrQtLeaderUserName; + } + + public String getQuotJsqrQtLeaderUserName() + { + return quotJsqrQtLeaderUserName; + } + public void setQuotJsqrQtLeaderState(String quotJsqrQtLeaderState) + { + this.quotJsqrQtLeaderState = quotJsqrQtLeaderState; + } + + public String getQuotJsqrQtLeaderState() + { + return quotJsqrQtLeaderState; + } + public void setQuotJsqrQtLeaderTime(String quotJsqrQtLeaderTime) + { + this.quotJsqrQtLeaderTime = quotJsqrQtLeaderTime; + } + + public String getQuotJsqrQtLeaderTime() + { + return quotJsqrQtLeaderTime; + } + public void setQuotJsqrQtLeaderRemark(String quotJsqrQtLeaderRemark) + { + this.quotJsqrQtLeaderRemark = quotJsqrQtLeaderRemark; + } + + public String getQuotJsqrQtLeaderRemark() + { + return quotJsqrQtLeaderRemark; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("quotJsqrId", getQuotJsqrId()) + .append("quotJsqrCode", getQuotJsqrCode()) + .append("quotJsqrTlApprovalStatus", getQuotJsqrTlApprovalStatus()) + .append("quotJsqrTlOperateUserName", getQuotJsqrTlOperateUserName()) + .append("quotJsqrTlOperateStatus", getQuotJsqrTlOperateStatus()) + .append("quotJsqrTlOperateTime", getQuotJsqrTlOperateTime()) + .append("quotJsqrTlRemark", getQuotJsqrTlRemark()) + .append("quotJsqrTlCheckUserName", getQuotJsqrTlCheckUserName()) + .append("quotJsqrTlCheckState", getQuotJsqrTlCheckState()) + .append("quotJsqrTlCheckTime", getQuotJsqrTlCheckTime()) + .append("quotJsqrTlCheckRemark", getQuotJsqrTlCheckRemark()) + .append("quotJsqrTlLeaderUserName", getQuotJsqrTlLeaderUserName()) + .append("quotJsqrTlLeaderState", getQuotJsqrTlLeaderState()) + .append("quotJsqrTlLeaderTime", getQuotJsqrTlLeaderTime()) + .append("quotJsqrTlLeaderRemark", getQuotJsqrTlLeaderRemark()) + .append("quotJsqrDyApprovalStatus", getQuotJsqrDyApprovalStatus()) + .append("quotJsqrDyOperateUserName", getQuotJsqrDyOperateUserName()) + .append("quotJsqrDyOperateStatus", getQuotJsqrDyOperateStatus()) + .append("quotJsqrDyOperateTime", getQuotJsqrDyOperateTime()) + .append("quotJsqrDyRemark", getQuotJsqrDyRemark()) + .append("quotJsqrDyCheckUserName", getQuotJsqrDyCheckUserName()) + .append("quotJsqrDyCheckState", getQuotJsqrDyCheckState()) + .append("quotJsqrDyCheckTime", getQuotJsqrDyCheckTime()) + .append("quotJsqrDyCheckRemark", getQuotJsqrDyCheckRemark()) + .append("quotJsqrDyLeaderUserName", getQuotJsqrDyLeaderUserName()) + .append("quotJsqrDyLeaderState", getQuotJsqrDyLeaderState()) + .append("quotJsqrDyLeaderTime", getQuotJsqrDyLeaderTime()) + .append("quotJsqrDyLeaderRemark", getQuotJsqrDyLeaderRemark()) + .append("quotJsqrZyApprovalStatus", getQuotJsqrZyApprovalStatus()) + .append("quotJsqrZyOperateUserName", getQuotJsqrZyOperateUserName()) + .append("quotJsqrZyOperateStatus", getQuotJsqrZyOperateStatus()) + .append("quotJsqrZyOperateTime", getQuotJsqrZyOperateTime()) + .append("quotJsqrZyRemark", getQuotJsqrZyRemark()) + .append("quotJsqrZyCheckUserName", getQuotJsqrZyCheckUserName()) + .append("quotJsqrZyCheckState", getQuotJsqrZyCheckState()) + .append("quotJsqrZyCheckTime", getQuotJsqrZyCheckTime()) + .append("quotJsqrZyCheckRemark", getQuotJsqrZyCheckRemark()) + .append("quotJsqrZyLeaderUserName", getQuotJsqrZyLeaderUserName()) + .append("quotJsqrZyLeaderState", getQuotJsqrZyLeaderState()) + .append("quotJsqrZyLeaderTime", getQuotJsqrZyLeaderTime()) + .append("quotJsqrZyLeaderRemark", getQuotJsqrZyLeaderRemark()) + .append("quotJsqrQtApprovalStatus", getQuotJsqrQtApprovalStatus()) + .append("quotJsqrQtOperateUserName", getQuotJsqrQtOperateUserName()) + .append("quotJsqrQtOperateStatus", getQuotJsqrQtOperateStatus()) + .append("quotJsqrQtOperateTime", getQuotJsqrQtOperateTime()) + .append("quotJsqrQtRemark", getQuotJsqrQtRemark()) + .append("quotJsqrQtCheckUserName", getQuotJsqrQtCheckUserName()) + .append("quotJsqrQtCheckState", getQuotJsqrQtCheckState()) + .append("quotJsqrQtCheckTime", getQuotJsqrQtCheckTime()) + .append("quotJsqrQtCheckRemark", getQuotJsqrQtCheckRemark()) + .append("quotJsqrQtLeaderUserName", getQuotJsqrQtLeaderUserName()) + .append("quotJsqrQtLeaderState", getQuotJsqrQtLeaderState()) + .append("quotJsqrQtLeaderTime", getQuotJsqrQtLeaderTime()) + .append("quotJsqrQtLeaderRemark", getQuotJsqrQtLeaderRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/mapper/QuotJsqrMapper.java b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/mapper/QuotJsqrMapper.java new file mode 100644 index 0000000..c1b0f56 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/mapper/QuotJsqrMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.technicalConfirm.mapper; + +import com.ruoyi.technicalConfirm.domain.QuotJsqr; + +import java.util.List; + +/** + * 报价单-技术确认单Mapper接口 + * + * @author ruoyi + * @date 2024-04-07 + */ +public interface QuotJsqrMapper +{ + /** + * 查询报价单-技术确认单 + * + * @param quotJsqrId 报价单-技术确认单主键 + * @return 报价单-技术确认单 + */ + public QuotJsqr selectQuotJsqrByQuotJsqrId(String quotJsqrId); + + /** + * 查询报价单-技术确认单列表 + * + * @param quotJsqr 报价单-技术确认单 + * @return 报价单-技术确认单集合 + */ + public List selectQuotJsqrList(QuotJsqr quotJsqr); + + /** + * 新增报价单-技术确认单 + * + * @param quotJsqr 报价单-技术确认单 + * @return 结果 + */ + public int insertQuotJsqr(QuotJsqr quotJsqr); + + /** + * 修改报价单-技术确认单 + * + * @param quotJsqr 报价单-技术确认单 + * @return 结果 + */ + public int updateQuotJsqr(QuotJsqr quotJsqr); + + /** + * 删除报价单-技术确认单 + * + * @param quotJsqrId 报价单-技术确认单主键 + * @return 结果 + */ + public int deleteQuotJsqrByQuotJsqrId(String quotJsqrId); + + /** + * 批量删除报价单-技术确认单 + * + * @param quotJsqrIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQuotJsqrByQuotJsqrIds(String[] quotJsqrIds); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/service/IQuotJsqrService.java b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/service/IQuotJsqrService.java new file mode 100644 index 0000000..ce05a28 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/service/IQuotJsqrService.java @@ -0,0 +1,62 @@ +package com.ruoyi.technicalConfirm.service; + +import com.ruoyi.technicalConfirm.domain.QuotJsqr; + +import java.util.List; + +/** + * 报价单-技术确认单Service接口 + * + * @author ruoyi + * @date 2024-04-07 + */ +public interface IQuotJsqrService +{ + /** + * 查询报价单-技术确认单 + * + * @param quotJsqrId 报价单-技术确认单主键 + * @return 报价单-技术确认单 + */ + public QuotJsqr selectQuotJsqrByQuotJsqrId(String quotJsqrId); + + /** + * 查询报价单-技术确认单列表 + * + * @param quotJsqr 报价单-技术确认单 + * @return 报价单-技术确认单集合 + */ + public List selectQuotJsqrList(QuotJsqr quotJsqr); + + /** + * 新增报价单-技术确认单 + * + * @param quotJsqr 报价单-技术确认单 + * @return 结果 + */ + public int insertQuotJsqr(QuotJsqr quotJsqr); + + /** + * 修改报价单-技术确认单 + * + * @param quotJsqr 报价单-技术确认单 + * @return 结果 + */ + public int updateQuotJsqr(QuotJsqr quotJsqr); + + /** + * 批量删除报价单-技术确认单 + * + * @param quotJsqrIds 需要删除的报价单-技术确认单主键集合 + * @return 结果 + */ + public int deleteQuotJsqrByQuotJsqrIds(String[] quotJsqrIds); + + /** + * 删除报价单-技术确认单信息 + * + * @param quotJsqrId 报价单-技术确认单主键 + * @return 结果 + */ + public int deleteQuotJsqrByQuotJsqrId(String quotJsqrId); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/service/impl/QuotJsqrServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/service/impl/QuotJsqrServiceImpl.java new file mode 100644 index 0000000..c69d85d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/service/impl/QuotJsqrServiceImpl.java @@ -0,0 +1,100 @@ +package com.ruoyi.technicalConfirm.service.impl; + +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.technicalConfirm.domain.QuotJsqr; +import com.ruoyi.technicalConfirm.mapper.QuotJsqrMapper; +import com.ruoyi.technicalConfirm.service.IQuotJsqrService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 报价单-技术确认单Service业务层处理 + * + * @author ruoyi + * @date 2024-04-07 + */ +@Service +public class QuotJsqrServiceImpl implements IQuotJsqrService +{ + @Autowired + private QuotJsqrMapper quotJsqrMapper; + + /** + * 查询报价单-技术确认单 + * + * @param quotJsqrId 报价单-技术确认单主键 + * @return 报价单-技术确认单 + */ + @Override + public QuotJsqr selectQuotJsqrByQuotJsqrId(String quotJsqrId) + { + return quotJsqrMapper.selectQuotJsqrByQuotJsqrId(quotJsqrId); + } + + /** + * 查询报价单-技术确认单列表 + * + * @param quotJsqr 报价单-技术确认单 + * @return 报价单-技术确认单 + */ + @Override + public List selectQuotJsqrList(QuotJsqr quotJsqr) + { + return quotJsqrMapper.selectQuotJsqrList(quotJsqr); + } + + /** + * 新增报价单-技术确认单 + * + * @param quotJsqr 报价单-技术确认单 + * @return 结果 + */ + @Override + @Transactional + public int insertQuotJsqr(QuotJsqr quotJsqr) + { + quotJsqr.setCreateTime(DateUtils.getNowDate()); + return quotJsqrMapper.insertQuotJsqr(quotJsqr); + } + + /** + * 修改报价单-技术确认单 + * + * @param quotJsqr 报价单-技术确认单 + * @return 结果 + */ + @Override + @Transactional + public int updateQuotJsqr(QuotJsqr quotJsqr) + { + quotJsqr.setUpdateTime(DateUtils.getNowDate()); + return quotJsqrMapper.updateQuotJsqr(quotJsqr); + } + + /** + * 批量删除报价单-技术确认单 + * + * @param quotJsqrIds 需要删除的报价单-技术确认单主键 + * @return 结果 + */ + @Override + public int deleteQuotJsqrByQuotJsqrIds(String[] quotJsqrIds) + { + return quotJsqrMapper.deleteQuotJsqrByQuotJsqrIds(quotJsqrIds); + } + + /** + * 删除报价单-技术确认单信息 + * + * @param quotJsqrId 报价单-技术确认单主键 + * @return 结果 + */ + @Override + public int deleteQuotJsqrByQuotJsqrId(String quotJsqrId) + { + return quotJsqrMapper.deleteQuotJsqrByQuotJsqrId(quotJsqrId); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotJsqrMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotJsqrMapper.xml new file mode 100644 index 0000000..2c53865 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotJsqrMapper.xml @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select quot_jsqr_id, quot_jsqr_code, quot_jsqr_tl_approval_status, quot_jsqr_tl_operate_user_name, quot_jsqr_tl_operate_status, quot_jsqr_tl_operate_time, quot_jsqr_tl_remark, quot_jsqr_tl_check_user_name, quot_jsqr_tl_check_state, quot_jsqr_tl_check_time, quot_jsqr_tl_check_remark, quot_jsqr_tl_leader_user_name, quot_jsqr_tl_leader_state, quot_jsqr_tl_leader_time, quot_jsqr_tl_leader_remark, quot_jsqr_dy_approval_status, quot_jsqr_dy_operate_user_name, quot_jsqr_dy_operate_status, quot_jsqr_dy_operate_time, quot_jsqr_dy_remark, quot_jsqr_dy_check_user_name, quot_jsqr_dy_check_state, quot_jsqr_dy_check_time, quot_jsqr_dy_check_remark, quot_jsqr_dy_leader_user_name, quot_jsqr_dy_leader_state, quot_jsqr_dy_leader_time, quot_jsqr_dy_leader_remark, quot_jsqr_zy_approval_status, quot_jsqr_zy_operate_user_name, quot_jsqr_zy_operate_status, quot_jsqr_zy_operate_time, quot_jsqr_zy_remark, quot_jsqr_zy_check_user_name, quot_jsqr_zy_check_state, quot_jsqr_zy_check_time, quot_jsqr_zy_check_remark, quot_jsqr_zy_leader_user_name, quot_jsqr_zy_leader_state, quot_jsqr_zy_leader_time, quot_jsqr_zy_leader_remark, quot_jsqr_qt_approval_status, quot_jsqr_qt_operate_user_name, quot_jsqr_qt_operate_status, quot_jsqr_qt_operate_time, quot_jsqr_qt_remark, quot_jsqr_qt_check_user_name, quot_jsqr_qt_check_state, quot_jsqr_qt_check_time, quot_jsqr_qt_check_remark, quot_jsqr_qt_leader_user_name, quot_jsqr_qt_leader_state, quot_jsqr_qt_leader_time, quot_jsqr_qt_leader_remark, create_by, create_time, update_by, update_time from quot_jsqr + + + + + + + + insert into quot_jsqr + + quot_jsqr_id, + quot_jsqr_code, + quot_jsqr_tl_approval_status, + quot_jsqr_tl_operate_user_name, + quot_jsqr_tl_operate_status, + quot_jsqr_tl_operate_time, + quot_jsqr_tl_remark, + quot_jsqr_tl_check_user_name, + quot_jsqr_tl_check_state, + quot_jsqr_tl_check_time, + quot_jsqr_tl_check_remark, + quot_jsqr_tl_leader_user_name, + quot_jsqr_tl_leader_state, + quot_jsqr_tl_leader_time, + quot_jsqr_tl_leader_remark, + quot_jsqr_dy_approval_status, + quot_jsqr_dy_operate_user_name, + quot_jsqr_dy_operate_status, + quot_jsqr_dy_operate_time, + quot_jsqr_dy_remark, + quot_jsqr_dy_check_user_name, + quot_jsqr_dy_check_state, + quot_jsqr_dy_check_time, + quot_jsqr_dy_check_remark, + quot_jsqr_dy_leader_user_name, + quot_jsqr_dy_leader_state, + quot_jsqr_dy_leader_time, + quot_jsqr_dy_leader_remark, + quot_jsqr_zy_approval_status, + quot_jsqr_zy_operate_user_name, + quot_jsqr_zy_operate_status, + quot_jsqr_zy_operate_time, + quot_jsqr_zy_remark, + quot_jsqr_zy_check_user_name, + quot_jsqr_zy_check_state, + quot_jsqr_zy_check_time, + quot_jsqr_zy_check_remark, + quot_jsqr_zy_leader_user_name, + quot_jsqr_zy_leader_state, + quot_jsqr_zy_leader_time, + quot_jsqr_zy_leader_remark, + quot_jsqr_qt_approval_status, + quot_jsqr_qt_operate_user_name, + quot_jsqr_qt_operate_status, + quot_jsqr_qt_operate_time, + quot_jsqr_qt_remark, + quot_jsqr_qt_check_user_name, + quot_jsqr_qt_check_state, + quot_jsqr_qt_check_time, + quot_jsqr_qt_check_remark, + quot_jsqr_qt_leader_user_name, + quot_jsqr_qt_leader_state, + quot_jsqr_qt_leader_time, + quot_jsqr_qt_leader_remark, + create_by, + create_time, + update_by, + update_time, + + + #{quotJsqrId}, + #{quotJsqrCode}, + #{quotJsqrTlApprovalStatus}, + #{quotJsqrTlOperateUserName}, + #{quotJsqrTlOperateStatus}, + #{quotJsqrTlOperateTime}, + #{quotJsqrTlRemark}, + #{quotJsqrTlCheckUserName}, + #{quotJsqrTlCheckState}, + #{quotJsqrTlCheckTime}, + #{quotJsqrTlCheckRemark}, + #{quotJsqrTlLeaderUserName}, + #{quotJsqrTlLeaderState}, + #{quotJsqrTlLeaderTime}, + #{quotJsqrTlLeaderRemark}, + #{quotJsqrDyApprovalStatus}, + #{quotJsqrDyOperateUserName}, + #{quotJsqrDyOperateStatus}, + #{quotJsqrDyOperateTime}, + #{quotJsqrDyRemark}, + #{quotJsqrDyCheckUserName}, + #{quotJsqrDyCheckState}, + #{quotJsqrDyCheckTime}, + #{quotJsqrDyCheckRemark}, + #{quotJsqrDyLeaderUserName}, + #{quotJsqrDyLeaderState}, + #{quotJsqrDyLeaderTime}, + #{quotJsqrDyLeaderRemark}, + #{quotJsqrZyApprovalStatus}, + #{quotJsqrZyOperateUserName}, + #{quotJsqrZyOperateStatus}, + #{quotJsqrZyOperateTime}, + #{quotJsqrZyRemark}, + #{quotJsqrZyCheckUserName}, + #{quotJsqrZyCheckState}, + #{quotJsqrZyCheckTime}, + #{quotJsqrZyCheckRemark}, + #{quotJsqrZyLeaderUserName}, + #{quotJsqrZyLeaderState}, + #{quotJsqrZyLeaderTime}, + #{quotJsqrZyLeaderRemark}, + #{quotJsqrQtApprovalStatus}, + #{quotJsqrQtOperateUserName}, + #{quotJsqrQtOperateStatus}, + #{quotJsqrQtOperateTime}, + #{quotJsqrQtRemark}, + #{quotJsqrQtCheckUserName}, + #{quotJsqrQtCheckState}, + #{quotJsqrQtCheckTime}, + #{quotJsqrQtCheckRemark}, + #{quotJsqrQtLeaderUserName}, + #{quotJsqrQtLeaderState}, + #{quotJsqrQtLeaderTime}, + #{quotJsqrQtLeaderRemark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update quot_jsqr + + quot_jsqr_code = #{quotJsqrCode}, + quot_jsqr_tl_approval_status = #{quotJsqrTlApprovalStatus}, + quot_jsqr_tl_operate_user_name = #{quotJsqrTlOperateUserName}, + quot_jsqr_tl_operate_status = #{quotJsqrTlOperateStatus}, + quot_jsqr_tl_operate_time = #{quotJsqrTlOperateTime}, + quot_jsqr_tl_remark = #{quotJsqrTlRemark}, + quot_jsqr_tl_check_user_name = #{quotJsqrTlCheckUserName}, + quot_jsqr_tl_check_state = #{quotJsqrTlCheckState}, + quot_jsqr_tl_check_time = #{quotJsqrTlCheckTime}, + quot_jsqr_tl_check_remark = #{quotJsqrTlCheckRemark}, + quot_jsqr_tl_leader_user_name = #{quotJsqrTlLeaderUserName}, + quot_jsqr_tl_leader_state = #{quotJsqrTlLeaderState}, + quot_jsqr_tl_leader_time = #{quotJsqrTlLeaderTime}, + quot_jsqr_tl_leader_remark = #{quotJsqrTlLeaderRemark}, + quot_jsqr_dy_approval_status = #{quotJsqrDyApprovalStatus}, + quot_jsqr_dy_operate_user_name = #{quotJsqrDyOperateUserName}, + quot_jsqr_dy_operate_status = #{quotJsqrDyOperateStatus}, + quot_jsqr_dy_operate_time = #{quotJsqrDyOperateTime}, + quot_jsqr_dy_remark = #{quotJsqrDyRemark}, + quot_jsqr_dy_check_user_name = #{quotJsqrDyCheckUserName}, + quot_jsqr_dy_check_state = #{quotJsqrDyCheckState}, + quot_jsqr_dy_check_time = #{quotJsqrDyCheckTime}, + quot_jsqr_dy_check_remark = #{quotJsqrDyCheckRemark}, + quot_jsqr_dy_leader_user_name = #{quotJsqrDyLeaderUserName}, + quot_jsqr_dy_leader_state = #{quotJsqrDyLeaderState}, + quot_jsqr_dy_leader_time = #{quotJsqrDyLeaderTime}, + quot_jsqr_dy_leader_remark = #{quotJsqrDyLeaderRemark}, + quot_jsqr_zy_approval_status = #{quotJsqrZyApprovalStatus}, + quot_jsqr_zy_operate_user_name = #{quotJsqrZyOperateUserName}, + quot_jsqr_zy_operate_status = #{quotJsqrZyOperateStatus}, + quot_jsqr_zy_operate_time = #{quotJsqrZyOperateTime}, + quot_jsqr_zy_remark = #{quotJsqrZyRemark}, + quot_jsqr_zy_check_user_name = #{quotJsqrZyCheckUserName}, + quot_jsqr_zy_check_state = #{quotJsqrZyCheckState}, + quot_jsqr_zy_check_time = #{quotJsqrZyCheckTime}, + quot_jsqr_zy_check_remark = #{quotJsqrZyCheckRemark}, + quot_jsqr_zy_leader_user_name = #{quotJsqrZyLeaderUserName}, + quot_jsqr_zy_leader_state = #{quotJsqrZyLeaderState}, + quot_jsqr_zy_leader_time = #{quotJsqrZyLeaderTime}, + quot_jsqr_zy_leader_remark = #{quotJsqrZyLeaderRemark}, + quot_jsqr_qt_approval_status = #{quotJsqrQtApprovalStatus}, + quot_jsqr_qt_operate_user_name = #{quotJsqrQtOperateUserName}, + quot_jsqr_qt_operate_status = #{quotJsqrQtOperateStatus}, + quot_jsqr_qt_operate_time = #{quotJsqrQtOperateTime}, + quot_jsqr_qt_remark = #{quotJsqrQtRemark}, + quot_jsqr_qt_check_user_name = #{quotJsqrQtCheckUserName}, + quot_jsqr_qt_check_state = #{quotJsqrQtCheckState}, + quot_jsqr_qt_check_time = #{quotJsqrQtCheckTime}, + quot_jsqr_qt_check_remark = #{quotJsqrQtCheckRemark}, + quot_jsqr_qt_leader_user_name = #{quotJsqrQtLeaderUserName}, + quot_jsqr_qt_leader_state = #{quotJsqrQtLeaderState}, + quot_jsqr_qt_leader_time = #{quotJsqrQtLeaderTime}, + quot_jsqr_qt_leader_remark = #{quotJsqrQtLeaderRemark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where quot_jsqr_id = #{quotJsqrId} + + + + delete from quot_jsqr where quot_jsqr_id = #{quotJsqrId} + + + + delete from quot_jsqr where quot_jsqr_id in + + #{quotJsqrId} + + + diff --git a/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml b/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml new file mode 100644 index 0000000..a21384a --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select quot_jsqr_id, quot_jsqr_code, quot_jsqr_tl_approval_status, quot_jsqr_tl_operate_user_name, quot_jsqr_tl_operate_status, quot_jsqr_tl_operate_time, quot_jsqr_tl_remark, quot_jsqr_tl_check_user_name, quot_jsqr_tl_check_state, quot_jsqr_tl_check_time, quot_jsqr_tl_check_remark, quot_jsqr_tl_leader_user_name, quot_jsqr_tl_leader_state, quot_jsqr_tl_leader_time, quot_jsqr_tl_leader_remark, quot_jsqr_dy_approval_status, quot_jsqr_dy_operate_user_name, quot_jsqr_dy_operate_status, quot_jsqr_dy_operate_time, quot_jsqr_dy_remark, quot_jsqr_dy_check_user_name, quot_jsqr_dy_check_state, quot_jsqr_dy_check_time, quot_jsqr_dy_check_remark, quot_jsqr_dy_leader_user_name, quot_jsqr_dy_leader_state, quot_jsqr_dy_leader_time, quot_jsqr_dy_leader_remark, quot_jsqr_zy_approval_status, quot_jsqr_zy_operate_user_name, quot_jsqr_zy_operate_status, quot_jsqr_zy_operate_time, quot_jsqr_zy_remark, quot_jsqr_zy_check_user_name, quot_jsqr_zy_check_state, quot_jsqr_zy_check_time, quot_jsqr_zy_check_remark, quot_jsqr_zy_leader_user_name, quot_jsqr_zy_leader_state, quot_jsqr_zy_leader_time, quot_jsqr_zy_leader_remark, quot_jsqr_qt_approval_status, quot_jsqr_qt_operate_user_name, quot_jsqr_qt_operate_status, quot_jsqr_qt_operate_time, quot_jsqr_qt_remark, quot_jsqr_qt_check_user_name, quot_jsqr_qt_check_state, quot_jsqr_qt_check_time, quot_jsqr_qt_check_remark, quot_jsqr_qt_leader_user_name, quot_jsqr_qt_leader_state, quot_jsqr_qt_leader_time, quot_jsqr_qt_leader_remark, create_by, create_time, update_by, update_time from quot_jsqr + + + + + + + + insert into quot_jsqr + + quot_jsqr_id, + quot_jsqr_code, + quot_jsqr_tl_approval_status, + quot_jsqr_tl_operate_user_name, + quot_jsqr_tl_operate_status, + quot_jsqr_tl_operate_time, + quot_jsqr_tl_remark, + quot_jsqr_tl_check_user_name, + quot_jsqr_tl_check_state, + quot_jsqr_tl_check_time, + quot_jsqr_tl_check_remark, + quot_jsqr_tl_leader_user_name, + quot_jsqr_tl_leader_state, + quot_jsqr_tl_leader_time, + quot_jsqr_tl_leader_remark, + quot_jsqr_dy_approval_status, + quot_jsqr_dy_operate_user_name, + quot_jsqr_dy_operate_status, + quot_jsqr_dy_operate_time, + quot_jsqr_dy_remark, + quot_jsqr_dy_check_user_name, + quot_jsqr_dy_check_state, + quot_jsqr_dy_check_time, + quot_jsqr_dy_check_remark, + quot_jsqr_dy_leader_user_name, + quot_jsqr_dy_leader_state, + quot_jsqr_dy_leader_time, + quot_jsqr_dy_leader_remark, + quot_jsqr_zy_approval_status, + quot_jsqr_zy_operate_user_name, + quot_jsqr_zy_operate_status, + quot_jsqr_zy_operate_time, + quot_jsqr_zy_remark, + quot_jsqr_zy_check_user_name, + quot_jsqr_zy_check_state, + quot_jsqr_zy_check_time, + quot_jsqr_zy_check_remark, + quot_jsqr_zy_leader_user_name, + quot_jsqr_zy_leader_state, + quot_jsqr_zy_leader_time, + quot_jsqr_zy_leader_remark, + quot_jsqr_qt_approval_status, + quot_jsqr_qt_operate_user_name, + quot_jsqr_qt_operate_status, + quot_jsqr_qt_operate_time, + quot_jsqr_qt_remark, + quot_jsqr_qt_check_user_name, + quot_jsqr_qt_check_state, + quot_jsqr_qt_check_time, + quot_jsqr_qt_check_remark, + quot_jsqr_qt_leader_user_name, + quot_jsqr_qt_leader_state, + quot_jsqr_qt_leader_time, + quot_jsqr_qt_leader_remark, + create_by, + create_time, + update_by, + update_time, + + + #{quotJsqrId}, + #{quotJsqrCode}, + #{quotJsqrTlApprovalStatus}, + #{quotJsqrTlOperateUserName}, + #{quotJsqrTlOperateStatus}, + #{quotJsqrTlOperateTime}, + #{quotJsqrTlRemark}, + #{quotJsqrTlCheckUserName}, + #{quotJsqrTlCheckState}, + #{quotJsqrTlCheckTime}, + #{quotJsqrTlCheckRemark}, + #{quotJsqrTlLeaderUserName}, + #{quotJsqrTlLeaderState}, + #{quotJsqrTlLeaderTime}, + #{quotJsqrTlLeaderRemark}, + #{quotJsqrDyApprovalStatus}, + #{quotJsqrDyOperateUserName}, + #{quotJsqrDyOperateStatus}, + #{quotJsqrDyOperateTime}, + #{quotJsqrDyRemark}, + #{quotJsqrDyCheckUserName}, + #{quotJsqrDyCheckState}, + #{quotJsqrDyCheckTime}, + #{quotJsqrDyCheckRemark}, + #{quotJsqrDyLeaderUserName}, + #{quotJsqrDyLeaderState}, + #{quotJsqrDyLeaderTime}, + #{quotJsqrDyLeaderRemark}, + #{quotJsqrZyApprovalStatus}, + #{quotJsqrZyOperateUserName}, + #{quotJsqrZyOperateStatus}, + #{quotJsqrZyOperateTime}, + #{quotJsqrZyRemark}, + #{quotJsqrZyCheckUserName}, + #{quotJsqrZyCheckState}, + #{quotJsqrZyCheckTime}, + #{quotJsqrZyCheckRemark}, + #{quotJsqrZyLeaderUserName}, + #{quotJsqrZyLeaderState}, + #{quotJsqrZyLeaderTime}, + #{quotJsqrZyLeaderRemark}, + #{quotJsqrQtApprovalStatus}, + #{quotJsqrQtOperateUserName}, + #{quotJsqrQtOperateStatus}, + #{quotJsqrQtOperateTime}, + #{quotJsqrQtRemark}, + #{quotJsqrQtCheckUserName}, + #{quotJsqrQtCheckState}, + #{quotJsqrQtCheckTime}, + #{quotJsqrQtCheckRemark}, + #{quotJsqrQtLeaderUserName}, + #{quotJsqrQtLeaderState}, + #{quotJsqrQtLeaderTime}, + #{quotJsqrQtLeaderRemark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update quot_jsqr + + quot_jsqr_code = #{quotJsqrCode}, + quot_jsqr_tl_approval_status = #{quotJsqrTlApprovalStatus}, + quot_jsqr_tl_operate_user_name = #{quotJsqrTlOperateUserName}, + quot_jsqr_tl_operate_status = #{quotJsqrTlOperateStatus}, + quot_jsqr_tl_operate_time = #{quotJsqrTlOperateTime}, + quot_jsqr_tl_remark = #{quotJsqrTlRemark}, + quot_jsqr_tl_check_user_name = #{quotJsqrTlCheckUserName}, + quot_jsqr_tl_check_state = #{quotJsqrTlCheckState}, + quot_jsqr_tl_check_time = #{quotJsqrTlCheckTime}, + quot_jsqr_tl_check_remark = #{quotJsqrTlCheckRemark}, + quot_jsqr_tl_leader_user_name = #{quotJsqrTlLeaderUserName}, + quot_jsqr_tl_leader_state = #{quotJsqrTlLeaderState}, + quot_jsqr_tl_leader_time = #{quotJsqrTlLeaderTime}, + quot_jsqr_tl_leader_remark = #{quotJsqrTlLeaderRemark}, + quot_jsqr_dy_approval_status = #{quotJsqrDyApprovalStatus}, + quot_jsqr_dy_operate_user_name = #{quotJsqrDyOperateUserName}, + quot_jsqr_dy_operate_status = #{quotJsqrDyOperateStatus}, + quot_jsqr_dy_operate_time = #{quotJsqrDyOperateTime}, + quot_jsqr_dy_remark = #{quotJsqrDyRemark}, + quot_jsqr_dy_check_user_name = #{quotJsqrDyCheckUserName}, + quot_jsqr_dy_check_state = #{quotJsqrDyCheckState}, + quot_jsqr_dy_check_time = #{quotJsqrDyCheckTime}, + quot_jsqr_dy_check_remark = #{quotJsqrDyCheckRemark}, + quot_jsqr_dy_leader_user_name = #{quotJsqrDyLeaderUserName}, + quot_jsqr_dy_leader_state = #{quotJsqrDyLeaderState}, + quot_jsqr_dy_leader_time = #{quotJsqrDyLeaderTime}, + quot_jsqr_dy_leader_remark = #{quotJsqrDyLeaderRemark}, + quot_jsqr_zy_approval_status = #{quotJsqrZyApprovalStatus}, + quot_jsqr_zy_operate_user_name = #{quotJsqrZyOperateUserName}, + quot_jsqr_zy_operate_status = #{quotJsqrZyOperateStatus}, + quot_jsqr_zy_operate_time = #{quotJsqrZyOperateTime}, + quot_jsqr_zy_remark = #{quotJsqrZyRemark}, + quot_jsqr_zy_check_user_name = #{quotJsqrZyCheckUserName}, + quot_jsqr_zy_check_state = #{quotJsqrZyCheckState}, + quot_jsqr_zy_check_time = #{quotJsqrZyCheckTime}, + quot_jsqr_zy_check_remark = #{quotJsqrZyCheckRemark}, + quot_jsqr_zy_leader_user_name = #{quotJsqrZyLeaderUserName}, + quot_jsqr_zy_leader_state = #{quotJsqrZyLeaderState}, + quot_jsqr_zy_leader_time = #{quotJsqrZyLeaderTime}, + quot_jsqr_zy_leader_remark = #{quotJsqrZyLeaderRemark}, + quot_jsqr_qt_approval_status = #{quotJsqrQtApprovalStatus}, + quot_jsqr_qt_operate_user_name = #{quotJsqrQtOperateUserName}, + quot_jsqr_qt_operate_status = #{quotJsqrQtOperateStatus}, + quot_jsqr_qt_operate_time = #{quotJsqrQtOperateTime}, + quot_jsqr_qt_remark = #{quotJsqrQtRemark}, + quot_jsqr_qt_check_user_name = #{quotJsqrQtCheckUserName}, + quot_jsqr_qt_check_state = #{quotJsqrQtCheckState}, + quot_jsqr_qt_check_time = #{quotJsqrQtCheckTime}, + quot_jsqr_qt_check_remark = #{quotJsqrQtCheckRemark}, + quot_jsqr_qt_leader_user_name = #{quotJsqrQtLeaderUserName}, + quot_jsqr_qt_leader_state = #{quotJsqrQtLeaderState}, + quot_jsqr_qt_leader_time = #{quotJsqrQtLeaderTime}, + quot_jsqr_qt_leader_remark = #{quotJsqrQtLeaderRemark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where quot_jsqr_id = #{quotJsqrId} + + + + delete from quot_jsqr where quot_jsqr_id = #{quotJsqrId} + + + + delete from quot_jsqr where quot_jsqr_id in + + #{quotJsqrId} + + + diff --git a/ruoyi-ui/src/api/technicalConfirm/technicalConfirm.js b/ruoyi-ui/src/api/technicalConfirm/technicalConfirm.js new file mode 100644 index 0000000..4881052 --- /dev/null +++ b/ruoyi-ui/src/api/technicalConfirm/technicalConfirm.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询报价单-技术确认单列表 +export function listJsqr(query) { + return request({ + url: '/jsqr/jsqr/list', + method: 'get', + params: query + }) +} + +// 查询报价单-技术确认单详细 +export function getJsqr(quotJsqrId) { + return request({ + url: '/jsqr/jsqr/' + quotJsqrId, + method: 'get' + }) +} + +// 新增报价单-技术确认单 +export function addJsqr(data) { + return request({ + url: '/jsqr/jsqr', + method: 'post', + data: data + }) +} + +// 修改报价单-技术确认单 +export function updateJsqr(data) { + return request({ + url: '/jsqr/jsqr', + method: 'put', + data: data + }) +} + +// 删除报价单-技术确认单 +export function delJsqr(quotJsqrId) { + return request({ + url: '/jsqr/jsqr/' + quotJsqrId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index 88e7faa..7a9ce25 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -164,7 +164,7 @@ - + @@ -521,7 +521,7 @@
保 存 提 交 - 提交技术协助 + 提交技术协助
@@ -721,7 +721,7 @@ export default { this.$refs["form"].validate(valid => { if (valid) { //技术协助-分组传值 - let quotJsxzGroups = null; + let quotJsxzGroups = ''; if(this.form.quotJsxzGroup){ this.form.quotJsxzGroup.forEach(function (item,index) { if(index !== 0){ @@ -753,7 +753,7 @@ export default { this.$refs["form"].validate(valid => { if (valid) { //技术协助-分组传值 - let quotJsxzGroups = null; + let quotJsxzGroups = ''; if(this.form.quotJsxzGroup){ this.form.quotJsxzGroup.forEach(function (item,index) { if(index !== 0){ @@ -777,9 +777,8 @@ export default { checkPermi, /** 报价组提交技术协助按钮 */ commitJsForm() { - //技术协助-分组传值 - let quotJsxzGroups = null; + let quotJsxzGroups = ''; if(this.form.quotJsxzGroup){ this.form.quotJsxzGroup.forEach(function (item,index) { if(index !== 0){ @@ -791,7 +790,7 @@ export default { this.form.quotJsxzGroup = quotJsxzGroups; this.form.quotMaterialList = this.quotMaterialList; commitJsQuot(this.form).then(response => { - this.$modal.msgSuccess("提交成功"); + this.$modal.msgSuccess("提交技术协助成功"); this.open = false; this.getList(); }); diff --git a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue new file mode 100644 index 0000000..deb9bc6 --- /dev/null +++ b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue @@ -0,0 +1,436 @@ + + +