@@ -4,22 +4,22 @@ package com.ningdatech.pmapi.todocenter.controller; | |||||
import javax.servlet.http.HttpServletResponse; | import javax.servlet.http.HttpServletResponse; | ||||
import javax.validation.Valid; | import javax.validation.Valid; | ||||
import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | |||||
import com.ningdatech.pmapi.todocenter.model.dto.AdjustHandleDTO; | |||||
import com.ningdatech.pmapi.todocenter.model.dto.SealInfoDTO; | |||||
import com.ningdatech.pmapi.todocenter.model.vo.ProcessProgressDetailVo; | |||||
import com.ningdatech.pmapi.todocenter.model.req.ProcessDetailReq; | |||||
import com.ningdatech.pmapi.todocenter.model.req.ToBeProcessedExportReq; | |||||
import com.wflow.workflow.bean.dto.ReqProcessHandlerDTO; | |||||
import io.swagger.annotations.ApiOperation; | |||||
import org.springframework.validation.annotation.Validated; | import org.springframework.validation.annotation.Validated; | ||||
import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.pmapi.todocenter.manage.TodoCenterManage; | import com.ningdatech.pmapi.todocenter.manage.TodoCenterManage; | ||||
import com.ningdatech.pmapi.todocenter.model.dto.AdjustHandleDTO; | |||||
import com.ningdatech.pmapi.todocenter.model.dto.SealInfoDTO; | |||||
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.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.ResToBeProcessedVO; | ||||
import com.wflow.workflow.bean.dto.ReqProcessHandlerDTO; | |||||
import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
import io.swagger.annotations.ApiOperation; | |||||
import lombok.AllArgsConstructor; | import lombok.AllArgsConstructor; | ||||
/** | /** | ||||
@@ -1,9 +1,29 @@ | |||||
package com.ningdatech.pmapi.todocenter.manage; | package com.ningdatech.pmapi.todocenter.manage; | ||||
import cn.hutool.core.bean.BeanUtil; | |||||
import cn.hutool.core.codec.Base64; | |||||
import cn.hutool.core.collection.CollUtil; | |||||
import cn.hutool.core.util.StrUtil; | |||||
import static com.ningdatech.pmapi.todocenter.constant.WorkNotice.*; | |||||
import static com.wflow.workflow.task.TriggerServiceTask.runtimeService; | |||||
import java.io.IOException; | |||||
import java.io.InputStream; | |||||
import java.math.BigDecimal; | |||||
import java.time.LocalDateTime; | |||||
import java.util.*; | |||||
import java.util.stream.Collectors; | |||||
import javax.servlet.http.HttpServletResponse; | |||||
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.history.HistoricProcessInstance; | |||||
import org.flowable.engine.runtime.ActivityInstance; | |||||
import org.springframework.beans.BeanUtils; | |||||
import org.springframework.mock.web.MockMultipartFile; | |||||
import org.springframework.stereotype.Component; | |||||
import org.springframework.transaction.annotation.Transactional; | |||||
import org.springframework.web.multipart.MultipartFile; | |||||
import com.alibaba.fastjson.JSON; | import com.alibaba.fastjson.JSON; | ||||
import com.alibaba.fastjson.JSONObject; | import com.alibaba.fastjson.JSONObject; | ||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; | import com.baomidou.mybatisplus.core.toolkit.Wrappers; | ||||
@@ -84,30 +104,12 @@ import com.wflow.workflow.bean.vo.ProcessTaskVo; | |||||
import com.wflow.workflow.enums.ProcessHandlerEnum; | import com.wflow.workflow.enums.ProcessHandlerEnum; | ||||
import com.wflow.workflow.service.ProcessInstanceService; | import com.wflow.workflow.service.ProcessInstanceService; | ||||
import com.wflow.workflow.service.ProcessTaskService; | import com.wflow.workflow.service.ProcessTaskService; | ||||
import cn.hutool.core.bean.BeanUtil; | |||||
import cn.hutool.core.codec.Base64; | |||||
import cn.hutool.core.collection.CollUtil; | |||||
import cn.hutool.core.util.StrUtil; | |||||
import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||
import lombok.extern.slf4j.Slf4j; | import lombok.extern.slf4j.Slf4j; | ||||
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.history.HistoricProcessInstance; | |||||
import org.flowable.engine.runtime.ActivityInstance; | |||||
import org.springframework.beans.BeanUtils; | |||||
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.time.LocalDateTime; | |||||
import java.util.*; | |||||
import java.util.stream.Collectors; | |||||
import static com.ningdatech.pmapi.todocenter.constant.WorkNotice.*; | |||||
import static com.wflow.workflow.task.TriggerServiceTask.runtimeService; | |||||
/** | /** | ||||
* @author ZPF | * @author ZPF | ||||
@@ -7,8 +7,6 @@ import javax.validation.constraints.NotNull; | |||||
import com.google.common.collect.Maps; | import com.google.common.collect.Maps; | ||||
import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO; | import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO; | ||||
import com.wflow.workflow.bean.process.ProcessComment; | |||||
import com.wflow.workflow.enums.ProcessHandlerEnum; | |||||
import cn.hutool.core.collection.CollUtil; | import cn.hutool.core.collection.CollUtil; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
@@ -1,11 +1,8 @@ | |||||
package com.ningdatech.pmapi.todocenter.model.po; | package com.ningdatech.pmapi.todocenter.model.po; | ||||
import com.ningdatech.pmapi.todocenter.model.vo.TodoVO; | |||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.Data; | import lombok.Data; | ||||
import java.util.List; | |||||
/** | /** | ||||
* @Classname TodoCenterStatisticsPO | * @Classname TodoCenterStatisticsPO | ||||
* @Description | * @Description | ||||
@@ -1,8 +1,8 @@ | |||||
package com.ningdatech.pmapi.todocenter.model.vo; | package com.ningdatech.pmapi.todocenter.model.vo; | ||||
import com.wflow.workflow.bean.dto.ProcessInstanceUserDto; | |||||
import com.wflow.workflow.bean.vo.ProcessProgressVo; | import com.wflow.workflow.bean.vo.ProcessProgressVo; | ||||
import lombok.AllArgsConstructor; | import lombok.AllArgsConstructor; | ||||
import lombok.Builder; | import lombok.Builder; | ||||
import lombok.Data; | import lombok.Data; | ||||
@@ -1,21 +1,6 @@ | |||||
package com.ningdatech.pmapi.todocenter.utils; | package com.ningdatech.pmapi.todocenter.utils; | ||||
import cn.hutool.core.io.FileUtil; | |||||
import cn.hutool.core.io.resource.ResourceUtil; | |||||
import cn.hutool.core.util.StrUtil; | |||||
import com.itextpdf.text.DocumentException; | |||||
import com.itextpdf.text.Image; | |||||
import com.itextpdf.text.Rectangle; | |||||
import com.itextpdf.text.pdf.*; | |||||
import com.ningdatech.basic.exception.BizException; | |||||
import com.ningdatech.pmapi.common.util.StrUtils; | |||||
import lombok.extern.slf4j.Slf4j; | |||||
import org.springframework.stereotype.Component; | |||||
import org.springframework.transaction.annotation.Propagation; | |||||
import org.springframework.transaction.annotation.Transactional; | |||||
import org.xhtmlrenderer.pdf.ITextFontResolver; | |||||
import org.xhtmlrenderer.pdf.ITextRenderer; | |||||
import java.io.*; | import java.io.*; | ||||
import java.nio.charset.StandardCharsets; | import java.nio.charset.StandardCharsets; | ||||
import java.nio.file.Files; | import java.nio.file.Files; | ||||
@@ -23,6 +8,16 @@ import java.nio.file.Paths; | |||||
import java.util.Map; | import java.util.Map; | ||||
import java.util.UUID; | import java.util.UUID; | ||||
import org.springframework.stereotype.Component; | |||||
import org.xhtmlrenderer.pdf.ITextFontResolver; | |||||
import org.xhtmlrenderer.pdf.ITextRenderer; | |||||
import com.itextpdf.text.DocumentException; | |||||
import com.itextpdf.text.pdf.BaseFont; | |||||
import com.ningdatech.basic.exception.BizException; | |||||
import lombok.extern.slf4j.Slf4j; | |||||
/** | /** | ||||
* pdf生成工具类 | * pdf生成工具类 | ||||
* | * | ||||
@@ -153,6 +153,7 @@ public class UserAuthLoginManage { | |||||
userFullInfoDTO.setUserId(userInfo.getId()); | userFullInfoDTO.setUserId(userInfo.getId()); | ||||
userFullInfoDTO.setIdentifier(userInfo.getRealName()); | userFullInfoDTO.setIdentifier(userInfo.getRealName()); | ||||
userFullInfoDTO.setRealName(userInfo.getRealName()); | userFullInfoDTO.setRealName(userInfo.getRealName()); | ||||
userFullInfoDTO.setEmployeeCode(employeeCode); | |||||
userFullInfoDTO.setUsername(userInfo.getRealName()); | userFullInfoDTO.setUsername(userInfo.getRealName()); | ||||
} | } | ||||
@@ -14,7 +14,6 @@ import com.ningdatech.pmapi.organization.model.entity.DingEmployeeInfo; | |||||
import com.ningdatech.pmapi.organization.model.entity.DingOrganization; | import com.ningdatech.pmapi.organization.model.entity.DingOrganization; | ||||
import com.ningdatech.pmapi.organization.service.IDingEmployeeInfoService; | import com.ningdatech.pmapi.organization.service.IDingEmployeeInfoService; | ||||
import com.ningdatech.pmapi.organization.service.IDingOrganizationService; | import com.ningdatech.pmapi.organization.service.IDingOrganizationService; | ||||
import com.ningdatech.pmapi.sys.model.dto.RegionDTO; | |||||
import com.ningdatech.pmapi.sys.model.entity.Role; | import com.ningdatech.pmapi.sys.model.entity.Role; | ||||
import com.ningdatech.pmapi.sys.model.entity.UserRole; | import com.ningdatech.pmapi.sys.model.entity.UserRole; | ||||
import com.ningdatech.pmapi.sys.service.IRoleService; | import com.ningdatech.pmapi.sys.service.IRoleService; | ||||
@@ -40,7 +40,7 @@ public class AgentLoginUserDetailService implements UserDetailsService { | |||||
userInfoDetails.setRegionCode(userFullInfoDTO.getRegionCode()); | userInfoDetails.setRegionCode(userFullInfoDTO.getRegionCode()); | ||||
userInfoDetails.setIdentifier(userFullInfoDTO.getIdentifier()); | userInfoDetails.setIdentifier(userFullInfoDTO.getIdentifier()); | ||||
userInfoDetails.setPassword(userFullInfoDTO.getCredential()); | userInfoDetails.setPassword(userFullInfoDTO.getCredential()); | ||||
userInfoDetails.setEmployeeCode(userFullInfoDTO.getEmployeeCode()); | |||||
userInfoDetails.setOrganizationCode(userFullInfoDTO.getOrganizationCode()); | userInfoDetails.setOrganizationCode(userFullInfoDTO.getOrganizationCode()); | ||||
userInfoDetails.setOrganizationName(userFullInfoDTO.getOrganizationName()); | userInfoDetails.setOrganizationName(userFullInfoDTO.getOrganizationName()); | ||||
return userInfoDetails; | return userInfoDetails; | ||||