人力资源管理调整、首页公告样式调整

项目添加“工程审价（上海）”项目类型，并且该类型无需上报

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -627,7 +627,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				}
 				break;
 			case "2":
-				if("5".equals(projectRecords.getAttachmentProjectSort()) || "6".equals(projectRecords.getAttachmentProjectSort()) || "8".equals(projectRecords.getAttachmentProjectSort())){
+				if("5".equals(projectRecords.getAttachmentProjectSort()) || "6".equals(projectRecords.getAttachmentProjectSort()) || "8".equals(projectRecords.getAttachmentProjectSort()) || "9".equals(projectRecords.getAttachmentProjectSort())){
 					projectRecords.setReportedState("10");
 				}else{
 					projectRecords.setReportedState(null);

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

@@ -1281,4 +1281,18 @@ public class RuralProjectRecordsController extends BaseController {
 	}
 
 
+	/**
+	 * 项目名称判重查询方法
+	 */
+	@RequestMapping(value = "reProjectName")
+	@ResponseBody
+	public Integer reProjectName(RuralProjectRecords projectRecords, RedirectAttributes redirectAttributes) {
+		if(StringUtils.isNotBlank(projectRecords.getProjectName())){
+			Integer projectNameCount = projectRecordsService.reProjectName(projectRecords.getProjectName());
+			return projectNameCount;
+		}
+		return 0;
+	}
+
+
 }

src/main/java/com/jeeplus/modules/workstaff/entity/WorkStaffBasicInfo.java

@@ -112,6 +112,7 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 	private String handSignatureUrl;	//手签章路径(展示)
 	private String userLoginFlag;	//用户登录状态
 	private String otherServiceFlag;	//是否获取其他服务待办
+	private String isHandSignature;	//是否有手签章
 
 	//劳动关系临时属性
 	private String relationshipStatus;
@@ -853,4 +854,12 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 	public void setOtherServiceFlag(String otherServiceFlag) {
 		this.otherServiceFlag = otherServiceFlag;
 	}
+
+	public String getIsHandSignature() {
+		return isHandSignature;
+	}
+
+	public void setIsHandSignature(String isHandSignature) {
+		this.isHandSignature = isHandSignature;
+	}
 }

src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -220,6 +220,19 @@
 			<if test="achiveId != null and achiveId !=''">
 				AND a.achive_id = #{achiveId}
 			</if>
+			<if test="highestEducation != null and highestEducation !=''">
+				AND a.highest_education = #{highestEducation}
+			</if>
+			<if test="isHandSignature != null and isHandSignature !=''">
+				<choose>
+					<when test="isHandSignature == 1">
+						and hand_signature is not null
+					</when>
+					<otherwise>
+						and (hand_signature is null or hand_signature = '')
+					</otherwise>
+				</choose>
+			</if>
             <if test="sqlMap.dsf !=null and sqlMap.dsf !=''">
                 AND ((a.user_id = #{currentUser.id} AND a.branch_office = #{currentUser.branchOffice.id})${sqlMap.dsf} )
             </if>

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

@@ -62,10 +62,22 @@
                 $(".layui-tab-title li").eq(ggType-1).attr("class","layui-this");
             }*/
             $(".layui-tab-title li").click(function() {
+                console.log(this.value)
                 $(".layui-tab-title li").each(function () {
                     $(this).removeAttr("class","layui-this");
+                    $(this).removeAttr("style","background-color: #FFFFFF");
+                    $("li a").attr('style','color: #ffffee');//修改style属性
                 })
+
+                // <li value="0" class="layui-this" style="background-color: #FFFFFF"><a style="color: #0d8ddb">最新消息</a></li>
                 $(this).attr("class","layui-this");
+                $(this).attr("style","background-color: #FFFFFF");
+                $(".layui-this a").attr('style','color: #0d8ddb');//修改style属性
+                if(this.value === 0 ){
+                    $(".informBordMore").attr('style','display: none');//修改style属性\
+                }else{
+                    $(".informBordMore").removeAttr("style","display: none");
+                }
                 //创建一个临时行数值
                 var count = 0;
                 //清除公告栏下已存在的li信息
@@ -830,14 +842,14 @@
                                         <li value="3"><a style="color: #ffffee">公司标准或规范</a></li>
                                         <li value="4"><a style="color: #ffffee">行业标准或规范</a></li>
                                         <li value="5"><a style="color: #ffffee">其他</a></li>--%>
-                                        <li value="0"><a style="color: #ffffee">最新消息</a></li>
+                                        <li value="0" class="layui-this" style="background-color: #FFFFFF"><a style="color: #0d8ddb">最新消息</a></li>
                                         <li value="1"><a style="color: #ffffee">通告</a></li>
                                         <li value="2"><a style="color: #ffffee">知识分享</a></li>
                                     </ul>
                                 </div>
                         </div>
                     </div>
-                    <div class="bord-more">
+                    <div class="bord-more informBordMore" style="display: none">
                         <a href="javascript:void(0)" onclick='openNotifyTab("${ctx }/oa/oaNotify/self","公告信息", false)'><span>更多 </span><i class="fa fa-angle-right"></i></a>
                     </div>
                 </div>

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -765,7 +765,7 @@
                                 <img class="layui-upload-img" width="200px" height="150px" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workStaffBasicInfo.handSignatureUrl}','90%','90%')" id="handSignatureImg" src="${workStaffBasicInfo.handSignatureUrl}">
                             </c:when>
                             <c:otherwise>
-                                <img class="layui-upload-img" width="200px" height="150px" id="handSignatureImg">
+                                <img class="layui-upload-img" width="100px" height="75px" id="handSignatureImg">
                             </c:otherwise>
                         </c:choose>
                         <p id="handSignatureText"></p>

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoList.jsp

@@ -99,7 +99,7 @@
                 <input type="hidden" input="params" value="">
                 <input id="toflag" name="toflag" type="hidden" value="1"/>
                 <table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
-                <div class="commonQuery">
+                <div class="commonQuery lw6">
                     <div class="layui-item query athird">
                         <label class="layui-form-label">姓    名：</label>
                         <div class="layui-input-block">
@@ -126,7 +126,7 @@
                     </div>
                     <div style="    clear:both;"></div>
                 </div>
-                <div id="moresees" style="clear:both;display:none;">
+                <div id="moresees" style="clear:both;display:none;" class="form-group layui-row first lw12">
                     <div class="layui-item query athird">
                         <label class="layui-form-label">工    号：</label>
                         <div class="layui-input-block">
@@ -163,6 +163,21 @@
                         </div>
                     </div>
                     <div class="layui-item query athird">
+                        <label class="layui-form-label">是否有手签章：</label>
+                        <div class="layui-input-block">
+                            <form:select path="isHandSignature" class="form-control simple-select">
+                                <form:option value="" label=""/>
+                                <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                            </form:select>
+                        </div>
+                    </div>
+                    <div class="layui-item query athird">
+                        <label class="layui-form-label">最高学历：</label>
+                        <div class="layui-input-block">
+                            <form:input path="highestEducation" htmlEscape="false" maxlength="20"  class=" form-control layui-input"/>
+                        </div>
+                    </div>
+                    <div class="layui-item query athird">
                         <label class="layui-form-label">入职日期：</label>
                         <div class="layui-input-block readOnlyFFF">
                             <input id="beginEntryDate" name="beginEntryDate" type="text" placeholder="开始时间" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoView.jsp

@@ -355,7 +355,7 @@
                                     <img class="layui-upload-img" width="200px" height="150px" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workStaffBasicInfo.handSignatureUrl}','90%','90%')" id="handSignatureImg" src="${workStaffBasicInfo.handSignatureUrl}">
                                 </c:when>
                                 <c:otherwise>
-                                    <img class="layui-upload-img" width="200px" height="150px" id="handSignatureImg">
+                                    <img class="layui-upload-img" width="100px" height="75px" id="handSignatureImg" src="${ctxStatic}/common/images/not_available_picture.jpg">
                                 </c:otherwise>
                             </c:choose>
                             <p id="handSignatureText"></p>