Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/java/com/zjugis/business/flow/resign/controller/vo/ResignPageReqVO.java

@@ -106,6 +106,17 @@ public class ResignPageReqVO extends PageParam {
 
 
     //========================离职员工交接清单==================================
+
+    /**
+     * 日志填报
+     */
+    private String rztb;
+    /**
+     * 成果交接确认
+     */
+    private String cgjjqr;
+
+
     /**
      * 手提电脑、台式机处理方式
      */

zjugis-business/src/main/java/com/zjugis/business/flow/resign/entity/ResignDO.java

@@ -105,6 +105,14 @@ public class ResignDO extends BaseEntity {
 
 
     //========================离职员工交接清单==================================
+    /**
+     * 日志填报
+     */
+    private String rztb;
+    /**
+     * 成果交接确认
+     */
+    private String cgjjqr;
     /**
      * 手提电脑、台式机处理方式
      */

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

@@ -357,6 +357,55 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                 <div class="form-title">
 
                 </div>
+                <div class="TableTotal">
+                    <div class="Box">
+                        <h2>部门交接清单</h2>
+                        <table class="tables">
+                            <tr>
+
+                                <td class="span2">
+                                    完成当月日志项目工时申报
+                                </td>
+
+                                <td class="span2">
+                                    <div class="z-comp-radio" name="createReqVO$rztb">
+                                        <div class="z-radio-item <#if (formEntity.rztb!)? contains("1")>checked</#if>"
+                                             value="1"><i></i>是
+                                        </div>
+                                        <div class="z-radio-item <#if (formEntity.rztb!)? contains("2")>checked</#if>"
+                                             value="2"><i></i>否
+                                        </div>
+                                    </div>
+                                </td>
+
+                                <td class="span2">
+                                    部门经理确认
+                                </td>
+                            </tr>
+
+
+                            <tr>
+                                <td class="span2">
+                                    完成所有项目成果、客户信息等交接
+                                </td>
+                                <td class="span2">
+                                    <div class="z-comp-radio" name="createReqVO$cgjjqr">
+                                        <div class="z-radio-item <#if (formEntity.cgjjqr!)? contains("1")>checked</#if>"
+                                             value="1"><i></i>是
+                                        </div>
+                                        <div class="z-radio-item <#if (formEntity.cgjjqr!)? contains("2")>checked</#if>"
+                                             value="2"><i></i>否
+                                        </div>
+                                    </div>
+                                </td>
+                                <td class="span2">
+                                    分管领导确认
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
+
                 <div class="TableTotal">
                     <div class="Box">
                         <h2>人力中心交接清单</h2>