Explorar el Código

合同归档审批展示bug修复

user5 hace 3 años
padre
commit
10a4d1fcb0

+ 9 - 1
src/main/java/com/jeeplus/modules/workcontractrecord/service/WorkContractRecordService.java

@@ -497,7 +497,7 @@ public class WorkContractRecordService extends CrudService<WorkContractRecordDao
 					if(workContractRecord.getWorkContractInfo()!=null){
 						if(StringUtils.isNotBlank(workContractRecord.getWorkContractInfo().getId())){
 							WorkContractInfo workContractInfo = workContractInfoService.get(workContractRecord.getWorkContractInfo().getId());
-							workContractInfo.setContractState("5");
+							workContractInfo.setContractRecordState("5");
 							//判定合同归档状态是不是超期
 							if("1".equals(workContractInfo.getOverDueStatus())){
 								workContractInfo.setContractRecordState("7");
@@ -586,6 +586,14 @@ public class WorkContractRecordService extends CrudService<WorkContractRecordDao
 												"重新申请",
 												notifyRole));
 						users.add( workContractRecord.getCreateBy());
+						//归档中状态
+						if(workContractRecord.getWorkContractInfo()!=null){
+							if(StringUtils.isNotBlank(workContractRecord.getWorkContractInfo().getId())){
+								WorkContractInfo workContractInfo = workContractInfoService.get(workContractRecord.getWorkContractInfo().getId());
+								workContractInfo.setContractRecordState("4");
+								workContractInfoService.save(workContractInfo);
+							}
+						}
 					} else {
 						if (StringUtils.isNotBlank(enname)) {//驳回待办信息
 							title = "合同【"+workContractRecord.getWorkContractInfo().getName()+"】归档重新申请,待审批";