用印管理修改，接口值班与计划

yaowanxin

2 天以前 5051c4082a91cbab723445dcfcea2d85770a8c97

用印管理修改，接口值班与计划

 src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.ruoyi.collaborativeApproval.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.collaborativeApproval.dto.DutyPlanDTO;
import com.ruoyi.collaborativeApproval.mapper.DutyPlanMapper;
import com.ruoyi.collaborativeApproval.pojo.DutyPlan;
import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagement;
import com.ruoyi.collaborativeApproval.service.DutyPlanService;
import com.ruoyi.common.utils.excel.ExcelUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

@RestController
@RequestMapping("/dutyPlan")
@AllArgsConstructor
public class DutyPlanController {
    @Autowired
    private DutyPlanService dutyPlanService;

    @GetMapping("/getList")
    @ApiOperation("分页查询")
    public AjaxResult listPage(Page page, DutyPlanDTO dutyPlanDTO){
        return AjaxResult.success(dutyPlanService.listPage(page, dutyPlanDTO));
    }
    @GetMapping("/getNum")
    @ApiOperation("获取等级数据")
    public AjaxResult getNum(){
        return AjaxResult.success(dutyPlanService.getNum());
    }

    @PostMapping("/add")
    @ApiOperation("新增")
    public AjaxResult add(@RequestBody DutyPlan dutyPlan){
        return AjaxResult.success(dutyPlanService.save(dutyPlan));
    }

    @PostMapping("/update")
    @ApiOperation("修改")
    public AjaxResult update(@RequestBody DutyPlan dutyPlan){
        return AjaxResult.success(dutyPlanService.updateById(dutyPlan));
    }

    @DeleteMapping("/delete")
    @ApiOperation("删除")
    public AjaxResult delete(@RequestBody List<Long> ids){
        if (CollectionUtils.isEmpty(ids)) {
            throw new RuntimeException("请传入要删除的ID");
        }
        return AjaxResult.success(dutyPlanService.removeBatchByIds(ids));
    }
    @PostMapping("/export")
    @ApiOperation("导出")
    public void exportData(HttpServletResponse response, DutyPlanDTO dutyPlanDTO){
        dutyPlanService.exportData(response, dutyPlanDTO);
    }
}

 src/main/java/com/ruoyi/collaborativeApproval/dto/DutyPlanDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.ruoyi.collaborativeApproval.dto;

import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.collaborativeApproval.pojo.DutyPlan;
import lombok.Data;

import java.time.LocalDate;
import java.util.List;

@Data
public class DutyPlanDTO extends DutyPlan {
    private List<String> tags;

    /**
     * æŸ¥è¯¢æ—¥æœŸ
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate queryDate;
}

 src/main/java/com/ruoyi/collaborativeApproval/mapper/DutyPlanMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.ruoyi.collaborativeApproval.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.collaborativeApproval.dto.DutyPlanDTO;
import com.ruoyi.collaborativeApproval.pojo.DutyPlan;
import io.lettuce.core.dynamic.annotation.Param;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;
import java.util.Map;

@Mapper
public interface DutyPlanMapper extends BaseMapper<DutyPlan> {
    IPage<DutyPlanDTO> listPage(Page page, @Param("dutyPlan") DutyPlanDTO dutyPlan);


    List<Map<String, Object>> getNum();
}

 src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,100 @@
package com.ruoyi.collaborativeApproval.pojo;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.approve.utils.ListToStringTypeHandler;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.ibatis.type.JdbcType;
import org.springframework.format.annotation.DateTimeFormat;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;

@Data
@TableName("duty_plan")
public class DutyPlan{
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    /**
     * è®¡åˆ’标题
     */
    @Excel(name = "计划标题")
    @ApiModelProperty("计划标题")
    private String title;
    /**
     * è®¡åˆ’描述
     */
    @Excel(name = "计划描述")
    @ApiModelProperty("计划描述")
    private String description;


    /**
     * è®¡åˆ’级别
     */
    @Excel(name = "计划级别")
    @ApiModelProperty("计划级别")
    private String level;
    /**
     * æ—¶é—´å‘¨æœŸ
     */
    @Excel(name = "时间周期")
    @ApiModelProperty("时间周期")
    private String period;
    /**
     * å¼€å§‹æ—¶é—´
     */
    @Excel(name = "开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate startDate;
    /**
     * ç»“束时间
     */
    @Excel(name = "结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate endDate;

    /**
     * è´Ÿè´£äºº
     */
    @Excel(name = "负责人")
    @ApiModelProperty("负责人")
    private String assignee;
    /**
     * çŠ¶æ€
     */
    @Excel(name = "状态")
    @ApiModelProperty("状态")
    private String status;
    /**
     * ä¼˜å…ˆçº§
     */
    @Excel(name = "优先级")
    @ApiModelProperty("优先级")
    private String priority;
    /**
     * å®Œæˆåº¦
     */
    @Excel(name = "完成度")
    @ApiModelProperty("完成度")
    private Integer progress;
    /**
     * æ ‡ç­¾
     */
    @Excel(name = "标签")
    @ApiModelProperty("标签")
    @TableField(value = "tags",typeHandler = ListToStringTypeHandler.class,jdbcType = JdbcType.VARCHAR)
    private List<String> tags;
    /**
     * ç§Ÿæˆ·ID
     */
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;


}

 src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java

@@ -80,6 +80,8 @@
     * åˆ›å»ºæ—¶é—´
     */
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;
    /**
     * ä¿®æ”¹äºº
@@ -90,6 +92,8 @@
     * ä¿®æ”¹æ—¶é—´
     */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;
    /**
     * ç§Ÿæˆ·ID

 src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java

@@ -1,8 +1,10 @@
package com.ruoyi.collaborativeApproval.pojo;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.time.LocalDateTime;

@@ -54,6 +56,8 @@
     * åˆ›å»ºæ—¶é—´
     */
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;
    /**
     * ç§Ÿæˆ·ID

 src/main/java/com/ruoyi/collaborativeApproval/service/DutyPlanService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.ruoyi.collaborativeApproval.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.collaborativeApproval.dto.DutyPlanDTO;
import com.ruoyi.collaborativeApproval.pojo.DutyPlan;

import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;

public interface DutyPlanService extends IService<DutyPlan> {
    IPage listPage(Page page, DutyPlanDTO dutyPlanDTO);

    List<Map<String, Object>> getNum();

    void exportData(HttpServletResponse response, DutyPlanDTO dutyPlan);
}

 src/main/java/com/ruoyi/collaborativeApproval/service/impl/DutyPlanServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
package com.ruoyi.collaborativeApproval.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.collaborativeApproval.dto.DutyPlanDTO;
import com.ruoyi.collaborativeApproval.mapper.DutyPlanMapper;
import com.ruoyi.collaborativeApproval.pojo.DutyPlan;
import com.ruoyi.collaborativeApproval.service.DutyPlanService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;

@Service
public class DutyPlanServiceImpl extends ServiceImpl<DutyPlanMapper, DutyPlan> implements DutyPlanService {
    @Autowired
    private DutyPlanMapper dutyPlanMapper;

    @Override
    public IPage listPage(Page page, DutyPlanDTO dutyPlanDTO) {
        return dutyPlanMapper.listPage(page, dutyPlanDTO);
    }

    @Override
    public List<Map<String, Object>> getNum() {

        return dutyPlanMapper.getNum();
    }

    @Override
    public void exportData(HttpServletResponse response, DutyPlanDTO dutyPlanDTO) {
        IPage<DutyPlanDTO> dutyPlans = dutyPlanMapper.listPage(new Page<>(-1, -1), dutyPlanDTO);
        List<DutyPlanDTO> records = dutyPlans.getRecords();
        ExcelUtil<DutyPlanDTO> util = new ExcelUtil<>(DutyPlanDTO.class);
        util.exportExcel(response, records, "计划导出");
    }
}

 src/main/resources/mapper/collaborativeApproval/DutyPlanMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.collaborativeApproval.mapper.DutyPlanMapper">
    <resultMap id="DutyPlanDTOMap" type="com.ruoyi.collaborativeApproval.dto.DutyPlanDTO">
        <result column="id" property="id"/>
        <result column="tags" property="tags" typeHandler="com.ruoyi.approve.utils.ListToStringTypeHandler"/>
    </resultMap>

    <select id="listPage" resultMap="DutyPlanDTOMap">
        select * from duty_plan
        <where>
        1=1
            <if test="dutyPlan.title != null and dutyPlan.title != ''">
                and title like concat('%',#{dutyPlan.title},'%')
            </if>
            <if test="dutyPlan.level != null">
                and level = #{dutyPlan.level}
            </if>
            <if test="dutyPlan.period != null">
                and period = #{dutyPlan.period}
            </if>
            <if test="dutyPlan.queryDate != null">
                and start_date &lt;= #{dutyPlan.queryDate}
                and end_date &gt;= #{dutyPlan.queryDate}
            </if>
        </where>
    </select>

    <select id="getNum" resultType="java.util.Map">
        SELECT
            level,
            COUNT(*) AS num,
            ROUND(COUNT(*) / total.count * 100) AS completion
        FROM
            duty_plan,
            (SELECT COUNT(*) AS count FROM duty_plan) AS total
        GROUP BY
            level, total.count
    </select>
</mapper>

 src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml

@@ -17,6 +17,9 @@
        from rules_regulations_management rrm
        left join sys_user su on rrm.create_user = su.user_id
        <where>
            <if test="ew.regulationNum != null and ew.regulationNum != ''">
                and rrm.regulation_num = #{ew.regulationNum}
            </if>
            <if test="ew.title != null and ew.title != ''">
                and rrm.title like concat('%',#{ew.title},'%')
            </if>