diff --git a/bonus-gateway/src/main/java/com/bonus/gateway/filter/RequestCoverFilter.java b/bonus-gateway/src/main/java/com/bonus/gateway/filter/RequestCoverFilter.java index 6a67ec3..304d21e 100644 --- a/bonus-gateway/src/main/java/com/bonus/gateway/filter/RequestCoverFilter.java +++ b/bonus-gateway/src/main/java/com/bonus/gateway/filter/RequestCoverFilter.java @@ -106,6 +106,22 @@ public class RequestCoverFilter implements GlobalFilter, Ordered { } } + }else{ + Object obj= formData.get(SystemGlobal.FORM_DATA); + if(!ObjectUtils.isEmpty(obj)){ + String data= obj.toString(); + if(StringUtils.isEmpty(data)){ + return CommonConstant.buildResponse(exchange, HttpStatus.BAD_REQUEST.value(), "请输入正确的请求参数"); + } + String[] params=data.split("&"); + for (int i = 0; i < params.length; i++) { + String[] param=params[i].split("="); + formData2.add(param[0],param[1]); + } + formData=formData2; + } + + } StringBuilder formDataBodyBuilder = new StringBuilder(); String entryKey; diff --git a/bonus-modules/bonus-exam/src/main/java/com/bonus/exam/controller/CoursewareLibraryController.java b/bonus-modules/bonus-exam/src/main/java/com/bonus/exam/controller/CoursewareLibraryController.java index e65a9f2..51bfef2 100644 --- a/bonus-modules/bonus-exam/src/main/java/com/bonus/exam/controller/CoursewareLibraryController.java +++ b/bonus-modules/bonus-exam/src/main/java/com/bonus/exam/controller/CoursewareLibraryController.java @@ -18,6 +18,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.BufferedReader; import java.io.InputStreamReader; +import java.net.URLDecoder; import java.nio.charset.StandardCharsets; import java.util.Objects; @@ -92,8 +93,9 @@ public class CoursewareLibraryController { while ((line = bufferedReader.readLine()) != null) { stringBuilder.append(line); } - String courseId = stringBuilder.toString().split("&")[0].split("=")[1]; - String fileType = stringBuilder.toString().split("&")[1].split("=")[1]; + String str=decord(stringBuilder.toString()); + String courseId = str.split("&")[0].split("=")[1]; + String fileType =str.split("&")[1].split("=")[1]; if (!StaticVariableUtils.ONE.equals(fileType)) { dto.setCoursewareId(Integer.parseInt(courseId)); } @@ -106,6 +108,16 @@ public class CoursewareLibraryController { } } + public String decord(String str){ + try{ + return URLDecoder.decode(str, StandardCharsets.UTF_8.toString()); + }catch (Exception e){ + log.error(e.toString(),e); + } + return str; + + + } /** * 课件上传 * diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/controller/BusinessController.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/controller/BusinessController.java index af13a22..dd47914 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/controller/BusinessController.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/controller/BusinessController.java @@ -10,6 +10,7 @@ import com.bonus.common.log.enums.OperaType; import com.bonus.flowable.entity.AuditTask; import com.bonus.flowable.service.BusinessService; import com.bonus.flowable.utils.FlowTaskUtils; +import com.bonus.system.api.RemoteUserService; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.annotation.Transactional; @@ -37,10 +38,14 @@ public class BusinessController { @Resource private FlowTaskUtils flowTaskUtils; + + + + @PostMapping("/submitApproval") @SysLog(title = "入场申请", businessType = OperaType.QUERY, logType = 0, module = "入场申请", details = "提交审批") public AjaxResult submitApproval(@RequestBody AuditTask auditTask) { - return businessService.submitApproval(auditTask); + return businessService.submitApproval(auditTask); } @PostMapping("/submitMulApproval") diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/CheckComment.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/CheckComment.java index 2e16051..8738418 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/CheckComment.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/CheckComment.java @@ -24,4 +24,6 @@ public class CheckComment { private String sort; private Integer agree; + private String agree; + } diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java index 202d717..26abb4c 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.flowable.service.impl; import com.bonus.common.core.domain.BaseBean; +import com.bonus.common.core.domain.MsgBean; import com.bonus.common.core.utils.StaticVariableUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; @@ -12,8 +13,10 @@ import com.bonus.flowable.entity.*; import com.bonus.flowable.mapper.BusinessMapper; import com.bonus.flowable.service.BpmnModelService; import com.bonus.flowable.service.BusinessService; +import com.bonus.system.api.RemoteUserService; import com.bonus.system.api.domain.SysUser; import com.bonus.system.api.model.LoginUser; +import liquibase.pro.packaged.M; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.annotations.Param; import org.jetbrains.annotations.Nullable; @@ -39,6 +42,9 @@ public class BusinessServiceImpl implements BusinessService { @Resource private BusinessMapper mapper; + @Resource + private RemoteUserService remoteUserService; + @Override public AjaxResult submitApproval(AuditTask auditTask) { //任务id @@ -82,7 +88,7 @@ public class BusinessServiceImpl implements BusinessService { } } - + sedPhoneMsg(); ConfigurationVo cd = null; // if("0".equals(examineId)){ String screenExamineId = getExamineIdByProAndCheckType(auditTask.getProId(), auditTask.getTaskType()); @@ -1151,4 +1157,24 @@ public class BusinessServiceImpl implements BusinessService { public void updateTaskIsPassStatus(String taskId, String isPass) { mapper.updateTaskIsPassStatus(taskId, isPass); } + + + public void sedPhoneMsg(){ + try{ + MsgBean bean=new MsgBean(); + bean.setMsg("您有新的审核数据进行审核,"); + bean.setPhone("15755022653"); + remoteUserService.setPhoneMsg(bean); + }catch (Exception e){ + log.error(e.toString(),e); + } + + + + } + + + + + } diff --git a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml index 4d94a4b..0e1c28b 100644 --- a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml +++ b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml @@ -507,6 +507,7 @@ SELECT c.ii as id, c.id AS userId, + d.agree, IFNULL( d.`comment`, '' ) AS reason, IFNULL( d.reject, '' ) AS turnDownReason, IFNULL( d.time, '' ) AS time, @@ -527,6 +528,7 @@ LEFT JOIN ( SELECT id, + b.agree, a.proc_inst_id, version, repeated_submit, diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SubController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SubController.java index f261193..9cb02cd 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SubController.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SubController.java @@ -89,7 +89,6 @@ public class SubController extends BaseController { @SysLog(title = "分包商管理", businessType = OperaType.QUERY,logType = 0,module = "分包商管理->分包商人员入场申请列表") public TableDataInfo enterPersonList(SubPerson bean) { try{ -// startPage(); List list = service.enterPersonList(bean); return getDataTable1(list); }catch (Exception e){ diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ContEntryExit.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ContEntryExit.java index 535414f..767eccc 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ContEntryExit.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ContEntryExit.java @@ -56,6 +56,7 @@ public class ContEntryExit extends BaseBean { * 审批状态 */ private String status; + private String intoStatus; /** diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java index fb82a74..b299d8c 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.project.service.impl; +import com.aspose.words.IFieldMergingCallback; import com.bonus.common.core.domain.R; import com.bonus.common.core.domain.RequestEntity; import com.bonus.common.core.utils.DateUtils; @@ -15,6 +16,7 @@ import com.bonus.project.service.ContEntryExitService; import com.bonus.project.service.FlowTaskService; import com.bonus.system.api.RemoteFileService; import com.bonus.system.api.domain.SysFile; +import com.bonus.system.api.model.LoginUser; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,6 +67,10 @@ public class ContEntryExitServiceImpl implements ContEntryExitService { */ @Override public List listCommencementApproval(ContEntryExit bean) { + LoginUser us=SecurityUtils.getLoginUser(); + if(us!=null &&us.getSysUser()!=null){ + bean.setContUuid(us.getSysUser().getParentUuid()); + } List list = ceMapper.listCommencementApproval(bean); RequestEntity entity = new RequestEntity(); entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java index 4d8f48b..85154cd 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java @@ -83,7 +83,7 @@ public class ProjectServiceImpl implements ProjectService { for (BaseBean bean : list) { //获取处理后的短信内容 String content = getMessage(bean); -// ShortMessageUtils.sendShortMessage(bean.getUuid(), content); + // ShortMessageUtils.sendShortMessage(bean.getUuid(), content); MsgBean b = new MsgBean(); b.setPhone(bean.getUuid()); b.setMsg(content); diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java index d9724f6..0578da5 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java @@ -176,9 +176,7 @@ public class SubServiceImpl implements SubService { bean.setUserList(stringList); PageUtils.startPage(); List list = mapper.enterPersonList(bean); - System.err.println("stringList="+stringList); - // RequestEntity entity = new RequestEntity(); entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 GenericProcessor processor = new GenericProcessor(); diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml index b93399d..e6137e0 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml @@ -420,12 +420,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pcp.cons_user_id as id, lcp.uuid FROM pt_cons_person pcp - LEFT JOIN lk_cont_person lcp ON lcp.pro_id = #{proId} AND lcp.cons_persion_id = pcp.cons_user_id + LEFT JOIN lk_cont_person lcp ON lcp.pro_id = #{proId} AND lcp.cons_persion_id = pcp.cons_user_id WHERE pcp.phone = #{phone} AND pcp.is_active = '1' and pcp.cons_user_id != #{consUserId} - + limit 1