314637581
/
flossom-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

仪器管理-增加仪器绑定积分，删除场景相关信息

Browse Source
master
382696293@qq.com 2 years ago
parent 78c5fff6f3
commit cdfecf607f
4 changed files with 50 additions and 65 deletions
Show Stats Download Patch File Download Diff File

41
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java
Unescape Escape View File

@ -72,6 +72,11 @@ public class WxInstrument extends BaseEntity {
*/
private Long isExtraClock;
/**
* 仪器绑定积分
*/
private Integer bindingCredit;
/**
* 额外打卡时间开始
*/
@ -104,16 +109,6 @@ public class WxInstrument extends BaseEntity {
*/
private String wecomTagNames;
/**
* 场景ID(xxxx,xxxx,xxx)
*/
private String sceneIds;
/**
* 场景名称(xxx,xxx,xxx)
*/
private String sceneNames;
/**
* 护理时长
*/
@ -313,22 +308,6 @@ public class WxInstrument extends BaseEntity {
return wecomTagNames;
}
public void setSceneIds(String sceneIds) {
this.sceneIds = sceneIds;
}
public String getSceneIds() {
return sceneIds;
}
public void setSceneNames(String sceneNames) {
this.sceneNames = sceneNames;
}
public String getSceneNames() {
return sceneNames;
}
public void setNursingTime(LocalTime nursingTime) {
this.nursingTime = nursingTime;
}
@ -449,6 +428,14 @@ public class WxInstrument extends BaseEntity {
this.isExtraClock = isExtraClock;
}
public Integer getBindingCredit() {
return bindingCredit;
}
public void setBindingCredit(Integer bindingCredit) {
this.bindingCredit = bindingCredit;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@ -468,8 +455,6 @@ public class WxInstrument extends BaseEntity {
.append("miniTagNames", getMiniTagNames())
.append("wecomTagIds", getWecomTagIds())
.append("wecomTagNames", getWecomTagNames())
.append("sceneIds", getSceneIds())
.append("sceneNames", getSceneNames())
.append("nursingTime", getNursingTime())
.append("iotVersion", getIotVersion())
.append("iotUpgradeData", getIotUpgradeData())

38
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java
Unescape Escape View File

@ -88,6 +88,10 @@ public class WxInstrumentSaveReq {
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private List<LocalDateTime> extraClockTimeRange;
/**
* 仪器绑定积分
*/
private Integer bindingCredit;
/**
* 标签ID(xxxx,xxxx,xxx)
@ -99,16 +103,6 @@ public class WxInstrumentSaveReq {
*/
private String wecomTagIds;
/**
* 场景ID(xxxx,xxxx,xxx)
*/
private String sceneIds;
/**
* 场景名称(xxx,xxx,xxx)
*/
private String sceneNames;
/**
* 护理时长
*/
@ -285,22 +279,6 @@ public class WxInstrumentSaveReq {
this.extraClockTimeRange = extraClockTimeRange;
}
public String getSceneIds() {
return sceneIds;
}
public void setSceneIds(String sceneIds) {
this.sceneIds = sceneIds;
}
public String getSceneNames() {
return sceneNames;
}
public void setSceneNames(String sceneNames) {
this.sceneNames = sceneNames;
}
public LocalTime getNursingTime() {
return nursingTime;
}
@ -436,4 +414,12 @@ public class WxInstrumentSaveReq {
public void setWecomTagIds(String wecomTagIds) {
this.wecomTagIds = wecomTagIds;
}
public Integer getBindingCredit() {
return bindingCredit;
}
public void setBindingCredit(Integer bindingCredit) {
this.bindingCredit = bindingCredit;
}
}

16
flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
Unescape Escape View File

@ -16,14 +16,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dailyClockCredit" column="daily_clock_credit" />
<result property="isExtraClock" column="is_extra_clock" />
<result property="extraClockCredit" column="extra_clock_credit" />
<result property="bindingCredit" column="binding_credit" />
<result property="startTime" column="start_time" />
<result property="endTime" column="end_time" />
<result property="miniTagIds" column="mini_tag_ids" />
<result property="miniTagNames" column="mini_tag_names" />
<result property="wecomTagIds" column="wecom_tag_ids" />
<result property="wecomTagNames" column="wecom_tag_names" />
<result property="sceneIds" column="scene_ids" />
<result property="sceneNames" column="scene_names" />
<result property="nursingTime" column="nursing_time" />
<result property="iotVersion" column="iot_version" />
<result property="iotUpgradeData" column="iot_upgrade_data" />
@ -46,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWxInstrumentVo">
select id, name, type, model, banner, logo, serial, guarantee, daily_clock_credit, is_extra_clock, extra_clock_credit, start_time, end_time, mini_tag_ids, mini_tag_names, wecom_tag_ids, wecom_tag_names, scene_ids, scene_names, nursing_time, iot_version, iot_upgrade_data, is_scan_code, is_purchase, shopping_appid, shopping_path, bluetooth_connecting, bluetooth_closed, iot_version_upgrade, sort_no, status, manual_code_binding, scan_code_binding, create_by, create_time, update_by, update_time, remark from wx_instrument
select id, name, type, model, banner, logo, serial, guarantee, daily_clock_credit, is_extra_clock, binding_credit, extra_clock_credit, start_time, end_time, mini_tag_ids, mini_tag_names, wecom_tag_ids, wecom_tag_names, nursing_time, iot_version, iot_upgrade_data, is_scan_code, is_purchase, shopping_appid, shopping_path, bluetooth_connecting, bluetooth_closed, iot_version_upgrade, sort_no, status, manual_code_binding, scan_code_binding, create_by, create_time, update_by, update_time, remark from wx_instrument
</sql>
<select id="selectWxInstrumentList" parameterType="WxInstrument" resultMap="WxInstrumentResult">
@ -64,12 +63,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="extraClockCredit != null "> and extra_clock_credit = #{extraClockCredit}</if>
<if test="startTime != null "> and start_time = #{startTime}</if>
<if test="endTime != null "> and end_time = #{endTime}</if>
<if test="bindingCredit != null "> and binding_credit = #{bindingCredit}</if>
<if test="miniTagIds != null and miniTagIds != ''"> and mini_tag_ids = #{miniTagIds}</if>
<if test="miniTagNames != null and miniTagNames != ''"> and mini_tag_names = #{miniTagNames}</if>
<if test="wecomTagIds != null and wecomTagIds != ''"> and wecom_tag_ids = #{wecomTagIds}</if>
<if test="wecomTagNames != null and wecomTagNames != ''"> and wecom_tag_names = #{wecomTagNames}</if>
<if test="sceneIds != null and sceneIds != ''"> and scene_ids = #{sceneIds}</if>
<if test="sceneNames != null and sceneNames != ''"> and scene_names = #{sceneNames}</if>
<if test="nursingTime != null "> and nursing_time = #{nursingTime}</if>
<if test="iotVersion != null and iotVersion != ''"> and iot_version = #{iotVersion}</if>
<if test="iotUpgradeData != null and iotUpgradeData != ''"> and iot_upgrade_data = #{iotUpgradeData}</if>
@ -120,13 +118,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isExtraClock != null">is_extra_clock,</if>
<if test="extraClockCredit != null">extra_clock_credit,</if>
<if test="startTime != null">start_time,</if>
<if test="bindingCredit != null">binding_credit,</if>
<if test="endTime != null">end_time,</if>
<if test="miniTagIds != null">mini_tag_ids,</if>
<if test="miniTagNames != null">mini_tag_names,</if>
<if test="wecomTagIds != null">wecom_tag_ids,</if>
<if test="wecomTagNames != null">wecom_tag_names,</if>
<if test="sceneIds != null and sceneIds != ''">scene_ids,</if>
<if test="sceneNames != null">scene_names,</if>
<if test="nursingTime != null">nursing_time,</if>
<if test="iotVersion != null">iot_version,</if>
<if test="iotUpgradeData != null">iot_upgrade_data,</if>
@ -158,13 +155,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dailyClockCredit != null">#{dailyClockCredit},</if>
<if test="isExtraClock != null">#{isExtraClock},</if>
<if test="extraClockCredit != null">#{extraClockCredit},</if>
<if test="bindingCredit != null">#{bindingCredit},</if>
<if test="startTime != null">#{startTime},</if>
<if test="endTime != null">#{endTime},</if>
<if test="miniTagIds != null">#{miniTagIds},</if>
<if test="miniTagNames != null">#{miniTagNames},</if>
<if test="wecomTagIds != null">#{wecomTagIds},</if>
<if test="wecomTagNames != null">#{wecomTagNames},</if>
<if test="sceneIds != null and sceneIds != ''">#{sceneIds},</if>
<if test="sceneNames != null">#{sceneNames},</if>
<if test="nursingTime != null">#{nursingTime},</if>
<if test="iotVersion != null">#{iotVersion},</if>
@ -201,14 +198,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dailyClockCredit != null">daily_clock_credit = #{dailyClockCredit},</if>
<if test="isExtraClock != null">is_extra_clock = #{isExtraClock},</if>
<if test="extraClockCredit != null">extra_clock_credit = #{extraClockCredit},</if>
<if test="bindingCredit != null">binding_credit = #{bindingCredit},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="endTime != null">end_time = #{endTime},</if>
<if test="miniTagIds != null">mini_tag_ids = #{miniTagIds},</if>
<if test="miniTagNames != null">mini_tag_names = #{miniTagNames},</if>
<if test="wecomTagIds != null">wecom_tag_ids = #{wecomTagIds},</if>
<if test="wecomTagNames != null">wecom_tag_names = #{wecomTagNames},</if>
<if test="sceneIds != null and sceneIds != ''">scene_ids = #{sceneIds},</if>
<if test="sceneNames != null">scene_names = #{sceneNames},</if>
<if test="nursingTime != null">nursing_time = #{nursingTime},</if>
<if test="iotVersion != null">iot_version = #{iotVersion},</if>
<if test="iotUpgradeData != null">iot_upgrade_data = #{iotUpgradeData},</if>

20
flossom-ui/src/views/system/instrument/index.vue
Unescape Escape View File

@ -446,6 +446,9 @@
>
</el-date-picker>
</el-form-item>
<el-form-item label="仪器绑定积分" prop="bindingCredit">
<el-input-number :min="0" :precision="0" v-model="form.bindingCredit" />
</el-form-item>
<el-form-item label="仪器类型" prop="type">
<el-select
v-model="form.type"
@ -823,7 +826,7 @@
<el-dialog title="产品说明书配置" :visible.sync="instrumentInstructions.visible" width="50%">
<el-button size="mini" type="primary" icon="el-icon-add" @click="addInstrumentInstructionLine()">添加说明书
</el-button>
<el-table v-loading="loading" :data="instrumentInstructions.instructionList">
<el-table v-loading="loading" :data="instrumentInstructions.instructionList">
<el-table-column align="center" prop="name" width="200" label="说明书类型">
<template slot-scope="scope">
<el-input placeholder="请输入说明书类型" v-model="scope.row.name" clearable/>
@ -1010,6 +1013,13 @@ export default {
isExtraClock: [
{required: true, message: '请选择是否开启额外打卡奖励'},
],
bindingCredit: [
{
required: true,
message: '仪器绑定奖励积分',
trigger: 'blur',
},
],
extraClockCredit: [
{
required: true,
@ -1138,6 +1148,7 @@ export default {
extraClockCredit: 0,
/* 额外打卡时间范围 */
extraClockTimeRange: [],
bindingCredit: 0,
miniTagIds: null,
miniTagNames: null,
wecomTagIds: null,
@ -1220,6 +1231,13 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
id: null,
name: null,
type: null,
};
this.resetForm('queryForm')
this.handleQuery()
},

Write Preview
Loading…
Cancel
Save