pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/WEB-INF/aky/aky.properties | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/WEB-INF/gslab/gslab.properties | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/WEB-INF/xjdx/xjdx.properties | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/resources/images/新疆大学logo.png | 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/resources/images/新疆维吾尔自治区安全科学技术研究院logo.png | 补丁 | 查看 | 原始文档 | blame | 历史 |
pom.xml
@@ -484,6 +484,18 @@ <profile.active>zkdsz</profile.active> </properties> </profile> <profile> <id>xjdx</id> <properties> <profile.active>xjdx</profile.active> </properties> </profile> <profile> <id>aky</id> <properties> <profile.active>aky</profile.active> </properties> </profile> </profiles> <build> <finalName>smartlab</finalName> src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
@@ -118,6 +118,7 @@ AND f.user_id= #{user} WHERE f.id IS NOT NULL and sr.valid_flag = 1 and supplier.valid_flag = 1 and sr.type != 3 <if test="cas != null and cas != ''"> and sr.cas like concat("%", #{cas} ,"%") @@ -149,6 +150,7 @@ AND f.user_id = #{user} AND f.id IS NULL where sr.valid_flag = 1 and supplier.valid_flag = 1 and sr.type != 3 <if test="cas != null and cas != ''"> and sr.cas like concat("%", #{cas} ,"%") @@ -247,13 +249,12 @@ <select id="getSysReagentListNew" parameterType="java.util.Map" resultMap="SysReagent"> select sr.*, ss.meta_value as product_home_name, ifnull(w.reserve,0) as reserve, bm.meta_value as control_products_name,supplier.name as supplierName from sys_reagent as sr left join base_meta as ss on sr.product_home = ss.id left join base_meta bm on bm.id = sr.control_products left join (select reagent_id, sum(reserve) reserve from ope_warehouse_reserve where valid_flag = 1 group by reagent_id) w on w.reagent_id = sr.id left join sys_supplier supplier on supplier.id = sr.supplier_id where sr.valid_flag = 1 and supplier.valid_flag = 1 <if test="cas != null and cas != ''"> and sr.cas = #{cas} </if> @@ -299,6 +300,7 @@ left join sys_supplier supplier on supplier.id = sr.supplier_id LEFT JOIN favor f on f.reagent_id = sr.id AND f.user_id = #{user} where sr.valid_flag = 1 and supplier.valid_flag = 1 <if test="cas != null and cas != ''"> and sr.cas like concat("%", #{cas} ,"%") </if> @@ -316,7 +318,9 @@ <select id="getSysReagentTotalCountNew" parameterType="java.util.Map" resultType="int"> select count(1) from sys_reagent as sr LEFT JOIN sys_supplier ss on ss.id = sr.supplier_id where sr.valid_flag = 1 and ss.valid_flag = 1 <if test="cas != null and cas != ''"> and sr.cas = #{cas} </if> src/main/webapp/WEB-INF/aky/aky.properties
对比新文件 @@ -0,0 +1,10 @@ jdbc.url=jdbc:mysql://sinanoaq.com:23306/aky_smartlab?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false jdbc.username=root jdbc.password=NMS@uss20201! institute.id = institute.name =\u65B0\u7586\u7EF4\u543E\u5C14\u81EA\u6CBB\u533A\u5B89\u5168\u79D1\u5B66\u6280\u672F\u7814\u7A76\u9662 institute.url = http://aq.sinanoaq.com:8005 institute.app.id = institute.app.secret = alarm.url = src/main/webapp/WEB-INF/gslab/gslab.properties
@@ -1,4 +1,5 @@ jdbc.url=jdbc:mysql://192.168.0.228:3306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false #jdbc.url=jdbc:mysql://222.92.16.2:13306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false jdbc.username=root jdbc.password=Gslab@uss2021! src/main/webapp/WEB-INF/xjdx/xjdx.properties
对比新文件 @@ -0,0 +1,10 @@ jdbc.url=jdbc:mysql://sinanoaq.com:23306/xjdx_smartlab?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false jdbc.username=root jdbc.password=NMS@uss20201! institute.id = institute.name =\u65B0\u7586\u5927\u5B66 institute.url = http://aq.sinanoaq.com:8003 institute.app.id = institute.app.secret = alarm.url = src/main/webapp/resources/images/新疆大学logo.png
src/main/webapp/resources/images/新疆维吾尔自治区安全科学技术研究院logo.png