2、服务指令包：1）新增分类标签，调整新增、编辑界面分类标签的选择与回显；2）选择过服务指令后不允许再更改分类标签；3）引用服务指令包、选择服务指令只展示对应分类标签相关的内容；
3、服务指令包的服务总时长允许保存0 4、服务指令的服务时长允许保存0
This commit is contained in:
parent
72d5fe88d1
commit
7394ad2bda
|
|
@ -87,6 +87,7 @@ public class DirectivePackage implements Serializable {
|
||||||
private java.lang.String endTimeStr;
|
private java.lang.String endTimeStr;
|
||||||
|
|
||||||
@ApiModelProperty(value = "分类标签")
|
@ApiModelProperty(value = "分类标签")
|
||||||
|
@Dict(dicCode = "id",dicText = "instruction_name",dictTable = "nu_config_service_instruction_tag")
|
||||||
private java.lang.String instructionTagId;
|
private java.lang.String instructionTagId;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
|
|
|
||||||
|
|
@ -4,82 +4,85 @@
|
||||||
|
|
||||||
<!-- 定义 resultMap -->
|
<!-- 定义 resultMap -->
|
||||||
<resultMap id="DirectivePackageResultMap" type="com.nu.modules.config.directivepackage.entity.DirectivePackage">
|
<resultMap id="DirectivePackageResultMap" type="com.nu.modules.config.directivepackage.entity.DirectivePackage">
|
||||||
<id property="id" column="id" />
|
<id property="id" column="id"/>
|
||||||
<result property="packageName" column="package_name" />
|
<result property="packageName" column="package_name"/>
|
||||||
<result property="description" column="description" />
|
<result property="description" column="description"/>
|
||||||
<result property="sort" column="sort" />
|
<result property="sort" column="sort"/>
|
||||||
<result property="izEnabled" column="iz_enabled" />
|
<result property="izEnabled" column="iz_enabled"/>
|
||||||
<result property="delFlag" column="del_flag" />
|
<result property="delFlag" column="del_flag"/>
|
||||||
<result property="createBy" column="create_by" />
|
<result property="createBy" column="create_by"/>
|
||||||
<result property="createTime" column="create_time" />
|
<result property="createTime" column="create_time"/>
|
||||||
<result property="updateBy" column="update_by" />
|
<result property="updateBy" column="update_by"/>
|
||||||
<result property="updateTime" column="update_time" />
|
<result property="updateTime" column="update_time"/>
|
||||||
<result property="startTimeStr" column="start_time_str" />
|
<result property="startTimeStr" column="start_time_str"/>
|
||||||
<result property="endTimeStr" column="end_time_str" />
|
<result property="endTimeStr" column="end_time_str"/>
|
||||||
<result property="instructionTagId" column="instruction_tag_id" />
|
<result property="instructionTagId" column="instruction_tag_id"/>
|
||||||
<result property="totalDuration" column="total_duration" />
|
<result property="totalDuration" column="total_duration"/>
|
||||||
<result property="timeoutDuration" column="timeout_duration" />
|
<result property="timeoutDuration" column="timeout_duration"/>
|
||||||
<!-- 关联的指令列表 -->
|
<!-- 关联的指令列表 -->
|
||||||
<collection property="directives" ofType="com.nu.modules.config.servicedirective.entity.ConfigServiceDirective">
|
<collection property="directives" ofType="com.nu.modules.config.servicedirective.entity.ConfigServiceDirective">
|
||||||
<id property="id" column="directive_id" />
|
<id property="id" column="directive_id"/>
|
||||||
<result property="directiveName" column="directive_name" />
|
<result property="directiveName" column="directive_name"/>
|
||||||
<result property="categoryId" column="category_id" />
|
<result property="categoryId" column="category_id"/>
|
||||||
<result property="typeId" column="type_id" />
|
<result property="typeId" column="type_id"/>
|
||||||
<result property="instructionTagId" column="instruction_tag_id" />
|
<result property="instructionTagId" column="instruction_tag_id"/>
|
||||||
<result property="instructionTagName" column="instruction_name" />
|
<result property="instructionTagName" column="instruction_name"/>
|
||||||
<result property="tollPrice" column="toll_price" />
|
<result property="tollPrice" column="toll_price"/>
|
||||||
<result property="comPrice" column="com_price" />
|
<result property="comPrice" column="com_price"/>
|
||||||
<result property="izReimbursement" column="iz_reimbursement" />
|
<result property="izReimbursement" column="iz_reimbursement"/>
|
||||||
<result property="izPreferential" column="iz_preferential" />
|
<result property="izPreferential" column="iz_preferential"/>
|
||||||
<result property="chargingFrequency" column="charging_frequency" />
|
<result property="chargingFrequency" column="charging_frequency"/>
|
||||||
<result property="cycleType" column="cycle_type" />
|
<result property="cycleType" column="cycle_type"/>
|
||||||
<result property="serviceContent" column="service_content" />
|
<result property="serviceContent" column="service_content"/>
|
||||||
<result property="serviceDuration" column="service_duration" />
|
<result property="serviceDuration" column="service_duration"/>
|
||||||
<result property="izEnabled" column="directive_iz_enabled" />
|
<result property="izEnabled" column="directive_iz_enabled"/>
|
||||||
<result property="delFlag" column="directive_del_flag" />
|
<result property="delFlag" column="directive_del_flag"/>
|
||||||
<result property="createBy" column="directive_create_by" />
|
<result property="createBy" column="directive_create_by"/>
|
||||||
<result property="createTime" column="directive_create_time" />
|
<result property="createTime" column="directive_create_time"/>
|
||||||
<result property="updateBy" column="directive_update_by" />
|
<result property="updateBy" column="directive_update_by"/>
|
||||||
<result property="updateTime" column="directive_update_time" />
|
<result property="updateTime" column="directive_update_time"/>
|
||||||
<result property="sysOrgCode" column="directive_sys_org_code" />
|
<result property="sysOrgCode" column="directive_sys_org_code"/>
|
||||||
<result property="mp3File" column="mp3_file" />
|
<result property="mp3File" column="mp3_file"/>
|
||||||
<result property="mp4File" column="mp4_file" />
|
<result property="mp4File" column="mp4_file"/>
|
||||||
<result property="categoryName" column="csc_category_name" />
|
<result property="categoryName" column="csc_category_name"/>
|
||||||
<result property="typeName" column="cst_type_name" />
|
<result property="typeName" column="cst_type_name"/>
|
||||||
<result property="previewFile" column="preview_file"/>
|
<result property="previewFile" column="preview_file"/>
|
||||||
<result property="immediateFile" column="immediate_file"/>
|
<result property="immediateFile" column="immediate_file"/>
|
||||||
<result property="cycleTypeShow" column="cycleTypeShow"/>
|
<result property="cycleTypeShow" column="cycleTypeShow"/>
|
||||||
<result property="cycleTypeValue" column="cycleTypeValue"/>
|
<result property="cycleTypeValue" column="cycleTypeValue"/>
|
||||||
<!-- 关联的体型标签列表 -->
|
<!-- 关联的体型标签列表 -->
|
||||||
<collection property="bodyTagList" ofType="com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag">
|
<collection property="bodyTagList" ofType="com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag">
|
||||||
<id property="id" column="tag_id" />
|
<id property="id" column="tag_id"/>
|
||||||
<result property="tagName" column="bodytag_name" />
|
<result property="tagName" column="bodytag_name"/>
|
||||||
<result property="sort" column="bodytag_sort" />
|
<result property="sort" column="bodytag_sort"/>
|
||||||
<result property="izEnabled" column="bodytag_iz_enabled" />
|
<result property="izEnabled" column="bodytag_iz_enabled"/>
|
||||||
<result property="delFlag" column="bodytag_del_flag" />
|
<result property="delFlag" column="bodytag_del_flag"/>
|
||||||
<result property="createBy" column="bodytag_create_by" />
|
<result property="createBy" column="bodytag_create_by"/>
|
||||||
<result property="createTime" column="bodytag_create_time" />
|
<result property="createTime" column="bodytag_create_time"/>
|
||||||
<result property="updateBy" column="bodytag_update_by" />
|
<result property="updateBy" column="bodytag_update_by"/>
|
||||||
<result property="updateTime" column="bodytag_update_time" />
|
<result property="updateTime" column="bodytag_update_time"/>
|
||||||
<result property="sysOrgCode" column="bodytag_sys_org_code" />
|
<result property="sysOrgCode" column="bodytag_sys_org_code"/>
|
||||||
</collection>
|
</collection>
|
||||||
<!-- 关联的情绪标签列表 -->
|
<!-- 关联的情绪标签列表 -->
|
||||||
<collection property="emotionTagList" ofType="com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag">
|
<collection property="emotionTagList"
|
||||||
<id property="id" column="emotag_id" />
|
ofType="com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag">
|
||||||
<result property="tagName" column="emotag_name" />
|
<id property="id" column="emotag_id"/>
|
||||||
<result property="sort" column="emotag_sort" />
|
<result property="tagName" column="emotag_name"/>
|
||||||
<result property="izEnabled" column="emotag_iz_enabled" />
|
<result property="sort" column="emotag_sort"/>
|
||||||
<result property="delFlag" column="emotag_del_flag" />
|
<result property="izEnabled" column="emotag_iz_enabled"/>
|
||||||
<result property="createBy" column="emotag_create_by" />
|
<result property="delFlag" column="emotag_del_flag"/>
|
||||||
<result property="createTime" column="emotag_create_time" />
|
<result property="createBy" column="emotag_create_by"/>
|
||||||
<result property="updateBy" column="emotag_update_by" />
|
<result property="createTime" column="emotag_create_time"/>
|
||||||
<result property="updateTime" column="emotag_update_time" />
|
<result property="updateBy" column="emotag_update_by"/>
|
||||||
<result property="sysOrgCode" column="emotag_sys_org_code" />
|
<result property="updateTime" column="emotag_update_time"/>
|
||||||
|
<result property="sysOrgCode" column="emotag_sys_org_code"/>
|
||||||
</collection>
|
</collection>
|
||||||
</collection>
|
</collection>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
<update id="updateTotalDurationInt">
|
<update id="updateTotalDurationInt">
|
||||||
update nu_config_directive_package set total_duration = #{duration} where id = #{id}
|
update nu_config_directive_package
|
||||||
|
set total_duration = #{duration}
|
||||||
|
where id = #{id}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
<!-- 分页查询 -->
|
<!-- 分页查询 -->
|
||||||
|
|
@ -152,11 +155,16 @@
|
||||||
FROM
|
FROM
|
||||||
(SELECT * FROM nu_config_directive_package
|
(SELECT * FROM nu_config_directive_package
|
||||||
<where>
|
<where>
|
||||||
del_flag = '0' and id in
|
del_flag = '0'
|
||||||
|
and id in
|
||||||
<foreach collection="ids" item="item" open="(" separator="," close=")">
|
<foreach collection="ids" item="item" open="(" separator="," close=")">
|
||||||
#{item.id}
|
#{item.id}
|
||||||
</foreach>
|
</foreach>
|
||||||
</where>) dp
|
<if test="directivePackage.instructionTagId != null and directivePackage.instructionTagId != '' ">
|
||||||
|
and instruction_tag_id = #{directivePackage.instructionTagId}
|
||||||
|
</if>
|
||||||
|
</where>
|
||||||
|
) dp
|
||||||
LEFT JOIN nu_config_package_directive pd ON dp.id = pd.package_id
|
LEFT JOIN nu_config_package_directive pd ON dp.id = pd.package_id
|
||||||
LEFT JOIN nu_config_service_directive csd ON pd.directive_id = csd.id
|
LEFT JOIN nu_config_service_directive csd ON pd.directive_id = csd.id
|
||||||
LEFT JOIN nu_directive_body_tag bdt ON csd.id = bdt.directive_id
|
LEFT JOIN nu_directive_body_tag bdt ON csd.id = bdt.directive_id
|
||||||
|
|
@ -185,7 +193,9 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<delete id="deleteDirectives">
|
<delete id="deleteDirectives">
|
||||||
delete from nu_config_package_directive where package_id = #{package.id}
|
delete
|
||||||
|
from nu_config_package_directive
|
||||||
|
where package_id = #{package.id}
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<insert id="saveDirectives">
|
<insert id="saveDirectives">
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,8 @@ public class DirectivePackageServiceImpl extends ServiceImpl<DirectivePackageMap
|
||||||
List<DirectivePackage> query = Lists.newArrayList();
|
List<DirectivePackage> query = Lists.newArrayList();
|
||||||
DirectivePackage queryDto = new DirectivePackage().setId(id);
|
DirectivePackage queryDto = new DirectivePackage().setId(id);
|
||||||
query.add(queryDto);
|
query.add(queryDto);
|
||||||
List<DirectivePackage> directivePackages = baseMapper.queryList(null, query);
|
DirectivePackage directivePackage = new DirectivePackage();
|
||||||
|
List<DirectivePackage> directivePackages = baseMapper.queryList(directivePackage, query);
|
||||||
return directivePackages.stream().findFirst().orElse(null);
|
return directivePackages.stream().findFirst().orElse(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue