zss
16 小时以前 37d6a48e46a04b9b26bd6c423af85e2ddc9d1a7e
用印管理加一个审批人,然后对接消息通知
已修改4个文件
29 ■■■■■ 文件已修改
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.service.ISysNoticeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -15,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
@AllArgsConstructor
@@ -25,6 +27,9 @@
    @Autowired
    private SealApplicationManagementService sealApplicationManagementService;
    @Autowired
    private ISysNoticeService sysNoticeService;
    @GetMapping("/getList")
    @ApiOperation("分页查询")
    public AjaxResult listPage(Page page, SealApplicationManagement sealApplicationManagement){
@@ -34,6 +39,13 @@
    @PostMapping("/add")
    @ApiOperation("新增")
    public AjaxResult add(@RequestBody SealApplicationManagement sealApplicationManagement){
        //消息通知
        sysNoticeService.simpleNoticeByUser("用印审批",
                "申请编号:"+sealApplicationManagement.getApplicationNum()+"\n"
                +"申请标题:"+sealApplicationManagement.getTitle(),
                Arrays.asList(sealApplicationManagement.getApproveUserId()),
                sealApplicationManagement.getTenantId(),
                "/collaborativeApproval/sealManagement?applicationNum="+sealApplicationManagement.getApplicationNum());
        return AjaxResult.success(sealApplicationManagementService.save(sealApplicationManagement));
    }
src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java
@@ -8,4 +8,7 @@
    private String createUserName;
    //所属部门
    private String department;
    //审批人
    private String approveUserName;
}
src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
@@ -32,7 +32,7 @@
     * 用印类型
     */
    @ApiModelProperty("用印类型")
    @Excel(name = "用印类型", readConverterExp = "official=公章,contract=合同专用章,finance=财务专用章,legal=未知")
    @Excel(name = "用印类型", readConverterExp = "official=公章,contract=合同专用章,finance=财务专用章,legal=法人章")
    private String sealType;
    /**
     * 申请用印原因
@@ -51,6 +51,11 @@
    @ApiModelProperty("状态")
    @Excel(name = "状态", readConverterExp = "pending=待审批,approved=已通过,rejected=已拒绝")
    private String status;
    /**
     * 审批人
     */
    private Long approveUserId;
    /**
     * 创建者
     */
src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
@@ -4,12 +4,17 @@
    <select id="listPage" resultType="com.ruoyi.collaborativeApproval.dto.SealApplicationManagementDTO">
        select sam.*, su.user_name as create_user_name, d.dept_name as department
        select sam.*, su.user_name as create_user_name, d.dept_name as department,
        su1.nick_name as approveUserName
        from seal_application_management sam
        left join sys_user su on sam.create_user = su.user_id
        left join sys_user su1 on sam.approve_user_id = su1.user_id
        left join sys_user_dept sud on su.user_id = sud.user_id
        left join sys_dept d on sud.dept_id = d.dept_id
        <where>
            <if test="ew.applicationNum != null and ew.applicationNum != ''">
                and sam.application_num like concat('%',#{ew.applicationNum},'%')
            </if>
            <if test="ew.title != null and ew.title != ''">
                and sam.title like concat('%',#{ew.title},'%')
            </if>