Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-1phase

biz-base/src/main/java/com/dayou/controller/MessageController.java

@@ -1,7 +1,6 @@
 package com.dayou.controller;
 
 import com.dayou.annotation.IgnoreAuth;
-import com.dayou.message.MessageServerCenter;
 import com.dayou.message.handler.SystemMessageHandler;
 import com.dayou.service.IMessageService;
 import lombok.extern.slf4j.Slf4j;

service/src/main/java/com/dayou/service/impl/FinanceInvoiceServiceImpl.java

@@ -10,10 +10,8 @@ import com.dayou.dto.ItemAddFinanceInvoiceDTO;
 import com.dayou.dto.MajorProductionSimpleDTO;
 import com.dayou.entity.FinanceInvoice;
 import com.dayou.entity.Item;
-import com.dayou.entity.MajorProduction;
 import com.dayou.entity.OrderFund;
 import com.dayou.enums.FinanceInvoiceState;
-import com.dayou.enums.ReportStatus;
 import com.dayou.exception.ErrorCode;
 import com.dayou.mapper.FinanceInvoiceMapper;
 import com.dayou.mapper.MajorProductionMapper;
@@ -25,29 +23,14 @@ import com.dayou.utils.LoginContext;
 import com.dayou.vo.FinanceInvoiceVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.dayou.utils.ExcelUtil;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.Collections;
+
 import java.util.List;
-import java.util.ArrayList;
-import java.util.stream.Collectors;
 
 import org.springframework.transaction.annotation.Transactional;
-import com.dayou.enums.BatchTaskTypeEnum;
 
+import static com.dayou.enums.FinanceInvoiceState.已开票;
 import static com.dayou.enums.MainBusinessEnum.ITEM_BUSINESS;
 
 /**
@@ -144,11 +127,8 @@ public class FinanceInvoiceServiceImpl extends ServiceImpl<FinanceInvoiceMapper,
 
     @Override
     public Boolean update(FinanceInvoice financeInvoice){
-//        financeInvoice.setCheckerId(LoginContext.getCurrentUserId());
-//        financeInvoice.setMakerId(LoginContext.getCurrentUserId());
-//        financeInvoice.setState(FinanceInvoiceState.已开票.name());
         FinanceInvoice invoice = this.getById(financeInvoice.getId());
-        if (FinanceInvoiceState.已开票.name().equals(invoice.getState())){
+        if (已开票.name().equals(invoice.getState())){
             ErrorCode.throwBusinessException(ErrorCode.CUSTOM_ERROR,"财务室已开票，无法修改开票信息。");
         }
         return this.updateById(financeInvoice);
@@ -156,10 +136,13 @@ public class FinanceInvoiceServiceImpl extends ServiceImpl<FinanceInvoiceMapper,
 
     @Override
     public Boolean invoiceCheck(FinanceInvoice financeInvoice) {
-        financeInvoice.setCheckerId(LoginContext.getCurrentUserId());
-        financeInvoice.setMakerId(LoginContext.getCurrentUserId());
-//        financeInvoice.setState(FinanceInvoiceState.已开票.name());
-        return this.updateById(financeInvoice);
+        return this.update(new LambdaUpdateWrapper<FinanceInvoice>().eq(BaseEntity::getId,financeInvoice.getId())
+                .set(FinanceInvoice::getCheckerId,LoginContext.getCurrentUserId())
+                .set(FinanceInvoice::getMakerId,LoginContext.getCurrentUserId())
+                .set(FinanceInvoice::getRealMakeDate,financeInvoice.getRealMakeDate())
+                .set(FinanceInvoice::getTicketNo,financeInvoice.getTicketNo())
+                .set(FinanceInvoice::getRealAmount,financeInvoice.getRealAmount())
+                .set(FinanceInvoice::getState,已开票));
     }
 
     @Override
@@ -177,7 +160,7 @@ public class FinanceInvoiceServiceImpl extends ServiceImpl<FinanceInvoiceMapper,
     public Boolean cancellation(FinanceInvoice financeInvoice) {
         Long id = financeInvoice.getId();
         FinanceInvoice invoice = this.getById(id);
-        if (!invoice.getState().equals(FinanceInvoiceState.已开票.name())){
+        if (!invoice.getState().equals(已开票.name())){
             ErrorCode.throwBusinessException(ErrorCode.CUSTOM_ERROR,"此发票还未开具，无法申请作废。");
         }
         return this.update(new LambdaUpdateWrapper<FinanceInvoice>().set(FinanceInvoice::getState, FinanceInvoiceState.申请作废)
@@ -215,7 +198,7 @@ public class FinanceInvoiceServiceImpl extends ServiceImpl<FinanceInvoiceMapper,
             ErrorCode.throwBusinessException(ErrorCode.CUSTOM_ERROR,"发票状态错误，无法作废。");
         }
 
-        return this.update(new LambdaUpdateWrapper<FinanceInvoice>().set(FinanceInvoice::getState, FinanceInvoiceState.已开票).eq(BaseEntity::getId,id));
+        return this.update(new LambdaUpdateWrapper<FinanceInvoice>().set(FinanceInvoice::getState, 已开票).eq(BaseEntity::getId,id));
 
     }
 }