大屏各地市业务办理接口修改（MXY）

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/BusinessTypeEnum.java

@@ -13,7 +13,7 @@ public enum BusinessTypeEnum {
 
     DQJY("dqjy","定期检验"),
     BGDJ("bgdj","变更登记"),
-    ZXBX("zxbx","注销报销");
+    ZXBX("zxbx","注销报废");
 
 
     private BusinessTypeEnum(String code, String name){

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -1694,10 +1694,10 @@
         and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
         and a.inspection_type = 'DQJY'
           <if test="dto.beginDate != null and dto.beginDate != ''">
-        and  date_ge(CAST(a.accept_date as date),#{dto.beginDate})
+        and  date_ge(CAST(a.application_date  as date),#{dto.beginDate})
           </if>
           <if test="dto.endDate != null and dto.endDate != ''">
-        and date_le(CAST(a.accept_date as date),#{dto.endDate})
+        and date_le(CAST(a.application_date  as date),#{dto.endDate})
           </if>
         <if test="dto.companyName != null and dto.companyName != ''">
             and application_unit_name like CONCAT('%', #{dto.companyName}, '%')
@@ -1781,11 +1781,12 @@
     </select>
     <select id="countBizFinishedNumForDPListZXBX" resultType="java.util.Map">
         select a.sequence_nbr as sequenceNbr,use_unit_name as unitName,receive_org_name as receiveOrgName,create_date as createDate,audit_pass_date as handleDate,a.audit_status as status from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%')
+        and audit_status != '使用单位待提交'
         <if test="dto.beginDate != null and dto.beginDate != ''">
-            and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate})
+            and (date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate}) or date_ge(CAST(a.create_date as date),#{dto.beginDate}))
         </if>
         <if test="dto.endDate != null and dto.endDate != ''">
-            and date_le(CAST(a.audit_pass_date as date),#{dto.endDate})
+            and (date_le(CAST(a.audit_pass_date as date),#{dto.endDate}) or date_le(CAST(a.create_date as date),#{dto.endDate}))
         </if>
         <if test="dto.companyName != null and dto.companyName != ''">
             and use_unit_name like CONCAT('%', #{dto.companyName}, '%')