合同续签新增字段

zjugis-business/src/main/java/com/zjugis/business/flow/contractRenew/controller/vo/ContractRenewPageVO.java

@@ -80,7 +80,17 @@ public class ContractRenewPageVO extends PageParam {
 
 
     /**
-     * 合同到期时间
+     * 旧合同到期时间
      */
     private LocalDateTime htdqs;
+
+    /**
+     * 新合同签订时间
+     */
+    private LocalDateTime htqdsj;
+
+    /**
+     * 新合同到期时间
+     */
+    private LocalDateTime xhtdqs;
 }

zjugis-business/src/main/java/com/zjugis/business/flow/contractRenew/controller/vo/ContractRenewVO.java

@@ -80,14 +80,18 @@ public class ContractRenewVO {
 
 
     /**
-     * 合同到期时间
+     * 旧合同到期时间
      */
     private LocalDateTime htdqs;
 
     /**
-     * 合同签订时间
+     * 新合同签订时间
      */
     private LocalDateTime htqdsj;
 
+    /**
+     * 新合同到期时间
+     */
+    private LocalDateTime xhtdqs;
 
 }

zjugis-business/src/main/java/com/zjugis/business/flow/contractRenew/entity/ContractRenewDO.java

@@ -83,13 +83,18 @@ public class ContractRenewDO extends BaseEntity {
 
 
     /**
-     * 合同到期时间
+     * 旧合同到期时间
      */
     private LocalDateTime htdqs;
 
     /**
-     * 合同签订时间
+     * 新合同签订时间
      */
     private LocalDateTime htqdsj;
 
+    /**
+     * 新合同到期时间
+     */
+    private LocalDateTime xhtdqs;
+
 }

zjugis-business/src/main/resources/templates/ContractRenew/index.ftl

@@ -97,7 +97,7 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
 
                         <tr>
                             <td class="th">
-                                <div class="form-label">合同到期时间：</div>
+                                <div class="form-label">旧合同到期时间：</div>
                             </td>
                             <td>
                                 <div class="form-group">
@@ -159,15 +159,18 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
 
                         <tr>
                             <td class="th">
-                                <div class="form-label">续签时间：</div>
+                                <div class="form-label">新合同续签时间：</div>
                             </td>
                             <td>
-                                <div class="form-group">
-                                    <div class="form-item">
-                                        <div class="z-comp-date" name="createReqVO$htqdsj">
-                                            <input type="text" value="${(formEntity.htqdsj?date)!}">
-                                        </div>
+                                <div class="form-group date-range">
+                                    <div class="z-comp-date" name="createReqVO$htqdsj" style="display: inline-block; width: 50%;">
+                                        <input type="text" value="${(formEntity.htqdsj?date)!}">
+                                    </div>
+                                    <span style="display: inline-block; padding: 0 5px;">-</span>
+                                    <div class="z-comp-date" name="createReqVO$xhtdqs" style="display: inline-block; width: 50%;">
+                                        <input type="text" value="${(formEntity.xhtdqs?date)!}">
                                     </div>
+
                                 </div>
                             </td>
 
@@ -209,5 +212,12 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
         })();
     </script>
     <style type="text/css">
+
+        .date-range {
+            display: flex;
+            align-items: center; /* 垂直居中子元素 */
+        }
+
+
     </style>
 </@w.workFlow>

zjugis-business/src/main/resources/templates/ContractRenew/js/index.js

@@ -3,7 +3,7 @@
 
 
         initStaff();
-        backPerson();//离职员工重新入职直接返回已有数据
+        // backPerson();//离职员工重新入职直接返回已有数据
         bindEvents();
     }
 
@@ -48,7 +48,7 @@
                 $("[name='createReqVO$deptId']").val(staff.deptId);//部门id
                 z.ui.select("[name='createReqVO$drzw']").setValue(staff.drzw); //岗位
                 z.ui.laydate("[name='createReqVO$htdqs']").setValue(moment(staff.htdqs).format('YYYY-MM-DD')); //合同到期时
-                z.ui.laydate("[name='createReqVO$htqdsj']").setValue(moment(staff.htqdsj).format('YYYY-MM-DD')); //合同到期时
+                // z.ui.laydate("[name='createReqVO$htqdsj']").setValue(moment(staff.htqdsj).format('YYYY-MM-DD')); //合同签订时
                 z.ui.input("[name='createReqVO$xqcs']").setValue(staff.xqcs); //续签次数
                 z.ui.input("[name='createReqVO$xqnx']").setValue(staff.xqnx); //续签年限
             });
@@ -90,6 +90,8 @@
         for (let key of Object.keys(postData)) {
             let mealName = postData[key];
             mealName.htdqs = Date.parse(mealName.htdqs + "");
+            mealName.xhtdqs = Date.parse(mealName.xhtdqs + "");
+            mealName.htqdsj = Date.parse(mealName.htqdsj + "");
             postData.createReqVO = mealName;
         }