1111

src/main/java/com/jeeplus/modules/workbidproject/service/WorkBidProjectService.java

@@ -628,7 +628,9 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 
 		// 对不同环节的业务逻辑进行操作
 		String taskDefKey = workBidProject.getAct().getTaskDefKey();
+		// 投标专员，，申请人
 		if("tbzy".equals(taskDefKey) || ("sqr").equals(taskDefKey)){
+			// 如果是这两个人，需要提交补充材料，处理一下附件。
 			updateWorkReimbursementInfo(workBidProject);
 			actTaskService.claim(workBidProject.getAct().getTaskId(), UserUtils.getUser().getId());
 		}else if(!"modifyApply".equals(taskDefKey)){
@@ -726,11 +728,12 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 					exp = "pass";
 					if ("yes".equals(workBidProject.getAct().getFlag())) {
 						workActivityProcessService.insertAuditsByType(auditUsers,workBidProject.getProcessInstanceId(),2,1);
+						//通知下一位审批人
 						notifyRole = "市场研发管理部负责人备案";
 						workActivityProcess.setIsApproval("1");
 						enname = "scyfglbzr";
-						vars.put("scyfglbzrscount",auditUsers.size());
-						vars.put("scyfglbzrsList",auditUsers);
+						vars.put("scyfglbzrcount",auditUsers.size());
+						vars.put("scyfglbzrList",auditUsers);
 
 					} else {
 						notifyRole = "调整申请";
@@ -1021,17 +1024,16 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 					notify.setNotifyId(workBidProject.getId());
 					userList = workProjectNotifyService.readByNotifyId(notify);
 					//users.addAll(userList);
-					workProjectNotifyService
-							.save(UtilNotify
-									.saveNotify(workBidProject.getId(),
-											workBidProject.getCreateBy(),
-											workBidProject.getCompanyId(),
-											title,
-											str,
-											"50",
-											"0",
-											"重新申请",
-											notifyRole));
+					workProjectNotifyService.save(UtilNotify.saveNotify(
+							workBidProject.getId(),
+							workBidProject.getCreateBy(),
+							workBidProject.getCompanyId(),
+							title,
+							str,
+							"50",
+							"0",
+							"重新申请",
+							notifyRole));
 					users.add( workBidProject.getCreateBy());
 				} else {
 					if (StringUtils.isNotBlank(enname)&&!enname.contains("不为空")&&!enname.equals("sqr")){

src/main/java/com/jeeplus/modules/workbidproject/web/WorkBidProjectController.java

@@ -17,6 +17,7 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
+import com.jeeplus.common.websocket.utils.Constant;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
@@ -124,7 +125,7 @@ public class  WorkBidProjectController extends BaseController {
 	}
 
 	/**
-	 * 查看，增加，编辑投标项目表单页面
+	 * 查看tabId=1，增加，编辑投标项目表单页面
 	 */
 	//@RequiresPermissions(value={"workbidproject:workBidProject:view","workbidproject:workBidProject:add","workbidproject:workBidProject:edit"},logical=Logical.OR)
 	@RequestMapping(value = "form")
@@ -209,19 +210,6 @@ public class  WorkBidProjectController extends BaseController {
 			}
 		}
 		return  act;
-		/*if (processInstance!=null) {
-			Task taskInfok = actTaskService.getCurrentTaskInfo(processInstance);
-			Act act = new Act();
-			act.setTaskId(taskInfok.getId());
-			act.setTaskName(taskInfok.getName());
-			act.setTaskDefKey(taskInfok.getTaskDefinitionKey());
-			act.setProcDefId(taskInfok.getProcessDefinitionId());
-			act.setProcInsId(taskInfok.getProcessInstanceId());
-			act.setTask(taskInfok);
-			return act;
-		}else {
-			return null;
-		}*/
 	}
 	@RequestMapping(value = "store")
     public String store(WorkBidProject workBidProject,
@@ -296,9 +284,12 @@ public class  WorkBidProjectController extends BaseController {
 		}
 		return "redirect:"+Global.getAdminPath()+"/workbidproject/workBidProject/?repage";
 	}
+
 	/**
 	 * 工单执行（完成任务）
+	 * @param workBidProject
 	 * @param model
+	 * @param redirectAttributes
 	 * @return
 	 */
 	@RequestMapping(value = "saveAudit")

src/main/java/com/jeeplus/modules/workregularapply/web/WorkRegularApplyController.java

@@ -28,6 +28,7 @@ import com.jeeplus.modules.workregularapply.service.WorkRegularContentService;
 import com.jeeplus.modules.workregularapply.service.WorkRegularScoreService;
 import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.Logical;
@@ -69,6 +70,8 @@ public class WorkRegularApplyController extends BaseController {
 	@Autowired
 	private WorkRegularScoreService workRegularScoreService;
 	@Autowired
+	private WorkStaffBasicInfoService workStaffBasicInfoService;
+	@Autowired
 	private ActTaskService actTaskService;
 	@Autowired
 	private UserDao userDao;
@@ -105,7 +108,13 @@ public class WorkRegularApplyController extends BaseController {
 	@RequestMapping(value = "form")
 	public String form(WorkRegularApply workRegularApply, Model model) {
 		String flat=request.getParameter("tabId");
+
+		//1 为 新增转正申请
 		if("1".equals(flat)){
+			// 如果当前用户在试用期，则将入职信息自动填写到Form
+			WorkStaffBasicInfo basicInfo = workStaffBasicInfoService.getWorkStaffBasicInfoByUserId(UserUtils.getUser().getId());
+			workRegularApply.setWorkStaffBasicInfo(basicInfo);
+
 			WorkRegularContent w=new WorkRegularContent();
 			List<WorkRegularScore> workRegularScoreList=new ArrayList<>();
 			List<WorkRegularContent> list=workRegularContentService.findList(w);

src/main/java/com/jeeplus/modules/workstaff/dao/WorkStaffBasicInfoDao.java

@@ -16,6 +16,12 @@ import java.util.List;
  */
 @MyBatisDao
 public interface WorkStaffBasicInfoDao extends CrudDao<WorkStaffBasicInfo> {
+    /**
+     * 根据用户id,多表查询获取用户入职信息
+     * @param userId
+     * @return
+     */
+    public WorkStaffBasicInfo  getWorkStaffBasicInfoByUserId(String userId);
 
     public WorkStaffBasicInfo  getWorkStaffBasicInfo(String id);//根据用户获取用户入职信息
     public Integer getByCompany(WorkStaffBasicInfo workStaffBasicInfo);//根据用户获取用户入职信息

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

@@ -778,4 +778,14 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         titleService.saveEdu(workStaffBasicInfo);//职称
         trainingService.saveEdu(workStaffBasicInfo);//培训经历
     }
+
+    /**
+     * 通过员工的id,获取员工入职信息,试用期员工转正申请使用此方法
+     * @param userId
+     * @return
+     */
+    public WorkStaffBasicInfo getWorkStaffBasicInfoByUserId(String userId){
+        return  workStaffBasicInfoDao.getWorkStaffBasicInfoByUserId(userId);
+    }
+
 }

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

@@ -370,6 +370,19 @@
 		where a.id=#{id}
 	</select>
 
+<!--	根据userId，获取workStaffBasicInfo信息-->
+	<select id="getWorkStaffBasicInfoByUserId" resultType="WorkStaffBasicInfo" parameterType="java.lang.String">
+		select a.* ,
+		o.name as "office.name",
+		jg.name AS "jobGrade.name",
+		jg.pay AS "salary"
+		FROM work_staff_basic_info  a
+		LEFT JOIN sys_office o on o.id=a.office_id
+		LEFT JOIN work_job_grade jg ON jg.id = a.job_grade
+		where a.user_id=#{userId,jdbcType=VARCHAR}
+		and a.status = "试用"
+	</select>
+
     <select id="queryMaxNoWithCompany" resultType="String">
         SELECT max(SUBSTR(no,5)+0) FROM work_staff_achives where branch_office=#{branchOffice.id} and del_flag='0'
     </select>