diff --git a/pom.xml b/pom.xml index 6576b988..31ef9d76 100644 --- a/pom.xml +++ b/pom.xml @@ -476,6 +476,13 @@ org.projectlombok lombok + + + + com.yomahub + liteflow-spring-boot-starter + 2.11.4.2 + " + + ""); + sbf.append(""); + // 富文本内容 + sbf.append(content); + sbf.append(""); + + // 必须要设置编码,避免中文就会乱码 + byte[] b = sbf.toString().getBytes("GBK"); + // 将字节数组包装到流中 + ByteArrayInputStream bais = new ByteArrayInputStream(b); + POIFSFileSystem poifs = new POIFSFileSystem(); + DirectoryEntry directory = poifs.getRoot(); + // 这代码不能省略,否则导出乱码。 + DocumentEntry documentEntry = directory.createDocument("WordDocument", bais); + //输出文件 +// request.setCharacterEncoding("utf-8"); + // 导出word格式 + response.setContentType("application/msword"); + response.addHeader("Content-Disposition", "attachment;filename=" + + new String(fileName.getBytes("GB2312"),"iso8859-1") + ".doc"); + ServletOutputStream ostream = response.getOutputStream(); + poifs.writeFilesystem(ostream); + bais.close(); + ostream.close(); + } + + /** + * 富文本内容到word（本地） + * @param content 输出内容 + * @param fileName 导出文件名称 + * @throws Exception + */ + public static void exportHtmlToWord(String filepath, String content, String fileName) throws Exception { + // 拼接html格式内容 + StringBuffer sbf = new StringBuffer(); + // 这里拼接一下html标签,便于word文档能够识别 + sbf.append(""); + sbf.append("" + + "" + + ""); + sbf.append(""); + // 富文本内容 + sbf.append(content); + sbf.append(""); + + // 必须要设置编码,避免中文就会乱码 + byte[] b = sbf.toString().getBytes("GBK"); + // 将字节数组包装到流中 + ByteArrayInputStream bais = new ByteArrayInputStream(b); + POIFSFileSystem poifs = new POIFSFileSystem(); + DirectoryEntry directory = poifs.getRoot(); + // 这代码不能省略,否则导出乱码。 + DocumentEntry documentEntry = directory.createDocument("WordDocument", bais); + + FileOutputStream out = new FileOutputStream(new File(filepath+fileName)); + poifs.writeFilesystem(out); + bais.close(); + out.close(); + } +} diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 1db9c3fa..df22d1dc 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,5 +1,3 @@ - - datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root @@ -60,22 +58,19 @@ spring.main.banner-mode=off #preventionxgf.api.url=http://192.168.0.79:8088 # #qa-regulatory-gwj.api.url=http://192.168.0.79:8008 - -preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/ -qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/ +preventionxgf.api.url=http://39.100.115.58:8082/qa-prevention-xgf/ +qa-regulatory-gwj.api.url=http://39.100.115.58:8081/qa-regulatory-gwj/ #????? -smb.host=39.103.224.166 +smb.host=39.101.130.96 smb.port=22 smb.user=root smb.password=Zcloud@zcloud88888 -smb.basePath=/mnt/qgfile/file/ +smb.basePath=/mnt/wwag/file/ #Mq\u914D\u7F6E rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group1=edu-admin-add -#rocketmq.name-server=10.0.140.141:9876 -#rocketmq.name-server=192.168.0.70:9876 -rocketmq.name-server=172.24.151.16:9876 +rocketmq.name-server=39.100.115.58:8899 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096 @@ -90,16 +85,49 @@ mq.topic.eightWork=eightWork mq.group.info=scheduled_tasks mq.group.eightWork=scheduled_tasks_eightWork -http.file.url=https://qgqy.qhdsafety.com/file/ - - -#数据同步topic -mq.gwj.data.topic=czks_qy_docking -mq.gwj.file.topic=czks_qy_dockingPicture -#港务局文件服务器前缀 -baseimgpath=https://qgqy.qhdsafety.com/file/ - -cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd corp.default.pic-path=https://qgqy.qhdsafety.com/ corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ + + +#用户标识 +# 沧州矿石 +czks-useridentity=CZKS +czks-baseimgpath=https://wwag.qhdsafety.com/file/ +czks-backendaddr=http://192.168.0.79:8091/ +# 港务局 +gwj-useridentity=GWJ +gwj-baseimgpath=https://qgqy.qhdsafety.com/file/ +gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/ +# ?????? +http.file.url=https://qgqy.qhdsafety.com/file/ +perLoc.url=http://192.168.210.32:8084 +perLoc.userName=qaaqadmin +perLoc.pwd=Cfd2023@ +baseimgpath =http://192.168.192.201:8991/file/ + +mq.csy.data.topic=csy_docking +mq.csy.data.group=scheduled_tasks_csy_docking +mq.csy.file.topic=csy_dockingPicture +mq.csy.file.group=scheduled_tasks_csy_dockingPicture + +mq.cmt.data.topic=cmt_docking +mq.cmt.data.group=scheduled_tasks_cmt_docking +mq.cmt.file.topic=cmt_dockingPicture +mq.cmt.file.group=scheduled_tasks_cmt_dockingPicture + +mq.czks.data.topic=czks_docking +mq.czks.data.group=scheduled_tasks_czks_docking +mq.czks.file.topic=czks_dockingPicture +mq.czks.file.group=scheduled_tasks_czks_dockingPicture + +mq.gwj.data.topic=czks_docking +mq.gwj.file.topic=czks_dockingPicture + +#港务局文件服务器前缀 +cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd +#河北秦安文件服务器前缀 +heBeiQinAnFile=https://file.zcloudchina.com/YTHFile + +liteflow.rule-source=flow.xml +liteflow.print-execution-log=false diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties index bc29f57c..b0c2ac96 100644 --- a/src/main/resources/application-master.properties +++ b/src/main/resources/application-master.properties @@ -93,6 +93,12 @@ mq.gwj.file.topic=czks_dockingPicture #港务局文件服务器前缀 baseimgpath=http://192.168.192.201:8991/file/ -cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd +cfd.prevention.api.url=http://10.100.106.2:8991/qa-prevention-csy/ http.file.url=http://192.168.192.201:8991/file/ + +#河北秦安文件服务器前缀 +heBeiQinAnFile=https://file.zcloudchina.com/YTHFile + +liteflow.rule-source=flow.xml +liteflow.print-execution-log=false diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index dd259ac5..3d07f3f7 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -6,7 +6,7 @@ server.port=8091 #����31ʱʹ�� #spring.profiles.active=dev #?? -spring.profiles.active=master +#spring.profiles.active=master diff --git a/src/main/resources/flow.xml b/src/main/resources/flow.xml new file mode 100644 index 00000000..eab2b5f0 --- /dev/null +++ b/src/main/resources/flow.xml @@ -0,0 +1,19 @@ + + + + SWITCH(InitCompany).to( + THEN(YiBanCharge,YiBanSupervise).id("YiBan"), + THEN( + YiBanCharge, + SWITCH(JiTuanCharge).to( + JiTuanSupervise, + THEN(JiTuanWeiTuoCharge,JiTuanWeiTuoSupervise).id("WeiTuo") + ).DEFAULT(DefaultNode) + ).id("JiTuan"), + SWITCH(GuFenCharge).to( + GuFenSupervise, + THEN(GuFenWeiTuoCharge,GuFenWeiTuoSupervise).id("GuFenWeiTuo") + ).DEFAULT(DefaultNode).id("GuFen") + ); + + diff --git a/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml index 860f3659..fe62fdf6 100644 --- a/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml @@ -222,6 +222,7 @@ CODE = #{CODE}, COMPANY_AREA = #{COMPANY_AREA}, ADDRESS = #{ADDRESS}, + ADDRESS_BUSINESS = #{ADDRESS_BUSINESS}, CREATE_DATE = #{CREATE_DATE}, SCALE = #{SCALE}, LONGITUDE = #{LONGITUDE}, @@ -682,4 +683,53 @@ where USER_ID = #{USER_ID} + + diff --git a/src/main/resources/mybatis/datasource/bus/NoticeCorpUserMapper.xml b/src/main/resources/mybatis/datasource/bus/NoticeCorpUserMapper.xml index 608fec45..389aa646 100644 --- a/src/main/resources/mybatis/datasource/bus/NoticeCorpUserMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/NoticeCorpUserMapper.xml @@ -147,7 +147,18 @@ - + + + insert into + ( + + ) values + + ( #{item.NOTICECORP_ID}, #{item.USER_ID},0, #{item.NOTICECORPUSERID_ID} ) + + + + delete from where NOTICECORP_ID = #{NOTICECORP_ID} diff --git a/src/main/resources/mybatis/datasource/depository/HiddenLibraryMapper.xml b/src/main/resources/mybatis/datasource/depository/HiddenLibraryMapper.xml new file mode 100644 index 00000000..31579d6e --- /dev/null +++ b/src/main/resources/mybatis/datasource/depository/HiddenLibraryMapper.xml @@ -0,0 +1,278 @@ + + + + + + + BUS_HIDDEN_LIBRARY + + + + + SYS_DICTIONARIES + + + + + f.INDUSTRY_TYPE_ONE, + f.INDUSTRY_TYPE_TWO, + f.INDUSTRY_TYPE_THREE, + f.INDUSTRY_TYPE_FOUR, + f.HIDDEN_TYPES, + f.RISK_UNIT_ID, + f.RISK_UNIT_NAME, + f.HIDDEN_PART, + f.HIDDEN_DESCR, + f.CREATOR_ID, + f.CREATOR_NAME, + f.CREATED_TIME, + f.OPERATOR_ID, + f.OPERATOR_NAME, + f.OPERATE_TIME, + f.INSPECTION_BASIS, + f.INSPECTION_INFO, + f.RECTIFYDESCR, + f.CORP_INFO_ID, + f.ISDELETE, + f.STATUS, + f.HIDDEN_LIBRARY_ID, + f.SOURCE, + f.HIDDEN_TYPE_ONE, + f.HIDDEN_TYPE_TWO, + f.HIDDEN_TYPE_THREE + + + + + INDUSTRY_TYPE_ONE, + INDUSTRY_TYPE_TWO, + INDUSTRY_TYPE_THREE, + INDUSTRY_TYPE_FOUR, + HIDDEN_TYPES, + RISK_UNIT_ID, + RISK_UNIT_NAME, + HIDDEN_PART, + HIDDEN_DESCR, + CREATOR_ID, + CREATOR_NAME, + CREATED_TIME, + OPERATOR_ID, + OPERATOR_NAME, + OPERATE_TIME, + INSPECTION_BASIS, + INSPECTION_INFO, + RECTIFYDESCR, + CORP_INFO_ID, + ISDELETE, + STATUS, + HIDDEN_LIBRARY_ID, + SOURCE, + HIDDEN_TYPE_ONE, + HIDDEN_TYPE_TWO, + HIDDEN_TYPE_THREE + + + + + #{INDUSTRY_TYPE_ONE}, + #{INDUSTRY_TYPE_TWO}, + #{INDUSTRY_TYPE_THREE}, + #{INDUSTRY_TYPE_FOUR}, + #{HIDDEN_TYPES}, + #{RISK_UNIT_ID}, + #{RISK_UNIT_NAME}, + #{HIDDEN_PART}, + #{HIDDEN_DESCR}, + #{CREATOR_ID}, + #{CREATOR_NAME}, + #{CREATED_TIME}, + #{OPERATOR_ID}, + #{OPERATOR_NAME}, + #{OPERATE_TIME}, + #{INSPECTION_BASIS}, + #{INSPECTION_INFO}, + #{RECTIFYDESCR}, + #{CORP_INFO_ID}, + #{ISDELETE}, + #{STATUS}, + #{HIDDEN_LIBRARY_ID}, + #{SOURCE}, + #{HIDDEN_TYPE_ONE}, + #{HIDDEN_TYPE_TWO}, + #{HIDDEN_TYPE_THREE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + HIDDEN_LIBRARY_ID = #{HIDDEN_LIBRARY_ID} + + + + + update + + set + INDUSTRY_TYPE_ONE = #{INDUSTRY_TYPE_ONE}, + INDUSTRY_TYPE_TWO = #{INDUSTRY_TYPE_TWO}, + INDUSTRY_TYPE_THREE = #{INDUSTRY_TYPE_THREE}, + INDUSTRY_TYPE_FOUR = #{INDUSTRY_TYPE_FOUR}, + HIDDEN_TYPES = #{HIDDEN_TYPES}, + RISK_UNIT_ID = #{RISK_UNIT_ID}, + RISK_UNIT_NAME = #{RISK_UNIT_NAME}, + HIDDEN_PART = #{HIDDEN_PART}, + HIDDEN_DESCR = #{HIDDEN_DESCR}, + CREATOR_ID = #{CREATOR_ID}, + CREATOR_NAME = #{CREATOR_NAME}, + CREATED_TIME = #{CREATED_TIME}, + OPERATOR_ID = #{OPERATOR_ID}, + OPERATOR_NAME = #{OPERATOR_NAME}, + OPERATE_TIME = #{OPERATE_TIME}, + INSPECTION_BASIS = #{INSPECTION_BASIS}, + INSPECTION_INFO = #{INSPECTION_INFO}, + RECTIFYDESCR = #{RECTIFYDESCR}, + CORP_INFO_ID = #{CORP_INFO_ID}, + ISDELETE = #{ISDELETE}, + STATUS = #{STATUS}, + SOURCE = #{SOURCE}, + HIDDEN_TYPE_ONE = #{HIDDEN_TYPE_ONE}, + HIDDEN_TYPE_TWO = #{HIDDEN_TYPE_TWO}, + HIDDEN_TYPE_THREE = #{HIDDEN_TYPE_THREE}, + HIDDEN_LIBRARY_ID = HIDDEN_LIBRARY_ID + where + HIDDEN_LIBRARY_ID = #{HIDDEN_LIBRARY_ID} + + + + + update + + set + STATUS = '1' + where + HIDDEN_LIBRARY_ID in + + #{item} + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + HIDDEN_LIBRARY_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/depository/LabelFacoryMapper.xml b/src/main/resources/mybatis/datasource/depository/LabelFacoryMapper.xml new file mode 100644 index 00000000..4895b0c6 --- /dev/null +++ b/src/main/resources/mybatis/datasource/depository/LabelFacoryMapper.xml @@ -0,0 +1,197 @@ + + + + + + + BUS_LABEL_FACTORY + + + + + SYS_DICTIONARIES + + + + + f.PARENT_ID, + f.ANCESTORS_ID, + f.IS_ANCESTORS_FLAG, + f.LEVEL, + f.NAME, + f.CREATOR_ID, + f.CREATED_TIME, + f.ISDELETE, + f.SORT, + f.TYPE, + f.BUS_LABEL_FACTORY_ID, + f.CORPINFO_ID + + + + + PARENT_ID, + ANCESTORS_ID, + IS_ANCESTORS_FLAG, + LEVEL, + NAME, + CREATOR_ID, + CREATED_TIME, + ISDELETE, + SORT, + TYPE, + BUS_LABEL_FACTORY_ID, + CORPINFO_ID + + + + + #{PARENT_ID}, + #{ANCESTORS_ID}, + #{IS_ANCESTORS_FLAG}, + #{LEVEL}, + #{NAME}, + #{CREATOR_ID}, + #{CREATED_TIME}, + #{ISDELETE}, + #{SORT}, + #{TYPE}, + #{BUS_LABEL_FACTORY_ID}, + #{CORPINFO_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + BUS_LABEL_FACTORY_ID = #{BUS_LABEL_FACTORY_ID} + + + delete from + + where TYPE = #{TYPE} + + and CORPINFO_ID = #{CORPINFO_ID} + + + + + + update + + set + PARENT_ID = #{PARENT_ID}, + ANCESTORS_ID = #{ANCESTORS_ID}, + IS_ANCESTORS_FLAG = #{IS_ANCESTORS_FLAG}, + LEVEL = #{LEVEL}, + NAME = #{NAME}, + CREATOR_ID = #{CREATOR_ID}, + CREATED_TIME = #{CREATED_TIME}, + SORT = #{SORT}, + TYPE = #{TYPE}, + CORPINFO_ID = #{CORPINFO_ID}, + BUS_LABEL_FACTORY_ID = BUS_LABEL_FACTORY_ID + where + BUS_LABEL_FACTORY_ID = #{BUS_LABEL_FACTORY_ID} + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + BUS_LABEL_FACTORY_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/depository/LibraryLabelsMapper.xml b/src/main/resources/mybatis/datasource/depository/LibraryLabelsMapper.xml new file mode 100644 index 00000000..00ff5e05 --- /dev/null +++ b/src/main/resources/mybatis/datasource/depository/LibraryLabelsMapper.xml @@ -0,0 +1,164 @@ + + + + + + + BUS_LIBRARY_LABELS + + + + + SYS_DICTIONARIES + + + + + f.BUS_TEXT_LIBRARY_ID, + f.NAME, + f.BUS_LABEL_FACTORY_ID, + f.CREATED_TIME, + f.LABEL_NAME, + f.ISDELETE, + f.BUS_LIBRARY_LABELS_ID, + f.CORPINFO_ID, + f.CATEGORY, + f.CATEGORY_ID, + f.CATEGORY_NAME + + + + + BUS_TEXT_LIBRARY_ID, + NAME, + BUS_LABEL_FACTORY_ID, + CREATED_TIME, + LABEL_NAME, + ISDELETE, + BUS_LIBRARY_LABELS_ID, + CORPINFO_ID, + CATEGORY, + CATEGORY_ID, + CATEGORY_NAME + + + + + #{BUS_TEXT_LIBRARY_ID}, + #{NAME}, + #{BUS_LABEL_FACTORY_ID}, + #{CREATED_TIME}, + #{LABEL_NAME}, + #{ISDELETE}, + #{BUS_LIBRARY_LABELS_ID}, + #{CORPINFO_ID}, + #{CATEGORY}, + #{CATEGORY_ID}, + #{CATEGORY_NAME} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + BUS_LIBRARY_LABELS_ID = #{BUS_LIBRARY_LABELS_ID} + + + delete from + + where + BUS_TEXT_LIBRARY_ID = #{BUS_TEXT_LIBRARY_ID} + + + + + update + + set + BUS_TEXT_LIBRARY_ID = #{BUS_TEXT_LIBRARY_ID}, + NAME = #{NAME}, + CREATED_TIME = #{CREATED_TIME}, + LABEL_NAME = #{LABEL_NAME}, + ISDELETE = #{ISDELETE}, + CORPINFO_ID = #{CORPINFO_ID}, + CATEGORY = #{CATEGORY}, + CATEGORY_ID = #{CATEGORY_ID}, + CATEGORY_NAME = #{CATEGORY_NAME}, + BUS_LIBRARY_LABELS_ID = BUS_LIBRARY_LABELS_ID + where + BUS_LIBRARY_LABELS_ID = #{BUS_LIBRARY_LABELS_ID} + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + BUS_LIBRARY_LABELS_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/depository/LibraryLogMapper.xml b/src/main/resources/mybatis/datasource/depository/LibraryLogMapper.xml new file mode 100644 index 00000000..281a170c --- /dev/null +++ b/src/main/resources/mybatis/datasource/depository/LibraryLogMapper.xml @@ -0,0 +1,72 @@ + + + + + + + BUS_LIBRARY_LOG + + + + + SYS_DICTIONARIES + + + + + f.LIBRARY_LOG_ID, + f.PATH, + f.CREATOR, + f.CREATOR_NAME, + f.CREATE_TIME, + f.BUS_TEXT_LIBRARY_ID + + + + LIBRARY_LOG_ID, + PATH, + CREATOR, + CREATOR_NAME, + CREATE_TIME, + BUS_TEXT_LIBRARY_ID + + + + #{LIBRARY_LOG_ID}, + #{PATH}, + #{CREATOR}, + #{CREATOR_NAME}, + #{CREATE_TIME}, + #{BUS_TEXT_LIBRARY_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + + + diff --git a/src/main/resources/mybatis/datasource/depository/TextInfoMapper.xml b/src/main/resources/mybatis/datasource/depository/TextInfoMapper.xml new file mode 100644 index 00000000..8ee04b6c --- /dev/null +++ b/src/main/resources/mybatis/datasource/depository/TextInfoMapper.xml @@ -0,0 +1,138 @@ + + + + + + + BUS_TEXT_INFO + + + + + SYS_DICTIONARIES + + + + + f.TEXT_INFO, + f.BUS_TEXT_LIBRARY_ID, + f.ISDELETE, + f.CREATED_TIME, + f.OPERATE_TIME, + f.TEXT_INFO_ID + + + + + TEXT_INFO, + BUS_TEXT_LIBRARY_ID, + ISDELETE, + CREATED_TIME, + OPERATE_TIME, + TEXT_INFO_ID + + + + + #{TEXT_INFO}, + #{BUS_TEXT_LIBRARY_ID}, + #{ISDELETE}, + #{CREATED_TIME}, + #{OPERATE_TIME}, + #{TEXT_INFO_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + TEXT_INFO_ID = #{TEXT_INFO_ID} + + + + + update + + set + TEXT_INFO = #{TEXT_INFO}, + BUS_TEXT_LIBRARY_ID = #{BUS_TEXT_LIBRARY_ID}, + ISDELETE = #{ISDELETE}, + OPERATE_TIME = #{OPERATE_TIME}, + TEXT_INFO_ID = TEXT_INFO_ID + where + TEXT_INFO_ID = #{TEXT_INFO_ID} + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + TEXT_INFO_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml b/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml new file mode 100644 index 00000000..46ef1d8c --- /dev/null +++ b/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml @@ -0,0 +1,206 @@ + + + + + + + BUS_TEXT_LIBRARY + + + + + SYS_DICTIONARIES + + + + + f.REMARKS, + f.TYPE, + f.TYPE_NAME, + f.FILE_NAME, + f.UPLOAD_TIME, + f.UPLOAD_USER, + f.UPLOAD_USER_NAME, + f.PATH, + f.REMOTE_PATH, + f.CREATED_TIME, + f.ISDELETE, + f.REMOTE_FILE_NAME, + f.LOCKTOOL, + f.ISTOPTIME, + f.ASSOCIATION, + f.STATUS, + f.BUS_TEXT_LIBRARY_ID, + f.MIGRATION_FLAG, + f.CORPINFO_ID + + + + + REMARKS, + TYPE, + TYPE_NAME, + FILE_NAME, + UPLOAD_TIME, + UPLOAD_USER, + UPLOAD_USER_NAME, + PATH, + REMOTE_PATH, + CREATED_TIME, + ISDELETE, + REMOTE_FILE_NAME, + LOCKTOOL, + ISTOPTIME, + ASSOCIATION, + STATUS, + BUS_TEXT_LIBRARY_ID, + CORPINFO_ID, + MIGRATION_FLAG + + + + + #{REMARKS}, + #{TYPE}, + #{TYPE_NAME}, + #{FILE_NAME}, + #{UPLOAD_TIME}, + #{UPLOAD_USER}, + #{UPLOAD_USER_NAME}, + #{PATH}, + #{REMOTE_PATH}, + #{CREATED_TIME}, + #{ISDELETE}, + #{REMOTE_FILE_NAME}, + #{LOCKTOOL}, + #{ISTOPTIME}, + #{ASSOCIATION}, + #{STATUS}, + #{BUS_TEXT_LIBRARY_ID}, + #{CORPINFO_ID}, + #{MIGRATION_FLAG} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + BUS_TEXT_LIBRARY_ID = #{BUS_TEXT_LIBRARY_ID} + + + + + update + + set + REMARKS = #{REMARKS}, + TYPE = #{TYPE}, + FILE_NAME = #{FILE_NAME}, + REMOTE_FILE_NAME = #{REMOTE_FILE_NAME}, + UPLOAD_TIME = #{UPLOAD_TIME}, + UPLOAD_USER = #{UPLOAD_USER}, + UPLOAD_USER_NAME = #{UPLOAD_USER_NAME}, + PATH = #{PATH}, + REMOTE_PATH = #{REMOTE_PATH}, + CREATED_TIME = #{CREATED_TIME}, + LOCKTOOL = #{LOCKTOOL}, + ISTOPTIME = #{ISTOPTIME}, + TYPE_NAME = #{TYPE_NAME}, + ASSOCIATION = #{ASSOCIATION}, + STATUS = #{STATUS}, + CORPINFO_ID = #{CORPINFO_ID}, + MIGRATION_FLAG = #{MIGRATION_FLAG}, + BUS_TEXT_LIBRARY_ID = BUS_TEXT_LIBRARY_ID + where + BUS_TEXT_LIBRARY_ID = #{BUS_TEXT_LIBRARY_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + BUS_TEXT_LIBRARY_ID in + + #{item} + + and LOCKTOOL is null + + + diff --git a/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml index 4d6bfc1d..0ac65962 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml @@ -301,4 +301,56 @@ + + diff --git a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml index 6af6dad9..abbca825 100644 --- a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml @@ -427,8 +427,11 @@ and f.STATE = #{pd.state} - - and f.HIDDENTYPE = #{pd.hiddenType} + + and f.HIDDENTYPE in + + #{pd.hiddenTypeList[${index}]} + and ( diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml index 022c4347..7121f2de 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml @@ -374,6 +374,9 @@ and f.STATE = 4 + + + and f.SOURCE = #{pd.SOURCE} and f.HIDDENLEVEL = #{pd.HIDDENLEVEL} diff --git a/src/main/resources/mybatis/datasource/map/MapEightMapper.xml b/src/main/resources/mybatis/datasource/map/MapEightMapper.xml index 4d0f9ebc..fadc2b02 100644 --- a/src/main/resources/mybatis/datasource/map/MapEightMapper.xml +++ b/src/main/resources/mybatis/datasource/map/MapEightMapper.xml @@ -67,24 +67,26 @@ AND CORPINFO_ID IN - #{item} + #{item} GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, - '0' AS cutroadCount, + '0' AS hotworkapplicationCount, count( 1 ) blindboardCount, - '0' breakgroundCount, + '0' confinedspaceCount, '0' highworkCount, '0' hoistingCount, '0' electricityCount FROM - bus_blindboard + gf_blindboard WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} @@ -96,19 +98,21 @@ GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, '0' cutroadCount, '0' blindboardCount, - count( 1 ) breakgroundCount, + count( 1 ) confinedspaceCount, '0' highworkCount, '0' hoistingCount, '0' electricityCount FROM - bus_confinedspace + gf_confinedspace WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} @@ -120,19 +124,21 @@ GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, - '0' cutroadCount, + '0' hotworkapplicationCount, '0' blindboardCount, - '0' breakgroundCount, + '0' confinedspaceCount, count( 1 ) highworkCount, '0' hoistingCount, '0' electricityCount FROM - bus_highwork + gf_highwork WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} @@ -144,19 +150,22 @@ GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, - '0' cutroadCount, + '0' hotworkapplicationCount, '0' blindboardCount, - '0' breakgroundCount, + '0' confinedspaceCount, '0' highworkCount, count( 1 ) hoistingCount, '0' electricityCount FROM - bus_hoisting + gf_hoisting WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} @@ -168,49 +177,53 @@ GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) UNION ALL + + SELECT STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) CREATTIME, - '0' cutroadCount, + '0' hotworkapplicationCount, '0' blindboardCount, - '0' breakgroundCount, + '0' confinedspaceCount, '0' highworkCount, '0' hoistingCount, count( 1 ) electricityCount FROM - bus_electricity + gf_electricity WHERE DATE_SUB( CURDATE(), INTERVAL 4 DAY )<= STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) and ISDELETE = '0' + and APPLY_STATUS != '0' and CORPINFO_ID = #{CORPINFO_ID} - + AND CORPINFO_ID IN - + #{item} GROUP BY STR_TO_DATE( CREATTIME, '%Y-%m-%d' ) + ) s GROUP BY s.CREATTIME ) h ON h.CREATTIME = t.click_date order by t.click_date - + SELECT * FROM - (SELECT + (SELECT f.HOTWORK_ID ID, f.CHECK_NO WORK_NUMBER, '动火作业' WORK_TYPE, @@ -504,31 +409,38 @@ GROUP BY f.HOTWORK_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.electricity_ID ID, - f.CHECK_NO WORK_NUMBER, - '临时用电作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '待确认' - when '2' then '待审批' - when '3' then '已归档' - when '4' then '已验收' - when '-1' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.APPLY_USER_ID - when '1' then f.ASSURE_USER_ID - when '2' then f.APPROVE_USER_ID - when '3' then f.ACCEPT_USER_ID - when '-1' then f.APPLY_USER_ID - END NEXT_USER_ID, + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.electricity_ID ID, + f.CHECK_NO WORK_NUMBER, + '临时用电作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '用电单位待审核' + when '3' then '配送电单位待审核' + when '4' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.APPLY_USER_ID + when '1' then f.CONFIRM_USER_ID + when '2' then f.AUDIT_USER_ID + when '3' then f.APPROVE_USER_ID + when '4' then f.ACCEPT_USER_ID + when '-1' then f.APPLY_USER_ID + when '-2' then f.APPLY_USER_ID + when '-3' then f.APPLY_USER_ID + when '-4' then f.APPLY_USER_ID + when '-5' then f.APPLY_USER_ID + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('3','4') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '5' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -538,32 +450,37 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.blindboard_ID ID, - f.CHECK_NO WORK_NUMBER, - '盲板作业' WORK_TYPE, - case f.APPLY_STATUS - when '1' then '待确认' - when '2' then '待审批' - when '3' then '已归档' - when '4' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '1' then bb.OPERATION_UNIT_PERSONCHARGE - when '2' then bb.CORPINFO_APPROVER - when '3' then f.APPLY_USER_ID - when '4' then f.APPLY_USER_ID - END NEXT_USER_ID, + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.blindboard_ID ID, + f.CHECK_NO WORK_NUMBER, + '盲板作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '4' then '所在单位待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.APPLY_USER_ID + when '1' then f.CONSTRUCTION_USER_ID + when '4' then f.LEADER_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then APPLY_USER_ID + when '-5' then APPLY_USER_ID + when '-6' then APPLY_USER_ID + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_blindboard f - LEFT JOIN bus_blindboardinfo bb ON bb.BLINDBOARD_ID = f.BLINDBOARD_ID - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('3','4') - AND date_format(now(),'%Y-%m-%d %H:%i') >= bb.BOARD_INSTALL_TIME AND bb.BOARD_DISASSEMBLE_TIME >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_blindboard f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -573,39 +490,44 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.HIGHWORK_ID ID, - f.CHECK_NO WORK_NUMBER, - '高处作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '待确认' - when '2' then '待审核' - when '3' then '待审批' - when '4' then '已归档' - when '5' then '已验收' - when '-2' then '确认打回' - when '-3' then '审核打回' - when '-4' then '审批打回' - when '55' then '待验收' - END STATUS_NAME, - case f.APPLY_STATUS - when '1' then f.CONSTRUCTION_USER_ID - when '2' then f.AUDIT_USER_ID - when '3' then f.APPROVE_USER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '55' then f.ACCEPT_USER_ID - END NEXT_USER_ID, + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.HIGHWORK_ID ID, + f.CHECK_NO WORK_NUMBER, + '高处作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '所在单位待审核' + when '3' then '审核部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.CONSTRUCTION_USER_ID + when '2' then f.LEADER_USER_ID + when '3' then f.AUDIT_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('4','5','55','-5') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -615,44 +537,34 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.confinedspace_ID ID, - f.WORK_PERMIT_NUMBER WORK_NUMBER, - '有限空间作业' WORK_TYPE, - case f.APPLY_STATUS - when '1' then '待采样' - when '2' then '作业单位责任人确认' - when '3' then '作业现场责任人审核' - when '4' then '管理单位责任人审批' - when '5' then '作业单位责任人验收' - when '6' then '管理单位责任人验收' - when '-2' then '作业单位责任人确认打回' - when '-3' then '作业现场责任人审核打回' - when '-4' then '管理单位责任人审批打回' - when '-5' then '作业单位责任人验收打回' - when '-6' then '管理单位责任人验收打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '1' then f.SAMPLING_ANALYST_ID - when '2' then f.WORK_UNIT_MANAGER_ID - when '3' then f.JOB_SITE_MANAGER_ID - when '4' then f.MANAGEMENT_UNIT_ID - when '5' then f.WORK_UNIT_MANAGER_ID - when '6' then f.MANAGEMENT_UNIT_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '-5' then f.CREATOR - when '-6' then f.CREATOR - END NEXT_USER_ID, + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.confinedspace_ID ID, + f.CHECK_NO WORK_NUMBER, + '有限空间作业' WORK_TYPE, + case f.APPLY_STATUS + when '1' then '作业负责人待审核' + when '4' then '所在单位待审核' + when '5' then '待验收' + when '-4' then '作业负责人审核打回' + when '-5' then '所在单位审核打回' + when '-6' then '验收打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '1' then f.CONFIRM_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_confinedspace f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '7' - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_confinedspace f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -662,40 +574,44 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.hoisting_ID ID, - f.NUMBERING WORK_NUMBER, - '吊装作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '待确认' - when '2' then '待审核' - when '3' then '待审批' - when '4' then '已归档' - when '5' then '已验收' - when '-2' then '确认打回' - when '-3' then '审核打回' - when '-4' then '审批打回' - when '55' then '待验收' - END STATUS_NAME, - case f.APPLY_STATUS - when '1' then f.CONSTRUCTION_JOB_MANAGER_ID - when '2' then f.WORK_UNIT_MANAGER_ID - when '3' then f.BRANCH_APPROVER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '55' then f.ACCEPTOR_ID - END NEXT_USER_ID, + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.hoisting_ID ID, + f.CHECK_NO WORK_NUMBER, + '吊装作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业指挥待审核' + when '2' then '所在单位待审核' + when '3' then '审核部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.LEADER_USER_ID + when '2' then f.CONSTRUCTION_USER_ID + when '3' then f.AUDIT_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_hoisting f - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('4','5','55','-5') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.JOB_START_TIME AND f.JOB_END_TIME >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_hoisting f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -705,9 +621,9 @@ #{pd.ids[${index}]} - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - ) f + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + ) f ORDER BY f.OPERATTIME DESC @@ -715,17 +631,17 @@ SELECT - 'ELECTRICITY' TYPE, - f.ELECTRICITY_ID id, - CONCAT_WS("", '临时用电作业 编号：', f.CHECK_NO) NAME, - f.WORK_LONGITUDE LONGITUDE, - f.WORK_LATITUDE LATITUDE, - './bi/images/map/electricity.png' IMAGE_FILE, + 'ELECTRICITY' TYPE, + f.ELECTRICITY_ID id, + CONCAT_WS("", '临时用电作业 编号：', f.CHECK_NO) NAME, + f.WORK_LONGITUDE LONGITUDE, + f.WORK_LATITUDE LATITUDE, + './bi/images/map/electricity.png' IMAGE_FILE, f.CORPINFO_ID, f.CHECK_NO as MAP_POINT_NAME FROM bus_electricity f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL - AND f.APPLY_STATUS NOT IN ('3','4') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + AND f.APPLY_STATUS NOT IN ('3','4') + AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') and f.CORPINFO_ID = #{CORPINFO_ID} @@ -764,7 +680,7 @@ SELECT - 'HIGHWORK' TYPE, - f.HIGHWORK_ID id, - CONCAT_WS("", '高处作业 编号：', f.CHECK_NO) NAME, - f.WORK_LONGITUDE LONGITUDE, - f.WORK_LATITUDE LATITUDE, - './bi/images/map/highwork.png' IMAGE_FILE, - f.CORPINFO_ID, - f.CHECK_NO as MAP_POINT_NAME - FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL - AND f.APPLY_STATUS NOT IN ('4','5','55','-5') - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + 'HIGHWORK' TYPE, + f.HIGHWORK_ID id, + CONCAT_WS("", '高处作业 编号：', f.CHECK_NO) NAME, + f.WORK_LONGITUDE LONGITUDE, + f.WORK_LATITUDE LATITUDE, + './bi/images/map/highwork.png' IMAGE_FILE, + f.CORPINFO_ID, + f.CHECK_NO as MAP_POINT_NAME + FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + AND f.APPLY_STATUS NOT IN ('4','5','55','-5') + AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') and f.CORPINFO_ID = #{CORPINFO_ID} @@ -814,57 +730,6 @@ - - - - - - - SELECT * FROM - (SELECT - f.HOTWORKAPPLICATION_ID ID, - f.JOB_NUMBER WORK_NUMBER, - '动火作业' WORK_TYPE, - case f.STATE - when 1 then '动火单位负责人确认' - when 2 then '项目发包单位签发' - when 3 then '现场管辖单位负责人' - when 4 then '动火许可签发单位' - when 5 then '安全总监审批' - when 6 then '现场负责人' - when 7 then '动火前' - when 8 then '现场负责人确认' - when 9 then '动火后' - when 10 then '延时监火' - when 11 then '归档' - when 21 then '动火操作人' - when 22 then '监护人' - when 24 then '气体检测人' - when -1 then '审核不通过' - when -2 then '特级动火不通过' - when -3 then '未完成 关闭归档' - when -4 then '延期' - when -5 then '已打回' - when -6 then '超期' - when 30 then '动火负责人确认' - when 31 then '项目主管初审' - when 32 then '项目监管部门负责人' - when 33 then '分公司安全总监审批' - when 34 then '分公司主要负责人' - when 35 then '安全监督部初审' - when 36 then '安委会办公室' - when 37 then '安全总监审批' - END STATUS_NAME, - IF(f.STATE = 10,IFNULL(od.`NAME`,IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,''))),IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,''))) USER_NAME, - - DATE_FORMAT(ifnull(f.OPERATTIME,f.CREATTIME),'%Y-%m-%d %H:%i:%s') OPERATTIME - FROM bus_hotworkapplication f - LEFT JOIN bus_hotworkapplicationuser hu ON hu.FOREIGN_KEY = f.HOTWORKAPPLICATION_ID AND hu.STATE = f.STATE - LEFT JOIN sys_user u ON u.USER_ID = hu.USER_ID - LEFT JOIN oa_department od ON od.DEPARTMENT_ID = hu.USER_ID - LEFT JOIN `qa-gwj-regulatory`.sys_user qu on qu.USER_ID = hu.USER_ID - WHERE f.ISDELETE = '0' AND f.STATE >= 0 and f.STATE != 11 + (SELECT + f.HOTWORKAPPLICATION_ID ID, + f.JOB_NUMBER WORK_NUMBER, + '动火作业' WORK_TYPE, + case f.STATE + when 1 then '动火单位负责人确认' + when 2 then '项目发包单位签发' + when 3 then '现场管辖单位负责人' + when 4 then '动火许可签发单位' + when 5 then '安全总监审批' + when 6 then '现场负责人' + when 7 then '动火前' + when 8 then '现场负责人确认' + when 9 then '动火后' + when 10 then '延时监火' + when 11 then '归档' + when 21 then '动火操作人' + when 22 then '监护人' + when 24 then '气体检测人' + when -1 then '审核不通过' + when -2 then '特级动火不通过' + when -3 then '未完成 关闭归档' + when -4 then '延期' + when -5 then '已打回' + when -6 then '超期' + when 30 then '动火负责人确认' + when 31 then '项目主管初审' + when 32 then '项目监管部门负责人' + when 33 then '分公司安全总监审批' + when 34 then '分公司主要负责人' + when 35 then '安全监督部初审' + when 36 then '安委会办公室' + when 37 then '安全总监审批' + END STATUS_NAME, + IF(f.STATE = 10,IFNULL(od.`NAME`,IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,''))),IFNULL(GROUP_CONCAT(REPLACE(u.NAME,'/',',')),IFNULL(qu.`NAME`,''))) USER_NAME, + + DATE_FORMAT(ifnull(f.OPERATTIME,f.CREATTIME),'%Y-%m-%d %H:%i:%s') OPERATTIME + FROM bus_hotworkapplication f + LEFT JOIN bus_hotworkapplicationuser hu ON hu.FOREIGN_KEY = f.HOTWORKAPPLICATION_ID AND hu.STATE = f.STATE + LEFT JOIN sys_user u ON u.USER_ID = hu.USER_ID + LEFT JOIN oa_department od ON od.DEPARTMENT_ID = hu.USER_ID + LEFT JOIN `qa-gwj-regulatory`.sys_user qu on qu.USER_ID = hu.USER_ID + WHERE f.ISDELETE = '0' AND f.STATE >= 0 and f.STATE != 11 and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -2126,165 +1972,118 @@ - GROUP BY f.HOTWORKAPPLICATION_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.electricity_ID ID, - f.CHECK_NO WORK_NUMBER, - '临时用电作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业负责人待审核' - when '2' then '用电单位待审核' - when '3' then '配送电单位待审核' - when '4' then '待验收' - when '-2' then '已打回' - when '-3' then '已打回' - when '-4' then '已打回' - when '-5' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.APPLY_USER_ID - when '1' then f.CONFIRM_USER_ID - when '2' then f.AUDIT_USER_ID - when '3' then f.APPROVE_USER_ID - when '4' then f.ACCEPT_USER_ID - when '-1' then f.APPLY_USER_ID - when '-2' then f.APPLY_USER_ID - when '-3' then f.APPLY_USER_ID - when '-4' then f.APPLY_USER_ID - when '-5' then f.APPLY_USER_ID - END NEXT_USER_ID, - ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '5' - - and f.CORPINFO_ID = #{pd.CORPINFO_ID} - - - AND f.CORPINFO_ID IN - - #{pd.ids[${index}]} - - - - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.blindboard_ID ID, - f.CHECK_NO WORK_NUMBER, - '盲板作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业负责人待审核' - when '4' then '所在单位待审核' - when '5' then '待验收' - when '-2' then '已打回' - when '-5' then '已打回' - when '-6' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.APPLY_USER_ID - when '1' then f.CONSTRUCTION_USER_ID - when '4' then f.LEADER_USER_ID - when '5' then f.ACCEPT_USER_ID - when '-2' then APPLY_USER_ID - when '-5' then APPLY_USER_ID - when '-6' then APPLY_USER_ID - END NEXT_USER_ID, - ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_blindboard f - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' - - and f.CORPINFO_ID = #{pd.CORPINFO_ID} - - - AND f.CORPINFO_ID IN - - #{pd.ids[${index}]} - - - - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.HIGHWORK_ID ID, - f.CHECK_NO WORK_NUMBER, - '高处作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业负责人待审核' - when '2' then '所在单位待审核' - when '3' then '审核部门待审核' - when '4' then '审批部门待审核' - when '5' then '待验收' - when '-2' then '已打回' - when '-3' then '已打回' - when '-4' then '已打回' - when '-5' then '已打回' - when '-6' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.CREATOR - when '1' then f.CONSTRUCTION_USER_ID - when '2' then f.LEADER_USER_ID - when '3' then f.AUDIT_USER_ID - when '4' then f.APPROVE_USER_ID - when '5' then f.ACCEPT_USER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '-5' then f.CREATOR - when '-6' then f.CREATOR - END NEXT_USER_ID, - ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' - - and f.CORPINFO_ID = #{pd.CORPINFO_ID} - - - AND f.CORPINFO_ID IN - - #{pd.ids[${index}]} - - - - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL + GROUP BY f.HOTWORKAPPLICATION_ID + UNION ALL SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME FROM (SELECT - f.confinedspace_ID ID, - f.WORK_PERMIT_NUMBER WORK_NUMBER, - '有限空间作业' WORK_TYPE, + f.electricity_ID ID, + f.CHECK_NO WORK_NUMBER, + '临时用电作业' WORK_TYPE, case f.APPLY_STATUS - when '1' then '待采样' - when '2' then '作业单位责任人确认' - when '3' then '作业现场责任人审核' - when '4' then '管理单位责任人审批' - when '5' then '作业单位责任人验收' - when '6' then '管理单位责任人验收' - when '-2' then '作业单位责任人确认打回' - when '-3' then '作业现场责任人审核打回' - when '-4' then '管理单位责任人审批打回' - when '-5' then '作业单位责任人验收打回' - when '-6' then '管理单位责任人验收打回' + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '用电单位待审核' + when '3' then '配送电单位待审核' + when '4' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' END STATUS_NAME, case f.APPLY_STATUS - when '1' then f.SAMPLING_ANALYST_ID - when '2' then f.WORK_UNIT_MANAGER_ID - when '3' then f.JOB_SITE_MANAGER_ID - when '4' then f.MANAGEMENT_UNIT_ID - when '5' then f.WORK_UNIT_MANAGER_ID - when '6' then f.MANAGEMENT_UNIT_ID + when '0' then f.APPLY_USER_ID + when '1' then f.CONFIRM_USER_ID + when '2' then f.AUDIT_USER_ID + when '3' then f.APPROVE_USER_ID + when '4' then f.ACCEPT_USER_ID + when '-1' then f.APPLY_USER_ID + when '-2' then f.APPLY_USER_ID + when '-3' then f.APPLY_USER_ID + when '-4' then f.APPLY_USER_ID + when '-5' then f.APPLY_USER_ID + END NEXT_USER_ID, + ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME + FROM gf_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '5' + + and f.CORPINFO_ID = #{pd.CORPINFO_ID} + + + AND f.CORPINFO_ID IN + + #{pd.ids[${index}]} + + + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.blindboard_ID ID, + f.CHECK_NO WORK_NUMBER, + '盲板作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '4' then '所在单位待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.APPLY_USER_ID + when '1' then f.CONSTRUCTION_USER_ID + when '4' then f.LEADER_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then APPLY_USER_ID + when '-5' then APPLY_USER_ID + when '-6' then APPLY_USER_ID + END NEXT_USER_ID, + ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME + FROM gf_blindboard f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' + + and f.CORPINFO_ID = #{pd.CORPINFO_ID} + + + AND f.CORPINFO_ID IN + + #{pd.ids[${index}]} + + + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.HIGHWORK_ID ID, + f.CHECK_NO WORK_NUMBER, + '高处作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '所在单位待审核' + when '3' then '审核部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.CONSTRUCTION_USER_ID + when '2' then f.LEADER_USER_ID + when '3' then f.AUDIT_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID when '-2' then f.CREATOR when '-3' then f.CREATOR when '-4' then f.CREATOR @@ -2292,8 +2091,44 @@ when '-6' then f.CREATOR END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM bus_confinedspace f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '7' - AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') + FROM gf_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' + + and f.CORPINFO_ID = #{pd.CORPINFO_ID} + + + AND f.CORPINFO_ID IN + + #{pd.ids[${index}]} + + + + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.confinedspace_ID ID, + f.CHECK_NO WORK_NUMBER, + '有限空间作业' WORK_TYPE, + case f.APPLY_STATUS + when '1' then '作业负责人待审核' + when '4' then '所在单位待审核' + when '5' then '待验收' + when '-4' then '作业负责人审核打回' + when '-5' then '所在单位审核打回' + when '-6' then '验收打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '1' then f.CONFIRM_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, + ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME + FROM gf_confinedspace f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -2305,42 +2140,42 @@ ) f LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.hoisting_ID ID, - f.CHECK_NO WORK_NUMBER, - '吊装作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业指挥待审核' - when '2' then '所在单位待审核' - when '3' then '审核部门待审核' - when '4' then '审批部门待审核' - when '5' then '待验收' - when '-2' then '已打回' - when '-3' then '已打回' - when '-4' then '已打回' - when '-5' then '已打回' - when '-6' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.CREATOR - when '1' then f.LEADER_USER_ID - when '2' then f.CONSTRUCTION_USER_ID - when '3' then f.AUDIT_USER_ID - when '4' then f.APPROVE_USER_ID - when '5' then f.ACCEPT_USER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '-5' then f.CREATOR - when '-6' then f.CREATOR - END NEXT_USER_ID, + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.hoisting_ID ID, + f.CHECK_NO WORK_NUMBER, + '吊装作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业指挥待审核' + when '2' then '所在单位待审核' + when '3' then '审核部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.LEADER_USER_ID + when '2' then f.CONSTRUCTION_USER_ID + when '3' then f.AUDIT_USER_ID + when '4' then f.APPROVE_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_hoisting f - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' + FROM gf_hoisting f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -2351,45 +2186,45 @@ - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.BREAKGROUND_ID ID, - f.CHECK_NO WORK_NUMBER, - '动土作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业负责人待审核' - when '2' then '所在单位待审核' - when '3' then '有关部门待审核' - when '4' then '审批部门待审核' - when '5' then '待验收' - when '-2' then '已打回' - when '-3' then '已打回' - when '-4' then '已打回' - when '-5' then '已打回' - when '-6' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.CREATOR - when '1' then f.CONSTRUCTION_USER_ID - when '2' then f.PRODUCTION_USER_ID - when '3' then f.SAFETY_USER_ID - when '4' then f.LEADER_USER_ID - when '5' then f.ACCEPT_USER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '-5' then f.CREATOR - when '-6' then f.CREATOR - END NEXT_USER_ID, + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.BREAKGROUND_ID ID, + f.CHECK_NO WORK_NUMBER, + '动土作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '所在单位待审核' + when '3' then '有关部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.CONSTRUCTION_USER_ID + when '2' then f.PRODUCTION_USER_ID + when '3' then f.SAFETY_USER_ID + when '4' then f.LEADER_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_breakground f - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' + FROM gf_breakground f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -2400,45 +2235,45 @@ - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - UNION ALL - SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME - FROM - (SELECT - f.CUTROAD_ID ID, - f.CHECK_NO WORK_NUMBER, - '断路作业' WORK_TYPE, - case f.APPLY_STATUS - when '0' then '待提交' - when '1' then '作业负责人待审核' - when '2' then '所在单位待审核' - when '3' then '消防、安全管理部门待审核' - when '4' then '审批部门待审核' - when '5' then '待验收' - when '-2' then '已打回' - when '-3' then '已打回' - when '-4' then '已打回' - when '-5' then '已打回' - when '-6' then '已打回' - END STATUS_NAME, - case f.APPLY_STATUS - when '0' then f.CREATOR - when '1' then f.CONSTRUCTION_USER_ID - when '2' then f.PRODUCTION_USER_ID - when '3' then f.SAFETY_USER_ID - when '4' then f.LEADER_USER_ID - when '5' then f.ACCEPT_USER_ID - when '-2' then f.CREATOR - when '-3' then f.CREATOR - when '-4' then f.CREATOR - when '-5' then f.CREATOR - when '-6' then f.CREATOR - END NEXT_USER_ID, + UNION ALL + SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME + FROM + (SELECT + f.CUTROAD_ID ID, + f.CHECK_NO WORK_NUMBER, + '断路作业' WORK_TYPE, + case f.APPLY_STATUS + when '0' then '待提交' + when '1' then '作业负责人待审核' + when '2' then '所在单位待审核' + when '3' then '消防、安全管理部门待审核' + when '4' then '审批部门待审核' + when '5' then '待验收' + when '-2' then '已打回' + when '-3' then '已打回' + when '-4' then '已打回' + when '-5' then '已打回' + when '-6' then '已打回' + END STATUS_NAME, + case f.APPLY_STATUS + when '0' then f.CREATOR + when '1' then f.CONSTRUCTION_USER_ID + when '2' then f.PRODUCTION_USER_ID + when '3' then f.SAFETY_USER_ID + when '4' then f.LEADER_USER_ID + when '5' then f.ACCEPT_USER_ID + when '-2' then f.CREATOR + when '-3' then f.CREATOR + when '-4' then f.CREATOR + when '-5' then f.CREATOR + when '-6' then f.CREATOR + END NEXT_USER_ID, ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME - FROM gf_cutroad f - WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' + FROM gf_cutroad f + WHERE f.ISDELETE = '0' AND f.APPLY_STATUS !='6' and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -2449,9 +2284,9 @@ - ) f - LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID - ) f + ) f + LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID + ) f ORDER BY f.OPERATTIME DESC @@ -2479,9 +2314,9 @@ - + select - `NAME` + `NAME` from - sys_dictionaries + sys_dictionaries where - DICTIONARIES_ID in + DICTIONARIES_ID in #{item} @@ -3704,4 +3538,228 @@ f.HOISTING_ID = #{HOISTING_ID} and f.CORPINFO_ID = #{CORPINFO_ID} and f.ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID} order by f.ACCEPT_CONFESS_USER_SIGNER_TIME asc + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml new file mode 100644 index 00000000..826d278d --- /dev/null +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml @@ -0,0 +1,222 @@ + + + + + + + MKMJ_AREA_GATE + + + + + SYS_DICTIONARIES + + + + + f.AREA_GATE_ID, + f.GATE_NUMBER, + f.AREA_ID, + f.GATE_NAME, + f.GATE_TYPE, + f.GATE_CATEGORY, + f.GATE_MODEL, + f.GATE_POSITION, + f.IS_ADJACENT, + f.ADJACENT_AREA_ID, + f.LONGITUDE, + f.LATITUDE, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + AREA_GATE_ID, + GATE_NUMBER, + AREA_ID, + GATE_NAME, + GATE_TYPE, + GATE_CATEGORY, + GATE_MODEL, + GATE_POSITION, + IS_ADJACENT, + ADJACENT_AREA_ID, + LONGITUDE, + LATITUDE, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{AREA_GATE_ID}, + #{GATE_NUMBER}, + #{AREA_ID}, + #{GATE_NAME}, + #{GATE_TYPE}, + #{GATE_CATEGORY}, + #{GATE_MODEL}, + #{GATE_POSITION}, + #{IS_ADJACENT}, + #{ADJACENT_AREA_ID}, + #{LONGITUDE}, + #{LATITUDE}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + AREA_GATE_ID = #{AREA_GATE_ID} + + + + + update + + set + AREA_GATE_ID= AREA_GATE_ID, + GATE_NUMBER=#{GATE_NUMBER}, + AREA_ID=#{AREA_ID}, + GATE_NAME=#{GATE_NAME}, + GATE_TYPE=#{GATE_TYPE}, + GATE_CATEGORY=#{GATE_CATEGORY}, + GATE_MODEL=#{GATE_MODEL}, + GATE_POSITION=#{GATE_POSITION}, + IS_ADJACENT=#{IS_ADJACENT}, + ADJACENT_AREA_ID=#{ADJACENT_AREA_ID}, + LONGITUDE=#{LONGITUDE}, + LATITUDE=#{LATITUDE}, + CORPINFO_ID=#{CORPINFO_ID}, + CREATOR=#{CREATOR}, + CREATTIME=#{CREATTIME}, + OPERATOR=#{OPERATOR}, + OPERATTIME=#{OPERATTIME}, + ISDELETE=#{ISDELETE} + where + AREA_GATE_ID=#{AREA_GATE_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + AREA_GATE_ID in + + #{item} + + + + + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + AREA_GATE_ID = #{AREA_GATE_ID} + + diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml new file mode 100644 index 00000000..a71e15c0 --- /dev/null +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml @@ -0,0 +1,188 @@ + + + + + + + MKMJ_AREA + + + + + SYS_DICTIONARIES + + + + + f.AREA_ID, + f.AREA_NAME, + f.AREA_RANGE, + f.AREA_LEAVE, + f.AREA_PARENT_ID, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + AREA_ID, + AREA_NAME, + AREA_RANGE, + AREA_LEAVE, + AREA_PARENT_ID, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{AREA_ID}, + #{AREA_NAME}, + #{AREA_RANGE}, + #{AREA_LEAVE}, + #{AREA_PARENT_ID}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + AREA_ID = #{AREA_ID} + + + + + update + + set + AREA_ID=AREA_ID, + AREA_NAME=#{AREA_NAME}, + AREA_RANGE=#{AREA_RANGE}, + AREA_LEAVE=#{AREA_LEAVE}, + AREA_PARENT_ID=#{AREA_PARENT_ID}, + CORPINFO_ID=#{CORPINFO_ID}, + CREATOR=#{CREATOR}, + CREATTIME=#{CREATTIME}, + OPERATOR=#{OPERATOR}, + OPERATTIME=#{OPERATTIME}, + ISDELETE=#{ISDELETE} + where + AREA_ID=#{AREA_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + AREA_ID in + + #{item} + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml new file mode 100644 index 00000000..4b5d0bdd --- /dev/null +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml @@ -0,0 +1,197 @@ + + + + + + + MKMJ_GATE_LOG + + + + + SYS_DICTIONARIES + + + + + f.AREA_LOG_ID, + f.AREA_GATE_ID, + f.STATE, + f.LOG_TIME, + f.USER_ID, + f.USER_NAME, + f.GATE_TYPE, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE, + f.EX1, + f.EX2, + f.EX3, + f.EX4, + f.EX5 + + + + + AREA_LOG_ID, + AREA_GATE_ID, + STATE, + LOG_TIME, + USER_ID, + USER_NAME, + GATE_TYPE, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE, + EX1, + EX2, + EX3, + EX4, + EX5 + + + + + #{AREA_LOG_ID}, + #{AREA_GATE_ID}, + #{STATE}, + #{LOG_TIME}, + #{USER_ID}, + #{USER_NAME} + #{GATE_TYPE}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE}, + #{EX1}, + #{EX2}, + #{EX3}, + #{EX4}, + #{EX5} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + AREA_LOG_ID = #{AREA_LOG_ID} + + + + + update + + set + AREA_LOG_ID= AREA_LOG_ID, + AREA_GATE_ID=#{AREA_GATE_ID}, + STATE=#{STATE}, + LOG_TIME=#{LOG_TIME}, + USER_CARD=#{USER_CARD}, + GATE_TYPE=#{GATE_TYPE}, + CREATOR=#{CREATOR}, + CREATTIME=#{CREATTIME}, + OPERATOR=#{OPERATOR}, + OPERATTIME=#{OPERATTIME}, + ISDELETE=#{ISDELETE}, + EX1=#{EX1}, + EX2=#{EX2}, + EX3=#{EX3}, + EX4=#{EX4}, + EX5=#{EX5} + where + AREA_LOG_ID=#{AREA_LOG_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + AREA_LOG_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml new file mode 100644 index 00000000..cef4d84c --- /dev/null +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml @@ -0,0 +1,183 @@ + + + + + + + MKMJ_GATE_VIDEO + + + + + SYS_DICTIONARIES + + + + + f.GATE_VIDEO_ID, + f.AREA_GATE_ID, + f.PLATFORMVIDEOMANAGEMENT_ID, + f.LONGITUDE, + f.LATITUDE, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + GATE_VIDEO_ID, + AREA_GATE_ID, + PLATFORMVIDEOMANAGEMENT_ID, + LONGITUDE, + LATITUDE, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{GATE_VIDEO_ID}, + #{AREA_GATE_ID}, + #{PLATFORMVIDEOMANAGEMENT_ID}, + #{LONGITUDE}, + #{LATITUDE}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + GATE_VIDEO_ID = #{GATE_VIDEO_ID} + + + + + update + + set + GATE_VIDEO_ID= GATE_VIDEO_ID, + AREA_GATE_ID=#{AREA_GATE_ID}, + PLATFORMVIDEOMANAGEMENT_ID=#{PLATFORMVIDEOMANAGEMENT_ID}, + LONGITUDE=#{LONGITUDE}, + LATITUDE=#{LATITUDE}, + CORPINFO_ID=#{CORPINFO_ID}, + CREATOR=#{CREATOR}, + CREATTIME=#{CREATTIME}, + OPERATOR=#{OPERATOR}, + OPERATTIME=#{OPERATTIME}, + ISDELETE=#{ISDELETE} + where + GATE_VIDEO_ID=#{GATE_VIDEO_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + GATE_VIDEO_ID in + + #{item} + + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + GATE_VIDEO_ID = #{GATE_VIDEO_ID} + + + + + + diff --git a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml index 21c16631..08e10df9 100644 --- a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml +++ b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml @@ -627,4 +627,11 @@ (COR_ORDER+0) asc, NAME,DEP_ORDER asc + diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 514370b1..e931bf02 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -91,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" JCR, CORPINFO_ID, CARDNO, + MKMJCARD, ISDELETE @@ -131,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" f.JCR, f.CORPINFO_ID, f.CARDNO, + f.MKMJCARD, f.ISDELETE @@ -168,6 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{JCR}, #{CORPINFO_ID}, #{CARDNO}, + #{MKMJCARD}, #{ISDELETE} @@ -387,6 +390,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ,CARDNO = #{CARDNO} + + ,MKMJCARD = #{MKMJCARD} + ,DURATION = #{DURATION} @@ -1432,4 +1438,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where u.CARDNO = #{CARDNO} + + diff --git a/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml index 4a663f1e..5801dc27 100644 --- a/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml @@ -28,7 +28,9 @@ f.END_FLAG, f.ISDELETE, f.PARENT_ID, - f.FOREIGN_KEY + f.FOREIGN_KEY, + f.SORT, + f.APPOINT_ANNEX @@ -47,7 +49,9 @@ END_FLAG, ISDELETE, PARENT_ID, - FOREIGN_KEY + FOREIGN_KEY, + SORT, + APPOINT_ANNEX @@ -66,7 +70,9 @@ #{END_FLAG}, #{ISDELETE}, #{PARENT_ID}, - #{FOREIGN_KEY} + #{FOREIGN_KEY}, + #{SORT}, + #{APPOINT_ANNEX} @@ -104,8 +110,10 @@ END_FLAG = #{END_FLAG}, ISDELETE = #{ISDELETE}, PARENT_ID = #{PARENT_ID}, - FOREIGN_ID = #{FOREIGN_ID}, + FOREIGN_KEY = #{FOREIGN_KEY}, STEP_NAME = #{STEP_NAME}, + SORT = #{SORT}, + APPOINT_ANNEX = #{APPOINT_ANNEX} where FLOW_DETAIL_ID = #{FLOW_DETAIL_ID} @@ -125,8 +133,25 @@ and a.PARENT_ID = #{PARENT_ID} - - and a.FOREIGN_ID = #{FOREIGN_ID} + + and a.FOREIGN_KEY = #{FOREIGN_KEY} + + + diff --git a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml index 978c5797..1c1b56e7 100644 --- a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml @@ -20,7 +20,9 @@ f.CREATOR_NAME, f.CREATOR_TIME, f.VALID_FLAG, - f.FOREIGN_KEY + f.FOREIGN_KEY, + f.ISDELETE, + f.END_FLAG @@ -31,7 +33,9 @@ CREATOR_NAME, CREATOR_TIME, VALID_FLAG, - FOREIGN_KEY + FOREIGN_KEY, + ISDELETE, + END_FLAG @@ -42,7 +46,9 @@ #{CREATOR_NAME}, #{CREATOR_TIME}, #{VALID_FLAG}, - #{FOREIGN_KEY} + #{FOREIGN_KEY}, + #{ISDELETE}, + #{END_FLAG} @@ -74,6 +80,8 @@ CREATOR_NAME = #{CREATOR_NAME}, CREATOR_TIME = #{CREATOR_TIME}, VALID_FLAG = #{VALID_FLAG}, + ISDELETE = #{ISDELETE}, + END_FLAG = #{END_FLAG}, FOREIGN_KEY = FOREIGN_KEY where FLOW_ID = #{FLOW_ID} @@ -87,5 +95,27 @@ and a.FOREIGN_KEY = #{FOREIGN_KEY} + + and a.TYPE = #{TYPE} + + + and a.VALID_FLAG = #{VALID_FLAG} + + + diff --git a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml new file mode 100644 index 00000000..5b7725af --- /dev/null +++ b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml @@ -0,0 +1,372 @@ + + + + + + xgf_flows + + + + f.FLOWS_ID, + f.FOREIGN_KEY_ID, + f.FOREIGN_KEY_NAME, + f.FLOWS_STEP, + f.FLOWS_TYPE, + f.IS_DELETE, + f.APPOINT_ZERO_CORP_ID, + f.APPOINT_ZERO_CORP_TYPE, + f.APPOINT_ZERO_CORP_NAME, + f.APPOINT_ZERO_DEPARTMENT_ID, + f.APPOINT_ZERO_DEPARTMENT_NAME, + f.APPOINT_ZERO_USER_ID, + f.APPOINT_ZERO_USER_NAME, + f.APPOINT_ZERO_STATUS, + f.APPOINT_ZERO_OPINION, + f.APPOINT_ZERO_TIME, + f.APPOINT_ONE_CORP_ID, + f.APPOINT_ONE_CORP_NAME, + f.APPOINT_ONE_CORP_TYPE, + f.APPOINT_ONE_DEPARTMENT_ID, + f.APPOINT_ONE_DEPARTMENT_NAME, + f.APPOINT_ONE_USER_ID, + f.APPOINT_ONE_USER_NAME, + f.APPOINT_ONE_STATUS, + f.APPOINT_ONE_OPINION, + f.APPOINT_ONE_TIME, + f.APPOINT_TWO_CORP_ID, + f.APPOINT_TWO_CORP_NAME, + f.APPOINT_TWO_CORP_TYPE, + f.APPOINT_TWO_DEPARTMENT_ID, + f.APPOINT_TWO_DEPARTMENT_NAME, + f.APPOINT_TWO_USER_ID, + f.APPOINT_TWO_USER_NAME, + f.APPOINT_TWO_STATUS, + f.APPOINT_TWO_OPINION, + f.APPOINT_TWO_TIME, + f.APPOINT_THREE_CORP_ID, + f.APPOINT_THREE_CORP_NAME, + f.APPOINT_THREE_CORP_TYPE, + f.APPOINT_THREE_DEPARTMENT_ID, + f.APPOINT_THREE_DEPARTMENT_NAME, + f.APPOINT_THREE_USER_ID, + f.APPOINT_THREE_USER_NAME, + f.APPOINT_THREE_STATUS, + f.APPOINT_THREE_OPINION, + f.APPOINT_THREE_TIME, + f.APPOINT_FOUR_CORP_ID, + f.APPOINT_FOUR_CORP_NAME, + f.APPOINT_FOUR_CORP_TYPE, + f.APPOINT_FOUR_DEPARTMENT_ID, + f.APPOINT_FOUR_DEPARTMENT_NAME, + f.APPOINT_FOUR_USER_ID, + f.APPOINT_FOUR_USER_NAME, + f.APPOINT_FOUR_STATUS, + f.APPOINT_FOUR_OPINION, + f.APPOINT_FIVE_CORP_ID, + f.APPOINT_FIVE_CORP_NAME, + f.APPOINT_FIVE_CORP_TYPE, + f.APPOINT_FIVE_DEPARTMENT_ID, + f.APPOINT_FIVE_DEPARTMENT_NAME, + f.APPOINT_FIVE_USER_ID, + f.APPOINT_FIVE_USER_NAME, + f.APPOINT_FIVE_STATUS, + f.APPOINT_FIVE_OPINION, + f.APPOINT_SIX_CORP_ID, + f.APPOINT_SIX_CORP_NAME, + f.APPOINT_SIX_CORP_TYPE, + f.APPOINT_SIX_DEPARTMENT_ID, + f.APPOINT_SIX_DEPARTMENT_NAME, + f.APPOINT_SIX_USER_ID, + f.APPOINT_SIX_USER_NAME, + f.APPOINT_SIX_STATUS, + f.APPOINT_SIX_OPINION, + f.APPOINT_SEVEN_CORP_ID, + f.APPOINT_SEVEN_CORP_NAME, + f.APPOINT_SEVEN_CORP_TYPE, + f.APPOINT_SEVEN_DEPARTMENT_ID, + f.APPOINT_SEVEN_DEPARTMENT_NAME, + f.APPOINT_SEVEN_USER_ID, + f.APPOINT_SEVEN_USER_NAME, + f.APPOINT_SEVEN_STATUS, + f.APPOINT_SEVEN_OPINION + + + + FLOWS_ID, + FOREIGN_KEY_ID, + FOREIGN_KEY_NAME, + FLOWS_STEP, + FLOWS_TYPE, + IS_DELETE, + APPOINT_ZERO_CORP_ID, + APPOINT_ZERO_CORP_TYPE, + APPOINT_ZERO_CORP_NAME, + APPOINT_ZERO_DEPARTMENT_ID, + APPOINT_ZERO_DEPARTMENT_NAME, + APPOINT_ZERO_USER_ID, + APPOINT_ZERO_USER_NAME, + APPOINT_ZERO_STATUS, + APPOINT_ZERO_OPINION, + APPOINT_ZERO_TIME, + APPOINT_ONE_CORP_ID, + APPOINT_ONE_CORP_NAME, + APPOINT_ONE_CORP_TYPE, + APPOINT_ONE_DEPARTMENT_ID, + APPOINT_ONE_DEPARTMENT_NAME, + APPOINT_ONE_USER_ID, + APPOINT_ONE_USER_NAME, + APPOINT_ONE_STATUS, + APPOINT_ONE_OPINION, + APPOINT_ONE_TIME, + APPOINT_TWO_CORP_ID, + APPOINT_TWO_CORP_NAME, + APPOINT_TWO_CORP_TYPE, + APPOINT_TWO_DEPARTMENT_ID, + APPOINT_TWO_DEPARTMENT_NAME, + APPOINT_TWO_USER_ID, + APPOINT_TWO_USER_NAME, + APPOINT_TWO_STATUS, + APPOINT_TWO_OPINION, + APPOINT_TWO_TIME, + APPOINT_THREE_CORP_ID, + APPOINT_THREE_CORP_NAME, + APPOINT_THREE_CORP_TYPE, + APPOINT_THREE_DEPARTMENT_ID, + APPOINT_THREE_DEPARTMENT_NAME, + APPOINT_THREE_USER_ID, + APPOINT_THREE_USER_NAME, + APPOINT_THREE_STATUS, + APPOINT_THREE_OPINION, + APPOINT_THREE_TIME, + APPOINT_FOUR_CORP_ID, + APPOINT_FOUR_CORP_NAME, + APPOINT_FOUR_CORP_TYPE, + APPOINT_FOUR_DEPARTMENT_ID, + APPOINT_FOUR_DEPARTMENT_NAME, + APPOINT_FOUR_USER_ID, + APPOINT_FOUR_USER_NAME, + APPOINT_FOUR_STATUS, + APPOINT_FOUR_OPINION, + APPOINT_FIVE_CORP_ID, + APPOINT_FIVE_CORP_NAME, + APPOINT_FIVE_CORP_TYPE, + APPOINT_FIVE_DEPARTMENT_ID, + APPOINT_FIVE_DEPARTMENT_NAME, + APPOINT_FIVE_USER_ID, + APPOINT_FIVE_USER_NAME, + APPOINT_FIVE_STATUS, + APPOINT_FIVE_OPINION, + APPOINT_SIX_CORP_ID, + APPOINT_SIX_CORP_NAME, + APPOINT_SIX_CORP_TYPE, + APPOINT_SIX_DEPARTMENT_ID, + APPOINT_SIX_DEPARTMENT_NAME, + APPOINT_SIX_USER_ID, + APPOINT_SIX_USER_NAME, + APPOINT_SIX_STATUS, + APPOINT_SIX_OPINION, + APPOINT_SEVEN_CORP_ID, + APPOINT_SEVEN_CORP_NAME, + APPOINT_SEVEN_CORP_TYPE, + APPOINT_SEVEN_DEPARTMENT_ID, + APPOINT_SEVEN_DEPARTMENT_NAME, + APPOINT_SEVEN_USER_ID, + APPOINT_SEVEN_USER_NAME, + APPOINT_SEVEN_STATUS, + APPOINT_SEVEN_OPINION + + + + #{FLOWS_ID}, + #{FOREIGN_KEY_ID}, + #{FOREIGN_KEY_NAME}, + #{FLOWS_STEP}, + #{FLOWS_TYPE}, + #{IS_DELETE}, + #{APPOINT_ZERO_CORP_ID}, + #{APPOINT_ZERO_CORP_TYPE}, + #{APPOINT_ZERO_CORP_NAME}, + #{APPOINT_ZERO_DEPARTMENT_ID}, + #{APPOINT_ZERO_DEPARTMENT_NAME}, + #{APPOINT_ZERO_USER_ID}, + #{APPOINT_ZERO_USER_NAME}, + #{APPOINT_ZERO_STATUS}, + #{APPOINT_ZERO_OPINION}, + #{APPOINT_ZERO_TIME}, + #{APPOINT_ONE_CORP_ID}, + #{APPOINT_ONE_CORP_NAME}, + #{APPOINT_ONE_CORP_TYPE}, + #{APPOINT_ONE_DEPARTMENT_ID}, + #{APPOINT_ONE_DEPARTMENT_NAME}, + #{APPOINT_ONE_USER_ID}, + #{APPOINT_ONE_USER_NAME}, + #{APPOINT_ONE_STATUS}, + #{APPOINT_ONE_OPINION}, + #{APPOINT_ONE_TIME}, + #{APPOINT_TWO_CORP_ID}, + #{APPOINT_TWO_CORP_NAME}, + #{APPOINT_TWO_CORP_TYPE}, + #{APPOINT_TWO_DEPARTMENT_ID}, + #{APPOINT_TWO_DEPARTMENT_NAME}, + #{APPOINT_TWO_USER_ID}, + #{APPOINT_TWO_USER_NAME}, + #{APPOINT_TWO_STATUS}, + #{APPOINT_TWO_OPINION}, + #{APPOINT_TWO_TIME}, + #{APPOINT_THREE_CORP_ID}, + #{APPOINT_THREE_CORP_NAME}, + #{APPOINT_THREE_CORP_TYPE}, + #{APPOINT_THREE_DEPARTMENT_ID}, + #{APPOINT_THREE_DEPARTMENT_NAME}, + #{APPOINT_THREE_USER_ID}, + #{APPOINT_THREE_USER_NAME}, + #{APPOINT_THREE_STATUS}, + #{APPOINT_THREE_OPINION}, + #{APPOINT_THREE_TIME}, + #{APPOINT_FOUR_CORP_ID}, + #{APPOINT_FOUR_CORP_NAME}, + #{APPOINT_FOUR_CORP_TYPE}, + #{APPOINT_FOUR_DEPARTMENT_ID}, + #{APPOINT_FOUR_DEPARTMENT_NAME}, + #{APPOINT_FOUR_USER_ID}, + #{APPOINT_FOUR_USER_NAME}, + #{APPOINT_FOUR_STATUS}, + #{APPOINT_FOUR_OPINION}, + #{APPOINT_FIVE_CORP_ID}, + #{APPOINT_FIVE_CORP_NAME}, + #{APPOINT_FIVE_CORP_TYPE}, + #{APPOINT_FIVE_DEPARTMENT_ID}, + #{APPOINT_FIVE_DEPARTMENT_NAME}, + #{APPOINT_FIVE_USER_ID}, + #{APPOINT_FIVE_USER_NAME}, + #{APPOINT_FIVE_STATUS}, + #{APPOINT_FIVE_OPINION}, + #{APPOINT_SIX_CORP_ID}, + #{APPOINT_SIX_CORP_NAME}, + #{APPOINT_SIX_CORP_TYPE}, + #{APPOINT_SIX_DEPARTMENT_ID}, + #{APPOINT_SIX_DEPARTMENT_NAME}, + #{APPOINT_SIX_USER_ID}, + #{APPOINT_SIX_USER_NAME}, + #{APPOINT_SIX_STATUS}, + #{APPOINT_SIX_OPINION}, + #{APPOINT_SEVEN_CORP_ID}, + #{APPOINT_SEVEN_CORP_NAME}, + #{APPOINT_SEVEN_CORP_TYPE}, + #{APPOINT_SEVEN_DEPARTMENT_ID}, + #{APPOINT_SEVEN_DEPARTMENT_NAME}, + #{APPOINT_SEVEN_USER_ID}, + #{APPOINT_SEVEN_USER_NAME}, + #{APPOINT_SEVEN_STATUS}, + #{APPOINT_SEVEN_OPINION} + + + + + insert into xgf_flows () values () + + + + + delete from xgf_flows where FLOWS_ID = #{FLOWS_ID} + + + + + update xgf_flows set + FLOWS_ID = #{FLOWS_ID}, + FOREIGN_KEY_ID = #{FOREIGN_KEY_ID}, + FOREIGN_KEY_NAME = #{FOREIGN_KEY_NAME}, + FLOWS_STEP = #{FLOWS_STEP}, + FLOWS_TYPE = #{FLOWS_TYPE}, + IS_DELETE = #{IS_DELETE}, + APPOINT_ZERO_CORP_ID = #{APPOINT_ZERO_CORP_ID}, + APPOINT_ZERO_CORP_TYPE = #{APPOINT_ZERO_CORP_TYPE}, + APPOINT_ZERO_CORP_NAME = #{APPOINT_ZERO_CORP_NAME}, + APPOINT_ZERO_DEPARTMENT_ID = #{APPOINT_ZERO_DEPARTMENT_ID}, + APPOINT_ZERO_DEPARTMENT_NAME = #{APPOINT_ZERO_DEPARTMENT_NAME}, + APPOINT_ZERO_USER_ID = #{APPOINT_ZERO_USER_ID}, + APPOINT_ZERO_USER_NAME = #{APPOINT_ZERO_USER_NAME}, + APPOINT_ZERO_STATUS = #{APPOINT_ZERO_STATUS}, + APPOINT_ZERO_OPINION = #{APPOINT_ZERO_OPINION}, + APPOINT_ZERO_TIME = #{APPOINT_ZERO_TIME}, + APPOINT_ONE_CORP_ID = #{APPOINT_ONE_CORP_ID}, + APPOINT_ONE_CORP_NAME = #{APPOINT_ONE_CORP_NAME}, + APPOINT_ONE_CORP_TYPE = #{APPOINT_ONE_CORP_TYPE}, + APPOINT_ONE_DEPARTMENT_ID = #{APPOINT_ONE_DEPARTMENT_ID}, + APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME}, + APPOINT_ONE_USER_ID = #{APPOINT_ONE_USER_ID}, + APPOINT_ONE_USER_NAME = #{APPOINT_ONE_USER_NAME}, + APPOINT_ONE_STATUS = #{APPOINT_ONE_STATUS}, + APPOINT_ONE_OPINION = #{APPOINT_ONE_OPINION}, + APPOINT_ONE_TIME = #{APPOINT_ONE_TIME}, + APPOINT_TWO_CORP_ID = #{APPOINT_TWO_CORP_ID}, + APPOINT_TWO_CORP_NAME = #{APPOINT_TWO_CORP_NAME}, + APPOINT_TWO_CORP_TYPE = #{APPOINT_TWO_CORP_TYPE}, + APPOINT_TWO_DEPARTMENT_ID = #{APPOINT_TWO_DEPARTMENT_ID}, + APPOINT_TWO_DEPARTMENT_NAME = #{APPOINT_TWO_DEPARTMENT_NAME}, + APPOINT_TWO_USER_ID = #{APPOINT_TWO_USER_ID}, + APPOINT_TWO_USER_NAME = #{APPOINT_TWO_USER_NAME}, + APPOINT_TWO_STATUS = #{APPOINT_TWO_STATUS}, + APPOINT_TWO_OPINION = #{APPOINT_TWO_OPINION}, + APPOINT_TWO_TIME = #{APPOINT_TWO_TIME}, + APPOINT_THREE_CORP_ID = #{APPOINT_THREE_CORP_ID}, + APPOINT_THREE_CORP_NAME = #{APPOINT_THREE_CORP_NAME}, + APPOINT_THREE_CORP_TYPE = #{APPOINT_THREE_CORP_TYPE}, + APPOINT_THREE_DEPARTMENT_ID = #{APPOINT_THREE_DEPARTMENT_ID}, + APPOINT_THREE_DEPARTMENT_NAME = #{APPOINT_THREE_DEPARTMENT_NAME}, + APPOINT_THREE_USER_ID = #{APPOINT_THREE_USER_ID}, + APPOINT_THREE_USER_NAME = #{APPOINT_THREE_USER_NAME}, + APPOINT_THREE_STATUS = #{APPOINT_THREE_STATUS}, + APPOINT_THREE_OPINION = #{APPOINT_THREE_OPINION}, + APPOINT_THREE_TIME = #{APPOINT_THREE_TIME}, + APPOINT_FOUR_CORP_ID = #{APPOINT_FOUR_CORP_ID}, + APPOINT_FOUR_CORP_NAME = #{APPOINT_FOUR_CORP_NAME}, + APPOINT_FOUR_CORP_TYPE = #{APPOINT_FOUR_CORP_TYPE}, + APPOINT_FOUR_DEPARTMENT_ID = #{APPOINT_FOUR_DEPARTMENT_ID}, + APPOINT_FOUR_DEPARTMENT_NAME = #{APPOINT_FOUR_DEPARTMENT_NAME}, + APPOINT_FOUR_USER_ID = #{APPOINT_FOUR_USER_ID}, + APPOINT_FOUR_USER_NAME = #{APPOINT_FOUR_USER_NAME}, + APPOINT_FOUR_STATUS = #{APPOINT_FOUR_STATUS}, + APPOINT_FOUR_OPINION = #{APPOINT_FOUR_OPINION}, + APPOINT_FIVE_CORP_ID = #{APPOINT_FIVE_CORP_ID}, + APPOINT_FIVE_CORP_NAME = #{APPOINT_FIVE_CORP_NAME}, + APPOINT_FIVE_CORP_TYPE = #{APPOINT_FIVE_CORP_TYPE}, + APPOINT_FIVE_DEPARTMENT_ID = #{APPOINT_FIVE_DEPARTMENT_ID}, + APPOINT_FIVE_DEPARTMENT_NAME = #{APPOINT_FIVE_DEPARTMENT_NAME}, + APPOINT_FIVE_USER_ID = #{APPOINT_FIVE_USER_ID}, + APPOINT_FIVE_USER_NAME = #{APPOINT_FIVE_USER_NAME}, + APPOINT_FIVE_STATUS = #{APPOINT_FIVE_STATUS}, + APPOINT_FIVE_OPINION = #{APPOINT_FIVE_OPINION}, + APPOINT_SIX_CORP_ID = #{APPOINT_SIX_CORP_ID}, + APPOINT_SIX_CORP_NAME = #{APPOINT_SIX_CORP_NAME}, + APPOINT_SIX_CORP_TYPE = #{APPOINT_SIX_CORP_TYPE}, + APPOINT_SIX_DEPARTMENT_ID = #{APPOINT_SIX_DEPARTMENT_ID}, + APPOINT_SIX_DEPARTMENT_NAME = #{APPOINT_SIX_DEPARTMENT_NAME}, + APPOINT_SIX_USER_ID = #{APPOINT_SIX_USER_ID}, + APPOINT_SIX_USER_NAME = #{APPOINT_SIX_USER_NAME}, + APPOINT_SIX_STATUS = #{APPOINT_SIX_STATUS}, + APPOINT_SIX_OPINION = #{APPOINT_SIX_OPINION}, + APPOINT_SEVEN_CORP_ID = #{APPOINT_SEVEN_CORP_ID}, + APPOINT_SEVEN_CORP_NAME = #{APPOINT_SEVEN_CORP_NAME}, + APPOINT_SEVEN_CORP_TYPE = #{APPOINT_SEVEN_CORP_TYPE}, + APPOINT_SEVEN_DEPARTMENT_ID = #{APPOINT_SEVEN_DEPARTMENT_ID}, + APPOINT_SEVEN_DEPARTMENT_NAME = #{APPOINT_SEVEN_DEPARTMENT_NAME}, + APPOINT_SEVEN_USER_ID = #{APPOINT_SEVEN_USER_ID}, + APPOINT_SEVEN_USER_NAME = #{APPOINT_SEVEN_USER_NAME}, + APPOINT_SEVEN_STATUS = #{APPOINT_SEVEN_STATUS}, + APPOINT_SEVEN_OPINION = #{APPOINT_SEVEN_OPINION} + where FLOWS_ID = #{FLOWS_ID} + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml index 0c1343c9..ed640710 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml @@ -63,7 +63,10 @@ f.IS_BF, f.IS_SOCIAL, f.SOCIAL_NUMBER, - f.zzName + f.zzName, + f.ANNEX, + f.ATTORNEY, + f.COMMITMENT_LETTER @@ -122,7 +125,10 @@ IS_BF, IS_SOCIAL, SOCIAL_NUMBER, - zzName + zzName, + ANNEX, + ATTORNEY, + COMMITMENT_LETTER @@ -181,7 +187,10 @@ #{IS_BF}, #{IS_SOCIAL}, #{SOCIAL_NUMBER}, - #{zzName} + #{zzName}, + #{ANNEX}, + #{ATTORNEY}, + #{COMMITMENT_LETTER} @@ -264,7 +273,10 @@ IS_BF = #{IS_BF}, IS_SOCIAL = #{IS_SOCIAL}, SOCIAL_NUMBER = #{SOCIAL_NUMBER}, - zzName = #{zzName} + zzName = #{zzName}, + ANNEX = #{ANNEX}, + ATTORNEY = #{ATTORNEY}, + COMMITMENT_LETTER = #{COMMITMENT_LETTER} where XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID} @@ -277,7 +289,7 @@ f where - f.XFG_USER_DETAILS_ID = #{XFG_USER_DETAILS_ID} + f.XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID} diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml index ddbff968..d3756fd4 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml @@ -21,7 +21,10 @@ f.STATUS, f.OPERATOR_TIME, f.ISFLOW, - f.STUDY_STATUS + f.STUDY_STATUS, + f.CHECK_STATUS, + f.CHECK_STEP, + f.LIMIT_END_TIME @@ -38,7 +41,10 @@ STATUS, OPERATOR_TIME, ISFLOW, - STUDY_STATUS + STUDY_STATUS, + CHECK_STATUS, + CHECK_STEP, + LIMIT_END_TIME @@ -55,7 +61,10 @@ #{STATUS}, #{OPERATOR_TIME}, #{ISFLOW}, - #{STUDY_STATUS} + #{STUDY_STATUS}, + #{CHECK_STATUS}, + #{CHECK_STEP}, + #{LIMIT_END_TIME} @@ -95,7 +104,10 @@ STATUS = #{STATUS}, OPERATOR_TIME = #{OPERATOR_TIME}, ISFLOW = #{ISFLOW}, - STUDY_STATUS = #{STUDY_STATUS} + STUDY_STATUS = #{STUDY_STATUS}, + CHECK_STATUS = #{CHECK_STATUS}, + CHECK_STEP = #{CHECK_STEP}, + LIMIT_END_TIME = #{LIMIT_END_TIME} where XGF_USER_ID = #{XGF_USER_ID} @@ -229,6 +241,9 @@ and a.VALID_FLAG = #{pd.VALID_FLAG} + + and a.CHECK_STATUS = #{pd.CHECK_STATUS} + + + diff --git a/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml b/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml index 3a2e2c88..a2b3204c 100644 --- a/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml +++ b/src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml @@ -510,5 +510,24 @@ where f.CODE = #{CODE} and ABS(TIMESTAMPDIFF(SECOND, f.OPERATTIME, #{OPERATTIME})) < 10; - + diff --git a/src/main/webapp/uploadFiles/file/userExcelTemplate2.xls b/src/main/webapp/uploadFiles/file/userExcelTemplate2.xls index 707f36eb..8b884d31 100644 Binary files a/src/main/webapp/uploadFiles/file/userExcelTemplate2.xls and b/src/main/webapp/uploadFiles/file/userExcelTemplate2.xls differ