转正+录用审批字段添加

zjugis-business/src/main/java/com/zjugis/business/flow/regular/controller/vo/RegularPageReqVO.java

@@ -105,6 +105,15 @@ public class RegularPageReqVO extends PageParam {
      */
     private String loginName;
 
+    /**
+     * 工作总结
+     */
+    private String gzzj;
+
+    /**
+     * 项目内容
+     */
+    private String xmnr;
 
     //----------------------------- 指导人考评表 ------------------------
     /**

zjugis-business/src/main/java/com/zjugis/business/flow/regular/entity/RegularDO.java

@@ -109,6 +109,16 @@ public class RegularDO extends BaseEntity {
      */
     private String loginName;
 
+    /**
+     * 工作总结
+     */
+    private String gzzj;
+
+    /**
+     * 项目内容
+     */
+    private String xmnr;
+
 
     //----------------------------- 指导人考评表 ------------------------
     /**

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

@@ -196,6 +196,37 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                         </tr>
 
 
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">工作总结：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-textarea" name="createReqVO$gzzj">
+                                           <textarea placeholder="内容包括对试用期工作的回顾、总结，对公司企业文化的理解；自己在工作中的优点及不足，如何改进存在的不足，对今后工作的感想、建议等等">${formEntity.gzzj!}</textarea>
+                                        </div>
+                                    </div>
+                                </div>
+                            </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-textarea" name="createReqVO$xmnr">
+                                            <textarea placeholder="试用期内主要做的项目内容">${formEntity.xmnr!}</textarea>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+
                     </table>
                 </div>
 

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

@@ -451,7 +451,7 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                                 </div>
                                 <div class="z-comp-checkbox" name="createReqVO$v7">
                                     <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",7,")>checked</#if>"
-                                         value="7"><i></i>其他材料
+                                         value="7"><i></i>银行卡
                                     </div>
                                 </div>
                             </td>