diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java new file mode 100644 index 000000000..c8c2f7328 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java @@ -0,0 +1,170 @@ +package com.jero.modules.project.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.project.entity.FeedbackHistory; +import com.jero.modules.project.service.IFeedbackHistoryService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 项目库-任务清单-反馈历史表 + * @Author: jero-boot + * @Date: 2022-05-18 + * @Version: V1.0 + */ +@Api(tags="项目库-任务清单-反馈历史表") +@RestController +@RequestMapping("/project/feedbackHistory") +@Slf4j +public class FeedbackHistoryController extends JeroController { + @Autowired + private IFeedbackHistoryService feedbackHistoryService; + + /** + * 分页列表查询 + * + * @param feedbackHistory + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "项目库-任务清单-反馈历史表-分页列表查询") + @ApiOperation(value="项目库-任务清单-反馈历史表-分页列表查询", notes="项目库-任务清单-反馈历史表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(FeedbackHistory feedbackHistory, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(feedbackHistory, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = feedbackHistoryService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "项目库-任务清单-反馈历史表-列表查询") + @ApiOperation(value="项目库-任务清单-反馈历史表-列表查询", notes="项目库-任务清单-反馈历史表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = feedbackHistoryService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param feedbackHistory + * @return + */ + @AutoLog(value = "项目库-任务清单-反馈历史表-添加") + @ApiOperation(value="项目库-任务清单-反馈历史表-添加", notes="项目库-任务清单-反馈历史表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody FeedbackHistory feedbackHistory) { + feedbackHistoryService.add(feedbackHistory); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param feedbackHistory + * @return + */ + @AutoLog(value = "项目库-任务清单-反馈历史表-编辑") + @ApiOperation(value="项目库-任务清单-反馈历史表-编辑", notes="项目库-任务清单-反馈历史表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody FeedbackHistory feedbackHistory) { + feedbackHistoryService.editById(feedbackHistory); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "项目库-任务清单-反馈历史表-通过id删除") + @ApiOperation(value="项目库-任务清单-反馈历史表-通过id删除", notes="项目库-任务清单-反馈历史表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + feedbackHistoryService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "项目库-任务清单-反馈历史表-批量删除") + @ApiOperation(value="项目库-任务清单-反馈历史表-批量删除", notes="项目库-任务清单-反馈历史表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.feedbackHistoryService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "项目库-任务清单-反馈历史表-通过id查询") + @ApiOperation(value="项目库-任务清单-反馈历史表-通过id查询", notes="项目库-任务清单-反馈历史表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + FeedbackHistory feedbackHistory = feedbackHistoryService.queryById(id); + if(feedbackHistory==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(feedbackHistory); + } + + /** + * 导出excel + * + * @param request + * @param feedbackHistory + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, FeedbackHistory feedbackHistory) { + return super.exportXls(request, feedbackHistory, FeedbackHistory.class, "项目库-任务清单-反馈历史表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, FeedbackHistory.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/FeedbackHistory.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/FeedbackHistory.java new file mode 100644 index 000000000..8392bf6ee --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/FeedbackHistory.java @@ -0,0 +1,108 @@ +package com.jero.modules.project.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 项目库-任务清单-反馈历史表 + * @Author: jero-boot + * @Date: 2022-05-18 + * @Version: V1.0 + */ +@Data +@TableName("project_task_inventory_feedback_history") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_task_inventory_feedback_history对象", description="项目库-任务清单-反馈历史表") +public class FeedbackHistory implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**工程师反馈*/ + @Excel(name = "工程师反馈", width = 15) + @ApiModelProperty(value = "工程师反馈") + private java.lang.String engineerFeedbackContent; + + /**交付物*/ + @Excel(name = "交付物", width = 15) + @ApiModelProperty(value = "交付物") + private java.lang.String fileId; + + /**工程接口人回复*/ + @Excel(name = "工程接口人回复", width = 15) + @ApiModelProperty(value = "工程接口人回复") + private java.lang.String engineeringInterfacePersonReply; + + /**流程类型*/ + @Excel(name = "流程类型", width = 15) + @ApiModelProperty(value = "流程类型") + private java.lang.String flowType; + + /**流程实例id*/ + @Excel(name = "流程实例id", width = 15) + @ApiModelProperty(value = "流程实例id") + private java.lang.String actiProcInstId; + + /**法规清单id*/ + @Excel(name = "法规清单id", width = 15) + @ApiModelProperty(value = "法规清单id") + private java.lang.String projectTaskInventoryId; + + /**工程交付要求*/ + @Excel(name = "工程交付要求", width = 15) + @ApiModelProperty(value = "工程交付要求") + private java.lang.String deliveryRequirements; + + /**反馈表id*/ + @Excel(name = "反馈表id", width = 15) + @ApiModelProperty(value = "反馈表id") + private java.lang.String feedbackId; + + /**数据状态 current：当前 history：历史 */ + @ApiModelProperty(value = "数据状态") + private java.lang.String dataStatus; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java index 96f7bfa64..ab8b5ab4b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java @@ -98,4 +98,6 @@ public class ProjectTaskInventoryFeedbackEO implements Serializable { @TableField(exist = false) private boolean isCreateUser = false; + @ApiModelProperty(value = "工程交付要求") + private String deliveryRequirements; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FeedBackHistoryDataStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FeedBackHistoryDataStatusEnum.java new file mode 100644 index 000000000..459957cb1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FeedBackHistoryDataStatusEnum.java @@ -0,0 +1,46 @@ +package com.jero.modules.project.enums; + +/** + * 反馈历史数据状态枚举类 + */ +public enum FeedBackHistoryDataStatusEnum { + + CUTTENT("当前数据","current"), + HISTORY("历史数据","history"), + ; + + + String name; + String value; + + private FeedBackHistoryDataStatusEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value) { + FeedBackHistoryDataStatusEnum[] values = values(); + for (FeedBackHistoryDataStatusEnum feedBackHistoryDataStatusEnum : values) { + if (feedBackHistoryDataStatusEnum.value.equals(value)) { + return feedBackHistoryDataStatusEnum.name; + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/FeedbackHistoryMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/FeedbackHistoryMapper.java new file mode 100644 index 000000000..907a1c3a0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/FeedbackHistoryMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.project.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.project.entity.FeedbackHistory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 项目库-任务清单-反馈历史表 + * @Author: jero-boot + * @Date: 2022-05-18 + * @Version: V1.0 + */ +public interface FeedbackHistoryMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/FeedbackHistoryMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/FeedbackHistoryMapper.xml new file mode 100644 index 000000000..8dd9a51de --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/FeedbackHistoryMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IFeedbackHistoryService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IFeedbackHistoryService.java new file mode 100644 index 000000000..fff6e380d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IFeedbackHistoryService.java @@ -0,0 +1,61 @@ +package com.jero.modules.project.service; + +import com.jero.modules.project.entity.FeedbackHistory; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 项目库-任务清单-反馈历史表 + * @Author: jero-boot + * @Date: 2022-05-18 + * @Version: V1.0 + */ +public interface IFeedbackHistoryService extends IService { + + /** + * 保存 + * + * @param feedbackHistory + * @return + */ + void add(FeedbackHistory feedbackHistory); + + /** + * 更新 + * + * @param feedbackHistory + * @return + */ + void editById(FeedbackHistory feedbackHistory); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + FeedbackHistory queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/FeedbackHistoryServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/FeedbackHistoryServiceImpl.java new file mode 100644 index 000000000..8323b7a02 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/FeedbackHistoryServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.project.service.impl; + +import com.jero.modules.project.entity.FeedbackHistory; +import com.jero.modules.project.mapper.FeedbackHistoryMapper; +import com.jero.modules.project.service.IFeedbackHistoryService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 项目库-任务清单-反馈历史表 + * @Author: jero-boot + * @Date: 2022-05-18 + * @Version: V1.0 + */ +@Service +public class FeedbackHistoryServiceImpl extends ServiceImpl implements IFeedbackHistoryService { + + /** + * 保存 + * + * @param feedbackHistory + * @return + */ + @Override + public void add(FeedbackHistory feedbackHistory) { + Date now = new Date(); + feedbackHistory.setCreateTime(now); + feedbackHistory.setUpdateTime(now); + save(feedbackHistory); + } + + /** + * 更新 + * + * @param feedbackHistory + * @return + */ + @Override + public void editById(FeedbackHistory feedbackHistory) { + Date now = new Date(); + feedbackHistory.setUpdateTime(now); + saveOrUpdate(feedbackHistory); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public FeedbackHistory queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java index 784370f50..3ff388942 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java @@ -3,16 +3,11 @@ package com.jero.modules.project.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.system.vo.LoginUser; -import com.jero.modules.project.entity.ProjectLawsInventoryEO; -import com.jero.modules.project.entity.ProjectLibraryBase; -import com.jero.modules.project.entity.ProjectNameInfoEO; -import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO; +import com.jero.modules.project.entity.*; import com.jero.modules.project.enums.MsgTypeEnum; -import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; -import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; -import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; -import com.jero.modules.project.mapper.ProjectTaskInventoryDetailEOMapper; +import com.jero.modules.project.mapper.*; import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService; +import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService; import com.jero.modules.project.util.SendMessageUtils; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; @@ -49,6 +44,9 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl projectTaskInventoryDetailEOList) { if(CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOList)){ List userIdList = new ArrayList<>(); + List createByList = new ArrayList<>(); + + List projectTaskInventoryFeedbackEOList = new ArrayList<>(); for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOList) { - userIdList.add(projectTaskInventoryDetailEO.getUserId()); + QueryWrapper sysUserQueryWrapper = new QueryWrapper<>(); + List sysUserList = sysUserService.getBaseMapper().selectList(sysUserQueryWrapper); + if(CollectionUtils.isNotEmpty(sysUserList)){ + userIdList.add(projectTaskInventoryDetailEO.getUserId()); + + ProjectTaskInventoryFeedbackEO projectTaskInventoryFeedbackEO = new ProjectTaskInventoryFeedbackEO(); + String userName = sysUserList.get(0).getUsername(); + projectTaskInventoryFeedbackEO.setActiProcInstId(projectTaskInventoryDetailEO.getActiProcInstId()); + projectTaskInventoryFeedbackEO.setCreateBy(userName); + projectTaskInventoryFeedbackEOList.add(projectTaskInventoryFeedbackEO); + + createByList.add(userName); + } } + //先删后加，确保用户只有一条反馈任务。 + QueryWrapper deleteFeedbackWrapper = new QueryWrapper<>(); + deleteFeedbackWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getActiProcInstId,projectTaskInventoryDetailEOList.get(0).getActiProcInstId()); + deleteFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getCreateBy,createByList); + projectTaskInventoryFeedbackEOService.remove(deleteFeedbackWrapper); + //给每一个dre设置一条反馈任务，让这个用户去进行编辑 + projectTaskInventoryFeedbackEOService.saveBatch(projectTaskInventoryFeedbackEOList); + //先删后加，确保一个用户只有一个任务。 QueryWrapper deleteWrapper = new QueryWrapper<>(); deleteWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,projectTaskInventoryDetailEOList.get(0).getActiProcInstId()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java index 2a1648a50..405a23da3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java @@ -2,16 +2,22 @@ package com.jero.modules.project.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.project.entity.FeedbackHistory; import com.jero.modules.project.entity.ProjectTaskInventoryFeedbackEO; +import com.jero.modules.project.enums.FeedBackHistoryDataStatusEnum; +import com.jero.modules.project.mapper.FeedbackHistoryMapper; import com.jero.modules.project.mapper.ProjectTaskInventoryFeedbackEOMapper; import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; import java.util.Map; +import java.util.UUID; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -24,6 +30,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl implements IProjectTaskInventoryFeedbackEOService { + @Autowired + private FeedbackHistoryMapper feedbackHistoryMapper; + /** * 保存 * @@ -48,7 +57,25 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl updateFeedbackHistoryDataStatusWrapper = new QueryWrapper<>(); + updateFeedbackHistoryDataStatusWrapper.lambda().eq(FeedbackHistory::getFeedbackId,projectTaskInventoryFeedbackEO.getId()); + updateFeedbackHistoryDataStatusWrapper.lambda().eq(FeedbackHistory::getDataStatus,FeedBackHistoryDataStatusEnum.CUTTENT.getValue()); + feedbackHistoryMapper.update(updateFeedbackHistory,updateFeedbackHistoryDataStatusWrapper); + + //设置历史表数据 + FeedbackHistory feedbackHistory = new FeedbackHistory(); + BeanUtils.copyProperties(projectTaskInventoryFeedbackEO, feedbackHistory); + String id = UUID.randomUUID().toString().replace("-", ""); + feedbackHistory.setId(id); + feedbackHistory.setFeedbackId(projectTaskInventoryFeedbackEO.getId()); + feedbackHistory.setDataStatus(FeedBackHistoryDataStatusEnum.CUTTENT.getValue()); + feedbackHistoryMapper.insert(feedbackHistory); + + this.baseMapper.updateById(projectTaskInventoryFeedbackEO); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/DesignComplianceNodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/DesignComplianceNodeEnum.java new file mode 100644 index 000000000..9865b861d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/DesignComplianceNodeEnum.java @@ -0,0 +1,64 @@ +package com.jero.modules.wkflow.enums; + +import com.alibaba.druid.util.StringUtils; +import com.jero.common.constant.enums.CutEnum; + +/** + * 设计符合性 节点枚举类 + */ +public enum DesignComplianceNodeEnum { + + TASK_CREATION("rwcj","任务创建","Task creation"), + INITIATE_PROCESS("fqlc","发起流程","Initiate process"), + THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK("zrrclrw","责任人处理任务","The responsible person handles the task"), + SPONSOR_REVIEW("fqrsh","发起人审核","Sponsor review"), + ; + + String key; + String cnName; + String enName; + + private DesignComplianceNodeEnum(String key, String cnName, String enName) { + this.key = key; + this.cnName = cnName; + this.enName = enName; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getCnName() { + return cnName; + } + + public void setCnName(String cnName) { + this.cnName = cnName; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public static String getTextByValue(String key,String cut) { + DesignComplianceNodeEnum[] values = values(); + for (DesignComplianceNodeEnum designComplianceNodeEnum : values) { + if (designComplianceNodeEnum.key.equals(key)) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return designComplianceNodeEnum.cnName; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + return designComplianceNodeEnum.enName; + } + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java index 6e2c6490c..dd05ac721 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java @@ -11,6 +11,7 @@ import com.jero.modules.project.enums.ReviewResultEnum; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.wkflow.entity.ProcessHistoryEO; +import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum; import com.jero.modules.wkflow.mapper.ProcessHistoryEOMapper; import com.jero.modules.wkflow.service.IProcessHistoryEOService; import org.apache.commons.collections4.CollectionUtils; @@ -148,6 +149,9 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl sysUser.getId().equals(data.getOperatorPersonId())).collect(Collectors.toList()).get(0); data.setAssignee(userInfo.getUsername()); } + if(StringUtils.isNotEmpty(data.getTaskDefinitionKey())){ + data.setTaskDefinitionKey(DesignComplianceNodeEnum.getTextByValue(data.getTaskDefinitionKey(),cut)); + } } } }