分包合同发起签订bug修改

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

@@ -8,7 +8,7 @@
         LEFT JOIN ASSET_PROCURE T1 ON T.ASSET_ID=T1.ID
         LEFT JOIN PROJECT T2 ON T1.PROJECT_ID=T2.ID
         <where>
-            T.ISVALID = 1 and T1.ISVALID = 1 AND T1.PROCURE_TYPE in (1,3) AND T1.FLOW_STATUS=90
+            T.ISVALID = 1 and T1.ISVALID = 1  AND T1.FLOW_STATUS=90
             <if test="params != null and params.state != null and params.state != ''">
                 AND T.state = #{params.state}
             </if>
@@ -77,7 +77,7 @@
         LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID_BAK = US.DEPT_ID_BAK
 
         <where>
-            T.ISVALID = 1 AND T.FLOW_STATUS = 90 AND T.PROCURE_TYPE in (1,3)
+            T.ISVALID = 1 AND T.FLOW_STATUS = 90
             <if test="params != null and params.userId != null and params.userId != ''">
                 AND T.USER_ID = #{params.userId}
             </if>

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

@@ -37,10 +37,10 @@
                 L.AGREED_PAY_TIME
             </when>
             <otherwise>
-                L.CREATE_TIME
+                L.APPLY_DATE
             </otherwise>
         </choose>
-        DESC nulls last
+        DESC nulls last,LOAN_NUMBER
     </select>
     <select id="getCount" resultType="java.lang.Integer">
         SELECT count(*)

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

@@ -27,26 +27,26 @@
             LEFT JOIN	WF_USE_MONEY T2 ON T1.USE_MONEY_ID = T2.ID
             LEFT JOIN PROJECT T3 ON T2.PROJECT_ID=T3.ID
         <where>
-            T1.COST_TYPE LIKE '14%'
-            <if test="params != null and params.costType != null">
+            T1.COST_TYPE LIKE '14%' and T2.FLOW_STATUS=90
+            <if test="params != null and params.costType != null and params.costType != ''">
                 AND T1.COST_TYPE = #{params.costType}
             </if>
-            <if test="params != null and params.useMoneyNo != null">
+            <if test="params != null and params.useMoneyNo != null and params.useMoneyNo != ''">
                 AND T2.USE_MONEY_NO = #{params.useMoneyNo}
             </if>
-            <if test="params != null and params.totalAmount != null">
+            <if test="params != null and params.totalAmount != null and params.totalAmount != ''">
                 AND T2.TOTAL_AMOUNT = #{params.totalAmount}
             </if>
             <if test="params != null and params.status != null  and params.status != ''">
                 AND T1.I_WRITE_OFF = #{params.status}
             </if>
-            <if test="params != null and params.userId != null">
+            <if test="params != null and params.userId != null and params.userId != ''">
                 AND T2.USER_ID = #{params.userId}
             </if>
-            <if test="params != null and params.applyOn != null">
+            <if test="params != null and params.applyOn != null and params.applyOn != ''">
                 AND T2.APPLY_TIME &gt;= #{params.applyOn}
             </if>
-            <if test="params != null and params.applyOff != null">
+            <if test="params != null and params.applyOff != null and params.applyOff != ''">
                 AND T2.APPLY_TIME &lt;= #{params.applyOff}
             </if>
             <if test="params != null and params.DeptList != null and params.DeptList.size > 0">
@@ -93,22 +93,22 @@
                     #{item,jdbcType=VARCHAR}
                 </foreach>
             </if>
-            <if test="params != null and params.costType != null">
+            <if test="params != null and params.costType != null and params.costType != ''">
                 AND T1.COST_TYPE = #{params.costType}
             </if>
-            <if test="params != null and params.totalAmount != null">
+            <if test="params != null and params.totalAmount != null and params.totalAmount != ''">
                 AND T2.TOTAL_AMOUNT = #{params.totalAmount}
             </if>
-            <if test="params != null and params.userId != null">
-                AND T2.USER_ID = #{params.userId}
-            </if>
-            <if test="params != null and params.status != null and params.status != ''">
+            <if test="params != null and params.status != null  and params.status != ''">
                 AND T1.I_WRITE_OFF = #{params.status}
             </if>
-            <if test="params != null and params.applyOn != null">
+            <if test="params != null and params.userId != null and params.userId != ''">
+                AND T2.USER_ID = #{params.userId}
+            </if>
+            <if test="params != null and params.applyOn != null and params.applyOn != ''">
                 AND T2.APPLY_TIME &gt;= #{params.applyOn}
             </if>
-            <if test="params != null and params.applyOff != null">
+            <if test="params != null and params.applyOff != null and params.applyOff != ''">
                 AND T2.APPLY_TIME &lt;= #{params.applyOff}
             </if>
             <if test="params != null and params.DeptList != null and params.DeptList.size > 0">
@@ -143,25 +143,25 @@
         LEFT JOIN project T3 ON T2.PROJECT_ID=T3.ID
         <where>
             T1.ISVALID = 1 and T2.FLOW_STATUS=90  AND T2.ISVALID = 1 and T1.COST_TYPE LIKE '14%'
-            <if test="params != null and params.costType != null">
+            <if test="params != null and params.costType != null and params.costType != ''">
                 AND T1.COST_TYPE = #{params.costType}
             </if>
-            <if test="params != null and params.useMoneyNo != null">
+            <if test="params != null and params.useMoneyNo != null and params.useMoneyNo != ''">
                 AND T2.USE_MONEY_NO = #{params.useMoneyNo}
             </if>
-            <if test="params != null and params.totalAmount != null">
+            <if test="params != null and params.totalAmount != null and params.totalAmount != ''">
                 AND T2.TOTAL_AMOUNT = #{params.totalAmount}
             </if>
-            <if test="params != null and params.userId != null">
-                AND T2.USER_ID = #{params.userId}
-            </if>
             <if test="params != null and params.status != null  and params.status != ''">
                 AND T1.I_WRITE_OFF = #{params.status}
             </if>
-            <if test="params != null and params.applyOn != null">
+            <if test="params != null and params.userId != null and params.userId != ''">
+                AND T2.USER_ID = #{params.userId}
+            </if>
+            <if test="params != null and params.applyOn != null and params.applyOn != ''">
                 AND T2.APPLY_TIME &gt;= #{params.applyOn}
             </if>
-            <if test="params != null and params.applyOff != null">
+            <if test="params != null and params.applyOff != null and params.applyOff != ''">
                 AND T2.APPLY_TIME &lt;= #{params.applyOff}
             </if>
             <if test="params != null and params.DeptList != null and params.DeptList.size > 0">

zjugis-business/src/main/resources/templates/FlowContractSub/js/outsourcingApply.js

@@ -30,7 +30,7 @@
                     }
                 })
             }
-            var params = {"projectType": projectTypeCode,"xzqh": xzqh};
+            var params = {};
             var postdata = {"name": '外包合同编号',"params": params}
             if(genFlag){
                 z.ui.ajax({

zjugis-business/src/main/resources/templates/FlowContractSub/js/subcontractApply.js

@@ -30,7 +30,7 @@
                     }
                 })
             }
-            var params = {"projectType": projectTypeCode,"xzqh": xzqh};
+            var params = {};
             var postdata = {"name": '分包合同编号',"params": params}
             if(genFlag){
                 z.ui.ajax({

zjugis-business/src/main/resources/templates/FlowContractSub/subcontractApply.ftl

@@ -53,7 +53,7 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                                 </div>
                             </td>
                             <td class="th">
-                                <div class="form-label">预估分包金额（元）：</div>
+                                <div class="form-label">分包金额（元）：</div>
                             </td>
                             <td>
                                 <div class="form-group">