Skip to content

A
Aidea
Commit 95be5746 authored by 谢希宇's avatar 谢希宇
Browse files
Options

Aidea product update by Strive Date 2020-10-29

parent 749b5b27
Show whitespace changes
Inline Side-by-side
Showing with 752 additions and 605 deletions
aidea-modules/consult-module-web/src/main/webapp/WEB-INF/views/consultSheet/consultSheetform.html
View file @ 95be5746
...@@ -53,23 +53,37 @@ ...@@ -53,23 +53,37 @@
<div class="wrapper"> <div class="wrapper">
<div class="content-wrapper" style="margin-left:0;"> <div class="content-wrapper" style="margin-left:0;">
<div id="dialog" style="display: none;width: 600px;height: 400px;border: solid white 1px;background: #ffffff;position: fixed;z-index: 2;left:25%;bottom:30%">
<div style="width: 600px;height: 50px;background: ghostwhite;">
<span style="line-height: 50px;padding-left: 30px;font-weight: bold">审核未通过原因</span>
</div>
<div style="padding-left: 120px;padding-top: 50px">
<textarea rows="10" cols="50" id="descriptionAdd">
</textarea> <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="exampleModalLabel" style="font-weight: 700;">咨询单拒绝原由</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<form>
<!--<div class="form-group">-->
<!--<label for="recipient-name" class="col-form-label">Recipient:</label>-->
<!--<input type="text" class="form-control" id="recipient-name">-->
<!--</div>-->
<div class="form-group">
<label for="message-text" class="col-form-label">请输入拒绝原由:</label>
<textarea class="form-control" rows="3" id="message-text"></textarea>
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-primary" onclick="review()">提交</button>
</div>
</div> </div>
<div style="padding-top: 15px;width: 100%;border-bottom: black solid 1px" ></div>
<div style="padding-left: 100px;padding-top: 20px">
<input type="button" style="width: 200.4px" class="btn btn-primary" id="confo" onclick="review() " value="确认" >&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
<input style="width: 200.4px" type="button" id="close" class="btn btn-primary" id="close" value="关闭" onclick="closeHide()">
</div> </div>
</div> </div>
<section class="content-header"> <section class="content-header">
<h1> <h1>
咨询单管理 咨询单管理
...@@ -93,7 +107,11 @@ ...@@ -93,7 +107,11 @@
<div class="box-body"> <div class="box-body">
<div class="form-group form-md-line-input"> <div class="panel panel-primary">
<div class="panel-heading">基础信息</div>
<div class="panel-body">
<div class="form-group form-md-line-input col-xs-5">
<label>咨询单编码<font style="color: red"></font></label> <label>咨询单编码<font style="color: red"></font></label>
<input type="text" <input type="text"
class="form-control" name="consultId" class="form-control" name="consultId"
...@@ -101,26 +119,29 @@ ...@@ -101,26 +119,29 @@
maxlength="50" placeholder="用药人姓名" maxlength="50" placeholder="用药人姓名"
value="$!{data.consultId}" value="$!{data.consultId}"
> >
<!-- <div--> </div>
<!-- class="form-control" name="consultId"--> <!-- <div-->
<!-- id="consultId"--> <!-- class="form-control" name="consultId"-->
<!-- style="height: 68px;background: #EEEEEE"--> <!-- id="consultId"-->
<!-- >$!{data.consultId}</div>--> <!-- style="height: 68px;background: #EEEEEE"-->
<label>用药人姓名<font style="color: red"></font></label> <!-- >$!{data.consultId}</div>-->
<div class="form-group form-md-line-input col-xs-5">
<label>用药人姓名</label>
<input type="text" <input type="text"
class="form-control" name="userName" class="form-control" name="userName"
id="userName" readonly="readonly" id="userName" readonly="readonly"
maxlength="50" placeholder="用药人姓名" maxlength="50" placeholder="用药人姓名"
value="$!{data.userName}" value="$!{data.userName}"
> >
<!-- <label>身份证号<font style="color: red"></font></label>--> </div>
<!-- <input type="text"--> <!-- <label>身份证号<font style="color: red"></font></label>-->
<!-- class="form-control" name="numberId"--> <!-- <input type="text"-->
<!-- id="numberId" readonly="readonly"--> <!-- class="form-control" name="numberId"-->
<!-- maxlength="50" placeholder="身份证号"--> <!-- id="numberId" readonly="readonly"-->
<!-- value="$!{data.numberId}"--> <!-- maxlength="50" placeholder="身份证号"-->
<!-- >--> <!-- value="$!{data.numberId}"-->
<!-- >-->
<div class="form-group form-md-line-input col-xs-5">
<label>性别<font style="color: red"></font></label> <label>性别<font style="color: red"></font></label>
<input type="text" <input type="text"
class="form-control" name="sex" class="form-control" name="sex"
...@@ -128,36 +149,90 @@ ...@@ -128,36 +149,90 @@
maxlength="50" placeholder="" maxlength="50" placeholder=""
value="$!{data.sex}" value="$!{data.sex}"
> >
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>联系方式<font style="color: red"></font></label> <label>联系方式<font style="color: red"></font></label>
<input type="text" <input type="text"
class="form-control" name="iPhone" class="form-control" name="iPhone"
id="iPhone" readonly="readonly" id="iPhone" readonly="readonly"
maxlength="50" placeholder="联系方式" maxlength="50" placeholder="联系方式"
value="$!{data.iPhone}" value="$!{data.phone}"
> >
</div>
</div>
</div>
<div class="panel panel-primary">
<div class="panel-heading">订单信息</div>
<div class="panel-body">
<div class="form-group form-md-line-input col-xs-10">
<label>审核状态<font style="color: red"></font></label>
<input type="text"
class="form-control" name="status"
id="status" readonly="readonly"
maxlength="50" placeholder="status"
value="$!{data.status}"
>
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>处方单<font style="color: red"></font></label>
<br/>
<div class="form-group " id="imageurl"
style=" width: 130px; height: 120px;margin-left: 5px; padding :10px ;background-color :#f4f4f4; border: 1px solid #CCCCCC">
<img style="cursor:zoom-in; width: 108px;height: 100% "
src="$!{data.prescription}" onclick="imgcli(this)">
</div>
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>审核未通过原因<font style="color: red"></font></label>
<div
class="form-control" name="description"
id="description"
maxlength="50"
style="height: 68px;background: #EEEEEE"
>$!{data.description}
</div>
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>疾病史<font style="color: red"></font></label> <label>疾病史<font style="color: red"></font></label>
<div <div
class="form-control" name="pastRecords" class="form-control" name="pastRecords"
id="pastRecords" id="pastRecords"
maxlength="50" maxlength="50"
style="height: 68px;background: #EEEEEE" style="height: 68px;background: #EEEEEE"
>$!{data.pastRecords}</div> >$!{data.pastRecords}
</div>
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>过敏史<font style="color: red"></font></label> <label>过敏史<font style="color: red"></font></label>
<div <div
class="form-control" name="allergy" class="form-control" name="allergy"
id="allergy" id="allergy"
maxlength="50" maxlength="50"
style="height: 68px;background: #EEEEEE" style="height: 68px;background: #EEEEEE"
>$!{data.allergy}</div> >$!{data.allergy}
</div>
<label>处方单<font style="color: red"></font></label>
<br/>
<div class="form-group " id="imageurl" style=" width: 130px; height: 120px;margin-left: 5px; padding :10px ;background-color :#f4f4f4; border: 1px solid #CCCCCC">
<img style="cursor:zoom-in; width: 108px;height: 100% " src="$!{data.prescription}" onclick="imgcli(this)">
</div> </div>
<div class="form-group form-md-line-input col-xs-5">
<label>病情描述<font style="color: red"></font></label>
<div
class="form-control" name="illness"
id="illness"
maxlength="50"
style="height: 68px;background: #EEEEEE"
>$!{data.illness}
</div>
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>药师姓名<font style="color: red"></font></label> <label>药师姓名<font style="color: red"></font></label>
<input type="text" <input type="text"
class="form-control" name="doctorName" class="form-control" name="doctorName"
...@@ -165,6 +240,9 @@ ...@@ -165,6 +240,9 @@
maxlength="50" placeholder="药师姓名" maxlength="50" placeholder="药师姓名"
value="$!{data.pharmaName}" value="$!{data.pharmaName}"
> >
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>客服姓名<font style="color: red"></font></label> <label>客服姓名<font style="color: red"></font></label>
<input type="text" <input type="text"
class="form-control" name="customerName" class="form-control" name="customerName"
...@@ -172,36 +250,17 @@ ...@@ -172,36 +250,17 @@
maxlength="50" placeholder="客服姓名" maxlength="50" placeholder="客服姓名"
value="$!{data.customerName}" value="$!{data.customerName}"
> >
<label>病情描述<font style="color: red"></font></label> </div>
<div
class="form-control" name="illness"
id="illness"
maxlength="50"
style="height: 68px;background: #EEEEEE"
>$!{data.illness}</div>
<label>审核状态<font style="color: red"></font></label>
<input type="text"
class="form-control" name="status"
id="status" readonly="readonly"
maxlength="50" placeholder="status"
value="$!{data.status}"
>
<label>备注(审核未通过原因)<font style="color: red"></font></label>
<div
class="form-control" name="description"
id="description"
maxlength="50"
style="height: 68px;background: #EEEEEE"
>$!{data.description}</div>
</div> </div>
</div>
<div class="box-footer"> <div class="box-footer">
#if($shiro.hasPermission("qy:consultSheet:edit")) #if($shiro.hasPermission("qy:consultSheet:edit"))
<input class="btn btn-info" id="save" value="通过" type="submit"> <input class="btn btn-info" id="save" value="通过" type="submit">
#end #end
<a id="reject" class="btn btn-danger" onclick="beizhu()">拒绝</a> <a id="reject" class="btn btn-danger" data-toggle="modal" data-target="#exampleModal">拒绝</a>
<a href="#springUrl('/a/consultSheet/list')" class="btn btn-default">返回</a> <a href="#springUrl('/a/consultSheet/list')" class="btn btn-default">返回</a>
</div> </div>
...@@ -221,8 +280,10 @@ ...@@ -221,8 +280,10 @@
immediately after the control sidebar --> immediately after the control sidebar -->
<div class="control-sidebar-bg"></div> <div class="control-sidebar-bg"></div>
</div><!-- ./wrapper --> </div><!-- ./wrapper -->
<div id="divimg" style="cursor:zoom-out;background: rgba(0,0,0,.6);width:100%;height:100%;position: absolute;z-index: 9999;left: 0;top: 0;display: none" onclick="hide()"> <div id="divimg"
<img style="width: 50%;margin-left: 30%; "> style="cursor:zoom-out;background: rgba(0,0,0,.6);width:100%;position: absolute;z-index: 9999;left: 0;top: 0;display: none"
onclick="hide()">
<img style="width: 50%;margin-left: 25%; ">
</div> </div>
<script src="plugins/jQuery/jQuery-2.1.4.min.js"></script> <script src="plugins/jQuery/jQuery-2.1.4.min.js"></script>
<!-- Bootstrap 3.3.5 --> <!-- Bootstrap 3.3.5 -->
...@@ -250,15 +311,8 @@ ...@@ -250,15 +311,8 @@
<!-- END PAGE LEVEL PLUGINS --> <!-- END PAGE LEVEL PLUGINS -->
<script> <script>
var consultid var consultid;
function beizhu() {
$("#dialog").show();
}
function closeHide(){
$("#dialog").hide();
}
// href="#springUrl('/a/consultSheet/list')" // href="#springUrl('/a/consultSheet/list')"
$().ready(function () { $().ready(function () {
...@@ -290,9 +344,11 @@ ...@@ -290,9 +344,11 @@
}); });
$('#divimg').click(function(){$(this).fadeOut(200)}) $('#divimg').click(function () {
$(this).fadeOut(200)
})
function imgcli(obj) { function imgcli(obj) {
console.log($(obj).attr("src")) $('#divimg').height($('.content-wrapper').height())
$('#divimg').fadeIn(200); $('#divimg').fadeIn(200);
$('#divimg img').attr('src', $(obj).attr("src")); $('#divimg img').attr('src', $(obj).attr("src"));
$('#divimg img').css("margin-top", "10%") $('#divimg img').css("margin-top", "10%")
...@@ -303,62 +359,73 @@ ...@@ -303,62 +359,73 @@
$("#hide").hide(); $("#hide").hide();
} }
function review() { function review() {
var url = "#springUrl('/a/consultSheet/updateData')"; var url = "#springUrl('/a/consultSheet/updateData')";
var descriptionAdd = $("#descriptionAdd").val(); var descriptionAdd = $("#message-text").text();
var aadata ={ var aadata = {
consultId : consultid, consultId: consultid,
status : "2", status: "2",
description : descriptionAdd description: descriptionAdd
}; };
$.ajax({ $.ajax({
url:url, url: url,
data:aadata, data: aadata,
type:"GET", type: "GET",
success:function(data){ success: function (data) {
if(data.errorNo==1){ if (data.errorNo == 0) {
alert("拒绝成功"); Cfapp.alert({
message: "拒绝成功",
btntext: "确定",
success: function () {
location.href = "#springUrl('/a/consultSheet/list')" location.href = "#springUrl('/a/consultSheet/list')"
}else if (data.errorNo==0){ }
alert("拒绝失败"); });
} else {
Cfapp.alert({
message: "审批失败",
btntext: "确定",
success: function () {
location.href = "#springUrl('/a/consultSheet/list')" location.href = "#springUrl('/a/consultSheet/list')"
} }
});
}
} }
}); });
} }
var recdTypeAdd = function () { var recdTypeAdd = function () {
var initForm = function () { var initForm = function () {
var initFormCtrl = function () { var initFormCtrl = function () {
bindEvent(); bindEvent();
}; };
var bindEvent = function () { var bindEvent = function () {
$("#myForm").validate({ $("#myForm").validate({
rules: {}, rules: {},
messages: {}, messages: {},
submitHandler: function (form) { submitHandler: function (form) {
// $("#save").attr("disabled", true); // $("#save").attr("disabled", true);
// var dataJSON = $("#myForm").serialize(); // var dataJSON = $("#myForm").serialize();
var dataJSON = {};
dataJSON.consultId = $("#consultId").val();
dataJSON.status = "1";
$.getJSON("#springUrl('/a/consultSheet/updateStatus')",dataJSON , function (returnobj) {
// $("#save").attr("disabled", false);
if (returnobj.errorNo == 1) { //保存成功
Cfapp.confirm({ Cfapp.confirm({
message: "确定审核通过吗",
btnoktext: "确定",
btncanceltext: "取消",
success: function () {
var dataJSON = {
"consultId": $("#consultId").val(),
"status": "1"
};
$.getJSON("#springUrl('/a/consultSheet/updateStatus')", dataJSON, function (returnobj) {
// $("#save").attr("disabled", false);
if (returnobj.errorNo == 0) { //保存成功
Cfapp.alert({
message: "审核成功", message: "审核成功",
btncanceltext: "关闭", btntext: "确定",
success: function () { success: function () {
location.href = "#springUrl('/a/consultSheet/list')"; location.href = "#springUrl('/a/consultSheet/list')";
},
cancel: function () {
location.href = "#springUrl('/a/consultSheet/list')";
} }
}); });
} else if (returnobj.errorNo == 0) { //修改成功 } else if (returnobj.errorNo == 1) { //修改成功
Cfapp.alert({ Cfapp.alert({
message: "审核失败", message: "审核失败",
btntext: "确定", btntext: "确定",
...@@ -368,6 +435,12 @@ ...@@ -368,6 +435,12 @@
}); });
} }
}); });
},
cancel: function () {
return;
}
});
} }
}) })
} }
......
aidea-modules/consult-module-web/src/main/webapp/WEB-INF/views/consultSheet/consultSheetlist.html
View file @ 95be5746
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<th>药师姓名</th> <th>药师姓名</th>
<th>客服姓名</th> <th>客服姓名</th>
<th>审核状态</th> <th>审核状态</th>
<th>备注(审核未通过原因)</th> <th>拒绝原由</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
"mData": "sex" "mData": "sex"
}, },
{ {
"mData": "iphone" "mData": "phone"
}, },
{ {
"mData": "pastRecords" "mData": "pastRecords"
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @ 95be5746
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
<result column="user_name" property="userName"/> <result column="user_name" property="userName"/>
<result column="number_id" property="numberId"/> <result column="number_id" property="numberId"/>
<result column="sex" property="sex"/> <result column="sex" property="sex"/>
<result column="iphone" property="iPhone"/> <result column="phone" property="phone"/>
<result column="past_records" property="pastRecords"/> <result column="past_records" property="pastRecords"/>
<result column="prescription" property="Prescription"/> <result column="prescription" property="prescription"/>
<result column="doctor_id" property="doctorId"/> <result column="doctor_id" property="doctorId"/>
<result column="customer_id" property="customerId"/> <result column="customer_id" property="customerId"/>
<result column="illness" property="illness"/> <result column="illness" property="illness"/>
...@@ -61,10 +61,10 @@ ...@@ -61,10 +61,10 @@
<sql id="sqlColumns"> <sql id="sqlColumns">
a.id, a.id,
a.consult_id, a.consult_id,
CONVERT(AES_DECRYPT(a.user_name,'aideakey') USING UTF8) , CONVERT(AES_DECRYPT(a.user_name,'aideakey') USING UTF8) user_name,
CONVERT(AES_DECRYPT(a.number_id,'aideakey') USING UTF8) , CONVERT(AES_DECRYPT(a.number_id,'aideakey') USING UTF8) number_id,
a.sex, a.sex,
CONVERT(AES_DECRYPT(a.iphone,'aideakey') USING UTF8) , CONVERT(AES_DECRYPT(a.phone,'aideakey') USING UTF8) phone,
a.past_records, a.past_records,
a.prescription, a.prescription,
a.doctor_id, a.doctor_id,
...@@ -90,24 +90,47 @@ ...@@ -90,24 +90,47 @@
</sql> </sql>
<insert id="save" parameterType="com.cftech.consultsheet.model.ConsultSheet" useGeneratedKeys="true" <insert id="save" parameterType="com.cftech.consultsheet.model.ConsultSheet" useGeneratedKeys="true"
keyProperty="id"> keyProperty="id">
insert into t_aidea_consult_sheet insert into t_aidea_consult_sheet
( (
<include refid="sqlColumns"/> id,
consult_id,
user_name ,
number_id,
sex,
phone,
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,
open_id,
drugs_id,
member_id,
order_id
) )
values values
( (
#{id, jdbcType=BIGINT} #{id, jdbcType=BIGINT},
#{consultId, jdbcType=VARCHAR}, #{consultId, jdbcType=VARCHAR},
AES_ENCRYPT(#{userName, jdbcType=VARBINARY},'aideakey'), AES_ENCRYPT(#{userName, jdbcType=VARBINARY},'aideakey'),
AES_ENCRYPT(#{numberId, jdbcType=VARBINARY},'aideakey'), AES_ENCRYPT(#{numberId, jdbcType=VARBINARY},'aideakey'),
now(),
#{sex, jdbcType=BIGINT}, #{sex, jdbcType=BIGINT},
AES_ENCRYPT(#{iPhone, jdbcType=VARBINARY},'aideakey'), AES_ENCRYPT(#{phone, jdbcType=VARBINARY},'aideakey'),
#{pastRecords, jdbcType=VARCHAR}, #{pastRecords, jdbcType=VARCHAR},
#{Prescription, jdbcType=VARCHAR}, #{prescription, jdbcType=VARCHAR},
#{doctorId, jdbcType=BIGINT}, #{doctorId, jdbcType=BIGINT},
#{customerId, jdbcType=BIGINT}, #{customerId, jdbcType=BIGINT},
#{illness, jdbcType=BIGINT}, #{illness, jdbcType=BIGINT},
...@@ -120,11 +143,9 @@ ...@@ -120,11 +143,9 @@
#{createBy, jdbcType=BIGINT}, #{createBy, jdbcType=BIGINT},
#{updateBy, jdbcType=BIGINT}, #{updateBy, jdbcType=BIGINT},
#{allergy, jdbcType=VARCHAR}, #{allergy, jdbcType=VARCHAR},
#{updateBy, jdbcType=VARCHAR}, #{symptom, jdbcType=VARCHAR},
#{diagnosis,jdbcType=BIGINT} #{diagnosis,jdbcType=BIGINT},
#{doctorName, jdbcType=VARCHAR}, #{openId, jdbcType=VARCHAR},
#{customerName,jdbcType=BIGINT},
#{openId,jdbcType=VARCHAR},
#{drugsId,jdbcType=BIGINT}, #{drugsId,jdbcType=BIGINT},
#{memberId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT},
#{orderId,jdbcType=BIGINT} #{orderId,jdbcType=BIGINT}
...@@ -156,7 +177,7 @@ ...@@ -156,7 +177,7 @@
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
<include refid="sqlWhere"/> <include refid="sqlWhere"/>
<if test="id!=null">and (a.doctor_id = ${id} or a.customer_id =${id} ) </if> <if test="id!=null">and (a.doctor_id = ${id} or a.customer_id =${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>
...@@ -167,13 +188,11 @@ ...@@ -167,13 +188,11 @@
<if test="id != null"> <if test="id != null">
id = #{id, jdbcType=BIGINT}, id = #{id, jdbcType=BIGINT},
</if> </if>
<if test="consultId != null"> <if test="consultId != null">
consult_id = #{consultId, jdbcType=VARCHAR}, consult_id = #{consultId, jdbcType=VARCHAR},
</if> </if>
<if test="userName != null"> <if test="userName != null">
user_name = AES_ENCRYPT(#{userName, jdbcType=VARBINARY},'aideakey'),
user_name = AES_ENCRYPT( #{userName, jdbcType=VARBINARY},'aideakey'),
</if> </if>
<if test="numberId != null"> <if test="numberId != null">
number_id = AES_ENCRYPT(#{numberId, jdbcType=VARBINARY},'aideakey'), number_id = AES_ENCRYPT(#{numberId, jdbcType=VARBINARY},'aideakey'),
...@@ -182,14 +201,14 @@ ...@@ -182,14 +201,14 @@
<if test="sex != null"> <if test="sex != null">
sex = #{sex, jdbcType=BIGINT}, sex = #{sex, jdbcType=BIGINT},
</if> </if>
<if test="iPhone != null"> <if test="phone != null">
iphone = AES_ENCRYPT(#{iPhone, jdbcType=VARBINARY},'aideakey'), phone = AES_ENCRYPT(#{phone, jdbcType=VARBINARY},'aideakey'),
</if> </if>
<if test="pastRecords != null"> <if test="pastRecords != null">
past_records = #{pastRecords, jdbcType=VARCHAR}, past_records = #{pastRecords, jdbcType=VARCHAR},
</if> </if>
<if test="Prescription != null"> <if test="prescription != null">
prescription = #{Prescription, jdbcType=VARCHAR}, prescription = #{prescription, jdbcType=VARCHAR},
</if> </if>
<if test="doctorId != null"> <if test="doctorId != null">
doctor_id = #{doctorId, jdbcType=BIGINT}, doctor_id = #{doctorId, jdbcType=BIGINT},
...@@ -249,7 +268,8 @@ ...@@ -249,7 +268,8 @@
<update id="delete" parameterType="java.lang.Long"> <update id="delete" parameterType="java.lang.Long">
update t_aidea_consult_sheet set del_flag=1 where id=#{id,jdbcType=BIGINT} update t_aidea_consult_sheet set del_flag=1 where id=#{id,jdbcType=BIGINT}
</update> </update>
<update id="updateDate" >
<update id="updateDate">
update t_aidea_consult_sheet update t_aidea_consult_sheet
<set> <set>
<if test="status !=null"> <if test="status !=null">
...@@ -261,6 +281,7 @@ ...@@ -261,6 +281,7 @@
</set> </set>
where consult_id = #{consultId} where consult_id = #{consultId}
</update> </update>
<update id="updateStatus"> <update id="updateStatus">
update t_aidea_consult_sheet update t_aidea_consult_sheet
<set> <set>
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/model/ConsultSheet.java
View file @ 95be5746
...@@ -30,31 +30,28 @@ public class ConsultSheet extends UserSheet implements Serializable { ...@@ -30,31 +30,28 @@ public class ConsultSheet extends UserSheet implements Serializable {
private String userName; private String userName;
/* 身份证号 */ /* 身份证号 */
private String numberId; private String numberId;
// /* 出生年月 */
// @JSONField(format = "yyyy-MM-dd")
// private Date benebitId;
/* 性别 */ /* 性别 */
@ExportConfig(value = "性别", width = 100, showLevel = 1) @ExportConfig(value = "性别", width = 100, showLevel = 1)
private Long sex; private Long sex;
/* 手机号 */ /* 手机号 */
@ExportConfig(value = "联系电话", width = 100, showLevel = 1) @ExportConfig(value = "联系电话", width = 100, showLevel = 1)
private Long iPhone; private String phone;
/* 疾病史 */ /* 疾病史 */
@ExportConfig(value = "疾病史", width = 100, showLevel = 1) @ExportConfig(value = "疾病史", width = 100, showLevel = 1)
private String pastRecords; private String pastRecords;
/* 过敏史 */
@ExportConfig(value = "过敏史", width = 100, showLevel = 1)
private String allergy;
/* 病情描述 */
@ExportConfig(value = "病情描述", width = 100, showLevel = 1)
private String illness;
/* 处方单 */ /* 处方单 */
@ExportConfig(value = "处方单", width = 100, showLevel = 1) @ExportConfig(value = "处方单", width = 100, showLevel = 1)
private String Prescription; private String prescription;
/* 药师id */ /* 药师id */
private Long doctorId; private Long doctorId;
/* 客服id */ /* 客服id */
private Long customerId; private Long customerId;
/* 病情描述 */
@ExportConfig(value = "病情描述", width = 100, showLevel = 1)
private String illness;
/* 过敏史 */
@ExportConfig(value = "过敏史", width = 100, showLevel = 1)
private String allergy;
/* 本次确认症状 */ /* 本次确认症状 */
private String symptom; private String symptom;
/*是否已在医院确诊*/ /*是否已在医院确诊*/
...@@ -70,16 +67,19 @@ public class ConsultSheet extends UserSheet implements Serializable { ...@@ -70,16 +67,19 @@ public class ConsultSheet extends UserSheet implements Serializable {
private Date createTime; private Date createTime;
/* 更新时间 */ /* 更新时间 */
private Date updateTime; private Date updateTime;
/* 备注 */ /* 是否勾选处方单真实性声明 0:未勾选 1:勾选 */
private String description; private String description;
/* 创建人 */ /* 创建人 */
private Long createBy; private Long createBy;
/* 更新人 */ /* 更新人 */
private Long updateBy; private Long updateBy;
/* 粉丝id */
private String openId; private String openId;
/* 药品id */
private Long drugsId; private Long drugsId;
/* 会员id */
private Long memberId; private Long memberId;
/* 订单id */
private Long orderId; private Long orderId;
public ConsultSheet() { public ConsultSheet() {
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/model/ConsultSheetVO.java
View file @ 95be5746
...@@ -27,7 +27,7 @@ public class ConsultSheetVO { ...@@ -27,7 +27,7 @@ public class ConsultSheetVO {
/* 手机号 */ /* 手机号 */
@ExportConfig(value = "联系电话", width = 100, showLevel = 1) @ExportConfig(value = "联系电话", width = 100, showLevel = 1)
private Long phone; private String phone;
/* 疾病史 */ /* 疾病史 */
@ExportConfig(value = "疾病史", width = 100, showLevel = 1) @ExportConfig(value = "疾病史", width = 100, showLevel = 1)
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/ConsultSheetService.java
View file @ 95be5746
...@@ -26,4 +26,5 @@ public interface ConsultSheetService extends GenericService<ConsultSheet> { ...@@ -26,4 +26,5 @@ public interface ConsultSheetService extends GenericService<ConsultSheet> {
* @param consultSheet * @param consultSheet
*/ */
JSONObject pollingConsultSheet(ConsultSheet consultSheet); JSONObject pollingConsultSheet(ConsultSheet consultSheet);
} }
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/impl/ConsultSheetServiceImpl.java
View file @ 95be5746
...@@ -2,6 +2,7 @@ package com.cftech.consultsheet.service.impl; ...@@ -2,6 +2,7 @@ package com.cftech.consultsheet.service.impl;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.cftech.base.codingrule.utils.CodingruleUtils;
import com.cftech.base.org.model.Qyuser; import com.cftech.base.org.model.Qyuser;
import com.cftech.base.org.service.QyuserService; import com.cftech.base.org.service.QyuserService;
import com.cftech.consultsheet.dao.ConsultSheetMapper; import com.cftech.consultsheet.dao.ConsultSheetMapper;
...@@ -17,11 +18,9 @@ import com.cftech.core.util.StringUtils; ...@@ -17,11 +18,9 @@ import com.cftech.core.util.StringUtils;
import com.cftech.member.model.Member; import com.cftech.member.model.Member;
import com.cftech.member.service.MemberService; import com.cftech.member.service.MemberService;
import com.cftech.order.service.OrderService; import com.cftech.order.service.OrderService;
import com.cftech.sys.model.User;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -49,6 +48,9 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im ...@@ -49,6 +48,9 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
@Autowired @Autowired
private QyuserService qyuserService; private QyuserService qyuserService;
@Autowired
private CodingruleUtils codingruleUtils;
@Override @Override
public GenericDao<ConsultSheet> getGenericMapper() { public GenericDao<ConsultSheet> getGenericMapper() {
return consultSheetMapper; return consultSheetMapper;
...@@ -78,19 +80,23 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im ...@@ -78,19 +80,23 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
return consultSheetMapper.fetchSearchByPage(params); return consultSheetMapper.fetchSearchByPage(params);
} }
@Transactional
@Override @Override
public JSONObject pollingConsultSheet(ConsultSheet consultSheet) { public JSONObject pollingConsultSheet(ConsultSheet consultSheet) {
JSONObject retObj = new JSONObject(); JSONObject retObj = new JSONObject();
try { try {
//consultSheet.setNumberId(codingruleUtils.getNumber(consultSheet.getAccountsId(), ConsultSheet.class.getName()));
consultSheet.setConsultId(codingruleUtils.getNumber(consultSheet.getAccountsId(), ConsultSheet.class.getName()));
if (consultSheetMapper.save(consultSheet) > 0) { if (consultSheetMapper.save(consultSheet) > 0) {
memberProcess(consultSheet.getOpenId(), consultSheet);
}
retObj.put("errerNo", 0); retObj.put("errerNo", 0);
retObj.put("data", 0); retObj.put("errerMsg", "咨询单提交成功，请等待药师审核");
//memberProcess(consultSheet.getOpenId(), consultSheet);
} else {
retObj.put("errrNo", 1);
retObj.put("errorMsg", "咨询单保存失败");
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
retObj.put("errrNo", 1); retObj.put("errrNo", 1);
retObj.put("errorMsg", "提交咨询单" + e.getMessage()); retObj.put("errorMsg", "提交咨询单" + e.getMessage());
} }
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/web/ConsultSheetController.java
View file @ 95be5746
...@@ -109,18 +109,16 @@ public class ConsultSheetController { ...@@ -109,18 +109,16 @@ public class ConsultSheetController {
@ResponseBody @ResponseBody
public JSONObject updateData( String consultId, String status,String description ,HttpServletRequest request) { public JSONObject updateData( String consultId, String status,String description ,HttpServletRequest request) {
JSONObject rtnJson = new JSONObject(); JSONObject rtnJson = new JSONObject();
Conds conds = new Conds();
try { try {
if (!StringUtils.isEmpty(consultId) && !StringUtils.isEmpty(status) && !StringUtils.isEmpty(description)) { if (!StringUtils.isEmpty(consultId) && !StringUtils.isEmpty(status) && !StringUtils.isEmpty(description)) {
Integer integer = consultSheetService.updateDate(consultId, status, description); Integer integer = consultSheetService.updateDate(consultId, status, description);
if (integer>0){ if (integer>0){
rtnJson.put("errorNo", 1); rtnJson.put("errorNo", 0);
} }
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
rtnJson.put("errorNo", 0); rtnJson.put("errorNo", 1);
} }
return rtnJson; return rtnJson;
} }
...@@ -130,18 +128,16 @@ public class ConsultSheetController { ...@@ -130,18 +128,16 @@ public class ConsultSheetController {
@ResponseBody @ResponseBody
public JSONObject updateStatus(String consultId, String status, HttpServletRequest request) { public JSONObject updateStatus(String consultId, String status, HttpServletRequest request) {
JSONObject rtnJson = new JSONObject(); JSONObject rtnJson = new JSONObject();
Conds conds = new Conds();
try { try {
if (!StringUtils.isEmpty(consultId) && !StringUtils.isEmpty(status) ) { if (!StringUtils.isEmpty(consultId) && !StringUtils.isEmpty(status) ) {
Integer integer = consultSheetService.updateStatus(consultId, status); Integer integer = consultSheetService.updateStatus(consultId, status);
if (integer>0){ if (integer>0){
rtnJson.put("errorNo", 1); rtnJson.put("errorNo", 0);
} }
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
rtnJson.put("errorNo", 0); rtnJson.put("errorNo", 1);
} }
return rtnJson; return rtnJson;
} }
...@@ -207,7 +203,7 @@ public class ConsultSheetController { ...@@ -207,7 +203,7 @@ public class ConsultSheetController {
consultSheetVO.setConsultId(consultSheet.getConsultId()); consultSheetVO.setConsultId(consultSheet.getConsultId());
consultSheetVO.setUserName(consultSheet.getUserName()); consultSheetVO.setUserName(consultSheet.getUserName());
consultSheetVO.setSex(consultSheet.getSex() == 1 ? "男" : "女"); consultSheetVO.setSex(consultSheet.getSex() == 1 ? "男" : "女");
consultSheetVO.setPhone(consultSheet.getIPhone()); consultSheetVO.setPhone(consultSheet.getPhone());
consultSheetVO.setPastRecords(consultSheet.getPastRecords()); consultSheetVO.setPastRecords(consultSheet.getPastRecords());
consultSheetVO.setIllness(consultSheet.getIllness()); consultSheetVO.setIllness(consultSheet.getIllness());
consultSheetVO.setAllergy(consultSheet.getAllergy()); consultSheetVO.setAllergy(consultSheet.getAllergy());
......
aidea-modules/consult-module/target/classes/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @ 95be5746
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
<result column="user_name" property="userName"/> <result column="user_name" property="userName"/>
<result column="number_id" property="numberId"/> <result column="number_id" property="numberId"/>
<result column="sex" property="sex"/> <result column="sex" property="sex"/>
<result column="iphone" property="iPhone"/> <result column="phone" property="phone"/>
<result column="past_records" property="pastRecords"/> <result column="past_records" property="pastRecords"/>
<result column="prescription" property="Prescription"/> <result column="prescription" property="prescription"/>
<result column="doctor_id" property="doctorId"/> <result column="doctor_id" property="doctorId"/>
<result column="customer_id" property="customerId"/> <result column="customer_id" property="customerId"/>
<result column="illness" property="illness"/> <result column="illness" property="illness"/>
...@@ -61,10 +61,10 @@ ...@@ -61,10 +61,10 @@
<sql id="sqlColumns"> <sql id="sqlColumns">
a.id, a.id,
a.consult_id, a.consult_id,
CONVERT(AES_DECRYPT(a.user_name,'aideakey') USING UTF8) , CONVERT(AES_DECRYPT(a.user_name,'aideakey') USING UTF8) user_name,
CONVERT(AES_DECRYPT(a.number_id,'aideakey') USING UTF8) , CONVERT(AES_DECRYPT(a.number_id,'aideakey') USING UTF8) number_id,
a.sex, a.sex,
CONVERT(AES_DECRYPT(a.iphone,'aideakey') USING UTF8) , CONVERT(AES_DECRYPT(a.phone,'aideakey') USING UTF8) phone,
a.past_records, a.past_records,
a.prescription, a.prescription,
a.doctor_id, a.doctor_id,
...@@ -90,24 +90,47 @@ ...@@ -90,24 +90,47 @@
</sql> </sql>
<insert id="save" parameterType="com.cftech.consultsheet.model.ConsultSheet" useGeneratedKeys="true" <insert id="save" parameterType="com.cftech.consultsheet.model.ConsultSheet" useGeneratedKeys="true"
keyProperty="id"> keyProperty="id">
insert into t_aidea_consult_sheet insert into t_aidea_consult_sheet
( (
<include refid="sqlColumns"/> id,
consult_id,
user_name ,
number_id,
sex,
phone,
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,
open_id,
drugs_id,
member_id,
order_id
) )
values values
( (
#{id, jdbcType=BIGINT} #{id, jdbcType=BIGINT},
#{consultId, jdbcType=VARCHAR}, #{consultId, jdbcType=VARCHAR},
AES_ENCRYPT(#{userName, jdbcType=VARBINARY},'aideakey'), AES_ENCRYPT(#{userName, jdbcType=VARBINARY},'aideakey'),
AES_ENCRYPT(#{numberId, jdbcType=VARBINARY},'aideakey'), AES_ENCRYPT(#{numberId, jdbcType=VARBINARY},'aideakey'),
now(),
#{sex, jdbcType=BIGINT}, #{sex, jdbcType=BIGINT},
AES_ENCRYPT(#{iPhone, jdbcType=VARBINARY},'aideakey'), AES_ENCRYPT(#{phone, jdbcType=VARBINARY},'aideakey'),
#{pastRecords, jdbcType=VARCHAR}, #{pastRecords, jdbcType=VARCHAR},
#{Prescription, jdbcType=VARCHAR}, #{prescription, jdbcType=VARCHAR},
#{doctorId, jdbcType=BIGINT}, #{doctorId, jdbcType=BIGINT},
#{customerId, jdbcType=BIGINT}, #{customerId, jdbcType=BIGINT},
#{illness, jdbcType=BIGINT}, #{illness, jdbcType=BIGINT},
...@@ -120,11 +143,9 @@ ...@@ -120,11 +143,9 @@
#{createBy, jdbcType=BIGINT}, #{createBy, jdbcType=BIGINT},
#{updateBy, jdbcType=BIGINT}, #{updateBy, jdbcType=BIGINT},
#{allergy, jdbcType=VARCHAR}, #{allergy, jdbcType=VARCHAR},
#{updateBy, jdbcType=VARCHAR}, #{symptom, jdbcType=VARCHAR},
#{diagnosis,jdbcType=BIGINT} #{diagnosis,jdbcType=BIGINT},
#{doctorName, jdbcType=VARCHAR}, #{openId, jdbcType=VARCHAR},
#{customerName,jdbcType=BIGINT},
#{openId,jdbcType=VARCHAR},
#{drugsId,jdbcType=BIGINT}, #{drugsId,jdbcType=BIGINT},
#{memberId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT},
#{orderId,jdbcType=BIGINT} #{orderId,jdbcType=BIGINT}
...@@ -156,7 +177,7 @@ ...@@ -156,7 +177,7 @@
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
<include refid="sqlWhere"/> <include refid="sqlWhere"/>
<if test="id!=null">and (a.doctor_id = ${id} or a.customer_id =${id} ) </if> <if test="id!=null">and (a.doctor_id = ${id} or a.customer_id =${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>
...@@ -167,13 +188,11 @@ ...@@ -167,13 +188,11 @@
<if test="id != null"> <if test="id != null">
id = #{id, jdbcType=BIGINT}, id = #{id, jdbcType=BIGINT},
</if> </if>
<if test="consultId != null"> <if test="consultId != null">
consult_id = #{consultId, jdbcType=VARCHAR}, consult_id = #{consultId, jdbcType=VARCHAR},
</if> </if>
<if test="userName != null"> <if test="userName != null">
user_name = AES_ENCRYPT(#{userName, jdbcType=VARBINARY},'aideakey'),
user_name = AES_ENCRYPT( #{userName, jdbcType=VARBINARY},'aideakey'),
</if> </if>
<if test="numberId != null"> <if test="numberId != null">
number_id = AES_ENCRYPT(#{numberId, jdbcType=VARBINARY},'aideakey'), number_id = AES_ENCRYPT(#{numberId, jdbcType=VARBINARY},'aideakey'),
...@@ -182,14 +201,14 @@ ...@@ -182,14 +201,14 @@
<if test="sex != null"> <if test="sex != null">
sex = #{sex, jdbcType=BIGINT}, sex = #{sex, jdbcType=BIGINT},
</if> </if>
<if test="iPhone != null"> <if test="phone != null">
iphone = AES_ENCRYPT(#{iPhone, jdbcType=VARBINARY},'aideakey'), phone = AES_ENCRYPT(#{phone, jdbcType=VARBINARY},'aideakey'),
</if> </if>
<if test="pastRecords != null"> <if test="pastRecords != null">
past_records = #{pastRecords, jdbcType=VARCHAR}, past_records = #{pastRecords, jdbcType=VARCHAR},
</if> </if>
<if test="Prescription != null"> <if test="prescription != null">
prescription = #{Prescription, jdbcType=VARCHAR}, prescription = #{prescription, jdbcType=VARCHAR},
</if> </if>
<if test="doctorId != null"> <if test="doctorId != null">
doctor_id = #{doctorId, jdbcType=BIGINT}, doctor_id = #{doctorId, jdbcType=BIGINT},
...@@ -249,7 +268,8 @@ ...@@ -249,7 +268,8 @@
<update id="delete" parameterType="java.lang.Long"> <update id="delete" parameterType="java.lang.Long">
update t_aidea_consult_sheet set del_flag=1 where id=#{id,jdbcType=BIGINT} update t_aidea_consult_sheet set del_flag=1 where id=#{id,jdbcType=BIGINT}
</update> </update>
<update id="updateDate" >
<update id="updateDate">
update t_aidea_consult_sheet update t_aidea_consult_sheet
<set> <set>
<if test="status !=null"> <if test="status !=null">
...@@ -261,6 +281,7 @@ ...@@ -261,6 +281,7 @@
</set> </set>
where consult_id = #{consultId} where consult_id = #{consultId}
</update> </update>
<update id="updateStatus"> <update id="updateStatus">
update t_aidea_consult_sheet update t_aidea_consult_sheet
<set> <set>
......
cftech-common-web/src/main/resources/common-test.properties
View file @ 95be5746
...@@ -24,9 +24,7 @@ AIDEA_QY_ACCOUNTS=349 ...@@ -24,9 +24,7 @@ AIDEA_QY_ACCOUNTS=349
#\u56FE\u7247\u8BBF\u95EE\u5730\u5740 #\u56FE\u7247\u8BBF\u95EE\u5730\u5740
IMAGEURL=/aidea/mobile/qybase/showPic?picFileName={PICFILENAME} IMAGEURL=/aidea/mobile/qybase/showPic?picFileName={PICFILENAME}
ROOT_PAPERCATEGORY_NAME=\u95EE\u5377\u7C7B\u578B ROOT_MATERIALCATEGORY_NAME=\u7D20\u6750\u7C7B\u578B
ROOT_QUESTIONSCATEGORY_NAME=\u95EE\u9898\u7C7B\u522B
ROOT_MATERIALCATEGORY_NAME=\u7D20\u6750\u7C7B\u522B
ARTICLEDETAILURL=http://www.changfu-tech.com/schaeffler/static/mp/dc/buy-car/dc-news-detail.html?appid={APPID}&articleId={ID} ARTICLEDETAILURL=http://www.changfu-tech.com/schaeffler/static/mp/dc/buy-car/dc-news-detail.html?appid={APPID}&articleId={ID}
ARTICLEDETAILPICURL=http://localhost:8080/schaeffler/static/article/picDetail.html?accountsid={ACCOUNTSID}&id={ID} ARTICLEDETAILPICURL=http://localhost:8080/schaeffler/static/article/picDetail.html?accountsid={ACCOUNTSID}&id={ID}
LOG_URL=http://www.michang-tech.com.cn:6989/log/addlog LOG_URL=http://www.michang-tech.com.cn:6989/log/addlog
......
cftech-common-web/src/main/webapp/assets/adminlte/pages/scripts/usermanager/useradd.js
View file @ 95be5746
...@@ -106,21 +106,24 @@ var UserAdd = function () { ...@@ -106,21 +106,24 @@ var UserAdd = function () {
$("#table tbody tr").each(function(i,val){ $("#table tbody tr").each(function(i,val){
// var dealerNo=$(this).find("td:eq(1) select option[data-attr='sys:dealer']").val()//获取为经销商编码的ID // var dealerNo=$(this).find("td:eq(1) select option[data-attr='sys:dealer']").val()//获取为经销商编码的ID
formdata["account"+i]=$(this).find("td:first select").val(); // formdata["account"+i]=$(this).find("td:first select").val();
formdata["roles"+i]=$(this).find("td:eq(1) select").val(); // formdata["roles"+i]=$(this).find("td:eq(1) select").val();
if(accountId.indexOf(","+$(this).find("td:first select").val()+",")>=0){ formdata["account"+i]="348";
Cfapp.alert({ formdata["roles"+i]=$(this).find("td:first select").val();
message: "存在重复公众号，请重新选择",
btntext: "确认", // if(accountId.indexOf(","+$(this).find("td:first select").val()+",")>=0){
success: function () { // Cfapp.alert({
} // message: "存在重复公众号，请重新选择",
}); // btntext: "确认",
issubmit=false; // success: function () {
return false; // }
}else{ // });
accountId+=","+$(this).find("td:first select").val()+","; // issubmit=false;
} // return false;
// }else{
// accountId+=","+$(this).find("td:first select").val()+",";
// }
}); });
accountId=""; accountId="";
...@@ -153,6 +156,7 @@ var UserAdd = function () { ...@@ -153,6 +156,7 @@ var UserAdd = function () {
} }
}); });
defaultAccountId = "348";
if (!defaultAccountId || defaultAccountId == '') { if (!defaultAccountId || defaultAccountId == '') {
Cfapp.alert({ Cfapp.alert({
message: "请选择默认的账号", message: "请选择默认的账号",
......
cos-modules/cos-upload-module-web/src/main/webapp/WEB-INF/views/upload/materialUploadform.html
View file @ 95be5746
...@@ -228,23 +228,23 @@ ...@@ -228,23 +228,23 @@
> >
</div> </div>
<div class="form-group form-md-line-input"> <!--<div class="form-group form-md-line-input">-->
<label>素材存储位置</label> <!--<label>素材存储位置</label>-->
<select name="cosconfigId" class="form-control"> <!--<select name="cosconfigId" class="form-control">-->
<!--<option value="0">本地</option>--> <!--&lt;!&ndash;<option value="0">本地</option>&ndash;&gt;-->
#foreach($cosconfig in $cosconfigList) <!--#foreach($cosconfig in $cosconfigList)-->
#if($cosconfig.cosType == "qcloud") <!--#if($cosconfig.cosType == "qcloud")-->
<option value="$cosconfig.id">腾讯</option> <!--<option value="$cosconfig.id">腾讯</option>-->
#end <!--#end-->
#if($cosconfig.cosType == "ali") <!--#if($cosconfig.cosType == "ali")-->
<option value="$cosconfig.id">阿里</option> <!--<option value="$cosconfig.id">阿里</option>-->
#end <!--#end-->
#if($cosconfig.cosType == "qiniu") <!--#if($cosconfig.cosType == "qiniu")-->
<option value="$cosconfig.id">七牛</option> <!--<option value="$cosconfig.id">七牛</option>-->
#end <!--#end-->
#end <!--#end-->
</select> <!--</select>-->
</div> <!--</div>-->
<div id="fine-uploader-manual-trigger"></div> <div id="fine-uploader-manual-trigger"></div>
<!--<div class="box-footer"> <!--<div class="box-footer">
#if($shiro.hasPermission("material:edit")) #if($shiro.hasPermission("material:edit"))
......
cos-modules/cos-upload-module/src/main/java/com/cftech/cos/uploader/web/MaterialUploadController.java
View file @ 95be5746
...@@ -53,7 +53,7 @@ import java.util.UUID; ...@@ -53,7 +53,7 @@ import java.util.UUID;
public class MaterialUploadController { public class MaterialUploadController {
private CosService cosService; private CosService cosService;
private Cosconfig cosconfig ; private Cosconfig cosconfig;
@Autowired @Autowired
private MaterialUploadService materialUploadService; private MaterialUploadService materialUploadService;
...@@ -70,7 +70,8 @@ public class MaterialUploadController { ...@@ -70,7 +70,8 @@ public class MaterialUploadController {
//素材查看权限 //素材查看权限
public static final String MATERIAL_VIEW = "material:view"; public static final String MATERIAL_VIEW = "material:view";
//素材编辑权限 //素材编辑权限
public static final String MATERIAL_EDIT= "material:edit"; public static final String MATERIAL_EDIT = "material:edit";
//列表页面 //列表页面
@RequestMapping("/list") @RequestMapping("/list")
@RequiresPermissions(value = MATERIAL_VIEW) @RequiresPermissions(value = MATERIAL_VIEW)
...@@ -88,12 +89,12 @@ public class MaterialUploadController { ...@@ -88,12 +89,12 @@ public class MaterialUploadController {
Conds conds = new Conds(); Conds conds = new Conds();
conds.equal("t.del_flag", Constants.DEL_FLAG_0); conds.equal("t.del_flag", Constants.DEL_FLAG_0);
// conds.equal("t.create_by", userId); // conds.equal("t.create_by", userId);
if(StringUtils.isNotBlank(material.getTitle())){ if (StringUtils.isNotBlank(material.getTitle())) {
conds.like("t.title", material.getTitle()); conds.like("t.title", material.getTitle());
} }
Sort sort = new Sort("t.create_time", OrderType.DESC); Sort sort = new Sort("t.create_time", OrderType.DESC);
List<Material> list = materialUploadService.fetchSearchByPageVo(material.getCategoryid(),conds, sort, iDisplayStart, iDisplayLength); List<Material> list = materialUploadService.fetchSearchByPageVo(material.getCategoryid(), conds, sort, iDisplayStart, iDisplayLength);
Integer counts = materialUploadService.countVo(material.getCategoryid(),conds); Integer counts = materialUploadService.countVo(material.getCategoryid(), conds);
JSONObject rtnJson = new JSONObject(); JSONObject rtnJson = new JSONObject();
rtnJson.put("iTotalRecords", counts); rtnJson.put("iTotalRecords", counts);
rtnJson.put("iTotalDisplayRecords", counts); rtnJson.put("iTotalDisplayRecords", counts);
...@@ -117,7 +118,7 @@ public class MaterialUploadController { ...@@ -117,7 +118,7 @@ public class MaterialUploadController {
/*conds.equal("t.create_by", userId);*/ /*conds.equal("t.create_by", userId);*/
Sort sort = new Sort("t.create_time", OrderType.DESC); Sort sort = new Sort("t.create_time", OrderType.DESC);
List<Material> list = materialUploadService.fetchSearchByPageVo(categoryId,conds, sort, iDisplayStart, iDisplayLength); List<Material> list = materialUploadService.fetchSearchByPageVo(categoryId, conds, sort, iDisplayStart, iDisplayLength);
JSONObject rtnJson = new JSONObject(); JSONObject rtnJson = new JSONObject();
rtnJson.put("aaData", list); rtnJson.put("aaData", list);
...@@ -125,7 +126,7 @@ public class MaterialUploadController { ...@@ -125,7 +126,7 @@ public class MaterialUploadController {
} }
/** /**
*增加页面 * 增加页面
*/ */
@RequiresPermissions(value = MATERIAL_EDIT) @RequiresPermissions(value = MATERIAL_EDIT)
@RequestMapping("/form") @RequestMapping("/form")
...@@ -137,8 +138,8 @@ public class MaterialUploadController { ...@@ -137,8 +138,8 @@ public class MaterialUploadController {
//for (Cosconfig cosconfig : cosconfigList) { //for (Cosconfig cosconfig : cosconfigList) {
model.addAttribute("cosconfigList", cosconfigList); model.addAttribute("cosconfigList", cosconfigList);
//} //}
Long id=material.getId(); Long id = material.getId();
if (id!=null) { if (id != null) {
material = materialUploadService.fetchById(id); material = materialUploadService.fetchById(id);
if (material.getCategoryid() == 0) { if (material.getCategoryid() == 0) {
material.setCategoryName(rootQCName); material.setCategoryName(rootQCName);
...@@ -165,49 +166,49 @@ public class MaterialUploadController { ...@@ -165,49 +166,49 @@ public class MaterialUploadController {
} }
List<MultipartFile> files = mhsr.getFiles("upfile"); List<MultipartFile> files = mhsr.getFiles("upfile");
for (MultipartFile file: files) { for (MultipartFile file : files) {
Material material = new Material(); Material material = new Material();
String fileName = file.getOriginalFilename().substring(0, file.getOriginalFilename().lastIndexOf(".")); String fileName = file.getOriginalFilename().substring(0, file.getOriginalFilename().lastIndexOf("."));
material.setTitle(fileName); material.setTitle(fileName);
material.setCategoryid(categoryId); material.setCategoryid(categoryId);
Map<String,Object> params = new HashMap<String,Object>(); Map<String, Object> params = new HashMap<String, Object>();
params.put("titlePrefix",fileName); params.put("titlePrefix", fileName);
Conds conds = new Conds(); Conds conds = new Conds();
conds.equal("del_flag", Constants.DEL_FLAG_0); conds.equal("del_flag", Constants.DEL_FLAG_0);
conds.like("title", fileName+"-"); conds.like("title", fileName + "-");
Integer counts = materialUploadService.count(conds); Integer counts = materialUploadService.count(conds);
material.setTitle(fileName+"-"+counts); material.setTitle(fileName + "-" + counts);
String url = ""; String url = "";
if(cosconfig == null){ if (cosconfig == null) {
//上传到本地 //上传到本地
Map<String,Object> resultMap = uploadMedia(UserUtils.getmpaccounts(request),material.getTitle(),file,request); Map<String, Object> resultMap = uploadMedia(UserUtils.getmpaccounts(request), material.getTitle(), file, request);
url = resultMap.get("mediaUrl").toString(); url = resultMap.get("mediaUrl").toString();
String key = resultMap.get("localPath").toString(); String key = resultMap.get("localPath").toString();
material.setKey(key); material.setKey(key);
material.setUploadType("local"); material.setUploadType("local");
material.setUrl(url); material.setUrl(url);
}else{ } else {
boolean resultTemp=getUploadService(cosconfig.getCosType()); boolean resultTemp = getUploadService(cosconfig.getCosType());
Map<String,Object> jsonObject=null; Map<String, Object> jsonObject = null;
CosFileUploader cosFileUploader = new CosFileUploader(cosconfig,cosService); CosFileUploader cosFileUploader = new CosFileUploader(cosconfig, cosService);
String format = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1); String format = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1);
try { try {
// jsonObject=cosFileUploader.uploadFile(file.getBytes(),format); // jsonObject=cosFileUploader.uploadFile(file.getBytes(),format);
jsonObject= UploadUtils.uploadImageFilesByQcloudInputStearm(request, "newRecommend",file,"/gogi/newReCommend/"); jsonObject = UploadUtils.uploadImageFilesByQcloudInputStearm(request, "newRecommend", file, "/gogi/newReCommend/");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage()); log.error(e.getMessage());
} }
material.setKey(null); material.setKey(null);
material.setUploadType(cosconfig.getCosType()); material.setUploadType(cosconfig.getCosType());
url = jsonObject.get("fileUrl")==null?"":jsonObject.get("fileUrl").toString(); url = jsonObject.get("fileUrl") == null ? "" : jsonObject.get("fileUrl").toString();
url+=SystemConfig.p.getProperty("Qcloud_STYLE_NAME"); url += SystemConfig.p.getProperty("Qcloud_STYLE_NAME");
material.setUrl(url); material.setUrl(url);
material.setCosId(cosconfigId); material.setCosId(cosconfigId);
} }
...@@ -220,11 +221,11 @@ public class MaterialUploadController { ...@@ -220,11 +221,11 @@ public class MaterialUploadController {
material.setCreateBy(userid); material.setCreateBy(userid);
material.setDelFlag("0"); material.setDelFlag("0");
material.setUpdateBy(userid); material.setUpdateBy(userid);
Boolean result=materialUploadService.save(material); Boolean result = materialUploadService.save(material);
} }
rtnJson.put("state","SUCCESS"); rtnJson.put("state", "SUCCESS");
return rtnJson; return rtnJson;
} }
...@@ -239,48 +240,49 @@ public class MaterialUploadController { ...@@ -239,48 +240,49 @@ public class MaterialUploadController {
@RequiresPermissions(value = MATERIAL_EDIT) @RequiresPermissions(value = MATERIAL_EDIT)
@RequestMapping("/formData") @RequestMapping("/formData")
@ResponseBody @ResponseBody
public JSONObject formData(HttpServletRequest request, Material material, Long cosconfigId, MultipartHttpServletRequest mhsr,MultipartFile file) { public JSONObject formData(HttpServletRequest request, Material material, Long cosconfigId, MultipartHttpServletRequest mhsr, MultipartFile file) {
JSONObject rtnJson = new JSONObject(); JSONObject rtnJson = new JSONObject();
Long userid = UserUtils.getUser().getId(); Long userid = UserUtils.getUser().getId();
cosconfig = cosconfigService.fetchById(cosconfigId); cosconfig = cosconfigService.fetchById(cosconfigId);
MultipartFile imgArr = mhsr.getFile("qqfile"); MultipartFile imgArr = mhsr.getFile("qqfile");
String titlePrefix=material.getTitle(); //未取标题使用uuid作为名称
String titlePrefix = StringUtils.isBlank(material.getTitle())? UUID.randomUUID().toString().replaceAll("-",""):material.getTitle();
int number = 0; int number = 0;
Map<String,Object> params = new HashMap<String,Object>(); Map<String, Object> params = new HashMap<String, Object>();
params.put("titlePrefix",titlePrefix); params.put("titlePrefix", titlePrefix);
Map<String,Object> mapNumber = materialUploadService.fetchSeaechByNumber(params); Map<String, Object> mapNumber = materialUploadService.fetchSeaechByNumber(params);
if(mapNumber!=null){ if (mapNumber != null) {
Object obj = mapNumber.get("number"); Object obj = mapNumber.get("number");
try{ try {
number=Integer.valueOf(obj.toString()); number = Integer.valueOf(obj.toString());
}catch (Exception e){ } catch (Exception e) {
} }
} }
number+=1; number += 1;
material.setTitle(titlePrefix+"-"+number); material.setTitle(titlePrefix + "-" + number);
try { try {
if(cosconfig == null){ if (cosconfig == null) {
//上传到本地 //上传到本地
Map<String,Object> resultMap = uploadMedia(UserUtils.getmpaccounts(request),material.getTitle(),imgArr,request); Map<String, Object> resultMap = uploadMedia(UserUtils.getmpaccounts(request), material.getTitle(), imgArr, request);
String url = resultMap.get("mediaUrl").toString(); String url = resultMap.get("mediaUrl").toString();
String key = resultMap.get("localPath").toString(); String key = resultMap.get("localPath").toString();
material.setKey(key); material.setKey(key);
material.setUploadType("local"); material.setUploadType("local");
material.setUrl(url); material.setUrl(url);
}else{ } else {
boolean resultTemp=getUploadService(cosconfig.getCosType()); boolean resultTemp = getUploadService(cosconfig.getCosType());
JSONObject jsonObject=null; JSONObject jsonObject = null;
CosFileUploader cosFileUploader = new CosFileUploader(cosconfig,cosService); CosFileUploader cosFileUploader = new CosFileUploader(cosconfig, cosService);
String format = imgArr.getOriginalFilename().substring(imgArr.getOriginalFilename().lastIndexOf(".")+1); String format = imgArr.getOriginalFilename().substring(imgArr.getOriginalFilename().lastIndexOf(".") + 1);
// jsonObject=cosFileUploader.uploadFile(imgArr.getBytes(),format); // jsonObject=cosFileUploader.uploadFile(imgArr.getBytes(),format);
try { try {
Map<String,Object> map = UploadUtils.uploadImageFilesByQcloudInputStearm(request, "newRecommend",imgArr,"/gogi/newReCommend/"); // cosFileUploader.uploadFile(file.getBytes(),format); Map<String, Object> map = UploadUtils.uploadImageFilesByQcloudInputStearm(request, "newRecommend", imgArr, "/gogi/newReCommend/"); // cosFileUploader.uploadFile(file.getBytes(),format);
material.setKey(null); material.setKey(null);
material.setUploadType(cosconfig.getCosType()); material.setUploadType(cosconfig.getCosType());
String url = map.get("fileUrl")==null?"":map.get("fileUrl").toString(); String url = map.get("fileUrl") == null ? "" : map.get("fileUrl").toString();
url+=SystemConfig.p.getProperty("Qcloud_STYLE_NAME"); url += SystemConfig.p.getProperty("Qcloud_STYLE_NAME");
material.setUrl(url); material.setUrl(url);
material.setCosId(cosconfigId); material.setCosId(cosconfigId);
} catch (Exception e) { } catch (Exception e) {
...@@ -288,18 +290,16 @@ public class MaterialUploadController { ...@@ -288,18 +290,16 @@ public class MaterialUploadController {
} }
} }
material.setCreateBy(userid); material.setCreateBy(userid);
material.setDelFlag("0"); material.setDelFlag("0");
material.setUpdateBy(userid); material.setUpdateBy(userid);
Boolean result=materialUploadService.save(material); Boolean result = materialUploadService.save(material);
} catch (Exception e) { } catch (Exception e) {
rtnJson.put("errorNo", 1); rtnJson.put("errorNo", 1);
e.printStackTrace(); e.printStackTrace();
} }
rtnJson.put("success","ok"); rtnJson.put("success", "ok");
return rtnJson; return rtnJson;
} }
...@@ -312,7 +312,7 @@ public class MaterialUploadController { ...@@ -312,7 +312,7 @@ public class MaterialUploadController {
try { try {
Material material = materialUploadService.fetchById(id); Material material = materialUploadService.fetchById(id);
boolean resultTemp = getUploadService(material.getUploadType()); boolean resultTemp = getUploadService(material.getUploadType());
if(!resultTemp){ if (!resultTemp) {
//删除本地图片 //删除本地图片
File file = new File(material.getKey()); File file = new File(material.getKey());
// 路径为文件且不为空则进行删除 // 路径为文件且不为空则进行删除
...@@ -321,21 +321,22 @@ public class MaterialUploadController { ...@@ -321,21 +321,22 @@ public class MaterialUploadController {
} }
} }
boolean result = materialUploadService.delete(id); boolean result = materialUploadService.delete(id);
if(result){ if (result) {
rtnJosn.put("errorNo",0); rtnJosn.put("errorNo", 0);
return rtnJosn; return rtnJosn;
} }
}catch (Exception e){ } catch (Exception e) {
rtnJosn.put("errorNo",1); rtnJosn.put("errorNo", 1);
e.printStackTrace(); e.printStackTrace();
} }
return rtnJosn; return rtnJosn;
} }
/** /**
* 上传到本地 * 上传到本地
*/ */
public static Map<String,Object> uploadMedia(Long userId, String moduleName, MultipartFile file, HttpServletRequest request){ public static Map<String, Object> uploadMedia(Long userId, String moduleName, MultipartFile file, HttpServletRequest request) {
Map<String,Object> params = new HashedMap(); Map<String, Object> params = new HashedMap();
BufferedInputStream bis = null; BufferedInputStream bis = null;
FileOutputStream fos = null; FileOutputStream fos = null;
HttpURLConnection conn = null; HttpURLConnection conn = null;
...@@ -347,11 +348,11 @@ public class MaterialUploadController { ...@@ -347,11 +348,11 @@ public class MaterialUploadController {
ff.mkdir(); ff.mkdir();
} }
String suffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));//文件扩展名 String suffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));//文件扩展名
String fileName =UUID.randomUUID().toString(); String fileName = UUID.randomUUID().toString();
finalFileName = fileName + suffix; finalFileName = fileName + suffix;
String realPath = dir + File.separator + finalFileName; String realPath = dir + File.separator + finalFileName;
params.put("localPath",realPath); params.put("localPath", realPath);
File localFile = new File(realPath); File localFile = new File(realPath);
if (!localFile.exists() && !localFile.isFile()) { if (!localFile.exists() && !localFile.isFile()) {
file.transferTo(localFile); file.transferTo(localFile);
...@@ -380,21 +381,22 @@ public class MaterialUploadController { ...@@ -380,21 +381,22 @@ public class MaterialUploadController {
} }
} }
String mediaUrl = ImageUrlUtils.formatImageUrl(finalFileName, "");//文件访问URL String mediaUrl = ImageUrlUtils.formatImageUrl(finalFileName, "");//文件访问URL
params.put("mediaUrl",mediaUrl); params.put("mediaUrl", mediaUrl);
return params; return params;
} }
//获取上传服务位置 //获取上传服务位置
private boolean getUploadService(String cosType){ private boolean getUploadService(String cosType) {
if(cosType.equals("qcloud")){ if (cosType.equals("qcloud")) {
//上传到腾讯 //上传到腾讯
cosService=new QcloudStorageService(); cosService = new QcloudStorageService();
}else if(cosType.equals("ali")){ } else if (cosType.equals("ali")) {
//上传到阿里 //上传到阿里
cosService=new AliOssStorageService(); cosService = new AliOssStorageService();
}else if(cosType.equals("qiniu")){ } else if (cosType.equals("qiniu")) {
//上传到七牛 //上传到七牛
cosService=new QiniuStorageService(); cosService = new QiniuStorageService();
}else { } else {
//上传到本地 //上传到本地
return false; return false;
} }
......
membercard-modules/member-module/src/main/java/com/cftech/member/service/impl/MemberServiceImpl.java
View file @ 95be5746
...@@ -65,17 +65,19 @@ public class MemberServiceImpl extends GenericServiceImpl<Member> implements Mem ...@@ -65,17 +65,19 @@ public class MemberServiceImpl extends GenericServiceImpl<Member> implements Mem
} }
@Override @Override
public List<MemberDto> selectmemberDto(Conds conds, Sort sort, int page, int pageSize){ public List<MemberDto> selectmemberDto(Conds conds, Sort sort, int page, int pageSize) {
Map<String, Object> params = new HashMap<String, Object>(); Map<String, Object> params = new HashMap<String, Object>();
params.put("conds", conds); params.put("conds", conds);
params.put("offset", page > 0 ? page : 0); params.put("offset", page > 0 ? page : 0);
params.put("limit", pageSize > 0 ? pageSize : 0); params.put("limit", pageSize > 0 ? pageSize : 0);
params.put("sort", sort); params.put("sort", sort);
return memberMapper.selectmemberDto(params); return memberMapper.selectmemberDto(params);
}; }
;
@Override @Override
public int selectmemberDtoCount (Conds conds){ public int selectmemberDtoCount(Conds conds) {
Map<String, Object> params = new HashMap<String, Object>(); Map<String, Object> params = new HashMap<String, Object>();
params.put("conds", conds); params.put("conds", conds);
return memberMapper.selectmemberDtoCount(params); return memberMapper.selectmemberDtoCount(params);
...@@ -85,19 +87,19 @@ public class MemberServiceImpl extends GenericServiceImpl<Member> implements Mem ...@@ -85,19 +87,19 @@ public class MemberServiceImpl extends GenericServiceImpl<Member> implements Mem
public JSONObject memberFormation(Long id) { public JSONObject memberFormation(Long id) {
JSONObject rtnJson = new JSONObject(); JSONObject rtnJson = new JSONObject();
try { try {
if (org.springframework.util.StringUtils.isEmpty(id)){ if (org.springframework.util.StringUtils.isEmpty(id)) {
rtnJson.put("errorNo","1"); rtnJson.put("errorNo", "1");
rtnJson.put("errorMsg","id不能为空"); rtnJson.put("errorMsg", "id不能为空");
} }
List<MemberVO> memberVOS = memberMapper.memberFormation(id); List<MemberVO> memberVOS = memberMapper.memberFormation(id);
Log.info("返回值"+memberVOS); Log.info("返回值" + memberVOS);
rtnJson.put("errorNo","0"); rtnJson.put("errorNo", "0");
rtnJson.put("data",memberVOS); rtnJson.put("data", memberVOS);
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
rtnJson.put("errorNo","1"); rtnJson.put("errorNo", "1");
} }
return rtnJson; return rtnJson;
} }
...@@ -106,67 +108,67 @@ public class MemberServiceImpl extends GenericServiceImpl<Member> implements Mem ...@@ -106,67 +108,67 @@ public class MemberServiceImpl extends GenericServiceImpl<Member> implements Mem
public JSONObject updateMember(MemberVO memberVO) { public JSONObject updateMember(MemberVO memberVO) {
JSONObject rtnJson = new JSONObject(); JSONObject rtnJson = new JSONObject();
try { try {
SimpleDateFormat sdf1= new SimpleDateFormat( "yy-MM-dd" , Locale. CHINA ); SimpleDateFormat sdf1 = new SimpleDateFormat("yy-MM-dd", Locale.CHINA);
String format = sdf1.format(memberVO.getBirthday()); String format = sdf1.format(memberVO.getBirthday());
Date date = sdf1.parse(format); Date date = sdf1.parse(format);
memberVO.setBirthday(date); memberVO.setBirthday(date);
if (StringUtils.isEmpty(memberVO.getMemberName())){ if (StringUtils.isEmpty(memberVO.getMemberName())) {
rtnJson.put("errorNo","1"); rtnJson.put("errorNo", "1");
rtnJson.put("errorMsg","姓名不能为空"); rtnJson.put("errorMsg", "姓名不能为空");
return rtnJson; return rtnJson;
} }
if (StringUtils.isEmpty(memberVO.getMailbox())){ if (StringUtils.isEmpty(memberVO.getMailbox())) {
rtnJson.put("errorNo","1"); rtnJson.put("errorNo", "1");
rtnJson.put("errorMsg","邮箱不能为空"); rtnJson.put("errorMsg", "邮箱不能为空");
return rtnJson; return rtnJson;
} }
if (StringUtils.isEmpty(memberVO.getPhone())){ if (StringUtils.isEmpty(memberVO.getPhone())) {
rtnJson.put("errorNo","1"); rtnJson.put("errorNo", "1");
rtnJson.put("errorMsg","联系方式不能为空"); rtnJson.put("errorMsg", "联系方式不能为空");
return rtnJson; return rtnJson;
} }
int i = memberMapper.updateMember(memberVO); int i = memberMapper.updateMember(memberVO);
if (i>0){ if (i > 0) {
rtnJson.put("errorNo","0"); rtnJson.put("errorNo", "0");
rtnJson.put("errorMsg","修改成功"); rtnJson.put("errorMsg", "修改成功");
}else{ } else {
rtnJson.put("errorNo","1"); rtnJson.put("errorNo", "1");
rtnJson.put("errorMsg","修改失败"); rtnJson.put("errorMsg", "修改失败");
return rtnJson; return rtnJson;
} }
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
rtnJson.put("errorNo","1"); rtnJson.put("errorNo", "1");
rtnJson.put("errorMsg","系统异常"); rtnJson.put("errorMsg", "系统异常");
} }
return rtnJson; return rtnJson;
} }
@Override @Override
public void updateworkshop(Member member,String invitcode) { public void updateworkshop(Member member, String invitcode) {
if(member!=null){ if (member != null) {
Conds conds1 = new Conds(); Conds conds1 = new Conds();
conds1.equal("invitcode",invitcode); conds1.equal("invitcode", invitcode);
Sort sort1 = new Sort("create_time", OrderType.DESC); Sort sort1 = new Sort("create_time", OrderType.DESC);
List<Workshop> list1 = workshopService.selectworkshop(conds1,sort1,0,0); List<Workshop> list1 = workshopService.selectworkshop(conds1, sort1, 0, 0);
if(list1!=null&&list1.size()>0){ if (list1 != null && list1.size() > 0) {
Workshop workshop = list1.get(0); Workshop workshop = list1.get(0);
if(member.getSurname().equals(workshop.getSurname())&&member.getName().equals(workshop.getFirst_name())&&member.getPhone().equals("")){ if (member.getSurname().equals(workshop.getSurname()) && member.getName().equals(workshop.getFirst_name()) && member.getPhone().equals("")) {
member.setPhone(workshop.getPhone()); member.setPhone(workshop.getPhone());
memberMapper.save(member); //注册成功会员表里面添加一条数据 memberMapper.save(member); //注册成功会员表里面添加一条数据
}else{ } else {
memberMapper.save(member); //注册成功会员表里面添加一条数据 memberMapper.save(member); //注册成功会员表里面添加一条数据
} }
} }
//把memberuid 插入到预导入名单表里面 //把memberuid 插入到预导入名单表里面
if(StringUtils.isNoneBlank(invitcode)){ if (StringUtils.isNoneBlank(invitcode)) {
Conds conds = new Conds(); Conds conds = new Conds();
conds.equal("invitcode",invitcode); conds.equal("invitcode", invitcode);
Sort sort = new Sort("create_time", OrderType.DESC); Sort sort = new Sort("create_time", OrderType.DESC);
List<Workshop> list = workshopService.selectworkshop(conds,sort,0,0); List<Workshop> list = workshopService.selectworkshop(conds, sort, 0, 0);
if(list!=null&&list.size()>0){ if (list != null && list.size() > 0) {
for(Workshop workshop : list){ for (Workshop workshop : list) {
//workshop.setMember_uid(member.getMember_uid()); //workshop.setMember_uid(member.getMember_uid());
workshopService.update(workshop); workshopService.update(workshop);
} }
......
sys-module-web/src/main/webapp/WEB-INF/views/manageuser/userupdate.html
View file @ 95be5746
...@@ -291,7 +291,6 @@ ...@@ -291,7 +291,6 @@
onText: '默认', onText: '默认',
offText: '否', offText: '否',
state: false state: false
}); });
}; };
...@@ -299,10 +298,9 @@ ...@@ -299,10 +298,9 @@
var qyUserRoles = eval(${qyUserRoles}); var qyUserRoles = eval(${qyUserRoles});
var defaultAccid = "${user.defaultAccId}"; //var defaultAccid = "${user.defaultAccId}";
for (var i = 0; i < userRoles.length; i++) { if (userRoles.length ==0) {
var accounthtml = $(".account").html();
var rolehtml = $(".role").html(); var rolehtml = $(".role").html();
var html = ""; var html = "";
html += "<tr class='trEle'>"; html += "<tr class='trEle'>";
...@@ -314,59 +312,84 @@ ...@@ -314,59 +312,84 @@
html += rolehtml; html += rolehtml;
html += '</select></td>' + html += '</select></td>' +
'<td>' + '<td>' +
'<div class="switch">' + // '<div class="switch">' +
'<input type="radio" id="' + userRoles[i]['accountsId'] + '-sel" name="isdefault"/>' + // '<input type="radio" name="isdefault"/>' +
'</div>' + // '</div>' +
'<button type="button" class="btn btn-danger delAccounts">删除</button>' + // '<button type="button" class="btn btn-danger delAccounts">删除</button>' +
'</td></tr>'; '</td></tr>';
$("#table tbody").append(html); $("#table tbody").append(html);
$("#table tbody tr:last select:first option").each(function (k, val) { bindSwitch();
if ($(this).val() == userRoles[i]['accountsId']) {
$(this).attr("selected", true);
}
})
$("#table tbody tr:last select:last option").each(function (k, val) {
if (userRoles[i]['roles'].indexOf("," + $(this).val() + ",") >= 0) {
$(this).attr("selected", true);
}
})
$(".select2").select2(); $(".select2").select2();
} else {
} for (var i = 0; i < userRoles.length; i++) {
for (var i = 0; i < qyUserRoles.length; i++) { var accounthtml = $(".account").html();
var accounthtml = $(".qyaccount").html(); var rolehtml = $(".role").html();
var rolehtml = $(".qyrole").html();
var html = ""; var html = "";
html += "<tr class='trEle'>"; html += "<tr class='trEle'>";
// html += "<td>"; // html += "<td>";
// html += "<select class='form-control select2 qyaccount' data-placeholder='请选择公众号'>" + accounthtml; // html += "<select class='form-control select2 account' data-placeholder='请选择公众号'>" + accounthtml;
// html += "</select></td>"; // html += "</select></td>";
html += "<td>"; html += "<td>";
html += "<select class='form-control select2 qyrole' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>"; html += "<select class='form-control select2 role' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>";
html += rolehtml; html += rolehtml;
html += '</select></td>' + html += '</select></td>' +
'<td>' + '<td>' +
'<div class="switch">' + // '<div class="switch">' +
'<input type="radio" id="' + qyUserRoles[i]['accountsId'] + '-sel" name="isdefault"/>' + // '<input type="radio" id="' + userRoles[i]['accountsId'] + '-sel" name="isdefault"/>' +
'</div>' + // '</div>' +
'<button type="button" class="btn btn-danger delAccounts">删除</button>' + // '<button type="button" class="btn btn-danger delAccounts">删除</button>' +
'</td></tr>'; '</td></tr>';
$("#qytable tbody").append(html); $("#table tbody").append(html);
$("#qytable tbody tr:last select:first option").each(function (k, val) { $("#table tbody tr:last select:first option").each(function (k, val) {
if ($(this).val() == qyUserRoles[i]['accountsId']) { if ($(this).val() == userRoles[i]['accountsId']) {
$(this).attr("selected", true); $(this).attr("selected", true);
} }
}) })
$("#qytable tbody tr:last select:last option").each(function (k, val) { $("#table tbody tr:last select:last option").each(function (k, val) {
if (qyUserRoles[i]['roles'].indexOf("," + $(this).val() + ",") >= 0) { if (userRoles[i]['roles'].indexOf("," + $(this).val() + ",") >= 0) {
$(this).attr("selected", true); $(this).attr("selected", true);
} }
}) })
$(".select2").select2(); $(".select2").select2();
} }
}
// for (var i = 0; i < qyUserRoles.length; i++) {
// var accounthtml = $(".qyaccount").html();
// var rolehtml = $(".qyrole").html();
// var html = "";
// html += "<tr class='trEle'>";
// html += "<td>";
// html += "<select class='form-control select2 qyaccount' data-placeholder='请选择公众号'>" + accounthtml;
// html += "</select></td>";
// html += "<td>";
// html += "<select class='form-control select2 qyrole' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>";
// html += rolehtml;
// html += '</select></td>' +
// '<td>' +
// '<div class="switch">' +
// '<input type="radio" id="' + qyUserRoles[i]['accountsId'] + '-sel" name="isdefault"/>' +
// '</div>' +
// '<button type="button" class="btn btn-danger delAccounts">删除</button>' +
// '</td></tr>';
// $("#qytable tbody").append(html);
// $("#qytable tbody tr:last select:first option").each(function (k, val) {
// if ($(this).val() == qyUserRoles[i]['accountsId']) {
// $(this).attr("selected", true);
// }
// })
// $("#qytable tbody tr:last select:last option").each(function (k, val) {
// if (qyUserRoles[i]['roles'].indexOf("," + $(this).val() + ",") >= 0) {
// $(this).attr("selected", true);
// }
// })
// $(".select2").select2();
// }
bindSwitch(); bindSwitch();
$('#' + defaultAccid + '-sel').bootstrapSwitch('toggleState'); //$('#' + defaultAccid + '-sel').bootstrapSwitch('toggleState');
jQuery(document).ready(function () { jQuery(document).ready(function () {
...@@ -400,38 +423,38 @@ ...@@ -400,38 +423,38 @@
html += rolehtml; html += rolehtml;
html += '</select></td>' + html += '</select></td>' +
'<td>' + '<td>' +
'<div class="switch">' + // '<div class="switch">' +
'<input type="radio" name="isdefault"/>' + // '<input type="radio" name="isdefault"/>' +
'</div>' + // '</div>' +
'<button type="button" class="btn btn-danger delAccounts">删除</button>' + // '<button type="button" class="btn btn-danger delAccounts">删除</button>' +
'</td></tr>'; '</td></tr>';
$("#table tbody").append(html); $("#table tbody").append(html);
bindSwitch(); bindSwitch();
$(".select2").select2(); $(".select2").select2();
}); });
$("#addQyAccounts").click(function () { // $("#addQyAccounts").click(function () {
var accounthtml = $(".qyaccount").html(); // var accounthtml = $(".qyaccount").html();
var rolehtml = $(".qyrole").html(); // var rolehtml = $(".qyrole").html();
var html = ""; // var html = "";
html += "<tr class='trEle'>"; // html += "<tr class='trEle'>";
// html += "<td>"; // html += "<td>";
// html += "<select class='form-control select2 qyaccount' data-placeholder='请选择企业号'>" + accounthtml; // html += "<select class='form-control select2 qyaccount' data-placeholder='请选择企业号'>" + accounthtml;
// html += "</select></td>"; // html += "</select></td>";
// html += "<td>"; // html += "<td>";
html += "<select class='form-control select2 qyrole' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>"; // html += "<select class='form-control select2 qyrole' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>";
html += rolehtml; // html += rolehtml;
html += '</select></td>' + // html += '</select></td>' +
'<td>' + // '<td>' +
'<div class="switch">' + // '<div class="switch">' +
'<input type="radio" name="isdefault"/>' + // '<input type="radio" name="isdefault"/>' +
'</div>' + // '</div>' +
'<button type="button" class="btn btn-danger delAccounts">删除</button>' + // '<button type="button" class="btn btn-danger delAccounts">删除</button>' +
'</td></tr>'; // '</td></tr>';
$("#qytable tbody").append(html); // $("#qytable tbody").append(html);
bindSwitch(); // bindSwitch();
$(".select2").select2(); // $(".select2").select2();
}) // })
var sQyUserSource = "#springUrl('/a/qyuser/listData')"; var sQyUserSource = "#springUrl('/a/qyuser/listData')";
$('#orgtypeSelect').on('click', $('#orgtypeSelect').on('click',
......
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