forked from integrated_whb/integrated_whb
动火验收,查询时,显示签字信息
parent
25d0947d7f
commit
44d1708a79
|
@ -157,19 +157,6 @@ public class AppHotworkController extends BaseController {
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping("/accept")
|
|
||||||
@ResponseBody
|
|
||||||
@LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "验收归档")
|
|
||||||
public Object accept() throws Exception {
|
|
||||||
Map<String,Object> map = new HashMap<>();
|
|
||||||
String errInfo = "success";
|
|
||||||
PageData pd = new PageData();
|
|
||||||
pd = this.getPageData();
|
|
||||||
hotworkService.accept(pd);
|
|
||||||
map.put("result",errInfo);
|
|
||||||
return map;
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequestMapping("/checkWorkCount")
|
@RequestMapping("/checkWorkCount")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public Object checkWorkCount() throws Exception{
|
public Object checkWorkCount() throws Exception{
|
||||||
|
|
|
@ -22,8 +22,6 @@ public interface HotworkService {
|
||||||
|
|
||||||
void nextStep(PageData pd, MultipartFile[] files) throws Exception;
|
void nextStep(PageData pd, MultipartFile[] files) throws Exception;
|
||||||
|
|
||||||
void accept(PageData pd)throws Exception;
|
|
||||||
|
|
||||||
void cancel(PageData pd) throws Exception;
|
void cancel(PageData pd) throws Exception;
|
||||||
|
|
||||||
PageData findById(PageData pd) throws Exception;
|
PageData findById(PageData pd) throws Exception;
|
||||||
|
|
|
@ -136,29 +136,21 @@ public class HotworkServiceImpl implements HotworkService {
|
||||||
List<PageData> unsignedList = hotworkSignMapper.checkUnsigned(sign);//当前步骤未签名人列表
|
List<PageData> unsignedList = hotworkSignMapper.checkUnsigned(sign);//当前步骤未签名人列表
|
||||||
if(unsignedList == null || unsignedList.size() == 0){//如果没有未签人 则跳转下一步
|
if(unsignedList == null || unsignedList.size() == 0){//如果没有未签人 则跳转下一步
|
||||||
hotworkMapper.editStep(work);
|
hotworkMapper.editStep(work);
|
||||||
PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
|
|
||||||
|
|
||||||
if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤
|
|
||||||
savePreparers(work,currentflow);
|
|
||||||
}
|
|
||||||
//保存日志
|
//保存日志
|
||||||
saveLog(work,work.getString(flow.get("ACTOR_FIELD")),"1");
|
saveLog(work,work.getString(flow.get("ACTOR_FIELD")),"1");
|
||||||
|
|
||||||
|
PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
|
||||||
|
if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤
|
||||||
|
savePreparers(work,currentflow);
|
||||||
|
}
|
||||||
saveNextSigner(work,currentflow);
|
saveNextSigner(work,currentflow);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 验收归档
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void accept(PageData pd)throws Exception{
|
|
||||||
PageData flow = getStep(pd.get("TASK_ID"), 99);
|
|
||||||
hotworkMapper.edit(pd);
|
|
||||||
saveLog(pd,pd.getString(flow.get("ACTOR_FIELD")),"1");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 取消
|
* 取消
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -301,6 +301,13 @@
|
||||||
monitor.SIGN_TIME as MONITOR_USER_SIGNER_TIME,
|
monitor.SIGN_TIME as MONITOR_USER_SIGNER_TIME,
|
||||||
monitor.SIGN_PATH as MONITOR_USER_SIGNER_PATH,
|
monitor.SIGN_PATH as MONITOR_USER_SIGNER_PATH,
|
||||||
IFNULL(monitor.DESCR,'无') as MONITOR_CONTENT,
|
IFNULL(monitor.DESCR,'无') as MONITOR_CONTENT,
|
||||||
|
start.SIGN_TIME as WORK_START_USER_SIGNER_TIME,
|
||||||
|
start.SIGN_PATH as WORK_START_USER_SIGNER_PATH,
|
||||||
|
end.SIGN_TIME as WORK_END_USER_SIGNER_TIME,
|
||||||
|
end.SIGN_PATH as WORK_END_USER_SIGNER_PATH,
|
||||||
|
accept.SIGN_TIME as ACCEPT_USER_SIGNER_TIME,
|
||||||
|
accept.SIGN_PATH as ACCEPT_USER_SIGNER_PATH,
|
||||||
|
IFNULL(accept.DESCR,'无') as ACCEPT_CONTENT,
|
||||||
f.ANALYZE_TIME
|
f.ANALYZE_TIME
|
||||||
FROM
|
FROM
|
||||||
bus_hotwork AS f
|
bus_hotwork AS f
|
||||||
|
@ -348,6 +355,9 @@
|
||||||
left join bus_hotwork_sign audit on audit.HOTWORK_ID = f.HOTWORK_ID and audit.STEP_ID = '10'
|
left join bus_hotwork_sign audit on audit.HOTWORK_ID = f.HOTWORK_ID and audit.STEP_ID = '10'
|
||||||
left join bus_hotwork_sign approve on approve.HOTWORK_ID = f.HOTWORK_ID and approve.STEP_ID = '11'
|
left join bus_hotwork_sign approve on approve.HOTWORK_ID = f.HOTWORK_ID and approve.STEP_ID = '11'
|
||||||
left join bus_hotwork_sign monitor on monitor.HOTWORK_ID = f.HOTWORK_ID and monitor.STEP_ID = '12'
|
left join bus_hotwork_sign monitor on monitor.HOTWORK_ID = f.HOTWORK_ID and monitor.STEP_ID = '12'
|
||||||
|
left join bus_hotwork_sign start on start.HOTWORK_ID = f.HOTWORK_ID and start.STEP_ID = '13'
|
||||||
|
left join bus_hotwork_sign end on end.HOTWORK_ID = f.HOTWORK_ID and end.STEP_ID = '14'
|
||||||
|
left join bus_hotwork_sign accept on accept.HOTWORK_ID = f.HOTWORK_ID and accept.STEP_ID = '15'
|
||||||
WHERE f.HOTWORK_ID = #{HOTWORK_ID}
|
WHERE f.HOTWORK_ID = #{HOTWORK_ID}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue