财务工时管理功能

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/controller/CwManHourManagementController.java

@@ -0,0 +1,96 @@
+package com.jeeplus.test.cw.projectRecords.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.aop.logging.annotation.ApiLog;
+import com.jeeplus.sys.constant.enums.LogTypeEnum;
+import com.jeeplus.test.cw.projectRecords.service.CwManHourManagementService;
+import com.jeeplus.test.cw.projectRecords.service.dto.CwManHourManagementDTO;
+import io.swagger.annotations.Api;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+/**
+ * @author: 徐滕
+ * @version: 2022-12-06 16:28
+ */
+@RestController
+@Api("财务项目工时管理信息")
+@RequestMapping(value = "/manHourManagement")
+public class CwManHourManagementController {
+
+    @Resource
+    private CwManHourManagementService cwManHourManagementService;
+
+    /**
+     * 查询财务项目信息列表
+     * @param cwManHourManagementDTO
+     * @param page
+     * @return
+     */
+    @ApiLog("查询财务项目工时管理列表")
+    @PreAuthorize("hasAuthority('manHourManagement:list')")
+    @GetMapping("list")
+    public ResponseEntity<IPage<CwManHourManagementDTO>> data(CwManHourManagementDTO cwManHourManagementDTO, Page<CwManHourManagementDTO> page) throws Exception {
+        IPage<CwManHourManagementDTO> result = new Page<CwManHourManagementDTO>();
+        result = cwManHourManagementService.findList (page,cwManHourManagementDTO);
+        return ResponseEntity.ok (result);
+    }
+
+    /**
+     * 查询财务项目详情
+     * @param id
+     * @return
+     */
+    @ApiLog("查询财务项目工时管理详情")
+    @PreAuthorize ("hasAnyAuthority('manHourManagement:view','manHourManagement:add','manHourManagement:edit')")
+    @GetMapping("queryById")
+    public ResponseEntity queryById(@RequestParam("id") String id) {
+        CwManHourManagementDTO cwManHourManagementDTO = cwManHourManagementService.queryById ( id );
+        return ResponseEntity.ok (cwManHourManagementDTO);
+    }
+
+    /**
+     * 保存财务项目信息
+     * @param cwManHourManagementDTO
+     * @return
+     */
+    @ApiLog(value = "修改/新增财务项目工时管理信息", type = LogTypeEnum.SAVE)
+    @PreAuthorize("hasAnyAuthority('manHourManagement:add','manHourManagement:edit')")
+    @PostMapping("save")
+    public ResponseEntity save(@Valid @RequestBody CwManHourManagementDTO cwManHourManagementDTO) throws Exception {
+        cwManHourManagementService.save(cwManHourManagementDTO);
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 更改状态
+     * @param id
+     * @return
+     */
+    @ApiLog("查询财务项目工时管理详情")
+    @PreAuthorize ("hasAnyAuthority('manHourManagement:add','manHourManagement:edit')")
+    @GetMapping("updateStatus")
+    public ResponseEntity updateStatus(@RequestParam("id") String id) {
+        cwManHourManagementService.updateStatus ( id );
+        return ResponseEntity.ok ("确认工时成功");
+    }
+
+    /**
+     * 删除财务项目信息
+     * @param ids
+     * @return
+     */
+    @ApiLog(value = "删除财务项目工时管理信息", type = LogTypeEnum.SAVE)
+    @PreAuthorize ("hasAuthority('manHourManagement:del')")
+    @DeleteMapping("delete")
+    public ResponseEntity delete(String ids) {
+        return cwManHourManagementService.deleteByIds(ids);
+    }
+
+}
+

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/domain/CwManHourManagement.java

@@ -0,0 +1,26 @@
+package com.jeeplus.test.cw.projectRecords.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 财务工时管理表
+ * @author: 徐滕
+ * @version: 2022-12-06 16:34
+ */
+@Data
+@TableName("cw_man_hour_management")
+public class CwManHourManagement extends BaseEntity {
+
+    private String projectId;   //项目id
+    private Date planStartDate; //计划开始时间
+    private Date planEndDate;   //计划结束时间
+    private String status;  //工时确认状态
+
+    private String projectName; //项目名称
+    private String projectNumber;   //项目编号
+    private String projectMasterId; //项目经理
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/mapper/CwManHourManagementMapper.java

@@ -0,0 +1,48 @@
+package com.jeeplus.test.cw.projectRecords.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.test.cw.projectRecords.domain.CwManHourManagement;
+import com.jeeplus.test.cw.projectRecords.service.dto.CwManHourManagementDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 财务项目登记mapper
+ * @author: 徐滕
+ * @version: 2022-11-10 14:56
+ */
+@Mapper
+public interface CwManHourManagementMapper extends BaseMapper<CwManHourManagement> {
+    /**
+     * 查询项目数据集合
+     * @param page
+     * @param queryWrapper
+     * @return
+     */
+    IPage<CwManHourManagementDTO> findList(Page<CwManHourManagementDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwManHourManagement> queryWrapper);
+
+    /**
+     * 根据id查询项目详情
+     * @param id
+     * @return
+     */
+    CwManHourManagementDTO queryById(@Param("id") String id);
+
+    /**
+     * 逻辑删除数据信息
+     * @param id
+     */
+    void delete(@Param("id") String id);
+
+    /**
+     * 更改状态
+     * @param id
+     */
+    void updateStatus(@Param("id") String id);
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/mapper/xml/CwManHourManagementMapper.xml

@@ -0,0 +1,58 @@
+<?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.jeeplus.test.cw.projectRecords.mapper.CwManHourManagementMapper">
+
+    <select id="findList" resultType="com.jeeplus.test.cw.projectRecords.service.dto.CwManHourManagementDTO">
+        select
+        p.id as "projectId",
+        p.project_name as "projectName",
+        p.project_number as "projectNumber",
+        psu.name as "projectMasterName",
+        a.id as "id",
+        a.create_by as "createBy.id",
+        su.name as "createBy.name",
+        a.create_date as "createDate",
+        a.plan_start_date as "planStartDate",
+        a.plan_end_date as "planEndDate",
+        a.status as "status"
+        from cw_man_hour_management a
+        left join cw_project_records p on a.project_id = p.id
+        left join sys_user psu on psu.id = p.project_master_id
+        left join sys_user su on a.create_by = su.id
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="queryById" resultType="com.jeeplus.test.cw.projectRecords.service.dto.CwManHourManagementDTO">
+        select
+        p.id as "projectId",
+        p.project_name as "projectName",
+        p.project_number as "projectNumber",
+        psu.name as "projectMasterName",
+        a.id as "id",
+        a.create_by as "createBy.id",
+        su.name as "createBy.name",
+        a.create_date as "createDate",
+        a.plan_start_date as "planStartDate",
+        a.plan_end_date as "planEndDate",
+        a.status as "status"
+        from cw_man_hour_management a
+        left join cw_project_records p on a.project_id = p.id
+        left join sys_user psu on psu.id = p.project_master_id
+        left join sys_user su on a.create_by = su.id
+        where a.del_flag = '0' and a.id = ${id}
+    </select>
+
+    <update id="delete">
+        update cw_man_hour_management
+        set del_flag = 0
+        where id = #{id}
+    </update>
+
+    <update id="updateStatus">
+        update cw_man_hour_management
+        set status = 1
+        where id = #{id}
+    </update>
+</mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/CwManHourManagementService.java

@@ -0,0 +1,208 @@
+package com.jeeplus.test.cw.projectRecords.service;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.google.common.collect.Lists;
+import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.sys.domain.User;
+import com.jeeplus.sys.mapper.UserMapper;
+import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.sys.utils.UserUtils;
+import com.jeeplus.test.cw.projectRecords.domain.CwManHourManagement;
+import com.jeeplus.test.cw.projectRecords.mapper.CwManHourManagementMapper;
+import com.jeeplus.test.cw.projectRecords.service.dto.CwManHourManagementDTO;
+import com.jeeplus.test.cw.projectRecords.service.mapstruct.CwManHourManagementWrapper;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 财务项目登记service
+ * @author: 徐滕
+ * @version: 2022-11-10 14:56
+ */
+@Service
+@Transactional
+public class CwManHourManagementService extends ServiceImpl<CwManHourManagementMapper, CwManHourManagement> {
+
+    @Resource
+    private CwManHourManagementMapper cwManHourManagementMapper;
+    @Resource
+    private UserMapper userMapper;
+
+    /**
+     * 差选项目列表信息
+     * @param page
+     * @param cwManHourManagementDTO
+     * @return
+     * @throws Exception
+     */
+    public IPage<CwManHourManagementDTO> findList(Page<CwManHourManagementDTO> page, CwManHourManagementDTO cwManHourManagementDTO) throws Exception{
+        QueryWrapper<CwManHourManagement> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( CwManHourManagementWrapper.INSTANCE.toEntity(cwManHourManagementDTO), CwManHourManagement.class );
+        queryWrapper.eq("a.del_flag","0");
+        queryWrapper.orderByDesc("a.create_date");
+        if (ObjectUtil.isNotEmpty(cwManHourManagementDTO)) {
+            if (ArrayUtil.isNotEmpty(cwManHourManagementDTO.getCreateDates())) {
+                queryWrapper.between("a.create_date", cwManHourManagementDTO.getCreateDates()[0], cwManHourManagementDTO.getCreateDates()[1]);
+            }
+            if (StringUtils.isNotBlank(cwManHourManagementDTO.getProjectMasterName())) {
+                List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwManHourManagementDTO.getProjectMasterName()));
+                List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
+                if (CollectionUtil.isNotEmpty(ids)) {
+                    queryWrapper.in("a.project_master_id", ids);
+                } else {
+                    return new Page<>();
+                }
+            }
+            if (StringUtils.isNotBlank(cwManHourManagementDTO.getCreateId())){
+                queryWrapper.eq("a.create_by", cwManHourManagementDTO.getCreateId());
+            }
+        }
+        if(StringUtils.isNotBlank(cwManHourManagementDTO.getProjectName())){
+            queryWrapper.like("p.project_name", cwManHourManagementDTO.getProjectName());
+        }
+        IPage<CwManHourManagementDTO> list = cwManHourManagementMapper.findList(page, queryWrapper);
+        List<CwManHourManagementDTO> records = list.getRecords();
+        for (CwManHourManagementDTO info:records) {
+            if("0".equals(info.getStatus())){
+                info.setStatusStr("未确认");
+            }else if("1".equals(info.getStatus())){
+                info.setStatusStr("已确认");
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 根据id查询项目详情
+     * @param id
+     * @return
+     */
+    public CwManHourManagementDTO queryById(String id) {
+        CwManHourManagementDTO cwManHourManagementDTO = cwManHourManagementMapper.queryById(id);
+        if (ObjectUtil.isNotEmpty(cwManHourManagementDTO)) {
+            if (ObjectUtil.isNotEmpty(cwManHourManagementDTO.getPlanStartDate()) && ObjectUtil.isNotEmpty(cwManHourManagementDTO.getPlanEndDate())) {
+                Date[] planDate = new Date[2];
+                planDate[0] = cwManHourManagementDTO.getPlanStartDate();
+                planDate[1] = cwManHourManagementDTO.getPlanEndDate();
+                cwManHourManagementDTO.setPlanDate(planDate);
+            }
+        }
+        return cwManHourManagementDTO;
+    }
+
+    /**
+     * 保存项目以及其他相关信息
+     * @param cwManHourManagementDTO
+     * @return
+     * @throws Exception
+     */
+    public String saveForm(CwManHourManagementDTO cwManHourManagementDTO) throws Exception{
+        if(StringUtils.isBlank(cwManHourManagementDTO.getId())){
+            //获取当前登录人信息
+            UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        }
+        CwManHourManagement cwManHourManagement = CwManHourManagementWrapper.INSTANCE.toEntity(cwManHourManagementDTO);
+        if (ObjectUtil.isNotEmpty(cwManHourManagement)) {
+            if (StringUtils.isBlank(cwManHourManagement.getCreateBy())) {
+                cwManHourManagement.setCreateBy(UserUtils.getCurrentUserDTO().getId());
+            }
+        }
+        if(StringUtils.isNotBlank(cwManHourManagementDTO.getProjectId())){
+            cwManHourManagement.setProjectId(cwManHourManagementDTO.getProjectId());
+        }
+        if(cwManHourManagementDTO.getPlanDate().length>1){
+            cwManHourManagement.setPlanStartDate(cwManHourManagementDTO.getPlanDate()[0]);
+            cwManHourManagement.setPlanEndDate(cwManHourManagementDTO.getPlanDate()[1]);
+        }
+        this.saveOrUpdate(cwManHourManagement);
+        return cwManHourManagement.getId();
+    }
+
+    /**
+     * 保存项目信息
+     * @param cwManHourManagementDTO
+     * @return
+     * @throws Exception
+     */
+    public ResponseEntity save(CwManHourManagementDTO cwManHourManagementDTO) throws Exception{
+        this.saveForm(cwManHourManagementDTO);
+        return ResponseEntity.ok("保存成功");
+    }
+
+    /**
+     * 保存项目信息
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    public ResponseEntity updateStatus(String id){
+        cwManHourManagementMapper.updateStatus(id);
+        return ResponseEntity.ok("保存成功");
+    }
+
+    /**
+     * 根据id删除项目信息
+     * @param ids
+     * @return
+     */
+    public ResponseEntity deleteByIds(String ids) {
+        String idArray[] =ids.split(",");
+        this.removeByIds (Lists.newArrayList (idArray));
+        return ResponseEntity.ok ("删除成功");
+    }
+
+    /**
+     * 根据客户id获取关联的项目信息
+     * @param clientId
+     * @return
+     */
+    /*public List<CwManHourManagementDTO> getByClientId(String clientId,CwManHourManagementDTO cwManHourManagementDTO) throws Exception {
+        if(StringUtils.isNotBlank(clientId)){
+            List<String> projectIdByClientId = cwManHourManagementMapper.getProjectIdByClientId(clientId);
+            List<String> projectList = projectIdByClientId.stream().distinct().collect(Collectors.toList());
+            if (CollectionUtil.isNotEmpty(projectList)) {
+                QueryWrapper<CwManHourManagement> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( CwManHourManagementWrapper.INSTANCE.toEntity(cwManHourManagementDTO), CwManHourManagement.class );
+                queryWrapper.in("a.id", projectList);
+                queryWrapper.eq("a.del_flag","0");
+                queryWrapper.eq("a.status","5");
+                queryWrapper.orderByDesc("a.create_date");
+                return cwManHourManagementMapper.getProjectByIdList(queryWrapper);
+            } else {
+                return new ArrayList<>();
+            }
+        } else {
+            return new ArrayList<>();
+        }
+    }*/
+
+    /**
+     * 根据合同id获取关联的项目信息
+     * @param contractId
+     * @return
+     */
+    /*public List<CwManHourManagementDTO> getByContractId(String contractId,CwManHourManagementDTO cwManHourManagementDTO) throws Exception{
+        if (StringUtils.isNotBlank(contractId)) {
+            QueryWrapper<CwManHourManagement> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( CwManHourManagementWrapper.INSTANCE.toEntity(cwManHourManagementDTO), CwManHourManagement.class );
+            queryWrapper.eq("a.contract_id", contractId);
+            queryWrapper.eq("a.del_flag","0");
+            queryWrapper.eq("a.status","5");
+            queryWrapper.orderByDesc("a.create_date");
+            return cwManHourManagementMapper.getByContractId(queryWrapper);
+        }
+        return new ArrayList<>();
+    }*/
+
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/dto/CwManHourManagementDTO.java

@@ -0,0 +1,36 @@
+package com.jeeplus.test.cw.projectRecords.service.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jeeplus.core.service.dto.BaseDTO;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author: 徐滕
+ * @version: 2022-12-06 16:38
+ */
+@Data
+public class CwManHourManagementDTO extends BaseDTO {
+
+    private String projectId;   //项目id
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date planStartDate; //计划开始时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date planEndDate;   //计划结束时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date[] planDate;    //项目预计时间
+    private String status;  //工时确认状态
+    private String statusStr;  //工时确认状态
+
+    private String projectName; //项目名称
+    private String projectNumber;   //项目编号
+    private String projectMasterId; //项目经理
+    private String projectMasterName;   //项目经理姓名
+    private String createId;   //创建人id
+    private Date[] createDates;   //时间查询
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/mapstruct/CwManHourManagementWrapper.java

@@ -0,0 +1,18 @@
+package com.jeeplus.test.cw.projectRecords.service.mapstruct;
+
+import com.jeeplus.core.mapstruct.EntityWrapper;
+import com.jeeplus.test.cw.projectRecords.domain.CwManHourManagement;
+import com.jeeplus.test.cw.projectRecords.domain.CwProjectRecords;
+import com.jeeplus.test.cw.projectRecords.service.dto.CwManHourManagementDTO;
+import com.jeeplus.test.cw.projectRecords.service.dto.CwProjectRecordsDTO;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+
+
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE, uses = {})
+public interface CwManHourManagementWrapper extends EntityWrapper<CwManHourManagementDTO, CwManHourManagement> {
+
+    CwManHourManagementWrapper INSTANCE = Mappers.getMapper(CwManHourManagementWrapper.class);
+
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/controller/CwProjectReportSignatureCallBackController.java

@@ -309,19 +309,25 @@ public class CwProjectReportSignatureCallBackController {
                     workattachment.setId(id);
                     workattachment.setCreateDate(new Date());
                     workattachment.setUpdateDate(new Date());
-                    ossServiceMapper.insert(workattachment);
-
-                    //将附件信息添加到签章附件信息表中
-                    CwProjectReportFile cwProjectReportFile = new CwProjectReportFile();
-                    cwProjectReportFile.setDelFlag(0);
-                    cwProjectReportFile.setId(UUID.randomUUID().toString().replace("-", ""));
-                    cwProjectReportFile.setCreateBy(UserUtils.getByLoginName("admin").getId());
-                    cwProjectReportFile.setUpdateBy(UserUtils.getByLoginName("admin").getId());
-                    cwProjectReportFile.setCreateDate(new Date());
-                    cwProjectReportFile.setUpdateDate(new Date());
-                    cwProjectReportFile.setReportFileId(id);
-                    cwProjectReportFile.setFileAffiliation("1");
-                    cwProjectReportService.insertProjectReportFile(cwProjectReportFile);
+                    //先查询数据库中是否已经对数据进行保存
+                    //若未保存，则进行保存，否则直接跳过
+                    List<WorkAttachment> byAttachmentIdAndUrl = ossServiceMapper.getByAttachmentIdAndUrl(workattachment);
+                    if(byAttachmentIdAndUrl.size() == 0){
+                        ossServiceMapper.insert(workattachment);
+
+                        //将附件信息添加到签章附件信息表中
+                        CwProjectReportFile cwProjectReportFile = new CwProjectReportFile();
+                        cwProjectReportFile.setDelFlag(0);
+                        cwProjectReportFile.setId(UUID.randomUUID().toString().replace("-", ""));
+                        cwProjectReportFile.setCreateBy(UserUtils.getByLoginName("admin").getId());
+                        cwProjectReportFile.setUpdateBy(UserUtils.getByLoginName("admin").getId());
+                        cwProjectReportFile.setCreateDate(new Date());
+                        cwProjectReportFile.setUpdateDate(new Date());
+                        cwProjectReportFile.setReportFileId(id);
+                        cwProjectReportFile.setFileAffiliation("1");
+                        cwProjectReportService.insertProjectReportFile(cwProjectReportFile);
+                    }
+
                     //遍历该contractId对应的报告信息，将报告信息中的附件地址进行替换
 
                     //查询报告文件信息（电子章）
@@ -343,7 +349,7 @@ public class CwProjectReportSignatureCallBackController {
             }
 
             //将报告数据中的盖章状态更改为已盖章
-            cwProjectReportService.updateReportSealType(projectReportData);
+            //cwProjectReportService.updateReportSealType(projectReportData);
 
         }catch (Exception e){
             e.printStackTrace();

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/oss/mapper/OssServiceMapper.java

@@ -20,4 +20,11 @@ public interface OssServiceMapper extends BaseMapper<WorkAttachment> {
     List<WorkAttachment> findList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 
     void insertWorkAttachment (@Param("workAttachment") WorkAttachment workAttachment, @Param("userDto") UserDTO userDto);
+
+    /**
+     * 根据关联id和url查询数据信息
+     * @param workAttachment
+     * @return
+     */
+    List<WorkAttachment> getByAttachmentIdAndUrl(WorkAttachment workAttachment);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/oss/mapper/xml/OssServiceMapper.xml

@@ -73,4 +73,21 @@
             #{workAttachment.sort}
             )
     </insert>
+
+    <select id="getByAttachmentIdAndUrl" resultType="com.jeeplus.test.oss.domain.WorkAttachment">
+        SELECT a.id, a.url, a.type, a.attachment_id, a.attachment_name, a.attachment_flag,
+        a.module_type, a.attachment_type, a.file_size, a.sort, a.description,
+        a.create_date, a.create_by as "create_by.id", su.name as "createBy.name" , a.update_date, a.update_by as "updateBy.id", a.del_flag
+         FROM work_attachment a
+         left join sys_user su on su.id = a.create_by
+         <where>
+             a.del_flag = 0
+             <if test="attachmentId != null and attachmentId != ''">
+                 and a.attachment_id = #{attachmentId}
+             </if>
+             <if test="attachmentName != null and attachmentName != ''">
+                 and a.attachment_name = #{attachmentName}
+             </if>
+         </where>
+    </select>
 </mapper>