diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java index b640933e..43bb5cf6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java @@ -10,13 +10,20 @@ import com.jero.common.aspect.annotation.DictPoint; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.oConvertUtils; +import com.jero.functionalsafetycenter.entity.SafetyCenter; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; +import com.jero.functionalsafetycenter.service.SafetyCenterService; import com.jero.functionalsafetycenter.service.SafetyCenterSubitemService; import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemImport; +import com.jero.project.entity.PayWorkingGroup; +import com.jero.project.entity.PayWorkingGroupSubItem; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -27,6 +34,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; +import java.util.Objects; /** * 功能安全中心成员(pay_functional_safety_center_subitem)表控制层 @@ -44,6 +52,9 @@ public class SafetyCenterSubitemController extends JeroController publishReminderList(SafetyCenterSubitem safetyCenterSubitem, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + if (StringUtils.isBlank(safetyCenterSubitem.getProjectId())) { + return Result.error("功能安全中心id不能为空!"); + } + if(!StringUtils.isBlank(safetyCenterSubitem.getCompanyName())){ + safetyCenterSubitem.setCompanyName(oConvertUtils.replaceAllPercent(safetyCenterSubitem.getCompanyName())); + } + SafetyCenter safetyCenter = safetyCenterService.getById(safetyCenterSubitem.getProjectId()); + if(Objects.isNull(safetyCenter)){ + return Result.error("功能安全中心!"); + } + Page page = new Page<>(pageNo, pageSize); + IPage pageList = safetyCenterSubitemService.publishReminderList(page, safetyCenterSubitem); + return Result.OK(pageList); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java index c0c44cb1..c65e5444 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java @@ -60,6 +60,11 @@ public class SafetyCenterSubitem { @Dict(dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") private String contactsId; + /**企业联系人姓名*/ + @TableField(exist = false) + @ApiModelProperty(value = "企业联系人姓名") + private String contactsName; + /**企业联系人列表*/ @TableField(exist = false) @ApiModelProperty(value = "企业联系人列表") @@ -101,4 +106,18 @@ public class SafetyCenterSubitem { @TableField(value = "update_time") @ApiModelProperty(value = "更新时间") private Date updateTime; + + /**已提醒*/ + @TableField(exist = false) + @Dict(dicCode = "yn") + private Integer remind; + + /**邮件提醒*/ + @TableField(exist = false) + @Dict(dicCode = "yn") + private Integer mailRemind; + + /**会议id*/ + @TableField(exist = false) + private String meetingId; } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java index 8617b415..793853e4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; +import com.jero.project.entity.PayWorkingGroupSubItem; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,4 +17,6 @@ public interface SafetyCenterSubitemMapper extends BaseMapper pageList(Page page, @Param("safetyCenterSubitem") SafetyCenterSubitem safetyCenterSubitem); List listByParentIdAndCompanyId(@Param("parentId") String parentId, @Param("companyId") String companyId); + + IPage publishReminderList(Page page, @Param("safetyCenterSubitem") SafetyCenterSubitem safetyCenterSubitem); } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml index c02750bf..07e49ad1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml @@ -40,4 +40,32 @@ and pfscs.company_id = #{companyId} + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index 074b49b2..88628ac8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -15,6 +15,7 @@ import com.jero.functionalsafetycenter.entity.SafetyCenter; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemContactsImport; import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemImport; +import com.jero.project.entity.PayWorkingGroupSubItem; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; @@ -373,4 +374,8 @@ public class SafetyCenterSubitemService extends ServiceImpl publishReminderList(Page page, SafetyCenterSubitem safetyCenterSubitem) { + return baseMapper.publishReminderList(page,safetyCenterSubitem); + } }