项目主流程增加字段

base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/entity/ProjectMainFlowEntity.java

@@ -36,6 +36,24 @@ public class ProjectMainFlowEntity extends BaseEntity {
     private String archivistStatus;//归档推送状态
     private String def8;//完工服务额
     private String def7;//J审定服务金额
+    private String def9;//D分包施工费率
+    private String def10;//D辅材费率
+
+    public String getDef9() {
+        return def9;
+    }
+
+    public void setDef9(String def9) {
+        this.def9 = def9;
+    }
+
+    public String getDef10() {
+        return def10;
+    }
+
+    public void setDef10(String def10) {
+        this.def10 = def10;
+    }
 
     public String getDef8() {
         return def8;

base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/entity/ProjectMainFlowEntity.xml

@@ -48,6 +48,8 @@
         ,field0428 as auditResult -- 审定推送结果
         ,field0426 as archivistResult -- 归档推送结果
         ,field0425 as archivistStatus -- 归档推送状态
+        ,field0032 as def9 -- D分包施工费率
+        ,field0033 as def10 -- D辅材费率
     </sql>
 
     <!--查询审计完成的数据，推送BIP新增-->
@@ -64,7 +66,7 @@
         WHERE 1=1
         and CTP_AFFAIR.node_policy = '审计完成' AND CTP_AFFAIR.complete_time is not null
         and CTP_AFFAIR.state = '4' and  CTP_AFFAIR.sub_state = '0' and field0427 is null
-        and rownum &lt; 100 and field0274 in ('浙S-QZWLJS2402YXZ001-05','浙S-QZWLJS2402YXZ001-04','浙D-NB2412TH15001')
+        and rownum &lt; 100 -- and field0274 in ('浙S-QZWLJS2402YXZ001-05','浙S-QZWLJS2402YXZ001-04','浙D-NB2412TH15001')
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null and id != ''"> and id = #{id} </if>
         </trim>
@@ -84,7 +86,7 @@
         WHERE 1=1
         and CTP_AFFAIR.node_policy = '归档' AND CTP_AFFAIR.complete_time is not null
         and CTP_AFFAIR.state = '4' and  CTP_AFFAIR.sub_state = '0' and field0425 is null
-        and rownum &lt; 100 and field0274 in ('浙S-QZWLJS2402YXZ001-05','浙S-QZWLJS2402YXZ001-04','浙D-NB2412TH15001')
+        and rownum &lt; 100 -- and field0274 in ('浙S-QZWLJS2402YXZ001-05','浙S-QZWLJS2402YXZ001-04','浙D-NB2412TH15001')
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null and id != ''"> and id = #{id} </if>
         </trim>

base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowArchivistPluginInitializer.java

@@ -184,6 +184,8 @@ public class ProjectMainFlowArchivistPluginInitializer extends PluginBaseEntity
         htdd01slave4_htdd01slave4.put("def6",projectMainFlowEntity.getDef6());
         htdd01slave4_htdd01slave4.put("def7",projectMainFlowEntity.getDef7());
         htdd01slave4_htdd01slave4.put("def8",projectMainFlowEntity.getDef8());
+        htdd01slave4_htdd01slave4.put("def9",projectMainFlowEntity.getDef9());
+        htdd01slave4_htdd01slave4.put("def10",projectMainFlowEntity.getDef10());
         jsonArray.add(htdd01slave4_htdd01slave4);
         bill.put("htdd01Master",htdd01Master);
         bill.put("htdd01slave4_htdd01slave4",jsonArray);

base-buildpackage/src/main/java/com/hzya/frame/plugin/projectMainFlow/plugin/ProjectMainFlowAuditPluginInitializer.java

@@ -176,6 +176,8 @@ public class ProjectMainFlowAuditPluginInitializer extends PluginBaseEntity {
         htdd01slave4_htdd01slave4.put("def6",projectMainFlowEntity.getDef6());
         htdd01slave4_htdd01slave4.put("def7",projectMainFlowEntity.getDef7());
         htdd01slave4_htdd01slave4.put("def8",projectMainFlowEntity.getDef8());
+        htdd01slave4_htdd01slave4.put("def9",projectMainFlowEntity.getDef9());
+        htdd01slave4_htdd01slave4.put("def10",projectMainFlowEntity.getDef10());
         jsonArray.add(htdd01slave4_htdd01slave4);
         bill.put("htdd01Master",htdd01Master);
         bill.put("htdd01slave4_htdd01slave4",jsonArray);

base-service/src/main/java/com/hzya/frame/sysnew/comparison/serviceData/service/impl/ServiceDataServiceImpl.java

@@ -352,7 +352,7 @@ public class ServiceDataServiceImpl extends BaseService<ComparisonEntity,String>
         List<JSONObject> list = new ArrayList<>();
         try {
             StringBuffer stringBuffer = new StringBuffer();
-            stringBuffer.append("select * from v_cmp_apply where 1=1 and vdef1 is not null  and push_status is null and applysum >0");
+            stringBuffer.append("select * from v_cmp_apply where 1=1 and vdef1 is not null  and push_status is null ");
             mdmModuleSourceEntity.setDataSourceCode(dbCode);
             List<HashMap<String, Object>> hashMaps = serviceDataDao.queryListBySWSource(stringBuffer.toString(), mdmModuleSourceEntity);
             int i = 0;