Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/java/com/zjugis/business/bean/entity/Project.java

@@ -61,20 +61,6 @@ public class Project extends BaseEntity {
     private LocalDate xmksrq;
 //项目结束日期
     private LocalDate xmjsrq;
-//项目成本预算
-    private BigDecimal xmcbys;
-//总用车成本
-    private BigDecimal zyccb;
-//总人力成本
-    private BigDecimal zrlcb;
-//总出差成本
-    private BigDecimal zcccb;
-//用车费用预算
-    private BigDecimal ycfyys;
-//人力费用预算
-    private BigDecimal rlfyys;
-//出差费用预算
-    private BigDecimal ccfyys;
 //风险防范预留金
     private BigDecimal fxffylj;
 //利润估算额

zjugis-business/src/main/resources/mapper/oracle/ContractInvoiceMapper.xml

@@ -22,7 +22,7 @@
             </if>
             <if test="params != null and params.invoiceNumber != null and params.invoiceNumber != ''">
                 <bind name="invoiceNumber" value="'%'+params.invoiceNumber+'%'"/>
-                AND T.INVOICE_NO like #{invoiceNumber}
+                AND T.INVOICE_NUMBER like #{invoiceNumber}
             </if>
             <if test="params != null and params.contractName != null and params.contractName != ''">
                 <bind name="contractName" value="'%'+params.contractName+'%'"/>
@@ -83,7 +83,7 @@
             </if>
             <if test="params != null and params.invoiceNumber != null and params.invoiceNumber != ''">
                 <bind name="invoiceNumber" value="'%'+params.invoiceNumber+'%'"/>
-                AND T.INVOICE_NO like #{invoiceNumber}
+                AND T.INVOICE_NUMBER like #{invoiceNumber}
             </if>
             <if test="params != null and params.contractName != null and params.contractName != ''">
                 <bind name="contractName" value="'%'+params.contractName+'%'"/>

zjugis-business/src/main/resources/templates/FlowContractInvoice/apply.ftl

@@ -667,8 +667,18 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                                       </div>
                                   </div>
                               </td>
-                              <td class="th"></td>
-                              <td></td>
+                              <td class="th">
+                                  <div class="form-label">发票号码：</div>
+                              </td>
+                              <td>
+                                  <div class="form-group">
+                                      <div class="form-item">
+                                          <div class="z-comp-input" name="contractInvoice$invoiceNo">
+                                              <input type="text" value="${formEntity.invoiceNo!}">
+                                          </div>
+                                      </div>
+                                  </div>
+                              </td>
                           </tr>
                       </table>
                   </div>