From 710a19057eb38431e407b0f7318614c77a239022 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Thu, 30 Mar 2023 11:53:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=B9=E5=8F=98=20=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java | 1 + 1 file changed, 1 insertion(+) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java index 335f33a..a13d088 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java @@ -329,6 +329,7 @@ public class UserInfoManage { resUserDetailVO.setUserId(userInfo.getId()); resUserDetailVO.setPhoneNo(userInfo.getMobile()); resUserDetailVO.setStatus(userInfo.getAvailable()); + resUserDetailVO.setEmployeeCode(userInfo.getEmployeeCode()); // 装配用户角色信息列表 List userRoleList = iUserRoleService.list(Wrappers.lambdaQuery(UserRole.class) From f7057d9f258d62c105a53de38504d7517b299eeb Mon Sep 17 00:00:00 2001 From: WendyYang Date: Thu, 30 Mar 2023 11:56:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A1=B9=E7=9B=AEbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/meeting/manage/MeetingManage.java | 7 ++++--- .../pmapi/todocenter/manage/TodoCenterManage.java | 16 ++++------------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java index f0f0cd8..b7f8d4a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java @@ -795,10 +795,11 @@ public class MeetingManage { private void buildOptionProjectQuery(LambdaQueryWrapper query, String meetingType, ProjectStatusEnum status) { String sql = String.format("select 1 from meeting m inner join meeting_inner_project mip on" + - " m.is_inner_project = true and m.id = mip.meeting_id and m.type = %s and m.status != 3", meetingType); + " m.is_inner_project = true and m.id = mip.meeting_id and nd_project.id = mip.project_id" + + " and m.type = %s and m.status != 3", meetingType); query.eq(Project::getStatus, status.getCode()); - query.and(q1 -> q1.notExists(sql)).or(q2 -> q2.exists(sql + " inner join nd_expert_review ner " + - "on ner.meeting_id = m.id and ner.is_final = true and review_result in (2, 3)")); + query.and(q1 -> q1.notExists(sql).or(q2 -> q2.exists(sql + " inner join nd_expert_review ner " + + "on ner.meeting_id = m.id and ner.is_final = true and review_result in (2, 3)"))); } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index 678b380..3a048eb 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -23,7 +23,6 @@ import com.ningdatech.pmapi.common.helper.UserInfoHelper; import com.ningdatech.pmapi.common.model.entity.ExcelExportWriter; import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; import com.ningdatech.pmapi.common.util.ExcelDownUtil; -import com.ningdatech.pmapi.common.util.StrUtils; import com.ningdatech.pmapi.irs.sign.IRSAPIRequest; import com.ningdatech.pmapi.organization.model.entity.DingEmployeeInfo; import com.ningdatech.pmapi.organization.model.entity.DingOrganization; @@ -40,7 +39,6 @@ import com.ningdatech.pmapi.projectlib.model.entity.Project; import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication; import com.ningdatech.pmapi.projectlib.model.entity.ProjectInst; import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; -import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; import com.ningdatech.pmapi.projectlib.service.IProjectApplicationService; import com.ningdatech.pmapi.projectlib.service.IProjectInstService; import com.ningdatech.pmapi.projectlib.service.IProjectService; @@ -52,17 +50,17 @@ import com.ningdatech.pmapi.staging.service.IProjectStagingService; import com.ningdatech.pmapi.sys.model.entity.Notify; import com.ningdatech.pmapi.sys.service.INotifyService; import com.ningdatech.pmapi.todocenter.bean.entity.WorkNoticeInfo; +import com.ningdatech.pmapi.todocenter.enumeration.IsAppendProjectEnum; import com.ningdatech.pmapi.todocenter.enumeration.IsOrNotEnum; import com.ningdatech.pmapi.todocenter.model.dto.AdjustHandleDTO; import com.ningdatech.pmapi.todocenter.model.dto.PdfGenerateDTO; import com.ningdatech.pmapi.todocenter.model.dto.SealInfoDTO; import com.ningdatech.pmapi.todocenter.model.dto.SignReqDTO; import com.ningdatech.pmapi.todocenter.model.po.TodoCenterStatisticsPO; -import com.ningdatech.pmapi.todocenter.model.vo.ProcessProgressDetailVo; -import com.ningdatech.pmapi.todocenter.enumeration.IsAppendProjectEnum; import com.ningdatech.pmapi.todocenter.model.req.ProcessDetailReq; import com.ningdatech.pmapi.todocenter.model.req.ToBeProcessedExportReq; import com.ningdatech.pmapi.todocenter.model.req.ToBeProcessedReq; +import com.ningdatech.pmapi.todocenter.model.vo.ProcessProgressDetailVo; import com.ningdatech.pmapi.todocenter.model.vo.ResToBeProcessedVO; import com.ningdatech.pmapi.todocenter.model.vo.TodoCenterStatisticsVO; import com.ningdatech.pmapi.todocenter.service.StatisticsService; @@ -92,28 +90,22 @@ import org.apache.commons.io.FileUtils; import org.assertj.core.util.Lists; import org.flowable.bpmn.model.*; import org.flowable.engine.HistoryService; -import org.flowable.engine.TaskService; import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.runtime.ActivityInstance; -import org.flowable.task.api.Task; -import org.flowable.task.api.TaskQuery; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.function.Function; import java.util.stream.Collectors; + import static com.ningdatech.pmapi.todocenter.constant.WorkNotice.*; import static com.wflow.workflow.task.TriggerServiceTask.runtimeService;