diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 10775fc..379895c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,12 +2,10 @@ - - - + - + @@ -21,24 +19,32 @@ - - - - - + + + + - + + + + + + + + + + + - - + - - + + @@ -141,85 +148,85 @@ - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + @@ -241,23 +248,39 @@ - + - + - + - + - - + + + + + + + + + + + + + file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.java + 226 + + + \ No newline at end of file diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination new file mode 100644 index 0000000..2b6a1e9 --- /dev/null +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -0,0 +1,11 @@ +#for tests only ! +#Thu Aug 08 14:57:29 CST 2024 +jco.client.lang=ZH +jco.client.passwd=fE;w~oY[RV}$Hq`k8+X*q%@jQBYm^Qo.).998p..HvCkC+6i +jco.client.sysnr=00 +jco.destination.pool_capacity=10 +jco.client.client=800 +jco.destination.peak_limit=10 +jco.client.user=RFC +jco.client.saprouter= +jco.client.ashost=172.19.0.125 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 32246c6..6c8a040 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 @@ -6,7 +6,6 @@ import javax.servlet.http.HttpServletResponse; import com.ruoyi.authorize.domain.AuthorizeFile; import com.ruoyi.authorize.domain.SysOaAuthorize; import com.ruoyi.authorize.service.IAuthorizeFileService; -import com.ruoyi.bid.domain.Bid; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; @@ -101,8 +100,8 @@ public class AuthorizeController extends BaseController authorize.setDoaCode(doaCode); // 获取用户角色 --判断是否有新建权限 - Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_ZHGLY"); - if(bidJlRoleFlag){ + Boolean doaJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_ZHGLY"); + if(doaJlRoleFlag){ Long deptId = userService.selectUserByUserName(authorize.getDoaSalesmanCode()).getDeptId(); authorize.setDoaSalesmanDeptId(String.valueOf(deptId)); SysDept sysDept = deptService.selectDeptById(deptId); @@ -128,8 +127,8 @@ public class AuthorizeController extends BaseController public AjaxResult edit(@RequestBody Authorize authorize) { // 获取用户角色 --判断是否有新建权限 - Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_ZHGLY"); - if(bidJlRoleFlag){ + Boolean doaJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_ZHGLY"); + if(doaJlRoleFlag){ Long deptId = userService.selectUserByUserName(authorize.getDoaSalesmanCode()).getDeptId(); authorize.setDoaSalesmanDeptId(String.valueOf(deptId)); SysDept sysDept = deptService.selectDeptById(deptId); @@ -174,10 +173,11 @@ public class AuthorizeController extends BaseController public AjaxResult commitAuthorize(@RequestBody Authorize authorize) { try{ + authorize.setDoaApprovalStatus("1"); Long deptId = getLoginUser().getUser().getDeptId(); // 获取用户角色 --判断是否有新建权限 - Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_ZHGLY"); - if(bidJlRoleFlag){ + Boolean doaJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_ZHGLY"); + if(doaJlRoleFlag){ deptId = userService.selectUserByUserName(authorize.getDoaSalesmanCode()).getDeptId(); } SysDept sysDept = deptService.selectDeptById(deptId); @@ -189,7 +189,7 @@ public class AuthorizeController extends BaseController String doaNumber = authorizeService.getCodeAT("S"); authorize.setDoaNumber(doaNumber); - if(bidJlRoleFlag){ + if(doaJlRoleFlag){ authorize.setDoaSalesmanDeptId(String.valueOf(deptId)); authorize.setDoaSalesmanDeptName(sysDept.getDeptName()); authorize.setCreateBy(authorize.getDoaSalesmanCode()); @@ -201,7 +201,7 @@ public class AuthorizeController extends BaseController }else{ String doaNumber = authorizeService.getCodeAT("S"); authorize.setDoaNumber(doaNumber); - if(bidJlRoleFlag){ + if(doaJlRoleFlag){ authorize.setDoaSalesmanDeptId(String.valueOf(deptId)); authorize.setDoaSalesmanDeptName(sysDept.getDeptName()); authorize.setCreateBy(authorize.getDoaSalesmanCode()); @@ -209,7 +209,7 @@ public class AuthorizeController extends BaseController }else{ authorize.setUpdateBy(getUsername()); } - authorize.setDoaApprovalStatus("1"); + authorize.setDoaRejectionReasons("");//驳回后再次提交清除驳回原因 authorizeService.updateAuthorize(authorize); return success(); @@ -247,42 +247,19 @@ 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.setDoaSalesmanPhone((authorize.getDoaSalesmanPhone())); sysOaAuthorize.setDoaProject(authorize.getDoaProject()); sysOaAuthorize.setDoaCustomerName(authorize.getDoaCustomerName()); sysOaAuthorize.setDoaOwnerUnit(authorize.getDoaOwnerUnit()); sysOaAuthorize.setDoaGeneralcontractUnit(authorize.getDoaGeneralcontractUnit()); sysOaAuthorize.setDoaSubcontractUnit(authorize.getDoaSubcontractUnit()); sysOaAuthorize.setDoaAuthorizer(authorize.getDoaAuthorizer()); - sysOaAuthorize.setDoaAuthorizerPhone(authorize.getDoaAuthorizerPhone()); - sysOaAuthorize.setDoaAuthorizerIdentificationNumber(authorize.getDoaAuthorizerIdentificationNumber()); sysOaAuthorize.setDoaAuthorizationDuration(authorize.getDoaAuthorizationDuration()); sysOaAuthorize.setDoaPowerAttorneyPurpose(authorize.getDoaPowerAttorneyPurpose()); - sysOaAuthorize.setDoaFormat(authorize.getDoaFormat()); sysOaAuthorize.setDoaRemark(authorize.getDoaRemark()); sysOaAuthorize.setDoaStandardizer(authorize.getDoaStandardizer()); - sysOaAuthorize.setDoaArchiving(authorize.getDoaArchiving()); - sysOaAuthorize.setDoaVicePresidentApproved(authorize.getDoaVicePresidentApproved()); - // 上传反馈清单 - AuthorizeFile authorizeFile = new AuthorizeFile(); - authorizeFile.setRelationId(authorize.getDoaId()); - authorizeFile.setFileType("authorizeYwyFile"); - List fileList = authorizeFileService.selectAuthorizeFileList(authorizeFile); - String fileString = ""; - if(fileList!=null&&fileList.size()>0){ - for(AuthorizeFile f:fileList){ - String fileUrl = f.getFileUrl(); - if(StringUtils.isEmpty(fileString)){ - fileString = fileString+fileUrl; - }else{ - fileString = fileString+","+fileUrl; - } - } - } - sysOaAuthorize.setFileAddress(fileString); sysOaAuthorize.setCreateTime(DateUtils.getNowDate()); sysOaAuthorize.setIsFinish("0");// 授权备案已提交OA审批中 authorizeService.insertSysOAAuthorize(sysOaAuthorize); @@ -302,8 +279,8 @@ public class AuthorizeController extends BaseController @ChangeRecordLog(serviceImplclass = "com.ruoyi.authorize.service.impl.AuthorizeServiceImpl", serviceImplMethod="selectAuthorizeByDoaId", tableId = "doaId",codeName = "doaCode",title = "投标办驳回") - @PostMapping("/rejectBid") - public AjaxResult rejectBid(@RequestBody Authorize authorize) + @PostMapping("/rejectAuthorize") + public AjaxResult rejectAuthorize(@RequestBody Authorize authorize) { String doa_rejection_reasons = authorize.getDoaRejectionReasons(); if(StringUtils.isEmpty(doa_rejection_reasons)){ 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 e564ba3..60ddcbe 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 @@ -107,8 +107,8 @@ public class ZgysController extends BaseController zgys.setPqCode(zgysCode); // 获取用户角色 --判断是否有新建权限 - Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_BSZZY")||SecurityUtils.hasRole("BID_ZHGLY"); - if(bidJlRoleFlag){ + Boolean pqJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_BSZZY")||SecurityUtils.hasRole("BID_ZHGLY"); + if(pqJlRoleFlag){ Long deptId = userService.selectUserByUserName(zgys.getPqSalesmanCode()).getDeptId(); zgys.setPqSalesmanDeptId(String.valueOf(deptId)); SysDept sysDept = deptService.selectDeptById(deptId); @@ -134,8 +134,8 @@ public class ZgysController extends BaseController public AjaxResult edit(@RequestBody Zgys zgys) { // 获取用户角色 --判断是否有新建权限 - Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_BSZZY")||SecurityUtils.hasRole("BID_ZHGLY"); - if(bidJlRoleFlag){ + Boolean pqJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_BSZZY")||SecurityUtils.hasRole("BID_ZHGLY"); + if(pqJlRoleFlag){ Long deptId = userService.selectUserByUserName(zgys.getPqSalesmanCode()).getDeptId(); zgys.setPqSalesmanDeptId(String.valueOf(deptId)); SysDept sysDept = deptService.selectDeptById(deptId); @@ -159,10 +159,11 @@ public class ZgysController extends BaseController public AjaxResult commitZgys(@RequestBody Zgys zgys) { try{ + zgys.setPqApprovalStatus("1"); Long deptId = getLoginUser().getUser().getDeptId(); // 获取用户角色 --判断是否有新建权限 - Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_BSZZY")||SecurityUtils.hasRole("BID_ZHGLY"); - if(bidJlRoleFlag){ + Boolean pqJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_BSZZY")||SecurityUtils.hasRole("BID_ZHGLY"); + if(pqJlRoleFlag){ deptId = userService.selectUserByUserName(zgys.getPqSalesmanCode()).getDeptId(); } SysDept sysDept = deptService.selectDeptById(deptId); @@ -175,7 +176,7 @@ public class ZgysController extends BaseController String pqNumber = zgysService.getCodePQ("Z"); zgys.setPqNumber(pqNumber); - if(bidJlRoleFlag){ + if(pqJlRoleFlag){ zgys.setPqSalesmanDeptId(String.valueOf(deptId)); zgys.setPqSalesmanDeptName(sysDept.getDeptName()); zgys.setCreateBy(zgys.getPqSalesmanCode()); @@ -185,9 +186,7 @@ public class ZgysController extends BaseController zgysService.insertZgys(zgys); return success(); }else{ - String pqNumber = zgysService.getCodePQ("Z"); - zgys.setPqNumber(pqNumber); - if(bidJlRoleFlag){ + if(pqJlRoleFlag){ zgys.setPqSalesmanDeptId(String.valueOf(deptId)); zgys.setPqSalesmanDeptName(sysDept.getDeptName()); zgys.setCreateBy(zgys.getPqSalesmanCode()); @@ -195,7 +194,7 @@ public class ZgysController extends BaseController }else{ zgys.setUpdateBy(getUsername()); } - zgys.setPqApprovalStatus("1"); + zgys.setPqReturnRemark("");//驳回后再次提交清除驳回原因 zgysService.updateZgys(zgys); return success(); @@ -218,51 +217,43 @@ public class ZgysController extends BaseController public AjaxResult commitZgysOA(@RequestBody Zgys zgys) { - // 资格预审提交OA,插入中间表 sys_oa_zgys - SysOaZgys sysOaZgys = new SysOaZgys(); - SysOaZgys oauser = zgysService.selectOAUserByUserName(getUsername());// 查询OA用户 - if(oauser==null){ - return error("该账户:"+getUsername()+"在OA中不存在"); - } - - sysOaZgys.setUserId(oauser.getUserId()); - sysOaZgys.setDepartmentId(oauser.getDepartmentId()); - sysOaZgys.setSubmissionTime(DateUtils.getDate()); - sysOaZgys.setPqId(UUID.fastUUID().toString()); - sysOaZgys.setPqCode(zgys.getPqCode()); - sysOaZgys.setPqSalesmanName(zgys.getPqSalesmanName()); - sysOaZgys.setPqCustomerName(zgys.getPqCustomerName()); - sysOaZgys.setPqProject(zgys.getPqProject()); - sysOaZgys.setPqAuthorizedRepresentative(zgys.getPqAuthorizedRepresentative()); - sysOaZgys.setPqBidDate(zgys.getPqBidDate()); - sysOaZgys.setPqZbr(zgys.getPqZbr()); - sysOaZgys.setPqBidWinningStatus(zgys.getPqBidWinningStatus()); - sysOaZgys.setPqIllustrate(zgys.getPqIllustrate()); - - // 上传反馈清单 - ZgysFile zgysFile = new ZgysFile(); - zgysFile.setRelationId(zgys.getPqId()); - zgysFile.setFileType("zgysYwyFile"); - List fileList = zgysFileService.selectZgysFileList(zgysFile); - String fileString = ""; - if(fileList!=null&&fileList.size()>0){ - for(ZgysFile f:fileList){ - String fileUrl = f.getFileUrl(); - if(StringUtils.isEmpty(fileString)){ - fileString = fileString+fileUrl; - }else{ - fileString = fileString+","+fileUrl; - } + try{ + String pq_oa_approval_status = zgys.getPqOaApprovalStatus(); + if("1".equals(pq_oa_approval_status)){ + return error("已提交OA审批中,请勿重复操作"); } - } - sysOaZgys.setPqYwyFile(fileString); - sysOaZgys.setCreateTime(DateUtils.getNowDate()); - sysOaZgys.setIsFinish("0");// 资格预审已提交OA审批中 - zgysService.insertSysOAZgys(sysOaZgys); - zgys.setPqOaApprovalStatus("1");// 更新OA提交状态为 审批中 - zgysService.updateZgys(zgys); - return success(); + // 资格预审提交OA,插入中间表 sys_oa_zgys + SysOaZgys sysOaZgys = new SysOaZgys(); + SysOaZgys oauser = zgysService.selectOAUserByUserName(getUsername());// 查询OA用户 + if(oauser==null){ + return error("该账户:"+getUsername()+"在OA中不存在"); + } + + sysOaZgys.setUserId(oauser.getUserId()); + sysOaZgys.setDepartmentId(oauser.getDepartmentId()); + sysOaZgys.setSubmissionTime(DateUtils.getDate()); + sysOaZgys.setPqId(UUID.fastUUID().toString()); + sysOaZgys.setPqNumber(zgys.getPqNumber()); + sysOaZgys.setPqSalesmanName(zgys.getPqSalesmanName()); + sysOaZgys.setPqCustomerName(zgys.getPqCustomerName()); + sysOaZgys.setPqProject(zgys.getPqProject()); + sysOaZgys.setPqAuthorizedRepresentative(zgys.getPqAuthorizedRepresentative()); + sysOaZgys.setPqAgency(zgys.getPqAgency()); + sysOaZgys.setPqBidDate(zgys.getPqBidDate()); + sysOaZgys.setPqZbr(zgys.getPqZbr()); + sysOaZgys.setPqIllustrate(zgys.getPqIllustrate()); + + sysOaZgys.setCreateTime(DateUtils.getNowDate()); + sysOaZgys.setIsFinish("0");// 资格预审已提交OA审批中 + zgysService.insertSysOAZgys(sysOaZgys); + + zgys.setPqOaApprovalStatus("1");// 更新OA提交状态为 审批中 + zgysService.updateZgys(zgys); + return success(); + }catch (Exception e){ + return error("系统异常"); + } } /** @@ -272,8 +263,8 @@ public class ZgysController extends BaseController @ChangeRecordLog(serviceImplclass = "com.ruoyi.zgys.service.impl.ZgysServiceImpl", serviceImplMethod="selectZgysByPqId", tableId = "pqId",codeName = "pqCode",title = "投标办驳回") - @PostMapping("/rejectBid") - public AjaxResult rejectBid(@RequestBody Zgys zgys) + @PostMapping("/rejectZgys") + public AjaxResult rejectZgys(@RequestBody Zgys zgys) { String pq_returnRemark = zgys.getPqReturnRemark(); if(StringUtils.isEmpty(pq_returnRemark)){ 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 213c2c8..20a7109 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/quot/QuotController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class index 0f6f90e..06f4d70 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/zgys/ZgysController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/zgys/ZgysController.class index 6881936..6be52e2 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 9c26ad0..0633bec 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 10:18:08 CST 2024 +#Thu Aug 08 15:05:33 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 85d96dd..f3adc52 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 5139681..43bbeff 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 384882d..66980d5 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 10:17:35 CST 2024 +#Thu Aug 08 15:05:20 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 1cc06a0..74db44d 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 ecf3226..2756e3a 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 10:17:52 CST 2024 +#Thu Aug 08 15:05:26 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 f76523c..db7b141 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 de5f845..add1946 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 10:17:58 CST 2024 +#Thu Aug 08 15:05:28 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 216302c..531792c 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 e52b99e..53ea28b 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 10:17:56 CST 2024 +#Thu Aug 08 15:05:28 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 432e0fa..b3bd8d5 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 920aed9..c82aa38 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 @@ -44,7 +44,7 @@ public class Authorize extends BaseEntity private String doaSalesmanDeptId; /** 部门名 */ - @DataName(name = "部门名") + @DataName(name = "部门") private String doaSalesmanDeptName; /** 业务员电话 */ @@ -132,8 +132,8 @@ public class Authorize extends BaseEntity @Excel(name = "提交状态",dictType = "doa_approval_status") private String doaApprovalStatus; - /** 副总审批状态(0-待提交 1-审批中 2-已完成 3-已驳回) */ - @DataName(name = "副总审批状态",readConverterExp="0=待提交,1=审批中,2=已完成,3=已驳回") + /** OA审批状态(0-待提交 1-审批中 2-已完成 3-已驳回) */ + @DataName(name = "OA审批状态",readConverterExp="0=待提交,1=审批中,2=已完成,3=已驳回") private String doaOaApprovalStatus; /** OA反馈说明 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/SysOaAuthorize.java b/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/SysOaAuthorize.java index 30e8646..00c5e9e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/SysOaAuthorize.java +++ b/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/SysOaAuthorize.java @@ -17,8 +17,6 @@ public class SysOaAuthorize extends Authorize { private Integer departmentId; /** 提交oa时间 */ private String submissionTime; - /** 业务员附件*/ - private String fileAddress; /** 授权备案完成状态*/ private String isFinish; @@ -46,14 +44,6 @@ public class SysOaAuthorize extends Authorize { this.submissionTime = submissionTime; } - public String getFileAddress() { - return fileAddress; - } - - public void setFileAddress(String fileAddress) { - this.fileAddress = fileAddress; - } - public String getIsFinish() { return isFinish; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java b/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java index f8638a0..c4cb3c1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java @@ -46,6 +46,7 @@ public class Bid extends BaseEntity private String bidSalesmanDeptId; /** 部门名称 */ + @DataName(name = "部门") private String bidSalesmanDeptName; /** 是否报名 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/SysOaZgys.java b/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/SysOaZgys.java index e6eabf8..c8a3e18 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/SysOaZgys.java +++ b/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/SysOaZgys.java @@ -15,8 +15,6 @@ public class SysOaZgys extends Zgys { private Integer departmentId; /** 提交oa时间 */ private String submissionTime; - /** 业务员附件*/ - private String pqYwyFile; /** 资格预审完成状态*/ private String isFinish; @@ -44,14 +42,6 @@ public class SysOaZgys extends Zgys { this.submissionTime = submissionTime; } - public String getPqYwyFile() { - return pqYwyFile; - } - - public void setPqYwyFile(String pqYwyFile) { - this.pqYwyFile = pqYwyFile; - } - public String getIsFinish() { return isFinish; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/Zgys.java b/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/Zgys.java index bb7c9cd..cc28714 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/Zgys.java +++ b/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/Zgys.java @@ -43,7 +43,8 @@ public class Zgys extends BaseEntity private String pqSalesmanDeptId; /** 部门名 */ - @Excel(name = "部门名") + @Excel(name = "部门") + @DataName(name = "部门") private String pqSalesmanDeptName; /** 客户编码 */ @@ -83,8 +84,8 @@ public class Zgys extends BaseEntity @DataName(name = "中标状态",readConverterExp="0=是,1=否") private String pqBidWinningStatus; - /** 说明 */ - @DataName(name = "类别",readConverterExp="1=报名,2=供方调查表,3=资格预审,4=其他资料,5=网站注册") + /** 类别 */ + @DataName(name = "类别",readConverterExp="1=报名,2=调查表,3=资格预审,4=其他,5=注册网址") private String pqIllustrate; /** 公告链接网址 */ @@ -113,10 +114,14 @@ public class Zgys extends BaseEntity @DataName(name = "提交状态",readConverterExp="0=待提交,1=协助中,2=已完成,3=已驳回") private String pqApprovalStatus; - /** OA提交状态 */ - @DataName(name = "OA提交状态",readConverterExp="0=待提交,1=审批中,2=已通过,3=已驳回") + /** OA审批状态 */ + @DataName(name = "OA审批状态",readConverterExp="0=待提交,1=审批中,2=已通过,3=已驳回") private String pqOaApprovalStatus; + /** OA反馈说明 */ + @DataName(name = "OA反馈说明") + private String pqOaRemark; + @DataName(name = "副总审批") private String pqVpApproval; @@ -321,6 +326,9 @@ public class Zgys extends BaseEntity public String getPqOaApprovalStatus() { return pqOaApprovalStatus; } public void setPqOaApprovalStatus(String pqOaApprovalStatus) { this.pqOaApprovalStatus = pqOaApprovalStatus; } + public String getPqOaRemark() { return pqOaRemark; } + + public void setPqOaRemark(String pqOaRemark) { this.pqOaRemark = pqOaRemark; } public String getPqVpApproval() { return pqVpApproval; } public void setPqVpApproval(String pqVpApproval) { this.pqVpApproval = pqVpApproval; } diff --git a/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml b/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml index c3da1f3..2618a66 100644 --- a/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml @@ -164,26 +164,19 @@ department_id, submission_time, doa_id, - doa_code, + doa_number, doa_salesman_name, - doa_salesman_phone, doa_project, doa_customer_name, doa_owner_unit, doa_generalcontract_unit, doa_subcontract_unit, doa_authorizer, - doa_authorizer_phone, - doa_authorizer_identification_number, doa_authorization_duration, doa_power_attorney_purpose, - doa_format, doa_remark, doa_standardizer, - doa_archiving, - doa_vice_president_approved, create_time, - file_address, isFinish, @@ -191,26 +184,19 @@ #{departmentId}, #{submissionTime}, #{doaId}, - #{doaCode}, + #{doaNumber}, #{doaSalesmanName}, - #{doaSalesmanPhone}, #{doaProject}, #{doaCustomerName}, #{doaOwnerUnit}, #{doaGeneralcontractUnit}, #{doaSubcontractUnit}, #{doaAuthorizer}, - #{doaAuthorizerPhone}, - #{doaAuthorizerIdentificationNumber}, #{doaAuthorizationDuration}, #{doaPowerAttorneyPurpose}, - #{doaFormat}, #{doaRemark}, #{doaStandardizer}, - #{doaArchiving}, - #{doaVicePresidentApproved}, #{createTime}, - #{fileAddress}, #{isFinish}, diff --git a/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml b/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml index 0f55954..c227d39 100644 --- a/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml @@ -28,6 +28,7 @@ + @@ -50,7 +51,7 @@ a.pq_customer_name, a.pq_project, a.pq_bid_winning_remark, a.pq_authorized_representative, a.pq_bid_date, a.pq_zbr, a.pq_bid_winning_status, a.pq_illustrate, a.pq_announcement_link_website, a.pq_phone, a.pq_agency, a.pq_remark, - a.pq_approval_status,a.pq_oa_approval_status,a.pq_returnRemark, a.pq_archiving, a.pq_vp_approval, + a.pq_approval_status,a.pq_oa_approval_status,a.pq_oa_remark,a.pq_returnRemark, a.pq_archiving, a.pq_vp_approval, a.create_by, u.nick_name create_name,a.create_time, a.update_by, a.update_time from zgys a @@ -82,28 +83,29 @@ insert into zgys pq_id, - pq_code, - pq_number, + pq_code, + pq_number, pq_salesman_code, pq_salesman_bm, - pq_salesman_name, + pq_salesman_name, pq_salesman_dept_id, - pq_salesman_dept_name, + pq_salesman_dept_name, pq_customer_bm, - pq_customer_name, - pq_project, + pq_customer_name, + pq_project, pq_bid_winning_remark, - pq_authorized_representative, - pq_bid_date, + pq_authorized_representative, + pq_bid_date, pq_zbr, pq_bid_winning_status, - pq_illustrate, + pq_illustrate, pq_announcement_link_website, - pq_phone, + pq_phone, pq_agency, pq_remark, pq_approval_status, pq_oa_approval_status, + pq_oa_remark, pq_returnRemark, pq_archiving, pq_vp_approval, @@ -114,28 +116,29 @@ #{pqId}, - #{pqCode}, - #{pqNumber}, + #{pqCode}, + #{pqNumber}, #{pqSalesmanCode}, #{pqSalesmanBm}, - #{pqSalesmanName}, + #{pqSalesmanName}, #{pqSalesmanDeptId}, - #{pqSalesmanDeptName}, + #{pqSalesmanDeptName}, #{pqCustomerBm}, - #{pqCustomerName}, - #{pqProject}, + #{pqCustomerName}, + #{pqProject}, #{pqBidWinningRemark}, - #{pqAuthorizedRepresentative}, - #{pqBidDate}, + #{pqAuthorizedRepresentative}, + #{pqBidDate}, #{pqZbr}, #{pqBidWinningStatus}, - #{pqIllustrate}, + #{pqIllustrate}, #{pqAnnouncementLinkWebsite}, #{pqPhone}, #{pqAgency}, #{pqRemark}, #{pqApprovalStatus}, #{pqOaApprovalStatus}, + #{pqOaRemark}, #{pqReturnRemark}, #{pqArchiving}, #{pqVpApproval}, @@ -149,72 +152,67 @@ insert into sys_oa_zgys - user_id, - department_id, - submission_time, + user_id, + department_id, + submission_time, pq_id, - pq_code, - pq_number, - pq_salesman_name, - pq_customer_name, - pq_project, - pq_bid_winning_remark, - pq_authorized_representative, - pq_bid_date, + pq_number, + pq_salesman_name, + pq_customer_name, + pq_project, + pq_authorized_representative, + pq_agency, + pq_bid_date, pq_zbr, - pq_bid_winning_status, - pq_illustrate, + pq_illustrate, create_time, - pq_ywy_file, - isFinish, + isFinish, - #{userId}, - #{departmentId}, - #{submissionTime}, + #{userId}, + #{departmentId}, + #{submissionTime}, #{pqId}, - #{pqCode}, - #{pqNumber}, - #{pqSalesmanName}, - #{pqCustomerName}, - #{pqProject}, - #{pqBidWinningRemark}, - #{pqAuthorizedRepresentative}, - #{pqBidDate}, + #{pqNumber}, + #{pqSalesmanName}, + #{pqCustomerName}, + #{pqProject}, + #{pqAuthorizedRepresentative}, + #{pqAgency}, + #{pqBidDate}, #{pqZbr}, - #{pqBidWinningStatus}, - #{pqIllustrate}, + #{pqIllustrate}, #{createTime}, - #{pqYwyFile}, - #{isFinish}, + #{isFinish}, update zgys - pq_code = #{pqCode}, - pq_number = #{pqNumber}, + pq_code = #{pqCode}, + pq_number = #{pqNumber}, pq_salesman_code = #{pqSalesmanCode}, pq_salesman_bm = #{pqSalesmanBm}, - pq_salesman_name = #{pqSalesmanName}, + pq_salesman_name = #{pqSalesmanName}, pq_salesman_dept_id = #{pqSalesmanDeptId}, - pq_salesman_dept_name = #{pqSalesmanDeptName}, + pq_salesman_dept_name = #{pqSalesmanDeptName}, pq_customer_bm = #{pqCustomerBm}, - pq_customer_name = #{pqCustomerName}, - pq_project = #{pqProject}, + pq_customer_name = #{pqCustomerName}, + pq_project = #{pqProject}, pq_bid_winning_remark = #{pqBidWinningRemark}, - pq_authorized_representative = #{pqAuthorizedRepresentative}, - pq_bid_date = #{pqBidDate}, + pq_authorized_representative = #{pqAuthorizedRepresentative}, + pq_bid_date = #{pqBidDate}, pq_zbr = #{pqZbr}, pq_bid_winning_status = #{pqBidWinningStatus}, - pq_illustrate = #{pqIllustrate}, + pq_illustrate = #{pqIllustrate}, pq_announcement_link_website = #{pqAnnouncementLinkWebsite}, - pq_phone = #{pqPhone}, + pq_phone = #{pqPhone}, pq_agency = #{pqAgency}, pq_remark = #{pqRemark}, pq_approval_status = #{pqApprovalStatus}, pq_oa_approval_status = #{pqOaApprovalStatus}, + pq_oa_remark = #{pqOaRemark}, pq_returnRemark = #{pqReturnRemark}, pq_archiving = #{pqArchiving}, pq_vp_approval = #{pqVpApproval}, @@ -245,7 +243,7 @@ {call GetSerialNo_Business(#{type,mode=IN,jdbcType=VARCHAR})} - select top 1 id as userId,departmentid as departmentId from HrmResource where loginid = #{loginid} 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 063fb62..840ee24 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/authorize/domain/SysOaAuthorize.class b/ruoyi-system/target/classes/com/ruoyi/authorize/domain/SysOaAuthorize.class index 5b3f082..ac8ffdf 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/authorize/domain/SysOaAuthorize.class and b/ruoyi-system/target/classes/com/ruoyi/authorize/domain/SysOaAuthorize.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class b/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class index 7e2141a..771dbd4 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class and b/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/quot/domain/Quot.class b/ruoyi-system/target/classes/com/ruoyi/quot/domain/Quot.class index d16664e..13c604e 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/quot/domain/Quot.class and b/ruoyi-system/target/classes/com/ruoyi/quot/domain/Quot.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/quot/domain/SysOaQuot.class b/ruoyi-system/target/classes/com/ruoyi/quot/domain/SysOaQuot.class index a95b998..77ff7bf 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/quot/domain/SysOaQuot.class and b/ruoyi-system/target/classes/com/ruoyi/quot/domain/SysOaQuot.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/quot/mapper/QuotMapper.class b/ruoyi-system/target/classes/com/ruoyi/quot/mapper/QuotMapper.class index c749c9b..17f0057 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/quot/mapper/QuotMapper.class and b/ruoyi-system/target/classes/com/ruoyi/quot/mapper/QuotMapper.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/quot/service/IQuotService.class b/ruoyi-system/target/classes/com/ruoyi/quot/service/IQuotService.class index 5ac7baa..e86b9e5 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/quot/service/IQuotService.class and b/ruoyi-system/target/classes/com/ruoyi/quot/service/IQuotService.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/quot/service/impl/QuotServiceImpl.class b/ruoyi-system/target/classes/com/ruoyi/quot/service/impl/QuotServiceImpl.class index 0abee0e..011a1b0 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/quot/service/impl/QuotServiceImpl.class and b/ruoyi-system/target/classes/com/ruoyi/quot/service/impl/QuotServiceImpl.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/zgys/domain/SysOaZgys.class b/ruoyi-system/target/classes/com/ruoyi/zgys/domain/SysOaZgys.class index fb92b3d..14ff73a 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/zgys/domain/SysOaZgys.class and b/ruoyi-system/target/classes/com/ruoyi/zgys/domain/SysOaZgys.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/zgys/domain/Zgys.class b/ruoyi-system/target/classes/com/ruoyi/zgys/domain/Zgys.class index b784bee..a4fb7e8 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/zgys/domain/Zgys.class and b/ruoyi-system/target/classes/com/ruoyi/zgys/domain/Zgys.class differ diff --git a/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml b/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml index c3da1f3..2618a66 100644 --- a/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml +++ b/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml @@ -164,26 +164,19 @@ department_id, submission_time, doa_id, - doa_code, + doa_number, doa_salesman_name, - doa_salesman_phone, doa_project, doa_customer_name, doa_owner_unit, doa_generalcontract_unit, doa_subcontract_unit, doa_authorizer, - doa_authorizer_phone, - doa_authorizer_identification_number, doa_authorization_duration, doa_power_attorney_purpose, - doa_format, doa_remark, doa_standardizer, - doa_archiving, - doa_vice_president_approved, create_time, - file_address, isFinish, @@ -191,26 +184,19 @@ #{departmentId}, #{submissionTime}, #{doaId}, - #{doaCode}, + #{doaNumber}, #{doaSalesmanName}, - #{doaSalesmanPhone}, #{doaProject}, #{doaCustomerName}, #{doaOwnerUnit}, #{doaGeneralcontractUnit}, #{doaSubcontractUnit}, #{doaAuthorizer}, - #{doaAuthorizerPhone}, - #{doaAuthorizerIdentificationNumber}, #{doaAuthorizationDuration}, #{doaPowerAttorneyPurpose}, - #{doaFormat}, #{doaRemark}, #{doaStandardizer}, - #{doaArchiving}, - #{doaVicePresidentApproved}, #{createTime}, - #{fileAddress}, #{isFinish}, diff --git a/ruoyi-system/target/classes/mapper/quot/QuotMapper.xml b/ruoyi-system/target/classes/mapper/quot/QuotMapper.xml index 9bebec8..44be5d7 100644 --- a/ruoyi-system/target/classes/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/target/classes/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}, diff --git a/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.xml b/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.xml index 0f55954..c227d39 100644 --- a/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.xml +++ b/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.xml @@ -28,6 +28,7 @@ + @@ -50,7 +51,7 @@ a.pq_customer_name, a.pq_project, a.pq_bid_winning_remark, a.pq_authorized_representative, a.pq_bid_date, a.pq_zbr, a.pq_bid_winning_status, a.pq_illustrate, a.pq_announcement_link_website, a.pq_phone, a.pq_agency, a.pq_remark, - a.pq_approval_status,a.pq_oa_approval_status,a.pq_returnRemark, a.pq_archiving, a.pq_vp_approval, + a.pq_approval_status,a.pq_oa_approval_status,a.pq_oa_remark,a.pq_returnRemark, a.pq_archiving, a.pq_vp_approval, a.create_by, u.nick_name create_name,a.create_time, a.update_by, a.update_time from zgys a @@ -82,28 +83,29 @@ insert into zgys pq_id, - pq_code, - pq_number, + pq_code, + pq_number, pq_salesman_code, pq_salesman_bm, - pq_salesman_name, + pq_salesman_name, pq_salesman_dept_id, - pq_salesman_dept_name, + pq_salesman_dept_name, pq_customer_bm, - pq_customer_name, - pq_project, + pq_customer_name, + pq_project, pq_bid_winning_remark, - pq_authorized_representative, - pq_bid_date, + pq_authorized_representative, + pq_bid_date, pq_zbr, pq_bid_winning_status, - pq_illustrate, + pq_illustrate, pq_announcement_link_website, - pq_phone, + pq_phone, pq_agency, pq_remark, pq_approval_status, pq_oa_approval_status, + pq_oa_remark, pq_returnRemark, pq_archiving, pq_vp_approval, @@ -114,28 +116,29 @@ #{pqId}, - #{pqCode}, - #{pqNumber}, + #{pqCode}, + #{pqNumber}, #{pqSalesmanCode}, #{pqSalesmanBm}, - #{pqSalesmanName}, + #{pqSalesmanName}, #{pqSalesmanDeptId}, - #{pqSalesmanDeptName}, + #{pqSalesmanDeptName}, #{pqCustomerBm}, - #{pqCustomerName}, - #{pqProject}, + #{pqCustomerName}, + #{pqProject}, #{pqBidWinningRemark}, - #{pqAuthorizedRepresentative}, - #{pqBidDate}, + #{pqAuthorizedRepresentative}, + #{pqBidDate}, #{pqZbr}, #{pqBidWinningStatus}, - #{pqIllustrate}, + #{pqIllustrate}, #{pqAnnouncementLinkWebsite}, #{pqPhone}, #{pqAgency}, #{pqRemark}, #{pqApprovalStatus}, #{pqOaApprovalStatus}, + #{pqOaRemark}, #{pqReturnRemark}, #{pqArchiving}, #{pqVpApproval}, @@ -149,72 +152,67 @@ insert into sys_oa_zgys - user_id, - department_id, - submission_time, + user_id, + department_id, + submission_time, pq_id, - pq_code, - pq_number, - pq_salesman_name, - pq_customer_name, - pq_project, - pq_bid_winning_remark, - pq_authorized_representative, - pq_bid_date, + pq_number, + pq_salesman_name, + pq_customer_name, + pq_project, + pq_authorized_representative, + pq_agency, + pq_bid_date, pq_zbr, - pq_bid_winning_status, - pq_illustrate, + pq_illustrate, create_time, - pq_ywy_file, - isFinish, + isFinish, - #{userId}, - #{departmentId}, - #{submissionTime}, + #{userId}, + #{departmentId}, + #{submissionTime}, #{pqId}, - #{pqCode}, - #{pqNumber}, - #{pqSalesmanName}, - #{pqCustomerName}, - #{pqProject}, - #{pqBidWinningRemark}, - #{pqAuthorizedRepresentative}, - #{pqBidDate}, + #{pqNumber}, + #{pqSalesmanName}, + #{pqCustomerName}, + #{pqProject}, + #{pqAuthorizedRepresentative}, + #{pqAgency}, + #{pqBidDate}, #{pqZbr}, - #{pqBidWinningStatus}, - #{pqIllustrate}, + #{pqIllustrate}, #{createTime}, - #{pqYwyFile}, - #{isFinish}, + #{isFinish}, update zgys - pq_code = #{pqCode}, - pq_number = #{pqNumber}, + pq_code = #{pqCode}, + pq_number = #{pqNumber}, pq_salesman_code = #{pqSalesmanCode}, pq_salesman_bm = #{pqSalesmanBm}, - pq_salesman_name = #{pqSalesmanName}, + pq_salesman_name = #{pqSalesmanName}, pq_salesman_dept_id = #{pqSalesmanDeptId}, - pq_salesman_dept_name = #{pqSalesmanDeptName}, + pq_salesman_dept_name = #{pqSalesmanDeptName}, pq_customer_bm = #{pqCustomerBm}, - pq_customer_name = #{pqCustomerName}, - pq_project = #{pqProject}, + pq_customer_name = #{pqCustomerName}, + pq_project = #{pqProject}, pq_bid_winning_remark = #{pqBidWinningRemark}, - pq_authorized_representative = #{pqAuthorizedRepresentative}, - pq_bid_date = #{pqBidDate}, + pq_authorized_representative = #{pqAuthorizedRepresentative}, + pq_bid_date = #{pqBidDate}, pq_zbr = #{pqZbr}, pq_bid_winning_status = #{pqBidWinningStatus}, - pq_illustrate = #{pqIllustrate}, + pq_illustrate = #{pqIllustrate}, pq_announcement_link_website = #{pqAnnouncementLinkWebsite}, - pq_phone = #{pqPhone}, + pq_phone = #{pqPhone}, pq_agency = #{pqAgency}, pq_remark = #{pqRemark}, pq_approval_status = #{pqApprovalStatus}, pq_oa_approval_status = #{pqOaApprovalStatus}, + pq_oa_remark = #{pqOaRemark}, pq_returnRemark = #{pqReturnRemark}, pq_archiving = #{pqArchiving}, pq_vp_approval = #{pqVpApproval}, @@ -245,7 +243,7 @@ {call GetSerialNo_Business(#{type,mode=IN,jdbcType=VARCHAR})} - select top 1 id as userId,departmentid as departmentId from HrmResource where loginid = #{loginid} diff --git a/ruoyi-system/target/maven-archiver/pom.properties b/ruoyi-system/target/maven-archiver/pom.properties index 1c3bf81..501bf4a 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 10:17:39 CST 2024 +#Thu Aug 08 15:05:23 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 ba4e3f8..e8bddc0 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 e6122a2..1d2df2b 100644 --- a/ruoyi-ui/src/api/authorize/authorize.js +++ b/ruoyi-ui/src/api/authorize/authorize.js @@ -79,9 +79,9 @@ export function commitAuthorizeOA(data) { }) } //驳回按钮 -export function rejectForm(data) { +export function rejectAuthorize(data) { return request({ - url: '/authorize/authorize/rejectForm', + url: '/authorize/authorize/rejectAuthorize', method: 'post', data: data }) diff --git a/ruoyi-ui/src/api/zgys/zgys.js b/ruoyi-ui/src/api/zgys/zgys.js index 3ea5c48..9822802 100644 --- a/ruoyi-ui/src/api/zgys/zgys.js +++ b/ruoyi-ui/src/api/zgys/zgys.js @@ -79,9 +79,9 @@ export function commitZgysOA(data) { }) } //驳回按钮 -export function rejectForm(data) { +export function rejectZgys(data) { return request({ - url: '/zgys/zgys/rejectForm', + url: '/zgys/zgys/rejectZgys', method: 'post', data: data }) diff --git a/ruoyi-ui/src/views/authorize/authorize/index.vue b/ruoyi-ui/src/views/authorize/authorize/index.vue index c5047bb..002aec3 100644 --- a/ruoyi-ui/src/views/authorize/authorize/index.vue +++ b/ruoyi-ui/src/views/authorize/authorize/index.vue @@ -216,7 +216,9 @@ - + + + @@ -229,7 +231,7 @@ - + - + - + - + @@ -269,42 +271,42 @@ - + - + - + - + - + - + - + @@ -314,7 +316,7 @@ type="date" value-format="yyyy-MM-dd" placeholder="请选择授权期限" - :disabled="ywyDis"> + :disabled="ywyDis||tbDis"> @@ -322,14 +324,14 @@ - + - + @@ -343,12 +345,12 @@ - + - + 提交至OA - 驳回 + 驳回 @@ -444,7 +446,7 @@