Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectRecordsController.java

@@ -291,7 +291,7 @@ public class ProjectRecordsController extends BaseController {
             StringBuilder workClinetInfoIds = new StringBuilder();
             for (WorkClientInfo workClientInfo : workContractInfo.getWorkClientInfoList()) {
                 workClinetInfoIds.append(workClientInfo.getId()).append(",");
-            }
+			}
             workClinetInfoIds.deleteCharAt(workClinetInfoIds.length()-1);
             workContractInfo.setWorkClinetInfoIds(workClinetInfoIds.toString());
         }
@@ -612,4 +612,20 @@ public class ProjectRecordsController extends BaseController {
         }
 		return map;
     }
+
+    @ResponseBody
+	@RequestMapping(value = "getLinkManByClientId")
+    public Map<String, Object> queryWorkClientLinkMen(String clientId){
+		WorkClientLinkman linkman = workClientInfoService.queryLinkManByClientId(clientId);
+		WorkClientInfo workClientInfo = workClientInfoService.get(clientId);
+		Map<String,Object> map = new HashMap<>();
+		map.put("id",linkman.getId());
+		map.put("clientId",workClientInfo.getId());
+		map.put("clientName",workClientInfo.getName());
+		map.put("linkName",linkman.getName());
+		map.put("linkMobile",linkman.getLinkMobile());
+		map.put("linkPhone",linkman.getLinkPhone());
+		return map;
+
+	}
 }

src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientLinkmanDao.java

@@ -32,4 +32,6 @@ public interface WorkClientLinkmanDao extends CrudDao<WorkClientLinkman> {
     List<String> queryLinkmanOfProjectClient(WorkBidProject workBidProject);
 
     List<WorkClientLinkman> queryProjectLinkmans(@Param("projectId") String projectId, @Param("isEntrust") int i);
+
+    WorkClientLinkman queryLinkManByClientId(String id);
 }

src/main/java/com/jeeplus/modules/workclientinfo/service/WorkClientInfoService.java

@@ -566,4 +566,8 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
         page.setList(workClientBankDao.findList(workClientBank));
         return page;
     }
+
+    public WorkClientLinkman queryLinkManByClientId(String clientId){
+        return workClientLinkmanDao.queryLinkManByClientId(clientId);
+    }
 }

src/main/java/com/jeeplus/modules/workofficechange/service/WorkOfficeChangeService.java

@@ -155,7 +155,6 @@ public class WorkOfficeChangeService extends CrudService<WorkOfficeChangeDao, Wo
 	 */
 	@Transactional(readOnly = false)
 	public void updateWorkOfficeChangeList(WorkOfficeChange workOfficeChange) {
-		String jobGradeId = workOfficeChange.getChangeOffice();
 		if (workOfficeChange.getWorkOfficeChangeUserList() != null && workOfficeChange.getWorkOfficeChangeUserList().size() > 0) {
 			for (WorkOfficeChangeUser workOfficeChangeUser : workOfficeChange.getWorkOfficeChangeUserList()) {
 				if (StringUtils.isBlank(workOfficeChangeUser.getId())) {
@@ -186,6 +185,7 @@ public class WorkOfficeChangeService extends CrudService<WorkOfficeChangeDao, Wo
 					}
 				}
 				String userId = workOfficeChangeUser.getUserId();
+				String jobGradeId = workOfficeChangeUser.getJobGrade2().getId();
 				workStaffBasicInfoDao.updateJobGradeByUserId(userId,jobGradeId);
 				String officeId = workOfficeChangeUser.getOldOfficeId();
 				if(officeId!=null){

src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -538,12 +538,16 @@ public class WorkStaffBasicInfoController extends BaseController {
 		if (!beanValidator(model, workStaffBasicInfo)){
 			return form(workStaffBasicInfo, model,false);
 		}
-		WorkStaffBasicInfo basicInfo = workStaffBasicInfoService.getBasicInfoByAchiveId(workStaffBasicInfo.getId());//从数据库取出记录的值
-        String staffId = basicInfo.getId();
-        MyBeanUtils.copyBeanNotNull2Bean(workStaffBasicInfo, basicInfo);//将编辑表单中的非NULL值覆盖数据库记录中的值
-        basicInfo.setId(staffId);
-		workStaffBasicInfoService.updateAchieveDirectly(basicInfo,request);
+		String achieveId = workStaffBasicInfo.getId();
+		WorkStaffBasicInfo t = workStaffBasicInfoService.getBasicInfoByAchiveId(workStaffBasicInfo.getId());//从数据库取出记录的值
+		String staffId = t.getId();
+		MyBeanUtils.copyBeanNotNull2Bean(workStaffBasicInfo, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+		t.setAchiveId(achieveId);
+		t.setId(staffId);
+		System.out.println("----------"+t.getAchiveId());
+		workStaffBasicInfoService.updateAchieveDirectly(t,request);
 		addMessage(redirectAttributes, "保存员工档案信息成功");
+
 		return "redirect:"+Global.getAdminPath()+"/sys/user/info?repage";
 	}
 

src/main/resources/mappings/modules/workclientinfo/WorkClientLinkmanDao.xml

@@ -20,20 +20,36 @@
 		a.office AS "office",
 		b.name AS "clientId.name"
 	</sql>
-	
+	<sql id="linkManColumn">
+		a.id AS "id",
+		a.name AS "name",
+		a.position AS "position",
+		a.qq AS "qq",
+		a.link_phone AS "linkPhone",
+		a.link_mobile AS "linkMobile",
+		a.email AS "email",
+		a.is_default AS "isDefault",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.del_flag AS "delFlag",
+		a.client_id AS "clientId.id",
+	</sql>
+
 	<sql id="workClientLinkmanJoins">
 		LEFT JOIN work_client_info b ON b.id = a.client_id
 	</sql>
-	
-    
+
+
 	<select id="get" resultType="WorkClientLinkman" >
-		SELECT 
+		SELECT
 			<include refid="workClientLinkmanColumns"/>
 		FROM work_client_linkman a
 		<include refid="workClientLinkmanJoins"/>
 		WHERE a.id = #{id}
 	</select>
-	
+
 	<select id="findByClientId" resultType="WorkClientLinkman">
 		SELECT <include refid="workClientLinkmanColumns"/>
 		FROM work_client_linkman a
@@ -63,14 +79,14 @@
 	</select>
 
 	<select id="findList" resultType="WorkClientLinkman" >
-		SELECT 
+		SELECT
 			<include refid="workClientLinkmanColumns"/>
 		FROM work_client_linkman a
 		<include refid="workClientLinkmanJoins"/>
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="name != null and name != ''">
-				AND a.name LIKE 
+				AND a.name LIKE
 					<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
 					<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
 					<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
@@ -142,13 +158,13 @@
 	</select>
 
 	<select id="findAllList" resultType="WorkClientLinkman" >
-		SELECT 
+		SELECT
 			<include refid="workClientLinkmanColumns"/>
 		FROM work_client_linkman a
 		<include refid="workClientLinkmanJoins"/>
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
-		</where>		
+		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -212,9 +228,9 @@
 			#{office}
 		)
 	</insert>
-	
+
 	<update id="update">
-		UPDATE work_client_linkman SET 	
+		UPDATE work_client_linkman SET
 			name = #{name},
 			position = #{position},
 			qq = #{qq},
@@ -228,8 +244,8 @@
 			office = #{office}
 		WHERE id = #{id}
 	</update>
-	
-	
+
+
 	<!--物理删除-->
 	<update id="delete">
 		DELETE FROM work_client_linkman
@@ -242,10 +258,10 @@
 			</otherwise>
 		</choose>
 	</update>
-	
+
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
-		UPDATE work_client_linkman SET 
+		UPDATE work_client_linkman SET
 			del_flag = #{DEL_FLAG_DELETE}
 		<choose>
 			<when test="id !=null and id != ''">
@@ -256,8 +272,8 @@
 			</otherwise>
 		</choose>
 	</update>
-	
-	
+
+
 	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
 	<select id="findUniqueByProperty" resultType="WorkClientLinkman" statementType="STATEMENT">
 		select * FROM work_client_linkman  where ${propertyName} = '${value}'
@@ -269,4 +285,10 @@
 		FROM project_client_linkman p,work_client_linkman a,work_client_info b
 		WHERE p.linkman_id = a.id and b.id = a.client_id and p.project_id=#{projectId} and is_entrust = #{isEntrust}
 	</select>
+
+	<select id="queryLinkManByClientId" resultType="WorkClientLinkman">
+		select *
+		from work_client_linkman
+		where client_id = #{id}
+	</select>
 </mapper>

src/main/webapp/WEB-INF/tags/sys/gridselectContract.tag

@@ -37,9 +37,10 @@ function searchGrid${id}(){
 	    	 }
 	    	 $("#${id}Id").val(item.split('_item_')[0]);
 	    	 $("#${id}Name").val(item.split('_item_')[1]);
-			 top.layer.close(index);//关闭对话框。
-             setContractValue(item.split('_item_')[0]);
-		  },
+			setContractValue(item.split('_item_')[0]);
+			setLinkMan();
+			top.layer.close(index);//关闭对话框。
+		},
 		  cancel: function(index){ 
 	       }
 	}); 

src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -83,12 +83,14 @@
                 radioVal = $(this).val();
                 if(radioVal == 0){
                     //有合同状态
+                    $("#divv2 input").val("");
                     $("#divv").show();
                     $("#div1").remove();
                     $("#div2").remove();
                     var temp = $("<div id='div1'></div>").html(div1);
                     $("#LinkMenDiv").append(temp);
                 }else{
+                    $("#divv2 input").val("");
                     $("#divv").hide();
                     $("#divv input").val('');
                     $("#div1").remove();
@@ -102,6 +104,7 @@
 
         function setContractValue(obj){
             var clientId = $("#contractClientId").val();
+            console.log("___"+clientId);
             $.ajax({
                 type:'post',
                 url:'${ctx}/project/projectRecords/getContractInfo',
@@ -117,13 +120,37 @@
                     $("#constructionProjectType").val(data.constructionProjectTypeStr);
                     $("#linkmanId").val(data.workClinetInfoIds);
                 }
-            })
+            });
+
+
             var newClientId  =$("#contractClientId").val();
+            // console.log("new-----"+newClientId);
             if (clientId != newClientId){
                 $("#workClientLinkmanList tr").remove();
             }
         }
 
+        function setLinkMan() {
+            var clientId = $("#contractClientId").val();
+            console.log(clientId+"-----------");
+            $.ajax({
+                url:"${ctx}/project/projectRecords/getLinkManByClientId",
+                data:{"clientId":clientId},
+                type:"post",
+                dataType:"json",
+                success:function (d) {
+                    // console.log(d);
+                    addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl);workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                    var row = workClientLinkmanRowIdx - 1 ;
+                    $("#workClientLinkmanList"+row+"_id").val(d.id);
+                    $("#workClientLinkmanList"+row+"_clientId_id").val(d.clientId);
+                    $("#workClientLinkmanList"+row+"_clientName").val(d.clientName);
+                    $("#workClientLinkmanList"+row+"_name").val(d.linkName);
+                    $("#workClientLinkmanList"+row+"_linkMobile").val(d.linkMobile);
+                    $("#workClientLinkmanList"+row+"_linkPhone").val(d.linkPhone);
+                }
+            });
+        }
         function setValuee(obj){
             for(var i=0;i<obj.length;i++){
                 var idArr = $("#workClientLinkmanList tr:visible .clientId");
@@ -357,18 +384,20 @@
                         </div>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">主委托方：</label>
-                    <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">工程分类：</label>
-                    <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
-                    </div>
-                </div>
+               <div id="divv2">
+                   <div class="layui-item layui-col-sm6 lw7">
+                       <label class="layui-form-label">主委托方：</label>
+                       <div class="layui-input-block">
+                           <input htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
+                       </div>
+                   </div>
+                   <div class="layui-item layui-col-sm6 lw7">
+                       <label class="layui-form-label">工程分类：</label>
+                       <div class="layui-input-block">
+                           <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+                       </div>
+                   </div>
+               </div>
             </div>
 
             <div class="form-group layui-row">