资料维护调整
This commit is contained in:
+52
-1
@@ -1,19 +1,30 @@
|
||||
package com.jero.mail.controller;
|
||||
|
||||
import java.security.PrivateKey;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
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.service.ProjectDetailService;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.company.entity.PayContactsManagement;
|
||||
import com.jero.company.mapper.PayContactsManagementMapper;
|
||||
import com.jero.company.service.IPayContactsManagementService;
|
||||
import com.jero.mail.entity.PayMailBill;
|
||||
import com.jero.mail.entity.PayMailBillProject;
|
||||
import com.jero.mail.service.IPayMailBillProjectService;
|
||||
import com.jero.mail.service.IPayMailBillService;
|
||||
import com.jero.member.entity.PayMemberProjectSubitem;
|
||||
import com.jero.member.service.IPayMemberProjectSubitemService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
@@ -35,7 +46,15 @@ import io.swagger.annotations.ApiOperation;
|
||||
public class PayMailBillController extends JeroController<PayMailBill, IPayMailBillService> {
|
||||
@Autowired
|
||||
private IPayMailBillService payMailBillService;
|
||||
|
||||
@Autowired
|
||||
private ProjectDetailService projectDetailService;
|
||||
@Autowired
|
||||
private IPayContactsManagementService iPayContactsManagementService;
|
||||
@Autowired
|
||||
private IPayMailBillProjectService iPayMailBillProjectService;
|
||||
|
||||
@Autowired
|
||||
private IPayMemberProjectSubitemService iPayMemberProjectSubitemService;
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
@@ -71,6 +90,38 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
|
||||
payMailBillService.save(payMailBill);
|
||||
return Result.OK("添加成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param keyId
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value="邮寄票据-项目详情", notes="邮寄票据-项目详情")
|
||||
@PostMapping(value = "/getProjectDetail")
|
||||
@Transactional
|
||||
public Result<?> getProjectDetail(@RequestParam(name="keyId") String keyId,
|
||||
@RequestParam(name="companyName") String companyName,
|
||||
@RequestParam(name="liaisonMan") String liaisonMan) {
|
||||
//获取联系人id公司id
|
||||
LambdaQueryWrapper<PayContactsManagement> payContactsManagementLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
payContactsManagementLambdaQueryWrapper.eq(PayContactsManagement::getCompanyName,companyName);
|
||||
payContactsManagementLambdaQueryWrapper.eq(PayContactsManagement::getName,liaisonMan);
|
||||
PayContactsManagement one = iPayContactsManagementService.getOne(payContactsManagementLambdaQueryWrapper, false);
|
||||
//获取项目id
|
||||
LambdaQueryWrapper<PayMailBillProject> payMailBillProjectLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
payMailBillProjectLambdaQueryWrapper.eq(PayMailBillProject::getBillId,keyId);
|
||||
PayMailBillProject one1 = iPayMailBillProjectService.getOne(payMailBillProjectLambdaQueryWrapper);
|
||||
JSONObject projectDetail = projectDetailService.getProjectDetail(one1.getProjectId(), one.getCompanyId(), one.getId());
|
||||
//根据项目id企业id和联系人id获取项目详情
|
||||
LambdaQueryWrapper<PayMemberProjectSubitem> payMemberProjectSubitemLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
payMemberProjectSubitemLambdaQueryWrapper.eq(PayMemberProjectSubitem::getCompanyId,one.getCompanyId());
|
||||
payMemberProjectSubitemLambdaQueryWrapper.eq(PayMemberProjectSubitem::getCompanyContactId,one.getId());
|
||||
payMemberProjectSubitemLambdaQueryWrapper.eq(PayMemberProjectSubitem::getProjectId,one1.getProjectId());
|
||||
PayMemberProjectSubitem payMemberProjectSubitem = iPayMemberProjectSubitemService.getOne(payMemberProjectSubitemLambdaQueryWrapper, false);
|
||||
projectDetail.put("payMemberProjectSubitem",payMemberProjectSubitem);
|
||||
return Result.OK(projectDetail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
|
||||
Reference in New Issue
Block a user