1

pro-base/src/main/java/com/idea/invoice/controller/InvoiceManageController.java

@@ -0,0 +1,74 @@
+package com.idea.invoice.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.idea.invoice.dto.InvoiceManageDto;
+import com.idea.invoice.model.InvoiceBank;
+import com.idea.invoice.service.InvoiceManageService;
+import com.rockstar.common.base.BaseController;
+import com.rockstar.common.domain.AjaxResult;
+import com.rockstar.frame.model.extend.DateTrans;
+import com.rockstar.frame.model.extend.TableSplitResult;
+import com.rockstar.frame.model.extend.Tablepar;
+import com.rockstar.shiro.util.ShiroUtils;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping(value = "InvoiceManageController")
+@Api(value="开票管理")
+public class InvoiceManageController extends BaseController {
+
+    @Autowired
+    private InvoiceManageService modelService;
+
+    /**
+     * 预收款发票
+     * @param tablepar
+     * @param model
+     * @param dt
+     * @return
+     */
+    @PostMapping(value = "advancePaymentInvoiceList",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object advancePaymentInvoiceList(Tablepar tablepar, InvoiceManageDto model, DateTrans dt){
+        PageInfo<InvoiceManageDto> page= modelService.advancePaymentInvoiceList(tablepar,model,dt);
+        return new TableSplitResult<>(page.getPageNum(), page.getTotal(), page.getList());
+    }
+
+    /**
+     * 正式发票
+     * @param tablepar
+     * @param model
+     * @param dt
+     * @return
+     */
+    @PostMapping(value = "formalInvoiceList",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object formalInvoiceList(Tablepar tablepar, InvoiceManageDto model, DateTrans dt){
+        PageInfo<InvoiceManageDto> page= modelService.formalInvoiceList(tablepar,model,dt);
+        return new TableSplitResult<>(page.getPageNum(), page.getTotal(), page.getList());
+    }
+
+    @PostMapping(value = "add",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult add(InvoiceManageDto record){
+        int result = modelService.add(record);
+        return result(result);
+    }
+
+    @PostMapping(value = "getById",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object getById(String id){
+        InvoiceManageDto result = modelService.getById(id);
+        return result;
+    }
+
+
+
+
+
+}

pro-base/src/main/java/com/idea/invoice/dto/InvoiceManageDto.java

@@ -0,0 +1,36 @@
+package com.idea.invoice.dto;
+
+import com.idea.invoice.model.InvoiceManage;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class InvoiceManageDto extends InvoiceManage {
+
+    private BigDecimal totalPrice;
+
+    private BigDecimal maintenanceTotalPrice;
+
+    /**
+     * 已收
+     */
+    private BigDecimal receivedMoney;
+
+    /**
+     * 应收
+     */
+    private BigDecimal receivableMoney;
+
+    private String contractNumber;
+
+    private String buyerName;
+
+    private String houseName;
+
+    private String collectionStatus;
+
+    private String fundCollectionStatus;
+
+
+}

pro-base/src/main/java/com/idea/invoice/mapper/InvoiceManageExtendMapper.java

@@ -0,0 +1,16 @@
+package com.idea.invoice.mapper;
+
+import com.idea.invoice.dto.InvoiceManageDto;
+import com.idea.invoice.model.InvoiceManage;
+import com.idea.invoice.model.InvoiceManageExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface InvoiceManageExtendMapper {
+
+    List<InvoiceManageDto> listByModel(InvoiceManageDto model);
+
+
+
+}

pro-base/src/main/java/com/idea/invoice/mapper/InvoiceManageMapper.java

@@ -0,0 +1,31 @@
+package com.idea.invoice.mapper;
+
+import java.util.List;
+
+import com.idea.invoice.model.InvoiceManage;
+import com.idea.invoice.model.InvoiceManageExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface InvoiceManageMapper {
+    long countByExample(InvoiceManageExample example);
+
+    int deleteByExample(InvoiceManageExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(InvoiceManage record);
+
+    int insertSelective(InvoiceManage record);
+
+    List<InvoiceManage> selectByExample(InvoiceManageExample example);
+
+    InvoiceManage selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") InvoiceManage record, @Param("example") InvoiceManageExample example);
+
+    int updateByExample(@Param("record") InvoiceManage record, @Param("example") InvoiceManageExample example);
+
+    int updateByPrimaryKeySelective(InvoiceManage record);
+
+    int updateByPrimaryKey(InvoiceManage record);
+}

pro-base/src/main/java/com/idea/invoice/model/InvoiceManage.java

@@ -0,0 +1,579 @@
+package com.idea.invoice.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class InvoiceManage implements Serializable {
+    private String id;
+
+    private String contractId;
+
+    private String customerManagementId;
+
+    private String contractNumber;
+
+    private String recordNumber;
+
+    private String type;
+
+    private String costType;
+
+    private String paymentType;
+
+    private String sendStatus;
+
+    private String invoiceStatus;
+
+    private Date invoiceDate;
+
+    private String invoiceCode;
+
+    private String invoiceNo;
+
+    private String invoiceType;
+
+    private BigDecimal invoiceAmount;
+
+    private String invoiceTax;
+
+    private BigDecimal invoiceCount;
+
+    private BigDecimal invoicePrice;
+
+    private String invoiceGoodsCode;
+
+    private String invoiceGoodsName;
+
+    private String invoiceSellerName;
+
+    private String invoiceSellerNumber;
+
+    private String invoiceSellerBank;
+
+    private String invoiceSellerBankNumber;
+
+    private String invoiceSellerAddress;
+
+    private String invoiceSellerPhone;
+
+    private String invoiceEmail;
+
+    private String invoicePhone;
+
+    private String invoiceContent;
+
+    private Date submitTime;
+
+    private String submitUser;
+
+    private String invoiceHeaderId;
+
+    private String invoiceHeaderName;
+
+    private String invoiceHeaderNumber;
+
+    private String invoiceHeaderAddress;
+
+    private String invoiceHeaderPhone;
+
+    private String invoiceHeaderBank;
+
+    private String invoiceHeaderBankNumber;
+
+    private String badDebtReason;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String updateUser;
+
+    private Date updateTime;
+
+    private String invoiceFile;
+
+    private String takeStatus;
+
+    private String takeUser;
+
+    private Date takeDate;
+
+    private String takeNotes;
+
+    private String takeUpdateUser;
+
+    private String redInvoiceNo;
+
+    private String redConfirmUuid;
+
+    private String redConfirmNo;
+
+    private String redConfirmSerialNo;
+
+    private String confirmState;
+
+    private String remark;
+
+    private String eInvoiceUrl;
+
+    private String serialNo;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getPaymentType() {
+        return paymentType;
+    }
+
+    public void setPaymentType(String paymentType) {
+        this.paymentType = paymentType;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getContractId() {
+        return contractId;
+    }
+
+    public void setContractId(String contractId) {
+        this.contractId = contractId == null ? null : contractId.trim();
+    }
+
+    public String getCustomerManagementId() {
+        return customerManagementId;
+    }
+
+    public void setCustomerManagementId(String customerManagementId) {
+        this.customerManagementId = customerManagementId == null ? null : customerManagementId.trim();
+    }
+
+    public String getContractNumber() {
+        return contractNumber;
+    }
+
+    public void setContractNumber(String contractNumber) {
+        this.contractNumber = contractNumber == null ? null : contractNumber.trim();
+    }
+
+    public String getRecordNumber() {
+        return recordNumber;
+    }
+
+    public void setRecordNumber(String recordNumber) {
+        this.recordNumber = recordNumber == null ? null : recordNumber.trim();
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    public String getCostType() {
+        return costType;
+    }
+
+    public void setCostType(String costType) {
+        this.costType = costType == null ? null : costType.trim();
+    }
+
+    public String getSendStatus() {
+        return sendStatus;
+    }
+
+    public void setSendStatus(String sendStatus) {
+        this.sendStatus = sendStatus == null ? null : sendStatus.trim();
+    }
+
+    public String getInvoiceStatus() {
+        return invoiceStatus;
+    }
+
+    public void setInvoiceStatus(String invoiceStatus) {
+        this.invoiceStatus = invoiceStatus == null ? null : invoiceStatus.trim();
+    }
+
+    public Date getInvoiceDate() {
+        return invoiceDate;
+    }
+
+    public void setInvoiceDate(Date invoiceDate) {
+        this.invoiceDate = invoiceDate;
+    }
+
+    public String getInvoiceCode() {
+        return invoiceCode;
+    }
+
+    public void setInvoiceCode(String invoiceCode) {
+        this.invoiceCode = invoiceCode == null ? null : invoiceCode.trim();
+    }
+
+    public String getInvoiceNo() {
+        return invoiceNo;
+    }
+
+    public void setInvoiceNo(String invoiceNo) {
+        this.invoiceNo = invoiceNo == null ? null : invoiceNo.trim();
+    }
+
+    public String getInvoiceType() {
+        return invoiceType;
+    }
+
+    public void setInvoiceType(String invoiceType) {
+        this.invoiceType = invoiceType == null ? null : invoiceType.trim();
+    }
+
+    public BigDecimal getInvoiceAmount() {
+        return invoiceAmount;
+    }
+
+    public void setInvoiceAmount(BigDecimal invoiceAmount) {
+        this.invoiceAmount = invoiceAmount;
+    }
+
+    public String getInvoiceTax() {
+        return invoiceTax;
+    }
+
+    public void setInvoiceTax(String invoiceTax) {
+        this.invoiceTax = invoiceTax == null ? null : invoiceTax.trim();
+    }
+
+    public BigDecimal getInvoiceCount() {
+        return invoiceCount;
+    }
+
+    public void setInvoiceCount(BigDecimal invoiceCount) {
+        this.invoiceCount = invoiceCount;
+    }
+
+    public BigDecimal getInvoicePrice() {
+        return invoicePrice;
+    }
+
+    public void setInvoicePrice(BigDecimal invoicePrice) {
+        this.invoicePrice = invoicePrice;
+    }
+
+    public String getInvoiceGoodsCode() {
+        return invoiceGoodsCode;
+    }
+
+    public void setInvoiceGoodsCode(String invoiceGoodsCode) {
+        this.invoiceGoodsCode = invoiceGoodsCode == null ? null : invoiceGoodsCode.trim();
+    }
+
+    public String getInvoiceGoodsName() {
+        return invoiceGoodsName;
+    }
+
+    public void setInvoiceGoodsName(String invoiceGoodsName) {
+        this.invoiceGoodsName = invoiceGoodsName == null ? null : invoiceGoodsName.trim();
+    }
+
+    public String getInvoiceSellerName() {
+        return invoiceSellerName;
+    }
+
+    public void setInvoiceSellerName(String invoiceSellerName) {
+        this.invoiceSellerName = invoiceSellerName == null ? null : invoiceSellerName.trim();
+    }
+
+    public String getInvoiceSellerNumber() {
+        return invoiceSellerNumber;
+    }
+
+    public void setInvoiceSellerNumber(String invoiceSellerNumber) {
+        this.invoiceSellerNumber = invoiceSellerNumber == null ? null : invoiceSellerNumber.trim();
+    }
+
+    public String getInvoiceSellerBank() {
+        return invoiceSellerBank;
+    }
+
+    public void setInvoiceSellerBank(String invoiceSellerBank) {
+        this.invoiceSellerBank = invoiceSellerBank == null ? null : invoiceSellerBank.trim();
+    }
+
+    public String getInvoiceSellerBankNumber() {
+        return invoiceSellerBankNumber;
+    }
+
+    public void setInvoiceSellerBankNumber(String invoiceSellerBankNumber) {
+        this.invoiceSellerBankNumber = invoiceSellerBankNumber == null ? null : invoiceSellerBankNumber.trim();
+    }
+
+    public String getInvoiceSellerAddress() {
+        return invoiceSellerAddress;
+    }
+
+    public void setInvoiceSellerAddress(String invoiceSellerAddress) {
+        this.invoiceSellerAddress = invoiceSellerAddress == null ? null : invoiceSellerAddress.trim();
+    }
+
+    public String getInvoiceSellerPhone() {
+        return invoiceSellerPhone;
+    }
+
+    public void setInvoiceSellerPhone(String invoiceSellerPhone) {
+        this.invoiceSellerPhone = invoiceSellerPhone == null ? null : invoiceSellerPhone.trim();
+    }
+
+    public String getInvoiceEmail() {
+        return invoiceEmail;
+    }
+
+    public void setInvoiceEmail(String invoiceEmail) {
+        this.invoiceEmail = invoiceEmail == null ? null : invoiceEmail.trim();
+    }
+
+    public String getInvoicePhone() {
+        return invoicePhone;
+    }
+
+    public void setInvoicePhone(String invoicePhone) {
+        this.invoicePhone = invoicePhone == null ? null : invoicePhone.trim();
+    }
+
+    public String getInvoiceContent() {
+        return invoiceContent;
+    }
+
+    public void setInvoiceContent(String invoiceContent) {
+        this.invoiceContent = invoiceContent == null ? null : invoiceContent.trim();
+    }
+
+    public Date getSubmitTime() {
+        return submitTime;
+    }
+
+    public void setSubmitTime(Date submitTime) {
+        this.submitTime = submitTime;
+    }
+
+    public String getSubmitUser() {
+        return submitUser;
+    }
+
+    public void setSubmitUser(String submitUser) {
+        this.submitUser = submitUser == null ? null : submitUser.trim();
+    }
+
+    public String getInvoiceHeaderId() {
+        return invoiceHeaderId;
+    }
+
+    public void setInvoiceHeaderId(String invoiceHeaderId) {
+        this.invoiceHeaderId = invoiceHeaderId == null ? null : invoiceHeaderId.trim();
+    }
+
+    public String getInvoiceHeaderName() {
+        return invoiceHeaderName;
+    }
+
+    public void setInvoiceHeaderName(String invoiceHeaderName) {
+        this.invoiceHeaderName = invoiceHeaderName == null ? null : invoiceHeaderName.trim();
+    }
+
+    public String getInvoiceHeaderNumber() {
+        return invoiceHeaderNumber;
+    }
+
+    public void setInvoiceHeaderNumber(String invoiceHeaderNumber) {
+        this.invoiceHeaderNumber = invoiceHeaderNumber == null ? null : invoiceHeaderNumber.trim();
+    }
+
+    public String getInvoiceHeaderAddress() {
+        return invoiceHeaderAddress;
+    }
+
+    public void setInvoiceHeaderAddress(String invoiceHeaderAddress) {
+        this.invoiceHeaderAddress = invoiceHeaderAddress == null ? null : invoiceHeaderAddress.trim();
+    }
+
+    public String getInvoiceHeaderPhone() {
+        return invoiceHeaderPhone;
+    }
+
+    public void setInvoiceHeaderPhone(String invoiceHeaderPhone) {
+        this.invoiceHeaderPhone = invoiceHeaderPhone == null ? null : invoiceHeaderPhone.trim();
+    }
+
+    public String getInvoiceHeaderBank() {
+        return invoiceHeaderBank;
+    }
+
+    public void setInvoiceHeaderBank(String invoiceHeaderBank) {
+        this.invoiceHeaderBank = invoiceHeaderBank == null ? null : invoiceHeaderBank.trim();
+    }
+
+    public String getInvoiceHeaderBankNumber() {
+        return invoiceHeaderBankNumber;
+    }
+
+    public void setInvoiceHeaderBankNumber(String invoiceHeaderBankNumber) {
+        this.invoiceHeaderBankNumber = invoiceHeaderBankNumber == null ? null : invoiceHeaderBankNumber.trim();
+    }
+
+    public String getBadDebtReason() {
+        return badDebtReason;
+    }
+
+    public void setBadDebtReason(String badDebtReason) {
+        this.badDebtReason = badDebtReason == null ? null : badDebtReason.trim();
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser == null ? null : updateUser.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInvoiceFile() {
+        return invoiceFile;
+    }
+
+    public void setInvoiceFile(String invoiceFile) {
+        this.invoiceFile = invoiceFile == null ? null : invoiceFile.trim();
+    }
+
+    public String getTakeStatus() {
+        return takeStatus;
+    }
+
+    public void setTakeStatus(String takeStatus) {
+        this.takeStatus = takeStatus == null ? null : takeStatus.trim();
+    }
+
+    public String getTakeUser() {
+        return takeUser;
+    }
+
+    public void setTakeUser(String takeUser) {
+        this.takeUser = takeUser == null ? null : takeUser.trim();
+    }
+
+    public Date getTakeDate() {
+        return takeDate;
+    }
+
+    public void setTakeDate(Date takeDate) {
+        this.takeDate = takeDate;
+    }
+
+    public String getTakeNotes() {
+        return takeNotes;
+    }
+
+    public void setTakeNotes(String takeNotes) {
+        this.takeNotes = takeNotes == null ? null : takeNotes.trim();
+    }
+
+    public String getTakeUpdateUser() {
+        return takeUpdateUser;
+    }
+
+    public void setTakeUpdateUser(String takeUpdateUser) {
+        this.takeUpdateUser = takeUpdateUser == null ? null : takeUpdateUser.trim();
+    }
+
+    public String getRedInvoiceNo() {
+        return redInvoiceNo;
+    }
+
+    public void setRedInvoiceNo(String redInvoiceNo) {
+        this.redInvoiceNo = redInvoiceNo == null ? null : redInvoiceNo.trim();
+    }
+
+    public String getRedConfirmUuid() {
+        return redConfirmUuid;
+    }
+
+    public void setRedConfirmUuid(String redConfirmUuid) {
+        this.redConfirmUuid = redConfirmUuid == null ? null : redConfirmUuid.trim();
+    }
+
+    public String getRedConfirmNo() {
+        return redConfirmNo;
+    }
+
+    public void setRedConfirmNo(String redConfirmNo) {
+        this.redConfirmNo = redConfirmNo == null ? null : redConfirmNo.trim();
+    }
+
+    public String getRedConfirmSerialNo() {
+        return redConfirmSerialNo;
+    }
+
+    public void setRedConfirmSerialNo(String redConfirmSerialNo) {
+        this.redConfirmSerialNo = redConfirmSerialNo == null ? null : redConfirmSerialNo.trim();
+    }
+
+    public String getConfirmState() {
+        return confirmState;
+    }
+
+    public void setConfirmState(String confirmState) {
+        this.confirmState = confirmState == null ? null : confirmState.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public String geteInvoiceUrl() {
+        return eInvoiceUrl;
+    }
+
+    public void seteInvoiceUrl(String eInvoiceUrl) {
+        this.eInvoiceUrl = eInvoiceUrl == null ? null : eInvoiceUrl.trim();
+    }
+
+    public String getSerialNo() {
+        return serialNo;
+    }
+
+    public void setSerialNo(String serialNo) {
+        this.serialNo = serialNo == null ? null : serialNo.trim();
+    }
+}

pro-base/src/main/java/com/idea/invoice/service/InvoiceManageService.java

@@ -0,0 +1,152 @@
+package com.idea.invoice.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.IdUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.idea.invoice.dto.InvoiceManageDto;
+import com.idea.invoice.mapper.InvoiceManageExtendMapper;
+import com.idea.invoice.mapper.InvoiceManageMapper;
+import com.idea.invoice.model.InvoiceManage;
+import com.idea.invoice.model.InvoiceManageExample;
+import com.idea.paymentManagement.service.PayLogService;
+import com.rockstar.common.base.BaseService;
+import com.rockstar.frame.model.extend.DateTrans;
+import com.rockstar.frame.model.extend.Tablepar;
+import com.rockstar.shiro.util.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class InvoiceManageService implements BaseService<InvoiceManage, InvoiceManageExample> {
+
+    @Autowired
+    private InvoiceManageMapper invoiceManageMapper;
+    @Autowired
+    private InvoiceManageExtendMapper extendMapper;
+    @Autowired
+    private PayLogService payLogService;
+
+
+    @Override
+    public int deleteByPrimaryKey(String s) {
+        return invoiceManageMapper.deleteByPrimaryKey(s);
+    }
+
+    @Override
+    public int insertSelective(InvoiceManage invoiceManage) {
+        invoiceManage.setId(IdUtil.simpleUUID());
+        return invoiceManageMapper.insertSelective(invoiceManage);
+    }
+
+    public int insertWithoutId(InvoiceManage invoiceManage) {
+        return invoiceManageMapper.insertSelective(invoiceManage);
+    }
+
+    @Override
+    public InvoiceManage selectByPrimaryKey(String s) {
+        return invoiceManageMapper.selectByPrimaryKey(s);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(InvoiceManage invoiceManage) {
+        return invoiceManageMapper.updateByPrimaryKeySelective(invoiceManage);
+    }
+
+    @Override
+    public int updateByExampleSelective(InvoiceManage invoiceManage, InvoiceManageExample invoiceManageExample) {
+        return invoiceManageMapper.updateByExampleSelective(invoiceManage, invoiceManageExample);
+    }
+
+    @Override
+    public int updateByExample(InvoiceManage invoiceManage, InvoiceManageExample invoiceManageExample) {
+        return invoiceManageMapper.updateByExample(invoiceManage, invoiceManageExample);
+    }
+
+    @Override
+    public List<InvoiceManage> selectByExample(InvoiceManageExample invoiceManageExample) {
+        return invoiceManageMapper.selectByExample(invoiceManageExample);
+    }
+
+    @Override
+    public long countByExample(InvoiceManageExample invoiceManageExample) {
+        return invoiceManageMapper.countByExample(invoiceManageExample);
+    }
+
+    @Override
+    public int deleteByExample(InvoiceManageExample invoiceManageExample) {
+        return invoiceManageMapper.deleteByExample(invoiceManageExample);
+    }
+
+
+    /**
+     * 预收款发票
+     *
+     * @param tablepar
+     * @param model
+     * @param dt
+     * @return
+     */
+    public PageInfo<InvoiceManageDto> advancePaymentInvoiceList(Tablepar tablepar, InvoiceManageDto model, DateTrans dt) {
+        model.setType("1");
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        List<InvoiceManageDto> list = extendMapper.listByModel(model);
+        for(InvoiceManageDto invoiceManage : list){
+            BigDecimal totalPrice = invoiceManage.getTotalPrice();
+            BigDecimal maintenanceTotalPrice = invoiceManage.getMaintenanceTotalPrice();
+            String money = payLogService.getMoneyByContractId(invoiceManage.getContractId(), null);
+            invoiceManage.setReceivableMoney(totalPrice.add(maintenanceTotalPrice));
+            invoiceManage.setReceivedMoney(new BigDecimal(money));
+        }
+        return new PageInfo<>(list);
+    }
+
+    public int add(InvoiceManageDto model) {
+
+        model.setCreateTime(new Date());
+        model.setCreateUser(ShiroUtils.getUserId());
+        return insertSelective(model);
+    }
+
+    public InvoiceManageDto getById(String id) {
+        InvoiceManage invoiceManage = selectByPrimaryKey(id);
+        InvoiceManageDto result = new InvoiceManageDto();
+        BeanUtil.copyProperties(invoiceManage, result);
+        return result;
+    }
+
+    /**
+     * 正式发票管理
+     * @param tablepar
+     * @param model
+     * @param dt
+     * @return
+     */
+    public PageInfo<InvoiceManageDto> formalInvoiceList(Tablepar tablepar, InvoiceManageDto model, DateTrans dt) {
+        model.setType("2");
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        List<InvoiceManageDto> list = extendMapper.listByModel(model);
+        for(InvoiceManageDto invoiceManage : list){
+            String money = "";
+            // 房款
+            if(invoiceManage.getPaymentType().equals("1")){
+                money = payLogService.getMoneyByContractId(invoiceManage.getContractId(), 1);
+                invoiceManage.setReceivableMoney(invoiceManage.getTotalPrice());
+            }
+            // 专项维修资金
+            if(invoiceManage.getPaymentType().equals("2")){
+                money = payLogService.getMoneyByContractId(invoiceManage.getContractId(), 2);
+                invoiceManage.setReceivableMoney(invoiceManage.getMaintenanceTotalPrice());
+            }
+            invoiceManage.setReceivedMoney(new BigDecimal(money));
+        }
+        return new PageInfo<>(list);
+    }
+
+
+
+}

pro-base/src/main/java/com/idea/invoice/util/InvoiceConstant.java

@@ -0,0 +1,42 @@
+package com.idea.invoice.util;
+
+public class InvoiceConstant {
+
+    // 0待开票 1已开票 2已发票作废 3待坏账红冲 4已坏账红冲
+    public static final String INVOICE_STATUS_WAIT = "0";
+    public static final String INVOICE_STATUS_FINISH = "1";
+    public static final String INVOICE_STATUS_ERROR = "2";
+    public static final String INVOICE_STATUS_WAIT_BAD_DEBT = "3";
+    public static final String INVOICE_STATUS_BAD_DEBT = "4";
+
+    // 026 增值税电子发票, 007 增值税普通发票, 028 增值税电子专用发票, 004 增值税专用发票
+    public static final String INVOICE_TYPE_ELE_NORMAL = "026";
+    public static final String INVOICE_TYPE_NORMAL = "007";
+    public static final String INVOICE_TYPE_ELE_SPECIAL = "028";
+    public static final String INVOICE_TYPE_SPECIAL = "004";
+
+
+
+    // 税收商品编码
+    // 房地产预收款
+    public static final String INVOICE_GOODS_CODE_ADVANCE_PAYMENT = "";
+    public static final String INVOICE_GOODS_NAME_ADVANCE_PAYMENT = "房地产预收款";
+
+    // 不动产
+    public static final String INVOICE_GOODS_CODE_REAL_ESTATE = "";
+    public static final String INVOICE_GOODS_NAME_REAL_ESTATE = "不动产";
+
+
+    // 开票销方信息
+    // 企业名称
+    public static final String INVOICE_SELLER_NAME = "无锡安恒置业有限公司";
+    // 税号
+    public static final String INVOICE_SELLER_NUMBER = "91320213MA27N437X0";
+    public static final String INVOICE_SELLER_NUMBER_TEST = "";
+    // 地址
+    public static final String INVOICE_SELLER_ADDRESS = "";
+    // 电话
+    public static final String INVOICE_SELLER_PHONE = "";
+
+
+}

pro-base/src/main/java/com/idea/paymentManagement/service/PayLogService.java

@@ -211,5 +211,16 @@ public class PayLogService implements BaseService<PayLog, PayLogExample> {
         return result;
     }
 
+    /**
+     * 根据合同id 查询收款
+     * @param contractId
+     * @param payType
+     * @return
+     */
+    public String getMoneyByContractId(String contractId,Integer payType){
+        String money = extendMapper.getMoneyByContractId(contractId, payType);
+        return money;
+    }
+
 
 }

pro-base/src/main/resources/mybatis/invoice/InvoiceManageExtendMapper.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.idea.invoice.mapper.InvoiceManageExtendMapper">
+
+
+  <select id="listByModel" resultType="com.idea.invoice.dto.InvoiceManageDto">
+      select i.*,cm.id contractId,cm.contract_number,cm.record_number,cm.buyer_name,cm.house_name,cm.total_price,
+             cm.maintenance_total_price,cm.collection_status,cm.fund_collection_status
+      from invoice_manage i
+      left join idea_settle_down.contract_manage cm on i.contract_id = cm.id
+      <where>
+          <if test="type !=null and type !=''">
+              and i.type = #{type}
+          </if>
+          <if test="buyerName !=null and buyerName !=''">
+              and cm.buyer_name like concat('%',#{buyerName},'%')
+          </if>
+          <if test="houseName !=null and houseName !=''">
+              and cm.house_name like concat('%',#{houseName},'%')
+          </if>
+          <if test="sendStatus !=null and sendStatus !=''">
+              and i.send_status = #{sendStatus}
+          </if>
+          <if test="sendDateFrom !=null and sendDateFrom !=''">
+              and i.submit_time >= #{sendDateFrom}
+          </if>
+          <if test="sendDateTo !=null and sendDateTo !=''">
+              and i.submit_time &lt;= #{sendDateTo}
+          </if>
+          <if test="invoiceStatus !=null and invoiceStatus !=''">
+              and i.invoice_status = #{invoiceStatus}
+          </if>
+          <if test="invoiceDateFrom !=null and invoiceDateFrom !=''">
+              and i.invoice_date >= #{invoiceDateFrom}
+          </if>
+          <if test="invoiceDateTo !=null and invoiceDateTo !=''">
+              and i.invoice_date &lt;= #{sendDateTo}
+          </if>
+      </where>
+  </select>
+
+
+
+
+</mapper>

pro-base/src/main/resources/mybatis/paymentManagement/PayLogExtendMapper.xml

@@ -4,8 +4,15 @@
 
 
   <select id="getMoneyByContractId" resultType="java.lang.String">
-    select ifnull(sum(pay_money),0) from pay_log
-    where contract_id = #{contractId} and pay_type = #{payType}
+      select ifnull(sum(pay_money),0) from pay_log
+      <where>
+          <if test="contractId != null and contractId !=''">
+              and contract_id = #{contractId}
+          </if>
+          <if test="payType != null and payType !=''">
+              and pay_type = #{payType}
+          </if>
+      </where>
   </select>
 
   <select id="listByModel" resultType="com.idea.customerManagement.dto.ContractManageDto">