Skip to content

S
sxgjjapp
Commit 6e724271 authored by 华润's avatar 华润
Browse files
Options

数据库连接更改

parent 484d6f7d
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 59 deletions
.idea/workspace.xml
View file @ 6e724271
......@@ -25,24 +25,6 @@
</component>
<component name="ChangeListManager">
<list default="true" id="59d91216-f841-4441-8dfd-41c9f37310c6" name="Default Changelist" comment="数据库连接更改">
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-common/gjjapp-common-controller/gjjapp-common-controller.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-common/gjjapp-common-dao/gjjapp-common-dao.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-common/gjjapp-common-service/gjjapp-common-service.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-common/gjjapp-common.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-db/gjjapp-db.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-gedai/gjjapp-gedai-controller/gjjapp-gedai-controller.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-gedai/gjjapp-gedai-core/gjjapp-gedai-core.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-gedai/gjjapp-gedai-dao/gjjapp-gedai-dao.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-gedai/gjjapp-gedai-service/gjjapp-gedai-service.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-gedai/gjjapp-gedai.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-web/cd4japp-web.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-web/gjjapp-web.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-zhfwpt/gjjapp-zhfwpt-controller/gjjapp-zhfwpt-controller.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-zhfwpt/gjjapp-zhfwpt-core/gjjapp-zhfwpt-core.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-zhfwpt/gjjapp-zhfwpt-dao/gjjapp-zhfwpt-dao.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-zhfwpt/gjjapp-zhfwpt-service/gjjapp-zhfwpt-service.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp-zhfwpt/gjjapp-zhfwpt.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../$RECYCLE.BIN/S-1-5-21-504193650-2407936575-1522015057-1001/$RQPRRCV/gjjapp.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../gjjserver_java/gjjapp/gjjapp-common/gjjapp-common-controller/gjjapp-common-controller.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../gjjserver_java/gjjapp/gjjapp-common/gjjapp-common-dao/gjjapp-common-dao.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../gjjserver_java/gjjapp/gjjapp-common/gjjapp-common-service/gjjapp-common-service.iml" afterDir="false" />
......@@ -356,6 +338,7 @@
<change beforePath="$PROJECT_DIR$/../gjjapp/gjjapp-zhfwpt/gjjapp-zhfwpt-service/src/main/java/com/changda/gjjapp/zhfwpt/service/impl/tyfb/TyfbxwInfoImp.java" beforeDir="false" afterPath="$PROJECT_DIR$/../gjjapp/gjjapp-zhfwpt/gjjapp-zhfwpt-service/src/main/java/com/changda/gjjapp/zhfwpt/service/impl/tyfb/TyfbxwInfoImp.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../gjjapp/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../gjjapp/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gjjapp-zhfwpt/gjjapp-zhfwpt-dao/src/main/resources/mappings/WJDC.xml" beforeDir="false" afterPath="$PROJECT_DIR$/gjjapp-zhfwpt/gjjapp-zhfwpt-dao/src/main/resources/mappings/WJDC.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../新建文件夹 (6)/hbzdmhxm.jar" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
......@@ -492,6 +475,8 @@
<workItem from="1619146474603" duration="6687000" />
<workItem from="1619157172869" duration="885000" />
<workItem from="1619158082371" duration="9523000" />
<workItem from="1619170062071" duration="229000" />
<workItem from="1619311100509" duration="6061000" />
</task>
<task id="LOCAL-00001" summary="222">
<created>1617244899238</created>
......@@ -556,7 +541,14 @@
<option name="project" value="LOCAL" />
<updated>1619157134380</updated>
</task>
<option name="localTasksCounter" value="10" />
<task id="LOCAL-00010" summary="数据库连接更改">
<created>1619170119743</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1619170119744</updated>
</task>
<option name="localTasksCounter" value="11" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -596,86 +588,86 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="740" y="260" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1619159676966" />
<state width="1591" height="379" key="GridCell.Tab.0.bottom" timestamp="1619170027555">
<state width="1591" height="445" key="GridCell.Tab.0.bottom" timestamp="1619332473212">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1591" height="379" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1619170027555" />
<state width="1591" height="379" key="GridCell.Tab.0.center" timestamp="1619170027555">
<state width="1591" height="445" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1619332473212" />
<state width="1591" height="445" key="GridCell.Tab.0.center" timestamp="1619332473212">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1591" height="379" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1619170027555" />
<state width="1591" height="379" key="GridCell.Tab.0.left" timestamp="1619170027555">
<state width="1591" height="445" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1619332473212" />
<state width="1591" height="445" key="GridCell.Tab.0.left" timestamp="1619332473212">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1591" height="379" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1619170027555" />
<state width="1591" height="379" key="GridCell.Tab.0.right" timestamp="1619170027555">
<state width="1591" height="445" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1619332473212" />
<state width="1591" height="445" key="GridCell.Tab.0.right" timestamp="1619332473212">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1591" height="379" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1619170027555" />
<state width="1591" height="379" key="GridCell.Tab.1.bottom" timestamp="1619170027556">
<state width="1591" height="445" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1619332473212" />
<state width="1591" height="445" key="GridCell.Tab.1.bottom" timestamp="1619332473212">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1591" height="379" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1619170027556" />
<state width="1591" height="379" key="GridCell.Tab.1.center" timestamp="1619170027555">
<state width="1591" height="445" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1619332473212" />
<state width="1591" height="445" key="GridCell.Tab.1.center" timestamp="1619332473212">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1591" height="379" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1619170027555" />
<state width="1591" height="379" key="GridCell.Tab.1.left" timestamp="1619170027555">
<state width="1591" height="445" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1619332473212" />
<state width="1591" height="445" key="GridCell.Tab.1.left" timestamp="1619332473212">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1591" height="379" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1619170027555" />
<state width="1591" height="379" key="GridCell.Tab.1.right" timestamp="1619170027555">
<state width="1591" height="445" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1619332473212" />
<state width="1591" height="445" key="GridCell.Tab.1.right" timestamp="1619332473212">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1591" height="379" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1619170027555" />
<state width="1591" height="379" key="GridCell.Tab.2.bottom" timestamp="1619170027557">
<state width="1591" height="445" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1619332473212" />
<state width="1591" height="445" key="GridCell.Tab.2.bottom" timestamp="1619332472985">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1591" height="379" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1619170027557" />
<state width="1591" height="379" key="GridCell.Tab.2.center" timestamp="1619170027557">
<state width="1591" height="445" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1619332472985" />
<state width="1591" height="445" key="GridCell.Tab.2.center" timestamp="1619332472985">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1591" height="379" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1619170027557" />
<state width="1591" height="379" key="GridCell.Tab.2.left" timestamp="1619170027556">
<state width="1591" height="445" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1619332472985" />
<state width="1591" height="445" key="GridCell.Tab.2.left" timestamp="1619332472985">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1591" height="379" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1619170027556" />
<state width="1591" height="379" key="GridCell.Tab.2.right" timestamp="1619170027557">
<state width="1591" height="445" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1619332472985" />
<state width="1591" height="445" key="GridCell.Tab.2.right" timestamp="1619332472985">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1591" height="379" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1619170027557" />
<state width="1591" height="379" key="GridCell.Tab.3.bottom" timestamp="1619170027558">
<state width="1591" height="445" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1619332472985" />
<state width="1591" height="445" key="GridCell.Tab.3.bottom" timestamp="1619332472985">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1591" height="379" key="GridCell.Tab.3.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1619170027558" />
<state width="1591" height="379" key="GridCell.Tab.3.center" timestamp="1619170027557">
<state width="1591" height="445" key="GridCell.Tab.3.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1619332472985" />
<state width="1591" height="445" key="GridCell.Tab.3.center" timestamp="1619332472985">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1591" height="379" key="GridCell.Tab.3.center/0.0.1920.1040@0.0.1920.1040" timestamp="1619170027557" />
<state width="1591" height="379" key="GridCell.Tab.3.left" timestamp="1619170027557">
<state width="1591" height="445" key="GridCell.Tab.3.center/0.0.1920.1040@0.0.1920.1040" timestamp="1619332472985" />
<state width="1591" height="445" key="GridCell.Tab.3.left" timestamp="1619332472985">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1591" height="379" key="GridCell.Tab.3.left/0.0.1920.1040@0.0.1920.1040" timestamp="1619170027557" />
<state width="1591" height="379" key="GridCell.Tab.3.right" timestamp="1619170027557">
<state width="1591" height="445" key="GridCell.Tab.3.left/0.0.1920.1040@0.0.1920.1040" timestamp="1619332472985" />
<state width="1591" height="445" key="GridCell.Tab.3.right" timestamp="1619332472985">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1591" height="379" key="GridCell.Tab.3.right/0.0.1920.1040@0.0.1920.1040" timestamp="1619170027557" />
<state width="1591" height="445" key="GridCell.Tab.3.right/0.0.1920.1040@0.0.1920.1040" timestamp="1619332472985" />
<state x="440" y="94" key="SettingsEditor" timestamp="1619160553285">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="440" y="94" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1619160553285" />
<state x="552" y="252" key="Vcs.Push.Dialog.v2" timestamp="1619157137207">
<state x="552" y="252" key="Vcs.Push.Dialog.v2" timestamp="1619170122581">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="552" y="252" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1619157137207" />
<state x="662" y="252" width="596" height="536" key="find.popup" timestamp="1619156797927">
<state x="552" y="252" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1619170122581" />
<state x="662" y="252" width="596" height="536" key="find.popup" timestamp="1619332627161">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="662" y="252" width="596" height="536" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1619156797927" />
<state x="632" y="306" key="git4idea.merge.GitPullDialog" timestamp="1619154883958">
<state x="662" y="252" width="596" height="536" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1619332627161" />
<state x="632" y="306" key="git4idea.merge.GitPullDialog" timestamp="1619332850632">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="632" y="306" key="git4idea.merge.GitPullDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1619154883958" />
<state x="632" y="306" key="git4idea.merge.GitPullDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1619332850632" />
<state x="711" y="398" key="git4idea.remote.GitConfigureRemotesDialog" timestamp="1619146498710">
<screen x="0" y="0" width="1920" height="1040" />
</state>
......
gjjapp-zhfwpt/gjjapp-zhfwpt-dao/src/main/resources/mappings/WJDC.xml
View file @ 6e724271
......@@ -114,7 +114,7 @@
</insert>
<select id="sreachTSINFO" resultType="com.changda.gjjapp.db.entity.M_TSXQ">
select iscl,jsbh,s_qdzd.qdmc,a.tsid,a.tslxid,a.issh,a.bt,a.tsnr,a.yhxm,a.yhdh,a.tssj,a.sfcl,NVL (a.GRZH, ' ') grzh,a.qdid,nvl(a.hfsj,' ') hfsj,a.sfyc,b.lxmc,nvl(a.hfnr,' ') hfnr from s_qdzd,zhfw80.m_tsxq a inner join zhfw80.s_tslx b on a.tslxid=b.tslxid
select iscl,jsbh,s_qdzd.qdmc,a.tsid,a.tslxid,a.issh,a.bt,a.tsnr,a.yhxm,a.yhdh,a.tssj,a.sfcl,NVL (a.GRZH, ' ') grzh,a.qdid,nvl(a.hfsj,' ') hfsj,a.sfyc,b.lxmc,nvl(a.hfnr,' ') hfnr from s_qdzd,sxzhfw80.m_tsxq a inner join sxzhfw80.s_tslx b on a.tslxid=b.tslxid
where a.qdid = s_qdzd.qdid and b.zlx=#{zlx}
<if test="issh != null and issh !=''">and a.issh = #{issh} </if>
<if test="sfcl != null and sfcl !=''">and a.sfcl = #{sfcl} </if>
......@@ -128,7 +128,7 @@
</select>
<select id="sreachISHF" resultType="com.changda.gjjapp.db.entity.M_TSXQ">
select jsbh,s_qdzd.qdmc,a.tsid,a.tslxid,a.issh,a.bt,a.tsnr,a.yhxm,a.yhdh,a.tssj,a.sfcl,NVL (a.GRZH, ' ') grzh,a.qdid,nvl(a.hfsj,' ') hfsj,a.sfyc,b.lxmc,nvl(a.hfnr,' ') hfnr from s_qdzd,zhfw80.m_tsxq a inner join zhfw80.s_tslx b on a.tslxid=b.tslxid
select jsbh,s_qdzd.qdmc,a.tsid,a.tslxid,a.issh,a.bt,a.tsnr,a.yhxm,a.yhdh,a.tssj,a.sfcl,NVL (a.GRZH, ' ') grzh,a.qdid,nvl(a.hfsj,' ') hfsj,a.sfyc,b.lxmc,nvl(a.hfnr,' ') hfnr from s_qdzd,sxzhfw80.m_tsxq a inner join sxzhfw80.s_tslx b on a.tslxid=b.tslxid
where a.qdid = s_qdzd.qdid
<if test="tsid != null and tsid !=''">and a.tsid = #{tsid} </if>
order by tssj desc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment