add:邮寄添加邮寄人

This commit is contained in:
zhangqinlin
2021-10-18 17:05:31 +08:00
parent dfd9ce3470
commit a3224b7704
11 changed files with 126 additions and 116 deletions
@@ -166,7 +166,9 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@Transactional
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayMailBill payMailBill) {
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
payMailBill.setPostStatus(1);
payMailBill.setMailer(sysUser.getUsername());
payMailBillService.updateById(payMailBill);
//变更5种项目的邮寄状态
LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
@@ -263,7 +265,6 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
}
PayMailBill payMailBillData = payMailBillService.getById(payMailBill.getId());
if(!Objects.isNull(payMailBillData)){
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(payMailBillData.getEmail())){
@@ -108,18 +108,19 @@ public class PayMailContractController extends JeroController<PayMailContract, I
* 邮寄合同-编辑(邮寄和修改按钮统一接口)
*/
@RequiresPermissions("contractMail:mail")
@AutoLog(value = "邮寄合同-邮寄合同-编辑(邮寄和修改按钮统一接口)")
@ApiOperation(value = "邮寄合同-编辑(邮寄和修改按钮统一接口)", notes = "邮寄合同-编辑(邮寄和修改按钮统一接口)")
@AutoLog(value = "邮寄合同-邮寄口")
@ApiOperation(value = "邮寄合同-邮寄口", notes = "邮寄合同-邮寄口")
@PostMapping(value = "/mile")
public Result<?> mile(@RequestBody PayMailContract payMailContract
) {
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
PayMailContract payMailContractData = payMailContractService.getById(payMailContract.getId());
payMailContract.setPostStatus(1);
payMailContract.setMailer(sysUser.getUsername());
payMailContractService.updateById(payMailContract);
if (!Objects.isNull(payMailContractData) && Objects.equals(payMailContractData.getPostStatus(), ProjectCommon.POST_STATUS0)) {
PayIncomeContract payIncomeContract = payIncomeContractService.getById(payMailContractData.getContractId());
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if (!StringUtils.isBlank(payMailContractData.getEmail())) {
@@ -134,8 +134,8 @@ public class PayMailBill implements Serializable {
@ApiModelProperty(value = "项目id")
private String projectId;
@ApiModelProperty(value = "邮寄人")
private String mailer;
@NotNull(message = "项目负责人id不能为空")
@ApiModelProperty(value = "项目负责人id")
@@ -51,6 +51,8 @@ public class PayMailBillList {
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "邮寄时间")
private java.util.Date sendDate;
@ApiModelProperty(value = "邮寄人")
private java.lang.String mailer;
@@ -84,4 +84,7 @@ public class PayMailContract implements Serializable {
/**联系人邮箱*/
@ApiModelProperty(value = "联系人邮箱")
private String email;
/**邮寄人*/
@ApiModelProperty(value = "邮寄人")
private String mailer;
}
@@ -65,6 +65,7 @@
post_status as postStatus,
send_method as sendMethod ,
create_time,
mailer,
post_no as postNo,
send_date as sendDate,
pmb.remark
@@ -10,6 +10,7 @@ pc.post_no as postNo,
pc.liaison_man as liaisonMan,
pc.mobile,
pc.remark,
pc.mailer,
pc.send_date as sendDate,
pic.contract_num as contractNum,
pic.contract_name as contractName,
@@ -84,19 +84,19 @@ public class AllProjectStatisticsController {
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
idList=null;
//企业职员项目负责人
}else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
}else {
} else {
throw new JeroBootException("权限异常");
}
@@ -161,19 +161,19 @@ public class AllProjectStatisticsController {
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
idList=null;
//企业职员项目负责人
}else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
}else {
} else {
throw new JeroBootException("权限异常");
}
if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
@@ -236,21 +236,21 @@ public class AllProjectStatisticsController {
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//企业职员项目负责人
} else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
}
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
}
if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
Calendar calendar = Calendar.getInstance();
String year = String.valueOf(calendar.get(Calendar.YEAR));
@@ -276,21 +276,22 @@ public class AllProjectStatisticsController {
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//企业职员项目负责人
} else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
}
if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
Calendar calendar = Calendar.getInstance();
String year = String.valueOf(calendar.get(Calendar.YEAR));
@@ -331,16 +332,16 @@ public class AllProjectStatisticsController {
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//企业职员项目负责人
} else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
@@ -147,21 +147,21 @@ public class CompanyComeMoneyStatisticsController {
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
idList=null;
//企业职员项目负责人
}else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
String userId = sysUser.getId();
idList.add(userId);
}else {
throw new JeroBootException("权限异常");
}
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
}
Page<CompanyComeMoneyDetail> page = new Page<>(pageNo, pageSize);
IPage<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,idList);
HashMap<String, Object> hashMap = new HashMap<>();
@@ -215,16 +215,16 @@ public class CompanyComeMoneyStatisticsController {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//企业职员项目负责人
} else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
@@ -255,16 +255,16 @@ public class CompanyComeMoneyStatisticsController {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//企业职员项目负责人
} else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
@@ -159,16 +159,16 @@ public class PayWorkingGroupStatisticsController {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//企业职员项目负责人
} else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
@@ -202,16 +202,16 @@ public class PayWorkingGroupStatisticsController {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//企业职员项目负责人
} else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
@@ -78,21 +78,21 @@ public class PrincipalPeopleStatisticsController {
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
idList=null;
//企业职员项目负责人
}else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
String userId = sysUser.getId();
idList.add(userId);
}else {
throw new JeroBootException("权限异常");
}
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
}
Page<PrincipalPeopleList> page = new Page<>(pageNo, pageSize);
IPage<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipal(page,principalPeopleSearch,idList);
@@ -197,16 +197,16 @@ public class PrincipalPeopleStatisticsController {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//企业职员项目负责人
} else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {