首页项目金额，编号生成

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

@@ -230,8 +230,8 @@
             COALESCE(SUM(CASE WHEN T.XMZT = 4 THEN 1 ELSE 0 END),0) as accepted,
             COALESCE(SUM(CASE WHEN T.XMZT = 1 THEN 1 ELSE 0 END),0) as unaccepted
         FROM PROJECT T
-                 LEFT JOIN CONTRACT T1 ON T1.PROJECT_ID = T.ID
-        WHERE T.ISVALID = 1
+                 LEFT JOIN CONTRACT T1 ON T1.PROJECT_ID = T.ID AND T1.FLOW_STATUS = 90 AND T1.ISVALID = 1
+        WHERE T.ISVALID = 1 AND T.FLOW_STATUS = 90
         <if test="params != null  and params.deptIds != null  and params.deptIds.size > 0">
             AND T.ZRBM_ID in
             <foreach collection="params.deptIds" item="item" open="(" close=")" separator=",">
@@ -249,8 +249,8 @@
             COALESCE(SUM(CASE WHEN T1.CONTRACT_AMOUNT &gt;= 3000000 and T1.CONTRACT_AMOUNT &lt; 4000000 THEN 1 ELSE 0 END),0) as lt400,
             COALESCE(SUM(CASE WHEN T1.CONTRACT_AMOUNT &gt;= 4000000 THEN 1 ELSE 0 END),0) as gte400
         FROM PROJECT T
-            LEFT JOIN CONTRACT T1 ON T1.PROJECT_ID = T.ID
-        WHERE T.ISVALID = 1
+            LEFT JOIN CONTRACT T1 ON T1.PROJECT_ID = T.ID AND T1.FLOW_STATUS = 90 AND T1.ISVALID = 1
+        WHERE T.ISVALID = 1 AND T.FLOW_STATUS = 90
         <if test="params != null  and params.deptIds != null  and params.deptIds.size > 0">
             AND T.ZRBM_ID in
             <foreach collection="params.deptIds" item="item" open="(" close=")" separator=",">
@@ -273,7 +273,7 @@
             WHERE STATE = 1 AND ISVALID = 1
             GROUP BY PROJECT_ID
             ) T1 ON T1.PROJECT_ID = T.ID
-        WHERE T.ISVALID = 1
+        WHERE T.ISVALID = 1  AND T.FLOW_STATUS = 90
         <if test="params != null  and params.deptIds != null  and params.deptIds.size > 0">
             AND T.ZRBM_ID in
             <foreach collection="params.deptIds" item="item" open="(" close=")" separator=",">

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

@@ -156,6 +156,28 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                               </div>
                           </td>
                       </tr>
+                      <tr>
+                          <td class="th">
+                              <div class="form-label">签订时间：</div>
+                          </td>
+                          <td>
+                              <div class="form-group">
+                                  <div class="z-comp-date" name="contract$signTime">
+                                      <input type="text" value="${formEntity.signTime!}">
+                                  </div>
+                              </div>
+                          </td>
+                          <td class="th">
+                              <div class="form-label">履约到期时间：</div>
+                          </td>
+                          <td>
+                              <div class="form-group">
+                                  <div class="z-comp-date" name="contract$dueTime">
+                                      <input type="text" value="${formEntity.dueTime!}">
+                                  </div>
+                              </div>
+                          </td>
+                      </tr>
                       <tr>
                           <td class="th">
                               <div class="form-label">事业部独立开拓：</div>

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

@@ -29,8 +29,7 @@
                         genFlag = false;
                     },
                     onConfirm: function () {
-                        var params = {"projectType": 'WB',"xzqh": ''};
-                        var postdata = {"name": '外包合同编号',"params": params}
+                        var postdata = {"name": '外包合同编号'}
                         if(genFlag){
                             z.ui.ajax({
                                 type: "post",

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

@@ -29,8 +29,7 @@
                         genFlag = false;
                     },
                     onConfirm: function () {
-                        var params = {"projectType": 'FB',"xzqh": ''};
-                        var postdata = {"name": '分包合同编号',"params": params}
+                        var postdata = {"name": '分包合同编号'}
                         if(genFlag){
                             z.ui.ajax({
                                 type: "post",