forked from integrated_whb/integrated_whb
八项作业动火作业签字显示完成,动火人及证书编号显示完成
parent
a4b7ff0a63
commit
cc33e51b0c
|
@ -156,6 +156,26 @@ public class AppHotworkController extends BaseController {
|
||||||
map.put("result",errInfo);
|
map.put("result",errInfo);
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
/**搜索动火作业动火人及证书编号
|
||||||
|
* @param page
|
||||||
|
* @throws Exception
|
||||||
|
*/
|
||||||
|
@RequestMapping(value="/namelist")
|
||||||
|
@ResponseBody
|
||||||
|
@LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "动火作业动火人及证书编号")
|
||||||
|
public Object namelist(Page page) throws Exception{
|
||||||
|
Map<String,Object> map = new HashMap<String,Object>();
|
||||||
|
String errInfo = "success";
|
||||||
|
PageData pd = new PageData();
|
||||||
|
pd = this.getPageData();
|
||||||
|
pd.put("CORPINFO_ID", pd.get("CORPINFO_ID")); //企业ID
|
||||||
|
page.setPd(pd);
|
||||||
|
List<PageData> varList = hotworkService.namelist(pd); //列出PersonnelManagement列表
|
||||||
|
map.put("varList", varList);
|
||||||
|
map.put("page", page);
|
||||||
|
map.put("result", errInfo);
|
||||||
|
return map;
|
||||||
|
}
|
||||||
|
|
||||||
@RequestMapping("/checkWorkCount")
|
@RequestMapping("/checkWorkCount")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
|
|
|
@ -18,6 +18,9 @@ public interface HotworkMapper {
|
||||||
void editGasTime(PageData pd);
|
void editGasTime(PageData pd);
|
||||||
void editStep(PageData pd);
|
void editStep(PageData pd);
|
||||||
List<PageData> datalistPage(Page page);
|
List<PageData> datalistPage(Page page);
|
||||||
|
|
||||||
|
List<PageData> namelist(PageData pd);
|
||||||
|
|
||||||
List<PageData> listAllMeasures();
|
List<PageData> listAllMeasures();
|
||||||
|
|
||||||
List<PageData> checkWorkCount(PageData pd);
|
List<PageData> checkWorkCount(PageData pd);
|
||||||
|
|
|
@ -22,6 +22,8 @@ public interface HotworkService {
|
||||||
|
|
||||||
void nextStep(PageData pd, MultipartFile[] files) throws Exception;
|
void nextStep(PageData pd, MultipartFile[] files) throws Exception;
|
||||||
|
|
||||||
|
public List<PageData> namelist(PageData pd)throws Exception;
|
||||||
|
|
||||||
PageData findById(PageData pd) throws Exception;
|
PageData findById(PageData pd) throws Exception;
|
||||||
|
|
||||||
PageData listSignFinished(PageData pd) throws Exception;
|
PageData listSignFinished(PageData pd) throws Exception;
|
||||||
|
|
|
@ -99,6 +99,10 @@ public class HotworkServiceImpl implements HotworkService {
|
||||||
return hotworkMapper.datalistPage(page);
|
return hotworkMapper.datalistPage(page);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<PageData> namelist(PageData pd)throws Exception{
|
||||||
|
return hotworkMapper.namelist(pd);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 下一步
|
* 下一步
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -481,6 +481,22 @@
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
<select id="namelist" parameterType="pd" resultType="pd">
|
||||||
|
select
|
||||||
|
concat("姓名:",f.NAME,',',"编号:",f.CERTIFICATE_NUM) NAME
|
||||||
|
from
|
||||||
|
BUS_PERSONNELMANAGEMENT f
|
||||||
|
left join sys_dictionaries a on a.DICTIONARIES_ID = f.JOB_TYPE
|
||||||
|
left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID
|
||||||
|
left join bus_units r on r.UNITS_ID = f.UNITS_ID
|
||||||
|
where f.ISDELETE = '0'
|
||||||
|
<if test="CORPINFO_ID != null and ORPINFO_ID != ''">
|
||||||
|
and f.CORPINFO_ID = #{CORPINFO_ID}
|
||||||
|
</if>
|
||||||
|
ORDER BY f.OPERATTIME DESC
|
||||||
|
</select>
|
||||||
|
|
||||||
<select id="checkWorkCount" parameterType="pd" resultType="pd" >
|
<select id="checkWorkCount" parameterType="pd" resultType="pd" >
|
||||||
select
|
select
|
||||||
step.CODE,count(1) COUNT
|
step.CODE,count(1) COUNT
|
||||||
|
|
Loading…
Reference in New Issue