Commit dd385468 authored by 周昊's avatar 周昊

1、开发接口获取法律依据列表

2、开发接口据字典key获取字典列表
parent ab701ba6
......@@ -6,10 +6,12 @@ import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
import com.censoft.censoftrongtong.service.*;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysUploadFileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
......@@ -55,6 +57,12 @@ public class RiskPlanAppController extends BaseController {
@Resource
private ISysUploadFileService uploadFileService;
@Resource
private ILawListService lawListService;
@Resource
private ISysDictDataService dictDataService;
/**
* 服务器地址
*/
......@@ -119,13 +127,20 @@ public class RiskPlanAppController extends BaseController {
@GetMapping("/create/list")
public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByCreateUser(String status) {
List<RiskPlanStatusType> statusList;
String state;
if ("running".equals(status)) {
statusList = Arrays.asList(RiskPlanStatusType.WAIT_START, RiskPlanStatusType.RUNNING);
state = "待执行";
} else {
statusList = Arrays.asList(RiskPlanStatusType.WAIT_FINISH, RiskPlanStatusType.FINISH
, RiskPlanStatusType.WAIT_ADJUST, RiskPlanStatusType.REVOKE);
state = "已执行";
}
return R.ok(riskPlanService.getRiskPlanAppListDtoList(statusList, getUserId(), null));
List<RiskPlanAppListDto> list = riskPlanService.getRiskPlanAppListDtoList(statusList, getUserId(), null);
list.forEach(dto -> {
dto.setState(state);
});
return R.ok(list);
}
/**
......@@ -361,4 +376,26 @@ public class RiskPlanAppController extends BaseController {
public R<Integer> revokeByPlanId(@PathVariable("planId") Long planId) {
return R.ok(riskPlanService.revokeByPlanId(planId,getUserId()));
}
/**
* 获取法律依据
*
* @real_return {@link R<List<LawList>>}
*/
@GetMapping("/law/list")
public R<List<LawList>> getLawList(LawList lawList) {
return R.ok(lawListService.selectLawListList(lawList));
}
/**
* 根据字典key获取字典列表
*
* @real_return {@link R<List<SysDictData>>}
*/
@GetMapping("/dict/data/list")
public R<List<SysDictData>> getSysDictDataList(SysDictData dictData) {
return R.ok(dictDataService.selectDictDataList(dictData));
}
}
......@@ -57,13 +57,13 @@ public class RiskPlan extends BaseEntity
private Long approveUserId;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/** 状态 */
......
......@@ -26,4 +26,7 @@ public class RiskPlanAppListDto {
/** 处理人员 */
private String leaderUserName;
/** 显示状态 */
private String state;
}
......@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectLawListVo">
select id, name, type, sketch, range, normative_references, issue_date, implementation_date, del_flag, create_by, create_time, update_by, update_time from law_list
select id, name, type, sketch, `RANGE`, normative_references, issue_date, implementation_date, del_flag, create_by, create_time, update_by, update_time from law_list
</sql>
<select id="selectLawListList" parameterType="com.censoft.censoftrongtong.domain.LawList" resultMap="LawListResult">
......
......@@ -77,7 +77,7 @@ spring:
# 端口,默认为6379
port: 6379
# 数据库索引
database: 0
database: 1
# 密码
password:
# 连接超时时间
......
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