Skip to content

A
Aidea
Commit 6c482644 authored by 黎聪聪's avatar 黎聪聪
Browse files
Options

粉丝会员管理

parent 777d4661
Show whitespace changes
Inline Side-by-side
Showing with 85 additions and 87 deletions
aidea-modules/consult-module-web/src/main/webapp/WEB-INF/views/consultSheet/consultSheetform.html
View file @ 6c482644
......@@ -169,7 +169,7 @@
class="form-control" name="doctorName"
id="doctorName" readonly="readonly"
maxlength="50" placeholder="药师姓名"
value="$!{data.doctorName}"
value="$!{data.pharmaName}"
>
<label>客服姓名<font style="color: red"></font></label>
<input type="text"
......
aidea-modules/consult-module-web/src/main/webapp/WEB-INF/views/consultSheet/consultSheetlist.html
View file @ 6c482644
......@@ -80,7 +80,7 @@
<div class="col-xs-5">
<div class="col-xs-2">
<input type="text" class="form-control required"
name="doctorName" placeholder="用药人姓名">
name="userName" placeholder="用药人姓名">
</div>
<div class="col-xs-2">
<input type="text" class="form-control required"
......@@ -236,7 +236,7 @@
"mData": "allergy"
},
{
"mData": "doctorName"
"mData": "pharmaName"
},
{
"mData": "customerName"
......@@ -349,7 +349,7 @@
},
{
"aTargets": [9],
"mData": "doctorName",
"mData": "pharmaName",
"mRender": function (a, b, c, d) {
if(a){
return a;
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @ 6c482644
......@@ -26,8 +26,7 @@
<result column="allergy" property="allergy"/>
<result column="symptom" property="symptom"/>
<result column="diagnosis" property="diagnosis"/>
<result column="doctor_name" property="doctorName"/>
<result column="customer_name" property="customerName"/>
</resultMap>
<sql id="sqlWhere">
......@@ -58,65 +57,40 @@
</sql>
<sql id="sqlColumns">
aidea.id,
aidea.consult_id,
aidea.user_name,
aidea.number_id,
aidea.benebit_id,
aidea.sex,
aidea.iphone,
aidea.past_records,
aidea.prescription,
aidea.doctor_id,
aidea.customer_id,
aidea.illness,
aidea.accounts_id,
aidea.del_flag,
aidea.status,
aidea.create_time,
aidea.update_time,
aidea.description,
aidea.create_by,
aidea.update_by,
aidea.allergy,
aidea.symptom,
aidea.diagnosis,
USER.doctor_name,
USER.customer_name
a.id,
a.consult_id,
a.user_name,
a.number_id,
a.benebit_id,
a.sex,
a.iphone,
a.past_records,
a.prescription,
a.doctor_id,
a.customer_id,
a.illness,
a.accounts_id,
a.del_flag,
a.STATUS,
a.create_time,
a.update_time,
a.description,
a.create_by,
a.update_by,
a.allergy,
a.symptom,
a.diagnosis,
b.`name` pharmaName,
c.`name` customerName
</sql>
<sql id="sqlColumn">
id,
consult_id,
user_name,
number_id,
benebit_id,
sex,
iphone,
past_records,
prescription,
doctor_id,
customer_id,
illness,
accounts_id,
del_flag,
status,
create_time,
update_time,
description,
create_by,
update_by,
allergy,
symptom,
diagnosis,
</sql>
<insert id="save" parameterType="com.cftech.consultsheet.model.ConsultSheet" useGeneratedKeys="true"
keyProperty="id">
insert into t_aidea_consult_sheet
(
<include refid="sqlColumn"/>
<include refid="sqlColumns"/>
)
values
(
......@@ -152,14 +126,16 @@
<select id="fetchById" parameterType="java.lang.Long" resultMap="resultMap">
SELECT
<include refid="sqlColumns"/>
FROM t_aidea_consult_sheet aidea LEFT JOIN t_qyuser USER ON aidea.doctor_id = USER.doctor_id AND
aidea.customer_id = USER.customer_id
WHERE aidea.id=#{id}
FROM t_aidea_consult_sheet a
LEFT JOIN t_qyuser b ON b.id = a.doctor_id
LEFT JOIN t_qyuser c ON c.id = a.customer_id
WHERE a.id=#{id}
</select>
<select id="count" parameterType="java.util.Map" resultType="java.lang.Integer">
SELECT COUNT(1) FROM t_aidea_consult_sheet aidea LEFT JOIN t_qyuser USER ON aidea.doctor_id = USER.doctor_id AND
aidea.customer_id = USER.customer_id
SELECT COUNT(1) FROM t_aidea_consult_sheet a
LEFT JOIN t_qyuser b ON b.id = a.doctor_id
LEFT JOIN t_qyuser c ON c.id = a.customer_id
<include refid="sqlWhere"/>
</select>
......@@ -167,9 +143,9 @@
<select id="fetchSearchByPage" parameterType="java.util.Map" resultMap="resultMap">
SELECT
<include refid="sqlColumns"/>
FROM t_aidea_consult_sheet aidea
LEFT JOIN t_qyuser USER ON aidea.doctor_id = USER.doctor_id AND
aidea.customer_id = USER.customer_id
FROM t_aidea_consult_sheet a
LEFT JOIN t_qyuser b ON b.id = a.doctor_id
LEFT JOIN t_qyuser c ON c.id = a.customer_id
<include refid="sqlWhere"/>
<if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>
<if test="limit>0">limit #{offset},#{limit}</if>
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/model/ConsultSheetVO.java
View file @ 6c482644
......@@ -46,9 +46,10 @@ public class ConsultSheetVO {
/* 药师姓名*/
@ExportConfig(value = "药师姓名", width = 100, showLevel = 1)
private String doctorName;
private String pharmaName;
/* 客服姓名*/
@ExportConfig(value = "客服姓名", width = 100, showLevel = 1)
private String customerName;
}
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/model/UserSheet.java
View file @ 6c482644
......@@ -13,8 +13,10 @@ import org.omg.CORBA.PRIVATE_MEMBER;
public class UserSheet {
/* 药师姓名*/
@ExportConfig(value = "药师姓名", width = 100, showLevel = 1)
private String doctorName;
private String pharmaName;
/* 客服姓名*/
@ExportConfig(value = "客服姓名", width = 100, showLevel = 1)
private String customerName;
}
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/web/ConsultSheetController.java
View file @ 6c482644
......@@ -154,16 +154,16 @@ public class ConsultSheetController {
public JSONObject listData(int iDisplayStart, int iDisplayLength, ConsultSheet consultSheet, HttpServletRequest request) {
Long accountsId = UserUtils.getmpaccounts(request);
Conds conds = new Conds();
if (!StringUtils.isEmpty(consultSheet.getDoctorName())){
conds.like("USER.doctor_name",consultSheet.getDoctorName());
if (!StringUtils.isEmpty(consultSheet.getUserName())){
conds.like("a.user_name",consultSheet.getUserName());
}
if (!StringUtils.isEmpty(consultSheet.getIllness())){
conds.like("aidea.illness",consultSheet.getIllness());
conds.like("a.illness",consultSheet.getIllness());
}
conds.equal("aidea.del_flag", Constants.DEL_FLAG_0);
conds.equal("aidea.accounts_id", accountsId);
Sort sort = new Sort("aidea.create_time", OrderType.DESC);
conds.equal("a.del_flag", Constants.DEL_FLAG_0);
conds.equal("a.accounts_id", accountsId);
Sort sort = new Sort("a.create_time", OrderType.DESC);
List<ConsultSheet> list = consultSheetService.fetchSearchByPage(conds, sort, iDisplayStart, iDisplayLength);
Integer counts = consultSheetService.count(conds);
......@@ -194,9 +194,9 @@ public class ConsultSheetController {
@RequiresPermissions(value = CONSULTSHEET_VIEW)
public void exportExcel(HttpServletRequest request, HttpServletResponse response) {
Long accountId = UserUtils.getmpaccounts(request);
Sort sort = new Sort("aidea.create_time", OrderType.ASC);
Sort sort = new Sort("a.create_time", OrderType.ASC);
Conds conds = new Conds();
conds.equal("aidea.del_flag", 0);
conds.equal("a.del_flag", 0);
List<ConsultSheet> list = consultSheetService.fetchSearchByPage(conds, sort, 0, 0);
List<ConsultSheetVO> consultSheetVOS = new LinkedList<>();
......@@ -210,7 +210,7 @@ public class ConsultSheetController {
consultSheetVO.setIllness(consultSheet.getIllness());
consultSheetVO.setAllergy(consultSheet.getAllergy());
consultSheetVO.setStatus(consultSheet.getStatus().equals("0") ? "未审核" : consultSheet.getStatus().equals("1") ? "已通过" : "已拒绝");
consultSheetVO.setDoctorName(consultSheet.getDoctorName());
consultSheetVO.setPharmaName(consultSheet.getPharmaName());
consultSheetVO.setCustomerName(consultSheet.getCustomerName());
consultSheetVOS.add(consultSheetVO);
}
......
membercard-modules/member-module-web/src/main/webapp/WEB-INF/views/member/memberlist.html
View file @ 6c482644
......@@ -309,12 +309,17 @@
"aTargets":[6],
"mData":"source",
"mRender":function(a,b,c,d){
if (a==1){
return "普通关注";
}else if (a==2){
return "医师二维码";
}else if (a==3){
return "客服二维码";
}else if(a==4){
return "医生二维码";
}else if(a==5){
return "组织二维码";
}else{
return "";
}
......
membercard-modules/member-module/src/main/java/com/cftech/member/web/MemberController.java
View file @ 6c482644
......@@ -300,6 +300,12 @@ public class MemberController {
memberDto.setSource("药师二维码");
} else if ("3".equals(memberDto.getSource())) {
memberDto.setSource("客服二维码");
}else if("4".equals(memberDto.getSource())){
memberDto.setSource("医生二维码");
}else if("5".equals(memberDto.getSource())){
memberDto.setSource("组织二维码");
}else {
memberDto.setSource("");
}
Date parse = simpleDateFormat.parse(memberDto.getCreateTime());
memberDto.setCreateTime(simpleDateFormat.format(parse));
......
mp-modules/mp-fanss-module-web/src/main/webapp/WEB-INF/views/managefans/fansslist.html
View file @ 6c482644
......@@ -556,8 +556,15 @@
return "医师二维码";
}else if (a==3){
return "客服二维码";
}else if(a==4){
return "医生二维码";
}else if(a==5){
return "组织二维码";
}else{
return "";
}
}
}, {
"aTargets": [8],
......
mp-modules/mp-fanss-module/src/main/java/com/cftech/mp/fans/controller/MpFanssController.java
View file @ 6c482644
......@@ -155,7 +155,7 @@ public class MpFanssController {
mpFanssVO.setProvince(fanssEntity.getProvince());
mpFanssVO.setCity(fanssEntity.getCity());
mpFanssVO.setNickname(fanssEntity.getNickname());
mpFanssVO.setSource(fanssEntity.getSource().equals("1") ? "普通关注" : fanssEntity.getSource().equals("2") ? "医师二维码" : "客服二维码");
mpFanssVO.setSource(fanssEntity.getSource().equals("1") ? "普通关注" : fanssEntity.getSource().equals("2") ? "医师二维码" : fanssEntity.getSource().equals("3") ? "客服二维码" :fanssEntity.getSource().equals("4") ? "医生二维码" :"组织二维码");
mpFanssVO.setSubscribetime( simpleDateFormat.format(fanssEntity.getSubscribetime()));
list.add(mpFanssVO);
......
mp-modules/mp-promotion-module-web/src/main/webapp/WEB-INF/views/qrCode/qrCodelist.html
View file @ 6c482644
......@@ -268,15 +268,16 @@
"aTargets": [3],
"mData": "content_source",
"mRender": function (a, b, c, d) {//a表示createtime对应的值，c表示当前记录行对象
var viewHTML = '';
var imgs = new Array();
imgs = a.split(",");
for (var i = 0; i < imgs.length; i++) {
if (imgs[i] != "") {
viewHTML += '<img style="margin-right:5px;" src="' + imgs[i] + '" alt="" width="80" height="80" />';
}
}
return viewHTML;
// var viewHTML = '';
// var imgs = new Array();
// imgs = a.split(",");
// for (var i = 0; i < imgs.length; i++) {
// if (imgs[i] != "") {
// viewHTML += '<img style="margin-right:5px;" src="' + imgs[i] + '" alt="" width="80" height="80" />';
// }
// }
return a;
}
},
......
mp-modules/mp-promotion-module/src/main/java/com/cftech/mp/qrcode/web/QrCodeController.java
View file @ 6c482644
......@@ -106,7 +106,7 @@ public class QrCodeController {
Long accountsId = UserUtils.getmpaccounts(request);
Conds conds = new Conds();
conds.equal("del_flag", Constants.DEL_FLAG_0);
conds.equal("accounts_id", accountsId);
conds.equal("accountsid", accountsId);
Sort sort = new Sort("create_time", OrderType.DESC);
List<QrCode> list = qrCodeService.fetchSearchByPage(conds, sort, iDisplayStart, iDisplayLength);
......
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