修改

src/main/java/com/jeeplus/modules/workregularapply/service/WorkRegularApplyService.java

@@ -545,7 +545,7 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 					workActivityProcess.setCount(0);
 					enname = "bmzr";
 					if (!"yes".equals(workRegularApply.getAct().getFlag())) {
-						workRegularApply.setState("3");
+						workRegularApply.setState("2");
 					}
 					break;
 				}

src/main/java/com/jeeplus/modules/workresignation/service/WorkResignationService.java

@@ -409,6 +409,7 @@ public class WorkResignationService extends CrudService<WorkResignationDao, Work
 		String sId = workResignation.getWorkStaffBasicInfo().getId();
 		String comId= null;
 		WorkStaffBasicInfo workStaffBasicInfo = workStaffBasicInfoService.getAchives(sId);
+		WorkStaffBasicInfo workStaffBasicInfo1 = workStaffBasicInfoService.getByAc(sId);
 		if(workStaffBasicInfo!=null){
 			comId = workStaffBasicInfo.getBranchOffice().getId();
 			String uId = workStaffBasicInfo.getUserId();
@@ -863,6 +864,7 @@ public class WorkResignationService extends CrudService<WorkResignationDao, Work
 					workStaffBasicInfo.preUpdate();
 					workStaffBasicInfo.setDimissionDate(workResignation.getDate());
 					workStaffBasicInfo.setWorkEndDate(workResignation.getEndDate());
+					workStaffBasicInfoService.delete(workStaffBasicInfo1);
 					workStaffAchivesDao.update(workStaffBasicInfo);
 				}else if("2".equals(workResignation.getType())){
 					workStaffBasicInfo.setStatus("退休");

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

@@ -24,6 +24,7 @@ public interface WorkStaffBasicInfoDao extends CrudDao<WorkStaffBasicInfo> {
      * @return
      */
     public WorkStaffBasicInfo  getWorkStaffBasicInfoByUserId(String userId);
+    WorkStaffBasicInfo  getByAc(String id);
 
     public WorkStaffBasicInfo  getWorkStaffBasicInfo(String id);//根据用户获取用户入职信息
     public Integer getByCompany(WorkStaffBasicInfo workStaffBasicInfo);//根据用户获取用户入职信息

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

@@ -143,6 +143,9 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
     public WorkStaffBasicInfo get(String id) {
 		return super.get(id);
 	}
+    public WorkStaffBasicInfo getByAc(String id) {
+        return workStaffBasicInfoDao.getByAc(id);
+    }
 	public Integer getByCompany(WorkStaffBasicInfo workStaffBasicInfo) {
 	  return workStaffAchivesDao.getByCompany(workStaffBasicInfo);
 	}

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

@@ -71,6 +71,13 @@
 		<include refid="workStaffBasicInfoJoins"/>
 		WHERE a.id = #{id}
 	</select>
+	<select id="getByAc" parameterType="String" resultType="WorkStaffBasicInfo" >
+		SELECT
+		<include refid="workStaffBasicInfoColumns"/>
+		FROM work_staff_basic_info a
+		<include refid="workStaffBasicInfoJoins"/>
+		WHERE a.achive_id = #{id}
+	</select>
 	<select id="getByCompany" resultType="java.lang.Integer" >
 		select count(*) FROM work_staff_basic_info
 		where