diff --git a/src/main/java/com/zcloud/controller/check/AppCheckRecordController.java b/src/main/java/com/zcloud/controller/check/AppCheckRecordController.java index 7e4fb6c..9d08b4c 100644 --- a/src/main/java/com/zcloud/controller/check/AppCheckRecordController.java +++ b/src/main/java/com/zcloud/controller/check/AppCheckRecordController.java @@ -157,7 +157,7 @@ public class AppCheckRecordController extends BaseController { @RequestMapping(value = "/finish") @ResponseBody @Transactional - @LogAnno(menuType= "手机",menuServer= "隐患排查",instructionsOperate = "清单检查情况",instructionsType = "完成检查") + @LogAnno(menuType= "手机",menuServer= "风险排查",instructionsOperate = "清单检查情况",instructionsType = "完成检查") public Object finish() throws Exception { Map map = new HashMap(); String errInfo = "success"; diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomCheckRecordController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomCheckRecordController.java index 74f85b9..4dc2180 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomCheckRecordController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/AppCustomCheckRecordController.java @@ -48,7 +48,7 @@ public class AppCustomCheckRecordController extends BaseController { @Autowired private CustomHiddenService customHiddenService; @Autowired - private CheckUserService checkuserService; + private CustomCheckUserService customCheckUserService; @Autowired private CorpInfoService corpinfoService; @Autowired @@ -168,6 +168,7 @@ public class AppCustomCheckRecordController extends BaseController { * @param * @throws Exception */ + // /app/checkrecord/finish @RequestMapping(value = "/finish") @ResponseBody @Transactional @@ -222,7 +223,7 @@ public class AppCustomCheckRecordController extends BaseController { } pd.put("FINISHED", "1"); // 是否完成 customCheckRecordService.edit(pd); - checkuserService.delete(pd); + customCheckUserService.delete(pd); if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) { List list1 = (List) JSON.parse(pd.get("OTHER").toString()); for (JSONObject json : list1) { @@ -235,7 +236,7 @@ public class AppCustomCheckRecordController extends BaseController { other.put("USER_ID", json.get("USER_ID")); other.put("DEPARTMENT_NAME", json.get("DEPARTMENT_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(); pd = this.getPageData(); pd = customCheckRecordService.findById(pd); // 根据ID读取 - PageData users = checkuserService.getCheckUser(pd); + PageData users = customCheckUserService.getCheckUser(pd); List varList = customCheckRecordItemService.listAll(pd); pd.put("USERS", users.get("USERS")); PageData pd2 = new PageData(); @@ -427,7 +428,7 @@ public class AppCustomCheckRecordController extends BaseController { pd = this.getPageData(); String IDENTIFICATION_ID = pd.getString("IDENTIFICATION_ID"); pd = customCheckRecordService.findById(pd); // 根据ID读取 - PageData users = checkuserService.getCheckUser(pd); + PageData users = customCheckUserService.getCheckUser(pd); pd.put("IDENTIFICATION_ID", IDENTIFICATION_ID); List varList = customCheckRecordItemService.listAll(pd); PageData idData = new PageData(); diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenServiceImpl.java index 9b359b5..34c2a9d 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CustomHiddenServiceImpl.java @@ -42,7 +42,7 @@ import java.util.stream.Collectors; public class CustomHiddenServiceImpl implements CustomHiddenService { @Resource - private CustomHiddenMapper customHiddenServiceMapper; + private CustomHiddenMapper customHiddenMapper; @Resource private DictionariesService dictionariesService; @Resource @@ -65,7 +65,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @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 */ public void delete(PageData pd)throws Exception{ - customHiddenServiceMapper.delete(pd); + customHiddenMapper.delete(pd); } /**修改 @@ -81,7 +81,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @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 */ public void editInfo(PageData pd)throws Exception{ - customHiddenServiceMapper.editInfo(pd); + customHiddenMapper.editInfo(pd); } public void editISCONFIRM(PageData pd)throws Exception{ - customHiddenServiceMapper.editISCONFIRM(pd); + customHiddenMapper.editISCONFIRM(pd); } public void editHIDDENLEVEL(PageData pd)throws Exception{ - customHiddenServiceMapper.editHIDDENLEVEL(pd); + customHiddenMapper.editHIDDENLEVEL(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 */ public void changeState(PageData pd)throws Exception{ - customHiddenServiceMapper.changeState(pd); + customHiddenMapper.changeState(pd); } /**定时修改过期隐患 @@ -118,7 +118,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @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 */ public void check(PageData pd)throws Exception{ - customHiddenServiceMapper.check(pd); + customHiddenMapper.check(pd); } /**复查 @@ -134,7 +134,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @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 */ public void rectify(PageData pd)throws Exception{ - customHiddenServiceMapper.rectify(pd); + customHiddenMapper.rectify(pd); } /**列表 @@ -150,7 +150,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List list(Page page)throws Exception{ - return customHiddenServiceMapper.datalistPage(page); + return customHiddenMapper.datalistPage(page); } /**列表(全部) @@ -158,7 +158,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List listAll(PageData pd)throws Exception{ - return customHiddenServiceMapper.listAll(pd); + return customHiddenMapper.listAll(pd); } /**查询昨日过期隐患。发短信 @@ -166,17 +166,17 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List getYestoday(PageData pd)throws Exception{ - return customHiddenServiceMapper.getYestoday(pd); + return customHiddenMapper.getYestoday(pd); } /**列表(全部,打印使用) * @param pd * @throws Exception */ public List listAllToPrint(PageData pd)throws Exception{ - return customHiddenServiceMapper.listAllToPrint(pd); + return customHiddenMapper.listAllToPrint(pd); } public List listHiddenAll(PageData pd)throws Exception{ - return customHiddenServiceMapper.listHiddenAll(pd); + return customHiddenMapper.listHiddenAll(pd); } /** @@ -185,7 +185,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List getHiddenByRecord(PageData pd)throws Exception{ - return customHiddenServiceMapper.getHiddenByRecord(pd); + return customHiddenMapper.getHiddenByRecord(pd); } /**通过id获取数据 @@ -193,7 +193,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @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 */ public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ - customHiddenServiceMapper.deleteAll(ArrayDATA_IDS); + customHiddenMapper.deleteAll(ArrayDATA_IDS); } /**批量修改 * @throws Exception */ public void updateAll(PageData hiddens)throws Exception{ - customHiddenServiceMapper.updateAll(hiddens); + customHiddenMapper.updateAll(hiddens); } /**按日统计 * @throws Exception */ public List hiddenStatisticsByDay(PageData pd)throws Exception{ - return customHiddenServiceMapper.hiddenStatisticsByDay(pd); + return customHiddenMapper.hiddenStatisticsByDay(pd); } /**总数统计 * @throws Exception */ public List hiddenStatisticsAll(PageData pd)throws Exception{ - return customHiddenServiceMapper.hiddenStatisticsAll(pd); + return customHiddenMapper.hiddenStatisticsAll(pd); } /** *app首页 根据用户ID获取发现隐患信息 @@ -231,7 +231,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List getCountByCreatorId(PageData pd) throws Exception{ - return customHiddenServiceMapper.getCountByCreatorId(pd); + return customHiddenMapper.getCountByCreatorId(pd); } /** * app首页 根据用户ID获取整改隐患信息 @@ -240,7 +240,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List getCountByRectifiCationorId(PageData pd) throws Exception{ - return customHiddenServiceMapper.getCountByRectifiCationorId(pd); + return customHiddenMapper.getCountByRectifiCationorId(pd); } /** @@ -250,7 +250,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List getCountByCheckorId(PageData pd) throws Exception{ - return customHiddenServiceMapper.getCountByCheckorId(pd); + return customHiddenMapper.getCountByCheckorId(pd); } /** @@ -259,7 +259,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List getBICount(PageData pd) throws Exception{ - return customHiddenServiceMapper.getBICount(pd); + return customHiddenMapper.getBICount(pd); } /** @@ -269,7 +269,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { */ @Override public List getOtherHidden(PageData pd) throws Exception { - return customHiddenServiceMapper.getOtherHidden(pd); + return customHiddenMapper.getOtherHidden(pd); } /** @@ -277,18 +277,18 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { */ @Override public void submitList(PageData pd) throws Exception { - customHiddenServiceMapper.submitList(pd); + customHiddenMapper.submitList(pd); } public List getCountByHiddenType(PageData pd) throws Exception{ - return customHiddenServiceMapper.getCountByHiddenType(pd); + return customHiddenMapper.getCountByHiddenType(pd); } /**按日统计 * @throws Exception */ public List getHiddenNum(PageData pd)throws Exception{ - return customHiddenServiceMapper.getHiddenNum(pd); + return customHiddenMapper.getHiddenNum(pd); } @@ -297,7 +297,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List listAllRoll(PageData pd){ - return customHiddenServiceMapper.listAllRoll(pd); + return customHiddenMapper.listAllRoll(pd); } /**绩效得分 @@ -305,46 +305,46 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List getDeptExamine(PageData pd)throws Exception{ - return customHiddenServiceMapper.getDeptExamine(pd); + return customHiddenMapper.getDeptExamine(pd); } public List getUserExamine(PageData pd)throws Exception{ - return customHiddenServiceMapper.getUserExamine(pd); + return customHiddenMapper.getUserExamine(pd); } public List listAllForDiagnosis(PageData pd)throws Exception{ - return customHiddenServiceMapper.listAllForDiagnosis(pd); + return customHiddenMapper.listAllForDiagnosis(pd); } public PageData getUserIndexData(PageData pd)throws Exception{ - return customHiddenServiceMapper.getUserIndexData(pd); + return customHiddenMapper.getUserIndexData(pd); } public PageData getDeptIndexData(PageData pd)throws Exception{ - return customHiddenServiceMapper.getDeptIndexData(pd); + return customHiddenMapper.getDeptIndexData(pd); } public PageData getSuperviseDeptIndexData(PageData pd)throws Exception{ - return customHiddenServiceMapper.getSuperviseDeptIndexData(pd); + return customHiddenMapper.getSuperviseDeptIndexData(pd); } @Override public List findByKey(PageData condition) throws Exception { - return customHiddenServiceMapper.findByKey(condition); + return customHiddenMapper.findByKey(condition); } @Override public List findByQue(PageData condition) throws Exception { - return customHiddenServiceMapper.findByQue(condition); + return customHiddenMapper.findByQue(condition); } @Override public List findByYin(PageData condition) throws Exception { - return customHiddenServiceMapper.findByYin(condition); + return customHiddenMapper.findByYin(condition); } @Override public List findByTs(PageData condition) throws Exception { - return customHiddenServiceMapper.findByTs(condition); + return customHiddenMapper.findByTs(condition); } /** @@ -355,12 +355,12 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { */ @Override public List findByInspectionId(PageData pd) throws Exception { - return customHiddenServiceMapper.findByInspectionId(pd); + return customHiddenMapper.findByInspectionId(pd); } @Override public List listAllInspection(PageData pd) throws Exception { - List hiddenList = customHiddenServiceMapper.listAllInspection(pd); + List hiddenList = customHiddenMapper.listAllInspection(pd); for (PageData hd : hiddenList) { PageData pd2 = new PageData(); pd2.put("FOREIGN_KEY",hd.getString("HIDDEN_ID")); @@ -374,17 +374,17 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { @Override public void editStateInspection(PageData pd) throws Exception { - customHiddenServiceMapper.editStateInspection(pd); + customHiddenMapper.editStateInspection(pd); } @Override public void deleteByKey(PageData pd) throws Exception { - customHiddenServiceMapper.deleteByKey(pd); + customHiddenMapper.deleteByKey(pd); } @Override public void deleteArray(PageData pd) throws Exception { - customHiddenServiceMapper.deleteArray(pd); + customHiddenMapper.deleteArray(pd); } /** @@ -394,7 +394,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List getCountByConfirmId(PageData pd) throws Exception{ - return customHiddenServiceMapper.getCountByConfirmId(pd); + return customHiddenMapper.getCountByConfirmId(pd); } /** @@ -404,7 +404,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List getCountSpecialByhId(PageData pd) throws Exception{ - return customHiddenServiceMapper.getCountSpecialByhId(pd); + return customHiddenMapper.getCountSpecialByhId(pd); } /**修改位置描述信息 @@ -412,17 +412,17 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public void editInformation(PageData pd)throws Exception{ - customHiddenServiceMapper.editInformation(pd); + customHiddenMapper.editInformation(pd); } @Override public void editstate(PageData hiddenExa) { - customHiddenServiceMapper.editstate(hiddenExa); + customHiddenMapper.editstate(hiddenExa); } @Override public List listOtherNotAccept(PageData pd) throws Exception { - return customHiddenServiceMapper.listOtherNotAccept(pd); + return customHiddenMapper.listOtherNotAccept(pd); } /** @@ -432,7 +432,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List listGwj(Page page) throws Exception{ - return customHiddenServiceMapper.listGwjdatalistPage(page); + return customHiddenMapper.listGwjdatalistPage(page); } /** @@ -442,14 +442,14 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List listIgnore(Page page) throws Exception{ - return customHiddenServiceMapper.listIgnoredatalistPage(page); + return customHiddenMapper.listIgnoredatalistPage(page); } public void saveForEmis(String hiddenId,String resXML)throws Exception{ PageData pd = new PageData(); pd.put("HIDDEN_ID",hiddenId); pd.put("resXML",resXML); - customHiddenServiceMapper.saveForEmis(pd); + customHiddenMapper.saveForEmis(pd); } /**删除 * @param @@ -458,7 +458,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { public void deleteForEmis(String hiddenId)throws Exception{ PageData pd = new PageData(); pd.put("HIDDEN_ID",hiddenId); - customHiddenServiceMapper.deleteForEmis(pd); + customHiddenMapper.deleteForEmis(pd); } public String goEmis (PageData pd) throws Exception{ String result = ""; @@ -569,22 +569,22 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public void confirmHidden (PageData pd) throws Exception{ - customHiddenServiceMapper.confirmHidden(pd); + customHiddenMapper.confirmHidden(pd); } @Override public List listForSafetyEnvironmental(Page page) throws Exception { - return customHiddenServiceMapper.hiddenInspectionlistPage(page); + return customHiddenMapper.hiddenInspectionlistPage(page); } @Override public List listOtherNotAssign(PageData pd) throws Exception { - return customHiddenServiceMapper.listOtherNotAssign(pd); + return customHiddenMapper.listOtherNotAssign(pd); } @Override public void assign(PageData pd) throws Exception { - customHiddenServiceMapper.assign(pd); + customHiddenMapper.assign(pd); } /**安全环保检查验收 @@ -592,12 +592,12 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public void finalcheck(PageData pd)throws Exception{ - customHiddenServiceMapper.finalcheck(pd); + customHiddenMapper.finalcheck(pd); } @Override public List listOtherNotAccept4pc(PageData pd) throws Exception { - return customHiddenServiceMapper.listOtherNotAccept4pc(pd); + return customHiddenMapper.listOtherNotAccept4pc(pd); } /**列表 @@ -605,7 +605,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List getListForTianzhang(Page page)throws Exception{ - return customHiddenServiceMapper.getListForTianzhangdatalistPage(page); + return customHiddenMapper.getListForTianzhangdatalistPage(page); } /** @@ -614,14 +614,14 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public void confirmUpdate(PageData pd) throws Exception{ - customHiddenServiceMapper.confirmUpdate(pd); + customHiddenMapper.confirmUpdate(pd); } public void updateStateByHidden(String type,String hiddenId) throws Exception{ PageData pd = new PageData(); pd.put("STATE",type); pd.put("HIDDEN_ID",hiddenId); - customHiddenServiceMapper.updateStateByHidden(pd); + customHiddenMapper.updateStateByHidden(pd); } /** @@ -650,7 +650,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List majorlist(Page page) throws Exception{ - return customHiddenServiceMapper.majordatalistPage(page); + return customHiddenMapper.majordatalistPage(page); } /** @@ -660,7 +660,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List verifylist(Page page) throws Exception{ - return customHiddenServiceMapper.verifydatalistPage(page); + return customHiddenMapper.verifydatalistPage(page); } /** @@ -670,14 +670,14 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { * @throws Exception */ public List majormanage(Page page) throws Exception{ - return customHiddenServiceMapper.majormanagelistPage(page); + return customHiddenMapper.majormanagelistPage(page); } /**通过id获取数据 * @param 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 */ public List getListForemis(Page page)throws Exception{ - return customHiddenServiceMapper.getListForemisdatalistPage(page); + return customHiddenMapper.getListForemisdatalistPage(page); } @Override @@ -724,7 +724,7 @@ public class CustomHiddenServiceImpl implements CustomHiddenService { condition.put("IS_SELF", lock.getString("IS_SELF")); condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); } - List varOList = customHiddenServiceMapper.listAll(condition); + List varOList = customHiddenMapper.listAll(condition); Set imgIds = varOList.stream().map(n -> n.getString("HIDDEN_ID")).collect(Collectors.toSet()); // 查询整改方案 diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml index dfcdf84..d8ab5bc 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml @@ -68,6 +68,7 @@ SOURCE, + CHECK_CATEGORY, CHECK_CATEGORY_NAME, CHECK_ITEM, CHECK_ITEM_NAME, @@ -118,6 +119,7 @@ #{SOURCE}, + #{CHECK_CATEGORY}, #{CHECK_CATEGORY_NAME}, #{CHECK_ITEM}, #{CHECK_ITEM_NAME}, @@ -226,12 +228,6 @@ HIDDEN_CATEGORY = #{HIDDEN_CATEGORY}, - - RISK_DESCR = #{RISK_DESCR}, - - - RISK_POSITION = #{RISK_POSITION}, - LEVEL = #{LEVEL}, @@ -507,11 +503,7 @@ and ( - f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') ) @@ -826,10 +818,6 @@ and ( - f.RISK_UNIT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') - or - f.RISK_POSITION LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') - or f.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') or f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') @@ -945,10 +933,6 @@ and ( - f.RISK_UNIT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') - or - f.RISK_POSITION LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') - or f.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') or f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') @@ -1662,16 +1646,13 @@ @@ -1763,10 +1744,6 @@ and ( - f.RISK_UNIT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') - or - f.RISK_POSITION LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') - or f.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') or f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') @@ -3079,14 +3056,14 @@ 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, RECTIFICATIONTIME,HIDDENLEVEL,STATE,CHECKDEPT,CHECKOR,CHECKTIME,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,POSITIONDESC,ISRELEVANT,EMIS_RES ) 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, 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,