diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 67ac235..10775fc 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,13 +2,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - @@ -98,6 +128,8 @@ + + @@ -109,14 +141,15 @@ - - + + - + - - + + + @@ -128,46 +161,46 @@ - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + @@ -208,10 +241,10 @@ - - + + - + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java index e70c71e..32246c6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java @@ -220,35 +220,21 @@ public class AuthorizeController extends BaseController } /** - * 提交投标办经理按钮 - */ - @PreAuthorize("@ss.hasPermi('authorize:authorize:commitJl')") - @ChangeRecordLog(serviceImplclass = "com.ruoyi.authorize.service.impl.AuthorizeServiceImpl", - serviceImplMethod="selectAuthorizeByDoaId", - tableId = "doaId",codeName = "doaCode",title = "投标办提交经理审批") - @PostMapping("/commitAuthorizeJl") - public AjaxResult commitAuthorizeJl(@RequestBody Authorize authorize) - { - try{ - authorize.setDoaJlApprovalStatus("1");//更新经理审批状态为已提交 - authorizeService.updateAuthorize(authorize); - return success(); - }catch (Exception e){ - return error("系统异常"); - } - } - - /** - * 投标办经理提交OA按钮 + * 投标办提交OA按钮 */ @PreAuthorize("@ss.hasPermi('authorize:authorize:commitOA')") @ChangeRecordLog(serviceImplclass = "com.ruoyi.authorize.service.impl.AuthorizeServiceImpl", serviceImplMethod="selectAuthorizeByDoaId", - tableId = "doaId",codeName = "doaCode",title = "投标办经理提交OA审批") + tableId = "doaId",codeName = "doaCode",title = "投标办提交OA审批") @PostMapping("/commitAuthorizeOA") public AjaxResult commitAuthorizeOA(@RequestBody Authorize authorize) { try{ + String doa_oa_approval_status = authorize.getDoaOaApprovalStatus(); + if("1".equals(doa_oa_approval_status)){ + return error("已提交OA审批中,请勿重复操作"); + } + // 投标提交OA,插入中间表 sys_oa_authorize SysOaAuthorize sysOaAuthorize = new SysOaAuthorize(); SysOaAuthorize oauser = authorizeService.selectOAUserByUserName(getUsername());// 查询OA用户 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java index 9663752..9a92e1c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java @@ -496,6 +496,12 @@ public class BidController extends BaseController @PostMapping("/commitJsBid") public AjaxResult commitJsBid(@RequestBody Bid bid) { + Bid bidInfo = bidService.selectBidByBidId(bid.getBidId()); + String bid_jsxz_approval_status = bidInfo.getBidJsxzApprovalStatus(); + if("1".equals(bid_jsxz_approval_status)){//技术协助状态为协助中 不可再次提交 + return error("技术协助-当前技术协助中,请勿重新提交"); + } + String bidJsxzGroup = ""; String bidJsxzGroupArr[] = bid.getBidJsxzGroup(); if(bidJsxzGroupArr.length>0){ @@ -576,6 +582,12 @@ public class BidController extends BaseController @PostMapping("/commitHjBid") public AjaxResult commitHjBid(@RequestBody Bid bid) { + Bid bidInfo = bidService.selectBidByBidId(bid.getBidId()); + String bid_hj_approval_status = bidInfo.getBidHjApprovalStatus(); + if("1".equals(bid_hj_approval_status)){//核价协助状态为协助中 不可再次提交 + return error("核价协助-当前核价协助中,请勿重新提交"); + } + BidHj bidHj = new BidHj(); String bidHjId = UUID.fastUUID().toString(); bidHj.setBidHjId(bidHjId); 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 a39822c..ff6e271 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 @@ -813,6 +813,7 @@ public class QuotController extends BaseController sysOaQuot.setQuotTongPrice(quot.getQuotTongPrice()); sysOaQuot.setQuotMatpriceDiff(quot.getQuotMatpriceDiff()); sysOaQuot.setQuotMatpriceDiff2(quot.getQuotMatpriceDiff2()); + sysOaQuot.setQuotBjyRemark(quot.getQuotBjyRemark()); // 上传反馈清单 QuotFile quotFile = new QuotFile(); @@ -1049,7 +1050,7 @@ public class QuotController extends BaseController @GetMapping("/listStatisticsQuotQuot") public TableDataInfo listStatisticsQuotQuot(Quot quot) { - List list = quotService.selectStatisticsQuotList(quot); + List list = quotService.selectStatisticsQuotList(quot); return getDataTable(list); } diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class index d36ab83..213c2c8 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class and b/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class differ diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class index 81945db..a8fead7 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class and b/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class differ diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/zgys/ZgysController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/zgys/ZgysController.class index 0f46a76..6881936 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/web/controller/zgys/ZgysController.class and b/ruoyi-admin/target/classes/com/ruoyi/web/controller/zgys/ZgysController.class differ diff --git a/ruoyi-admin/target/maven-archiver/pom.properties b/ruoyi-admin/target/maven-archiver/pom.properties index e0c36ea..9c26ad0 100644 --- a/ruoyi-admin/target/maven-archiver/pom.properties +++ b/ruoyi-admin/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 07 15:17:04 CST 2024 +#Thu Aug 08 10:18:08 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 d309673..85d96dd 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 1b779d5..5139681 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 9afc6ca..384882d 100644 --- a/ruoyi-common/target/maven-archiver/pom.properties +++ b/ruoyi-common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 07 15:16:51 CST 2024 +#Thu Aug 08 10:17:35 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 ebc1ff7..1cc06a0 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 36e3993..ecf3226 100644 --- a/ruoyi-framework/target/maven-archiver/pom.properties +++ b/ruoyi-framework/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 07 15:16:58 CST 2024 +#Thu Aug 08 10:17:52 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 b82da18..f76523c 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 bf6a713..de5f845 100644 --- a/ruoyi-generator/target/maven-archiver/pom.properties +++ b/ruoyi-generator/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 07 15:17:00 CST 2024 +#Thu Aug 08 10:17:58 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 3ab4562..216302c 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 ca07ec3..e52b99e 100644 --- a/ruoyi-quartz/target/maven-archiver/pom.properties +++ b/ruoyi-quartz/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 07 15:16:59 CST 2024 +#Thu Aug 08 10:17:56 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 04ffcdc..432e0fa 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/authorize/domain/Authorize.java b/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/Authorize.java index f97d295..920aed9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/Authorize.java +++ b/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/Authorize.java @@ -25,18 +25,19 @@ public class Authorize extends BaseEntity private String doaCode; /** 授权编号-业务编码 */ + @Excel(name = "授权编号") @DataName(name = "授权编号") private String doaNumber; - /** 业务经理账号 */ + /** 业务员账号 */ private String doaSalesmanCode; - /** 业务经理编码 */ + /** 业务员编码 */ private String doaSalesmanBm; - /** 业务经理 */ - @DataName(name = "业务经理") - @Excel(name = "业务经理") + /** 业务员 */ + @DataName(name = "业务员") + @Excel(name = "业务员") private String doaSalesmanName; /** 部门id */ @@ -46,8 +47,8 @@ public class Authorize extends BaseEntity @DataName(name = "部门名") private String doaSalesmanDeptName; - /** 业务经理电话 */ - @DataName(name = "业务经理电话") + /** 业务员电话 */ + @DataName(name = "业务员电话") private String doaSalesmanPhone; /** 项目名称 */ @@ -93,9 +94,9 @@ public class Authorize extends BaseEntity @DataName(name = "授权期限") private String doaAuthorizationDuration; - /** 授权书用途(1-备案 2-出具授权 3-签约) */ - @DataName(name = "授权书用途",readConverterExp="1=备案,2=出具授权,3=签约") - @Excel(name = "授权书用途") + /** 类别(1-授权书 2-备案) */ + @DataName(name = "类别",readConverterExp="1=授权书,2=备案") + @Excel(name = "类别") private String doaPowerAttorneyPurpose; /** 有无格式(0-有 1-无) */ @@ -114,6 +115,7 @@ public class Authorize extends BaseEntity /** 制标员 */ @DataName(name = "制标员") + @Excel(name = "制标员") private String doaStandardizer; /** 是否存档(0-是 1-否) */ @@ -127,7 +129,7 @@ public class Authorize extends BaseEntity /** 业务员提交状态(0-待提交 1-协助中 2-已完成 3-已驳回) */ @DataName(name = "提交状态",readConverterExp="0=待提交,1=协助中,2=已完成,3=已驳回") - @Excel(name = "提交状态") + @Excel(name = "提交状态",dictType = "doa_approval_status") private String doaApprovalStatus; /** 副总审批状态(0-待提交 1-审批中 2-已完成 3-已驳回) */ @@ -138,10 +140,6 @@ public class Authorize extends BaseEntity @DataName(name = "OA反馈说明") private String doaOaRemark; - /** 提交经理审批(0-待提交 1-已提交) */ - @DataName(name = "提交经理审批",readConverterExp="0=待提交,1=已提交") - private String doaJlApprovalStatus; - /** 创建人 */ @DataName(name = "创建人") private String createName; @@ -377,15 +375,6 @@ public class Authorize extends BaseEntity { return doaOaApprovalStatus; } - public void setDoaJlApprovalStatus(String doaJlApprovalStatus) - { - this.doaJlApprovalStatus = doaJlApprovalStatus; - } - - public String getDoaJlApprovalStatus() - { - return doaJlApprovalStatus; - } public String getCreateName() { return createName; } public void setCreateName(String createName) { this.createName = createName; } 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 0335469..9172acd 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,11 +1,10 @@ package com.ruoyi.quot.domain; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + import java.util.Date; import java.util.List; -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 @@ -134,7 +133,8 @@ public class Quot extends BaseEntity /** 报价单区分（1：报价生成询价单-传明细 2：创建询价单-传附件） */ private String quotDistinguish; - + /** 报价员备注 */ + private String quotBjyRemark; /** 技术协助 */ private String quotJsxzStandard;//技术协助-标准 @@ -391,11 +391,12 @@ public class Quot extends BaseEntity public String getQuotHandle() { return quotHandle; } public void setQuotHandle(String quotHandle) { this.quotHandle = quotHandle; } - public String getQuotDistinguish() {return quotDistinguish;} public void setQuotDistinguish(String quotDistinguish) {this.quotDistinguish = quotDistinguish;} + public String getQuotBjyRemark() { return quotBjyRemark; } + public void setQuotBjyRemark(String quotBjyRemark) { this.quotBjyRemark = quotBjyRemark; } public List getQuotMaterialList() { return quotMaterialList; } public void setQuotMaterialList(List quotMaterialList) diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/QuotSecDiff.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/QuotSecDiff.java new file mode 100644 index 0000000..a986b44 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/QuotSecDiff.java @@ -0,0 +1,141 @@ +package com.ruoyi.quot.domain; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; +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 + * + * @author ruoyi + * @date 2024-04-01 + */ +public class QuotSecDiff extends BaseEntity +{ + private String quotCode; + + /** 业务员 */ + private String quotSalesmanName; + + /** 客户名称 */ + private String quotCustomerName; + + /** 询价日期 */ + private Date quotInquiryDate; + + /** 项目名称 */ + private String quotProject; + + /** 报价日期 */ + private Date quotQuotationDate; + + /** 明细条数 */ + private Integer quotMaterialsCount; + + /** 总价 */ + private String quotTotalPrice; + + /** 审核人 */ + private String quotCheckUserNickname; + + /** 创建人 */ + private String createName; + + /** 处理时间 */ + private String secDiff; + + public String getQuotCode() { + return quotCode; + } + + public void setQuotCode(String quotCode) { + this.quotCode = quotCode; + } + + public String getQuotSalesmanName() { + return quotSalesmanName; + } + + public void setQuotSalesmanName(String quotSalesmanName) { + this.quotSalesmanName = quotSalesmanName; + } + + public String getQuotCustomerName() { + return quotCustomerName; + } + + public void setQuotCustomerName(String quotCustomerName) { + this.quotCustomerName = quotCustomerName; + } + + public Date getQuotInquiryDate() { + return quotInquiryDate; + } + + public void setQuotInquiryDate(Date quotInquiryDate) { + this.quotInquiryDate = quotInquiryDate; + } + + public String getQuotProject() { + return quotProject; + } + + public void setQuotProject(String quotProject) { + this.quotProject = quotProject; + } + + public Date getQuotQuotationDate() { + return quotQuotationDate; + } + + public void setQuotQuotationDate(Date quotQuotationDate) { + this.quotQuotationDate = quotQuotationDate; + } + + public Integer getQuotMaterialsCount() { + return quotMaterialsCount; + } + + public void setQuotMaterialsCount(Integer quotMaterialsCount) { + this.quotMaterialsCount = quotMaterialsCount; + } + + public String getQuotTotalPrice() { + return quotTotalPrice; + } + + public void setQuotTotalPrice(String quotTotalPrice) { + this.quotTotalPrice = quotTotalPrice; + } + + public String getQuotCheckUserNickname() { + return quotCheckUserNickname; + } + + public void setQuotCheckUserNickname(String quotCheckUserNickname) { + this.quotCheckUserNickname = quotCheckUserNickname; + } + + public String getCreateName() { + return createName; + } + + public void setCreateName(String createName) { + this.createName = createName; + } + + public String getSecDiff() { + BigDecimal value = new BigDecimal(secDiff); + BigDecimal noZeros = value.stripTrailingZeros(); + String result = noZeros.toPlainString(); + return result; + } + + public void setSecDiff(String secDiff) { + this.secDiff = secDiff; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/SysOaQuot.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/SysOaQuot.java index 443c8a4..37225b1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/SysOaQuot.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/SysOaQuot.java @@ -1,6 +1,5 @@ package com.ruoyi.quot.domain; -import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import java.util.Date; @@ -69,6 +68,9 @@ public class SysOaQuot extends BaseEntity /** 总价 */ private String quotTotalPrice; + /** 报价员备注 */ + private String quotBjyRemark; + /** OA审批状态 */ private String state; @@ -211,6 +213,10 @@ public class SysOaQuot extends BaseEntity public void setQuotTotalPrice(String quotTotalPrice) { this.quotTotalPrice = quotTotalPrice; } + public String getQuotBjyRemark() { return quotBjyRemark; } + + public void setQuotBjyRemark(String quotBjyRemark) { this.quotBjyRemark = quotBjyRemark; } + public String getState() { return state; } public void setState(String state) { this.state = state; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java b/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java index f206240..0bafb0e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java @@ -1,9 +1,6 @@ package com.ruoyi.quot.mapper; -import com.ruoyi.quot.domain.Quot; -import com.ruoyi.quot.domain.QuotMaterial; -import com.ruoyi.quot.domain.QuotZb; -import com.ruoyi.quot.domain.SysOaQuot; +import com.ruoyi.quot.domain.*; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -174,7 +171,7 @@ public interface QuotMapper * @param quot * @return */ - List selectStatisticsQuotList(Quot quot); + List selectStatisticsQuotList(Quot quot); /** * 统计有效报价单模块-明细进单占比 diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java b/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java index b7f6c78..3c46988 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java @@ -1,6 +1,7 @@ package com.ruoyi.quot.service; import com.ruoyi.quot.domain.Quot; +import com.ruoyi.quot.domain.QuotSecDiff; import com.ruoyi.quot.domain.QuotZb; import com.ruoyi.quot.domain.SysOaQuot; @@ -155,7 +156,7 @@ public interface IQuotService * @param quot * @return */ - List selectStatisticsQuotList(Quot quot); + List selectStatisticsQuotList(Quot quot); /** * 统计有效报价单模块-明细进单占比 diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java index ac236bf..37639d0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java @@ -6,10 +6,7 @@ import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.uuid.UUID; -import com.ruoyi.quot.domain.Quot; -import com.ruoyi.quot.domain.QuotMaterial; -import com.ruoyi.quot.domain.QuotZb; -import com.ruoyi.quot.domain.SysOaQuot; +import com.ruoyi.quot.domain.*; import com.ruoyi.quot.mapper.QuotMapper; import com.ruoyi.quot.service.IQuotService; import org.springframework.beans.factory.annotation.Autowired; @@ -294,7 +291,7 @@ public class QuotServiceImpl implements IQuotService * @return */ @Override - public List selectStatisticsQuotList(Quot quot) { + public List selectStatisticsQuotList(Quot quot) { return quotMapper.selectStatisticsQuotList(quot); } diff --git a/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml b/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml index d3c8b07..c3da1f3 100644 --- a/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml @@ -53,7 +53,7 @@ a.doa_owner_unit, a.doa_generalcontract_unit, a.doa_subcontract_unit, a.doa_authorizer, a.doa_authorizer_phone, a.doa_authorizer_identification_number, a.doa_authorization_duration, a.doa_power_attorney_purpose, a.doa_format, a.doa_remark, a.doa_rejection_reasons, a.doa_standardizer, a.doa_archiving, a.doa_vice_president_approved, - a.doa_approval_status, a.doa_oa_approval_status, a.doa_oa_remark, a.doa_jl_approval_status, + a.doa_approval_status, a.doa_oa_approval_status, a.doa_oa_remark, a.create_by, u.nick_name create_name, a.create_time, a.update_by, a.update_time from authorize a diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index fa0e999..44be5d7 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -122,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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_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,a.quot_distinguish, + a.create_by, a.create_time, a.update_by, a.update_time, u.nick_name create_name,a.quot_handle,a.quot_distinguish,a.quot_bjy_remark, a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter, a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id, @@ -260,6 +261,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_print, quot_print_user_name, quot_distinguish, + quot_bjy_remark, create_by, create_time, update_by, @@ -311,6 +313,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{quotPrint}, #{quotPrintUserName}, #{quotDistinguish}, + #{quotBjyRemark}, #{createBy}, #{createTime}, #{updateBy}, @@ -356,6 +359,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_matprice_diff2, quot_fk_file, quot_total_price, + quot_bjy_remark, create_time, isFinish, @@ -379,6 +383,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{quotMatpriceDiff2}, #{quotFkFile}, #{quotTotalPrice}, + #{quotBjyRemark}, #{createTime}, #{isFinish}, @@ -420,6 +425,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_print_user_name = #{quotPrintUserName}, quot_jsw_check_user_nickname = #{quotJswCheckUserNickname}, quot_bzr_user_nickname = #{quotBzrUserNickname}, + quot_bjy_remark = #{quotBjyRemark}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, @@ -547,8 +553,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + select a.quot_code quotCode,a.quot_salesman_name quotSalesmanName,a.quot_customer_name quotCustomerName, + a.quot_project quotProject, a.quot_materials_count quotMaterialsCount, + a.quot_total_price quotTotalPrice,a.quot_inquiry_date quotInquiryDate,a.quot_quotation_date quotQuotationDate, + a.quot_check_user_nickname quotCheckUserNickname, + a.create_name createName,a.create_time createTime, + + ROUND( + + (case when a.dayDiff = 0 and a.secDiff1 =]]> 0 and a.secDiff2 =]]> 0 then a.secDiff1+a.secDiff2 + + when a.dayDiff = 0 and a.secDiff1 0 and a.secDiff3 0 and a.secDiff2 =]]> 0 then a.secDiff2 + + when a.dayDiff = 0 then a.secDiff + + when a.dayDiff = 1 then a.secDiff-14*3600 + + when a.dayDiff > 1 then a.secDiff-(a.dayDiff-1)*24*3600 + else 0 end) / 3600.00, 2) secDiff + FROM ( + select a.quot_code,a.quot_salesman_name,a.quot_customer_name,a.quot_project, a.quot_materials_count, + a.quot_total_price,a.quot_inquiry_date,a.quot_quotation_date,u2.nick_name quot_check_user_nickname, + u.nick_name create_name,a.create_time, + + datediff(second,quot_inquiry_date,CONVERT(DATETIME, CONVERT(VARCHAR(10),quot_inquiry_date,111) + ' ' + '11:30:00')) secDiff1, + + datediff(second,CONVERT(DATETIME, CONVERT(VARCHAR(10),quot_quotation_date,111) + ' ' + '13:00:00'),quot_quotation_date) secDiff2, + + datediff(second,CONVERT(DATETIME, CONVERT(VARCHAR(10),quot_inquiry_date,111) + ' ' + '13:00:00'),quot_inquiry_date) secDiff3, + datediff(day,quot_inquiry_date,quot_quotation_date) dayDiff, + datediff(second,quot_inquiry_date,quot_quotation_date) secDiff + from quot a + left join sys_user u on u.user_name=a.create_by + left join sys_user u2 on u2.user_name=a.quot_check_user_name + and quot_code like concat('%', #{quotCode}, '%') and quot_customer_name like concat('%', #{quotCustomerName}, '%') @@ -562,6 +618,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and (a.quot_approval_status = '2' or (a.quot_approval_status = '3' and a.quot_oa_approval_status = '3')) + )a order by a.quot_quotation_date desc @@ -602,7 +659,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" else 0 end secDiff from ( select quot_code,quot_inquiry_date, quot_quotation_date, - + datediff(second,quot_inquiry_date,CONVERT(DATETIME, CONVERT(VARCHAR(10),quot_inquiry_date,111) + ' ' + '11:30:00')) secDiff1, datediff(second,CONVERT(DATETIME, CONVERT(VARCHAR(10),quot_quotation_date,111) + ' ' + '13:00:00'),quot_quotation_date) secDiff2, diff --git a/ruoyi-system/target/classes/com/ruoyi/authorize/domain/Authorize.class b/ruoyi-system/target/classes/com/ruoyi/authorize/domain/Authorize.class index b241e30..063fb62 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/authorize/domain/Authorize.class and b/ruoyi-system/target/classes/com/ruoyi/authorize/domain/Authorize.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/quot/domain/QuotSecDiff.class b/ruoyi-system/target/classes/com/ruoyi/quot/domain/QuotSecDiff.class new file mode 100644 index 0000000..1073dcd Binary files /dev/null and b/ruoyi-system/target/classes/com/ruoyi/quot/domain/QuotSecDiff.class differ diff --git a/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml b/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml index 5cc981f..c3da1f3 100644 --- a/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml +++ b/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml @@ -33,7 +33,6 @@ - @@ -54,7 +53,7 @@ a.doa_owner_unit, a.doa_generalcontract_unit, a.doa_subcontract_unit, a.doa_authorizer, a.doa_authorizer_phone, a.doa_authorizer_identification_number, a.doa_authorization_duration, a.doa_power_attorney_purpose, a.doa_format, a.doa_remark, a.doa_rejection_reasons, a.doa_standardizer, a.doa_archiving, a.doa_vice_president_approved, - a.doa_approval_status, a.doa_oa_approval_status, a.doa_oa_remark, a.doa_jl_approval_status, + a.doa_approval_status, a.doa_oa_approval_status, a.doa_oa_remark, a.create_by, u.nick_name create_name, a.create_time, a.update_by, a.update_time from authorize a @@ -113,7 +112,6 @@ doa_vice_president_approved, doa_approval_status, doa_oa_approval_status, - doa_jl_approval_status, doa_oa_remark, create_by, @@ -150,7 +148,6 @@ #{doaVicePresidentApproved}, #{doaApprovalStatus}, #{doaOaApprovalStatus}, - #{doaJlApprovalStatus}, #{doaOaRemark}, #{createBy}, @@ -248,7 +245,6 @@ doa_vice_president_approved = #{doaVicePresidentApproved}, doa_approval_status = #{doaApprovalStatus}, doa_oa_approval_status = #{doaOaApprovalStatus}, - doa_jl_approval_status = #{doaJlApprovalStatus}, doa_oa_remark = #{doaOaRemark}, create_by = #{createBy}, diff --git a/ruoyi-system/target/classes/mapper/quot/QuotMapper.xml b/ruoyi-system/target/classes/mapper/quot/QuotMapper.xml index 2f7c66a..9bebec8 100644 --- a/ruoyi-system/target/classes/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/target/classes/mapper/quot/QuotMapper.xml @@ -547,8 +547,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + select a.quot_code quotCode,a.quot_salesman_name quotSalesmanName,a.quot_customer_name quotCustomerName, + a.quot_project quotProject, a.quot_materials_count quotMaterialsCount, + a.quot_total_price quotTotalPrice,a.quot_inquiry_date quotInquiryDate,a.quot_quotation_date quotQuotationDate, + a.quot_check_user_nickname quotCheckUserNickname, + a.create_name createName,a.create_time createTime, + + ROUND( + + (case when a.dayDiff = 0 and a.secDiff1 =]]> 0 and a.secDiff2 =]]> 0 then a.secDiff1+a.secDiff2 + + when a.dayDiff = 0 and a.secDiff1 0 and a.secDiff3 0 and a.secDiff2 =]]> 0 then a.secDiff2 + + when a.dayDiff = 0 then a.secDiff + + when a.dayDiff = 1 then a.secDiff-14*3600 + + when a.dayDiff > 1 then a.secDiff-(a.dayDiff-1)*24*3600 + else 0 end) / 3600.00, 2) secDiff + FROM ( + select a.quot_code,a.quot_salesman_name,a.quot_customer_name,a.quot_project, a.quot_materials_count, + a.quot_total_price,a.quot_inquiry_date,a.quot_quotation_date,u2.nick_name quot_check_user_nickname, + u.nick_name create_name,a.create_time, + + datediff(second,quot_inquiry_date,CONVERT(DATETIME, CONVERT(VARCHAR(10),quot_inquiry_date,111) + ' ' + '11:30:00')) secDiff1, + + datediff(second,CONVERT(DATETIME, CONVERT(VARCHAR(10),quot_quotation_date,111) + ' ' + '13:00:00'),quot_quotation_date) secDiff2, + + datediff(second,CONVERT(DATETIME, CONVERT(VARCHAR(10),quot_inquiry_date,111) + ' ' + '13:00:00'),quot_inquiry_date) secDiff3, + datediff(day,quot_inquiry_date,quot_quotation_date) dayDiff, + datediff(second,quot_inquiry_date,quot_quotation_date) secDiff + from quot a + left join sys_user u on u.user_name=a.create_by + left join sys_user u2 on u2.user_name=a.quot_check_user_name + and quot_code like concat('%', #{quotCode}, '%') and quot_customer_name like concat('%', #{quotCustomerName}, '%') @@ -562,6 +612,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and (a.quot_approval_status = '2' or (a.quot_approval_status = '3' and a.quot_oa_approval_status = '3')) + )a order by a.quot_quotation_date desc @@ -587,26 +638,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/target/maven-archiver/pom.properties b/ruoyi-system/target/maven-archiver/pom.properties index 41d0776..1c3bf81 100644 --- a/ruoyi-system/target/maven-archiver/pom.properties +++ b/ruoyi-system/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 07 15:16:54 CST 2024 +#Thu Aug 08 10:17:39 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-system diff --git a/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index d1dd79f..6dd1851 100644 --- a/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -36,6 +36,7 @@ com\ruoyi\authorize\service\IAuthorizeFileService.class com\ruoyi\system\mapper\SysDictTypeMapper.class com\ruoyi\clMaterial\service\ICYlMaterialService.class com\ruoyi\materialType\service\ICMaterialTypeService.class +com\ruoyi\quot\domain\QuotSecDiff.class com\ruoyi\system\mapper\SysUserPostMapper.class com\ruoyi\material\domain\CMaterialCost.class com\ruoyi\customer\domain\qcc\Verify.class diff --git a/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index b739ab2..50938f9 100644 --- a/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -35,6 +35,7 @@ E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\quot\domain\jsw E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\customer\domain\qcc\QccVerifyJsonResult.java E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\factory\domain\CMaterialTypeFactory.java E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\quot\domain\jsw\QuotJswMaterial.java +E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\quot\domain\QuotSecDiff.java E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\system\domain\LoginParams.java E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\zgys\service\IZgysService.java E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\quot\domain\jsw\QuotJswInfo.java diff --git a/ruoyi-system/target/ruoyi-system-3.8.7.jar b/ruoyi-system/target/ruoyi-system-3.8.7.jar index 063f876..ba4e3f8 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/authorize/authorize.js b/ruoyi-ui/src/api/authorize/authorize.js index 9075d78..e6122a2 100644 --- a/ruoyi-ui/src/api/authorize/authorize.js +++ b/ruoyi-ui/src/api/authorize/authorize.js @@ -70,15 +70,6 @@ export function commitAuthorize(data) { }) } -//投标办提交经理按钮 -export function commitAuthorizeJl(data) { - return request({ - url: '/authorize/authorize/commitAuthorizeJl', - method: 'post', - data: data - }) -} - //投标办经理提交OA按钮 export function commitAuthorizeOA(data) { return request({ diff --git a/ruoyi-ui/src/views/authorize/authorize/index.vue b/ruoyi-ui/src/views/authorize/authorize/index.vue index 8f18d8e..c5047bb 100644 --- a/ruoyi-ui/src/views/authorize/authorize/index.vue +++ b/ruoyi-ui/src/views/authorize/authorize/index.vue @@ -9,8 +9,8 @@ @keyup.enter.native="handleQuery" /> - - + + - + @@ -153,6 +153,11 @@ + + + +