diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 379895c..b19f977 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,10 +2,17 @@ + + + + + + + - + @@ -16,35 +23,33 @@ + + + + + + + + + + + + + + + + + - - - - - + - - - - - - - - - - - + - - - - - - - - - - + + + + + + - @@ -136,7 +141,7 @@ - + @@ -144,19 +149,20 @@ \ No newline at end of file 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 6c8a040..0157d4d 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 @@ -247,6 +247,7 @@ public class AuthorizeController extends BaseController sysOaAuthorize.setSubmissionTime(DateUtils.getDate()); sysOaAuthorize.setDoaId(authorize.getDoaId()); + sysOaAuthorize.setDoaCode(authorize.getDoaCode()); sysOaAuthorize.setDoaNumber(authorize.getDoaNumber()); sysOaAuthorize.setDoaSalesmanName((authorize.getDoaSalesmanName())); sysOaAuthorize.setDoaProject(authorize.getDoaProject()); 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 9a92e1c..2d9c5bd 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 @@ -652,6 +652,7 @@ public class BidController extends BaseController sysOaBidTb.setSubmissionTime(DateUtils.getDate()); String bidId = UUID.fastUUID().toString(); sysOaBidTb.setBidId(bidId); + sysOaBidTb.setBidCode(bid.getBidCode());//标书单号 sysOaBidTb.setBidNumber(bid.getBidNumber());//标书编号 sysOaBidTb.setBidSalesmanName(bid.getBidSalesmanName());//业务员 sysOaBidTb.setBidTenderingUnit(bid.getBidTenderingUnit());//客户 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 60ddcbe..6a8ed93 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 @@ -234,6 +234,7 @@ public class ZgysController extends BaseController sysOaZgys.setDepartmentId(oauser.getDepartmentId()); sysOaZgys.setSubmissionTime(DateUtils.getDate()); sysOaZgys.setPqId(UUID.fastUUID().toString()); + sysOaZgys.setPqCode(zgys.getPqCode()); sysOaZgys.setPqNumber(zgys.getPqNumber()); sysOaZgys.setPqSalesmanName(zgys.getPqSalesmanName()); sysOaZgys.setPqCustomerName(zgys.getPqCustomerName()); 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 20a7109..652986c 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 a8fead7..2b6da89 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 6be52e2..17a2b09 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 0633bec..b9eba50 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 15:05:33 CST 2024 +#Thu Aug 08 16:45:42 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 f3adc52..3974a05 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 43bbeff..b319c50 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 66980d5..9c9489c 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 15:05:20 CST 2024 +#Thu Aug 08 16:45:31 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 74db44d..f331c6e 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 2756e3a..9fb2aa6 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 15:05:26 CST 2024 +#Thu Aug 08 16:45: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 db7b141..8672cd3 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 add1946..bde7055 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 15:05:28 CST 2024 +#Thu Aug 08 16:45:37 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 531792c..9567b25 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 new file mode 100644 index 0000000..d46f23a --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysAuthorize.java @@ -0,0 +1,65 @@ +package com.ruoyi.quartz.domain; + +/** + * 授权备案信息对象 OASysZgys + * + * @author ruoyi + * @date 2024-04-01 + */ +public class OASysAuthorize +{ + /** 授权备案信息id */ + private String doaId; + + /** 授权备案信息单号 */ + private String doaCode; + + /** OA审批状态 */ + private String state; + + /** OA审批备注 */ + private String remark; + + /** 副总审批 */ + private String doaVicePresidentApproved; + + public String getDoaId() { + return doaId; + } + + public void setDoaId(String doaId) { + this.doaId = doaId; + } + + public String getDoaCode() { + return doaCode; + } + + public void setDoaCode(String doaCode) { + this.doaCode = doaCode; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getDoaVicePresidentApproved() { + return doaVicePresidentApproved; + } + + public void setDoaVicePresidentApproved(String doaVicePresidentApproved) { + this.doaVicePresidentApproved = doaVicePresidentApproved; + } +} 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 1ef88d3..717640b 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 @@ -20,6 +20,9 @@ public class OASysBid /** OA审批备注 */ private String remark; + /** 副总审批 */ + private String bidVicePresidentApproved; + public String getBidId() { return bidId; } public void setBidId(String bidId) { this.bidId = bidId; } @@ -39,4 +42,12 @@ public class OASysBid public void setRemark(String remark) { this.remark = remark; } + + public String getBidVicePresidentApproved() { + return bidVicePresidentApproved; + } + + public void setBidVicePresidentApproved(String bidVicePresidentApproved) { + this.bidVicePresidentApproved = bidVicePresidentApproved; + } } 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 new file mode 100644 index 0000000..d851aab --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAAuthorizeMapper.java @@ -0,0 +1,37 @@ +package com.ruoyi.quartz.mapper; + +import com.ruoyi.quartz.domain.OASysAuthorize; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 授权备案Mapper接口 + * + * @author ruoyi + * @date 2024-04-01 + */ +public interface OAAuthorizeMapper +{ + + /** + * 查询 授权备案信息-OA审批状态为审批中的单号，并且在中间表显示流程已经结束的单据，根据单号更新 OA审批状态 + * @return + */ + List selectOAAUTHORIZE(); + + /** + * 批量更新授权备案信息-OA审批状态为已完成 + * @param doaId + * @param state + * @param remark + */ + void updateAuthorizeOAApprovalStatus(@Param("doaId") String doaId, @Param("state") String state, @Param("remark") String remark,@Param("doaVicePresidentApproved") String doaVicePresidentApproved); + + + /** + * 将中间表 根据授权备案信息单号更新 isfinish=1 表示授权备案审核流程已结束 + * @param pqCode + */ + void updateOAAuthorizeByAuthorizeCode(String pqCode); +} 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 bdb998f..419dcc3 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 @@ -35,4 +35,28 @@ public interface OABidMapper * @param bidCode */ void updateOABidByBidCode(String bidCode); + + + /** ==========================================================================================*/ + + + /** + * 检查 投标办提交OA至副总 是否审核结束 + * @return + */ + List selectOABIDTB(); + + /** + * 批量更新投标信息-提交、OA审批状态,备注 + * @param bidId + * @param state + * @param remark + */ + void updateBidOAApprovalStatusTb(@Param("bidId") String bidId, @Param("state") String state, @Param("remark") String remark,@Param("bidVicePresidentApproved") String bidVicePresidentApproved); + + /** + * 将中间表 根据投标信息单号更新 isfinish=1 表示审核流程已结束 + * @param bidCode + */ + void updateOABidByBidCodeTb(String bidCode); } 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 new file mode 100644 index 0000000..612a105 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAAuthorizeService.java @@ -0,0 +1,36 @@ +package com.ruoyi.quartz.service; + +import com.ruoyi.quartz.domain.OASysAuthorize; +import com.ruoyi.quartz.domain.OASysZgys; + +import java.util.List; + +/** + * 授权备案Service接口 + * + * @author ruoyi + * @date 2024-04-01 + */ +public interface OAAuthorizeService +{ + + /** + * 查询 授权备案信息-OA审批状态为审批中的单号，并且在中间表显示流程已经结束的单据，根据单号更新 OA审批状态 + * @return + */ + List selectOAAUTHORIZE(); + + /** + * 批量更新授权备案信息-OA审批状态为已完成 + * @param doaId + * @param state + * @param remark + */ + void updateAuthorizeOAApprovalStatus(String doaId,String state,String remark,String doaVicePresidentApproved); + + + /** + * 将中间表 根据授权备案信息单号更新 isfinish=1 表示授权备案审核流程已结束 + */ + void updateOAAuthorizeByAuthorizeCode(String pqCode); +} 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 107faa9..942bf19 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 @@ -18,7 +18,7 @@ public interface OABidService List selectOABID(); /** - * 批量更新投标信息-OA审批状态为已完成 + * 批量更新投标信息-提交状态,备注 * @param bidId * @param state * @param remark @@ -30,4 +30,24 @@ public interface OABidService * 将中间表 根据投标信息单号更新 isfinish=1 表示投标审核流程已结束 */ void updateOABidByBidCode(String bidCode); + + /** + * 检查 投标办提交OA至副总 是否审核结束 + * @return + */ + List selectOABIDTB(); + + /** + * 批量更新投标信息-提交、OA审批状态,备注 + * @param bidId + * @param state + * @param remark + */ + void updateBidOAApprovalStatusTb(String bidId, String state, String remark,String bidVicePresidentApproved); + + /** + * 将中间表 根据投标信息单号更新 isfinish=1 表示审核流程已结束 + * @param bidCode + */ + void updateOABidByBidCodeTb(String bidCode); } 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 new file mode 100644 index 0000000..ffaf687 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.java @@ -0,0 +1,51 @@ +package com.ruoyi.quartz.service.impl; + +import com.ruoyi.quartz.domain.OASysAuthorize; +import com.ruoyi.quartz.mapper.OAAuthorizeMapper; +import com.ruoyi.quartz.service.OAAuthorizeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 授权备案Service业务层处理 + * + * @author ruoyi + * @date 2024-04-01 + */ +@Service +public class OAAuthorizeServiceImpl implements OAAuthorizeService +{ + @Resource + private OAAuthorizeMapper aAAuthorizeMapper; + + /** + * 查询 授权备案信息-OA审批状态为审批中的单号，并且在中间表显示流程已经结束的单据，根据单号更新 OA审批状态 + * @return + */ + @Override + public List selectOAAUTHORIZE() { + return aAAuthorizeMapper.selectOAAUTHORIZE(); + } + + /** + * 批量更新授权备案信息-OA审批状态为已完成 + * @param doaId + * @param state + * @param remark + */ + @Override + public void updateAuthorizeOAApprovalStatus(String doaId,String state,String remark,String doaVicePresidentApproved) { + aAAuthorizeMapper.updateAuthorizeOAApprovalStatus(doaId,state,remark,doaVicePresidentApproved); + } + + /** + * 将中间表 根据授权备案信息单号更新 isfinish=1 表示授权备案审核流程已结束 + * @param doaCode + */ + @Override + public void updateOAAuthorizeByAuthorizeCode(String doaCode) { + aAAuthorizeMapper.updateOAAuthorizeByAuthorizeCode(doaCode); + } +} 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 971a5fc..d698646 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 @@ -33,7 +33,7 @@ public class OABidServiceImpl implements OABidService } /** - * 批量更新投标信息-OA审批状态为已完成 + * 批量更新投标信息-提交状态,备注 * @param bidId * @param state * @param remark @@ -51,4 +51,33 @@ public class OABidServiceImpl implements OABidService public void updateOABidByBidCode(String bidCode) { aABidMapper.updateOABidByBidCode(bidCode); } + + /** + * 检查 投标办提交OA至副总 是否审核结束 + * @return + */ + @Override + public List selectOABIDTB() { + return aABidMapper.selectOABIDTB(); + } + + /** + * 批量更新投标信息-提交、OA审批状态,备注 + * @param bidId + * @param state + * @param remark + */ + @Override + public void updateBidOAApprovalStatusTb(String bidId, String state, String remark,String bidVicePresidentApproved) { + aABidMapper.updateBidOAApprovalStatusTb(bidId,state,remark,bidVicePresidentApproved); + } + + /** + * 将中间表 根据投标信息单号更新 isfinish=1 表示审核流程已结束 + * @param bidCode + */ + @Override + public void updateOABidByBidCodeTb(String bidCode) { + aABidMapper.updateOABidByBidCodeTb(bidCode); + } } 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 new file mode 100644 index 0000000..e770add --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AuthorizeTask.java @@ -0,0 +1,46 @@ +package com.ruoyi.quartz.task; + +import com.ruoyi.quartz.domain.OASysAuthorize; +import com.ruoyi.quartz.service.OAAuthorizeService; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import javax.annotation.Resource; +import java.util.List; + +/** + * 定时任务调度-授权备案信息OA流程状态读取 + * + * @author ruoyi + */ +@Component("authorizeTask") +public class AuthorizeTask +{ + @Resource + private OAAuthorizeService authorizeService; + + public static AuthorizeTask testUtils; + + @PostConstruct + public void init() { + testUtils = this; + } + + /** + * 检查OA是否审核结束 + */ + public void OAAuthorizeCheck() throws Exception { + try { + // 查询 授权备案信息-OA审批状态为审批中的单号，并且在中间表显示流程已经结束的单据，根据单号更新 OA审批状态 + List auths = authorizeService.selectOAAUTHORIZE(); + for(OASysAuthorize sysAuthorize:auths){ + // 批量更新授权备案信息-提交、OA审批状态,备注,副总审批 + authorizeService.updateAuthorizeOAApprovalStatus(sysAuthorize.getDoaId(),sysAuthorize.getState(),sysAuthorize.getRemark(),sysAuthorize.getDoaVicePresidentApproved()); + //将中间表 根据授权备案信息单号更新 isfinish=1 表示审核流程已结束 + authorizeService.updateOAAuthorizeByAuthorizeCode(sysAuthorize.getDoaCode()); + } + } 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 d482aec..cc75d84 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 @@ -29,14 +29,14 @@ public class BidTask } /** - * 检查OA 事业部经理、直营店店长是否审核结束 + * 检查 提交OA至 事业部经理、直营店店长 是否审核结束 */ public void OABidCheck() throws Exception { try { // 查询 投标信息-OA审批状态为审批中的单号，并且在中间表显示流程已经结束的单据，根据单号更新 OA审批状态 List bids = bidService.selectOABID(); for(OASysBid sysBid:bids){ - // 批量更新投标信息-OA审批状态,备注 + // 批量更新投标信息-提交状态,备注 bidService.updateBidOAApprovalStatus(sysBid.getBidId(),sysBid.getState(),sysBid.getRemark()); //将中间表 根据投标信息单号更新 isfinish=1 表示审核流程已结束 bidService.updateOABidByBidCode(sysBid.getBidCode()); @@ -45,4 +45,22 @@ public class BidTask e.printStackTrace(); } } + + /** + * 检查 投标办提交OA至副总 是否审核结束 + */ + public void OABidTbCheck() throws Exception { + try { + // 查询 投标信息-OA审批状态为审批中的单号，并且在中间表显示流程已经结束的单据，根据单号更新 OA审批状态 + List bids = bidService.selectOABIDTB(); + for(OASysBid sysBid:bids){ + // 批量更新投标信息-提交、OA审批状态,备注,副总审批 + bidService.updateBidOAApprovalStatusTb(sysBid.getBidId(),sysBid.getState(),sysBid.getRemark(),sysBid.getBidVicePresidentApproved()); + //将中间表 根据投标信息单号更新 isfinish=1 表示审核流程已结束 + bidService.updateOABidByBidCodeTb(sysBid.getBidCode()); + } + } 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 5651c93..6ae54fb 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 @@ -35,7 +35,7 @@ public class ZgysTask // 查询 资格预审信息-OA审批状态为审批中的单号，并且在中间表显示流程已经结束的单据，根据单号更新 OA审批状态 List pqs = zgysService.selectOAZGYS(); for(OASysZgys sysZgys:pqs){ - // 批量更新资格预审信息-OA审批状态,备注 + // 批量更新资格预审信息-提交、OA审批状态,备注,副总审批 zgysService.updateZgysOAApprovalStatus(sysZgys.getPqId(),sysZgys.getState(),sysZgys.getRemark(),sysZgys.getPqVpApproval()); //将中间表 根据资格预审信息单号更新 isfinish=1 表示审核流程已结束 zgysService.updateOAZgysByZgysCode(sysZgys.getPqCode()); diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/OAAuthorizeMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/OAAuthorizeMapper.xml new file mode 100644 index 0000000..19cd8bd --- /dev/null +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/OAAuthorizeMapper.xml @@ -0,0 +1,28 @@ + + + + + + + update authorize set doa_approval_status = #{state},doa_oa_approval_status = #{state}, + doa_oa_remark = #{remark},doa_vice_president_approved = #{doaVicePresidentApproved} + where doa_id = #{doaId} + + + + update sys_oa_authorize set isFinish = '1' where doa_code = #{doaCode} + + diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/OABidMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/OABidMapper.xml index ab15633..e1d69c9 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/OABidMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/OABidMapper.xml @@ -24,4 +24,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_oa_bid set isFinish = '1' where bid_code = #{bidCode} + + + + + + + + update bid set bid_approval_status = #{state},bid_oa_approval_status = #{state}, bid_oa_remark = #{remark},bid_vice_president_approved = {bidVicePresidentApproved} + where bid_id = #{bidId} + + + + update sys_oa_bid_tb set isFinish = '1' where bid_code = #{bidCode} + diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/OAZgysMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/OAZgysMapper.xml index eb8992c..18287da 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/OAZgysMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/OAZgysMapper.xml @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update zgys set pq_approval_status = #{state},pq_oa_approval_status = #{state}, - pq_returnRemark = #{remark},pq_vp_approval = #{pqVpApproval} + pq_oa_remark = #{remark},pq_vp_approval = #{pqVpApproval} where pq_id = #{pqId} diff --git a/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysAuthorize.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysAuthorize.class new file mode 100644 index 0000000..19fc721 Binary files /dev/null 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 80285af..0b6ccdf 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/mapper/OAAuthorizeMapper.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/mapper/OAAuthorizeMapper.class new file mode 100644 index 0000000..1e2fee9 Binary files /dev/null and b/ruoyi-quartz/target/classes/com/ruoyi/quartz/mapper/OAAuthorizeMapper.class differ diff --git a/ruoyi-quartz/target/classes/com/ruoyi/quartz/mapper/OABidMapper.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/mapper/OABidMapper.class index bc66993..d7f9d06 100644 Binary files a/ruoyi-quartz/target/classes/com/ruoyi/quartz/mapper/OABidMapper.class and b/ruoyi-quartz/target/classes/com/ruoyi/quartz/mapper/OABidMapper.class differ diff --git a/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/OAAuthorizeService.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/OAAuthorizeService.class new file mode 100644 index 0000000..04ba157 Binary files /dev/null and b/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/OAAuthorizeService.class differ diff --git a/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/OABidService.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/OABidService.class index 051b961..5913633 100644 Binary files a/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/OABidService.class and b/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/OABidService.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 new file mode 100644 index 0000000..dd2edbb Binary files /dev/null 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 740e15e..7f61ba4 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/task/AuthorizeTask.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/AuthorizeTask.class new file mode 100644 index 0000000..0260899 Binary files /dev/null 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 ca5a914..6a93a75 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/mapper/quartz/OAAuthorizeMapper.xml b/ruoyi-quartz/target/classes/mapper/quartz/OAAuthorizeMapper.xml new file mode 100644 index 0000000..19cd8bd --- /dev/null +++ b/ruoyi-quartz/target/classes/mapper/quartz/OAAuthorizeMapper.xml @@ -0,0 +1,28 @@ + + + + + + + update authorize set doa_approval_status = #{state},doa_oa_approval_status = #{state}, + doa_oa_remark = #{remark},doa_vice_president_approved = #{doaVicePresidentApproved} + where doa_id = #{doaId} + + + + update sys_oa_authorize set isFinish = '1' where doa_code = #{doaCode} + + diff --git a/ruoyi-quartz/target/classes/mapper/quartz/OABidMapper.xml b/ruoyi-quartz/target/classes/mapper/quartz/OABidMapper.xml index ab15633..e1d69c9 100644 --- a/ruoyi-quartz/target/classes/mapper/quartz/OABidMapper.xml +++ b/ruoyi-quartz/target/classes/mapper/quartz/OABidMapper.xml @@ -24,4 +24,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_oa_bid set isFinish = '1' where bid_code = #{bidCode} + + + + + + + + update bid set bid_approval_status = #{state},bid_oa_approval_status = #{state}, bid_oa_remark = #{remark},bid_vice_president_approved = {bidVicePresidentApproved} + where bid_id = #{bidId} + + + + update sys_oa_bid_tb set isFinish = '1' where bid_code = #{bidCode} + diff --git a/ruoyi-quartz/target/classes/mapper/quartz/OAZgysMapper.xml b/ruoyi-quartz/target/classes/mapper/quartz/OAZgysMapper.xml index eb8992c..18287da 100644 --- a/ruoyi-quartz/target/classes/mapper/quartz/OAZgysMapper.xml +++ b/ruoyi-quartz/target/classes/mapper/quartz/OAZgysMapper.xml @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update zgys set pq_approval_status = #{state},pq_oa_approval_status = #{state}, - pq_returnRemark = #{remark},pq_vp_approval = #{pqVpApproval} + pq_oa_remark = #{remark},pq_vp_approval = #{pqVpApproval} where pq_id = #{pqId} diff --git a/ruoyi-quartz/target/maven-archiver/pom.properties b/ruoyi-quartz/target/maven-archiver/pom.properties index 53ea28b..87e3d83 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 15:05:28 CST 2024 +#Thu Aug 08 16:45:36 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-quartz diff --git a/ruoyi-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/ruoyi-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 9f4f930..1394c17 100644 --- a/ruoyi-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/ruoyi-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,41 +1,46 @@ +com\ruoyi\quartz\domain\OASysAuthorize.class com\ruoyi\quartz\util\QuartzDisallowConcurrentExecution.class com\ruoyi\quartz\domain\c_rb_product_price.class -com\ruoyi\quartz\domain\OASysBid.class -com\ruoyi\quartz\util\CronUtils.class com\ruoyi\quartz\service\impl\OAZgysServiceImpl.class com\ruoyi\quartz\service\impl\SysJobLogServiceImpl.class -com\ruoyi\quartz\service\ISysJobLogService.class -com\ruoyi\quartz\mapper\OAZgysMapper.class com\ruoyi\quartz\mapper\SysJobLogMapper.class -com\ruoyi\quartz\mapper\SapTjMapper.class com\ruoyi\quartz\task\BidTask.class com\ruoyi\quartz\controller\SysJobLogController.class com\ruoyi\quartz\task\QuotTask.class com\ruoyi\quartz\task\RyTask.class com\ruoyi\quartz\util\JobInvokeUtil.class -com\ruoyi\quartz\util\RedisTriggerListener.class com\ruoyi\quartz\mapper\OAQuotMapper.class com\ruoyi\quartz\service\impl\OAQuotServiceImpl.class com\ruoyi\quartz\domain\OASysZgys.class com\ruoyi\quartz\task\RbTask.class -com\ruoyi\quartz\domain\OASysQuot.class com\ruoyi\quartz\service\impl\SapTjServiceImpl.class com\ruoyi\quartz\service\OAQuotService.class -com\ruoyi\quartz\mapper\OABidMapper.class -com\ruoyi\quartz\util\JDBCBatchInsert.class com\ruoyi\quartz\controller\SysJobController.class -com\ruoyi\quartz\util\ScheduleUtils.class +com\ruoyi\quartz\service\OAAuthorizeService.class com\ruoyi\quartz\mapper\SysJobMapper.class com\ruoyi\quartz\domain\SysJob.class +com\ruoyi\quartz\util\AbstractQuartzJob.class +com\ruoyi\quartz\task\ZgysTask.class +com\ruoyi\quartz\service\OAZgysService.class +com\ruoyi\quartz\service\ISysJobService.class +com\ruoyi\quartz\domain\c_rb_productbase_price.class +com\ruoyi\quartz\domain\OASysBid.class +com\ruoyi\quartz\util\CronUtils.class +com\ruoyi\quartz\service\impl\OAAuthorizeServiceImpl.class +com\ruoyi\quartz\service\ISysJobLogService.class +com\ruoyi\quartz\mapper\OAZgysMapper.class +com\ruoyi\quartz\mapper\SapTjMapper.class +com\ruoyi\quartz\util\RedisTriggerListener.class +com\ruoyi\quartz\domain\OASysQuot.class +com\ruoyi\quartz\mapper\OAAuthorizeMapper.class +com\ruoyi\quartz\mapper\OABidMapper.class +com\ruoyi\quartz\util\JDBCBatchInsert.class +com\ruoyi\quartz\util\ScheduleUtils.class com\ruoyi\quartz\service\SapTjService.class com\ruoyi\quartz\domain\SysJobLog.class com\ruoyi\quartz\service\impl\OABidServiceImpl.class com\ruoyi\quartz\service\OABidService.class -com\ruoyi\quartz\util\AbstractQuartzJob.class -com\ruoyi\quartz\task\ZgysTask.class +com\ruoyi\quartz\task\AuthorizeTask.class com\ruoyi\quartz\service\impl\SysJobServiceImpl.class -com\ruoyi\quartz\service\OAZgysService.class -com\ruoyi\quartz\service\ISysJobService.class com\ruoyi\quartz\config\ScheduleConfig.class -com\ruoyi\quartz\domain\c_rb_productbase_price.class com\ruoyi\quartz\util\QuartzJobExecution.class diff --git a/ruoyi-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/ruoyi-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index cf72d63..c15433c 100644 --- a/ruoyi-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/ruoyi-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -3,9 +3,11 @@ E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\service\ E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\util\QuartzJobExecution.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\domain\SysJob.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\domain\c_rb_productbase_price.java +E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\service\OAAuthorizeService.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\config\ScheduleConfig.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\util\JobInvokeUtil.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\domain\SysJobLog.java +E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\task\AuthorizeTask.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\service\ISysJobLogService.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\util\AbstractQuartzJob.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\task\RyTask.java @@ -17,15 +19,18 @@ E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\util\Cro E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\domain\OASysZgys.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\service\impl\SapTjServiceImpl.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\task\BidTask.java +E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\mapper\OAAuthorizeMapper.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\task\RbTask.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\mapper\SapTjMapper.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\domain\c_rb_product_price.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\controller\SysJobLogController.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\mapper\SysJobLogMapper.java +E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\service\impl\OAAuthorizeServiceImpl.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\util\QuartzDisallowConcurrentExecution.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\domain\OASysBid.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\mapper\OABidMapper.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\service\impl\OABidServiceImpl.java +E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\domain\OASysAuthorize.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\util\JDBCBatchInsert.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\mapper\OAQuotMapper.java E:\myproject\JNBusinessTest\ruoyi-quartz\src\main\java\com\ruoyi\quartz\mapper\OAZgysMapper.java diff --git a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar index b3bd8d5..cd1e817 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/resources/mapper/authorize/AuthorizeMapper.xml b/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml index 2618a66..7d51e62 100644 --- a/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml @@ -164,6 +164,7 @@ department_id, submission_time, doa_id, + doa_code, doa_number, doa_salesman_name, doa_project, @@ -184,6 +185,7 @@ #{departmentId}, #{submissionTime}, #{doaId}, + #{doaCode}, #{doaNumber}, #{doaSalesmanName}, #{doaProject}, diff --git a/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml b/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml index 383df33..0b7e4c8 100644 --- a/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml @@ -390,6 +390,7 @@ department_id, submission_time, bid_id, + bid_code, bid_number, bid_salesman_name, bid_tendering_unit, @@ -427,6 +428,7 @@ #{departmentId}, #{submissionTime}, #{bidId}, + #{bidCode}, #{bidNumber}, #{bidSalesmanName}, #{bidTenderingUnit}, diff --git a/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml b/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml index c227d39..613916c 100644 --- a/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml @@ -156,6 +156,7 @@ department_id, submission_time, pq_id, + pq_code, pq_number, pq_salesman_name, pq_customer_name, @@ -173,6 +174,7 @@ #{departmentId}, #{submissionTime}, #{pqId}, + #{pqCode}, #{pqNumber}, #{pqSalesmanName}, #{pqCustomerName}, diff --git a/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml b/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml index 2618a66..7d51e62 100644 --- a/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml +++ b/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml @@ -164,6 +164,7 @@ department_id, submission_time, doa_id, + doa_code, doa_number, doa_salesman_name, doa_project, @@ -184,6 +185,7 @@ #{departmentId}, #{submissionTime}, #{doaId}, + #{doaCode}, #{doaNumber}, #{doaSalesmanName}, #{doaProject}, diff --git a/ruoyi-system/target/classes/mapper/bid/BidMapper.xml b/ruoyi-system/target/classes/mapper/bid/BidMapper.xml index 383df33..0b7e4c8 100644 --- a/ruoyi-system/target/classes/mapper/bid/BidMapper.xml +++ b/ruoyi-system/target/classes/mapper/bid/BidMapper.xml @@ -390,6 +390,7 @@ department_id, submission_time, bid_id, + bid_code, bid_number, bid_salesman_name, bid_tendering_unit, @@ -427,6 +428,7 @@ #{departmentId}, #{submissionTime}, #{bidId}, + #{bidCode}, #{bidNumber}, #{bidSalesmanName}, #{bidTenderingUnit}, diff --git a/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.xml b/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.xml index c227d39..613916c 100644 --- a/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.xml +++ b/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.xml @@ -156,6 +156,7 @@ department_id, submission_time, pq_id, + pq_code, pq_number, pq_salesman_name, pq_customer_name, @@ -173,6 +174,7 @@ #{departmentId}, #{submissionTime}, #{pqId}, + #{pqCode}, #{pqNumber}, #{pqSalesmanName}, #{pqCustomerName}, diff --git a/ruoyi-system/target/maven-archiver/pom.properties b/ruoyi-system/target/maven-archiver/pom.properties index 501bf4a..5b62b57 100644 --- a/ruoyi-system/target/maven-archiver/pom.properties +++ b/ruoyi-system/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Aug 08 15:05:23 CST 2024 +#Thu Aug 08 16:45:33 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-system diff --git a/ruoyi-system/target/ruoyi-system-3.8.7.jar b/ruoyi-system/target/ruoyi-system-3.8.7.jar index e8bddc0..3f77361 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