LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工作组变更

Browse Source
This commit is contained in:
梁琦涛
2021-09-17 13:34:25 +08:00
parent 182a19e5c5
commit 426c1543aa
4 changed files with 99 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+3 -33
View File
@@ -55,8 +55,6 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
@Autowired
private IPayWorkingGroupService payWorkingGroupService;
@Autowired
private ISysUserService sysUserService;
@Autowired
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
@Autowired
private IPayPackCompanyProjectService payPackCompanyProjectService;
@@ -228,10 +226,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
return Result.error("工作组id不能为空！");
}
payWorkingGroupService.copy(payWorkingGroup);
setPayWorkingGroup(payWorkingGroup);
payWorkingGroupService.save(payWorkingGroup);
return Result.OK("添加成功！");
return Result.OK("复制成功！");
}
/**
@@ -260,7 +255,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
log.info("工作组项目-添加异常",e);
return Result.error("工作组项目已存在！");
}
setPayWorkingGroup(payWorkingGroup);
payWorkingGroupService.setPayWorkingGroup(payWorkingGroup);
payWorkingGroupService.save(payWorkingGroup);
return Result.OK("添加成功！");
}
@@ -291,35 +286,10 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
log.info("工作组项目-编辑异常",e);
return Result.error("工作组项目已存在！");
}
setPayWorkingGroup(payWorkingGroup);
payWorkingGroupService.setPayWorkingGroup(payWorkingGroup);
payWorkingGroupService.updateById(payWorkingGroup);
return Result.OK("编辑成功!");
}
/**
* @Description 获取负责人A名称，负责人B名称
* @Author lqt
* @Date 2021/8/31
* @Param payWorkingGroup
* @Return
* @Exception
*/
private void setPayWorkingGroup(PayWorkingGroup payWorkingGroup){
// 负责人A名称
SysUser principalIdA = sysUserService.getById(payWorkingGroup.getPrincipalIdA());
if (Objects.isNull(principalIdA)) {
throw new JeroBootException("负责人A不存在！");
}
payWorkingGroup.setPrincipalNameA(principalIdA.getRealname());
// 负责人B名称
if(!StringUtils.isBlank(payWorkingGroup.getPrincipalIdB())){
SysUser principalIdB = sysUserService.getById(payWorkingGroup.getPrincipalIdB());
if(Objects.isNull(principalIdB)){
throw new JeroBootException("负责人B不存在！");
}
payWorkingGroup.setPrincipalNameB(principalIdB.getRealname());
}
}
/**
* 通过id删除
*
jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java
+10
View File
@@ -93,4 +93,14 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
*/
void copy(PayWorkingGroup payWorkingGroup);
/**
* @Description 获取负责人A名称，负责人B名称
* @Author lqt
* @Date 2021/8/31
* @Param payWorkingGroup
* @Return
* @Exception
*/
void setPayWorkingGroup(PayWorkingGroup payWorkingGroup);
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+62 -1
View File
@@ -7,15 +7,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.exception.JeroBootException;
import com.jero.contract.entity.PayIncomeContractAssociated;
import com.jero.contract.service.IPayIncomeContractAssociatedService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.project.entity.PayWorkingGroupSearch;
import com.jero.project.entity.PayWorkingGroupStatistics;
import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.service.IPayWorkingGroupDataFileService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.project.vo.PayWorkingGroupVO;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.project.entity.PayWorkingGroup;
import com.jero.project.mapper.PayWorkingGroupMapper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -43,6 +48,9 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
private IPayIncomeContractAssociatedService payIncomeContractAssociatedService;
@Resource
private PayWorkingGroupMapper payWorkingGroupMapper;
@Autowired
private ISysUserService sysUserService;
@Override
public IPage<PayWorkingGroupVO> queryPageList(Page<PayWorkingGroupVO> page, PayWorkingGroup payWorkingGroup) {
return payWorkingGroupMapper.queryPageList(page,payWorkingGroup);
@@ -100,8 +108,61 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
}
@Override
@Transactional
public void copy(PayWorkingGroup payWorkingGroup) {
// 更新工作组
PayWorkingGroup payWorkingGroupOld = payWorkingGroupService.getById(payWorkingGroup.getId());
if(Objects.isNull(payWorkingGroupOld)){
throw new JeroBootException("工作组不存在！");
}
payWorkingGroupOld.setId(null);
payWorkingGroupOld.setWorkingGroupProject(payWorkingGroupOld.getWorkingGroupProject() + "-副本");
payWorkingGroupOld.setCreateBy(null);
payWorkingGroupOld.setCreateTime(null);
payWorkingGroupOld.setUpdateBy(null);
payWorkingGroupOld.setUpdateTime(null);
setPayWorkingGroup(payWorkingGroupOld);
payWorkingGroupService.save(payWorkingGroupOld);
// 拷贝工作组成员
LambdaQueryWrapper<PayWorkingGroupSubItem> query = new LambdaQueryWrapper<>();
query.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroup.getId());
List<PayWorkingGroupSubItem> listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(query);
if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){
listPayWorkingGroupSubItem.forEach(p->{
p.setId(null);
p.setCreateBy(null);
p.setCreateTime(null);
p.setUpdateBy(null);
p.setUpdateTime(null);
p.setWorkingGroupId(payWorkingGroupOld.getId());
});
payWorkingGroupSubItemService.saveBatch(listPayWorkingGroupSubItem);
}
}
/**
* @Description 获取负责人A名称，负责人B名称
* @Author lqt
* @Date 2021/8/31
* @Param payWorkingGroup
* @Return
* @Exception
*/
@Override
public void setPayWorkingGroup(PayWorkingGroup payWorkingGroup){
// 负责人A名称
SysUser principalIdA = sysUserService.getById(payWorkingGroup.getPrincipalIdA());
if (Objects.isNull(principalIdA)) {
throw new JeroBootException("负责人A不存在！");
}
payWorkingGroup.setPrincipalNameA(principalIdA.getRealname());
// 负责人B名称
if(!StringUtils.isBlank(payWorkingGroup.getPrincipalIdB())){
SysUser principalIdB = sysUserService.getById(payWorkingGroup.getPrincipalIdB());
if(Objects.isNull(principalIdB)){
throw new JeroBootException("负责人B不存在！");
}
payWorkingGroup.setPrincipalNameB(principalIdB.getRealname());
}
}
/**
jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java
+24 -2
View File
@@ -101,8 +101,19 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
helper.setText(es_content, true);
for(String file :fileList) {
if(!StringUtils.isBlank(file)) {
FileSystemResource filePath = new FileSystemResource(new File(file));
helper.addAttachment(file, filePath);
File newFile = new File(file);
FileSystemResource filePath = new FileSystemResource(newFile);
String fileName = newFile.getName();
if(fileName.lastIndexOf(".") == -1 || fileName.lastIndexOf(".") == 0){
return;
}
if(fileName.contains("_")){
int a = fileName.lastIndexOf("_");
fileName = fileName.substring(0,a) + fileName.substring(fileName.lastIndexOf("."));
}else{
fileName = fileName.substring(fileName.lastIndexOf("."));
}
helper.addAttachment(fileName, filePath);
}
}
mailSender.send(message);
@@ -112,4 +123,15 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
e.printStackTrace();
}
}
public static void main(String[] args) {
String str ="/a/b/c_daswqe.xml";
List<String> l = Arrays.asList(str.split("/"));
String f = l.get(l.size()-1);
System.out.println(f);
int a = f.lastIndexOf("_");
String f1 = f.substring(0,a);
System.out.println(f1);
}
}