Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -7,7 +7,10 @@ import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.oss.OSSClientUtil;
 import com.jeeplus.common.persistence.Page;
-import com.jeeplus.common.utils.*;
+import com.jeeplus.common.utils.DateUtils;
+import com.jeeplus.common.utils.MyBeanUtils;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
@@ -15,7 +18,6 @@ import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ActUtils;
 import com.jeeplus.modules.hr.service.UserInfoService;
-import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
 import com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo;
 import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
@@ -295,6 +297,7 @@ public class RuralCostProjectRecordsController extends BaseController {
 
                 projectRecords.setReviewerPerson(userInfoService.findUserById(projectRecords.getReviewerPersonId()).getName());
             }
+
         } else {
             projectRecords.setCreateBy(UserUtils.getUser());
             projectRecords.setCreateDate(new Date());

src/main/webapp/webpage/modules/sys/userInfo.jsp

@@ -427,10 +427,10 @@
                             <div class="ibox-title">
                                 <h2 style="text-indent: 12px;margin-top: 10px;font-size: 16px;font-weight: bold;border-left: 5px solid #009FFA;">基本信息</h2>
                                 <div class="ibox-tools" style="margin-top: -20px">
-                                    <a style="display:block;" class="dropdown-toggle" data-toggle="dropdown"
+                                    <%--<a style="display:block;" class="dropdown-toggle" data-toggle="dropdown"
                                        href="javascript:void(0)">
                                         编辑<i class="fa fa-wrench"></i>
-                                    </a>
+                                    </a>--%>
                                     <ul class="dropdown-menu dropdown-user">
                                         <li><a id="userEdit" data-toggle="modal" onclick="openDialog('修改档案信息', '${ctx}/workstaff/workStaffBasicInfo/applyEdit','95%','95%')" data-target="#register">申请修改</a>
                                         </li>
@@ -510,13 +510,13 @@
                                             <input name="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
                                         </div>
                                     </div>
-                                    <div class="layui-item layui-col-sm6 lw7">
+                                    <%--<div class="layui-item layui-col-sm6 lw7">
                                         <label class="layui-form-label"><span class="require-item">*</span>公历/农历：</label>
                                         <div class="layui-input-block">
                                             <input value="${fns:getDictLabel(workStaffBasicInfo.calendar,'calendar_type','')}" type="text" readonly="true" class="form-control  layui-input" />
                                             <input value="${workStaffBasicInfo.calendar}" type="hidden" readonly="true" class="form-control  layui-input" />
                                         </div>
-                                    </div>
+                                    </div>--%>
                                     <div class="layui-item layui-col-sm6 lw7">
                                         <label class="layui-form-label">电子邮箱：</label>
                                         <div class="layui-input-block">
@@ -530,7 +530,7 @@
                                         </div>
                                     </div>
 
-                                    <div class="layui-item layui-col-sm6 lw7">
+                                    <%--<div class="layui-item layui-col-sm6 lw7">
                                         <label class="layui-form-label">座机：</label>
                                         <div class="layui-input-block">
                                             <input name="phone" value="${workStaffBasicInfo.phone}" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
@@ -575,7 +575,7 @@
                                         <div class="layui-input-block">
                                             <input name="status" value="${workStaffBasicInfo.status}" type="text" readonly="true" class="form-control  layui-input" />
                                         </div>
-                                    </div>
+                                    </div>--%>
                                     <div class="layui-item layui-col-sm6 lw7">
                                         <label class="layui-form-label"><span class="require-item">*</span>入职日期：</label>
                                         <div class="layui-input-block">
@@ -583,6 +583,19 @@
                                         </div>
                                     </div>
                                     <div class="layui-item layui-col-sm6 lw7">
+                                        <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
+                                        <div class="layui-input-block">
+                                            <input name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
+                                            <input name="office.id" value="${workStaffBasicInfo.office.id}" type="hidden" readonly="true" class="form-control  layui-input" />
+                                        </div>
+                                    </div>
+                                    <div class="layui-item layui-col-sm6 lw7">
+                                        <label class="layui-form-label"><span class="require-item">*</span>岗   位：</label>
+                                        <div class="layui-input-block ">
+                                            <input id="roleName" value="${workStaffBasicInfo.roleName}" type="text" readonly class="form-control layui-input" />
+                                        </div>
+                                    </div>
+                                    <%--<div class="layui-item layui-col-sm6 lw7">
                                         <label class="layui-form-label double-line"><span class="require-item">*</span>参加工作日期：</label>
                                         <div class="layui-input-block">
                                             <input name="workDate" value="<fmt:formatDate value="${workStaffBasicInfo.workDate}" pattern="yyyy-MM"/>" type="text" readonly="true" class="form-control  layui-input" />
@@ -663,9 +676,9 @@
                                             <input id="workEndDate"  type="text" maxlength="20" readonly class="form-control layui-input"
                                                    value="<fmt:formatDate value="${workStaffBasicInfo.workEndDate}" pattern="yyyy-MM-dd"/>"/>
                                         </div>
-                                    </div>
+                                    </div>--%>
                                 </div>
-                                <div class="form-group layui-row">
+                                <%--<div class="form-group layui-row">
                                     <div class="form-group-label"><h2>教育经历</h2></div>
                                     <div class="layui-item layui-col-xs12 form-table-container">
                                         <table id="educationTable" class="table table-bordered table-condensed details">
@@ -717,8 +730,8 @@
                                             </tbody>
                                         </table>
                                     </div>
-                                </div>
-                                <div class="form-group layui-row">
+                                </div>--%>
+                                <%--<div class="form-group layui-row">
                                     <div class="form-group-label"><h2>劳动关系</h2></div>
                                     <div class="layui-item layui-col-xs12 form-table-container">
                                         <table id="labourTable" class="table table-bordered table-condensed details">
@@ -744,7 +757,7 @@
                                                     <td><fmt:formatDate value="${buyDetails.contractEndTime}" pattern="yyyy-MM-dd"/></td>
                                                     <td><fmt:formatDate value="${buyDetails.tryEndTime}" pattern="yyyy-MM-dd"/></td>
                                                     <td><fmt:formatDate value="${buyDetails.transactTime}" pattern="yyyy-MM-dd"/></td>
-                                                        <%--试用期结束时间<td><fmt:formatDate value="${buyDetails.tryEndTime}" pattern="yyyy-MM-dd"/></td>--%>
+                                                        &lt;%&ndash;试用期结束时间<td><fmt:formatDate value="${buyDetails.tryEndTime}" pattern="yyyy-MM-dd"/></td>&ndash;%&gt;
 
                                                     <c:forEach items="${buyDetails.workAttachments}" var = "workClientAttachment" varStatus="status">
                                                         <c:choose>
@@ -772,8 +785,8 @@
                                             </tbody>
                                         </table>
                                     </div>
-                                </div>
-                                <div class="form-group layui-row">
+                                </div>--%>
+                                <%--<div class="form-group layui-row">
                                     <div class="form-group-label"><h2>外语语种</h2></div>
                                     <div class="layui-item layui-col-xs12 form-table-container">
                                         <table id="languageTable" class="table table-bordered table-condensed details">
@@ -809,8 +822,8 @@
                                             </tbody>
                                         </table>
                                     </div>
-                                </div>
-                                <div class="form-group layui-row">
+                                </div>--%>
+                                <%--<div class="form-group layui-row">
                                     <div class="form-group-label"><h2>工作经历</h2></div>
                                     <div class="layui-item layui-col-xs12 form-table-container">
                                         <table id="experienceTable" class="table table-bordered table-condensed details">
@@ -854,7 +867,7 @@
                                             </tbody>
                                         </table>
                                     </div>
-                                </div>
+                                </div>--%>
                                 <div class="form-group layui-row">
                                     <div class="form-group-label"><h2>执业资格证书</h2></div>
                                     <div class="layui-item layui-col-xs12 form-table-container">
@@ -912,7 +925,7 @@
                                         </table>
                                     </div>
                                 </div>
-                                <div class="form-group layui-row">
+                                <%--<div class="form-group layui-row">
                                     <div class="form-group-label"><h2>职称</h2></div>
                                     <div class="layui-item layui-col-xs12 form-table-container">
                                         <table id="titleTable" class="table table-bordered table-condensed details">
@@ -952,8 +965,8 @@
                                             </tbody>
                                         </table>
                                     </div>
-                                </div>
-                                <div class="form-group layui-row">
+                                </div>--%>
+                                <%--<div class="form-group layui-row">
                                     <div class="form-group-label"><h2>家庭情况</h2></div>
                                     <div class="layui-item layui-col-xs12 form-table-container">
                                         <table id="familyTable" class="table table-bordered table-condensed details">
@@ -989,8 +1002,8 @@
                                             </tbody>
                                         </table>
                                     </div>
-                                </div>
-                                <div class="form-group layui-row">
+                                </div>--%>
+                                <%--<div class="form-group layui-row">
                                     <div class="form-group-label"><h2>培训经历</h2></div>
                                     <div class="layui-item layui-col-xs12 form-table-container">
                                         <table id="trainingTable" class="table table-bordered table-condensed details">
@@ -1046,8 +1059,8 @@
                                             </tbody>
                                         </table>
                                     </div>
-                                </div>
-                                <div class="form-group layui-row">
+                                </div>--%>
+                                <%--<div class="form-group layui-row">
                                     <div class="form-group-label"><h2>社会及行业职务</h2></div>
                                     <div class="layui-item layui-col-xs12 form-table-container">
                                         <table id="socialPositionTable" class="table table-bordered table-condensed details">
@@ -1079,8 +1092,8 @@
                                             </tbody>
                                         </table>
                                     </div>
-                                </div>
-                                <div class="form-group layui-row">
+                                </div>--%>
+                                <%--<div class="form-group layui-row">
                                     <div class="form-group-label"><h2>奖惩情况</h2></div>
                                     <div class="layui-item layui-col-xs12 form-table-container">
                                         <table id="rewardsTable" class="table table-bordered table-condensed details">
@@ -1120,8 +1133,8 @@
                                             </tbody>
                                         </table>
                                     </div>
-                                </div>
-                                <div class="form-group layui-row">
+                                </div>--%>
+                                <%--<div class="form-group layui-row">
                                     <div class="form-group-label"><h2>工作业绩</h2></div>
                                     <div class="layui-item layui-col-xs12 form-table-container">
                                         <table id="achievementTable" class="table table-bordered table-condensed details">
@@ -1161,8 +1174,8 @@
                                             </tbody>
                                         </table>
                                     </div>
-                                </div>
-                                <div class="form-group layui-row">
+                                </div>--%>
+                                <%--<div class="form-group layui-row">
                                     <div class="form-group-label"><h2>电子档案</h2></div>
                                     <div class="layui-item layui-col-xs12 form-table-container">
                                         <table id="recordTable" class="table table-bordered table-condensed details">
@@ -1194,7 +1207,7 @@
                                             </tbody>
                                         </table>
                                     </div>
-                                </div>
+                                </div>--%>
                             </div>
                         </div>
                     </div>