15050 监护人签字列表 字段缺少数据
							parent
							
								
									60bfb26030
								
							
						
					
					
						commit
						03ebdabc6d
					
				|  | @ -1207,6 +1207,13 @@ public class AppHotworkCfdController extends BaseController { | ||||||
| 					//sendMessageUtil.sendMessages(mes, paramsList);
 | 					//sendMessageUtil.sendMessages(mes, paramsList);
 | ||||||
| 				} | 				} | ||||||
| 				break; | 				break; | ||||||
|  | 			case "-1.5": {//确认
 | ||||||
|  | 				log.put("ACTION", "作业负责人打回"); | ||||||
|  | 				pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); | ||||||
|  | 				pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); | ||||||
|  | 				hotworkCfdService.edit(pd2); | ||||||
|  | 				break; | ||||||
|  | 			} | ||||||
| 			case "-2": {//确认打回
 | 			case "-2": {//确认打回
 | ||||||
| 				log.put("ACTION", "作业单位打回"); | 				log.put("ACTION", "作业单位打回"); | ||||||
| 				pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); | 				pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); | ||||||
|  | @ -1856,6 +1863,7 @@ public class AppHotworkCfdController extends BaseController { | ||||||
| 			condition.put("CORPINFO_ID",request.get("CORPINFO_ID")); | 			condition.put("CORPINFO_ID",request.get("CORPINFO_ID")); | ||||||
| 			condition.put("TYPE","2"); | 			condition.put("TYPE","2"); | ||||||
| 			condition.put("APPROVAL_STATUS","1"); | 			condition.put("APPROVAL_STATUS","1"); | ||||||
|  | 			condition.put("APPROVAL_CONTENT", request.getString("APPROVAL_CONTENT")); | ||||||
| 			hotworkCfdService.confessApproval(condition, files); | 			hotworkCfdService.confessApproval(condition, files); | ||||||
| 
 | 
 | ||||||
| 			// 保存安全项信息
 | 			// 保存安全项信息
 | ||||||
|  | @ -1877,6 +1885,8 @@ public class AppHotworkCfdController extends BaseController { | ||||||
| 				measures.put("CONFIRM_NAME", request.get("ACTION_USER")); | 				measures.put("CONFIRM_NAME", request.get("ACTION_USER")); | ||||||
| 				hotworkToMeasuresCfdService.save(measures); | 				hotworkToMeasuresCfdService.save(measures); | ||||||
| 			} | 			} | ||||||
|  | 
 | ||||||
|  | 			// 保存其他审批意见
 | ||||||
| 			response.put("result", "success"); | 			response.put("result", "success"); | ||||||
| 			return response; | 			return response; | ||||||
| 		} catch (Exception e) { | 		} catch (Exception e) { | ||||||
|  |  | ||||||
|  | @ -232,6 +232,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { | ||||||
| 		entity.put("APPROVAL_STATUS", request.getString("APPROVAL_STATUS")); | 		entity.put("APPROVAL_STATUS", request.getString("APPROVAL_STATUS")); | ||||||
| 		entity.put("APPROVAL_SIGNATURE", Warden.saveFile(files,request.getString("CORPINFO_ID"))); | 		entity.put("APPROVAL_SIGNATURE", Warden.saveFile(files,request.getString("CORPINFO_ID"))); | ||||||
| 		entity.put("APPROVAL_SIGNATURE_TIME", DateUtil.getTime()); | 		entity.put("APPROVAL_SIGNATURE_TIME", DateUtil.getTime()); | ||||||
|  | 		entity.put("APPROVAL_CONTENT",request.getString("APPROVAL_CONTENT")); | ||||||
| 		busHotworkCfdExamineMapper.edit(entity); | 		busHotworkCfdExamineMapper.edit(entity); | ||||||
| 
 | 
 | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue