Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

atms-api/src/main/java/pwc/taxtech/atms/controller/BillDetailController.java

+package pwc.taxtech.atms.controller;
+
+import org.springframework.web.bind.annotation.*;
+import pwc.taxtech.atms.dto.ApiResultDto;
+import pwc.taxtech.atms.dto.billDetail.BillDetailParam;
+import pwc.taxtech.atms.dto.billDetail.BillDetailResult;
+import pwc.taxtech.atms.dto.input.CamelPagingResultDto;
+import pwc.taxtech.atms.service.impl.BillDetailService;
+import pwc.taxtech.atms.vat.entity.BillDetail;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "api/v1/billDetail")
+public class BillDetailController extends BaseController {
+
+    @Resource
+    private BillDetailService billDetailService;
+
+    @PostMapping("queryPage")
+    public CamelPagingResultDto<BillDetailResult> queryPage(@RequestBody BillDetailParam param) {
+        return new CamelPagingResultDto<>(billDetailService.queryPage(param));
+    }
+
+
+    @PostMapping("queryBillTypeGroupBy")
+    public List<String> queryBillTypeGroupBy( @RequestParam(name = "projectId",required = true) String projectId,
+                                              @RequestParam(name = "period",required = true) Integer period) {
+        return billDetailService.queryBillTypeGroupBy(projectId,period);
+    }
+    @PostMapping("update")
+    public ApiResultDto updateConf(@RequestBody BillDetail billDetail) {
+        billDetailService.updateBillDetail(billDetail);
+        return ApiResultDto.success();
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/billDetail/BillDetailParam.java

+package pwc.taxtech.atms.dto.billDetail;
+
+import pwc.taxtech.atms.dto.input.CamelPagingDto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+public class BillDetailParam implements Serializable {
+
+    private static final long serialVersionUID = 3854050681366543422L;
+
+    private CamelPagingDto pageInfo;
+
+    private String billType;
+
+    private String customer;
+
+    private String billContent;
+
+    private String billDate;
+
+    private Long revenueCofId;
+
+    private String department;
+
+    private BigDecimal billTaxRat;
+
+    private String billNumber;
+
+    private String projectId;
+
+    private Integer period;
+
+    private String queryDate;
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public Integer getPeriod() {
+        return period;
+    }
+
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    public String getQueryDate() {
+        return queryDate;
+    }
+
+    public void setQueryDate(String queryDate) {
+        this.queryDate = queryDate;
+    }
+
+    public String getCustomer() {
+        return customer;
+    }
+
+    public void setCustomer(String customer) {
+        this.customer = customer;
+    }
+
+    public Long getRevenueCofId() {
+        return revenueCofId;
+    }
+
+    public void setRevenueCofId(Long revenueCofId) {
+        this.revenueCofId = revenueCofId;
+    }
+
+    public String getBillType() {
+        return billType;
+    }
+
+    public void setBillType(String billType) {
+        this.billType = billType;
+    }
+
+    public String getBillContent() {
+        return billContent;
+    }
+
+    public void setBillContent(String billContent) {
+        this.billContent = billContent;
+    }
+
+    public String getBillDate() {
+        return billDate;
+    }
+
+    public void setBillDate(String billDate) {
+        this.billDate = billDate;
+    }
+
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public BigDecimal getBillTaxRat() {
+        return billTaxRat;
+    }
+
+    public void setBillTaxRat(BigDecimal billTaxRat) {
+        this.billTaxRat = billTaxRat;
+    }
+
+    public String getBillNumber() {
+        return billNumber;
+    }
+
+    public void setBillNumber(String billNumber) {
+        this.billNumber = billNumber;
+    }
+
+    public  CamelPagingDto getPageInfo() {
+        return this.pageInfo;
+    }
+
+    public void setPageInfo(CamelPagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/billDetail/BillDetailResult.java

+package pwc.taxtech.atms.dto.billDetail;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+public class BillDetailResult implements Serializable {
+
+    private static final long serialVersionUID = 4342336578709406470L;
+
+    private Long id;
+
+    private String subject;
+
+    private String customer;
+
+    private String billType;
+
+    private String billContent;
+
+    private BigDecimal billAmount;
+
+    private BigDecimal billTaxRat;
+
+    private BigDecimal billTaxAmount;
+
+    private String OANo;
+
+    private String department;
+
+    private String  billDate;
+
+    private String billCode;
+
+    private String billNumber;
+
+    private String  revenueConfName;
+
+    private Long  revenueCofId;
+
+    private Integer emptyCode;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getCustomer() {
+        return customer;
+    }
+
+    public void setCustomer(String customer) {
+        this.customer = customer;
+    }
+
+    public String getBillType() {
+        return billType;
+    }
+
+    public void setBillType(String billType) {
+        this.billType = billType;
+    }
+
+    public String getBillContent() {
+        return billContent;
+    }
+
+    public void setBillContent(String billContent) {
+        this.billContent = billContent;
+    }
+
+    public BigDecimal getBillAmount() {
+        return billAmount;
+    }
+
+    public void setBillAmount(BigDecimal billAmount) {
+        this.billAmount = billAmount;
+    }
+
+    public BigDecimal getBillTaxRat() {
+        return billTaxRat;
+    }
+
+    public void setBillTaxRat(BigDecimal billTaxRat) {
+        this.billTaxRat = billTaxRat;
+    }
+
+    public BigDecimal getBillTaxAmount() {
+        return billTaxAmount;
+    }
+
+    public void setBillTaxAmount(BigDecimal billTaxAmount) {
+        this.billTaxAmount = billTaxAmount;
+    }
+
+    public String getOANo() {
+        return OANo;
+    }
+
+    public void setOANo(String OANo) {
+        this.OANo = OANo;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public String getBillDate() {
+        return billDate;
+    }
+
+    public void setBillDate(String billDate) {
+        this.billDate = billDate;
+    }
+
+    public String getBillCode() {
+        return billCode;
+    }
+
+    public void setBillCode(String billCode) {
+        this.billCode = billCode;
+    }
+
+    public String getBillNumber() {
+        return billNumber;
+    }
+
+    public void setBillNumber(String billNumber) {
+        this.billNumber = billNumber;
+    }
+
+    public String getRevenueConfName() {
+        return revenueConfName;
+    }
+
+    public void setRevenueConfName(String revenueConfName) {
+        this.revenueConfName = revenueConfName;
+    }
+
+    public Long getRevenueCofId() {
+        return revenueCofId;
+    }
+
+    public void setRevenueCofId(Long revenueCofId) {
+        this.revenueCofId = revenueCofId;
+    }
+
+    public Integer getEmptyCode() {
+        return emptyCode;
+    }
+
+    public void setEmptyCode(Integer emptyCode) {
+        this.emptyCode = emptyCode;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/revenueDetail/RevenueDetailResult.java

@@ -32,6 +32,17 @@ public class RevenueDetailResult implements Serializable {
 
     private String taxOn;
 
+    private Integer emptyCode;
+
+    public Integer getEmptyCode() {
+        return emptyCode;
+    }
+
+    public void setEmptyCode(Integer emptyCode) {
+        this.emptyCode = emptyCode;
+    }
+
+
     public String getSubject() {
         return subject;
     }

atms-api/src/main/java/pwc/taxtech/atms/service/impl/BillDetailService.java

+package pwc.taxtech.atms.service.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.stereotype.Service;
+import pwc.taxtech.atms.dpo.BillDetailDto;
+import pwc.taxtech.atms.dto.billDetail.BillDetailParam;
+import pwc.taxtech.atms.dto.billDetail.BillDetailResult;
+import pwc.taxtech.atms.vat.dao.BillDetailMapper;
+import pwc.taxtech.atms.vat.entity.BillDetail;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class BillDetailService extends BaseService {
+
+    @Resource
+    private BillDetailMapper billDetailMapper;
+
+
+
+    public PageInfo<BillDetailResult> queryPage(BillDetailParam param) {
+        Page page = PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
+        List<BillDetailDto> dataList = billDetailMapper.queryBillWithRevenueConf(param.getBillType(), param.getCustomer(), param.getBillNumber(), param.getRevenueCofId(), param.getBillContent(), param.getDepartment(), param.getBillTaxRat(), param.getBillDate(), param.getProjectId(), param.getPeriod(), param.getQueryDate());
+        PageInfo<BillDetailResult> pageInfo = new PageInfo<>(dataList.stream()
+                .map(o -> beanUtil.copyProperties(o, new BillDetailResult())).collect(Collectors.toList()));
+        pageInfo.setTotal(page.getTotal());
+        return pageInfo;
+    }
+
+    public List<String> queryBillTypeGroupBy(String projectId,Integer period){
+        return billDetailMapper.queryBillTypeGroupBy(projectId,period);
+    }
+
+    public void updateBillDetail(BillDetail billDetail) {
+        billDetailMapper.updateByPrimaryKeySelective(billDetail);
+    }
+}

atms-dao/etc/generator-mysql/vatGeneratorConfig.xml

@@ -41,20 +41,15 @@
             <property name="rootInterface" value="pwc.taxtech.atms.MyVatMapper" />
         </javaClientGenerator>
 
-        <table tableName="revenue_type_mapping" domainObjectName="RevenueTypeMapping">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>
-
      <!--   <table tableName="trial_balance_final" domainObjectName="TrialBalanceFinal">
             <property name="useActualColumnNames" value="false"/>
             <property name="ignoreQualifiersAtRuntime" value="true"/>
         </table>-->
 
-        <!--<table tableName="pwc_report_attach" domainObjectName="PwcReportAttach">-->
-            <!--<property name="useActualColumnNames" value="false"/>-->
-            <!--<property name="ignoreQualifiersAtRuntime" value="true"/>-->
-        <!--</table>-->
+        <table tableName="bill_detail" domainObjectName="BillDetail">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
 
         <!--<table tableName="certified_invoices_list" domainObjectName="CertifiedInvoicesList">
             <property name="useActualColumnNames" value="false"/>

atms-dao/src/main/java/pwc/taxtech/atms/dpo/BillDetailDto.java

+package pwc.taxtech.atms.dpo;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+public class BillDetailDto implements Serializable {
+
+
+    private static final long serialVersionUID = 3576219442624663660L;
+
+    private Long id;
+
+    private String subject;
+
+    private String customer;
+
+    private String billType;
+
+    private String billContent;
+
+    private BigDecimal billAmount;
+
+    private BigDecimal billTaxRat;
+
+    private BigDecimal billTaxAmount;
+
+    private String OANo;
+
+    private String department;
+
+    private String  billDate;
+
+    private String billCode;
+
+    private String billNumber;
+
+    private String  revenueConfName;
+
+    private Long  revenueCofId;
+
+    private Integer emptyCode;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getCustomer() {
+        return customer;
+    }
+
+    public void setCustomer(String customer) {
+        this.customer = customer;
+    }
+
+    public String getBillType() {
+        return billType;
+    }
+
+    public void setBillType(String billType) {
+        this.billType = billType;
+    }
+
+    public String getBillContent() {
+        return billContent;
+    }
+
+    public void setBillContent(String billContent) {
+        this.billContent = billContent;
+    }
+
+    public BigDecimal getBillAmount() {
+        return billAmount;
+    }
+
+    public void setBillAmount(BigDecimal billAmount) {
+        this.billAmount = billAmount;
+    }
+
+    public BigDecimal getBillTaxRat() {
+        return billTaxRat;
+    }
+
+    public void setBillTaxRat(BigDecimal billTaxRat) {
+        this.billTaxRat = billTaxRat;
+    }
+
+    public BigDecimal getBillTaxAmount() {
+        return billTaxAmount;
+    }
+
+    public void setBillTaxAmount(BigDecimal billTaxAmount) {
+        this.billTaxAmount = billTaxAmount;
+    }
+
+    public String getOANo() {
+        return OANo;
+    }
+
+    public void setOANo(String OANo) {
+        this.OANo = OANo;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public String getBillDate() {
+        return billDate;
+    }
+
+    public void setBillDate(String billDate) {
+        this.billDate = billDate;
+    }
+
+    public String getBillCode() {
+        return billCode;
+    }
+
+    public void setBillCode(String billCode) {
+        this.billCode = billCode;
+    }
+
+    public String getBillNumber() {
+        return billNumber;
+    }
+
+    public void setBillNumber(String billNumber) {
+        this.billNumber = billNumber;
+    }
+
+    public String getRevenueConfName() {
+        return revenueConfName;
+    }
+
+    public void setRevenueConfName(String revenueConfName) {
+        this.revenueConfName = revenueConfName;
+    }
+
+    public Long getRevenueCofId() {
+        return revenueCofId;
+    }
+
+    public void setRevenueCofId(Long revenueCofId) {
+        this.revenueCofId = revenueCofId;
+    }
+
+    public Integer getEmptyCode() {
+        return emptyCode;
+    }
+
+    public void setEmptyCode(Integer emptyCode) {
+        this.emptyCode = emptyCode;
+    }
+}

atms-dao/src/main/java/pwc/taxtech/atms/dpo/RevenueDetailDto.java

@@ -32,6 +32,16 @@ public class RevenueDetailDto implements Serializable {
 
     private String taxOn;
 
+    private Integer emptyCode;
+
+    public Integer getEmptyCode() {
+        return emptyCode;
+    }
+
+    public void setEmptyCode(Integer emptyCode) {
+        this.emptyCode = emptyCode;
+    }
+
     public String getSubject() {
         return subject;
     }

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/BillDetailMapper.java

+package pwc.taxtech.atms.vat.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyVatMapper;
+import pwc.taxtech.atms.dpo.BillDetailDto;
+import pwc.taxtech.atms.vat.entity.BillDetail;
+import pwc.taxtech.atms.vat.entity.BillDetailExample;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Mapper
+public interface BillDetailMapper extends MyVatMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    long countByExample(BillDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(BillDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    int insert(BillDetail record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    int insertSelective(BillDetail record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    List<BillDetail> selectByExampleWithRowbounds(BillDetailExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    List<BillDetail> selectByExample(BillDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    BillDetail selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") BillDetail record, @Param("example") BillDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") BillDetail record, @Param("example") BillDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(BillDetail record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(BillDetail record);
+
+    List<BillDetailDto> queryBillWithRevenueConf(
+            @Param("billType") String billType,
+            @Param("customer") String customer,
+            @Param("billNumber") String billNumber,
+            @Param("revenueCofId") Long revenueCofId,
+            @Param("billContent") String billContent,
+            @Param("department") String department,
+            @Param("billTaxRat") BigDecimal billTaxRat,
+            @Param("billDate") String  billDate,
+            @Param("projectId") String projectId,
+            @Param("period") Integer period,
+            @Param("queryDate") String queryDate);
+
+    List<String> queryBillTypeGroupBy(@Param("projectId") String projectId,
+                                      @Param("period") Integer period);
+
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/BillDetail.java

+package pwc.taxtech.atms.vat.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import pwc.taxtech.atms.entity.BaseEntity;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table bill_detail
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class BillDetail extends BaseEntity implements Serializable {
+    /**
+     * Database Column Remarks:
+     *   id
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.id
+     *
+     * @mbg.generated
+     */
+    private Long id;
+
+    /**
+     * Database Column Remarks:
+     *   发票类型
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.bill_type
+     *
+     * @mbg.generated
+     */
+    private String billType;
+
+    /**
+     * Database Column Remarks:
+     *   开票内容
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.bill_content
+     *
+     * @mbg.generated
+     */
+    private String billContent;
+
+    /**
+     * Database Column Remarks:
+     *   金额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.amount
+     *
+     * @mbg.generated
+     */
+    private BigDecimal amount;
+
+    /**
+     * Database Column Remarks:
+     *   税额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.tax_amount
+     *
+     * @mbg.generated
+     */
+    private BigDecimal taxAmount;
+
+    /**
+     * Database Column Remarks:
+     *   开票金额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.bill_amount
+     *
+     * @mbg.generated
+     */
+    private BigDecimal billAmount;
+
+    /**
+     * Database Column Remarks:
+     *   税率
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.tax_rate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal taxRate;
+
+    /**
+     * Database Column Remarks:
+     *    申请人 
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.applicant
+     *
+     * @mbg.generated
+     */
+    private String applicant;
+
+    /**
+     * Database Column Remarks:
+     *   OA申请单号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.oa_no
+     *
+     * @mbg.generated
+     */
+    private String oaNo;
+
+    /**
+     * Database Column Remarks:
+     *   合同编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.contract_no
+     *
+     * @mbg.generated
+     */
+    private String contractNo;
+
+    /**
+     * Database Column Remarks:
+     *   合同金额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.contract_amount
+     *
+     * @mbg.generated
+     */
+    private BigDecimal contractAmount;
+
+    /**
+     * Database Column Remarks:
+     *   reconciliation
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.reconciliation
+     *
+     * @mbg.generated
+     */
+    private String reconciliation;
+
+    /**
+     * Database Column Remarks:
+     *    所属部门 
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.department
+     *
+     * @mbg.generated
+     */
+    private String department;
+
+    /**
+     * Database Column Remarks:
+     *   申请日期 yyyy-mm-dd
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.apply_date
+     *
+     * @mbg.generated
+     */
+    private String applyDate;
+
+    /**
+     * Database Column Remarks:
+     *   开票日期 yyyy-mm-dd
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.bill_date
+     *
+     * @mbg.generated
+     */
+    private String billDate;
+
+    /**
+     * Database Column Remarks:
+     *   开票月份
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.bill_month
+     *
+     * @mbg.generated
+     */
+    private String billMonth;
+
+    /**
+     * Database Column Remarks:
+     *   发票号码
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.bill_no
+     *
+     * @mbg.generated
+     */
+    private String billNo;
+
+    /**
+     * Database Column Remarks:
+     *    备注 
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.remark
+     *
+     * @mbg.generated
+     */
+    private String remark;
+
+    /**
+     * Database Column Remarks:
+     *   发票张数
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.pages
+     *
+     * @mbg.generated
+     */
+    private Integer pages;
+
+    /**
+     * Database Column Remarks:
+     *   收入类别
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.revenue_type
+     *
+     * @mbg.generated
+     */
+    private String revenueType;
+
+    /**
+     * Database Column Remarks:
+     *   发票代码
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.bill_code
+     *
+     * @mbg.generated
+     */
+    private String billCode;
+
+    /**
+     * Database Column Remarks:
+     *   发票状态
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.billStatus
+     *
+     * @mbg.generated
+     */
+    private String billstatus;
+
+    /**
+     * Database Column Remarks:
+     *   revenue_config表主键id
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.revenue_cof_id
+     *
+     * @mbg.generated
+     */
+    private Long revenueCofId;
+
+    /**
+     * Database Column Remarks:
+     *   组织id
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.organization_id
+     *
+     * @mbg.generated
+     */
+    private String organizationId;
+
+    /**
+     * Database Column Remarks:
+     *   项目id
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.project_id
+     *
+     * @mbg.generated
+     */
+    private String projectId;
+
+    /**
+     * Database Column Remarks:
+     *   期数 201901
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.period
+     *
+     * @mbg.generated
+     */
+    private Integer period;
+
+    /**
+     * Database Column Remarks:
+     *   开票主体
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.subject
+     *
+     * @mbg.generated
+     */
+    private String subject;
+
+    /**
+     * Database Column Remarks:
+     *   客户名称
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column bill_detail.customer
+     *
+     * @mbg.generated
+     */
+    private String customer;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.id
+     *
+     * @return the value of bill_detail.id
+     *
+     * @mbg.generated
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.id
+     *
+     * @param id the value for bill_detail.id
+     *
+     * @mbg.generated
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.bill_type
+     *
+     * @return the value of bill_detail.bill_type
+     *
+     * @mbg.generated
+     */
+    public String getBillType() {
+        return billType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.bill_type
+     *
+     * @param billType the value for bill_detail.bill_type
+     *
+     * @mbg.generated
+     */
+    public void setBillType(String billType) {
+        this.billType = billType == null ? null : billType.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.bill_content
+     *
+     * @return the value of bill_detail.bill_content
+     *
+     * @mbg.generated
+     */
+    public String getBillContent() {
+        return billContent;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.bill_content
+     *
+     * @param billContent the value for bill_detail.bill_content
+     *
+     * @mbg.generated
+     */
+    public void setBillContent(String billContent) {
+        this.billContent = billContent == null ? null : billContent.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.amount
+     *
+     * @return the value of bill_detail.amount
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.amount
+     *
+     * @param amount the value for bill_detail.amount
+     *
+     * @mbg.generated
+     */
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.tax_amount
+     *
+     * @return the value of bill_detail.tax_amount
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getTaxAmount() {
+        return taxAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.tax_amount
+     *
+     * @param taxAmount the value for bill_detail.tax_amount
+     *
+     * @mbg.generated
+     */
+    public void setTaxAmount(BigDecimal taxAmount) {
+        this.taxAmount = taxAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.bill_amount
+     *
+     * @return the value of bill_detail.bill_amount
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getBillAmount() {
+        return billAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.bill_amount
+     *
+     * @param billAmount the value for bill_detail.bill_amount
+     *
+     * @mbg.generated
+     */
+    public void setBillAmount(BigDecimal billAmount) {
+        this.billAmount = billAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.tax_rate
+     *
+     * @return the value of bill_detail.tax_rate
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getTaxRate() {
+        return taxRate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.tax_rate
+     *
+     * @param taxRate the value for bill_detail.tax_rate
+     *
+     * @mbg.generated
+     */
+    public void setTaxRate(BigDecimal taxRate) {
+        this.taxRate = taxRate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.applicant
+     *
+     * @return the value of bill_detail.applicant
+     *
+     * @mbg.generated
+     */
+    public String getApplicant() {
+        return applicant;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.applicant
+     *
+     * @param applicant the value for bill_detail.applicant
+     *
+     * @mbg.generated
+     */
+    public void setApplicant(String applicant) {
+        this.applicant = applicant == null ? null : applicant.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.oa_no
+     *
+     * @return the value of bill_detail.oa_no
+     *
+     * @mbg.generated
+     */
+    public String getOaNo() {
+        return oaNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.oa_no
+     *
+     * @param oaNo the value for bill_detail.oa_no
+     *
+     * @mbg.generated
+     */
+    public void setOaNo(String oaNo) {
+        this.oaNo = oaNo == null ? null : oaNo.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.contract_no
+     *
+     * @return the value of bill_detail.contract_no
+     *
+     * @mbg.generated
+     */
+    public String getContractNo() {
+        return contractNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.contract_no
+     *
+     * @param contractNo the value for bill_detail.contract_no
+     *
+     * @mbg.generated
+     */
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo == null ? null : contractNo.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.contract_amount
+     *
+     * @return the value of bill_detail.contract_amount
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getContractAmount() {
+        return contractAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.contract_amount
+     *
+     * @param contractAmount the value for bill_detail.contract_amount
+     *
+     * @mbg.generated
+     */
+    public void setContractAmount(BigDecimal contractAmount) {
+        this.contractAmount = contractAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.reconciliation
+     *
+     * @return the value of bill_detail.reconciliation
+     *
+     * @mbg.generated
+     */
+    public String getReconciliation() {
+        return reconciliation;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.reconciliation
+     *
+     * @param reconciliation the value for bill_detail.reconciliation
+     *
+     * @mbg.generated
+     */
+    public void setReconciliation(String reconciliation) {
+        this.reconciliation = reconciliation == null ? null : reconciliation.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.department
+     *
+     * @return the value of bill_detail.department
+     *
+     * @mbg.generated
+     */
+    public String getDepartment() {
+        return department;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.department
+     *
+     * @param department the value for bill_detail.department
+     *
+     * @mbg.generated
+     */
+    public void setDepartment(String department) {
+        this.department = department == null ? null : department.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.apply_date
+     *
+     * @return the value of bill_detail.apply_date
+     *
+     * @mbg.generated
+     */
+    public String getApplyDate() {
+        return applyDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.apply_date
+     *
+     * @param applyDate the value for bill_detail.apply_date
+     *
+     * @mbg.generated
+     */
+    public void setApplyDate(String applyDate) {
+        this.applyDate = applyDate == null ? null : applyDate.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.bill_date
+     *
+     * @return the value of bill_detail.bill_date
+     *
+     * @mbg.generated
+     */
+    public String getBillDate() {
+        return billDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.bill_date
+     *
+     * @param billDate the value for bill_detail.bill_date
+     *
+     * @mbg.generated
+     */
+    public void setBillDate(String billDate) {
+        this.billDate = billDate == null ? null : billDate.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.bill_month
+     *
+     * @return the value of bill_detail.bill_month
+     *
+     * @mbg.generated
+     */
+    public String getBillMonth() {
+        return billMonth;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.bill_month
+     *
+     * @param billMonth the value for bill_detail.bill_month
+     *
+     * @mbg.generated
+     */
+    public void setBillMonth(String billMonth) {
+        this.billMonth = billMonth == null ? null : billMonth.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.bill_no
+     *
+     * @return the value of bill_detail.bill_no
+     *
+     * @mbg.generated
+     */
+    public String getBillNo() {
+        return billNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.bill_no
+     *
+     * @param billNo the value for bill_detail.bill_no
+     *
+     * @mbg.generated
+     */
+    public void setBillNo(String billNo) {
+        this.billNo = billNo == null ? null : billNo.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.remark
+     *
+     * @return the value of bill_detail.remark
+     *
+     * @mbg.generated
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.remark
+     *
+     * @param remark the value for bill_detail.remark
+     *
+     * @mbg.generated
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.pages
+     *
+     * @return the value of bill_detail.pages
+     *
+     * @mbg.generated
+     */
+    public Integer getPages() {
+        return pages;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.pages
+     *
+     * @param pages the value for bill_detail.pages
+     *
+     * @mbg.generated
+     */
+    public void setPages(Integer pages) {
+        this.pages = pages;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.revenue_type
+     *
+     * @return the value of bill_detail.revenue_type
+     *
+     * @mbg.generated
+     */
+    public String getRevenueType() {
+        return revenueType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.revenue_type
+     *
+     * @param revenueType the value for bill_detail.revenue_type
+     *
+     * @mbg.generated
+     */
+    public void setRevenueType(String revenueType) {
+        this.revenueType = revenueType == null ? null : revenueType.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.bill_code
+     *
+     * @return the value of bill_detail.bill_code
+     *
+     * @mbg.generated
+     */
+    public String getBillCode() {
+        return billCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.bill_code
+     *
+     * @param billCode the value for bill_detail.bill_code
+     *
+     * @mbg.generated
+     */
+    public void setBillCode(String billCode) {
+        this.billCode = billCode == null ? null : billCode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.billStatus
+     *
+     * @return the value of bill_detail.billStatus
+     *
+     * @mbg.generated
+     */
+    public String getBillstatus() {
+        return billstatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.billStatus
+     *
+     * @param billstatus the value for bill_detail.billStatus
+     *
+     * @mbg.generated
+     */
+    public void setBillstatus(String billstatus) {
+        this.billstatus = billstatus == null ? null : billstatus.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.revenue_cof_id
+     *
+     * @return the value of bill_detail.revenue_cof_id
+     *
+     * @mbg.generated
+     */
+    public Long getRevenueCofId() {
+        return revenueCofId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.revenue_cof_id
+     *
+     * @param revenueCofId the value for bill_detail.revenue_cof_id
+     *
+     * @mbg.generated
+     */
+    public void setRevenueCofId(Long revenueCofId) {
+        this.revenueCofId = revenueCofId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.organization_id
+     *
+     * @return the value of bill_detail.organization_id
+     *
+     * @mbg.generated
+     */
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.organization_id
+     *
+     * @param organizationId the value for bill_detail.organization_id
+     *
+     * @mbg.generated
+     */
+    public void setOrganizationId(String organizationId) {
+        this.organizationId = organizationId == null ? null : organizationId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.project_id
+     *
+     * @return the value of bill_detail.project_id
+     *
+     * @mbg.generated
+     */
+    public String getProjectId() {
+        return projectId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.project_id
+     *
+     * @param projectId the value for bill_detail.project_id
+     *
+     * @mbg.generated
+     */
+    public void setProjectId(String projectId) {
+        this.projectId = projectId == null ? null : projectId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.period
+     *
+     * @return the value of bill_detail.period
+     *
+     * @mbg.generated
+     */
+    public Integer getPeriod() {
+        return period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.period
+     *
+     * @param period the value for bill_detail.period
+     *
+     * @mbg.generated
+     */
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.subject
+     *
+     * @return the value of bill_detail.subject
+     *
+     * @mbg.generated
+     */
+    public String getSubject() {
+        return subject;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.subject
+     *
+     * @param subject the value for bill_detail.subject
+     *
+     * @mbg.generated
+     */
+    public void setSubject(String subject) {
+        this.subject = subject == null ? null : subject.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column bill_detail.customer
+     *
+     * @return the value of bill_detail.customer
+     *
+     * @mbg.generated
+     */
+    public String getCustomer() {
+        return customer;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column bill_detail.customer
+     *
+     * @param customer the value for bill_detail.customer
+     *
+     * @mbg.generated
+     */
+    public void setCustomer(String customer) {
+        this.customer = customer == null ? null : customer.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", billType=").append(billType);
+        sb.append(", billContent=").append(billContent);
+        sb.append(", amount=").append(amount);
+        sb.append(", taxAmount=").append(taxAmount);
+        sb.append(", billAmount=").append(billAmount);
+        sb.append(", taxRate=").append(taxRate);
+        sb.append(", applicant=").append(applicant);
+        sb.append(", oaNo=").append(oaNo);
+        sb.append(", contractNo=").append(contractNo);
+        sb.append(", contractAmount=").append(contractAmount);
+        sb.append(", reconciliation=").append(reconciliation);
+        sb.append(", department=").append(department);
+        sb.append(", applyDate=").append(applyDate);
+        sb.append(", billDate=").append(billDate);
+        sb.append(", billMonth=").append(billMonth);
+        sb.append(", billNo=").append(billNo);
+        sb.append(", remark=").append(remark);
+        sb.append(", pages=").append(pages);
+        sb.append(", revenueType=").append(revenueType);
+        sb.append(", billCode=").append(billCode);
+        sb.append(", billstatus=").append(billstatus);
+        sb.append(", revenueCofId=").append(revenueCofId);
+        sb.append(", organizationId=").append(organizationId);
+        sb.append(", projectId=").append(projectId);
+        sb.append(", period=").append(period);
+        sb.append(", subject=").append(subject);
+        sb.append(", customer=").append(customer);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/BillDetailExample.java

+package pwc.taxtech.atms.vat.entity;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+public class BillDetailExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    public BillDetailExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeIsNull() {
+            addCriterion("bill_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeIsNotNull() {
+            addCriterion("bill_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeEqualTo(String value) {
+            addCriterion("bill_type =", value, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeNotEqualTo(String value) {
+            addCriterion("bill_type <>", value, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeGreaterThan(String value) {
+            addCriterion("bill_type >", value, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("bill_type >=", value, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeLessThan(String value) {
+            addCriterion("bill_type <", value, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeLessThanOrEqualTo(String value) {
+            addCriterion("bill_type <=", value, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeLike(String value) {
+            addCriterion("bill_type like", value, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeNotLike(String value) {
+            addCriterion("bill_type not like", value, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeIn(List<String> values) {
+            addCriterion("bill_type in", values, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeNotIn(List<String> values) {
+            addCriterion("bill_type not in", values, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeBetween(String value1, String value2) {
+            addCriterion("bill_type between", value1, value2, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeNotBetween(String value1, String value2) {
+            addCriterion("bill_type not between", value1, value2, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillContentIsNull() {
+            addCriterion("bill_content is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillContentIsNotNull() {
+            addCriterion("bill_content is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillContentEqualTo(String value) {
+            addCriterion("bill_content =", value, "billContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillContentNotEqualTo(String value) {
+            addCriterion("bill_content <>", value, "billContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillContentGreaterThan(String value) {
+            addCriterion("bill_content >", value, "billContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillContentGreaterThanOrEqualTo(String value) {
+            addCriterion("bill_content >=", value, "billContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillContentLessThan(String value) {
+            addCriterion("bill_content <", value, "billContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillContentLessThanOrEqualTo(String value) {
+            addCriterion("bill_content <=", value, "billContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillContentLike(String value) {
+            addCriterion("bill_content like", value, "billContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillContentNotLike(String value) {
+            addCriterion("bill_content not like", value, "billContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillContentIn(List<String> values) {
+            addCriterion("bill_content in", values, "billContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillContentNotIn(List<String> values) {
+            addCriterion("bill_content not in", values, "billContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillContentBetween(String value1, String value2) {
+            addCriterion("bill_content between", value1, value2, "billContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillContentNotBetween(String value1, String value2) {
+            addCriterion("bill_content not between", value1, value2, "billContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountIsNull() {
+            addCriterion("amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountIsNotNull() {
+            addCriterion("amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountEqualTo(BigDecimal value) {
+            addCriterion("amount =", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountNotEqualTo(BigDecimal value) {
+            addCriterion("amount <>", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountGreaterThan(BigDecimal value) {
+            addCriterion("amount >", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("amount >=", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountLessThan(BigDecimal value) {
+            addCriterion("amount <", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("amount <=", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountIn(List<BigDecimal> values) {
+            addCriterion("amount in", values, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountNotIn(List<BigDecimal> values) {
+            addCriterion("amount not in", values, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("amount between", value1, value2, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("amount not between", value1, value2, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountIsNull() {
+            addCriterion("tax_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountIsNotNull() {
+            addCriterion("tax_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountEqualTo(BigDecimal value) {
+            addCriterion("tax_amount =", value, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountNotEqualTo(BigDecimal value) {
+            addCriterion("tax_amount <>", value, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountGreaterThan(BigDecimal value) {
+            addCriterion("tax_amount >", value, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("tax_amount >=", value, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountLessThan(BigDecimal value) {
+            addCriterion("tax_amount <", value, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("tax_amount <=", value, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountIn(List<BigDecimal> values) {
+            addCriterion("tax_amount in", values, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountNotIn(List<BigDecimal> values) {
+            addCriterion("tax_amount not in", values, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("tax_amount between", value1, value2, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("tax_amount not between", value1, value2, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillAmountIsNull() {
+            addCriterion("bill_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillAmountIsNotNull() {
+            addCriterion("bill_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillAmountEqualTo(BigDecimal value) {
+            addCriterion("bill_amount =", value, "billAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillAmountNotEqualTo(BigDecimal value) {
+            addCriterion("bill_amount <>", value, "billAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillAmountGreaterThan(BigDecimal value) {
+            addCriterion("bill_amount >", value, "billAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("bill_amount >=", value, "billAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillAmountLessThan(BigDecimal value) {
+            addCriterion("bill_amount <", value, "billAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("bill_amount <=", value, "billAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillAmountIn(List<BigDecimal> values) {
+            addCriterion("bill_amount in", values, "billAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillAmountNotIn(List<BigDecimal> values) {
+            addCriterion("bill_amount not in", values, "billAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("bill_amount between", value1, value2, "billAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("bill_amount not between", value1, value2, "billAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateIsNull() {
+            addCriterion("tax_rate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateIsNotNull() {
+            addCriterion("tax_rate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateEqualTo(BigDecimal value) {
+            addCriterion("tax_rate =", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateNotEqualTo(BigDecimal value) {
+            addCriterion("tax_rate <>", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateGreaterThan(BigDecimal value) {
+            addCriterion("tax_rate >", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("tax_rate >=", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateLessThan(BigDecimal value) {
+            addCriterion("tax_rate <", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("tax_rate <=", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateIn(List<BigDecimal> values) {
+            addCriterion("tax_rate in", values, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateNotIn(List<BigDecimal> values) {
+            addCriterion("tax_rate not in", values, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("tax_rate between", value1, value2, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("tax_rate not between", value1, value2, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplicantIsNull() {
+            addCriterion("applicant is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplicantIsNotNull() {
+            addCriterion("applicant is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplicantEqualTo(String value) {
+            addCriterion("applicant =", value, "applicant");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplicantNotEqualTo(String value) {
+            addCriterion("applicant <>", value, "applicant");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplicantGreaterThan(String value) {
+            addCriterion("applicant >", value, "applicant");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplicantGreaterThanOrEqualTo(String value) {
+            addCriterion("applicant >=", value, "applicant");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplicantLessThan(String value) {
+            addCriterion("applicant <", value, "applicant");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplicantLessThanOrEqualTo(String value) {
+            addCriterion("applicant <=", value, "applicant");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplicantLike(String value) {
+            addCriterion("applicant like", value, "applicant");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplicantNotLike(String value) {
+            addCriterion("applicant not like", value, "applicant");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplicantIn(List<String> values) {
+            addCriterion("applicant in", values, "applicant");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplicantNotIn(List<String> values) {
+            addCriterion("applicant not in", values, "applicant");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplicantBetween(String value1, String value2) {
+            addCriterion("applicant between", value1, value2, "applicant");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplicantNotBetween(String value1, String value2) {
+            addCriterion("applicant not between", value1, value2, "applicant");
+            return (Criteria) this;
+        }
+
+        public Criteria andOaNoIsNull() {
+            addCriterion("oa_no is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOaNoIsNotNull() {
+            addCriterion("oa_no is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOaNoEqualTo(String value) {
+            addCriterion("oa_no =", value, "oaNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOaNoNotEqualTo(String value) {
+            addCriterion("oa_no <>", value, "oaNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOaNoGreaterThan(String value) {
+            addCriterion("oa_no >", value, "oaNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOaNoGreaterThanOrEqualTo(String value) {
+            addCriterion("oa_no >=", value, "oaNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOaNoLessThan(String value) {
+            addCriterion("oa_no <", value, "oaNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOaNoLessThanOrEqualTo(String value) {
+            addCriterion("oa_no <=", value, "oaNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOaNoLike(String value) {
+            addCriterion("oa_no like", value, "oaNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOaNoNotLike(String value) {
+            addCriterion("oa_no not like", value, "oaNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOaNoIn(List<String> values) {
+            addCriterion("oa_no in", values, "oaNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOaNoNotIn(List<String> values) {
+            addCriterion("oa_no not in", values, "oaNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOaNoBetween(String value1, String value2) {
+            addCriterion("oa_no between", value1, value2, "oaNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOaNoNotBetween(String value1, String value2) {
+            addCriterion("oa_no not between", value1, value2, "oaNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoIsNull() {
+            addCriterion("contract_no is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoIsNotNull() {
+            addCriterion("contract_no is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoEqualTo(String value) {
+            addCriterion("contract_no =", value, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoNotEqualTo(String value) {
+            addCriterion("contract_no <>", value, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoGreaterThan(String value) {
+            addCriterion("contract_no >", value, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoGreaterThanOrEqualTo(String value) {
+            addCriterion("contract_no >=", value, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoLessThan(String value) {
+            addCriterion("contract_no <", value, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoLessThanOrEqualTo(String value) {
+            addCriterion("contract_no <=", value, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoLike(String value) {
+            addCriterion("contract_no like", value, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoNotLike(String value) {
+            addCriterion("contract_no not like", value, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoIn(List<String> values) {
+            addCriterion("contract_no in", values, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoNotIn(List<String> values) {
+            addCriterion("contract_no not in", values, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoBetween(String value1, String value2) {
+            addCriterion("contract_no between", value1, value2, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoNotBetween(String value1, String value2) {
+            addCriterion("contract_no not between", value1, value2, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractAmountIsNull() {
+            addCriterion("contract_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractAmountIsNotNull() {
+            addCriterion("contract_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractAmountEqualTo(BigDecimal value) {
+            addCriterion("contract_amount =", value, "contractAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractAmountNotEqualTo(BigDecimal value) {
+            addCriterion("contract_amount <>", value, "contractAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractAmountGreaterThan(BigDecimal value) {
+            addCriterion("contract_amount >", value, "contractAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("contract_amount >=", value, "contractAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractAmountLessThan(BigDecimal value) {
+            addCriterion("contract_amount <", value, "contractAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("contract_amount <=", value, "contractAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractAmountIn(List<BigDecimal> values) {
+            addCriterion("contract_amount in", values, "contractAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractAmountNotIn(List<BigDecimal> values) {
+            addCriterion("contract_amount not in", values, "contractAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("contract_amount between", value1, value2, "contractAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("contract_amount not between", value1, value2, "contractAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andReconciliationIsNull() {
+            addCriterion("reconciliation is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReconciliationIsNotNull() {
+            addCriterion("reconciliation is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReconciliationEqualTo(String value) {
+            addCriterion("reconciliation =", value, "reconciliation");
+            return (Criteria) this;
+        }
+
+        public Criteria andReconciliationNotEqualTo(String value) {
+            addCriterion("reconciliation <>", value, "reconciliation");
+            return (Criteria) this;
+        }
+
+        public Criteria andReconciliationGreaterThan(String value) {
+            addCriterion("reconciliation >", value, "reconciliation");
+            return (Criteria) this;
+        }
+
+        public Criteria andReconciliationGreaterThanOrEqualTo(String value) {
+            addCriterion("reconciliation >=", value, "reconciliation");
+            return (Criteria) this;
+        }
+
+        public Criteria andReconciliationLessThan(String value) {
+            addCriterion("reconciliation <", value, "reconciliation");
+            return (Criteria) this;
+        }
+
+        public Criteria andReconciliationLessThanOrEqualTo(String value) {
+            addCriterion("reconciliation <=", value, "reconciliation");
+            return (Criteria) this;
+        }
+
+        public Criteria andReconciliationLike(String value) {
+            addCriterion("reconciliation like", value, "reconciliation");
+            return (Criteria) this;
+        }
+
+        public Criteria andReconciliationNotLike(String value) {
+            addCriterion("reconciliation not like", value, "reconciliation");
+            return (Criteria) this;
+        }
+
+        public Criteria andReconciliationIn(List<String> values) {
+            addCriterion("reconciliation in", values, "reconciliation");
+            return (Criteria) this;
+        }
+
+        public Criteria andReconciliationNotIn(List<String> values) {
+            addCriterion("reconciliation not in", values, "reconciliation");
+            return (Criteria) this;
+        }
+
+        public Criteria andReconciliationBetween(String value1, String value2) {
+            addCriterion("reconciliation between", value1, value2, "reconciliation");
+            return (Criteria) this;
+        }
+
+        public Criteria andReconciliationNotBetween(String value1, String value2) {
+            addCriterion("reconciliation not between", value1, value2, "reconciliation");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentIsNull() {
+            addCriterion("department is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentIsNotNull() {
+            addCriterion("department is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentEqualTo(String value) {
+            addCriterion("department =", value, "department");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentNotEqualTo(String value) {
+            addCriterion("department <>", value, "department");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentGreaterThan(String value) {
+            addCriterion("department >", value, "department");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentGreaterThanOrEqualTo(String value) {
+            addCriterion("department >=", value, "department");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentLessThan(String value) {
+            addCriterion("department <", value, "department");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentLessThanOrEqualTo(String value) {
+            addCriterion("department <=", value, "department");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentLike(String value) {
+            addCriterion("department like", value, "department");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentNotLike(String value) {
+            addCriterion("department not like", value, "department");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentIn(List<String> values) {
+            addCriterion("department in", values, "department");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentNotIn(List<String> values) {
+            addCriterion("department not in", values, "department");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentBetween(String value1, String value2) {
+            addCriterion("department between", value1, value2, "department");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentNotBetween(String value1, String value2) {
+            addCriterion("department not between", value1, value2, "department");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyDateIsNull() {
+            addCriterion("apply_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyDateIsNotNull() {
+            addCriterion("apply_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyDateEqualTo(String value) {
+            addCriterion("apply_date =", value, "applyDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyDateNotEqualTo(String value) {
+            addCriterion("apply_date <>", value, "applyDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyDateGreaterThan(String value) {
+            addCriterion("apply_date >", value, "applyDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyDateGreaterThanOrEqualTo(String value) {
+            addCriterion("apply_date >=", value, "applyDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyDateLessThan(String value) {
+            addCriterion("apply_date <", value, "applyDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyDateLessThanOrEqualTo(String value) {
+            addCriterion("apply_date <=", value, "applyDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyDateLike(String value) {
+            addCriterion("apply_date like", value, "applyDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyDateNotLike(String value) {
+            addCriterion("apply_date not like", value, "applyDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyDateIn(List<String> values) {
+            addCriterion("apply_date in", values, "applyDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyDateNotIn(List<String> values) {
+            addCriterion("apply_date not in", values, "applyDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyDateBetween(String value1, String value2) {
+            addCriterion("apply_date between", value1, value2, "applyDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyDateNotBetween(String value1, String value2) {
+            addCriterion("apply_date not between", value1, value2, "applyDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillDateIsNull() {
+            addCriterion("bill_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillDateIsNotNull() {
+            addCriterion("bill_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillDateEqualTo(String value) {
+            addCriterion("bill_date =", value, "billDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillDateNotEqualTo(String value) {
+            addCriterion("bill_date <>", value, "billDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillDateGreaterThan(String value) {
+            addCriterion("bill_date >", value, "billDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillDateGreaterThanOrEqualTo(String value) {
+            addCriterion("bill_date >=", value, "billDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillDateLessThan(String value) {
+            addCriterion("bill_date <", value, "billDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillDateLessThanOrEqualTo(String value) {
+            addCriterion("bill_date <=", value, "billDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillDateLike(String value) {
+            addCriterion("bill_date like", value, "billDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillDateNotLike(String value) {
+            addCriterion("bill_date not like", value, "billDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillDateIn(List<String> values) {
+            addCriterion("bill_date in", values, "billDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillDateNotIn(List<String> values) {
+            addCriterion("bill_date not in", values, "billDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillDateBetween(String value1, String value2) {
+            addCriterion("bill_date between", value1, value2, "billDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillDateNotBetween(String value1, String value2) {
+            addCriterion("bill_date not between", value1, value2, "billDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillMonthIsNull() {
+            addCriterion("bill_month is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillMonthIsNotNull() {
+            addCriterion("bill_month is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillMonthEqualTo(String value) {
+            addCriterion("bill_month =", value, "billMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillMonthNotEqualTo(String value) {
+            addCriterion("bill_month <>", value, "billMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillMonthGreaterThan(String value) {
+            addCriterion("bill_month >", value, "billMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillMonthGreaterThanOrEqualTo(String value) {
+            addCriterion("bill_month >=", value, "billMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillMonthLessThan(String value) {
+            addCriterion("bill_month <", value, "billMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillMonthLessThanOrEqualTo(String value) {
+            addCriterion("bill_month <=", value, "billMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillMonthLike(String value) {
+            addCriterion("bill_month like", value, "billMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillMonthNotLike(String value) {
+            addCriterion("bill_month not like", value, "billMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillMonthIn(List<String> values) {
+            addCriterion("bill_month in", values, "billMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillMonthNotIn(List<String> values) {
+            addCriterion("bill_month not in", values, "billMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillMonthBetween(String value1, String value2) {
+            addCriterion("bill_month between", value1, value2, "billMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillMonthNotBetween(String value1, String value2) {
+            addCriterion("bill_month not between", value1, value2, "billMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillNoIsNull() {
+            addCriterion("bill_no is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillNoIsNotNull() {
+            addCriterion("bill_no is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillNoEqualTo(String value) {
+            addCriterion("bill_no =", value, "billNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillNoNotEqualTo(String value) {
+            addCriterion("bill_no <>", value, "billNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillNoGreaterThan(String value) {
+            addCriterion("bill_no >", value, "billNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillNoGreaterThanOrEqualTo(String value) {
+            addCriterion("bill_no >=", value, "billNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillNoLessThan(String value) {
+            addCriterion("bill_no <", value, "billNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillNoLessThanOrEqualTo(String value) {
+            addCriterion("bill_no <=", value, "billNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillNoLike(String value) {
+            addCriterion("bill_no like", value, "billNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillNoNotLike(String value) {
+            addCriterion("bill_no not like", value, "billNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillNoIn(List<String> values) {
+            addCriterion("bill_no in", values, "billNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillNoNotIn(List<String> values) {
+            addCriterion("bill_no not in", values, "billNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillNoBetween(String value1, String value2) {
+            addCriterion("bill_no between", value1, value2, "billNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillNoNotBetween(String value1, String value2) {
+            addCriterion("bill_no not between", value1, value2, "billNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andPagesIsNull() {
+            addCriterion("pages is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPagesIsNotNull() {
+            addCriterion("pages is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPagesEqualTo(Integer value) {
+            addCriterion("pages =", value, "pages");
+            return (Criteria) this;
+        }
+
+        public Criteria andPagesNotEqualTo(Integer value) {
+            addCriterion("pages <>", value, "pages");
+            return (Criteria) this;
+        }
+
+        public Criteria andPagesGreaterThan(Integer value) {
+            addCriterion("pages >", value, "pages");
+            return (Criteria) this;
+        }
+
+        public Criteria andPagesGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pages >=", value, "pages");
+            return (Criteria) this;
+        }
+
+        public Criteria andPagesLessThan(Integer value) {
+            addCriterion("pages <", value, "pages");
+            return (Criteria) this;
+        }
+
+        public Criteria andPagesLessThanOrEqualTo(Integer value) {
+            addCriterion("pages <=", value, "pages");
+            return (Criteria) this;
+        }
+
+        public Criteria andPagesIn(List<Integer> values) {
+            addCriterion("pages in", values, "pages");
+            return (Criteria) this;
+        }
+
+        public Criteria andPagesNotIn(List<Integer> values) {
+            addCriterion("pages not in", values, "pages");
+            return (Criteria) this;
+        }
+
+        public Criteria andPagesBetween(Integer value1, Integer value2) {
+            addCriterion("pages between", value1, value2, "pages");
+            return (Criteria) this;
+        }
+
+        public Criteria andPagesNotBetween(Integer value1, Integer value2) {
+            addCriterion("pages not between", value1, value2, "pages");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueTypeIsNull() {
+            addCriterion("revenue_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueTypeIsNotNull() {
+            addCriterion("revenue_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueTypeEqualTo(String value) {
+            addCriterion("revenue_type =", value, "revenueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueTypeNotEqualTo(String value) {
+            addCriterion("revenue_type <>", value, "revenueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueTypeGreaterThan(String value) {
+            addCriterion("revenue_type >", value, "revenueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("revenue_type >=", value, "revenueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueTypeLessThan(String value) {
+            addCriterion("revenue_type <", value, "revenueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueTypeLessThanOrEqualTo(String value) {
+            addCriterion("revenue_type <=", value, "revenueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueTypeLike(String value) {
+            addCriterion("revenue_type like", value, "revenueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueTypeNotLike(String value) {
+            addCriterion("revenue_type not like", value, "revenueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueTypeIn(List<String> values) {
+            addCriterion("revenue_type in", values, "revenueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueTypeNotIn(List<String> values) {
+            addCriterion("revenue_type not in", values, "revenueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueTypeBetween(String value1, String value2) {
+            addCriterion("revenue_type between", value1, value2, "revenueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueTypeNotBetween(String value1, String value2) {
+            addCriterion("revenue_type not between", value1, value2, "revenueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillCodeIsNull() {
+            addCriterion("bill_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillCodeIsNotNull() {
+            addCriterion("bill_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillCodeEqualTo(String value) {
+            addCriterion("bill_code =", value, "billCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillCodeNotEqualTo(String value) {
+            addCriterion("bill_code <>", value, "billCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillCodeGreaterThan(String value) {
+            addCriterion("bill_code >", value, "billCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("bill_code >=", value, "billCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillCodeLessThan(String value) {
+            addCriterion("bill_code <", value, "billCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillCodeLessThanOrEqualTo(String value) {
+            addCriterion("bill_code <=", value, "billCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillCodeLike(String value) {
+            addCriterion("bill_code like", value, "billCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillCodeNotLike(String value) {
+            addCriterion("bill_code not like", value, "billCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillCodeIn(List<String> values) {
+            addCriterion("bill_code in", values, "billCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillCodeNotIn(List<String> values) {
+            addCriterion("bill_code not in", values, "billCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillCodeBetween(String value1, String value2) {
+            addCriterion("bill_code between", value1, value2, "billCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillCodeNotBetween(String value1, String value2) {
+            addCriterion("bill_code not between", value1, value2, "billCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillstatusIsNull() {
+            addCriterion("billStatus is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillstatusIsNotNull() {
+            addCriterion("billStatus is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillstatusEqualTo(String value) {
+            addCriterion("billStatus =", value, "billstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillstatusNotEqualTo(String value) {
+            addCriterion("billStatus <>", value, "billstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillstatusGreaterThan(String value) {
+            addCriterion("billStatus >", value, "billstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillstatusGreaterThanOrEqualTo(String value) {
+            addCriterion("billStatus >=", value, "billstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillstatusLessThan(String value) {
+            addCriterion("billStatus <", value, "billstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillstatusLessThanOrEqualTo(String value) {
+            addCriterion("billStatus <=", value, "billstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillstatusLike(String value) {
+            addCriterion("billStatus like", value, "billstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillstatusNotLike(String value) {
+            addCriterion("billStatus not like", value, "billstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillstatusIn(List<String> values) {
+            addCriterion("billStatus in", values, "billstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillstatusNotIn(List<String> values) {
+            addCriterion("billStatus not in", values, "billstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillstatusBetween(String value1, String value2) {
+            addCriterion("billStatus between", value1, value2, "billstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillstatusNotBetween(String value1, String value2) {
+            addCriterion("billStatus not between", value1, value2, "billstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueCofIdIsNull() {
+            addCriterion("revenue_cof_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueCofIdIsNotNull() {
+            addCriterion("revenue_cof_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueCofIdEqualTo(Long value) {
+            addCriterion("revenue_cof_id =", value, "revenueCofId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueCofIdNotEqualTo(Long value) {
+            addCriterion("revenue_cof_id <>", value, "revenueCofId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueCofIdGreaterThan(Long value) {
+            addCriterion("revenue_cof_id >", value, "revenueCofId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueCofIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("revenue_cof_id >=", value, "revenueCofId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueCofIdLessThan(Long value) {
+            addCriterion("revenue_cof_id <", value, "revenueCofId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueCofIdLessThanOrEqualTo(Long value) {
+            addCriterion("revenue_cof_id <=", value, "revenueCofId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueCofIdIn(List<Long> values) {
+            addCriterion("revenue_cof_id in", values, "revenueCofId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueCofIdNotIn(List<Long> values) {
+            addCriterion("revenue_cof_id not in", values, "revenueCofId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueCofIdBetween(Long value1, Long value2) {
+            addCriterion("revenue_cof_id between", value1, value2, "revenueCofId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRevenueCofIdNotBetween(Long value1, Long value2) {
+            addCriterion("revenue_cof_id not between", value1, value2, "revenueCofId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdIsNull() {
+            addCriterion("organization_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdIsNotNull() {
+            addCriterion("organization_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdEqualTo(String value) {
+            addCriterion("organization_id =", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotEqualTo(String value) {
+            addCriterion("organization_id <>", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdGreaterThan(String value) {
+            addCriterion("organization_id >", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdGreaterThanOrEqualTo(String value) {
+            addCriterion("organization_id >=", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdLessThan(String value) {
+            addCriterion("organization_id <", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdLessThanOrEqualTo(String value) {
+            addCriterion("organization_id <=", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdLike(String value) {
+            addCriterion("organization_id like", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotLike(String value) {
+            addCriterion("organization_id not like", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdIn(List<String> values) {
+            addCriterion("organization_id in", values, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotIn(List<String> values) {
+            addCriterion("organization_id not in", values, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdBetween(String value1, String value2) {
+            addCriterion("organization_id between", value1, value2, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotBetween(String value1, String value2) {
+            addCriterion("organization_id not between", value1, value2, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIsNull() {
+            addCriterion("project_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIsNotNull() {
+            addCriterion("project_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdEqualTo(String value) {
+            addCriterion("project_id =", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotEqualTo(String value) {
+            addCriterion("project_id <>", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdGreaterThan(String value) {
+            addCriterion("project_id >", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdGreaterThanOrEqualTo(String value) {
+            addCriterion("project_id >=", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLessThan(String value) {
+            addCriterion("project_id <", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLessThanOrEqualTo(String value) {
+            addCriterion("project_id <=", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLike(String value) {
+            addCriterion("project_id like", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotLike(String value) {
+            addCriterion("project_id not like", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIn(List<String> values) {
+            addCriterion("project_id in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotIn(List<String> values) {
+            addCriterion("project_id not in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdBetween(String value1, String value2) {
+            addCriterion("project_id between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotBetween(String value1, String value2) {
+            addCriterion("project_id not between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIsNull() {
+            addCriterion("period is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIsNotNull() {
+            addCriterion("period is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodEqualTo(Integer value) {
+            addCriterion("period =", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotEqualTo(Integer value) {
+            addCriterion("period <>", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodGreaterThan(Integer value) {
+            addCriterion("period >", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
+            addCriterion("period >=", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodLessThan(Integer value) {
+            addCriterion("period <", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodLessThanOrEqualTo(Integer value) {
+            addCriterion("period <=", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIn(List<Integer> values) {
+            addCriterion("period in", values, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotIn(List<Integer> values) {
+            addCriterion("period not in", values, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodBetween(Integer value1, Integer value2) {
+            addCriterion("period between", value1, value2, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
+            addCriterion("period not between", value1, value2, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectIsNull() {
+            addCriterion("subject is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectIsNotNull() {
+            addCriterion("subject is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectEqualTo(String value) {
+            addCriterion("subject =", value, "subject");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNotEqualTo(String value) {
+            addCriterion("subject <>", value, "subject");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectGreaterThan(String value) {
+            addCriterion("subject >", value, "subject");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectGreaterThanOrEqualTo(String value) {
+            addCriterion("subject >=", value, "subject");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectLessThan(String value) {
+            addCriterion("subject <", value, "subject");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectLessThanOrEqualTo(String value) {
+            addCriterion("subject <=", value, "subject");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectLike(String value) {
+            addCriterion("subject like", value, "subject");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNotLike(String value) {
+            addCriterion("subject not like", value, "subject");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectIn(List<String> values) {
+            addCriterion("subject in", values, "subject");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNotIn(List<String> values) {
+            addCriterion("subject not in", values, "subject");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectBetween(String value1, String value2) {
+            addCriterion("subject between", value1, value2, "subject");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubjectNotBetween(String value1, String value2) {
+            addCriterion("subject not between", value1, value2, "subject");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerIsNull() {
+            addCriterion("customer is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerIsNotNull() {
+            addCriterion("customer is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerEqualTo(String value) {
+            addCriterion("customer =", value, "customer");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerNotEqualTo(String value) {
+            addCriterion("customer <>", value, "customer");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerGreaterThan(String value) {
+            addCriterion("customer >", value, "customer");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerGreaterThanOrEqualTo(String value) {
+            addCriterion("customer >=", value, "customer");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerLessThan(String value) {
+            addCriterion("customer <", value, "customer");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerLessThanOrEqualTo(String value) {
+            addCriterion("customer <=", value, "customer");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerLike(String value) {
+            addCriterion("customer like", value, "customer");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerNotLike(String value) {
+            addCriterion("customer not like", value, "customer");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerIn(List<String> values) {
+            addCriterion("customer in", values, "customer");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerNotIn(List<String> values) {
+            addCriterion("customer not in", values, "customer");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerBetween(String value1, String value2) {
+            addCriterion("customer between", value1, value2, "customer");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerNotBetween(String value1, String value2) {
+            addCriterion("customer not between", value1, value2, "customer");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table bill_detail
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table bill_detail
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/BillDetailMapper.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.BillDetailMapper">
+  <resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.BillDetail">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="bill_type" jdbcType="VARCHAR" property="billType" />
+    <result column="bill_content" jdbcType="VARCHAR" property="billContent" />
+    <result column="amount" jdbcType="DECIMAL" property="amount" />
+    <result column="tax_amount" jdbcType="DECIMAL" property="taxAmount" />
+    <result column="bill_amount" jdbcType="DECIMAL" property="billAmount" />
+    <result column="tax_rate" jdbcType="DECIMAL" property="taxRate" />
+    <result column="applicant" jdbcType="VARCHAR" property="applicant" />
+    <result column="oa_no" jdbcType="VARCHAR" property="oaNo" />
+    <result column="contract_no" jdbcType="VARCHAR" property="contractNo" />
+    <result column="contract_amount" jdbcType="DECIMAL" property="contractAmount" />
+    <result column="reconciliation" jdbcType="VARCHAR" property="reconciliation" />
+    <result column="department" jdbcType="VARCHAR" property="department" />
+    <result column="apply_date" jdbcType="VARCHAR" property="applyDate" />
+    <result column="bill_date" jdbcType="VARCHAR" property="billDate" />
+    <result column="bill_month" jdbcType="VARCHAR" property="billMonth" />
+    <result column="bill_no" jdbcType="VARCHAR" property="billNo" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="pages" jdbcType="INTEGER" property="pages" />
+    <result column="revenue_type" jdbcType="VARCHAR" property="revenueType" />
+    <result column="bill_code" jdbcType="VARCHAR" property="billCode" />
+    <result column="billStatus" jdbcType="VARCHAR" property="billstatus" />
+    <result column="revenue_cof_id" jdbcType="BIGINT" property="revenueCofId" />
+    <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
+    <result column="project_id" jdbcType="VARCHAR" property="projectId" />
+    <result column="period" jdbcType="INTEGER" property="period" />
+    <result column="subject" jdbcType="VARCHAR" property="subject" />
+    <result column="customer" jdbcType="VARCHAR" property="customer" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, bill_type, bill_content, amount, tax_amount, bill_amount, tax_rate, applicant, 
+    oa_no, contract_no, contract_amount, reconciliation, department, apply_date, bill_date, 
+    bill_month, bill_no, remark, pages, revenue_type, bill_code, billStatus, revenue_cof_id, 
+    organization_id, project_id, period, subject, customer
+  </sql>
+  <select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.BillDetailExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from bill_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from bill_detail
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from bill_detail
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="pwc.taxtech.atms.vat.entity.BillDetailExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from bill_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.BillDetail">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into bill_detail (id, bill_type, bill_content, 
+      amount, tax_amount, bill_amount, 
+      tax_rate, applicant, oa_no, 
+      contract_no, contract_amount, reconciliation, 
+      department, apply_date, bill_date, 
+      bill_month, bill_no, remark, 
+      pages, revenue_type, bill_code, 
+      billStatus, revenue_cof_id, organization_id, 
+      project_id, period, subject, 
+      customer)
+    values (#{id,jdbcType=BIGINT}, #{billType,jdbcType=VARCHAR}, #{billContent,jdbcType=VARCHAR}, 
+      #{amount,jdbcType=DECIMAL}, #{taxAmount,jdbcType=DECIMAL}, #{billAmount,jdbcType=DECIMAL}, 
+      #{taxRate,jdbcType=DECIMAL}, #{applicant,jdbcType=VARCHAR}, #{oaNo,jdbcType=VARCHAR}, 
+      #{contractNo,jdbcType=VARCHAR}, #{contractAmount,jdbcType=DECIMAL}, #{reconciliation,jdbcType=VARCHAR}, 
+      #{department,jdbcType=VARCHAR}, #{applyDate,jdbcType=VARCHAR}, #{billDate,jdbcType=VARCHAR}, 
+      #{billMonth,jdbcType=VARCHAR}, #{billNo,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
+      #{pages,jdbcType=INTEGER}, #{revenueType,jdbcType=VARCHAR}, #{billCode,jdbcType=VARCHAR}, 
+      #{billstatus,jdbcType=VARCHAR}, #{revenueCofId,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, 
+      #{projectId,jdbcType=VARCHAR}, #{period,jdbcType=INTEGER}, #{subject,jdbcType=VARCHAR}, 
+      #{customer,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.BillDetail">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into bill_detail
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="billType != null">
+        bill_type,
+      </if>
+      <if test="billContent != null">
+        bill_content,
+      </if>
+      <if test="amount != null">
+        amount,
+      </if>
+      <if test="taxAmount != null">
+        tax_amount,
+      </if>
+      <if test="billAmount != null">
+        bill_amount,
+      </if>
+      <if test="taxRate != null">
+        tax_rate,
+      </if>
+      <if test="applicant != null">
+        applicant,
+      </if>
+      <if test="oaNo != null">
+        oa_no,
+      </if>
+      <if test="contractNo != null">
+        contract_no,
+      </if>
+      <if test="contractAmount != null">
+        contract_amount,
+      </if>
+      <if test="reconciliation != null">
+        reconciliation,
+      </if>
+      <if test="department != null">
+        department,
+      </if>
+      <if test="applyDate != null">
+        apply_date,
+      </if>
+      <if test="billDate != null">
+        bill_date,
+      </if>
+      <if test="billMonth != null">
+        bill_month,
+      </if>
+      <if test="billNo != null">
+        bill_no,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="pages != null">
+        pages,
+      </if>
+      <if test="revenueType != null">
+        revenue_type,
+      </if>
+      <if test="billCode != null">
+        bill_code,
+      </if>
+      <if test="billstatus != null">
+        billStatus,
+      </if>
+      <if test="revenueCofId != null">
+        revenue_cof_id,
+      </if>
+      <if test="organizationId != null">
+        organization_id,
+      </if>
+      <if test="projectId != null">
+        project_id,
+      </if>
+      <if test="period != null">
+        period,
+      </if>
+      <if test="subject != null">
+        subject,
+      </if>
+      <if test="customer != null">
+        customer,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="billType != null">
+        #{billType,jdbcType=VARCHAR},
+      </if>
+      <if test="billContent != null">
+        #{billContent,jdbcType=VARCHAR},
+      </if>
+      <if test="amount != null">
+        #{amount,jdbcType=DECIMAL},
+      </if>
+      <if test="taxAmount != null">
+        #{taxAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="billAmount != null">
+        #{billAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="taxRate != null">
+        #{taxRate,jdbcType=DECIMAL},
+      </if>
+      <if test="applicant != null">
+        #{applicant,jdbcType=VARCHAR},
+      </if>
+      <if test="oaNo != null">
+        #{oaNo,jdbcType=VARCHAR},
+      </if>
+      <if test="contractNo != null">
+        #{contractNo,jdbcType=VARCHAR},
+      </if>
+      <if test="contractAmount != null">
+        #{contractAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="reconciliation != null">
+        #{reconciliation,jdbcType=VARCHAR},
+      </if>
+      <if test="department != null">
+        #{department,jdbcType=VARCHAR},
+      </if>
+      <if test="applyDate != null">
+        #{applyDate,jdbcType=VARCHAR},
+      </if>
+      <if test="billDate != null">
+        #{billDate,jdbcType=VARCHAR},
+      </if>
+      <if test="billMonth != null">
+        #{billMonth,jdbcType=VARCHAR},
+      </if>
+      <if test="billNo != null">
+        #{billNo,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="pages != null">
+        #{pages,jdbcType=INTEGER},
+      </if>
+      <if test="revenueType != null">
+        #{revenueType,jdbcType=VARCHAR},
+      </if>
+      <if test="billCode != null">
+        #{billCode,jdbcType=VARCHAR},
+      </if>
+      <if test="billstatus != null">
+        #{billstatus,jdbcType=VARCHAR},
+      </if>
+      <if test="revenueCofId != null">
+        #{revenueCofId,jdbcType=BIGINT},
+      </if>
+      <if test="organizationId != null">
+        #{organizationId,jdbcType=VARCHAR},
+      </if>
+      <if test="projectId != null">
+        #{projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="period != null">
+        #{period,jdbcType=INTEGER},
+      </if>
+      <if test="subject != null">
+        #{subject,jdbcType=VARCHAR},
+      </if>
+      <if test="customer != null">
+        #{customer,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.BillDetailExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from bill_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update bill_detail
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.billType != null">
+        bill_type = #{record.billType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.billContent != null">
+        bill_content = #{record.billContent,jdbcType=VARCHAR},
+      </if>
+      <if test="record.amount != null">
+        amount = #{record.amount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.taxAmount != null">
+        tax_amount = #{record.taxAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.billAmount != null">
+        bill_amount = #{record.billAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.taxRate != null">
+        tax_rate = #{record.taxRate,jdbcType=DECIMAL},
+      </if>
+      <if test="record.applicant != null">
+        applicant = #{record.applicant,jdbcType=VARCHAR},
+      </if>
+      <if test="record.oaNo != null">
+        oa_no = #{record.oaNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contractNo != null">
+        contract_no = #{record.contractNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contractAmount != null">
+        contract_amount = #{record.contractAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.reconciliation != null">
+        reconciliation = #{record.reconciliation,jdbcType=VARCHAR},
+      </if>
+      <if test="record.department != null">
+        department = #{record.department,jdbcType=VARCHAR},
+      </if>
+      <if test="record.applyDate != null">
+        apply_date = #{record.applyDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.billDate != null">
+        bill_date = #{record.billDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.billMonth != null">
+        bill_month = #{record.billMonth,jdbcType=VARCHAR},
+      </if>
+      <if test="record.billNo != null">
+        bill_no = #{record.billNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pages != null">
+        pages = #{record.pages,jdbcType=INTEGER},
+      </if>
+      <if test="record.revenueType != null">
+        revenue_type = #{record.revenueType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.billCode != null">
+        bill_code = #{record.billCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.billstatus != null">
+        billStatus = #{record.billstatus,jdbcType=VARCHAR},
+      </if>
+      <if test="record.revenueCofId != null">
+        revenue_cof_id = #{record.revenueCofId,jdbcType=BIGINT},
+      </if>
+      <if test="record.organizationId != null">
+        organization_id = #{record.organizationId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.projectId != null">
+        project_id = #{record.projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.period != null">
+        period = #{record.period,jdbcType=INTEGER},
+      </if>
+      <if test="record.subject != null">
+        subject = #{record.subject,jdbcType=VARCHAR},
+      </if>
+      <if test="record.customer != null">
+        customer = #{record.customer,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update bill_detail
+    set id = #{record.id,jdbcType=BIGINT},
+      bill_type = #{record.billType,jdbcType=VARCHAR},
+      bill_content = #{record.billContent,jdbcType=VARCHAR},
+      amount = #{record.amount,jdbcType=DECIMAL},
+      tax_amount = #{record.taxAmount,jdbcType=DECIMAL},
+      bill_amount = #{record.billAmount,jdbcType=DECIMAL},
+      tax_rate = #{record.taxRate,jdbcType=DECIMAL},
+      applicant = #{record.applicant,jdbcType=VARCHAR},
+      oa_no = #{record.oaNo,jdbcType=VARCHAR},
+      contract_no = #{record.contractNo,jdbcType=VARCHAR},
+      contract_amount = #{record.contractAmount,jdbcType=DECIMAL},
+      reconciliation = #{record.reconciliation,jdbcType=VARCHAR},
+      department = #{record.department,jdbcType=VARCHAR},
+      apply_date = #{record.applyDate,jdbcType=VARCHAR},
+      bill_date = #{record.billDate,jdbcType=VARCHAR},
+      bill_month = #{record.billMonth,jdbcType=VARCHAR},
+      bill_no = #{record.billNo,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      pages = #{record.pages,jdbcType=INTEGER},
+      revenue_type = #{record.revenueType,jdbcType=VARCHAR},
+      bill_code = #{record.billCode,jdbcType=VARCHAR},
+      billStatus = #{record.billstatus,jdbcType=VARCHAR},
+      revenue_cof_id = #{record.revenueCofId,jdbcType=BIGINT},
+      organization_id = #{record.organizationId,jdbcType=VARCHAR},
+      project_id = #{record.projectId,jdbcType=VARCHAR},
+      period = #{record.period,jdbcType=INTEGER},
+      subject = #{record.subject,jdbcType=VARCHAR},
+      customer = #{record.customer,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.vat.entity.BillDetail">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update bill_detail
+    <set>
+      <if test="billType != null">
+        bill_type = #{billType,jdbcType=VARCHAR},
+      </if>
+      <if test="billContent != null">
+        bill_content = #{billContent,jdbcType=VARCHAR},
+      </if>
+      <if test="amount != null">
+        amount = #{amount,jdbcType=DECIMAL},
+      </if>
+      <if test="taxAmount != null">
+        tax_amount = #{taxAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="billAmount != null">
+        bill_amount = #{billAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="taxRate != null">
+        tax_rate = #{taxRate,jdbcType=DECIMAL},
+      </if>
+      <if test="applicant != null">
+        applicant = #{applicant,jdbcType=VARCHAR},
+      </if>
+      <if test="oaNo != null">
+        oa_no = #{oaNo,jdbcType=VARCHAR},
+      </if>
+      <if test="contractNo != null">
+        contract_no = #{contractNo,jdbcType=VARCHAR},
+      </if>
+      <if test="contractAmount != null">
+        contract_amount = #{contractAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="reconciliation != null">
+        reconciliation = #{reconciliation,jdbcType=VARCHAR},
+      </if>
+      <if test="department != null">
+        department = #{department,jdbcType=VARCHAR},
+      </if>
+      <if test="applyDate != null">
+        apply_date = #{applyDate,jdbcType=VARCHAR},
+      </if>
+      <if test="billDate != null">
+        bill_date = #{billDate,jdbcType=VARCHAR},
+      </if>
+      <if test="billMonth != null">
+        bill_month = #{billMonth,jdbcType=VARCHAR},
+      </if>
+      <if test="billNo != null">
+        bill_no = #{billNo,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="pages != null">
+        pages = #{pages,jdbcType=INTEGER},
+      </if>
+      <if test="revenueType != null">
+        revenue_type = #{revenueType,jdbcType=VARCHAR},
+      </if>
+      <if test="billCode != null">
+        bill_code = #{billCode,jdbcType=VARCHAR},
+      </if>
+      <if test="billstatus != null">
+        billStatus = #{billstatus,jdbcType=VARCHAR},
+      </if>
+      <if test="revenueCofId != null">
+        revenue_cof_id = #{revenueCofId,jdbcType=BIGINT},
+      </if>
+      <if test="organizationId != null">
+        organization_id = #{organizationId,jdbcType=VARCHAR},
+      </if>
+      <if test="projectId != null">
+        project_id = #{projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="period != null">
+        period = #{period,jdbcType=INTEGER},
+      </if>
+      <if test="subject != null">
+        subject = #{subject,jdbcType=VARCHAR},
+      </if>
+      <if test="customer != null">
+        customer = #{customer,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.vat.entity.BillDetail">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update bill_detail
+    set bill_type = #{billType,jdbcType=VARCHAR},
+      bill_content = #{billContent,jdbcType=VARCHAR},
+      amount = #{amount,jdbcType=DECIMAL},
+      tax_amount = #{taxAmount,jdbcType=DECIMAL},
+      bill_amount = #{billAmount,jdbcType=DECIMAL},
+      tax_rate = #{taxRate,jdbcType=DECIMAL},
+      applicant = #{applicant,jdbcType=VARCHAR},
+      oa_no = #{oaNo,jdbcType=VARCHAR},
+      contract_no = #{contractNo,jdbcType=VARCHAR},
+      contract_amount = #{contractAmount,jdbcType=DECIMAL},
+      reconciliation = #{reconciliation,jdbcType=VARCHAR},
+      department = #{department,jdbcType=VARCHAR},
+      apply_date = #{applyDate,jdbcType=VARCHAR},
+      bill_date = #{billDate,jdbcType=VARCHAR},
+      bill_month = #{billMonth,jdbcType=VARCHAR},
+      bill_no = #{billNo,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      pages = #{pages,jdbcType=INTEGER},
+      revenue_type = #{revenueType,jdbcType=VARCHAR},
+      bill_code = #{billCode,jdbcType=VARCHAR},
+      billStatus = #{billstatus,jdbcType=VARCHAR},
+      revenue_cof_id = #{revenueCofId,jdbcType=BIGINT},
+      organization_id = #{organizationId,jdbcType=VARCHAR},
+      project_id = #{projectId,jdbcType=VARCHAR},
+      period = #{period,jdbcType=INTEGER},
+      subject = #{subject,jdbcType=VARCHAR},
+      customer = #{customer,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.BillDetailExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from bill_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+</mapper>
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/BillDetailExtendsMapper.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.BillDetailMapper">
+
+    <select id="queryBillWithRevenueConf" resultType="pwc.taxtech.atms.dpo.BillDetailDto">
+        select detail.*
+        from (select bd.id as id,
+        bd.subject as subject,
+        bd.customer as customer,
+        bd.bill_type as billType,
+        bd.bill_content as billContent,
+        bd.bill_amount as billAmount,
+        bd.tax_rate as billTaxRat,
+        bd.tax_amount as billTaxAmount,
+        bd.oa_no as OANo,
+        bd.department as department,
+        bd.bill_date as billDate,
+        bd.bill_code as billCode,
+        bd.bill_no as billNumber,
+        bd.revenue_cof_id as revenueCofId,
+        rc.name as revenueConfName,
+        case
+        when rc.id is null then 1
+        <![CDATA[WHEN rc.id IS NOT NULL and (rc.start_date > #{queryDate} or rc.end_date < #{queryDate}) then 1]]>
+        <![CDATA[WHEN rc.id IS NOT NULL and rc.start_date <= #{queryDate} and rc.end_date >= #{queryDate} THEN 2]]>
+        end as emptyCode
+        from bill_detail as bd
+        left join revenue_config as rc on rc.org_id = bd.organization_id and rc.id = bd.revenue_cof_id
+        where bd.project_id = #{projectId}
+        and bd.period = #{period}
+        <if test="billType != null and billType != ''">
+            and bd.bill_type = #{billType}
+        </if>
+        <if test="customer != null and customer != ''">
+            and bd.customer like concat('%',#{customer},'%')
+        </if>
+        <if test="billNumber != null and billNumber != ''">
+            and bd.bill_no like concat('%',#{billNumber},'%')
+        </if>
+        <if test="revenueCofId != null">
+            and bd.revenue_cof_id = #{revenueCofId}
+        </if>
+        <if test="billContent != null and billContent != ''">
+            and bd.bill_content like concat('%',#{billContent},'%')
+        </if>
+        <if test="department != null and department != ''">
+            and bd.department like concat('%',#{department},'%')
+        </if>
+        <if test="billTaxRat != null">
+            and bd.tax_rate = #{billTaxRat}
+        </if>
+        <if test="billDate != null and billDate != ''">
+            and bd.bill_date = #{billDate}
+        </if>
+        ) as detail
+        order by detail.emptyCode,detail.billDate desc
+
+
+    </select>
+
+    <select id="queryBillTypeGroupBy" resultType="java.lang.String">
+    select bill_type
+    from bill_detail
+    where project_id = #{projectId}
+      and period = #{period}
+    group by bill_type;
+
+  </select>
+
+</mapper>
\ No newline at end of file

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

@@ -26,7 +26,7 @@
     when tbf.segment3 like '8002%' and rc.id is null then 1
     <![CDATA[WHEN rc.id IS NOT NULL and (rc.start_date > #{queryDate} or rc.end_date < #{queryDate}) then 1]]>
     <![CDATA[WHEN rc.id IS NOT NULL and rc.start_date <= #{queryDate} and rc.end_date >= #{queryDate} THEN 2]]>
-    else 3 end as   isEmpty
+    else 3 end as   emptyCode
     from trial_balance_final as tbf
     left join
     revenue_config as rc
@@ -70,8 +70,8 @@
     </if>
     ) as detail
     where
-    <![CDATA[detail.isEmpty < 3]]>
-    order by detail.isEmpty
+    <![CDATA[detail.emptyCode < 3]]>
+    order by detail.emptyCode
 
   </select>
 

atms-web/src/main/webapp/Scripts/module-part1.js

@@ -999,6 +999,22 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g
 				deepStateRedirect: true,
 				sticky: true
 			});
+			$stateProvider.state({
+				name: 'vat.reductionData.billDetail',
+				url: '/billDetail',
+				views: {
+					'@vat.reductionData': {
+						controller: ['$scope', '$stateParams', 'appTranslation',
+							function ($scope, $stateParams, appTranslation) {
+								appTranslation.load([appTranslation.vat]);
+							}],
+						template: '<vat-bill-detail></vat-bill-detail>',
+					}
+				},
+				resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat),
+				deepStateRedirect: true,
+				sticky: true
+			});
 		    $stateProvider.state({
 		        name: 'vat.reductionData.unbilledInvoice',
 		        url: '/unbilledInvoice',

atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json

@@ -2173,5 +2173,61 @@
     "RevDetailType": "收入类型",
     "RevDetailCategory": "收入类别",
     "RevDetailTaxOn": "计税方法",
+    "RevDetail": "收入明细",
+	  "RevSearchAccountCode": "科目代码",
+	  "RevSearchAccountName": "科目名称",
+	  "RevSearchProfitCenterCode": "利润中心代码",
+	  "RevSearchProfitCenterName": "利润中心名称",
+	  "RevSearchProductCode": "产品代码",
+	  "RevSearchProductName": "产品名称",
+	  "RevSearchType": "收入类型",
+	  "RevSearchCategory": "收入类别",
+	  "RevSearchTaxOn": "计税方法",
+	  "RevDetailSearch": "查询",
+	  "RevDetailReset": "重置",
+	  "RevDetailColSerialNo": "序号",
+	  "RevDetailColSubject": "主体",
+	  "RevDetailColAccount": "科目",
+	  "RevDetailColProfitCenter": "利润中心",
+	  "RevDetailProduct": "产品",
+	  "RevDetailColSubjectExp": "主体说明",
+	  "RevDetailColAccountExp": "科目说明",
+	  "RevDetailColProfitCenterExp": "利润中心说明",
+	  "RevDetailProductExp": "产品说明",
+	  "RevDetailAmount": "发生额",
+	  "RevDetailType": "收入类型",
+	  "RevDetailCategory": "收入类别",
+	  "RevDetailTaxOn": "计税方法",
+	  "BillDetail": "开票明细",
+	  "BillEditRevenueType": "编辑收入类型",
+	  "BillDtlHandle": "操作",
+	  "BillSearchType": "发票类型",
+	  "BillSearchCustomer": "客户名称",
+	  "BillSearchProfitCenter": "利润中心代码",
+	  "BillSearchContent": "开票内容",
+	  "BillSearchDate": "开票日期",
+	  "BillSearchRevenueType": "收入类型",
+	  "BillSearchDepartment": "申请部门",
+	  "BillSearchTaxRate": "税率",
+	  "BillSearchNumber": "发票号码",
+	  "BillDtlSearch": "查询",
+	  "BillDtlReset": "重置",
+	  "BillDtlMoreSearch": "更多查询",
+	  "BillDtlShrink": "收起",
+	  "BillDtlColSerialNo": "序号",
+	  "BillDtlColSubject": "开票主体",
+	  "BillDtlColCustCompany": "客户公司名称",
+	  "BillDtlColType": "发票类型",
+	  "BillDtlColContent": "开票内容",
+	  "BillDtlColAmount": "开票金额",
+	  "BillDtlColTaxRate": "税率",
+	  "BillDtlColTaxAmount": "税额",
+	  "BillDtlColOANo": "OA申请单号",
+	  "BillDtlColDepartment": "所属部门",
+	  "BillDtlColDate": "开票日期",
+	  "BillDtlColCode": "发票代码",
+	  "BillDtlColNumber": "发票号码",
+	  "BillDtlColRevenueType": "收入类型",
+	  "BillDtlUpdateSuccess": "更新成功",
     "~MustBeEndOneApp": "我必须是最后一个！"
-}
\ No newline at end of file
+}

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -505,6 +505,7 @@ constant.vatPermission = {
         },
 
         revenueDetailCode:'02.003.004',
+        billDetailCode:'02.003.005',
         caculateDataCode: '02.003.003',
 
         unbilledInvoiceCode: '02.003.004',

atms-web/src/main/webapp/app/framework/app-overview/app-overview.ctrl.js

@@ -949,6 +949,8 @@
                         $state.go('vat.reductionData.caculateData');
                     }else if (data[constant.vatPermission.dataManage.revenueDetailCode]){
                         $state.go('vat.reductionData.revenueDetail');
+                    }else if (data[constant.vatPermission.dataManage.billDetailCode]){
+                        $state.go('vat.reductionData.billDetail');
                     }  /*else if (data[constant.vatPermission.dataManage.unbilledInvoiceCode]) {
                         $state.go('vat.reductionData.unbilledInvoice');
                     }*/ else if (data[constant.vatPermission.reportView.bsplCode] || data[constant.vatPermission.reportView.taxReturnCode]) {

atms-web/src/main/webapp/app/vat/import/vat-import-layout/vat-import-layout.ctrl.js

@@ -111,6 +111,10 @@ function ($scope, $log, $translate, $location, loginContext, enums, vatSessionSe
                     name: 'revenueDetail', permission: constant.vatPermission.dataManage.revenueDetailCode,
                     text: $translate.instant('revenueDetail'), icon: 'fa fa-random', show: true
                 },
+                {
+                    name: 'billDetail', permission: constant.vatPermission.dataManage.billDetailCode,
+                    text: $translate.instant('BillDetail'), icon: 'fa fa-random', show: true
+                }
             /*{
                 name: 'accountMapping', permission: constant.vatPermission.dataManage.accountMappingCode,
                 text: $translate.instant('accountMapping'), icon: 'fa fa-map', show: true

atms-web/src/main/webapp/app/vat/reduction/vat-bill-detail/vat-bill-detail.ctrl.js

+vatModule.controller('vatBillDetailController', ['$scope', '$log', '$translate', '$timeout', 'SweetAlert', '$q',
+    '$interval', 'dxDataGridService', '$http', 'apiConfig', 'vatSessionService',
+    function ($scope, $log, $translate, $timeout, SweetAlert, $q, $interval, dxDataGridService, $http, apiConfig, vatSessionService) {
+        'use strict';
+        $log.debug('vatBillDetailController.ctor()...');
+
+        //表格配置
+        $scope.revenueGridOptions = $.extend(true, {}, dxDataGridService.BASIC_GRID_OPTIONS, {
+            columns: [
+
+                {
+                    dataField: 'serialNo',
+                    caption: $translate.instant('BillDtlColSerialNo'),
+                    fixed: true,
+                    allowHeaderFiltering: true, cellTemplate: function (container, options) {
+                        try {
+                            $("<span>" + (options.rowIndex + 1) + "</span>")
+                                .appendTo(container);
+                        } catch (e) {
+                            $log.error(e);
+                        }
+                    }
+                },
+                {
+                    dataField: 'subject',
+                    caption: $translate.instant('BillDtlColSubject'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+                {
+                    dataField: 'customer',
+                    caption: $translate.instant('BillDtlColCustCompany'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+                {
+                    dataField: 'billType',
+                    caption: $translate.instant('BillDtlColType'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+                {
+                    dataField: 'billContent',
+                    caption: $translate.instant('BillDtlColContent'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+                {
+                    dataField: 'billAmount',
+                    caption: $translate.instant('BillDtlColAmount'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+                {
+                    dataField: 'billTaxRat',
+                    caption: $translate.instant('BillDtlColTaxRate'),
+                    fixed: true,
+                    allowHeaderFiltering: true,
+                    calculateCellValue: function (data) {
+                        return (data.billTaxRat * 100) + '%';
+                    }
+                },
+                {
+                    dataField: 'billTaxAmount',
+                    caption: $translate.instant('BillDtlColTaxAmount'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+                {
+                    dataField: 'oano',
+                    caption: $translate.instant('BillDtlColOANo'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+                {
+                    dataField: 'department',
+                    caption: $translate.instant('BillDtlColDepartment'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+                {
+                    dataField: 'billDate',
+                    caption: $translate.instant('BillDtlColDate'),
+                    fixed: true
+                },
+                {
+                    dataField: 'billCode',
+                    caption: $translate.instant('BillDtlColCode'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+                {
+                    dataField: 'billNumber',
+                    caption: $translate.instant('BillDtlColNumber'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+                {
+                    dataField: 'revenueConfName',
+                    caption: $translate.instant('BillDtlColRevenueType'),
+                    fixed: true,
+                    allowHeaderFiltering: true,
+                    cellTemplate: function (container, options) {
+                        try {
+                            if (options.data.revenueConfName == null) {
+                                $('<i class="fa fa-exclamation-circle fa-1x" style="color: yellow" aria-hidden="true "></i>&nbsp;&nbsp;')
+                                    .appendTo(container);
+                            } else {
+                                $("<span>" + options.data.revenueConfName + "</span>")
+                                    .appendTo(container);
+                            }
+                        } catch (e) {
+                            $log.error(e);
+                        }
+                    }
+                }, {
+                    dataField: '',
+                    caption: $translate.instant('BillDtlHandle'),
+                    fixed: true,
+                    width: '80px',
+                    alignment: 'center',
+                    cellTemplate: function (container, options) {
+                        try {
+                            if (options.data.revenueCofId) {
+                                $('<i class="fa fa-pencil-square-o" style="cursor: pointer"></i>&nbsp;&nbsp;')
+                                    .on('click', function () {
+                                        $scope.editRevenue(options.data);
+                                    }).appendTo(container);
+                            }
+                        } catch (e) {
+                            $log.error(e);
+                        }
+                    }
+                },
+            ],
+            bindingOptions: {
+                dataSource: 'pageConfDataSource'
+            }
+        });
+
+
+        //编辑
+        $scope.editRevenue = function (data) {
+            $scope.formParam = data;
+            $('#editRevenueTypeDiv').modal('show');
+        };
+
+        //关闭配置框
+        $scope.cancelModal = function () {
+            $('#configForm')[0].reset();
+        };
+
+        $scope.initDatePicker = function () {
+            var ele1 = $("#periodDatepicker");
+            ele1.datepicker({
+                todayHighlight: true,
+                viewMode: "days",
+                language: "zh-CN",
+                startView: 'days',
+                maxViewMode: 'years',
+                minViewMode: 'days',
+                orientation: "bottom",
+                autoclose: true, //选中之后自动隐藏日期选择框
+                clearBtn: true, //清除按钮
+                todayBtn: false, //今日按钮
+                format: $scope.dateFormat //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
+            });
+        };
+        //刷新页面
+        $scope.refreshGrid = function () {
+            $scope.searchParam.projectId = vatSessionService.project.id;
+            var month = vatSessionService.month < 10 ? ("0" + vatSessionService.month) : vatSessionService.month;
+            $scope.searchParam.period = "" + vatSessionService.year + month;
+            $scope.searchParam.queryDate = vatSessionService.year + "-" + month;
+            $scope.searchParam.pageInfo = {
+                pageIndex: $scope.pagingOptions.pageIndex,
+                totalItems: $scope.pagingOptions.totalItems,
+                pageSize: $scope.pagingOptions.pageSize
+            };
+            console.log('searchParam:' + JSON.stringify($scope.searchParam));
+            $http.post('/billDetail/queryPage', $scope.searchParam, apiConfig.createVat())
+                .success(function (res) {
+                    if (res && res.list) {
+                        $scope.pageConfDataSource = res.list;
+                        $scope.pagingOptions.totalItems = res.pageInfo.totalCount;
+                    } else {
+                        SweetAlert.error($translate.instant('SystemError'));
+                    }
+                })
+        };
+        //搜索框的处理
+        $scope.searchboxService = {
+
+            showOrHideSearchBox: function () {
+                $scope.hasShowMoreSearchBox = !$scope.hasShowMoreSearchBox;
+            },
+            search: function () {
+                $scope.pagingOptions.pageIndex = 1;
+                $scope.refreshGrid();
+            },
+            resetBox: function () {
+                $scope.searchParam = {};
+            }
+        };
+        $scope.revenueTypeAarry = [];
+        $scope.editRevenueTypeAarry = [];
+        $scope.getRevenueType = function () {
+            var month = vatSessionService.month < 10 ? ("0" + vatSessionService.month) : vatSessionService.month;
+            $http.post('/revenueConf/queryAll', {
+                startDate: vatSessionService.year + "-" + month,
+                endDate: vatSessionService.year + "-" + month,
+                orgId: vatSessionService.project.organizationID
+            }, apiConfig.createVat())
+                .success(function (res) {
+                    if (res) {
+                        angular.forEach(res, function (d) {
+                            $scope.revenueTypeAarry.push({'key': d.name, 'val': d.id});
+                            $scope.editRevenueTypeAarry.push({'key': d.name, 'val': d.id});
+                        })
+                    } else {
+                        SweetAlert.error($translate.instant('GetRevenueTypeError'));
+                    }
+                })
+        };
+        $scope.billTypeAarry = [];
+        $scope.getBillType = function () {
+            var month = vatSessionService.month < 10 ? ("0" + vatSessionService.month) : vatSessionService.month;
+            var period = "" + vatSessionService.year + month;
+            $http.post('/billDetail/queryBillTypeGroupBy?projectId=' + vatSessionService.project.id + '&period=' + period, {}, apiConfig.createVat())
+                .success(function (res) {
+                    if (res) {
+                        angular.forEach(res, function (d) {
+                            $scope.billTypeAarry.push({'key': d, 'val': d});
+                        })
+                    } else {
+                        SweetAlert.error($translate.instant('GetRevenueTypeError'));
+                    }
+                })
+        };
+        //添加配置
+        $scope.updateBillDetail = function () {
+            $http.post('/billDetail/update', {
+                id: $scope.formParam.id,
+                revenueCofId: $scope.formParam.revenueCofId
+            }, apiConfig.createVat())
+                .success(function (res) {
+                    if (res && 0 === res.code) {
+                        SweetAlert.success($translate.instant('BillDtlUpdateSuccess'));
+                        $scope.refreshGrid();
+                        $('#editRevenueTypeDiv').modal('hide');
+                    } else {
+                        SweetAlert.error($translate.instant('SystemError'));
+                    }
+                })
+        };
+        (function initialize() {
+
+            $scope.formParam = {};
+            //日期
+            $scope.dateFormat = $translate.instant('dateFormat4YearMonthDay');
+
+            //分页的设置
+            $scope.pagingOptions = {
+                pageIndex: 1,  //当前页码
+                totalItems: 0,  //总数据
+                pageSize: 20  //每页多少条数据
+            };
+
+            $scope.hasShowMoreSearchBox = true;
+
+            $scope.searchParam = {};
+            $scope.editRevenueType = 0;
+            $scope.searchOptions = {
+                revenueTypeOptions: {
+                    displayExpr: 'key',
+                    valueExpr: 'val',
+                    bindingOptions: {
+                        value: 'searchParam.revenueCofId'
+                    },
+                    dataSource: $scope.revenueTypeAarry
+                },
+                editRevenueTypeOptions: {
+                    displayExpr: 'key',
+                    valueExpr: 'val',
+                    bindingOptions: {
+                        value: 'formParam.revenueCofId'
+                    },
+                    dataSource: $scope.editRevenueTypeAarry
+                },
+                billTypeOptions: {
+                    displayExpr: 'key',
+                    valueExpr: 'val',
+                    bindingOptions: {
+                        value: 'searchParam.billType'
+                    },
+                    dataSource: $scope.billTypeAarry
+                },
+                taxRateOptions: {
+                    displayExpr: 'key',
+                    valueExpr: 'val',
+                    bindingOptions: {
+                        value: 'searchParam.billTaxRat'
+                    },
+                    dataSource: [
+                        {'key': '0%', 'val': 0},
+                        {'key': '1.5%', 'val': 0.015},
+                        {'key': '3%', 'val': 0.03},
+                        {'key': '5%', 'val': 0.05},
+                        {'key': '6%', 'val': 0.06},
+                        {'key': '10%', 'val': 0.1},
+                        {'key': '16%', 'val': 0.16},
+                    ]
+                }
+            };
+
+            function init() {
+                $scope.getRevenueType();
+                $scope.getBillType();
+                $scope.refreshGrid();
+                $scope.initDatePicker();
+            }
+
+            init()
+
+        })();
+    }
+]);
\ No newline at end of file

atms-web/src/main/webapp/app/vat/reduction/vat-bill-detail/vat-bill-detail.html

+<div class="vat-bill-detail">
+    <div class="header-title">
+        <div style="display:inline-block"><span class="title-name">{{'BillDetail' | translate }}</span></div>
+    </div>
+    <div class="content-container">
+        <div class="header">
+            <div class="search-panel">
+                <table class="table borderless table-bottom">
+                    <tr>
+                        <td><span class="lbl-name">{{'BillSearchType' | translate }}：</span></td>
+                        <td>
+                            <div dx-select-box="searchOptions.billTypeOptions"></div>
+                        </td>
+                        <td><span class="lbl-name">{{'BillSearchCustomer' | translate }}：</span></td>
+                        <td>
+                            <input class="form-control" name="name" ng-model="searchParam.customer" maxlength="20">
+                        </td>
+                        <td><span class="lbl-name">{{'BillSearchNumber' | translate }}：</span></td>
+                        <td>
+                            <input class="form-control" name="name" ng-model="searchParam.billNumber" maxlength="20">
+                        </td>
+
+                        <td ng-show="!hasShowMoreSearchBox">
+                            <button type="button" class="btn btn-primary invoice-btn"
+                                    ng-click="searchboxService.search()">{{'BillDtlSearch' | translate }}
+                            </button>
+                        </td>
+                        <td ng-show="!hasShowMoreSearchBox">
+                            <button type="button" class="btn btn-primary invoice-btn"
+                                    ng-click="searchboxService.resetBox()">{{'BillDtlReset' | translate }}
+                            </button>
+                        </td>
+                        <td ng-show="!hasShowMoreSearchBox">
+                            <span class="lbl-name">
+                                <a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()"><span><i
+                                        class="fa fa-chevron-down" aria-hidden="true"></i><span
+                                        style="margin-left:3px;">{{'BillDtlMoreSearch' | translate }}</span></span></a>
+                            </span>
+                        </td>
+                    </tr>
+                    <tr ng-show="hasShowMoreSearchBox">
+                        </td>
+                        <td><span class="lbl-name">{{'BillSearchRevenueType' | translate }}：</span></td>
+                        <td>
+                            <div dx-select-box="searchOptions.revenueTypeOptions"></div>
+                        </td>
+                        <td><span class="lbl-name">{{'BillSearchContent' | translate }}：</span></td>
+                        <td>
+                            <input class="form-control" name="name" ng-model="searchParam.billContent" maxlength="20">
+                        </td>
+                        <td><span class="lbl-name">{{'BillSearchDepartment' | translate }}：</span></td>
+                        <td>
+                            <input class="form-control" name="name" ng-model="searchParam.department" maxlength="20">
+                        </td>
+
+
+                    </tr>
+                    <tr ng-show="hasShowMoreSearchBox">
+                        <td><span class="lbl-name">{{'BillSearchTaxRate' | translate }}：</span></td>
+                        <td>
+                            <div dx-select-box="searchOptions.taxRateOptions"></div>
+                        </td>
+                        <td><span class="lbl-name">{{'BillSearchDate' | translate }}：</span></td>
+                        <td>
+                            <div class="period-picker">
+                            <input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;"
+                                   readonly="readonly" ng-model="searchParam.billDate"/>
+                            <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
+                            </div>
+                        </td>
+
+
+                        <td>
+                            <button type="button" class="btn btn-primary invoice-btn"
+                                    ng-click="searchboxService.search()">{{'BillDtlSearch' | translate }}
+                            </button>
+                        </td>
+                        <td>
+                            <button type="button" class="btn btn-primary invoice-btn"
+                                    ng-click="searchboxService.resetBox()">{{'BillDtlReset' | translate }}
+                            </button>
+                        </td>
+                        <td>
+                            <a href="javascript:void(0);" ng-click="searchboxService.showOrHideSearchBox()">
+                                <span><i class="fa fa-chevron-up" aria-hidden="true"></i><span
+                                        style="margin-left:3px;">{{'BillDtlShrink' | translate }}</span></span></a>
+                        </td>
+
+                    </tr>
+                </table>
+            </div>
+        </div>
+        <div class="body">
+
+            <div class="grid-container">
+                <div id="invoiceGridContainer" dx-data-grid="revenueGridOptions">
+                    <div data-options="dxTemplate:{ name:'editCellTemplate' }">
+
+                    </div>
+                </div>
+            </div>
+
+            <div class="page-footer">
+                <ack-pagination page-options="pagingOptions"
+                                refresh-table="refreshGrid()"></ack-pagination>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal fade" id="editRevenueTypeDiv" tabindex="-1" role="dialog">
+        <div class="modal-dialog" style="width: 1200px;" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h3 class="modal-title" id="modal-title">
+                        <span translate="BillEditRevenueType"></span>
+                    </h3>
+                </div>
+                <div class="modal-body" id="modal-body">
+                    <form class="form-horizontal" id="configForm">
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label"><span style="color: red">*</span>{{'BillSearchRevenueType' | translate}}：</label>
+                            <div class="col-sm-4">
+                                <div dx-select-box="searchOptions.editRevenueTypeOptions"></div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-primary" ng-click="updateBillDetail()">{{'Confirm' | translate }}</button>
+                    <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelModal()">{{'Cancel' | translate }}</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+

atms-web/src/main/webapp/app/vat/reduction/vat-bill-detail/vat-bill-detail.js

+vatModule.directive('vatBillDetail', ['$log', 'browserService', '$translate', 'region', '$timeout',
+    function ($log, browserService, $translate, region, $timeout) {
+        $log.debug('vatBillDetail.ctor()...');
+
+        return {
+            restrict: 'E',
+            templateUrl: '/app/vat/reduction/vat-bill-detail/vat-bill-detail.html' + '?_=' + Math.random(),
+            scope: {},
+            controller: 'vatBillDetailController'
+
+        }
+    }
+]);
\ No newline at end of file

atms-web/src/main/webapp/app/vat/reduction/vat-bill-detail/vat-bill-detail.less

+
+@border-color: #d4d4d4;
+@margin-left: 60px;
+@container-width: 970px;
+@control-width: 120px;
+
+//sharing
+.header {
+  padding: 15px;
+
+  img {
+    margin-top: 3px;
+  }
+
+  .search-panel {
+    border: 1px solid #CDCDCD;
+    border-radius: 5px;
+    padding: 5px;
+
+    .row {
+      margin: 10px 0;
+
+      .filter-item {
+        display: inline-block;
+        vertical-align: middle;
+        height: 32px;
+      }
+
+      .fileter-label {
+        text-align: right;
+        height: 32px;
+        padding-top: 5px;
+      }
+
+      .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
+        padding-left: 0;
+      }
+
+      .invoice-btn {
+        min-width: 90px;
+        height: 34px;
+      }
+    }
+
+    .table-bottom {
+      margin-bottom: 0px !important;
+
+      .lbl-name {
+        word-break: keep-all;
+      }
+
+      td {
+        vertical-align: middle;
+      }
+    }
+  }
+}
+
+.table-bottom {
+  margin-bottom: 0px !important;
+
+  .lbl-name {
+    word-break: keep-all;
+  }
+
+  td {
+    vertical-align: middle;
+  }
+}
+
+.red-color {
+  color: #d04a02;
+  /*vertical-align: middle;*/
+}
+
+.dx-widget {
+  font-size: 13px;
+}
+//share
+.header-title {
+  padding: 10px;
+
+  .sub-title {
+    font-family: "Microsoft YaHei";
+    font-weight: 400;
+    font-size: 12px;
+    color: rgb(153, 153, 153);
+  }
+
+  .title-name {
+    font-family: "Microsoft YaHei Bold", "Microsoft YaHei Regular", "Microsoft YaHei";
+    font-weight: 700;
+    font-style: normal;
+  }
+}
+
+.inline-block {
+  display: inline-block;
+
+  .left-side {
+    display: inline-block;
+  }
+
+  .right-side {
+    float: right;
+    display: inline-block;
+  }
+}
+
+
+.invoice-btn {
+  min-width: 80px;
+  height: 28px;
+  margin-right: 10px;
+  font-weight: normal;
+  font-size: 13px;
+  font-family: 'Microsoft YaHei';
+}
+
+.invoice-card {
+  width: 120px;
+  height: 130px;
+  border: 1px dashed @border-color;
+  border: 1px dashed rgba(0, 0, 0, 0.2);
+  border-radius: 5px;
+  background-color: #fff; /*#fbfbfb;*/
+  text-align: center;
+  cursor: pointer;
+  float: left;
+  margin: 10px;
+  position: relative;
+
+
+  &:hover {
+    background-color: #fff !important;
+    box-shadow: #a06748 1px 1px;
+  }
+  //卡片顶部的绝对定位
+  .dx-checkbox-container {
+    position: absolute;
+    left: 59px;
+    top: -8px;
+  }
+}
+
+.span-btn {
+  color: #6699CC;
+  padding: 0px 4px;
+  cursor: pointer;
+  font-size: 12px;
+}
+
+.borderless td, .borderless th {
+  border: none !important;
+  vertical-align: middle !important;
+}
+
+
+.page-footer {
+  display: inline-block;
+  float: right;
+  /*padding-right: 20px;*/
+}
+
+
+
+.invoice-table-dialog {
+  .modal-dialog {
+    min-width: 650px;
+
+    .modal-title {
+      color: red;
+    }
+  }
+}
+
+.invoiceNumber-link {
+  cursor: pointer;
+  /*color:#6699cc;*/
+}
+
+
+.vat-bill-detail {
+  height: 100% !important;
+  padding-top: 0px !important;
+  position: relative;
+  font-size: 13px;
+
+  .period-picker {
+    width: 150px;
+    border: 1px solid #c7c5c0;
+    display: inline-block;
+    line-height: 20px;
+    margin-top: 7px;
+  }
+
+  .imp-subheader {
+    display: inline-block;
+    font-size: 15px;
+    height: 30px;
+    line-height: 30px;
+    vertical-align: middle;
+    border: none;
+
+
+    select {
+      appearance: none;
+      -moz-appearance: none;
+      -webkit-appearance: none;
+      background: transparent;
+    }
+  }
+
+  .dx-datagrid-group-closed:before {
+    /* font-family: "ui-grid"; */
+    font-style: normal;
+    font-weight: normal;
+    speak: none;
+    display: inline-block;
+    text-decoration: inherit;
+    width: 1em;
+    margin-right: .2em;
+    text-align: center;
+    font-variant: normal;
+    text-transform: none;
+    line-height: 1em;
+    margin-left: .2em;
+    content: inherit!important;
+  }
+
+  .header-title {
+    padding: 10px;
+
+    .title-name {
+      font-family: "Microsoft YaHei Bold", "Microsoft YaHei Regular", "Microsoft YaHei";
+      font-weight: 700;
+      font-style: normal;
+    }
+  }
+
+
+  .custom-control {
+    width: @control-width !important;
+    height: 25px;
+    line-height: 25px;
+  }
+
+  .btn-search {
+    width: @control-width !important;
+  }
+
+
+  .content-container {
+    height: calc(~'100% - 40px');
+    position: relative;
+
+    .body {
+
+      .buttom-row {
+        padding: 15px;
+        display: inline-block;
+        width: 100%;
+
+        .left-side {
+          display: inline-block;
+          /*padding-left:5px;*/
+          .select-title {
+            margin-left: 20px;
+          }
+
+          .select-number {
+            padding: 0 1px;
+            color: red;
+          }
+        }
+
+        .right-side {
+          float: right;
+          display: inline-block;
+          /*padding-right:5px;*/
+          .btn {
+            margin-left: 20px;
+          }
+        }
+      }
+
+      .grid-container {
+        padding: 0px 15px;
+        /*height: 350px;*/
+        /*height:100%;*/
+        #invoiceGridContainer {
+          max-height: 100%;
+        }
+
+
+        .dx-datagrid-rowsview .dx-row > .dx-master-detail-cell {
+          padding: 0px !important;
+        }
+
+        .dx-datagrid-nowrap.dx-datagrid-headers .dx-header-row > td > .dx-datagrid-text-content {
+          white-space: normal !important;
+        }
+
+        .internal-grid-container {
+          padding: 10px 10px 10px 0;
+
+
+          & > div:first-child {
+            padding: 0 0 5px 10px;
+            font-size: 13px;
+            /*font-weight: bold;*/
+          }
+        }
+      }
+    }
+  }
+
+  .importVerifyInvoiceModal {
+    .modal-dialog {
+      height: 200px;
+      width: 610px;
+    }
+
+    .modal-footer {
+      text-align: left;
+    }
+  }
+}

atms-web/src/main/webapp/app/vat/reduction/vat-revenue-detail/vat-revenue-detail.ctrl.js

@@ -81,7 +81,7 @@
                     fixed: true,
                     allowHeaderFiltering: true, cellTemplate: function (container, options) {
                         try {
-                            if (options.data.type == null) {
+                            if (options.data.emptyCode == 1 || options.data.type == null) {
                                 $('<i class="fa fa-exclamation-circle fa-1x" style="color: yellow" aria-hidden="true "></i>&nbsp;&nbsp;')
                                     .appendTo(container);
                             } else {
@@ -102,7 +102,7 @@
                     allowHeaderFiltering: true,
                     cellTemplate: function (container, options) {
                         try {
-                            if (options.data.category == null) {
+                            if (options.data.emptyCode == 1 || options.data.category == null) {
                                 $('<i class="fa fa-exclamation-circle fa-1x" style="color: yellow" aria-hidden="true "></i>&nbsp;&nbsp;')
                                     .appendTo(container);
                             } else {
@@ -130,7 +130,7 @@
                     allowHeaderFiltering: true,
                     cellTemplate: function (container, options) {
                         try {
-                            if (options.data.taxOn == null) {
+                            if (options.data.emptyCode == 1 || options.data.taxOn == null) {
                                 $('<i class="fa fa-exclamation-circle fa-1x" style="color: yellow" aria-hidden="true "></i>&nbsp;&nbsp;')
                                     .appendTo(container);
                             } else {

atms-web/src/main/webapp/app/vat/vat-layout/vat-layout.ctrl.js

@@ -143,6 +143,7 @@ function ($scope, $rootScope, $q, $log, $timeout, $state, $translate, projectSer
 
                     constant.vatPermission.dataManage.caculateDataCode,
                     constant.vatPermission.dataManage.revenueDetailCode,
+                    constant.vatPermission.dataManage.billDetailCode,
                     // constant.vatPermission.dataManage.accountMappingCode,
                     // constant.vatPermission.dataManage.goodsMappingCode,
                     // constant.vatPermission.dataManage.unbilledInvoiceCode,
@@ -336,6 +337,10 @@ function ($scope, $rootScope, $q, $log, $timeout, $state, $translate, projectSer
                         name: 'reductionData.revenueDetail', state: 'reductionData.revenueDetail', num: 3,
                         permission: constant.vatPermission.dataManage.revenueDetailCode, url: '#/vat/reductionData/revenueDetail'
                     });
+                    subMenus.push({
+                        name: 'reductionData.billDetail', state: 'reductionData.billDetail', num: 3,
+                        permission: constant.vatPermission.dataManage.billDetailCode, url: '#/vat/reductionData/billDetail'
+                    });
                 }
                 else if (data[constant.vatPermission.dataManage.accountMappingCode]) {
                     $scope.menus.push({