Skip to content

A
Aidea
Commit 7783dd67 authored by 谢希宇's avatar 谢希宇
Browse files
Options

Aidea product update by Strive Date 2020-10-14

parent a2a1b5d2
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
aidea-modules/consult-module/target/classes/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @ 7783dd67
...@@ -147,17 +147,20 @@ ...@@ -147,17 +147,20 @@
SELECT COUNT(1) FROM t_aidea_consult_sheet a SELECT COUNT(1) FROM t_aidea_consult_sheet a
LEFT JOIN t_qyuser b ON b.id = a.doctor_id LEFT JOIN t_qyuser b ON b.id = a.doctor_id
LEFT JOIN t_qyuser c ON c.id = a.customer_id LEFT JOIN t_qyuser c ON c.id = a.customer_id
LEFT JOIN `user` u ON u.userid = b.id
<include refid="sqlWhere"/> <include refid="sqlWhere"/>
</select> </select>
<select id="fetchSearchByPage" parameterType="java.util.Map" resultMap="resultMap"> <select id="fetchSearchByPage" parameterType="java.util.Map" resultMap="resultMap">
SELECT SELECT
<include refid="sqlColumns"/> <include refid="sqlColumns"/>
FROM t_aidea_consult_sheet a FROM t_aidea_consult_sheet a
LEFT JOIN t_qyuser b ON b.id = a.doctor_id LEFT JOIN t_qyuser b ON b.id = a.doctor_id
LEFT JOIN t_qyuser c ON c.id = a.customer_id LEFT JOIN t_qyuser c ON c.id = a.customer_id
LEFT JOIN `user` u ON u.userid = b.id
<include refid="sqlWhere"/> <include refid="sqlWhere"/>
<if test="id!=null"> ${id} = b.id </if>
<if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if> <if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>
<if test="limit>0">limit #{offset},#{limit}</if> <if test="limit>0">limit #{offset},#{limit}</if>
</select> </select>
......
membercard-modules/pom.xml
View file @ 7783dd67
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<module>membercard-module</module> <module>membercard-module</module>
<module>membercard-module-web</module> <module>membercard-module-web</module>
<module>shipping-address-module</module> <module>shipping-address-module</module>
<module>shipping-address-web</module>
</modules> </modules>
<dependencies> <dependencies>
......
membercard-modules/shipping-address-web/pom.xml
View file @ 7783dd67
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<artifactId>shipping-address-web</artifactId> <artifactId>shipping-address-web</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>shipping-address-web Maven Webapp</name> <name>shipping-address-web Maven Webapp</name>
<version>1.0-SNAPSHOT</version>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<dependencies> <dependencies>
<dependency> <dependency>
...@@ -30,7 +29,4 @@ ...@@ -30,7 +29,4 @@
<build> <build>
<finalName>shipping-address-web</finalName> <finalName>shipping-address-web</finalName>
</build> </build>
</project> </project>
\ No newline at end of file
membercard-modules/shipping-address-web/src/main/webapp/WEB-INF/views/address/addresslist.html
View file @ 7783dd67
...@@ -78,28 +78,29 @@ ...@@ -78,28 +78,29 @@
<div class="box"> <div class="box">
<div class="box-header"> <div class="box-header">
<form id="seachTableForm" action="#springUrl('/a/address/list')" method="get"> <form id="seachTableForm" action="#springUrl('/a/address/list')" method="get">
<div class="col-xs-5"> <div class="col-xs-2">
<div class="col-xs-2" style=" display: flex"> <input type="text" class="form-control required"
<input style="width: 100px ; height: 41px" type="text" class="form-control required"
id="addressName" name="addressName" placeholder="患者姓名"> id="addressName" name="addressName" placeholder="患者姓名">
&nbsp;&nbsp; &nbsp; </div>
<select style="width: 100px" id="province" name="cityId" onchange="getCityList(this.value)"> <div class="col-xs-2" >
<select id="province" name="cityId" onchange="getCityList(this.value)" class="form-control required">
<option value="">请选择省份</option> <option value="">请选择省份</option>
</select> </select>
&nbsp;&nbsp; </div>
<select id="city" name="cityId" onchange="getReginList(this.value);"> <div class="col-xs-2" >
<select id="city" name="cityId" onchange="getReginList(this.value);" class="form-control required">
<option value="">请选择城市</option> <option value="">请选择城市</option>
</select> </select>
&nbsp;&nbsp; </div>
<select id="county" name="areaId"> <div class="col-xs-2" >
<select id="county" name="areaId" class="form-control required">
<option value="">请选择区/县</option> <option value="">请选择区/县</option>
</select> </select>
&nbsp;&nbsp; </div>
<!-- href="javascript:void(0)"--> <div class="col-xs-2">
#if($shiro.hasPermission("qy:address:view")) #if($shiro.hasPermission("qy:address:view"))
<a href="javascript:void(0)" class="btn btn-primary search">搜索</a> <a href="javascript:void(0)" class="btn btn-primary search">搜索</a>
#end #end
</div> </div>
<!-- #if($shiro.hasPermission("qy:address:edit"))--> <!-- #if($shiro.hasPermission("qy:address:edit"))-->
...@@ -107,7 +108,6 @@ ...@@ -107,7 +108,6 @@
<!-- <a href="#springUrl('/a/address/exportExcel')" class="btn btn-primary">导出</a>--> <!-- <a href="#springUrl('/a/address/exportExcel')" class="btn btn-primary">导出</a>-->
<!-- <a onclick="importExcel();" class="btn btn-primary">导入</a>--> <!-- <a onclick="importExcel();" class="btn btn-primary">导入</a>-->
<!-- #end--> <!-- #end-->
</div>
</form> </form>
</div><!-- /.box-header --> </div><!-- /.box-header -->
<div class="box-body"> <div class="box-body">
......
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