From e9048482f8bd368e79ef6ec9bbc748deaa977474 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Fri, 25 Jul 2025 16:37:55 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=9A=E5=91=98=E5=BC=80=E9=80=9A?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=202?= =?UTF-8?q?=E3=80=81=E5=90=88=E5=90=8C=E6=9F=A5=E8=AF=A2=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=203=E3=80=81=E8=BD=AE?= =?UTF-8?q?=E6=92=AD=E5=9B=BE=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/modules/pay/MpWxPayService.java | 4 +- .../apiService/impl/CommonApiServiceImpl.java | 17 +++-- .../apiService/impl/ContractServiceImpl.java | 80 ++++++++++++---------- 3 files changed, 57 insertions(+), 44 deletions(-) diff --git a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java index 0e33192..003ef74 100644 --- a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java +++ b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java @@ -98,12 +98,12 @@ public class MpWxPayService { request.setDetail(productName); //商品详情 request.setTotalFee(price); //总金额|分计 request.setSpbillCreateIp(clientIp); //终端IP - request.setNotifyUrl("https://admin.teyizhao.com/employ-api/employ/vip/payNotify");//设置回调路径 + request.setNotifyUrl("https://www.teyizhao.com/employ-api/employ/vip/payNotify");//设置回调路径 request.setProductId(productId); //商品id request.setOpenid(openId); //JSAPI OPENID if (dev){ request.setTotalFee(price); - request.setNotifyUrl("https://admin.teyizhao.com/employ-api/employ/vip/payNotify"); + request.setNotifyUrl("https://www.teyizhao.com/employ-api/employ/vip/payNotify"); } try { Object order = wxPayService.createOrder(request); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java index a569645..70127a8 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java @@ -139,13 +139,18 @@ public class CommonApiServiceImpl implements CommonApiService { //获取工种列表带分页 @Override public Result queryJobTypeList(PageBean pageBean) { + try{ + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employJobTypeService + .lambdaQuery() + .orderByAsc(EmployJobType::getTypeOrder) + .page(page); - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employJobTypeService - .lambdaQuery() - .page(page); - - return Result.OK("工种列表", pageList); + return Result.OK("工种列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("工种列表查询失败"); + } } //获取工作性质带分页 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ContractServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ContractServiceImpl.java index a9ac906..4a01912 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ContractServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ContractServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.apiService.impl; import com.aliyuncs.utils.IOUtils; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang.StringUtils; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageContentStream; @@ -22,6 +23,7 @@ import org.jeecg.modules.employContract.service.IEmployContractService; import org.jeecg.modules.employContractTemplate.entity.EmployContractTemplate; import org.jeecg.modules.employContractTemplate.service.IEmployContractTemplateService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -75,46 +77,52 @@ public class ContractServiceImpl implements ContractService { if("0".equals(role)){ //用户为个人 query.eq(EmployContract::getEmployeeId, hanHaiMember.getId()); - //签署状态: 0查询全部、1待我签署、2他人签署、3签约完成 - switch (status){ - case "0": - //查询全部 - break; - case "1": - //未签署 - employContract.setEmployeeStatus(0); - break; - case "2": - //他人未签署 - employContract.setBossStatus(0); - break; - case "3": - //签署完成 - employContract.setEmployeeStatus(1); - employContract.setBossStatus(1); - break; + if(StringUtils.isNotEmpty(status)){ + //签署状态: 0查询全部、1待我签署、2他人签署、3签约完成 + switch (status){ + case "0": + //查询全部 + break; + case "1": + //未签署 + employContract.setEmployeeStatus(0); + break; + case "2": + //他人未签署 + employContract.setBossStatus(0); + break; + case "3": + //签署完成 + employContract.setEmployeeStatus(1); + employContract.setBossStatus(1); + break; + } } + + }else if("1".equals(role)){ //用户为企业 query.eq(EmployContract::getBossId, hanHaiMember.getId()); - //签署状态: 0查询全部、1待我签署、2他人签署、3签约完成 - switch (status){ - case "0": - //查询全部 - break; - case "1": - //未签署 - employContract.setBossStatus(0); - break; - case "2": - //他人未签署 - employContract.setEmployeeStatus(0); - break; - case "3": - //签署完成 - employContract.setBossStatus(1); - employContract.setEmployeeStatus(1); - break; + if(StringUtils.isNotEmpty(status)){ + //签署状态: 0查询全部、1待我签署、2他人签署、3签约完成 + switch (status){ + case "0": + //查询全部 + break; + case "1": + //未签署 + employContract.setBossStatus(0); + break; + case "2": + //他人未签署 + employContract.setEmployeeStatus(0); + break; + case "3": + //签署完成 + employContract.setBossStatus(1); + employContract.setEmployeeStatus(1); + break; + } } }else { return Result.error("角色类型输入错误，电子合同列表查询失败");