111
k94314517
2024-01-22 c8ad6f13c0e9cbff9a0763bc50c86576449f6e03
111
已添加1个文件
已修改3个文件
40 ■■■■■ 文件已修改
server/service/src/main/java/com/doumee/dao/business/join/SolutionsJoinMapper.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/dao/business/model/Solutions.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/dao/business/join/SolutionsJoinMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.doumee.dao.business.join;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.Solutions;
import com.github.yulichang.base.mapper.MPJJoinMapper;
/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/01/16 10:03
 */
public interface SolutionsJoinMapper extends MPJJoinMapper<Solutions> {
}
server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
@@ -148,6 +148,9 @@
    @ExcelColumn(name="基表编码(自关联)")
    private Integer baseId;
    @ApiModelProperty(value = "员工", example = "1")
    @TableField(exist = false)
    private Integer memberId;
    @ApiModelProperty(value = "工种编码集合", example = "1")
    @TableField(exist = false)
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -15,6 +15,7 @@
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Objects;
/**
 * ç†èµ”申请表Service实现
@@ -29,7 +30,24 @@
    @Override
    public Integer create(SettleClaims settleClaims) {
//        if(Objects.isNull(settleClaims)
//                || Objects.isNull()
//        ){
//
//        }
        settleClaimsMapper.insert(settleClaims);
        return settleClaims.getId();
    }
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
@@ -12,6 +12,7 @@
import com.doumee.dao.business.SolutionsMapper;
import com.doumee.dao.business.WorktypeMapper;
import com.doumee.dao.business.join.SolutionWorktypeJoinMapper;
import com.doumee.dao.business.join.SolutionsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.SolutionsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -29,6 +30,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
/**
@@ -41,6 +43,8 @@
    @Autowired
    private SolutionsMapper solutionsMapper;
    @Autowired
    private SolutionsJoinMapper solutionsJoinMapper;
    @Autowired
    private WorktypeMapper worktypeMapper;
    @Autowired
@@ -393,4 +397,6 @@
        QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions);
        return solutionsMapper.selectCount(wrapper);
    }
}