工作组变更
This commit is contained in:
@@ -91,4 +91,13 @@ public class PayProjectCommon {
|
||||
* 是
|
||||
*/
|
||||
public static final Integer YES = 1;
|
||||
|
||||
/**
|
||||
* 项目类型1:工作组,2:分标委
|
||||
*/
|
||||
public final static Integer PROJECT_TYPE_FILE1 = 1;
|
||||
/**
|
||||
* 项目类型1:工作组,2:分标委
|
||||
*/
|
||||
public final static Integer PROJECT_TYPE_FILE2 = 2;
|
||||
}
|
||||
|
||||
+27
-12
@@ -14,6 +14,7 @@ import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.util.ValidUtil;
|
||||
import com.jero.common.util.oConvertUtils;
|
||||
import com.jero.project.common.PayProjectCommon;
|
||||
import com.jero.project.entity.PayWorkingGroupDataFile;
|
||||
import com.jero.project.service.IPayWorkingGroupDataFileService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -61,9 +62,13 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
if(StringUtils.isBlank(payWorkingGroupDataFile.getWorkingGroupId())){
|
||||
if(StringUtils.isBlank(payWorkingGroupDataFile.getProjectId())){
|
||||
return Result.error("工作组id不能为空!");
|
||||
}
|
||||
if(payWorkingGroupDataFile.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE1
|
||||
&& payWorkingGroupDataFile.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE2){
|
||||
return Result.error("项目状态不正确!");
|
||||
}
|
||||
Page<PayWorkingGroupDataFile> page = new Page<PayWorkingGroupDataFile>(pageNo, pageSize);
|
||||
IPage<PayWorkingGroupDataFile> pageList = payWorkingGroupDataFileService.queryPageList(page, payWorkingGroupDataFile);
|
||||
return Result.OK(pageList);
|
||||
@@ -79,8 +84,12 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
|
||||
@ApiOperation(value="资料维护-上传", notes="资料维护-上传")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@RequestBody PayWorkingGroupDataFile payWorkingGroupDataFile) {
|
||||
if(StringUtils.isBlank(payWorkingGroupDataFile.getWorkingGroupId())){
|
||||
return Result.error("工作组id不能为空!");
|
||||
if(StringUtils.isBlank(payWorkingGroupDataFile.getProjectId())){
|
||||
return Result.error("项目id不能为空!");
|
||||
}
|
||||
if(payWorkingGroupDataFile.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE1
|
||||
&& payWorkingGroupDataFile.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE2){
|
||||
return Result.error("项目状态不正确!");
|
||||
}
|
||||
if(StringUtils.isBlank(payWorkingGroupDataFile.getFileIds())){
|
||||
return Result.error("文件不能为空!");
|
||||
@@ -92,7 +101,8 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
|
||||
return Result.error("id不能为空!");
|
||||
}
|
||||
PayWorkingGroupDataFile payWorkingGroupDataFileNew = new PayWorkingGroupDataFile();
|
||||
payWorkingGroupDataFileNew.setWorkingGroupId(payWorkingGroupDataFile.getWorkingGroupId());
|
||||
payWorkingGroupDataFileNew.setProjectId(payWorkingGroupDataFile.getProjectId());
|
||||
payWorkingGroupDataFileNew.setProjectType(payWorkingGroupDataFile.getProjectType());
|
||||
payWorkingGroupDataFileNew.setFileId(s1);
|
||||
list.add(payWorkingGroupDataFileNew);
|
||||
}
|
||||
@@ -108,9 +118,9 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
|
||||
* @param payWorkingGroupDataFile
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "资料维护-编辑")
|
||||
// @AutoLog(value = "资料维护-编辑")
|
||||
// @ApiOperation(value="资料维护-编辑", notes="资料维护-编辑")
|
||||
@PostMapping(value = "/edit")
|
||||
// @PostMapping(value = "/edit")
|
||||
public Result<?> edit(@RequestBody PayWorkingGroupDataFile payWorkingGroupDataFile) {
|
||||
StringBuilder msg = ValidUtil.validateAll(payWorkingGroupDataFile);
|
||||
if(!StringUtils.isBlank(msg)){
|
||||
@@ -166,9 +176,9 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "资料维护-通过id查询")
|
||||
@ApiOperation(value="资料维护-通过id查询", notes="资料维护-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
// @AutoLog(value = "资料维护-通过id查询")
|
||||
// @ApiOperation(value="资料维护-通过id查询", notes="资料维护-通过id查询")
|
||||
// @GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id") String id) {
|
||||
PayWorkingGroupDataFile payWorkingGroupDataFile = payWorkingGroupDataFileService.getById(id);
|
||||
if(payWorkingGroupDataFile==null) {
|
||||
@@ -187,10 +197,15 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
|
||||
@ApiOperation(value="资料维护-导出excel", notes="资料维护-导出excel")
|
||||
@GetMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, PayWorkingGroupDataFile payWorkingGroupDataFile) {
|
||||
// 过滤选中数据
|
||||
String workingGroupId = request.getParameter("workingGroupId");
|
||||
if(StringUtils.isBlank(payWorkingGroupDataFile.getProjectId())){
|
||||
throw new JeroBootException("项目id不能为空!");
|
||||
}
|
||||
if(payWorkingGroupDataFile.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE1
|
||||
&& payWorkingGroupDataFile.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE2){
|
||||
throw new JeroBootException("项目状态不正确!");
|
||||
}
|
||||
// Step.2 获取导出数据
|
||||
List<PayWorkingGroupDataFile> pageList = payWorkingGroupDataFileService.queryList(payWorkingGroupDataFile.getWorkingGroupId());
|
||||
List<PayWorkingGroupDataFile> pageList = payWorkingGroupDataFileService.queryList(payWorkingGroupDataFile.getProjectId(),payWorkingGroupDataFile.getProjectType());
|
||||
List<PayWorkingGroupDataFile> exportList = null;
|
||||
|
||||
// 过滤选中数据
|
||||
|
||||
+80
-5
@@ -1,20 +1,32 @@
|
||||
package com.jero.project.controller;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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.jero.common.api.vo.Result;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.company.entity.PayContactsManagement;
|
||||
import com.jero.data.entity.PayCaseCommitteeSubitem;
|
||||
import com.jero.data.service.IPayCaseCommitteeSubitemService;
|
||||
import com.jero.modules.message.handle.impl.EmailSendMsgHandle;
|
||||
import com.jero.project.common.PayProjectCommon;
|
||||
import com.jero.project.entity.PayWorkingGroupDistributionRecord;
|
||||
import com.jero.project.entity.PayWorkingGroupSubItem;
|
||||
import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
|
||||
import com.jero.project.service.IPayWorkingGroupSubItemService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
@@ -34,6 +46,10 @@ import io.swagger.annotations.ApiOperation;
|
||||
public class PayWorkingGroupDistributionRecordController extends JeroController<PayWorkingGroupDistributionRecord, IPayWorkingGroupDistributionRecordService> {
|
||||
@Autowired
|
||||
private IPayWorkingGroupDistributionRecordService payWorkingGroupDistributionRecordService;
|
||||
@Autowired
|
||||
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
|
||||
@Autowired
|
||||
private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
@@ -56,6 +72,55 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
|
||||
IPage<PayWorkingGroupDistributionRecord> pageList = payWorkingGroupDistributionRecordService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分发成员列表
|
||||
* @param projectId 项目id
|
||||
* @param projectType 项目类型
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "资料分发-分发成员列表")
|
||||
@ApiOperation(value="资料分发-分发成员列表", notes="资料分发-分发成员列表")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<?> list(@RequestParam("projectId") String projectId,@RequestParam("projectType") Integer projectType) {
|
||||
if(StringUtils.isBlank(projectId)){
|
||||
throw new JeroBootException("项目id不能为空!");
|
||||
}
|
||||
if(projectType != PayProjectCommon.PROJECT_TYPE_FILE1
|
||||
&& projectType != PayProjectCommon.PROJECT_TYPE_FILE2){
|
||||
return Result.error("项目状态不正确!");
|
||||
}
|
||||
List<PayContactsManagement> listData = new ArrayList<>();
|
||||
if(projectType == PayProjectCommon.PROJECT_TYPE_FILE1){
|
||||
LambdaQueryWrapper<PayWorkingGroupSubItem> queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>();
|
||||
queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getWorkingGroupId,projectId);
|
||||
List<PayWorkingGroupSubItem> list = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem);
|
||||
if(!CollectionUtils.isEmpty(list)){
|
||||
list.forEach(p->{
|
||||
PayContactsManagement payContactsManagement = new PayContactsManagement();
|
||||
payContactsManagement.setId(p.getContactsTemporaryIdOne());
|
||||
payContactsManagement.setName(p.getContactsTemporaryNameOne());
|
||||
listData.add(payContactsManagement);
|
||||
});
|
||||
}
|
||||
}else if(projectType != PayProjectCommon.PROJECT_TYPE_FILE2){
|
||||
LambdaQueryWrapper<PayCaseCommitteeSubitem> queryPayCaseCommitteeSubitem = new LambdaQueryWrapper<>();
|
||||
queryPayCaseCommitteeSubitem.eq(PayCaseCommitteeSubitem::getCommitteeId,projectId);
|
||||
List<PayCaseCommitteeSubitem> list = payCaseCommitteeSubitemService.list(queryPayCaseCommitteeSubitem);
|
||||
if(!CollectionUtils.isEmpty(list)){
|
||||
list.forEach(p->{
|
||||
PayContactsManagement payContactsManagement = new PayContactsManagement();
|
||||
payContactsManagement.setId(p.getContactsId());
|
||||
payContactsManagement.setName(p.getContactsName());
|
||||
listData.add(payContactsManagement);
|
||||
});
|
||||
}
|
||||
}else{
|
||||
throw new JeroBootException("项目状态不正确!");
|
||||
}
|
||||
return Result.OK(listData);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 分发
|
||||
@@ -67,13 +132,23 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
|
||||
@ApiOperation(value="资料分发-分发", notes="资料分发-分发")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@RequestBody PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) {
|
||||
|
||||
// EmailSendMsgHandle emailHandle = new EmailSendMsgHandle();
|
||||
// emailHandle.SendMsgAndFile(mails, stringBuilder.toString(), stringBuilder.toString(), fileList);
|
||||
|
||||
payWorkingGroupDistributionRecordService.save(payWorkingGroupDistributionRecord);
|
||||
payWorkingGroupDistributionRecordService.add(payWorkingGroupDistributionRecord);
|
||||
return Result.OK("添加成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量分发
|
||||
*
|
||||
* @param payWorkingGroupDistributionRecord
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "资料分发-批量分发")
|
||||
@ApiOperation(value="资料分发-分发", notes="资料分发-批量分发")
|
||||
@PostMapping(value = "/addBatch")
|
||||
public Result<?> addBatch(@RequestBody PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) {
|
||||
payWorkingGroupDistributionRecordService.addBatch(payWorkingGroupDistributionRecord);
|
||||
return Result.OK("添加成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
|
||||
+9
-6
@@ -35,12 +35,15 @@ public class PayWorkingGroupDataFile implements Serializable {
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "主键")
|
||||
private java.lang.String id;
|
||||
/**工作组id*/
|
||||
// @Excel(name = "工作组id", width = 15)
|
||||
@ApiModelProperty(value = "工作组id")
|
||||
@NotEmpty(message = "工作组id不能为空!")
|
||||
@Size(max = 32,message = "工作组id长度不能大于32个字符")
|
||||
private java.lang.String workingGroupId;
|
||||
/**项目id(工作组id或者分标委id)*/
|
||||
@ApiModelProperty(value = "项目id(工作组id或者分标委id)")
|
||||
@NotEmpty(message = "工项目id不能为空!")
|
||||
@Size(max = 32,message = "项目id长度不能大于32个字符")
|
||||
private java.lang.String projectId;
|
||||
/**项目类型1:工作组,2:分标委*/
|
||||
@ApiModelProperty(value = "项目类型1:工作组,2:分标委")
|
||||
@NotEmpty(message = "项目类型1不能为空!")
|
||||
private java.lang.Integer projectType;
|
||||
/**文件id*/
|
||||
// @Excel(name = "文件id", width = 15)
|
||||
@ApiModelProperty(value = "文件id")
|
||||
|
||||
+21
-3
@@ -2,6 +2,7 @@ package com.jero.project.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
@@ -13,6 +14,8 @@ import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
|
||||
/**
|
||||
* @Description: pay_working_group_distribution_record
|
||||
* @Author: jeecg-boot
|
||||
@@ -35,9 +38,9 @@ public class PayWorkingGroupDistributionRecord implements Serializable {
|
||||
@Excel(name = "资料id", width = 15)
|
||||
@ApiModelProperty(value = "资料id")
|
||||
private java.lang.String dataId;
|
||||
/**工作组成员id*/
|
||||
@Excel(name = "工作组成员id", width = 15)
|
||||
@ApiModelProperty(value = "工作组成员id")
|
||||
/**工作组成员id或者分标委成员id*/
|
||||
@Excel(name = "工作组成员id或者分标委成员id", width = 15)
|
||||
@ApiModelProperty(value = "工作组成员id或者分标委成员id")
|
||||
private java.lang.String projectId;
|
||||
/**文件id*/
|
||||
@Excel(name = "文件id", width = 15)
|
||||
@@ -67,4 +70,19 @@ public class PayWorkingGroupDistributionRecord implements Serializable {
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "更新时间")
|
||||
private java.util.Date updateTime;
|
||||
|
||||
/**资料ids 多个以逗号分隔*/
|
||||
@Excel(name = "资料ids 多个以逗号分隔", width = 15)
|
||||
@ApiModelProperty(value = "资料ids 多个以逗号分隔")
|
||||
private java.lang.String dataIds;
|
||||
|
||||
/**项目类型1:工作组,2:分标委*/
|
||||
@ApiModelProperty(value = "项目类型1:工作组,2:分标委")
|
||||
@TableField(exist = false)
|
||||
private java.lang.Integer projectType;
|
||||
|
||||
/**联系人ids 多个以逗号分隔*/
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "联系人ids 多个以逗号分隔")
|
||||
private java.lang.String contactsIds;
|
||||
}
|
||||
|
||||
+1
-1
@@ -34,5 +34,5 @@ public interface PayWorkingGroupDataFileMapper extends BaseMapper<PayWorkingGrou
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
List<PayWorkingGroupDataFile> queryList(String workingGroupId);
|
||||
List<PayWorkingGroupDataFile> queryList(@Param("projectId") String projectId,@Param("projectType") Integer projectType);
|
||||
}
|
||||
|
||||
+4
-4
@@ -5,7 +5,7 @@
|
||||
<select id="queryPageList" resultType="com.jero.project.entity.PayWorkingGroupDataFile">
|
||||
SELECT
|
||||
pwgdf.id,
|
||||
pwgdf.working_group_id,
|
||||
pwgdf.project_id,
|
||||
pwgdf.file_id,
|
||||
pwgdf.create_by,
|
||||
pwgdf.create_time,
|
||||
@@ -15,7 +15,7 @@
|
||||
(SELECT count(*) FROM pay_file_download_record where file_id = pwgdf.file_id) AS downloadCount
|
||||
FROM pay_working_group_data_file pwgdf
|
||||
LEFT JOIN oss_file osf ON pwgdf.file_id = osf.id
|
||||
where working_group_id = #{payWorkingGroupDataFile.workingGroupId}
|
||||
where project_id = #{payWorkingGroupDataFile.projectId} AND project_type = #{payWorkingGroupDataFile.projectType}
|
||||
<if test="payWorkingGroupDataFile.fileName != null and payWorkingGroupDataFile.fileName != ''">
|
||||
AND osf.file_name LIKE CONCAT('%',CONCAT(#{payWorkingGroupDataFile.fileName},'%'))
|
||||
</if>
|
||||
@@ -25,7 +25,7 @@
|
||||
<select id="queryList" resultType="com.jero.project.entity.PayWorkingGroupDataFile">
|
||||
SELECT
|
||||
pwgdf.id,
|
||||
pwgdf.working_group_id,
|
||||
pwgdf.project_id,
|
||||
pwgdf.file_id,
|
||||
pwgdf.create_by,
|
||||
pwgdf.create_time,
|
||||
@@ -35,6 +35,6 @@
|
||||
(SELECT count(*) FROM pay_file_download_record where file_id = pwgdf.file_id) AS downloadCount
|
||||
FROM pay_working_group_data_file pwgdf
|
||||
LEFT JOIN oss_file osf ON pwgdf.file_id = osf.id
|
||||
where working_group_id = #{workingGroupId}
|
||||
WHERE project_id = #{projectId} AND project_type = #{projectType}
|
||||
</select>
|
||||
</mapper>
|
||||
+1
-1
@@ -31,6 +31,6 @@ public interface IPayWorkingGroupDataFileService extends IService<PayWorkingGrou
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
List<PayWorkingGroupDataFile> queryList(String workingGroupId);
|
||||
List<PayWorkingGroupDataFile> queryList(String projectId,Integer projectType);
|
||||
|
||||
}
|
||||
|
||||
+19
@@ -3,6 +3,7 @@ package com.jero.project.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.jero.project.entity.PayWorkingGroupDistributionRecord;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
|
||||
/**
|
||||
* @Description: pay_working_group_distribution_record
|
||||
@@ -12,4 +13,22 @@ import com.jero.project.entity.PayWorkingGroupDistributionRecord;
|
||||
*/
|
||||
public interface IPayWorkingGroupDistributionRecordService extends IService<PayWorkingGroupDistributionRecord> {
|
||||
|
||||
/**
|
||||
* @Description 分发
|
||||
* @Author lqt
|
||||
* @Date 2021/9/16
|
||||
* @Param
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
void add(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord);
|
||||
/**
|
||||
* @Description 批量分发
|
||||
* @Author lqt
|
||||
* @Date 2021/9/16
|
||||
* @Param
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
void addBatch(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord);
|
||||
}
|
||||
|
||||
+2
-2
@@ -35,7 +35,7 @@ public class PayWorkingGroupDataFileServiceImpl extends ServiceImpl<PayWorkingGr
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PayWorkingGroupDataFile> queryList(String workingGroupId) {
|
||||
return payWorkingGroupDataFileMapper.queryList(workingGroupId);
|
||||
public List<PayWorkingGroupDataFile> queryList(String projectId,Integer projectType) {
|
||||
return payWorkingGroupDataFileMapper.queryList(projectId,projectType);
|
||||
}
|
||||
}
|
||||
|
||||
+111
@@ -1,10 +1,29 @@
|
||||
package com.jero.project.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.company.entity.PayContactsManagement;
|
||||
import com.jero.company.service.IPayContactsManagementService;
|
||||
import com.jero.project.common.PayProjectCommon;
|
||||
import com.jero.project.entity.PayWorkingGroupDataFile;
|
||||
import com.jero.project.entity.PayWorkingGroupDistributionRecord;
|
||||
import com.jero.project.mapper.PayWorkingGroupDistributionRecordMapper;
|
||||
import com.jero.project.service.IPayWorkingGroupDataFileService;
|
||||
import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
|
||||
import com.jero.temporary.entity.PayContactsManagementTemporary;
|
||||
import com.jero.temporary.service.IPayContactsManagementTemporaryService;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Description: pay_working_group_distribution_record
|
||||
* @Author: jeecg-boot
|
||||
@@ -14,4 +33,96 @@ import org.springframework.stereotype.Service;
|
||||
@Service
|
||||
public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<PayWorkingGroupDistributionRecordMapper, PayWorkingGroupDistributionRecord> implements IPayWorkingGroupDistributionRecordService {
|
||||
|
||||
@Autowired
|
||||
private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
|
||||
@Autowired
|
||||
private IPayContactsManagementService payContactsManagementService;
|
||||
@Autowired
|
||||
private IPayWorkingGroupDataFileService payWorkingGroupDataFileService;
|
||||
|
||||
@Override
|
||||
public void add(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) {
|
||||
if(StringUtils.isBlank(payWorkingGroupDistributionRecord.getContactsIds())){
|
||||
throw new JeroBootException("成员id不能为空!");
|
||||
}
|
||||
String[] s = payWorkingGroupDistributionRecord.getContactsIds().split(",");
|
||||
for (String s1 : s) {
|
||||
if(StringUtils.isBlank(s1)){
|
||||
throw new JeroBootException("成员id不能为空!");
|
||||
}
|
||||
}
|
||||
if(StringUtils.isBlank(payWorkingGroupDistributionRecord.getDataId())){
|
||||
throw new JeroBootException("资料id不能为空!");
|
||||
}
|
||||
PayWorkingGroupDataFile payWorkingGroupDataFile = payWorkingGroupDataFileService.getById(payWorkingGroupDistributionRecord.getDataId());
|
||||
|
||||
if(payWorkingGroupDistributionRecord.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE1){
|
||||
LambdaQueryWrapper<PayContactsManagementTemporary> queryPayContactsManagementTemporary = new LambdaQueryWrapper<>();
|
||||
queryPayContactsManagementTemporary.in(PayContactsManagementTemporary::getId, Arrays.asList(payWorkingGroupDistributionRecord.getContactsIds().split(",")));
|
||||
List<PayContactsManagementTemporary> listContacts = payContactsManagementTemporaryService.list(queryPayContactsManagementTemporary);
|
||||
if(!CollectionUtils.isEmpty(listContacts)){
|
||||
// todo 调用发送邮箱接口
|
||||
List<String> list = listContacts.stream().map(PayContactsManagementTemporary::getEmail).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
}else if(payWorkingGroupDistributionRecord.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE2){
|
||||
LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
|
||||
queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(payWorkingGroupDistributionRecord.getContactsIds().split(",")));
|
||||
List<PayContactsManagement> listContacts = payContactsManagementService.list(queryPayContactsManagement);
|
||||
if(!CollectionUtils.isEmpty(listContacts)){
|
||||
// todo 调用发送邮箱接口
|
||||
List<String> list = listContacts.stream().map(PayContactsManagement::getEmail).collect(Collectors.toList());
|
||||
}
|
||||
}else{
|
||||
throw new JeroBootException("项目状态不正确!");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addBatch(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) {
|
||||
if(StringUtils.isBlank(payWorkingGroupDistributionRecord.getContactsIds())){
|
||||
throw new JeroBootException("成员id不能为空!");
|
||||
}
|
||||
String[] s = payWorkingGroupDistributionRecord.getContactsIds().split(",");
|
||||
for (String s1 : s) {
|
||||
if(StringUtils.isBlank(s1)){
|
||||
throw new JeroBootException("成员id不能为空!");
|
||||
}
|
||||
}
|
||||
if(StringUtils.isBlank(payWorkingGroupDistributionRecord.getDataIds())){
|
||||
throw new JeroBootException("资料id不能为空!");
|
||||
}
|
||||
String[] n = payWorkingGroupDistributionRecord.getDataIds().split(",");
|
||||
for (String s1 : n) {
|
||||
if(StringUtils.isBlank(s1)){
|
||||
throw new JeroBootException("资料id不能为空!");
|
||||
}
|
||||
}
|
||||
|
||||
List<PayWorkingGroupDataFile> listPayWorkingGroupDataFile = payWorkingGroupDataFileService.list();
|
||||
|
||||
|
||||
if(payWorkingGroupDistributionRecord.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE1){
|
||||
LambdaQueryWrapper<PayContactsManagementTemporary> queryPayContactsManagementTemporary = new LambdaQueryWrapper<>();
|
||||
queryPayContactsManagementTemporary.in(PayContactsManagementTemporary::getId, Arrays.asList(payWorkingGroupDistributionRecord.getContactsIds().split(",")));
|
||||
List<PayContactsManagementTemporary> listContacts = payContactsManagementTemporaryService.list(queryPayContactsManagementTemporary);
|
||||
if(!CollectionUtils.isEmpty(listContacts)){
|
||||
// todo 调用发送邮箱接口
|
||||
List<String> list = listContacts.stream().map(PayContactsManagementTemporary::getEmail).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
}else if(payWorkingGroupDistributionRecord.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE2){
|
||||
LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
|
||||
queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(payWorkingGroupDistributionRecord.getContactsIds().split(",")));
|
||||
List<PayContactsManagement> listContacts = payContactsManagementService.list(queryPayContactsManagement);
|
||||
if(!CollectionUtils.isEmpty(listContacts)){
|
||||
// todo 调用发送邮箱接口
|
||||
List<String> list = listContacts.stream().map(PayContactsManagement::getEmail).collect(Collectors.toList());
|
||||
}
|
||||
}else{
|
||||
throw new JeroBootException("项目状态不正确!");
|
||||
}
|
||||
// EmailSendMsgHandle emailHandle = new EmailSendMsgHandle();
|
||||
// emailHandle.SendMsgAndFile(mails, stringBuilder.toString(), stringBuilder.toString(), fileList);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user