md

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java

@@ -55,7 +55,7 @@ public class EmisSettleInvoiceChRecordController extends BaseController
     /**
      * 查询渠道开票记录表列表
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisSettleInvoiceChRecord:list')")
+//    @PreAuthorize("@ss.hasPermi('emis:emisSettleInvoiceChRecord:list')")
     @GetMapping("/list")
     public TableDataInfo list(EmisSettleInvoiceChRecord emisSettleInvoiceChRecord)
     {

emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml

@@ -126,6 +126,13 @@
             <if test="updateSite != null  and updateSite != ''"> and update_site = #{updateSite}</if>
 
 
+            <if test="params.beginCreateTime != null and params.beginCreateTime != ''">
+                and create_time <![CDATA[ >= ]]>  #{params.beginCreateTime}
+            </if>
+            <if test="params.endCreateTime != null and params.endCreateTime != ''">
+                and create_time <![CDATA[ <= ]]>  #{params.endCreateTime}
+            </if>
+
 
             <if test="params.canOpenBill != null and params.canOpenBill == 1">
                     and open_bill_status != '1'

emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml

@@ -385,11 +385,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <delete id="deleteEmisSettleInvoiceChRecordById" parameterType="Long">
-        update emis_settle_invoice_ch_record set del_flag='0' where id = #{id}
+        update emis_settle_invoice_ch_record set del_flag='1' where id = #{id}
     </delete>
 
     <delete id="deleteEmisSettleInvoiceChRecordByIds" parameterType="String">
-        update emis_settle_invoice_ch_record set del_flag='0' where id in
+        update emis_settle_invoice_ch_record set del_flag='1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml

@@ -27,12 +27,12 @@
         <result property="realTaxType"    column="real_tax_type"    />
         <result property="openMoneyMax"    column="open_money_max"    />
         <result property="openMoney"    column="open_money"    />
-        <result property="invoiceNo"    column="invoice_no"    />
+
         <result property="invoiceStatus"    column="invoice_status"    />
         <result property="invoiceStatusDesc"    column="invoice_status_desc"    />
         <result property="recieveAddress"    column="recieve_address"    />
         <result property="email"    column="email"    />
-        <result property="filePath"    column="file_path"    />
+
         <result property="blAudit"    column="bl_audit"    />
         <result property="auditDate"    column="audit_date"    />
         <result property="auditManCode"    column="audit_man_code"    />
@@ -46,6 +46,10 @@
         <result property="openChStatusDesc"    column="open_ch_status_desc"    />
         <result property="openComCode"    column="open_com_code"    />
 
+        <result property="filePath"    column="file_path"    />
+
+        <result property="invoiceNo"    column="invoice_no"    />
+
 
         <association property="applyManName"    column="apply_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
         <association property="applySiteName"    column="apply_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>

emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml

@@ -192,6 +192,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and  a.send_date <![CDATA[ <= ]]>  #{params.endSendDate}
             </if>
 
+            <if test="params.beginCreateTime != null and params.beginCreateTime != ''">
+                and b.create_time <![CDATA[ >= ]]>  #{params.beginCreateTime}
+            </if>
+            <if test="params.endCreateTime != null and params.endCreateTime != ''">
+                and b.create_time <![CDATA[ <= ]]>  #{params.endCreateTime}
+            </if>
+
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
                     a.salesmen=#{params.privEmpName}

emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml

@@ -242,11 +242,11 @@
     </update>
 
     <delete id="deleteEmisSiteAccountById" parameterType="Long">
-       update emis_site_account set del_flag='0' where id = #{id}
+       update emis_site_account set del_flag='1' where id = #{id}
     </delete>
 
     <delete id="deleteEmisSiteAccountByIds" parameterType="String">
-        update emis_site_account set del_flag='0' where id in
+        update emis_site_account set del_flag='1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>