公共接口修改

master
liuqingkun 3 years ago
parent 9bf0437434
commit a3a93896f5
  1. 6
      doc/api.md
  2. 11
      src/main/java/org/springblade/modules/business/controller/AppealRegController.java
  3. 18
      src/main/java/org/springblade/modules/system/mapper/DictBizMapper.xml
  4. 12
      src/main/java/org/springblade/modules/system/vo/DictSimpleVO.java

@ -44,11 +44,13 @@
"data": [ "data": [
{ {
"id": "1666700063321280514", "id": "1666700063321280514",
"dictValue": "其他事项" "dictValue": "其他事项",
"isSealed": 0 // 是否被使用, 0:否, 1:是
}, },
{ {
"id": "1666626705640546306", "id": "1666626705640546306",
"dictValue": "婚恋家庭纠纷" "dictValue": "婚恋家庭纠纷",
"isSealed": 0
} }
], ],
"msg": "操作成功" "msg": "操作成功"

@ -74,6 +74,17 @@ public class AppealRegController extends BladeController {
return null; return null;
} }
/**
* 导出
*
* @param file 诉求状态
* @return
*/
@GetMapping("/importData")
public R importData(String file) {
return null;
}
/** /**
* 根据id获取诉求信息, 上一次调解记录(点击"再次调解") * 根据id获取诉求信息, 上一次调解记录(点击"再次调解")
* *

@ -15,6 +15,19 @@
<result column="is_deleted" property="isDeleted"/> <result column="is_deleted" property="isDeleted"/>
</resultMap> </resultMap>
<!-- 通用查询映射结果 -->
<resultMap id="dictResultMap2" type="org.springblade.modules.system.entity.DictBiz">
<id column="id" property="id"/>
<result column="tenant_id" property="tenantId"/>
<result column="parent_id" property="parentId"/>
<result column="code" property="code"/>
<result column="dict_key" property="dictKey"/>
<result column="dict_value" property="dictValue"/>
<result column="sort" property="sort"/>
<result column="remark" property="remark"/>
<result column="sealed" property="isSealed"/>
</resultMap>
<resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode"> <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
<id column="id" property="id"/> <id column="id" property="id"/>
<result column="parent_id" property="parentId"/> <result column="parent_id" property="parentId"/>
@ -40,11 +53,12 @@
select id, tenant_id, parent_id, code, dict_key, dict_value, sort, remark from blade_dict_biz where code = #{param1} and parent_id > 0 and is_sealed = 0 and is_deleted = 0 select id, tenant_id, parent_id, code, dict_key, dict_value, sort, remark from blade_dict_biz where code = #{param1} and parent_id > 0 and is_sealed = 0 and is_deleted = 0
</select> </select>
<select id="getListThirdLevel" resultMap="dictResultMap"> <select id="getListThirdLevel" resultMap="dictResultMap2">
SELECT biz3.* SELECT biz3.*, if(swd.id IS NULL, 0, 1) sealed
FROM blade_dict_biz biz FROM blade_dict_biz biz
LEFT JOIN blade_dict_biz biz2 ON biz.id = biz2.parent_id LEFT JOIN blade_dict_biz biz2 ON biz.id = biz2.parent_id
LEFT JOIN blade_dict_biz biz3 ON biz2.id = biz3.parent_id LEFT JOIN blade_dict_biz biz3 ON biz2.id = biz3.parent_id
LEFT JOIN mp_server_windows_dispute swd ON biz3.id = swd.dispute_id
WHERE biz.code = #{dictCode} AND biz.parent_id = 0 WHERE biz.code = #{dictCode} AND biz.parent_id = 0
</select> </select>

@ -16,19 +16,13 @@
*/ */
package org.springblade.modules.system.vo; package org.springblade.modules.system.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tool.node.INode;
import org.springblade.modules.system.entity.Dict;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/** /**
* 视图实体类 * 视图实体类
@ -50,4 +44,10 @@ public class DictSimpleVO implements Serializable {
*/ */
@ApiModelProperty(value = "字典名称") @ApiModelProperty(value = "字典名称")
private String dictValue; private String dictValue;
/**
* 是否被使用, 0:, 1:
*/
@ApiModelProperty(value = "是否被使用")
private Integer isSealed;
} }

Loading…
Cancel
Save