diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryDetailEOController.java index ddfecd6f2..ea95231e9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryDetailEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryDetailEOController.java @@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class ProjectTaskInventoryDetailEOController extends JeroController { @Autowired private IProjectTaskInventoryDetailEOService projectTaskInventoryDetailEOService; - + /** * 分页列表查询 * @@ -167,4 +167,17 @@ public class ProjectTaskInventoryDetailEOController extends JeroController queryByActiProcInstId(@RequestParam(name="actiProcInstId",required=true) String actiProcInstId) { + return this.projectTaskInventoryDetailEOService.queryByActiProcInstId(actiProcInstId); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryFeedbackEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryFeedbackEOController.java new file mode 100644 index 000000000..fbe41f083 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryFeedbackEOController.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.ProjectTaskInventoryFeedbackEO; +import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService; +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-06 + * @Version: V1.0 + */ +@Api(tags="项目库-任务清单-意见反馈表") +@RestController +@RequestMapping("/project/projectTaskInventoryFeedbackEO") +@Slf4j +public class ProjectTaskInventoryFeedbackEOController extends JeroController { + @Autowired + private IProjectTaskInventoryFeedbackEOService projectTaskInventoryFeedbackEOService; + + /** + * 分页列表查询 + * + * @param projectTaskInventoryFeedbackEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "项目库-任务清单-意见反馈表-分页列表查询") + @ApiOperation(value="项目库-任务清单-意见反馈表-分页列表查询", notes="项目库-任务清单-意见反馈表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProjectTaskInventoryFeedbackEO projectTaskInventoryFeedbackEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectTaskInventoryFeedbackEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectTaskInventoryFeedbackEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "项目库-任务清单-意见反馈表-列表查询") + @ApiOperation(value="项目库-任务清单-意见反馈表-列表查询", notes="项目库-任务清单-意见反馈表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = projectTaskInventoryFeedbackEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param projectTaskInventoryFeedbackEO + * @return + */ + @AutoLog(value = "项目库-任务清单-意见反馈表-添加") + @ApiOperation(value="项目库-任务清单-意见反馈表-添加", notes="项目库-任务清单-意见反馈表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProjectTaskInventoryFeedbackEO projectTaskInventoryFeedbackEO) { + projectTaskInventoryFeedbackEOService.add(projectTaskInventoryFeedbackEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param projectTaskInventoryFeedbackEO + * @return + */ + @AutoLog(value = "项目库-任务清单-意见反馈表-编辑") + @ApiOperation(value="项目库-任务清单-意见反馈表-编辑", notes="项目库-任务清单-意见反馈表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProjectTaskInventoryFeedbackEO projectTaskInventoryFeedbackEO) { + projectTaskInventoryFeedbackEOService.editById(projectTaskInventoryFeedbackEO); + 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) { + projectTaskInventoryFeedbackEOService.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.projectTaskInventoryFeedbackEOService.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) { + ProjectTaskInventoryFeedbackEO projectTaskInventoryFeedbackEO = projectTaskInventoryFeedbackEOService.queryById(id); + if(projectTaskInventoryFeedbackEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectTaskInventoryFeedbackEO); + } + + /** + * 导出excel + * + * @param request + * @param projectTaskInventoryFeedbackEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProjectTaskInventoryFeedbackEO projectTaskInventoryFeedbackEO) { + return super.exportXls(request, projectTaskInventoryFeedbackEO, ProjectTaskInventoryFeedbackEO.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, ProjectTaskInventoryFeedbackEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java index 8024da376..b90ffcff3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -98,31 +99,17 @@ public class ProjectTaskInventoryDetailEO implements Serializable { /**表单数据 json*/ @Excel(name = "表单数据 json", width = 15) - private transient java.lang.String formDataString; + private String formData; - private byte[] formData; + /**前端传过来多个用户的id 用英文逗号分隔。*/ + @TableField(exist = false) + private String userIds; - public byte[] getFormData(){ - if(formDataString==null){ - return null; - } - try { - return formDataString.getBytes("UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return null; - } + /**中英文切换标识*/ + @TableField(exist = false) + private String cut; - public String getFormDataString(){ - if(formData==null || formData.length==0){ - return ""; - } - try { - return new String(formData,"UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return ""; - } + /**消息类型*/ + @TableField(exist = false) + private String msgType; } 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 new file mode 100644 index 000000000..3ae958c8f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java @@ -0,0 +1,96 @@ +package com.jero.modules.project.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import java.util.Date; + +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-06 + * @Version: V1.0 + */ +@Data +@TableName("project_task_inventory_feedback") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_task_inventory_feedback对象", description="项目库-任务清单-意见反馈表") +public class ProjectTaskInventoryFeedbackEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**工程师反馈*/ + @Excel(name = "工程师反馈", width = 15) + @ApiModelProperty(value = "工程师反馈") + private String engineerFeedbackContent; + + /**交付物*/ + @Excel(name = "交付物", width = 15) + @ApiModelProperty(value = "交付物") + private String fileId; + + /**工程接口人回复*/ + @Excel(name = "工程接口人回复", width = 15) + @ApiModelProperty(value = "工程接口人回复") + private String engineeringInterfacePersonReply; + + /**流程类型*/ + @Excel(name = "流程类型", width = 15) + @ApiModelProperty(value = "流程类型") + private String flowType; + + /**流程实例id*/ + @Excel(name = "流程实例id", width = 15) + @ApiModelProperty(value = "流程实例id") + private String actiProcInstId; + + /**法规清单id*/ + @Excel(name = "法规清单id", width = 15) + @ApiModelProperty(value = "法规清单id") + private String projectTaskInventoryId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryFeedbackEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryFeedbackEOMapper.java new file mode 100644 index 000000000..29f4d5547 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryFeedbackEOMapper.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.ProjectTaskInventoryFeedbackEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 项目库-任务清单-意见反馈表 + * @Author: jero-boot + * @Date: 2022-05-06 + * @Version: V1.0 + */ +public interface ProjectTaskInventoryFeedbackEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryFeedbackEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryFeedbackEOMapper.xml new file mode 100644 index 000000000..27c741af6 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryFeedbackEOMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryDetailEOService.java index 536a4d686..2ef603d85 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryDetailEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryDetailEOService.java @@ -1,5 +1,6 @@ package com.jero.modules.project.service; +import com.jero.common.api.vo.Result; import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -58,4 +59,11 @@ public interface IProjectTaskInventoryDetailEOService extends IService queryList(); + + /** + * 通过流程实例id查询 + * @param actiProcInstId + * @return + */ + Result queryByActiProcInstId(String actiProcInstId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java new file mode 100644 index 000000000..46a74f585 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.project.service; + +import com.jero.modules.project.entity.ProjectTaskInventoryFeedbackEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 项目库-任务清单-意见反馈表 + * @Author: jero-boot + * @Date: 2022-05-06 + * @Version: V1.0 + */ +public interface IProjectTaskInventoryFeedbackEOService extends IService { + + /** + * 保存 + * + * @param projectTaskInventoryFeedbackEO + * @return + */ + void add(ProjectTaskInventoryFeedbackEO projectTaskInventoryFeedbackEO); + + /** + * 更新 + * + * @param projectTaskInventoryFeedbackEO + * @return + */ + void editById(ProjectTaskInventoryFeedbackEO projectTaskInventoryFeedbackEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProjectTaskInventoryFeedbackEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} 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 70068691b..4aad263d9 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 @@ -1,11 +1,28 @@ 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.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.service.IProjectTaskInventoryDetailEOService; +import com.jero.modules.project.util.SendMessageUtils; +import me.zhyd.oauth.utils.StringUtils; +import org.apache.commons.collections4.CollectionUtils; +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.*; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** @@ -17,6 +34,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl implements IProjectTaskInventoryDetailEOService { + @Autowired + private ProjectLawsInventoryEOMapper projectLawsInventoryEOMapper; + + @Autowired + private ProjectLibraryBaseMapper projectLibraryBaseMapper; + + @Autowired + private ProjectNameInfoEOMapper projectNameInfoEOMapper; + + /** * 保存 * @@ -25,10 +52,30 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl list = new ArrayList<>(); + + List userIdList = Arrays.asList(projectTaskInventoryDetailEO.getUserIds().split(",")); + userIdList.forEach(userId -> { + ProjectTaskInventoryDetailEO taskInventoryDetailEO = new ProjectTaskInventoryDetailEO(); + BeanUtils.copyProperties(projectTaskInventoryDetailEO,taskInventoryDetailEO); + taskInventoryDetailEO.setUserId(userId); + list.add(taskInventoryDetailEO); + }); + + //先删后加，确保一个用户只有一个任务。 + QueryWrapper deleteWrapper = new QueryWrapper<>(); + deleteWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,projectTaskInventoryDetailEO.getActiProcInstId()); + deleteWrapper.lambda().in(ProjectTaskInventoryDetailEO::getUserId,userIdList); + this.baseMapper.delete(deleteWrapper); + + super.saveBatch(list); + + sendMessage(projectTaskInventoryDetailEO,userIdList); + } } /** @@ -86,4 +133,37 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public Result queryByActiProcInstId(String actiProcInstId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,actiProcInstId); + List projectTaskInventoryDetailEOS = this.baseMapper.selectList(queryWrapper); + return Result.OK(projectTaskInventoryDetailEOS); + } + + public void sendMessage(ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO,List userIdList){ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + String msgContentEN = ""; + + String projectTaskInventoryId = projectTaskInventoryDetailEO.getProjectTaskInventoryId(); + ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOMapper.selectOne(new QueryWrapper().lambda().eq(ProjectLawsInventoryEO::getId, projectTaskInventoryId)); + String projectLibraryId = projectLawsInventoryEO.getProjectLibraryId(); + ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(new QueryWrapper().lambda().eq(ProjectLibraryBase::getId, projectLibraryId)); + String projectNameId = projectLibraryBase.getProjectNameId(); + ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(new QueryWrapper().lambda().eq(ProjectNameInfoEO::getId, projectNameId)); + + + String id = UUID.randomUUID().toString().replace("-", ""); + //给工程师下发消息 + if(org.apache.commons.lang3.StringUtils.equals(projectTaskInventoryDetailEO.getMsgType(), MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue())){ + msgContentEN = currentUser.getUsername() + " has distributed the design compliance confirmation process of " + + projectLawsInventoryEO.getSerialNumber() + " in "+ projectNameInfoEO.getProjectName() + " (project name) in time."; + } + if(CollectionUtils.isNotEmpty(userIdList) && org.apache.commons.lang3.StringUtils.isNotEmpty(msgContentEN)){ + //发送消息 + SendMessageUtils.sendMessage(msgContentEN,userIdList,id); + } + } } 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 new file mode 100644 index 000000000..5a6a9db17 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.project.service.impl; + +import com.jero.modules.project.entity.ProjectTaskInventoryFeedbackEO; +import com.jero.modules.project.mapper.ProjectTaskInventoryFeedbackEOMapper; +import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService; +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-06 + * @Version: V1.0 + */ +@Service +public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl implements IProjectTaskInventoryFeedbackEOService { + + /** + * 保存 + * + * @param projectTaskInventoryFeedbackEO + * @return + */ + @Override + public void add(ProjectTaskInventoryFeedbackEO projectTaskInventoryFeedbackEO) { + Date now = new Date(); + projectTaskInventoryFeedbackEO.setCreateTime(now); + projectTaskInventoryFeedbackEO.setUpdateTime(now); + save(projectTaskInventoryFeedbackEO); + } + + /** + * 更新 + * + * @param projectTaskInventoryFeedbackEO + * @return + */ + @Override + public void editById(ProjectTaskInventoryFeedbackEO projectTaskInventoryFeedbackEO) { + Date now = new Date(); + projectTaskInventoryFeedbackEO.setUpdateTime(now); + saveOrUpdate(projectTaskInventoryFeedbackEO); + } + + /** + * 通过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 ProjectTaskInventoryFeedbackEO 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/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java index f3a9860d3..62632ab39 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java @@ -10,6 +10,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import net.sf.json.JSONObject; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -38,10 +39,19 @@ public class workFlowController { public Result startProcess(@RequestBody JSONObject jsonObject){ String type = jsonObject.getString("type"); LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if(type.equals("1")){ + jsonObject.put("loginUserId", currentUser.getId()); + jsonObject.put("loginUserName", currentUser.getUsername()); + if(StringUtils.equals(type,FlowTypeEnum.RWQRLC.getValue())){ jsonObject.put("id", FlowTypeEnum.RWQRLC.getProcessDefinitionKey()); //流程定义id - jsonObject.put("loginUserId", currentUser.getId()); - jsonObject.put("loginUserName", currentUser.getUsername()); + return this.activiti_define_start(jsonObject); + }else if(StringUtils.equals(type,FlowTypeEnum.SJFHXSHLC.getValue())){ + jsonObject.put("id", FlowTypeEnum.SJFHXSHLC.getProcessDefinitionKey()); + return this.activiti_define_start(jsonObject); + }else if(StringUtils.equals(type,FlowTypeEnum.PREHOMOQRLC.getValue())){ + jsonObject.put("id", FlowTypeEnum.PREHOMOQRLC.getProcessDefinitionKey()); + return this.activiti_define_start(jsonObject); + }else if(StringUtils.equals(type,FlowTypeEnum.YZFHXSCLC.getValue())){ + jsonObject.put("id", FlowTypeEnum.YZFHXSCLC.getProcessDefinitionKey()); return this.activiti_define_start(jsonObject); }else{ return null;