diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9c89dbf..841fcf1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + @@ -115,10 +187,10 @@ - + - + @@ -135,65 +207,65 @@ - + - - - + + + - - - + + + - - - + + + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination index 2b6a1e9..98f74ea 100644 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -1,7 +1,7 @@ #for tests only ! -#Thu Aug 08 14:57:29 CST 2024 +#Fri Aug 09 14:26:27 CST 2024 jco.client.lang=ZH -jco.client.passwd=fE;w~oY[RV}$Hq`k8+X*q%@jQBYm^Qo.).998p..HvCkC+6i +jco.client.passwd=654321 jco.client.sysnr=00 jco.destination.pool_capacity=10 jco.client.client=800 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java index 0157d4d..28d47dd 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 @@ -106,12 +106,16 @@ public class AuthorizeController extends BaseController authorize.setDoaSalesmanDeptId(String.valueOf(deptId)); SysDept sysDept = deptService.selectDeptById(deptId); authorize.setDoaSalesmanDeptName(sysDept.getDeptName()); - authorize.setCreateBy(authorize.getDoaSalesmanCode()); + + //获取用户ID + String userId = String.valueOf(userService.selectUserByUserName(authorize.getDoaSalesmanCode()).getUserId()); + authorize.setCreateBy(userId); + authorize.setUpdateBy(userId); }else{ - authorize.setCreateBy(getUsername()); + authorize.setCreateBy(String.valueOf(getUserId())); + authorize.setUpdateBy(String.valueOf(getUserId())); } - authorize.setUpdateBy(getUsername()); authorizeService.insertAuthorize(authorize); return success(authorize); } @@ -133,10 +137,12 @@ public class AuthorizeController extends BaseController authorize.setDoaSalesmanDeptId(String.valueOf(deptId)); SysDept sysDept = deptService.selectDeptById(deptId); authorize.setDoaSalesmanDeptName(sysDept.getDeptName()); - authorize.setCreateBy(authorize.getDoaSalesmanCode()); - authorize.setUpdateBy(authorize.getDoaSalesmanCode()); + + String userId = String.valueOf(userService.selectUserByUserName(authorize.getDoaSalesmanCode()).getUserId()); + authorize.setCreateBy(userId); + authorize.setUpdateBy(userId); }else{ - authorize.setUpdateBy(getUsername()); + authorize.setUpdateBy(String.valueOf(getUserId())); } return toAjax(authorizeService.updateAuthorize(authorize)); } @@ -181,33 +187,37 @@ public class AuthorizeController extends BaseController deptId = userService.selectUserByUserName(authorize.getDoaSalesmanCode()).getDeptId(); } SysDept sysDept = deptService.selectDeptById(deptId); + String doa_id = authorize.getDoaId(); + String doaNumber = authorizeService.getCodeAT("S"); + authorize.setDoaNumber(doaNumber); + if(StringUtils.isEmpty(doa_id)){ authorize.setDoaId(UUID.fastUUID().toString()); String doaCode = authorizeService.getCode("ZGYS"); authorize.setDoaCode(doaCode); - String doaNumber = authorizeService.getCodeAT("S"); - authorize.setDoaNumber(doaNumber); if(doaJlRoleFlag){ authorize.setDoaSalesmanDeptId(String.valueOf(deptId)); authorize.setDoaSalesmanDeptName(sysDept.getDeptName()); - authorize.setCreateBy(authorize.getDoaSalesmanCode()); + + String userId = String.valueOf(userService.selectUserByUserName(authorize.getDoaSalesmanCode()).getUserId()); + authorize.setCreateBy(userId); }else{ - authorize.setCreateBy(getUsername()); + authorize.setCreateBy(String.valueOf(getUserId())); } authorizeService.insertAuthorize(authorize); return success(); }else{ - String doaNumber = authorizeService.getCodeAT("S"); - authorize.setDoaNumber(doaNumber); if(doaJlRoleFlag){ authorize.setDoaSalesmanDeptId(String.valueOf(deptId)); authorize.setDoaSalesmanDeptName(sysDept.getDeptName()); - authorize.setCreateBy(authorize.getDoaSalesmanCode()); - authorize.setUpdateBy(authorize.getDoaSalesmanCode()); + + String userId = String.valueOf(userService.selectUserByUserName(authorize.getDoaSalesmanCode()).getUserId()); + authorize.setCreateBy(userId); + authorize.setUpdateBy(userId); }else{ - authorize.setUpdateBy(getUsername()); + authorize.setUpdateBy(String.valueOf(getUserId())); } authorize.setDoaRejectionReasons("");//驳回后再次提交清除驳回原因 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 2d9c5bd..7cc26fa 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 @@ -133,8 +133,10 @@ public class BidController extends BaseController copy.setBidPriceLinkageMethod(bidInfo.getBidPriceLinkageMethod()); copy.setBidOtherRequire(bidInfo.getBidOtherRequire()); - copy.setCreateBy(bidInfo.getBidSalesmanCode()); - copy.setUpdateBy(getUsername()); + //获取用户ID + String userId = String.valueOf(userService.selectUserByUserName(bidInfo.getBidSalesmanCode()).getUserId()); + copy.setCreateBy(userId); + copy.setUpdateBy(userId); bidService.insertBid(copy); return success(); @@ -232,12 +234,16 @@ public class BidController extends BaseController bid.setBidSalesmanDeptId(String.valueOf(deptId)); SysDept sysDept = deptService.selectDeptById(deptId); bid.setBidSalesmanDeptName(sysDept.getDeptName()); - bid.setCreateBy(bid.getBidSalesmanCode()); + + //获取用户ID + String userId = String.valueOf(userService.selectUserByUserName(bid.getBidSalesmanCode()).getUserId()); + bid.setCreateBy(userId); + bid.setUpdateBy(userId); }else{ - bid.setCreateBy(getUsername()); + bid.setCreateBy(String.valueOf(getUserId())); + bid.setUpdateBy(String.valueOf(getUserId())); } - bid.setUpdateBy(getUsername()); bidService.insertBid(bid); return success(bid); } @@ -259,10 +265,13 @@ public class BidController extends BaseController bid.setBidSalesmanDeptId(String.valueOf(deptId)); SysDept sysDept = deptService.selectDeptById(deptId); bid.setBidSalesmanDeptName(sysDept.getDeptName()); - bid.setCreateBy(bid.getBidSalesmanCode()); - bid.setUpdateBy(bid.getBidSalesmanCode()); + + //获取用户ID + String userId = String.valueOf(userService.selectUserByUserName(bid.getBidSalesmanCode()).getUserId()); + bid.setCreateBy(userId); + bid.setUpdateBy(userId); }else{ - bid.setUpdateBy(getUsername()); + bid.setUpdateBy(String.valueOf(getUserId())); } return toAjax(bidService.updateBid(bid)); } @@ -369,19 +378,25 @@ public class BidController extends BaseController if(bidJlRoleFlag){ bid.setBidSalesmanDeptId(String.valueOf(deptId)); bid.setBidSalesmanDeptName(sysDept.getDeptName()); - bid.setCreateBy(bid.getBidSalesmanCode()); + + //获取用户ID + String userId = String.valueOf(userService.selectUserByUserName(bid.getBidSalesmanCode()).getUserId()); + bid.setCreateBy(userId); }else{ - bid.setCreateBy(getUsername()); + bid.setCreateBy(String.valueOf(getUserId())); } bidService.insertBid(bid); }else{ if(bidJlRoleFlag){ bid.setBidSalesmanDeptId(String.valueOf(deptId)); bid.setBidSalesmanDeptName(sysDept.getDeptName()); - bid.setCreateBy(bid.getBidSalesmanCode()); - bid.setUpdateBy(bid.getBidSalesmanCode()); + + //获取用户ID + String userId = String.valueOf(userService.selectUserByUserName(bid.getBidSalesmanCode()).getUserId()); + bid.setCreateBy(userId); + bid.setUpdateBy(userId); }else{ - bid.setUpdateBy(getUsername()); + bid.setUpdateBy(String.valueOf(getUserId())); } } @@ -549,8 +564,8 @@ public class BidController extends BaseController bidJsqr.setBidJsqrQtLeaderState("0");//其他 组长状态 设置为 待通过 } - bidJsqr.setCreateBy(getUsername()); - bidJsqr.setUpdateBy(getUsername()); + bidJsqr.setCreateBy(String.valueOf(getUserId())); + bidJsqr.setUpdateBy(String.valueOf(getUserId())); bidJsqrService.insertBidJsqr(bidJsqr);//生成投标单-技术确认单 bid.setBidJsxzConfirmId(bidJsqrId); @@ -600,12 +615,12 @@ public class BidController extends BaseController bidHj.setBidJsqrCheckState("2".equals(bid.getBidJsxzApprovalStatus())?"0":"1"); bidHj.setBidJsqrCheckInfo(bid.getBidJsqrCheckInfo()); - bidHj.setCreateBy(getUsername()); - bidHj.setUpdateBy(getUsername()); + bidHj.setCreateBy(String.valueOf(getUserId())); + bidHj.setUpdateBy(String.valueOf(getUserId())); bidHjService.insertBidHj(bidHj);//生成投标-核价单 bid.setBidHjId(bidHjId); - bid.setUpdateBy(getUsername()); + bid.setUpdateBy(String.valueOf(getUserId())); bidService.updateBid(bid); // 将技术要求附件与核价单绑定 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/priceVerification/BidHjController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/priceVerification/BidHjController.java index ba4e9d8..f3a8c8a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/priceVerification/BidHjController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/priceVerification/BidHjController.java @@ -118,7 +118,7 @@ public class BidHjController extends BaseController public AjaxResult commitHj(@RequestBody BidHj bidHj) { bidHj.setBidHjApprovalStatus("2");//投标单-核价单 状态设置为 已协助 - bidHj.setUpdateBy(getUsername()); + bidHj.setUpdateBy(String.valueOf(getUserId())); bidHj.setBidHjPricingDate(DateUtils.getNowDate());//投标单-核价单 核价日期设置为 当前日期 bidHjService.updateBidHj(bidHj); @@ -146,7 +146,7 @@ public class BidHjController extends BaseController @PostMapping("/rejectHj") public AjaxResult rejectHj(@RequestBody BidHj bidHj) { - bidHj.setUpdateBy(getUsername()); + bidHj.setUpdateBy(String.valueOf(getUserId())); bidHj.setBidHjPricingDate(DateUtils.getNowDate());//投标单-核价单 核价日期设置为 当前日期 bidHjService.updateBidHj(bidHj); 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 ff6e271..14ac12c 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 @@ -446,6 +446,18 @@ public class QuotController extends BaseController } } + //根据该客户税号是否在客户单位表名单里-是否允许询价 是否是禁止 + Boolean isExist = false; + String quotCustomerBm = quot.getQuotCustomerBm(); + String tax = SapHanaUtils.selectTaxByBm(quotCustomerBm); + if(StringUtils.isNotEmpty(tax)){ + isExist = quotService.selectRegisteredCompanyByTax2(tax); + } + + if(isExist){ + return error("该单位有不良记录,暂停报价"); + } + String quot_id = quot.getQuotId(); quot.setUpdateBy(getUsername()); @@ -749,7 +761,7 @@ public class QuotController extends BaseController } /** - * 校验该客户税号是否在经营部注册公司名单里 + * 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止 * @param quot * @return */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.java index c0c5c8a..04ddbad 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.java @@ -481,7 +481,7 @@ public class BidJsqrController extends BaseController } bidJsqr.setBidJsxzApprovalStatus("2");//投标-技术协助状态 设置为 已协助 - bidJsqr.setUpdateBy(getUsername()); + bidJsqr.setUpdateBy(String.valueOf(getUserId())); bidJsqrService.updateBidJsqr(bidJsqr); //sendNoticeToBid(bidJsqr);// 发送给提醒 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.java index 6a8ed93..f3cfca8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.java @@ -113,12 +113,15 @@ public class ZgysController extends BaseController zgys.setPqSalesmanDeptId(String.valueOf(deptId)); SysDept sysDept = deptService.selectDeptById(deptId); zgys.setPqSalesmanDeptName(sysDept.getDeptName()); - zgys.setCreateBy(zgys.getPqSalesmanCode()); + + String userId = String.valueOf(userService.selectUserByUserName(zgys.getPqSalesmanCode()).getUserId()); + zgys.setCreateBy(userId); + zgys.setUpdateBy(userId); }else{ - zgys.setCreateBy(getUsername()); + zgys.setCreateBy(String.valueOf(getUserId())); + zgys.setUpdateBy(String.valueOf(getUserId())); } - zgys.setUpdateBy(getUsername()); zgysService.insertZgys(zgys); return success(zgys); } @@ -140,10 +143,12 @@ public class ZgysController extends BaseController zgys.setPqSalesmanDeptId(String.valueOf(deptId)); SysDept sysDept = deptService.selectDeptById(deptId); zgys.setPqSalesmanDeptName(sysDept.getDeptName()); - zgys.setCreateBy(zgys.getPqSalesmanCode()); - zgys.setUpdateBy(zgys.getPqSalesmanCode()); + + String userId = String.valueOf(userService.selectUserByUserName(zgys.getPqSalesmanCode()).getUserId()); + zgys.setCreateBy(userId); + zgys.setUpdateBy(userId); }else{ - zgys.setUpdateBy(getUsername()); + zgys.setUpdateBy(String.valueOf(getUserId())); } return toAjax(zgysService.updateZgys(zgys)); } @@ -169,19 +174,22 @@ public class ZgysController extends BaseController SysDept sysDept = deptService.selectDeptById(deptId); String pq_id = zgys.getPqId(); + String pqNumber = zgysService.getCodePQ("Z"); + zgys.setPqNumber(pqNumber); + if(StringUtils.isEmpty(pq_id)){ zgys.setPqId(UUID.fastUUID().toString()); String pqCode = zgysService.getCode("ZGYS"); zgys.setPqCode(pqCode); - String pqNumber = zgysService.getCodePQ("Z"); - zgys.setPqNumber(pqNumber); if(pqJlRoleFlag){ zgys.setPqSalesmanDeptId(String.valueOf(deptId)); zgys.setPqSalesmanDeptName(sysDept.getDeptName()); - zgys.setCreateBy(zgys.getPqSalesmanCode()); + + String userId = String.valueOf(userService.selectUserByUserName(zgys.getPqSalesmanCode()).getUserId()); + zgys.setCreateBy(userId); }else{ - zgys.setCreateBy(getUsername()); + zgys.setCreateBy(String.valueOf(getUserId())); } zgysService.insertZgys(zgys); return success(); @@ -189,10 +197,12 @@ public class ZgysController extends BaseController if(pqJlRoleFlag){ zgys.setPqSalesmanDeptId(String.valueOf(deptId)); zgys.setPqSalesmanDeptName(sysDept.getDeptName()); - zgys.setCreateBy(zgys.getPqSalesmanCode()); - zgys.setUpdateBy(zgys.getPqSalesmanCode()); + + String userId = String.valueOf(userService.selectUserByUserName(zgys.getPqSalesmanCode()).getUserId()); + zgys.setCreateBy(userId); + zgys.setUpdateBy(userId); }else{ - zgys.setUpdateBy(getUsername()); + zgys.setUpdateBy(String.valueOf(getUserId())); } zgys.setPqReturnRemark("");//驳回后再次提交清除驳回原因 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 beae17f..80b04ec 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 6301d96..023fd0d 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/priceVerification/BidHjController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/priceVerification/BidHjController.class index 8dde857..81c0a6b 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/web/controller/priceVerification/BidHjController.class and b/ruoyi-admin/target/classes/com/ruoyi/web/controller/priceVerification/BidHjController.class differ diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class index 06f4d70..d9eff33 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class and b/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class differ diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.class index 72cf7d5..fb8dbe5 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.class and b/ruoyi-admin/target/classes/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.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 0b85bb7..effab13 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 b9eba50..2181f38 100644 --- a/ruoyi-admin/target/maven-archiver/pom.properties +++ b/ruoyi-admin/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Aug 08 16:45:42 CST 2024 +#Fri Aug 09 14:20:44 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 3974a05..e994111 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 b319c50..788e727 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 9c9489c..0c3b908 100644 --- a/ruoyi-common/target/maven-archiver/pom.properties +++ b/ruoyi-common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Aug 08 16:45:31 CST 2024 +#Fri Aug 09 14:20:29 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 f331c6e..48212a8 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 9fb2aa6..dd4eda5 100644 --- a/ruoyi-framework/target/maven-archiver/pom.properties +++ b/ruoyi-framework/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Aug 08 16:45:36 CST 2024 +#Fri Aug 09 14:20:36 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 8672cd3..95c3897 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 bde7055..7737f21 100644 --- a/ruoyi-generator/target/maven-archiver/pom.properties +++ b/ruoyi-generator/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Aug 08 16:45:37 CST 2024 +#Fri Aug 09 14:20:38 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 9567b25..9724cdf 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/src/main/java/com/ruoyi/quartz/domain/OASysAuthorize.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysAuthorize.java index d46f23a..3714832 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysAuthorize.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysAuthorize.java @@ -8,6 +8,9 @@ package com.ruoyi.quartz.domain; */ public class OASysAuthorize { + /** oa授权备案信息id */ + private String oaDoaId; + /** 授权备案信息id */ private String doaId; @@ -23,6 +26,14 @@ public class OASysAuthorize /** 副总审批 */ private String doaVicePresidentApproved; + public String getOaDoaId() { + return oaDoaId; + } + + public void setOaDoaId(String oaDoaId) { + this.oaDoaId = oaDoaId; + } + public String getDoaId() { return doaId; } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysBid.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysBid.java index 717640b..eed7f34 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysBid.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysBid.java @@ -8,6 +8,9 @@ package com.ruoyi.quartz.domain; */ public class OASysBid { + /** oa投标信息id */ + private String oaBidId; + /** 投标信息id */ private String bidId; @@ -23,6 +26,9 @@ public class OASysBid /** 副总审批 */ private String bidVicePresidentApproved; + public String getOaBidId() { return oaBidId; } + public void setOaBidId(String oaBidId) { this.oaBidId = oaBidId; } + public String getBidId() { return bidId; } public void setBidId(String bidId) { this.bidId = bidId; } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysZgys.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysZgys.java index 5908eac..955b468 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysZgys.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysZgys.java @@ -8,6 +8,9 @@ package com.ruoyi.quartz.domain; */ public class OASysZgys { + /** oa资格预审信息id */ + private String oaPqId; + /** 资格预审信息id */ private String pqId; @@ -23,6 +26,9 @@ public class OASysZgys /** 副总审批 */ private String pqVpApproval; + public String getOaPqId() { return oaPqId; } + public void setOaPqId(String oaPqId) { this.oaPqId = oaPqId; } + public String getPqId() { return pqId; } public void setPqId(String pqId) { this.pqId = pqId; } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAAuthorizeMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAAuthorizeMapper.java index d851aab..55b8d33 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAAuthorizeMapper.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAAuthorizeMapper.java @@ -31,7 +31,7 @@ public interface OAAuthorizeMapper /** * 将中间表 根据授权备案信息单号更新 isfinish=1 表示授权备案审核流程已结束 - * @param pqCode + * @param oaDoaId */ - void updateOAAuthorizeByAuthorizeCode(String pqCode); + void updateOAAuthorizeByAuthorizeCode(String oaDoaId); } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OABidMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OABidMapper.java index 419dcc3..7ed75fa 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OABidMapper.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OABidMapper.java @@ -32,9 +32,9 @@ public interface OABidMapper /** * 将中间表 根据投标信息单号更新 isfinish=1 表示投标审核流程已结束 - * @param bidCode + * @param oaBidId */ - void updateOABidByBidCode(String bidCode); + void updateOABidByBidCode(String oaBidId); /** ==========================================================================================*/ @@ -56,7 +56,7 @@ public interface OABidMapper /** * 将中间表 根据投标信息单号更新 isfinish=1 表示审核流程已结束 - * @param bidCode + * @param oaBidId */ - void updateOABidByBidCodeTb(String bidCode); + void updateOABidByBidCodeTb(String oaBidId); } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAZgysMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAZgysMapper.java index 3b95e04..f1b452d 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAZgysMapper.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAZgysMapper.java @@ -31,7 +31,7 @@ public interface OAZgysMapper /** * 将中间表 根据资格预审信息单号更新 isfinish=1 表示资格预审审核流程已结束 - * @param pqCode + * @param oaPqId */ - void updateOAZgysByZgysCode(String pqCode); + void updateOAZgysByZgysCode(String oaPqId); } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAAuthorizeService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAAuthorizeService.java index 612a105..732d83c 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAAuthorizeService.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAAuthorizeService.java @@ -32,5 +32,5 @@ public interface OAAuthorizeService /** * 将中间表 根据授权备案信息单号更新 isfinish=1 表示授权备案审核流程已结束 */ - void updateOAAuthorizeByAuthorizeCode(String pqCode); + void updateOAAuthorizeByAuthorizeCode(String oaDoaId); } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OABidService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OABidService.java index 942bf19..961e41b 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OABidService.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OABidService.java @@ -29,7 +29,7 @@ public interface OABidService /** * 将中间表 根据投标信息单号更新 isfinish=1 表示投标审核流程已结束 */ - void updateOABidByBidCode(String bidCode); + void updateOABidByBidCode(String oaBidId); /** * 检查 投标办提交OA至副总 是否审核结束 @@ -47,7 +47,7 @@ public interface OABidService /** * 将中间表 根据投标信息单号更新 isfinish=1 表示审核流程已结束 - * @param bidCode + * @param oaBidId */ - void updateOABidByBidCodeTb(String bidCode); + void updateOABidByBidCodeTb(String oaBidId); } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAZgysService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAZgysService.java index 0e5e18d..2ab4beb 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAZgysService.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAZgysService.java @@ -31,5 +31,5 @@ public interface OAZgysService /** * 将中间表 根据资格预审信息单号更新 isfinish=1 表示资格预审审核流程已结束 */ - void updateOAZgysByZgysCode(String pqCode); + void updateOAZgysByZgysCode(String oaPqId); } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.java index ffaf687..436c873 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.java @@ -42,10 +42,10 @@ public class OAAuthorizeServiceImpl implements OAAuthorizeService /** * 将中间表 根据授权备案信息单号更新 isfinish=1 表示授权备案审核流程已结束 - * @param doaCode + * @param oaDoaId */ @Override - public void updateOAAuthorizeByAuthorizeCode(String doaCode) { - aAAuthorizeMapper.updateOAAuthorizeByAuthorizeCode(doaCode); + public void updateOAAuthorizeByAuthorizeCode(String oaDoaId) { + aAAuthorizeMapper.updateOAAuthorizeByAuthorizeCode(oaDoaId); } } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OABidServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OABidServiceImpl.java index d698646..5bd08ff 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OABidServiceImpl.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OABidServiceImpl.java @@ -45,11 +45,11 @@ public class OABidServiceImpl implements OABidService /** * 将中间表 根据投标信息单号更新 isfinish=1 表示投标审核流程已结束 - * @param bidCode + * @param oaBidId */ @Override - public void updateOABidByBidCode(String bidCode) { - aABidMapper.updateOABidByBidCode(bidCode); + public void updateOABidByBidCode(String oaBidId) { + aABidMapper.updateOABidByBidCode(oaBidId); } /** @@ -74,10 +74,10 @@ public class OABidServiceImpl implements OABidService /** * 将中间表 根据投标信息单号更新 isfinish=1 表示审核流程已结束 - * @param bidCode + * @param oaBidId */ @Override - public void updateOABidByBidCodeTb(String bidCode) { - aABidMapper.updateOABidByBidCodeTb(bidCode); + public void updateOABidByBidCodeTb(String oaBidId) { + aABidMapper.updateOABidByBidCodeTb(oaBidId); } } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.java index 3791e23..08d5df3 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.java @@ -42,10 +42,10 @@ public class OAZgysServiceImpl implements OAZgysService /** * 将中间表 根据资格预审信息单号更新 isfinish=1 表示资格预审审核流程已结束 - * @param pqCode + * @param oaPqId */ @Override - public void updateOAZgysByZgysCode(String pqCode) { - aAZgysMapper.updateOAZgysByZgysCode(pqCode); + public void updateOAZgysByZgysCode(String oaPqId) { + aAZgysMapper.updateOAZgysByZgysCode(oaPqId); } } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AuthorizeTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AuthorizeTask.java index e770add..bddc40f 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AuthorizeTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AuthorizeTask.java @@ -37,7 +37,7 @@ public class AuthorizeTask // 批量更新授权备案信息-提交、OA审批状态,备注,副总审批 authorizeService.updateAuthorizeOAApprovalStatus(sysAuthorize.getDoaId(),sysAuthorize.getState(),sysAuthorize.getRemark(),sysAuthorize.getDoaVicePresidentApproved()); //将中间表 根据授权备案信息单号更新 isfinish=1 表示审核流程已结束 - authorizeService.updateOAAuthorizeByAuthorizeCode(sysAuthorize.getDoaCode()); + authorizeService.updateOAAuthorizeByAuthorizeCode(sysAuthorize.getOaDoaId()); } } catch (Exception e) { e.printStackTrace(); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/BidTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/BidTask.java index cc75d84..ea35714 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/BidTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/BidTask.java @@ -39,7 +39,7 @@ public class BidTask // 批量更新投标信息-提交状态,备注 bidService.updateBidOAApprovalStatus(sysBid.getBidId(),sysBid.getState(),sysBid.getRemark()); //将中间表 根据投标信息单号更新 isfinish=1 表示审核流程已结束 - bidService.updateOABidByBidCode(sysBid.getBidCode()); + bidService.updateOABidByBidCode(sysBid.getOaBidId()); } } catch (Exception e) { e.printStackTrace(); @@ -57,7 +57,7 @@ public class BidTask // 批量更新投标信息-提交、OA审批状态,备注,副总审批 bidService.updateBidOAApprovalStatusTb(sysBid.getBidId(),sysBid.getState(),sysBid.getRemark(),sysBid.getBidVicePresidentApproved()); //将中间表 根据投标信息单号更新 isfinish=1 表示审核流程已结束 - bidService.updateOABidByBidCodeTb(sysBid.getBidCode()); + bidService.updateOABidByBidCodeTb(sysBid.getOaBidId()); } } catch (Exception e) { e.printStackTrace(); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/ZgysTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/ZgysTask.java index 6ae54fb..d754f54 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/ZgysTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/ZgysTask.java @@ -38,7 +38,7 @@ public class ZgysTask // 批量更新资格预审信息-提交、OA审批状态,备注,副总审批 zgysService.updateZgysOAApprovalStatus(sysZgys.getPqId(),sysZgys.getState(),sysZgys.getRemark(),sysZgys.getPqVpApproval()); //将中间表 根据资格预审信息单号更新 isfinish=1 表示审核流程已结束 - zgysService.updateOAZgysByZgysCode(sysZgys.getPqCode()); + zgysService.updateOAZgysByZgysCode(sysZgys.getOaPqId()); } } catch (Exception e) { e.printStackTrace(); diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/OAAuthorizeMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/OAAuthorizeMapper.xml index 19cd8bd..2d0c205 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/OAAuthorizeMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/OAAuthorizeMapper.xml @@ -4,11 +4,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select q.bid_id as bidId,q.bid_code as bidCode,sq.state,sq.remark + select q.bid_id as bidId,q.bid_code as bidCode,sq.bid_id oaBidId,sq.state,sq.remark from bid q inner join ( - select t.bid_code,t.state,t.remark from ( - select a.bid_code,a.state,a.remark, row_number() over(partition by bid_code order by create_time desc) rw + select t.bid_id,t.bid_code,t.state,t.remark from ( + select a.bid_id,a.bid_code,a.state,a.remark, row_number() over(partition by bid_code order by create_time desc) rw from sys_oa_bid a where a.triggerflag = '1' and a.state in ('1','3') and a.isFinish = '0' ) t where t.rw = 1 @@ -22,18 +22,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_oa_bid set isFinish = '1' where bid_code = #{bidCode} + update sys_oa_bid set isFinish = '1' where bid_id = #{oaBidId} - select q.pq_id as pqId,q.pq_code as pqCode,sq.state,sq.remark,sq.pq_vp_approval as pqVpApproval + select q.pq_id as pqId,q.pq_code as pqCode,sq.state,sq.pq_id oaPqId,sq.remark,sq.pq_vp_approval as pqVpApproval from zgys q inner join ( - select t.pq_code,t.state,t.remark,t.pq_vp_approval from ( - select a.pq_code,a.state,a.remark,a.pq_vp_approval, row_number() over(partition by pq_code order by create_time desc) rw + select t.pq_id,t.pq_code,t.state,t.remark,t.pq_vp_approval from ( + select a.pq_id,a.pq_code,a.state,a.remark,a.pq_vp_approval, row_number() over(partition by pq_code order by create_time desc) rw from sys_oa_zgys a where a.triggerflag = '1' and a.state in ('2','3') and a.isFinish = '0' ) t where t.rw = 1 @@ -23,6 +23,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_oa_zgys set isFinish = '1' where pq_code = #{pqCode} + update sys_oa_zgys set isFinish = '1' where pq_id = #{oaPqId} diff --git a/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysAuthorize.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysAuthorize.class index 19fc721..baa7166 100644 Binary files a/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysAuthorize.class and b/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysAuthorize.class differ diff --git a/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysBid.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysBid.class index 0b6ccdf..7f2a6f9 100644 Binary files a/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysBid.class and b/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysBid.class differ diff --git a/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysZgys.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysZgys.class index 04fb537..cb15981 100644 Binary files a/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysZgys.class and b/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysZgys.class differ diff --git a/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.class index dd2edbb..d69038d 100644 Binary files a/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.class and b/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.class differ diff --git a/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OABidServiceImpl.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OABidServiceImpl.class index 7f61ba4..f1a9df4 100644 Binary files a/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OABidServiceImpl.class and b/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OABidServiceImpl.class differ diff --git a/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.class index 31b513b..08b8ff4 100644 Binary files a/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.class and b/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.class differ diff --git a/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/AuthorizeTask.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/AuthorizeTask.class index e91699f..7394fe9 100644 Binary files a/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/AuthorizeTask.class and b/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/AuthorizeTask.class differ diff --git a/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/BidTask.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/BidTask.class index bc616be..9a865c2 100644 Binary files a/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/BidTask.class and b/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/BidTask.class differ diff --git a/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/ZgysTask.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/ZgysTask.class index 5d02a73..a55281c 100644 Binary files a/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/ZgysTask.class and b/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/ZgysTask.class differ diff --git a/ruoyi-quartz/target/classes/mapper/quartz/OAAuthorizeMapper.xml b/ruoyi-quartz/target/classes/mapper/quartz/OAAuthorizeMapper.xml index 19cd8bd..2d0c205 100644 --- a/ruoyi-quartz/target/classes/mapper/quartz/OAAuthorizeMapper.xml +++ b/ruoyi-quartz/target/classes/mapper/quartz/OAAuthorizeMapper.xml @@ -4,11 +4,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select q.bid_id as bidId,q.bid_code as bidCode,sq.state,sq.remark + select q.bid_id as bidId,q.bid_code as bidCode,sq.bid_id oaBidId,sq.state,sq.remark from bid q inner join ( - select t.bid_code,t.state,t.remark from ( - select a.bid_code,a.state,a.remark, row_number() over(partition by bid_code order by create_time desc) rw + select t.bid_id,t.bid_code,t.state,t.remark from ( + select a.bid_id,a.bid_code,a.state,a.remark, row_number() over(partition by bid_code order by create_time desc) rw from sys_oa_bid a where a.triggerflag = '1' and a.state in ('1','3') and a.isFinish = '0' ) t where t.rw = 1 @@ -22,18 +22,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_oa_bid set isFinish = '1' where bid_code = #{bidCode} + update sys_oa_bid set isFinish = '1' where bid_id = #{oaBidId} - select q.pq_id as pqId,q.pq_code as pqCode,sq.state,sq.remark,sq.pq_vp_approval as pqVpApproval + select q.pq_id as pqId,q.pq_code as pqCode,sq.state,sq.pq_id oaPqId,sq.remark,sq.pq_vp_approval as pqVpApproval from zgys q inner join ( - select t.pq_code,t.state,t.remark,t.pq_vp_approval from ( - select a.pq_code,a.state,a.remark,a.pq_vp_approval, row_number() over(partition by pq_code order by create_time desc) rw + select t.pq_id,t.pq_code,t.state,t.remark,t.pq_vp_approval from ( + select a.pq_id,a.pq_code,a.state,a.remark,a.pq_vp_approval, row_number() over(partition by pq_code order by create_time desc) rw from sys_oa_zgys a where a.triggerflag = '1' and a.state in ('2','3') and a.isFinish = '0' ) t where t.rw = 1 @@ -23,6 +23,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_oa_zgys set isFinish = '1' where pq_code = #{pqCode} + update sys_oa_zgys set isFinish = '1' where pq_id = #{oaPqId} diff --git a/ruoyi-quartz/target/maven-archiver/pom.properties b/ruoyi-quartz/target/maven-archiver/pom.properties index 87e3d83..5f6bc4b 100644 --- a/ruoyi-quartz/target/maven-archiver/pom.properties +++ b/ruoyi-quartz/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Aug 08 16:45:36 CST 2024 +#Fri Aug 09 14:20:38 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 cd1e817..5021bbf 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/quot/mapper/QuotMapper.java b/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java index 0bafb0e..6ddce24 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 @@ -160,12 +160,19 @@ public interface QuotMapper void saveQuotFeedbackExplanation(Quot quot); /** - * 根据客户税号查询经营部注册公司名单里是否存在 + * 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止 * @param tax * @return */ String selectRegisteredCompanyByTax(String tax); + /** + * 根据该客户税号是否在客户单位表名单里-是否允许询价 是否是禁止 + * @param tax + * @return + */ + String selectRegisteredCompanyByTax2(String tax); + /** * 统计有效报价单模块-获取报价单数据 * @param quot @@ -186,4 +193,5 @@ public interface QuotMapper * @return */ String selectHandleTime(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 3c46988..60a3a1d 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 @@ -145,12 +145,19 @@ public interface IQuotService void saveQuotFeedbackExplanation(Quot quot); /** - * 根据客户税号查询经营部注册公司名单里是否存在 + * 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止 * @param tax * @return */ Boolean selectRegisteredCompanyByTax(String tax); + /** + * 根据该客户税号是否在客户单位表名单里-是否允许询价 是否是禁止 + * @param tax + * @return + */ + Boolean selectRegisteredCompanyByTax2(String tax); + /** * 统计有效报价单模块-获取报价单数据 * @param quot @@ -171,4 +178,5 @@ public interface IQuotService * @return */ String selectHandleTime(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 37639d0..fe55491 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 @@ -325,7 +325,7 @@ public class QuotServiceImpl implements IQuotService } /** - * 根据客户税号查询经营部注册公司名单里是否存在 + * 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止 * @param tax * @return */ @@ -334,4 +334,16 @@ public class QuotServiceImpl implements IQuotService String count = quotMapper.selectRegisteredCompanyByTax(tax); return !"0".equals(count); } + + /** + * 根据该客户税号是否在客户单位表名单里-是否允许询价 是否是禁止 + * @param tax + * @return + */ + @Override + public Boolean selectRegisteredCompanyByTax2(String tax) { + String count = quotMapper.selectRegisteredCompanyByTax2(tax); + return !"0".equals(count); + } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/registeredCompany/domain/RegisteredCompany.java b/ruoyi-system/src/main/java/com/ruoyi/registeredCompany/domain/RegisteredCompany.java index 3cf4186..ca74801 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/registeredCompany/domain/RegisteredCompany.java +++ b/ruoyi-system/src/main/java/com/ruoyi/registeredCompany/domain/RegisteredCompany.java @@ -38,6 +38,14 @@ public class RegisteredCompany extends BaseEntity @Excel(name = "状态",dictType = "common_state") private String regState; + /** 是否允许特批报价-报价组提交OA(0-允许,1-禁止) */ + @Excel(name = "是否允许特批报价",dictType = "allow_tp_state") + private String regAllowTpState; + + /** 是否允许询价-业务员提交询价单(0-允许,1-禁止) */ + @Excel(name = "是否允许询价",dictType = "allow_quot_state") + private String regAllowQuotState; + public void setRegId(String regId) { this.regId = regId; @@ -92,20 +100,10 @@ public class RegisteredCompany extends BaseEntity { return regState; } + public String getRegAllowTpState() { return regAllowTpState; } - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("regId", getRegId()) - .append("regSalesmanCode", getRegSalesmanCode()) - .append("regSalesmanName", getRegSalesmanName()) - .append("regCompany", getRegCompany()) - .append("regTax", getRegTax()) - .append("regState", getRegState()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } + public void setRegAllowTpState(String regAllowTpState) { this.regAllowTpState = regAllowTpState; } + public String getRegAllowQuotState() { return regAllowQuotState; } + + public void setRegAllowQuotState(String regAllowQuotState) { this.regAllowQuotState = regAllowQuotState; } } diff --git a/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml b/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml index 7d51e62..b62cb4e 100644 --- a/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml @@ -43,7 +43,7 @@ - left join sys_user u on u.user_name=a.create_by + left join sys_user u on u.user_id=a.create_by left join sys_dept d on u.dept_id = d.dept_id diff --git a/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml b/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml index 0b7e4c8..9226c27 100644 --- a/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml @@ -102,7 +102,7 @@ - left join sys_user u on u.user_name=a.create_by + left join sys_user u on u.user_id=a.create_by left join sys_dept d on u.dept_id = d.dept_id left join bid_jsqr q on q.bid_jsqr_id = a.bid_jsxz_confirm_id left join bid_hj h on h.bid_hj_id = a.bid_hj_id diff --git a/ruoyi-system/src/main/resources/mapper/priceVerification/BidHjMapper.xml b/ruoyi-system/src/main/resources/mapper/priceVerification/BidHjMapper.xml index cb8c559..d2dc275 100644 --- a/ruoyi-system/src/main/resources/mapper/priceVerification/BidHjMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/priceVerification/BidHjMapper.xml @@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - left join sys_user u on u.user_name=a.create_by + left join sys_user u on u.user_id=a.create_by left join sys_dept d on u.dept_id = d.dept_id left join bid q on q.bid_id = a.bid_id - - + + + @@ -168,6 +160,30 @@ + + + + + + + + + + + + + +
@@ -183,7 +199,7 @@ import { listRegisteredCompany, getRegisteredCompany, delRegisteredCompany, addR export default { name: "RegisteredCompany", - dicts: ['common_state'], + dicts: ['common_state','allow_quot_state','allow_tp_state'], data() { return { // 遮罩层 @@ -198,7 +214,7 @@ export default { showSearch: true, // 总条数 total: 0, - // 经营部注册公司表格数据 + // 客户单位表格数据 registeredCompanyList: [], // 弹出层标题 title: "", @@ -230,7 +246,7 @@ export default { this.getList(); }, methods: { - /** 查询经营部注册公司列表 */ + /** 查询客户单位列表 */ getList() { this.loading = true; listRegisteredCompany(this.queryParams).then(response => { @@ -253,6 +269,8 @@ export default { regCompany: null, regTax: null, regState: null, + regAllowTpState: null, + regAllowQuotState: null, createBy: null, createTime: null, updateBy: null, @@ -280,8 +298,10 @@ export default { handleAdd() { this.reset(); this.open = true; - this.title = "经营部注册公司"; + this.title = "客户单位"; this.form.regState = '0'; + this.form.regAllowTpState = '0'; + this.form.regAllowQuotState = '0'; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -290,7 +310,7 @@ export default { getRegisteredCompany(regId).then(response => { this.form = response.data; this.open = true; - this.title = "经营部注册公司"; + this.title = "客户单位"; }); }, /** 提交按钮 */ @@ -316,7 +336,7 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const regIds = row.regId || this.ids; - this.$modal.confirm('是否确认删除该经营部注册公司？').then(function() { + this.$modal.confirm('是否确认删除该客户单位？').then(function() { return delRegisteredCompany(regIds); }).then(() => { this.getList();