modify

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/WPSR.java

@@ -15,9 +15,9 @@ import pwc.taxtech.atms.constant.enums.FormulaDataSourceType;
 import pwc.taxtech.atms.dto.vatdto.ReportCellDataSourceDto;
 import pwc.taxtech.atms.entity.Organization;
 import pwc.taxtech.atms.entity.Project;
-import pwc.taxtech.atms.vat.dao.HlOutputInterfaceLineMapper;
-import pwc.taxtech.atms.vat.dao.HlOutputOrderKpsqmxbMapper;
-import pwc.taxtech.atms.vat.dao.HlOutputOrderKpsqzbMapper;
+import pwc.taxtech.atms.invoice.HlOutputInterfaceLineMapper;
+import pwc.taxtech.atms.invoice.HlOutputOrderKpsqmxbMapper;
+import pwc.taxtech.atms.invoice.HlOutputOrderKpsqzbMapper;
 import pwc.taxtech.atms.vat.entity.*;
 
 import java.math.BigDecimal;
@@ -44,7 +44,7 @@ public class WPSR extends FunctionBase implements FreeRefFunction {
         }
         Integer type = getIntParam(args[0], ec);
         Integer rate = getIntParam(args[1], ec);
-        String rateStr = String.valueOf(rate / 100);
+        String rateStr = String.valueOf(rate.doubleValue() / 100);
         if (null == type || null == rate) {
             return ZERO_EVAL;
         }
@@ -100,7 +100,7 @@ public class WPSR extends FunctionBase implements FreeRefFunction {
         }
         //todo data source 显示优化
         try {
-            BigDecimal val = NumberUtils.createBigDecimal(result.toString());
+            BigDecimal val = NumberUtils.createBigDecimal(((StringEval) result).getStringValue());
             ReportCellDataSourceDto dto = new ReportCellDataSourceDto();
             dto.setAmount(val);
             dto.setName(DataSourceName.ReportDataSource);

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/HlOutputInterfaceLineMapper.java → atms-dao/src/main/java/pwc/taxtech/atms/invoice/HlOutputInterfaceLineMapper.java

-package pwc.taxtech.atms.vat.dao;
+package pwc.taxtech.atms.invoice;
 
 import java.util.List;
 import org.apache.ibatis.annotations.Mapper;

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/HlOutputOrderKpsqmxbMapper.java → atms-dao/src/main/java/pwc/taxtech/atms/invoice/HlOutputOrderKpsqmxbMapper.java

-package pwc.taxtech.atms.vat.dao;
+package pwc.taxtech.atms.invoice;
 
 import java.util.List;
 import org.apache.ibatis.annotations.Mapper;

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/HlOutputOrderKpsqzbMapper.java → atms-dao/src/main/java/pwc/taxtech/atms/invoice/HlOutputOrderKpsqzbMapper.java

-package pwc.taxtech.atms.vat.dao;
+package pwc.taxtech.atms.invoice;
 
 import java.util.List;
 import org.apache.ibatis.annotations.Mapper;

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/HlOutputInterfaceLineMapper.xml

 <?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="pwc.taxtech.atms.vat.dao.HlOutputInterfaceLineMapper">
+<mapper namespace="pwc.taxtech.atms.invoice.HlOutputInterfaceLineMapper">
   <resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.HlOutputInterfaceLine">
     <!--
       WARNING - @mbg.generated

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/HlOutputOrderKpsqmxbMapper.xml

 <?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="pwc.taxtech.atms.vat.dao.HlOutputOrderKpsqmxbMapper">
+<mapper namespace="pwc.taxtech.atms.invoice.HlOutputOrderKpsqmxbMapper">
   <resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.HlOutputOrderKpsqmxb">
     <!--
       WARNING - @mbg.generated

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/HlOutputOrderKpsqzbMapper.xml

 <?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="pwc.taxtech.atms.vat.dao.HlOutputOrderKpsqzbMapper">
+<mapper namespace="pwc.taxtech.atms.invoice.HlOutputOrderKpsqzbMapper">
   <resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.HlOutputOrderKpsqzb">
     <!--
       WARNING - @mbg.generated