wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

手机隐患清单排查

pull/4/head
wangpeng 2024-02-01 16:46:11 +08:00
parent 77e8562313
commit cd97e0916a
4 changed files with 85 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zcloud/controller/check/AppCheckRecordController.java
View File

@ -157,7 +157,7 @@ public class AppCheckRecordController extends BaseController {
@RequestMapping(value = "/finish") @RequestMapping(value = "/finish")
@ResponseBody @ResponseBody
@Transactional @Transactional
@LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "完成检查") @LogAnno(menuType= "手机",menuServer= "风险排查",instructionsOperate = "清单检查情况",instructionsType = "完成检查")
public Object finish() throws Exception { public Object finish() throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";

11
src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomCheckRecordController.java
View File

@ -48,7 +48,7 @@ public class AppCustomCheckRecordController extends BaseController {
@Autowired @Autowired
private CustomHiddenService customHiddenService; private CustomHiddenService customHiddenService;
@Autowired @Autowired
private CheckUserService checkuserService; private CustomCheckUserService customCheckUserService;
@Autowired @Autowired
private CorpInfoService corpinfoService; private CorpInfoService corpinfoService;
@Autowired @Autowired
@ -168,6 +168,7 @@ public class AppCustomCheckRecordController extends BaseController {
* @param * @param
* @throws Exception * @throws Exception
*/ */
// /app/checkrecord/finish
@RequestMapping(value = "/finish") @RequestMapping(value = "/finish")
@ResponseBody @ResponseBody
@Transactional @Transactional
@ -222,7 +223,7 @@ public class AppCustomCheckRecordController extends BaseController {
} }
pd.put("FINISHED", "1"); // 是否完成 pd.put("FINISHED", "1"); // 是否完成
customCheckRecordService.edit(pd); customCheckRecordService.edit(pd);
checkuserService.delete(pd); customCheckUserService.delete(pd);
if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) { if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) {
List<JSONObject> list1 = (List<JSONObject>) JSON.parse(pd.get("OTHER").toString()); List<JSONObject> list1 = (List<JSONObject>) JSON.parse(pd.get("OTHER").toString());
for (JSONObject json : list1) { for (JSONObject json : list1) {
@ -235,7 +236,7 @@ public class AppCustomCheckRecordController extends BaseController {
other.put("USER_ID", json.get("USER_ID")); other.put("USER_ID", json.get("USER_ID"));
other.put("DEPARTMENT_NAME", json.get("DEPARTMENT_NAME")); other.put("DEPARTMENT_NAME", json.get("DEPARTMENT_NAME"));
other.put("USER_NAME", json.get("USER_NAME")); other.put("USER_NAME", json.get("USER_NAME"));
checkuserService.save(other); customCheckUserService.save(other);
} }
} }
} }
@ -394,7 +395,7 @@ public class AppCustomCheckRecordController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd = customCheckRecordService.findById(pd); // 根据ID读取 pd = customCheckRecordService.findById(pd); // 根据ID读取
PageData users = checkuserService.getCheckUser(pd); PageData users = customCheckUserService.getCheckUser(pd);
List<PageData> varList = customCheckRecordItemService.listAll(pd); List<PageData> varList = customCheckRecordItemService.listAll(pd);
pd.put("USERS", users.get("USERS")); pd.put("USERS", users.get("USERS"));
PageData pd2 = new PageData(); PageData pd2 = new PageData();
@ -427,7 +428,7 @@ public class AppCustomCheckRecordController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
String IDENTIFICATION_ID = pd.getString("IDENTIFICATION_ID"); String IDENTIFICATION_ID = pd.getString("IDENTIFICATION_ID");
pd = customCheckRecordService.findById(pd); // 根据ID读取 pd = customCheckRecordService.findById(pd); // 根据ID读取
PageData users = checkuserService.getCheckUser(pd); PageData users = customCheckUserService.getCheckUser(pd);
pd.put("IDENTIFICATION_ID", IDENTIFICATION_ID); pd.put("IDENTIFICATION_ID", IDENTIFICATION_ID);
List<PageData> varList = customCheckRecordItemService.listAll(pd); List<PageData> varList = customCheckRecordItemService.listAll(pd);
PageData idData = new PageData(); PageData idData = new PageData();

144
src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenServiceImpl.java
View File

@ -42,7 +42,7 @@ import java.util.stream.Collectors;
public class CustomHiddenServiceImpl implements CustomHiddenService { public class CustomHiddenServiceImpl implements CustomHiddenService {
@Resource @Resource
private CustomHiddenMapper customHiddenServiceMapper; private CustomHiddenMapper customHiddenMapper;
@Resource @Resource
private DictionariesService dictionariesService; private DictionariesService dictionariesService;
@Resource @Resource
@ -65,7 +65,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public void save(PageData pd)throws Exception{ public void save(PageData pd)throws Exception{
customHiddenServiceMapper.save(pd); customHiddenMapper.save(pd);
} }
/**删除 /**删除
@ -73,7 +73,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public void delete(PageData pd)throws Exception{ public void delete(PageData pd)throws Exception{
customHiddenServiceMapper.delete(pd); customHiddenMapper.delete(pd);
} }
/**修改 /**修改
@ -81,7 +81,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public void edit(PageData pd)throws Exception{ public void edit(PageData pd)throws Exception{
customHiddenServiceMapper.edit(pd); customHiddenMapper.edit(pd);
} }
/**修改信息 /**修改信息
@ -89,20 +89,20 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public void editInfo(PageData pd)throws Exception{ public void editInfo(PageData pd)throws Exception{
customHiddenServiceMapper.editInfo(pd); customHiddenMapper.editInfo(pd);
} }
public void editISCONFIRM(PageData pd)throws Exception{ public void editISCONFIRM(PageData pd)throws Exception{
customHiddenServiceMapper.editISCONFIRM(pd); customHiddenMapper.editISCONFIRM(pd);
} }
public void editHIDDENLEVEL(PageData pd)throws Exception{ public void editHIDDENLEVEL(PageData pd)throws Exception{
customHiddenServiceMapper.editHIDDENLEVEL(pd); customHiddenMapper.editHIDDENLEVEL(pd);
} }
/**提交隐患 /**提交隐患
* @throws Exception * @throws Exception
*/ */
public void submit(PageData pd)throws Exception{ public void submit(PageData pd)throws Exception{
customHiddenServiceMapper.submit(pd); customHiddenMapper.submit(pd);
} }
/**修改 /**修改
@ -110,7 +110,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public void changeState(PageData pd)throws Exception{ public void changeState(PageData pd)throws Exception{
customHiddenServiceMapper.changeState(pd); customHiddenMapper.changeState(pd);
} }
/**定时修改过期隐患 /**定时修改过期隐患
@ -118,7 +118,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public void editDeadline(PageData pd)throws Exception{ public void editDeadline(PageData pd)throws Exception{
customHiddenServiceMapper.editDeadline(pd); customHiddenMapper.editDeadline(pd);
} }
/**验收 /**验收
@ -126,7 +126,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public void check(PageData pd)throws Exception{ public void check(PageData pd)throws Exception{
customHiddenServiceMapper.check(pd); customHiddenMapper.check(pd);
} }
/**复查 /**复查
@ -134,7 +134,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public void review(PageData pd)throws Exception{ public void review(PageData pd)throws Exception{
customHiddenServiceMapper.review(pd); customHiddenMapper.review(pd);
} }
/**整改 /**整改
@ -142,7 +142,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public void rectify(PageData pd)throws Exception{ public void rectify(PageData pd)throws Exception{
customHiddenServiceMapper.rectify(pd); customHiddenMapper.rectify(pd);
} }
/**列表 /**列表
@ -150,7 +150,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> list(Page page)throws Exception{ public List<PageData> list(Page page)throws Exception{
return customHiddenServiceMapper.datalistPage(page); return customHiddenMapper.datalistPage(page);
} }
/**列表(全部) /**列表(全部)
@ -158,7 +158,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> listAll(PageData pd)throws Exception{ public List<PageData> listAll(PageData pd)throws Exception{
return customHiddenServiceMapper.listAll(pd); return customHiddenMapper.listAll(pd);
} }
/**查询昨日过期隐患。发短信 /**查询昨日过期隐患。发短信
@ -166,17 +166,17 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> getYestoday(PageData pd)throws Exception{ public List<PageData> getYestoday(PageData pd)throws Exception{
return customHiddenServiceMapper.getYestoday(pd); return customHiddenMapper.getYestoday(pd);
} }
/**列表(全部,打印使用) /**列表(全部,打印使用)
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public List<PageData> listAllToPrint(PageData pd)throws Exception{ public List<PageData> listAllToPrint(PageData pd)throws Exception{
return customHiddenServiceMapper.listAllToPrint(pd); return customHiddenMapper.listAllToPrint(pd);
} }
public List<PageData> listHiddenAll(PageData pd)throws Exception{ public List<PageData> listHiddenAll(PageData pd)throws Exception{
return customHiddenServiceMapper.listHiddenAll(pd); return customHiddenMapper.listHiddenAll(pd);
} }
/** /**
@ -185,7 +185,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> getHiddenByRecord(PageData pd)throws Exception{ public List<PageData> getHiddenByRecord(PageData pd)throws Exception{
return customHiddenServiceMapper.getHiddenByRecord(pd); return customHiddenMapper.getHiddenByRecord(pd);
} }
/**通过id获取数据 /**通过id获取数据
@ -193,7 +193,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public PageData findById(PageData pd)throws Exception{ public PageData findById(PageData pd)throws Exception{
return customHiddenServiceMapper.findById(pd); return customHiddenMapper.findById(pd);
} }
/**批量删除 /**批量删除
@ -201,28 +201,28 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
customHiddenServiceMapper.deleteAll(ArrayDATA_IDS); customHiddenMapper.deleteAll(ArrayDATA_IDS);
} }
/**批量修改 /**批量修改
* @throws Exception * @throws Exception
*/ */
public void updateAll(PageData hiddens)throws Exception{ public void updateAll(PageData hiddens)throws Exception{
customHiddenServiceMapper.updateAll(hiddens); customHiddenMapper.updateAll(hiddens);
} }
/**按日统计 /**按日统计
* @throws Exception * @throws Exception
*/ */
public List<PageData> hiddenStatisticsByDay(PageData pd)throws Exception{ public List<PageData> hiddenStatisticsByDay(PageData pd)throws Exception{
return customHiddenServiceMapper.hiddenStatisticsByDay(pd); return customHiddenMapper.hiddenStatisticsByDay(pd);
} }
/**总数统计 /**总数统计
* @throws Exception * @throws Exception
*/ */
public List<PageData> hiddenStatisticsAll(PageData pd)throws Exception{ public List<PageData> hiddenStatisticsAll(PageData pd)throws Exception{
return customHiddenServiceMapper.hiddenStatisticsAll(pd); return customHiddenMapper.hiddenStatisticsAll(pd);
} }
/** /**
*app首页 根据用户ID获取发现隐患信息 *app首页 根据用户ID获取发现隐患信息
@ -231,7 +231,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> getCountByCreatorId(PageData pd) throws Exception{ public List<PageData> getCountByCreatorId(PageData pd) throws Exception{
return customHiddenServiceMapper.getCountByCreatorId(pd); return customHiddenMapper.getCountByCreatorId(pd);
} }
/** /**
* app首页 根据用户ID获取整改隐患信息 * app首页 根据用户ID获取整改隐患信息
@ -240,7 +240,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> getCountByRectifiCationorId(PageData pd) throws Exception{ public List<PageData> getCountByRectifiCationorId(PageData pd) throws Exception{
return customHiddenServiceMapper.getCountByRectifiCationorId(pd); return customHiddenMapper.getCountByRectifiCationorId(pd);
} }
/** /**
@ -250,7 +250,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> getCountByCheckorId(PageData pd) throws Exception{ public List<PageData> getCountByCheckorId(PageData pd) throws Exception{
return customHiddenServiceMapper.getCountByCheckorId(pd); return customHiddenMapper.getCountByCheckorId(pd);
} }
/** /**
@ -259,7 +259,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> getBICount(PageData pd) throws Exception{ public List<PageData> getBICount(PageData pd) throws Exception{
return customHiddenServiceMapper.getBICount(pd); return customHiddenMapper.getBICount(pd);
} }
/** /**
@ -269,7 +269,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
*/ */
@Override @Override
public List<PageData> getOtherHidden(PageData pd) throws Exception { public List<PageData> getOtherHidden(PageData pd) throws Exception {
return customHiddenServiceMapper.getOtherHidden(pd); return customHiddenMapper.getOtherHidden(pd);
} }
/** /**
@ -277,18 +277,18 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
*/ */
@Override @Override
public void submitList(PageData pd) throws Exception { public void submitList(PageData pd) throws Exception {
customHiddenServiceMapper.submitList(pd); customHiddenMapper.submitList(pd);
} }
public List<PageData> getCountByHiddenType(PageData pd) throws Exception{ public List<PageData> getCountByHiddenType(PageData pd) throws Exception{
return customHiddenServiceMapper.getCountByHiddenType(pd); return customHiddenMapper.getCountByHiddenType(pd);
} }
/**按日统计 /**按日统计
* @throws Exception * @throws Exception
*/ */
public List<PageData> getHiddenNum(PageData pd)throws Exception{ public List<PageData> getHiddenNum(PageData pd)throws Exception{
return customHiddenServiceMapper.getHiddenNum(pd); return customHiddenMapper.getHiddenNum(pd);
} }
@ -297,7 +297,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> listAllRoll(PageData pd){ public List<PageData> listAllRoll(PageData pd){
return customHiddenServiceMapper.listAllRoll(pd); return customHiddenMapper.listAllRoll(pd);
} }
/**绩效得分 /**绩效得分
@ -305,46 +305,46 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> getDeptExamine(PageData pd)throws Exception{ public List<PageData> getDeptExamine(PageData pd)throws Exception{
return customHiddenServiceMapper.getDeptExamine(pd); return customHiddenMapper.getDeptExamine(pd);
} }
public List<PageData> getUserExamine(PageData pd)throws Exception{ public List<PageData> getUserExamine(PageData pd)throws Exception{
return customHiddenServiceMapper.getUserExamine(pd); return customHiddenMapper.getUserExamine(pd);
} }
public List<PageData> listAllForDiagnosis(PageData pd)throws Exception{ public List<PageData> listAllForDiagnosis(PageData pd)throws Exception{
return customHiddenServiceMapper.listAllForDiagnosis(pd); return customHiddenMapper.listAllForDiagnosis(pd);
} }
public PageData getUserIndexData(PageData pd)throws Exception{ public PageData getUserIndexData(PageData pd)throws Exception{
return customHiddenServiceMapper.getUserIndexData(pd); return customHiddenMapper.getUserIndexData(pd);
} }
public PageData getDeptIndexData(PageData pd)throws Exception{ public PageData getDeptIndexData(PageData pd)throws Exception{
return customHiddenServiceMapper.getDeptIndexData(pd); return customHiddenMapper.getDeptIndexData(pd);
} }
public PageData getSuperviseDeptIndexData(PageData pd)throws Exception{ public PageData getSuperviseDeptIndexData(PageData pd)throws Exception{
return customHiddenServiceMapper.getSuperviseDeptIndexData(pd); return customHiddenMapper.getSuperviseDeptIndexData(pd);
} }
@Override @Override
public List<PageData> findByKey(PageData condition) throws Exception { public List<PageData> findByKey(PageData condition) throws Exception {
return customHiddenServiceMapper.findByKey(condition); return customHiddenMapper.findByKey(condition);
} }
@Override @Override
public List<PageData> findByQue(PageData condition) throws Exception { public List<PageData> findByQue(PageData condition) throws Exception {
return customHiddenServiceMapper.findByQue(condition); return customHiddenMapper.findByQue(condition);
} }
@Override @Override
public List<PageData> findByYin(PageData condition) throws Exception { public List<PageData> findByYin(PageData condition) throws Exception {
return customHiddenServiceMapper.findByYin(condition); return customHiddenMapper.findByYin(condition);
} }
@Override @Override
public List<PageData> findByTs(PageData condition) throws Exception { public List<PageData> findByTs(PageData condition) throws Exception {
return customHiddenServiceMapper.findByTs(condition); return customHiddenMapper.findByTs(condition);
} }
/** /**
@ -355,12 +355,12 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
*/ */
@Override @Override
public List<PageData> findByInspectionId(PageData pd) throws Exception { public List<PageData> findByInspectionId(PageData pd) throws Exception {
return customHiddenServiceMapper.findByInspectionId(pd); return customHiddenMapper.findByInspectionId(pd);
} }
@Override @Override
public List<PageData> listAllInspection(PageData pd) throws Exception { public List<PageData> listAllInspection(PageData pd) throws Exception {
List<PageData> hiddenList = customHiddenServiceMapper.listAllInspection(pd); List<PageData> hiddenList = customHiddenMapper.listAllInspection(pd);
for (PageData hd : hiddenList) { for (PageData hd : hiddenList) {
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2.put("FOREIGN_KEY",hd.getString("HIDDEN_ID")); pd2.put("FOREIGN_KEY",hd.getString("HIDDEN_ID"));
@ -374,17 +374,17 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
@Override @Override
public void editStateInspection(PageData pd) throws Exception { public void editStateInspection(PageData pd) throws Exception {
customHiddenServiceMapper.editStateInspection(pd); customHiddenMapper.editStateInspection(pd);
} }
@Override @Override
public void deleteByKey(PageData pd) throws Exception { public void deleteByKey(PageData pd) throws Exception {
customHiddenServiceMapper.deleteByKey(pd); customHiddenMapper.deleteByKey(pd);
} }
@Override @Override
public void deleteArray(PageData pd) throws Exception { public void deleteArray(PageData pd) throws Exception {
customHiddenServiceMapper.deleteArray(pd); customHiddenMapper.deleteArray(pd);
} }
/** /**
@ -394,7 +394,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> getCountByConfirmId(PageData pd) throws Exception{ public List<PageData> getCountByConfirmId(PageData pd) throws Exception{
return customHiddenServiceMapper.getCountByConfirmId(pd); return customHiddenMapper.getCountByConfirmId(pd);
} }
/** /**
@ -404,7 +404,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> getCountSpecialByhId(PageData pd) throws Exception{ public List<PageData> getCountSpecialByhId(PageData pd) throws Exception{
return customHiddenServiceMapper.getCountSpecialByhId(pd); return customHiddenMapper.getCountSpecialByhId(pd);
} }
/**修改位置描述信息 /**修改位置描述信息
@ -412,17 +412,17 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public void editInformation(PageData pd)throws Exception{ public void editInformation(PageData pd)throws Exception{
customHiddenServiceMapper.editInformation(pd); customHiddenMapper.editInformation(pd);
} }
@Override @Override
public void editstate(PageData hiddenExa) { public void editstate(PageData hiddenExa) {
customHiddenServiceMapper.editstate(hiddenExa); customHiddenMapper.editstate(hiddenExa);
} }
@Override @Override
public List<PageData> listOtherNotAccept(PageData pd) throws Exception { public List<PageData> listOtherNotAccept(PageData pd) throws Exception {
return customHiddenServiceMapper.listOtherNotAccept(pd); return customHiddenMapper.listOtherNotAccept(pd);
} }
/** /**
@ -432,7 +432,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> listGwj(Page page) throws Exception{ public List<PageData> listGwj(Page page) throws Exception{
return customHiddenServiceMapper.listGwjdatalistPage(page); return customHiddenMapper.listGwjdatalistPage(page);
} }
/** /**
@ -442,14 +442,14 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> listIgnore(Page page) throws Exception{ public List<PageData> listIgnore(Page page) throws Exception{
return customHiddenServiceMapper.listIgnoredatalistPage(page); return customHiddenMapper.listIgnoredatalistPage(page);
} }
public void saveForEmis(String hiddenId,String resXML)throws Exception{ public void saveForEmis(String hiddenId,String resXML)throws Exception{
PageData pd = new PageData(); PageData pd = new PageData();
pd.put("HIDDEN_ID",hiddenId); pd.put("HIDDEN_ID",hiddenId);
pd.put("resXML",resXML); pd.put("resXML",resXML);
customHiddenServiceMapper.saveForEmis(pd); customHiddenMapper.saveForEmis(pd);
} }
/**删除 /**删除
* @param * @param
@ -458,7 +458,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
public void deleteForEmis(String hiddenId)throws Exception{ public void deleteForEmis(String hiddenId)throws Exception{
PageData pd = new PageData(); PageData pd = new PageData();
pd.put("HIDDEN_ID",hiddenId); pd.put("HIDDEN_ID",hiddenId);
customHiddenServiceMapper.deleteForEmis(pd); customHiddenMapper.deleteForEmis(pd);
} }
public String goEmis (PageData pd) throws Exception{ public String goEmis (PageData pd) throws Exception{
String result = ""; String result = "";
@ -569,22 +569,22 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public void confirmHidden (PageData pd) throws Exception{ public void confirmHidden (PageData pd) throws Exception{
customHiddenServiceMapper.confirmHidden(pd); customHiddenMapper.confirmHidden(pd);
} }
@Override @Override
public List<PageData> listForSafetyEnvironmental(Page page) throws Exception { public List<PageData> listForSafetyEnvironmental(Page page) throws Exception {
return customHiddenServiceMapper.hiddenInspectionlistPage(page); return customHiddenMapper.hiddenInspectionlistPage(page);
} }
@Override @Override
public List<PageData> listOtherNotAssign(PageData pd) throws Exception { public List<PageData> listOtherNotAssign(PageData pd) throws Exception {
return customHiddenServiceMapper.listOtherNotAssign(pd); return customHiddenMapper.listOtherNotAssign(pd);
} }
@Override @Override
public void assign(PageData pd) throws Exception { public void assign(PageData pd) throws Exception {
customHiddenServiceMapper.assign(pd); customHiddenMapper.assign(pd);
} }
/**安全环保检查验收 /**安全环保检查验收
@ -592,12 +592,12 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public void finalcheck(PageData pd)throws Exception{ public void finalcheck(PageData pd)throws Exception{
customHiddenServiceMapper.finalcheck(pd); customHiddenMapper.finalcheck(pd);
} }
@Override @Override
public List<PageData> listOtherNotAccept4pc(PageData pd) throws Exception { public List<PageData> listOtherNotAccept4pc(PageData pd) throws Exception {
return customHiddenServiceMapper.listOtherNotAccept4pc(pd); return customHiddenMapper.listOtherNotAccept4pc(pd);
} }
/**列表 /**列表
@ -605,7 +605,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> getListForTianzhang(Page page)throws Exception{ public List<PageData> getListForTianzhang(Page page)throws Exception{
return customHiddenServiceMapper.getListForTianzhangdatalistPage(page); return customHiddenMapper.getListForTianzhangdatalistPage(page);
} }
/** /**
@ -614,14 +614,14 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public void confirmUpdate(PageData pd) throws Exception{ public void confirmUpdate(PageData pd) throws Exception{
customHiddenServiceMapper.confirmUpdate(pd); customHiddenMapper.confirmUpdate(pd);
} }
public void updateStateByHidden(String type,String hiddenId) throws Exception{ public void updateStateByHidden(String type,String hiddenId) throws Exception{
PageData pd = new PageData(); PageData pd = new PageData();
pd.put("STATE",type); pd.put("STATE",type);
pd.put("HIDDEN_ID",hiddenId); pd.put("HIDDEN_ID",hiddenId);
customHiddenServiceMapper.updateStateByHidden(pd); customHiddenMapper.updateStateByHidden(pd);
} }
/** /**
@ -650,7 +650,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> majorlist(Page page) throws Exception{ public List<PageData> majorlist(Page page) throws Exception{
return customHiddenServiceMapper.majordatalistPage(page); return customHiddenMapper.majordatalistPage(page);
} }
/** /**
@ -660,7 +660,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> verifylist(Page page) throws Exception{ public List<PageData> verifylist(Page page) throws Exception{
return customHiddenServiceMapper.verifydatalistPage(page); return customHiddenMapper.verifydatalistPage(page);
} }
/** /**
@ -670,14 +670,14 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> majormanage(Page page) throws Exception{ public List<PageData> majormanage(Page page) throws Exception{
return customHiddenServiceMapper.majormanagelistPage(page); return customHiddenMapper.majormanagelistPage(page);
} }
/**通过id获取数据 /**通过id获取数据
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public PageData findByEmisId(PageData pd)throws Exception{ public PageData findByEmisId(PageData pd)throws Exception{
return customHiddenServiceMapper.findByEmisId(pd); return customHiddenMapper.findByEmisId(pd);
} }
/**列表 /**列表
@ -685,7 +685,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
* @throws Exception * @throws Exception
*/ */
public List<PageData> getListForemis(Page page)throws Exception{ public List<PageData> getListForemis(Page page)throws Exception{
return customHiddenServiceMapper.getListForemisdatalistPage(page); return customHiddenMapper.getListForemisdatalistPage(page);
} }
@Override @Override
@ -724,7 +724,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService {
condition.put("IS_SELF", lock.getString("IS_SELF")); condition.put("IS_SELF", lock.getString("IS_SELF"));
condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
} }
List<PageData> varOList = customHiddenServiceMapper.listAll(condition); List<PageData> varOList = customHiddenMapper.listAll(condition);
Set<String> imgIds = varOList.stream().map(n -> n.getString("HIDDEN_ID")).collect(Collectors.toSet()); Set<String> imgIds = varOList.stream().map(n -> n.getString("HIDDEN_ID")).collect(Collectors.toSet());
// 查询整改方案 // 查询整改方案

35
src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml
View File

@ -68,6 +68,7 @@
<!-- 字段用于新增 --> <!-- 字段用于新增 -->
<sql id="Field2"> <sql id="Field2">
SOURCE, SOURCE,
CHECK_CATEGORY,
CHECK_CATEGORY_NAME, CHECK_CATEGORY_NAME,
CHECK_ITEM, CHECK_ITEM,
CHECK_ITEM_NAME, CHECK_ITEM_NAME,
@ -118,6 +119,7 @@
<!-- 字段值 --> <!-- 字段值 -->
<sql id="FieldValue"> <sql id="FieldValue">
#{SOURCE}, #{SOURCE},
#{CHECK_CATEGORY},
#{CHECK_CATEGORY_NAME}, #{CHECK_CATEGORY_NAME},
#{CHECK_ITEM}, #{CHECK_ITEM},
#{CHECK_ITEM_NAME}, #{CHECK_ITEM_NAME},
@ -226,12 +228,6 @@
<if test="HIDDEN_CATEGORY != null and HIDDEN_CATEGORY != ''"> <if test="HIDDEN_CATEGORY != null and HIDDEN_CATEGORY != ''">
HIDDEN_CATEGORY = #{HIDDEN_CATEGORY}, HIDDEN_CATEGORY = #{HIDDEN_CATEGORY},
</if> </if>
<if test="RISK_DESCR != null and RISK_DESCR != ''">
RISK_DESCR = #{RISK_DESCR},
</if>
<if test="RISK_POSITION != null and RISK_POSITION != ''">
RISK_POSITION = #{RISK_POSITION},
</if>
<if test="LEVEL != null and LEVEL != ''"> <if test="LEVEL != null and LEVEL != ''">
LEVEL = #{LEVEL}, LEVEL = #{LEVEL},
</if> </if>
@ -507,11 +503,7 @@
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 --> <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and and
( (
<!-- f.RISK_UNIT LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') <!-- f.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
f.RISK_POSITION LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
f.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or--> or-->
f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
) )
@ -826,10 +818,6 @@
<if test="KEYWORDS != null and KEYWORDS != ''"><!-- 关键词检索 --> <if test="KEYWORDS != null and KEYWORDS != ''"><!-- 关键词检索 -->
and and
( (
f.RISK_UNIT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
or
f.RISK_POSITION LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
or
f.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') f.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
or or
f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
@ -945,10 +933,6 @@
<if test="KEYWORDS != null and KEYWORDS != ''"><!-- 关键词检索 --> <if test="KEYWORDS != null and KEYWORDS != ''"><!-- 关键词检索 -->
and and
( (
f.RISK_UNIT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
or
f.RISK_POSITION LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
or
f.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') f.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
or or
f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
@ -1662,16 +1646,13 @@
</select> </select>
<select id="anaysis" resultType="com.zcloud.entity.PageData"> <select id="anaysis" resultType="com.zcloud.entity.PageData">
select count(1) as num, a.STATE from bus_hidden a where a.ISDELETE = '0' select count(1) as num, a.STATE from bus_hiddendangercheckstandard_hidden a where a.ISDELETE = '0'
<if test="ids != null and ids.size != 0"> <if test="ids != null and ids.size != 0">
and a.CUSTOM_ID in and a.CUSTOM_ID in
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")"> <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
'${item}' '${item}'
</foreach> </foreach>
</if> </if>
<if test="RISK_UNIT != null and RISK_UNIT != ''">
and a.RISK_UNIT = #{RISK_UNIT}
</if>
group by a.STATE group by a.STATE
</select> </select>
@ -1763,10 +1744,6 @@
<if test="KEYWORDS != null and KEYWORDS != ''"><!-- 关键词检索 --> <if test="KEYWORDS != null and KEYWORDS != ''"><!-- 关键词检索 -->
and and
( (
f.RISK_UNIT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
or
f.RISK_POSITION LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
or
f.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') f.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
or or
f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
@ -3079,14 +3056,14 @@
<insert id="saveForEmis" parameterType="pd"> <insert id="saveForEmis" parameterType="pd">
INSERT INTO bus_hidden_emis( INSERT INTO bus_hidden_emis(
HIDDEN_ID,SOURCE,RISK_UNIT,CHECK_ITEM,RISK_DESCR,RISK_POSITION,LEVEL,CHECK_CONTENT,HIDDENDESCR,HIDDENPART,CREATOR, HIDDEN_ID,,CHECK_CATEGORY_NAM,CHECK_CATEGORY_NAME,CHECK_ITEM,CHECK_ITEM_NAME,LEVEL,CHECK_CONTENT,HIDDENDESCR,HIDDENPART,CREATOR,
CREATTIME,RECTIFYDESCR,RECTIFICATIONTYPE,RECTIFICATIONDEPT,RECTIFICATIONOR,RECTIFICATIONDEADLINE, CREATTIME,RECTIFYDESCR,RECTIFICATIONTYPE,RECTIFICATIONDEPT,RECTIFICATIONOR,RECTIFICATIONDEADLINE,
RECTIFICATIONTIME,HIDDENLEVEL,STATE,CHECKDEPT,CHECKOR,CHECKTIME,CHECKDESCR,ISQUALIFIED,ISDELETE,CORPINFO_ID, RECTIFICATIONTIME,HIDDENLEVEL,STATE,CHECKDEPT,CHECKOR,CHECKTIME,CHECKDESCR,ISQUALIFIED,ISDELETE,CORPINFO_ID,
HIDDENFINDDEPT,CHECKRECORD_ID,RECORDITEM_ID,CUSTOM_ITEM_ID,REJECTREASON,REVIEWOR,REVIEWTIME,REVIEWDEPT,HAVESCHEME, HIDDENFINDDEPT,CHECKRECORD_ID,RECORDITEM_ID,CUSTOM_ITEM_ID,REJECTREASON,REVIEWOR,REVIEWTIME,REVIEWDEPT,HAVESCHEME,
LONGITUDE,LATITUDE,CUSTOM_ID,HIDDENTYPE,ISCONFIRM,CONFIRM_USER,CONFIRM_TIME,DISCOVERYTIME,INVESTMENT_FUNDS, LONGITUDE,LATITUDE,CUSTOM_ID,HIDDENTYPE,ISCONFIRM,CONFIRM_USER,CONFIRM_TIME,DISCOVERYTIME,INVESTMENT_FUNDS,
HIDDENTYPE2,POSITIONDESC,ISRELEVANT,EMIS_RES HIDDENTYPE2,POSITIONDESC,ISRELEVANT,EMIS_RES
) SELECT ) SELECT
HIDDEN_ID,SOURCE,RISK_UNIT,CHECK_ITEM,RISK_DESCR,RISK_POSITION,LEVEL,CHECK_CONTENT,HIDDENDESCR,HIDDENPART,CREATOR,CREATTIME,RECTIFYDESCR, HIDDEN_ID,SOURCE,CHECK_CATEGORY,CHECK_CATEGORY_NAME,CHECK_ITEM,CHECK_ITEM_NAME,LEVEL,CHECK_CONTENT,HIDDENDESCR,HIDDENPART,CREATOR,CREATTIME,RECTIFYDESCR,
RECTIFICATIONTYPE,RECTIFICATIONDEPT,RECTIFICATIONOR,RECTIFICATIONDEADLINE,RECTIFICATIONTIME,HIDDENLEVEL,STATE,CHECKDEPT,CHECKOR,CHECKTIME, RECTIFICATIONTYPE,RECTIFICATIONDEPT,RECTIFICATIONOR,RECTIFICATIONDEADLINE,RECTIFICATIONTIME,HIDDENLEVEL,STATE,CHECKDEPT,CHECKOR,CHECKTIME,
CHECKDESCR,ISQUALIFIED,ISDELETE,CORPINFO_ID,HIDDENFINDDEPT,CHECKRECORD_ID,RECORDITEM_ID,CUSTOM_ITEM_ID,REJECTREASON,REVIEWOR,REVIEWTIME,REVIEWDEPT, CHECKDESCR,ISQUALIFIED,ISDELETE,CORPINFO_ID,HIDDENFINDDEPT,CHECKRECORD_ID,RECORDITEM_ID,CUSTOM_ITEM_ID,REJECTREASON,REVIEWOR,REVIEWTIME,REVIEWDEPT,
HAVESCHEME,LONGITUDE,LATITUDE,CUSTOM_ID,HIDDENTYPE,ISCONFIRM,CONFIRM_USER,CONFIRM_TIME,DISCOVERYTIME,INVESTMENT_FUNDS,HIDDENTYPE2, HAVESCHEME,LONGITUDE,LATITUDE,CUSTOM_ID,HIDDENTYPE,ISCONFIRM,CONFIRM_USER,CONFIRM_TIME,DISCOVERYTIME,INVESTMENT_FUNDS,HIDDENTYPE2,