src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -37,6 +37,8 @@ import com.jeeplus.modules.sysimportinfo.entity.SysImportInfo;
 import com.jeeplus.modules.sysimportinfo.service.SysImportInfoService;
 import com.jeeplus.modules.workactivity.entity.Activity;
 import com.jeeplus.modules.workactivity.service.ActivityService;
+import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
+import com.jeeplus.modules.workbidproject.service.WorkBidProjectService;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
@@ -87,6 +89,8 @@ import java.util.*;
 public class WorkContractInfoController extends BaseController {
 
     @Autowired
+    private WorkBidProjectService workBidProjectService;
+    @Autowired
     private AlterInfoService alterInfoService;
     @Autowired
     private WorkContractInfoService workContractInfoService;
@@ -676,6 +680,10 @@ public class WorkContractInfoController extends BaseController {
 //        model.addAttribute("processInstanceId",workContractInfo.getProcessInstanceId());
 //        model.addAttribute("invalidateProcessInstanceId",workContractInfo.getInvalidateProcessInstanceId());
 
+       if("0".equals(workContractInfo.getExt())){
+           WorkBidProject workBidProject = workBidProjectService.get(workContractInfo.getProject().getId());
+           workContractInfo.setProject(workBidProject);
+       }
         //合同作废信息
         AlterInfo alterInfo = alterInfoService.getByContractInfo(workContractInfo);
         model.addAttribute("alterInfo",alterInfo);
@@ -932,12 +940,13 @@ public class WorkContractInfoController extends BaseController {
             workContractInfo.setSignatureStatus("1");
             workContractInfoService.save(workContractInfo);//暂存
             workContractInfoService.updateWorkContractInfo(workContractInfo);
-            WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
-            String id = workContractInfo.getId();
-            workContractReview.setContractId(id);
-            workContractReview.setWorkAttachments(list2);
-            workContractReview.setContractName(workContractInfo.getName());
-            workContractReviewService.save(workContractReview);
+//            合同评审暂时不用
+//            WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
+//            String id = workContractInfo.getId();
+//            workContractReview.setContractId(id);
+//            workContractReview.setWorkAttachments(list2);
+//            workContractReview.setContractName(workContractInfo.getName());
+//            workContractReviewService.save(workContractReview);
             addMessage(redirectAttributes, "暂存合同管理成功");
         }
         return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffAchievementService.java

@@ -101,7 +101,8 @@ public class WorkStaffAchievementService extends CrudService<WorkStaffAchievemen
             return;
         }
         WorkStaffAchievement entity = new WorkStaffAchievement();
-        entity.setStaff(workStaffBasicInfo.getId());
+//        entity.setStaff(workStaffBasicInfo.getId());
+        entity.setStaff(workStaffBasicInfo.getAchiveId());
         workStaffBasicInfo.setAchievementList(this.findList(entity));
     }
     private static Map<String,String> EDU_MAP = Maps.newHashMap();//教育经历

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -39,9 +39,8 @@ import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
 import com.jeeplus.modules.workrelationship.dao.WorkRelationshipDao;
 import com.jeeplus.modules.workrelationship.entity.WorkRelationship;
-import com.jeeplus.modules.workstaff.dao.WorkStaffAchivesDao;
-import com.jeeplus.modules.workstaff.entity.WorkStaffEducation;
-import com.jeeplus.modules.workstaff.entity.WorkStaffExperience;
+import com.jeeplus.modules.workstaff.dao.*;
+import com.jeeplus.modules.workstaff.entity.*;
 import com.jeeplus.modules.workstaffachiveslog.dao.WorkStaffAchivesLogDao;
 import com.jeeplus.modules.workstaffachiveslog.entity.WorkStaffAchivesLog;
 import com.jeeplus.modules.workstaffachiveslog.service.WorkStaffAchivesLogService;
@@ -53,8 +52,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
-import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
-import com.jeeplus.modules.workstaff.dao.WorkStaffBasicInfoDao;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -116,8 +113,31 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
     private WorkStaffAchivesLogService workStaffAchivesLogService;
     @Autowired
     private AreaDao areaDao;
+    @Autowired
+    private WorkStaffEducationDao educationDao;
+    @Autowired
+    private WorkStaffLanguagesDao languagesDao;
+    @Autowired
+    private WorkStaffAchievementDao achievementDao;
+    @Autowired
+    private WorkStaffCertificateDao certificateDao;
+    @Autowired
+    private WorkStaffExperienceDao experienceDao;
+    @Autowired
+    private WorkStaffFamilyDao familyDao;
+    @Autowired
+    private WorkStaffRecordDao recordDao;
+    @Autowired
+    private WorkStaffRewardsDao rewardsDao;
+    @Autowired
+    private WorkStaffSocialPositionDao socialPositionDao;
+    @Autowired
+    private WorkStaffTitleDao titleDao;
+    @Autowired
+    private WorkStaffTrainingDao trainingDao;
 
-	public WorkStaffBasicInfo get(String id) {
+
+    public WorkStaffBasicInfo get(String id) {
 		return super.get(id);
 	}
 	public Integer getByCompany(WorkStaffBasicInfo workStaffBasicInfo) {
@@ -175,7 +195,7 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         workStaffBasicInfo.setAchiveId(workStaffBasicInfo.getId());
         workStaffBasicInfo.setId(baseId);
 		super.save(workStaffBasicInfo);
-	    this.saveDetails(workStaffBasicInfo,false);
+//        this.saveDetails(workStaffBasicInfo,false);
 	    //同步修改sys_user表中的name
         if(roleService.getRoleIdByUserId(workStaffBasicInfo.getUserId())!=null){
             //更新信息
@@ -192,7 +212,9 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         }else{
             userService.insertRole(workStaffBasicInfo);
         }
-
+        //需要逻辑删除数据库中档案表id关联的教育经历等信息
+//        workStaffBasicInfo.setId(workStaffBasicInfo.getAchiveId());
+//        this.deleteDetailById(workStaffBasicInfo);
 	}
 
     /**
@@ -203,19 +225,21 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
      */
     @Transactional(readOnly = false)
     public void updateAchieveDirectly(WorkStaffBasicInfo workStaffBasicInfo,HttpServletRequest request) throws IOException {
-        String baseId = workStaffBasicInfo.getId();
+        String staffId = workStaffBasicInfo.getId();
         workStaffBasicInfo.setId(workStaffBasicInfo.getAchiveId());
         this.saveAchive(workStaffBasicInfo,request);
         workStaffBasicInfo.setAchiveId(workStaffBasicInfo.getId());
-        workStaffBasicInfo.setId(baseId);
+        workStaffBasicInfo.setId(staffId);
         super.save(workStaffBasicInfo);
-        this.saveDetails(workStaffBasicInfo,false);
-        if (workStaffBasicInfo.getPhone() != null) {
-            User user = new User();
-            user.setId(workStaffBasicInfo.getUserId());
-            user.setPhone(workStaffBasicInfo.getPhone());
-            userService.updateUser(user);
-        }
+//        this.saveDetails(workStaffBasicInfo,false);
+//        if (workStaffBasicInfo.getPhone() != null) {
+//            User user = new User();
+//            user.setId(workStaffBasicInfo.getUserId());
+//            user.setPhone(workStaffBasicInfo.getPhone());
+//            userService.updateUser(user);
+//        }
+        //需要逻辑删除数据库中员工id关联的教育经历等信息
+//        this.deleteDetailById(workStaffBasicInfo);
     }
     public void preSave(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request) throws IOException {
         if(workStaffBasicInfo.getCompany()==null){
@@ -858,4 +882,6 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         return workStaffBasicInfoDao.getByAchieveId(achiveId);
     }
 
+
+
 }

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffCertificateService.java

@@ -148,7 +148,8 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
             return;
         }
         WorkStaffCertificate entity = new WorkStaffCertificate();
-        entity.setStaffId(workStaffBasicInfo.getId());
+        entity.setStaffId(workStaffBasicInfo.getAchiveId());
+//        entity.setStaffId(workStaffBasicInfo.getId());
         workStaffBasicInfo.setCertificateList(this.findList(entity));
     }
     private static Map<String,String> EDU_MAP = Maps.newHashMap();//教育经历

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffEducationService.java

@@ -48,8 +48,11 @@ public class WorkStaffEducationService extends CrudService<WorkStaffEducationDao
     private WorkStaffAchivesLogService workStaffAchivesLogService;
     @Autowired
     private UserDao userDao;
+    @Autowired
+    private WorkStaffEducationDao workStaffEducationDao;
+
 
-	public WorkStaffEducation get(String id) {
+    public WorkStaffEducation get(String id) {
 		return super.get(id);
 	}
 	
@@ -138,7 +141,7 @@ public class WorkStaffEducationService extends CrudService<WorkStaffEducationDao
             }
             try {
                 OSSClientUtil ossUtil = new OSSClientUtil();
-                String path = Global.getStaffBasicFilePath()+ DateUtils.formatDate(new Date(),null)+"/";
+                String path = Global.getStaffBasicFilePath()+ DateUtils.formatDate(new Date(), (Object) null)+"/";
                 String newName = System.currentTimeMillis()+"-"+file.getOriginalFilename();
                 ossUtil.uploadFile2OSS(file.getInputStream(),path,newName);
                 return  Global.getAliDownloadUrl() + "/" + path + newName;
@@ -154,7 +157,8 @@ public class WorkStaffEducationService extends CrudService<WorkStaffEducationDao
             return;
         }
         WorkStaffEducation entity = new WorkStaffEducation();
-        entity.setStaff(workStaffBasicInfo.getId());
+//        entity.setStaff(workStaffBasicInfo.getId());
+        entity.setStaff(workStaffBasicInfo.getAchiveId());
         workStaffBasicInfo.setEducationList(this.findList(entity));
     }
 
@@ -498,4 +502,7 @@ public class WorkStaffEducationService extends CrudService<WorkStaffEducationDao
             }
         }
     }
+
+
+
 }

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffExperienceService.java

@@ -102,7 +102,8 @@ public class WorkStaffExperienceService extends CrudService<WorkStaffExperienceD
             return;
         }
         WorkStaffExperience entity = new WorkStaffExperience();
-        entity.setStaffId(workStaffBasicInfo.getId());
+        entity.setStaffId(workStaffBasicInfo.getAchiveId());
+//        entity.setStaffId(workStaffBasicInfo.getId());
         workStaffBasicInfo.setExperienceList(this.findList(entity));
     }
     private static Map<String,String> EDU_MAP = Maps.newHashMap();//工作经历

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffFamilyService.java

@@ -102,7 +102,8 @@ public class WorkStaffFamilyService extends CrudService<WorkStaffFamilyDao, Work
             return;
         }
         WorkStaffFamily entity = new WorkStaffFamily();
-        entity.setStaff(workStaffBasicInfo.getId());
+//        entity.setStaff(workStaffBasicInfo.getId());
+        entity.setStaff(workStaffBasicInfo.getAchiveId());
         workStaffBasicInfo.setFamilyList(this.findList(entity));
     }
     private static Map<String,String> EDU_MAP = Maps.newHashMap();//教育经历

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffLanguagesService.java

@@ -133,7 +133,7 @@ public class WorkStaffLanguagesService extends CrudService<WorkStaffLanguagesDao
             }
             try {
                 OSSClientUtil ossUtil = new OSSClientUtil();
-                String path = Global.getStaffBasicFilePath()+ DateUtils.formatDate(new Date(),null)+"/";
+                String path = Global.getStaffBasicFilePath()+ DateUtils.formatDate(new Date(), (Object) null)+"/";
                 String newName = System.currentTimeMillis()+"-"+file.getOriginalFilename();
                 ossUtil.uploadFile2OSS(file.getInputStream(),path,newName);
                 return  Global.getAliDownloadUrl() + "/" + path + newName;
@@ -149,7 +149,8 @@ public class WorkStaffLanguagesService extends CrudService<WorkStaffLanguagesDao
             return;
         }
         WorkStaffLanguages entity = new WorkStaffLanguages();
-        entity.setStaffId(workStaffBasicInfo.getId());
+//        entity.setStaffId(workStaffBasicInfo.getId());
+        entity.setStaffId(workStaffBasicInfo.getAchiveId());
         workStaffBasicInfo.setLanguageList(this.findList(entity));
     }
 

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffRecordService.java

@@ -150,7 +150,8 @@ public class WorkStaffRecordService extends CrudService<WorkStaffRecordDao, Work
             return;
         }
         WorkStaffRecord entity = new WorkStaffRecord();
-        entity.setStaff(workStaffBasicInfo.getId());
+//        entity.setStaff(workStaffBasicInfo.getId());
+        entity.setStaff(workStaffBasicInfo.getAchiveId());
         workStaffBasicInfo.setRecordList(this.findList(entity));
     }
     private static Map<String,String> EDU_MAP = Maps.newHashMap();//教育经历

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffRewardsService.java

@@ -102,7 +102,8 @@ public class WorkStaffRewardsService extends CrudService<WorkStaffRewardsDao, Wo
             return;
         }
         WorkStaffRewards entity = new WorkStaffRewards();
-        entity.setStaff(workStaffBasicInfo.getId());
+//        entity.setStaff(workStaffBasicInfo.getId());
+        entity.setStaff(workStaffBasicInfo.getAchiveId());
         workStaffBasicInfo.setRewardsList(this.findList(entity));
     }
     private static Map<String,String> EDU_MAP = Maps.newHashMap();//教育经历

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffSocialPositionService.java

@@ -102,7 +102,8 @@ public class WorkStaffSocialPositionService extends CrudService<WorkStaffSocialP
             return;
         }
         WorkStaffSocialPosition entity = new WorkStaffSocialPosition();
-        entity.setStaff(workStaffBasicInfo.getId());
+//        entity.setStaff(workStaffBasicInfo.getId());
+        entity.setStaff(workStaffBasicInfo.getAchiveId());
         workStaffBasicInfo.setSocialPositionList(this.findList(entity));
     }
     private static Map<String,String> EDU_MAP = Maps.newHashMap();//教育经历

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffTitleService.java

@@ -149,7 +149,8 @@ public class WorkStaffTitleService extends CrudService<WorkStaffTitleDao, WorkSt
             return;
         }
         WorkStaffTitle entity = new WorkStaffTitle();
-        entity.setStaffId(workStaffBasicInfo.getId());
+//        entity.setStaffId(workStaffBasicInfo.getId());
+        entity.setStaffId(workStaffBasicInfo.getAchiveId());
         workStaffBasicInfo.setTitleList(this.findList(entity));
     }
 

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffTrainingService.java

@@ -149,7 +149,8 @@ public class WorkStaffTrainingService extends CrudService<WorkStaffTrainingDao,
             return;
         }
         WorkStaffTraining entity = new WorkStaffTraining();
-        entity.setStaff(workStaffBasicInfo.getId());
+//        entity.setStaff(workStaffBasicInfo.getId());
+        entity.setStaff(workStaffBasicInfo.getAchiveId());
         workStaffBasicInfo.setTrainingList(this.findList(entity));
     }
 

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -76,6 +76,9 @@
 	<select id="get" resultType="WorkContractInfo" >
 		SELECT
 		a.id AS "id",
+		a.project_id AS "project.id",
+		a.project_name AS "project.name",
+		a.ext AS  "ext",
 		u.name AS "createBy.name",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",

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

@@ -526,7 +526,7 @@
                                     </div>
 
                                     <div class="layui-item layui-col-sm6 lw7">
-                                        <label class="layui-form-label">固定电话：</label>
+                                        <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"/>
                                         </div>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormAdd.jsp

@@ -29,14 +29,14 @@
                     //新增按钮页面暂存
                     $("#inputForm").attr("action","${ctx}/workcontractinfo/workContractInfo/store");
                 }
-                if($("#timeRequirements").val()==''){
-                    top.layer.alert('合同评审信息中时间要求不能为空！', {icon: 0});
-                    return;
-                }
-                if($("#specialRequirements").val()==''){
-                    top.layer.alert('合同评审信息中特殊要求不能为空！', {icon: 0});
-                    return;
-                }
+                // if($("#timeRequirements").val()==''){
+                //     top.layer.alert('合同评审信息中时间要求不能为空！', {icon: 0});
+                //     return;
+                // }
+                // if($("#specialRequirements").val()==''){
+                //     top.layer.alert('合同评审信息中特殊要求不能为空！', {icon: 0});
+                //     return;
+                // }
                 $("#inputForm").submit();
                 return true;
             }else {

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormEdit.jsp

@@ -66,15 +66,15 @@
             $("input[name='ext']").on('ifChecked', function(event){
                 var radioVal = $(this).val();
                 if(radioVal == 0){
-                    $("#td1").removeClass("hide");
-                    $("#td2").addClass("hide");
-                    $("#tr1").show()
-                    $("#tr2").show()
+                    // $("#td1").removeClass("hide");
+                    // $("#td2").addClass("hide");
+                    $("#tr1").show();
+                    $("#tr2").show();
                 }else{
-                    $("#td1").addClass("hide");
-                    $("#td2").removeClass("hide");
-                    $("#tr1").hide()
-                    $("#tr2").hide()
+                    // $("#td1").addClass("hide");
+                    // $("#td2").removeClass("hide");
+                    $("#tr1").hide();
+                    $("#tr2").hide();
                 }
             });
 

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

@@ -307,9 +307,9 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">固定电话：</label>
+                        <label class="layui-form-label">座机：</label>
                         <div class="layui-input-block">
-                            <form:input path="phone" id="phone"   htmlEscape="false" class="form-control  layui-input " maxlength="50"/>
+                            <form:input path="phone" id="phone"   htmlEscape="false"   class="form-control isTel  layui-input"  maxlength="50"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">

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

@@ -321,10 +321,10 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">固定电话：</label>
+                    <label class="layui-form-label">座机：</label>
                     <div class="layui-input-block">
-                        <form:input path="phone" id="phone"   htmlEscape="false" class="form-control  layui-input " maxlength="50"/>
-                        <span class="help-inline"></span>
+                        <form:input path="phone" htmlEscape="false"
+                                    class="form-control isTel  layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -415,6 +415,13 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">座机：</label>
+                    <div class="layui-input-block">
+                        <form:input path="phone" htmlEscape="false"
+                                    class="form-control isTel  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 with-icon">
                         <sys:treeselect id="office" name="office.id" value="${workStaffBasicInfo.office.id}" labelName="office.name" labelValue="${workStaffBasicInfo.office.name}"