Browse Source

索赔单导入调整开发对接完成

索赔开票调整开发对接
索赔开票初始化接口开发
索赔开票导入调整开发
供应商选择增加开票名称
zhanglei
God 11 months ago
parent
commit
ab1fb950de
  1. 34
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillExcelInfo.java
  2. 12
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/ReturnExcelInfo.java
  3. 5
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDetailsVo.java
  4. 5
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java
  5. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/ExcelInfoVo.java
  6. 4
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.java
  7. 4
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml
  8. 181
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java
  9. 9
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java
  10. 3
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java
  11. 13
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml
  12. 6
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java
  13. 26
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java
  14. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoChoice.java

34
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillExcelInfo.java

@ -0,0 +1,34 @@
package com.yxt.anrui.as.api.asbusclaimbill;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Data
public class AsBusclaimBillExcelInfo{
@ApiModelProperty("索赔单号")
private String billNo;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("索赔工时费")
private BigDecimal claimHourAmount = new BigDecimal("0");
@ApiModelProperty("索赔材料费")
private BigDecimal claimGoodsAmount = new BigDecimal("0");
@ApiModelProperty("索赔外出费")
private BigDecimal claimOutAmount = new BigDecimal("0");
@ApiModelProperty("索赔厂家补助")
private BigDecimal claimSubsidyAmount = new BigDecimal("0");
@ApiModelProperty("索赔其他费用")
private BigDecimal claimOtherAmount = new BigDecimal("0");
@ApiModelProperty("状态")
private String state;
}

12
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/ReturnExcelInfo.java

@ -0,0 +1,12 @@
package com.yxt.anrui.as.api.asbusclaimbill;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class ReturnExcelInfo {
private String checkInfo;
private List<AsBusclaimBillExcelInfo> infos = new ArrayList<>();
}

5
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDetailsVo.java

@ -19,7 +19,6 @@ public class AsBusclaimInvoiceBillDetailsVo {
private String sid;
private String createBySid;
private String createByName;
private String orgPath;
private String createTime;
@ -38,6 +37,10 @@ public class AsBusclaimInvoiceBillDetailsVo {
@ApiModelProperty("开票金额")
private String invoiceMoney;
private String createOrgSid;
private String useOrgSid;
private String useOrgName;
private List<String> fileList = new ArrayList<>();
private String remarks;

5
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java

@ -18,7 +18,6 @@ public class AsBusclaimInvoiceBillDto {
private String sid;
private String createBySid;
private String createByName;
private String orgPath;
private String createTime;
@ -37,6 +36,10 @@ public class AsBusclaimInvoiceBillDto {
@ApiModelProperty("开票金额")
private String invoiceMoney;
private String createOrgSid;
private String useOrgSid;
private String useOrgName;
private List<String> fileList = new ArrayList<>();
private String remarks;

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/ExcelInfoVo.java

@ -24,4 +24,6 @@ public class ExcelInfoVo {
private String claimSubsidyAmount;
@ApiModelProperty("其他费用")
private String claimOtherAmount;
@ApiModelProperty("费用是否一致")
private Boolean isUnanimous;
}

4
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.java

@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillExcelInfo;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@ -28,8 +30,6 @@ public interface AsBusclaimBillMapper extends BaseMapper<AsBusclaimBill> {
@Select("select count(*) from as_busclaim_bill where billNo = #{billNo}")
int checkBillNo(String billNo);
void updateByBillNo(AsBusclaimBill asBusclaimBill);
@Select("select billNo from as_busclaim_bill where repairBillSid = #{repairBillSid}")
List<String> selectByRepairBillSid(String repairBillSid);
}

4
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml

@ -44,8 +44,4 @@
order by id desc
limit 1
</select>
<update id="updateByBillNo">
UPDATE as_busclaim_bill SET hourAmount = #{item.hourAmount,jdbcType=DECIMAL},goodsAmount = #{item.goodsAmount,jdbcType=DECIMAL},claimOutAmount = #{item.claimOutAmount,jdbcType=DECIMAL},claimSubsidyAmount = #{item.claimSubsidyAmount,jdbcType=DECIMAL},claimOtherAmount = #{item.claimOtherAmount,jdbcType=DECIMAL}) WHERE billNo = #{item.billNo,jdbcType=VARCHAR}
</update>
</mapper>

181
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java

@ -7,11 +7,9 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -25,9 +23,8 @@ import java.math.BigDecimal;
import java.net.URLEncoder;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.regex.Pattern;
/**
* @description:
@ -81,7 +78,7 @@ public class AsBusclaimBillRest {
return ResultBean.fireFail().setMsg("上传文件不正确");
}
int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7};
List<AsBusclaimBill> resultList = new ArrayList<>();
List<AsBusclaimBillExcelInfo> resultList = new ArrayList<>();
boolean isExcel2003 = true;
if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
isExcel2003 = false;
@ -94,17 +91,36 @@ public class AsBusclaimBillRest {
wb = new XSSFWorkbook(is);
}
Sheet sheet = wb.getSheetAt(0);
resultList = getSheetVal(sheet, resultCell);
ReturnExcelInfo importReturn = getSheetVal(sheet, resultCell);
if (StringUtils.isNotBlank(importReturn.getCheckInfo())) {
return ResultBean.fireFail().setMsg(importReturn.getCheckInfo());
}
resultList = importReturn.getInfos();
System.out.println("结果是--->" + resultList);
try {
for (AsBusclaimBill asBusclaimBill : resultList) {
int i = asBusclaimBillService.checkBillNo(asBusclaimBill.getBillNo());
if (i == 0){
return ResultBean.fireFail().setMsg("索赔单号" + asBusclaimBill.getBillNo() + "不存在");
for (AsBusclaimBillExcelInfo asBusclaimBillExcelInfo : resultList) {
int i = asBusclaimBillService.checkBillNo(asBusclaimBillExcelInfo.getBillNo());
if (i == 0) {
return ResultBean.fireFail().setMsg("索赔单号" + asBusclaimBillExcelInfo.getBillNo() + "不存在");
}
}
for (AsBusclaimBill asBusclaimBill : resultList) {
asBusclaimBillService.updateByBillNo(asBusclaimBill);
for (AsBusclaimBillExcelInfo asBusclaimBillExcelInfo : resultList) {
AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNo(asBusclaimBillExcelInfo.getBillNo());
asBusclaimBill.setClaimHourAmount(asBusclaimBillExcelInfo.getClaimHourAmount());
asBusclaimBill.setClaimGoodsAmount(asBusclaimBillExcelInfo.getClaimGoodsAmount());
asBusclaimBill.setClaimOutAmount(asBusclaimBillExcelInfo.getClaimOutAmount());
asBusclaimBill.setClaimSubsidyAmount(asBusclaimBillExcelInfo.getClaimSubsidyAmount());
asBusclaimBill.setClaimOtherAmount(asBusclaimBillExcelInfo.getClaimOtherAmount());
if ("审核中".equals(asBusclaimBillExcelInfo.getState())) {
asBusclaimBill.setState(0);
} else if ("已通过".equals(asBusclaimBillExcelInfo.getState())) {
asBusclaimBill.setState(1);
} else if ("未通过".equals(asBusclaimBillExcelInfo.getState())) {
asBusclaimBill.setState(2);
} else if ("作废".equals(asBusclaimBillExcelInfo.getState())) {
asBusclaimBill.setState(3);
}
asBusclaimBillService.updateById(asBusclaimBill);
}
return ResultBean.fireSuccess().setMsg("数据导入成功");
} catch (Exception e) {
@ -113,67 +129,148 @@ public class AsBusclaimBillRest {
}
}
private List<AsBusclaimBill> getSheetVal(Sheet sheet, int[] resultCell) {
SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");
List<AsBusclaimBill> asBusclaimBillList = new ArrayList<>();
int[] resultIndex = new int[resultCell.length];
AsBusclaimBill asBusclaimBill;
private ReturnExcelInfo getSheetVal(Sheet sheet, int[] resultCell) {
ReturnExcelInfo importReturn = new ReturnExcelInfo();
List<AsBusclaimBillExcelInfo> asBusclaimBillExcelInfoList = new ArrayList<>();
Set<String> checkWord = new HashSet<>();
AsBusclaimBillExcelInfo asBusclaimBillExcelInfo;
for (int r = 1; r <= sheet.getLastRowNum(); r++) {
Row row = sheet.getRow(r);
if (row == null) {
continue;
}
asBusclaimBill = new AsBusclaimBill();
asBusclaimBillExcelInfo = new AsBusclaimBillExcelInfo();
for (int i = 0; i < row.getPhysicalNumberOfCells(); i++) {
String temp = getCellVal(row.getCell(i)).toString().trim();
for (int j = 0; j < resultCell.length; j++) {
if (i == resultCell[j]) {
String trim = new String();
try {
trim = getCellVal(row.getCell(i), i).toString().trim();
if (StringUtils.isBlank(trim)) {
NullPointerException nullPointerException = new NullPointerException();
}
String temp = getCellVal(row.getCell(i), i).toString().trim();
for (int j = 0; j < resultCell.length; j++) {
if (i == resultCell[j]) {
switch (i) {
case 0:
asBusclaimBillExcelInfo.setBillNo(temp);
break;
case 1:
asBusclaimBillExcelInfo.setVinNo(temp);
//车架号
break;
case 2:
//工时费
asBusclaimBillExcelInfo.setClaimHourAmount(new BigDecimal(temp));
break;
case 3:
//材料费
asBusclaimBillExcelInfo.setClaimGoodsAmount(new BigDecimal(temp));
break;
case 4:
//外出费
asBusclaimBillExcelInfo.setClaimOutAmount(new BigDecimal(temp));
break;
case 5:
//厂家补助
asBusclaimBillExcelInfo.setClaimSubsidyAmount(new BigDecimal(temp));
break;
case 6:
//其他费用
asBusclaimBillExcelInfo.setClaimOtherAmount(new BigDecimal(temp));
break;
case 7:
//状态
asBusclaimBillExcelInfo.setState(temp);
break;
default:
break;
}
} else {
continue;
}
}
} catch (Exception e) {
if (StringUtils.isBlank(trim)) {
String word = new String();
switch (i) {
case 0:
asBusclaimBill.setBillNo(temp);
word = "索赔单编号";
break;
case 1:
//车架号
word = "车架号";
break;
case 2:
//工时费
asBusclaimBill.setHourAmount(new BigDecimal(temp));
word = "索赔工时费";
break;
case 3:
//材料费
asBusclaimBill.setGoodsAmount(new BigDecimal(temp));
word = "索赔材料费";
break;
case 4:
//外出费
asBusclaimBill.setClaimOutAmount(new BigDecimal(temp));
word = "索赔外出费";
break;
case 5:
//厂家补助
asBusclaimBill.setClaimSubsidyAmount(new BigDecimal(temp));
word = "索赔厂家补助";
break;
case 6:
//其他费用
asBusclaimBill.setClaimOtherAmount(new BigDecimal(temp));
word = "索赔其他费用";
break;
case 7:
//状态
word = "状态";
break;
default:
break;
}
} else {
continue;
}
}
}
asBusclaimBillList.add(asBusclaimBill);
asBusclaimBillExcelInfoList.add(asBusclaimBillExcelInfo);
if (!asBusclaimBillExcelInfoList.isEmpty()) {
for (AsBusclaimBillExcelInfo excelInfo : asBusclaimBillExcelInfoList) {
if (StringUtils.isBlank(excelInfo.getBillNo())) {
checkWord.add("索赔单编号不能为空");
break;
}
if (StringUtils.isBlank(excelInfo.getVinNo())) {
checkWord.add("车架号不能为空");
break;
}
if (StringUtils.isBlank(excelInfo.getState())) {
checkWord.add("状态不能为空");
break;
} else if (!"审核中".equals(excelInfo.getState()) && !"已通过".equals(excelInfo.getState()) && !"未通过".equals(excelInfo.getState()) && !"作废".equals(excelInfo.getState())) {
checkWord.add("状态必须为(审核中、已通过、未通过、作废)中的其中一种");
break;
}
}
}
StringBuffer sbcheck1 = new StringBuffer();
if (!checkWord.isEmpty()) {
for (String s : checkWord) {
if (StringUtils.isBlank(s)) {
continue;
}
sbcheck1.append(s).append(";");
}
}
if (sbcheck1.length() > 0) {
sbcheck1.delete(sbcheck1.length() - 1, sbcheck1.length());
importReturn.setCheckInfo(sbcheck1.toString());
importReturn.setInfos(new ArrayList<>());
return importReturn;
}
importReturn.setInfos(asBusclaimBillExcelInfoList);
}
return asBusclaimBillList;
return importReturn;
}
public Object getCellVal(Cell cell) {
public Object getCellVal(Cell cell, Integer i) {
Object obj = null;
if (i == 1 || i == 0) {
if (cell != null) {
cell.setCellType(CellType.STRING);
}
}
if (cell != null) {
switch (cell.getCellTypeEnum()) {
case BOOLEAN:

9
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java

@ -4,10 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillDto;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillQuery;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
import com.yxt.anrui.as.api.asbusclaimbill.*;
import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListQuery;
import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListVo;
@ -83,10 +80,6 @@ public class AsBusclaimBillService extends MybatisBaseService<AsBusclaimBillMapp
return baseMapper.checkBillNo(billNo);
}
public void updateByBillNo(AsBusclaimBill asBusclaimBill) {
baseMapper.updateByBillNo(asBusclaimBill);
}
public List<String> selectByRepairBillSid(String repairBillSid) {
return baseMapper.selectByRepairBillSid(repairBillSid);
}

3
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBill;
import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillDetailsVo;
import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -23,4 +24,6 @@ public interface AsBusclaimInvoiceBillMapper extends BaseMapper<AsBusclaimInvoic
int selectBySid(String join);
int updateFlowFiled(Map<String, Object> beanToMap);
AsBusclaimInvoiceBillDetailsVo init(String deptSid);
}

13
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml

@ -43,4 +43,17 @@
</if>
WHERE sid = #{sid}
</update>
<select id="init" resultType="com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillDetailsVo">
SELECT
invoiceSid,
invoiceName,
invoiceKey,
invoiceValue
FROM
as_busclaim_invoice_bill
WHERE createDeptSid = #{deptSid}
ORDER BY createTime DESC
LIMIT 1
</select>
</mapper>

6
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java

@ -58,6 +58,12 @@ public class AsBusclaimInvoiceBillRest {
return asBusclaimInvoiceBillService.delAllBySids(sids);
}
@GetMapping("/init")
@ApiOperation("初始化")
ResultBean<AsBusclaimInvoiceBillDetailsVo> init(@RequestParam("deptSid") String deptSid) {
return asBusclaimInvoiceBillService.init(deptSid);
}
@GetMapping("/details")
@ApiOperation("详情")
ResultBean<AsBusclaimInvoiceBillDetailsVo> details(@RequestParam("sid") String sid) {

26
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java

@ -6,12 +6,14 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill;
import com.yxt.anrui.as.api.asbusclaimcheck.AsBusclaimCheckDto;
import com.yxt.anrui.as.api.asbusclaiminvoicebill.*;
import com.yxt.anrui.as.api.asbusclaiminvoicebill.flowable.*;
import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetail;
import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailDto;
import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailVo;
import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService;
import com.yxt.anrui.as.biz.asbusclaimcheck.AsBusclaimCheckService;
import com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailMapper;
import com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailService;
@ -52,6 +54,7 @@ import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
@ -71,6 +74,8 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
@Autowired
private AsBusclaimInvoiceBillDetailMapper asBusclaimInvoiceBillDetailMapper;
@Autowired
private AsBusclaimBillService asBusclaimBillService;
@Autowired
private FlowFeign flowFeign;
@Autowired
private MessageFeign messageFeign;
@ -544,7 +549,6 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
}
int[] resultCell = new int[]{0, 1, 2, 3, 4, 5};
List<ExcelInfoVo> list = new ArrayList<>();
List<ExcelInfoVo> list2 = new ArrayList<>();
boolean isExcel2003 = true;
if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
isExcel2003 = false;
@ -650,8 +654,20 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
for (ExcelInfoVo excelInfoVo : importVoList) {
if (StringUtils.isBlank(excelInfoVo.getClaimBillNo())) {
checkWord.add("索赔单号不能为空");
}else {
AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNo(excelInfoVo.getClaimBillNo());
if (asBusclaimBill == null){
checkWord.add("索赔单号" + excelInfoVo.getClaimBillNo() + "不存在");
}else {
BigDecimal importMoney = new BigDecimal(excelInfoVo.getClaimHourAmount()).add(new BigDecimal(excelInfoVo.getClaimGoodsAmount()).add(new BigDecimal(excelInfoVo.getClaimOutAmount()).add(new BigDecimal(excelInfoVo.getClaimSubsidyAmount()).add(new BigDecimal(excelInfoVo.getClaimOtherAmount())))));
BigDecimal selectMoney = asBusclaimBill.getClaimHourAmount().add(asBusclaimBill.getClaimGoodsAmount().add(asBusclaimBill.getClaimOutAmount().add(asBusclaimBill.getClaimSubsidyAmount().add(asBusclaimBill.getClaimOtherAmount()))));
if (importMoney.compareTo(selectMoney) != 0){
excelInfoVo.setIsUnanimous(false);
}else {
excelInfoVo.setIsUnanimous(true);
}
}
}
}
}
StringBuffer sbcheck1 = new StringBuffer();
@ -696,4 +712,10 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
}
return obj;
}
public ResultBean<AsBusclaimInvoiceBillDetailsVo> init(String deptSid) {
ResultBean rb = ResultBean.fireFail();
AsBusclaimInvoiceBillDetailsVo init = baseMapper.init(deptSid);
return rb.success().setData(init);
}
}

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoChoice.java

@ -55,6 +55,8 @@ public class PmsSupplierInfoChoice implements Vo {
private String sid;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("开票公司名称")
private String billingCompanyName;
@ApiModelProperty("开票类型key")
private String billingTypeKey;
@ApiModelProperty("开票类型value")

Loading…
Cancel
Save