合同执行预警查询元数据增加类型字段

backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/query/ContractWarningExe.mk

@@ -68,6 +68,15 @@
         </ref>
         <description></description>
       </field>
+      <field title='类型'>
+        <name>billType</name>
+        <type>string</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
       <field title='备注'>
         <name>memo</name>
         <type>string</type>

backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/query/ContractWarningExe.jmx

@@ -80,6 +80,16 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
+					<m:name>billType</m:name>
+					<m:title>类型</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
 					<m:name>memo</m:name>
 					<m:title>备注</m:title>
 					<m:type>string</m:type>

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/dao/DischargingDaoImpl.java

@@ -93,6 +93,7 @@ public class DischargingDaoImpl extends AbstractBaseDao implements DischargingDa
         KClass bean = Amino.getStaticMetadataContext().getBean(DischargingConstant.ENTITY, KClass.class);
         DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
         dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
+        detachedCriteria.add(Restrictions.eq("del", false));
         if(null==creatorId){
             creatorId=AminoContextHolder.getContext().getStaff().getUuid(BaseConstants.ID);
         }