新增续签时间+去除归档后同步

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

@@ -84,5 +84,10 @@ public class ContractRenewVO {
      */
     private LocalDateTime htdqs;
 
+    /**
+     * 合同签订时间
+     */
+    private LocalDateTime htqdsj;
+
 
 }

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

@@ -87,4 +87,9 @@ public class ContractRenewDO extends BaseEntity {
      */
     private LocalDateTime htdqs;
 
+    /**
+     * 合同签订时间
+     */
+    private LocalDateTime htqdsj;
+
 }

zjugis-business/src/main/java/com/zjugis/business/flow/contractRenew/event/ContractRenewEvent.java

@@ -123,15 +123,15 @@ public class ContractRenewEvent extends BaseController {
                 entity.setFlowFinishtime(LocalDateTime.now());
                 contractRenewService.update(entity);
 
-                //更新档案中的续签信息
-                StaffRecordsDTO dto = ContractRenewConvert.INSTANCE.convert02(entity);
-                //续签情况字段评价
-                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/M/d");
-                String createTime = entity.getCreateTime().format(formatter);
-                dto.setXqqk(createTime + "续签" + entity.getXqnx());
-
-
-                staffApi.updateContract(dto);
+//                //更新档案中的续签信息
+//                StaffRecordsDTO dto = ContractRenewConvert.INSTANCE.convert02(entity);
+//                //续签情况字段评价
+//                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/M/d");
+//                String createTime = entity.getCreateTime().format(formatter);
+//                dto.setXqqk(createTime + "续签" + entity.getXqnx());
+//
+//
+//                staffApi.updateContract(dto);
 
                 return ok("true");
             } else {

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

@@ -156,6 +156,28 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                             </td>
 
                         </tr>
+
+                        <tr>
+                            <td class="th">
+                                <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>
+                                </div>
+                            </td>
+
+                            <td class="th">
+                                <div class="form-label "></div>
+                            </td>
+                            <td>
+                            </td>
+
+                        </tr>
                     </table>
                 </div>
             </div>

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

@@ -48,6 +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.input("[name='createReqVO$xqcs']").setValue(staff.xqcs); //续签次数
                 z.ui.input("[name='createReqVO$xqnx']").setValue(staff.xqnx); //续签年限
             });

zjugis-module-adm/zjugis-module-adm-api/src/main/java/com/zjugis/module/adm/api/staff/dto/StaffRecordsDTO.java

@@ -129,6 +129,10 @@ public class StaffRecordsDTO {
      */
     private String drzw;
 
+    /**
+     * 合同签订时间
+     */
+    private LocalDateTime htqdsj;
     /**
      * 合同到期时间
      */