feat:机关角色后台填写上报信息

This commit is contained in:
周源 2021-10-12 12:00:56 +08:00
parent 73455f5669
commit edb9ccaced
4 changed files with 32 additions and 3 deletions

View File

@ -11,7 +11,7 @@
<parent> <parent>
<groupId>com.ydool.boot</groupId> <groupId>com.ydool.boot</groupId>
<artifactId>ydool-boot</artifactId> <artifactId>ydool-boot</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT-rd</version>
</parent> </parent>
<properties> <properties>

View File

@ -1,7 +1,7 @@
package com.ydool.boot.modules.rddb.entity; package com.ydool.boot.modules.rddb.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.ydool.boot.core.entity.BaseEntity; import com.ydool.boot.core.entity._BaseDataEntity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@TableName("t_report") @TableName("t_report")
public class Report extends BaseEntity{ public class Report extends _BaseDataEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

View File

@ -43,6 +43,7 @@ public class ReportController extends BaseAdminController {
} }
@PostMapping("list") @PostMapping("list")
@PreAuth("rddb:report:list")
@ResponseBody @ResponseBody
public void list(Report report) { public void list(Report report) {
QueryWrapper<Report> wrapper = new QueryWrapper<>(); QueryWrapper<Report> wrapper = new QueryWrapper<>();
@ -72,6 +73,7 @@ public class ReportController extends BaseAdminController {
if(StrUtil.isBlank(report.getId())) { if(StrUtil.isBlank(report.getId())) {
report.setCreatedId(getLoginUser().getId()); report.setCreatedId(getLoginUser().getId());
report.setStreetStr(getLoginUser().getStreetId()); report.setStreetStr(getLoginUser().getStreetId());
report.setHireStatus(0);
} }
boolean flag = reportService.saveOrUpdate(report); boolean flag = reportService.saveOrUpdate(report);
render(flag ? Ret.ok() : Ret.fail("操作失败")); render(flag ? Ret.ok() : Ret.fail("操作失败"));

View File

@ -79,6 +79,7 @@
</div> </div>
</div> </div>
<!--files--> <!--files-->
<% if(hasAuth("rddb:report:audit")) { %>
<div class="form-unit">审核信息</div> <div class="form-unit">审核信息</div>
<act:title title="" fields="4"/> <act:title title="" fields="4"/>
<act:input text="录用状态" name="hireStatus" col="2" as="select" dictType="sys_wait_pass_refuse"/> <act:input text="录用状态" name="hireStatus" col="2" as="select" dictType="sys_wait_pass_refuse"/>
@ -99,7 +100,32 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<% } %>
<% else { %>
<div class="form-unit">审核信息</div>
<act:title title="" fields="4"/>
<act:input text="录用状态" name="hireStatus" col="2" as="select" dictType="sys_wait_pass_refuse" readonly="true" />
<act:input text="录用级别" name="hireLevel" col="2" as="select" dictType="report_hire_level" readonly="true"/>
<act:input text="录用媒体" name="hireCategory" col="2" as="select" dictType="report_hire_category" readonly="true"/>
<act:input text="录用时间" as="date" view="month" name="hireDate" col="2" readonly="true"/>
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2">
<span aria-required="true"></span>
得分:
</label>
<div class="col-sm-10">
<input type="number" max="100" min="1" id="title" name="score" value="${report.score!}" maxlength="" readonly
class="form-control" placeholder="">
</div>
</div>
</div>
</div> </div>
</div>
<% } %>
<div class="box-footer"> <div class="box-footer">
<div class="row"> <div class="row">
@ -115,6 +141,7 @@
</div> </div>
</div> </div>
</div> </div>
</act:form> </act:form>
</div> </div>
</div> </div>