xiangshan
/
rd-admin-java
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

审议督政-满意度测评流程中增加一个参与测评对象选择，保留选择测评人员，在下方增加一个选项，可选择两类（人大代表、选民），不选择就不展示到人大代表和选民的版块，选择的话就将本次主题的所有流程展示到所选择的对象版块中的满意度测评功能里的去供人大代表或者选民查看评分

This commit is contained in:
lijiaqi 2022-08-16 16:09:41 +08:00
parent 568e0da097
commit 493f5c1f11
25 changed files with 138 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/ydool/boot/api/controller/ApiContactDbController.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
import com.github.xiaoymin.knife4j.annotations.DynamicResponseParameters;
import com.ydool.boot.common.result.Ret;
import com.ydool.boot.modules.rddb.entity.Const;
import com.ydool.boot.modules.rddb.entity.ContactDb;
import com.ydool.boot.modules.rddb.entity.ContactDbComment;
import com.ydool.boot.modules.rddb.entity.dto.ContactDbDto;
@ -43,14 +44,20 @@ public class ApiContactDbController extends ApiBaseController {
ContactDbCommentService contactDbCommentService;
@ApiImplicitParams({@ApiImplicitParam(name = "page", value = "当前页"), @ApiImplicitParam(name = "size", value = "显示条数"),})
@ApiImplicitParams({@ApiImplicitParam(name = "page", value = "当前页"), @ApiImplicitParam(name = "size", value = "显示条数"), @ApiImplicitParam(name = "platform", value = "当前登录的是哪个端 admin机关办公/ rddb代表/ voter选民 ", required = true)})
@DynamicResponseParameters(properties = {@DynamicParameter(value = "常委会联系代表", name = "data", dataTypeClass = ContactDbDto.class)})
@ApiOperation("常委会联系代表列表 (被指定的人与创建人可见)")
@GetMapping
public void contactDbPage() {
public void contactDbPage(String platform) {
Assert.notNull(platform, "请填入当前端参数");
QueryWrapper<ContactDb> qw = new QueryWrapper<ContactDb>()
// .and(_qw -> _qw.eq("created_id", getApiUserId()).or().inSql("id", "select contact_db_id from t_contact_db_user where user_id='" + getApiUserId() + "'"))
.orderByDesc("created_at");
if (Const.TYPE_RDDB.equals(platform)) {
qw.like("obj", platform);
} else if (Const.TYPE_VOTER.equals(platform)) {
qw.like("obj", platform);
}
IPage<ContactDb> paged = contactDbService.page(new Page<>(getPageNum(), getPageSize()), qw);
render(Ret.ok().paged(ContactDbWrapper.build().pageVO(paged)));
}

10
src/main/java/com/ydool/boot/api/controller/ApiReviewOfficerController.java
View File

@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
import com.github.xiaoymin.knife4j.annotations.DynamicResponseParameters;
import com.ydool.boot.common.result.Ret;
import com.ydool.boot.modules.rddb.entity.Const;
import com.ydool.boot.modules.rddb.entity.ReviewOfficer;
import com.ydool.boot.modules.rddb.entity.ReviewOfficerComment;
import com.ydool.boot.modules.rddb.entity.dto.ReviewOfficerDto;
@ -52,13 +53,15 @@ public class ApiReviewOfficerController extends ApiBaseController {
@ApiImplicitParam(name = "size", value = "显示条数"),
@ApiImplicitParam(name = "type", value = "类型 1法官评议 2检查官评议 "),
@ApiImplicitParam(name = "reviewSubject", value = "评议主题"),
@ApiImplicitParam(name = "platform", value = "当前登录的是哪个端 admin机关办公/ rddb代表/ voter选民 ", required = true)
})
@DynamicResponseParameters(properties = {
@DynamicParameter(value = "评议", name = "data", dataTypeClass = ReviewOfficerDto.class)
})
@ApiOperation("评议列表 (被指定的人与创建人可见)")
@GetMapping
public void reviewPage(String type,String reviewSubject) {
public void reviewPage(String type,String reviewSubject,String platform) {
Assert.notNull(platform, "请填入当前端参数");
QueryWrapper<ReviewOfficer> qw = new QueryWrapper<ReviewOfficer>()
.eq("type", type)
.like(StrUtil.isNotBlank(reviewSubject),"review_subject", reviewSubject)
@ -69,6 +72,11 @@ public class ApiReviewOfficerController extends ApiBaseController {
// .or()
// .inSql("id", "select review_id from t_review_officer_audit where user_id='" + getApiUserId() + "'"))
.orderByDesc("created_at");
if (Const.TYPE_RDDB.equals(platform)) {
qw.like("obj", platform);
} else if (Const.TYPE_VOTER.equals(platform)) {
qw.like("obj", platform);
}
IPage<ReviewOfficer> paged = reviewOfficerService.page(new Page<>(getPageNum(), getPageSize()), qw);
render(Ret.ok().paged(ReviewOfficerWrapper.build().pageVO(paged)));
}

10
src/main/java/com/ydool/boot/api/controller/ApiReviewSubjectController.java
View File

@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
import com.github.xiaoymin.knife4j.annotations.DynamicResponseParameters;
import com.ydool.boot.common.result.Ret;
import com.ydool.boot.modules.rddb.entity.Const;
import com.ydool.boot.modules.rddb.entity.ReviewSubject;
import com.ydool.boot.modules.rddb.entity.ReviewSubjectComment;
import com.ydool.boot.modules.rddb.entity.dto.ReviewSubjectDto;
@ -52,13 +53,15 @@ public class ApiReviewSubjectController extends ApiBaseController {
@ApiImplicitParam(name = "size", value = "显示条数"),
@ApiImplicitParam(name = "type", value = "类型 1专题询问 2专项评议 "),
@ApiImplicitParam(name = "reviewSubject", value = "评议主题"),
@ApiImplicitParam(name = "platform", value = "当前登录的是哪个端 admin机关办公/ rddb代表/ voter选民 ", required = true)
})
@DynamicResponseParameters(properties = {
@DynamicParameter(value = "评议", name = "data", dataTypeClass = ReviewSubjectDto.class)
})
@ApiOperation("评议列表 (被指定的人与创建人可见)")
@GetMapping
public void reviewPage(String type,String reviewSubject) {
public void reviewPage(String type,String reviewSubject,String platform) {
Assert.notNull(platform, "请填入当前端参数");
QueryWrapper<ReviewSubject> qw = new QueryWrapper<ReviewSubject>()
.eq("type", type)
.like(StrUtil.isNotBlank(reviewSubject),"review_subject", reviewSubject)
@ -69,6 +72,11 @@ public class ApiReviewSubjectController extends ApiBaseController {
// .or()
// .inSql("id", "select review_id from t_review_subject_audit where user_id='" + getApiUserId() + "'"))
.orderByDesc("created_at");
if (Const.TYPE_RDDB.equals(platform)) {
qw.like("obj", platform);
} else if (Const.TYPE_VOTER.equals(platform)) {
qw.like("obj", platform);
}
IPage<ReviewSubject> paged = reviewSubjectService.page(new Page<>(getPageNum(), getPageSize()), qw);
render(Ret.ok().paged(ReviewSubjectWrapper.build().pageVO(paged)));
}

14
src/main/java/com/ydool/boot/api/controller/ApiReviewSuperviseController.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
import com.github.xiaoymin.knife4j.annotations.DynamicResponseParameters;
import com.ydool.boot.common.result.Ret;
import com.ydool.boot.modules.rddb.entity.Const;
import com.ydool.boot.modules.rddb.entity.ReviewSupervise;
import com.ydool.boot.modules.rddb.entity.ReviewSuperviseComment;
import com.ydool.boot.modules.rddb.entity.dto.ReviewSuperviseDto;
@ -49,22 +50,29 @@ public class ApiReviewSuperviseController extends ApiBaseController {
@ApiImplicitParam(name = "size", value = "显示条数"),
@ApiImplicitParam(name = "subjectName", value = "主题名称"),
@ApiImplicitParam(name = "type", value = "分类 会议审查conference/视察调研view/执法检查law/其他活动other"),
@ApiImplicitParam(name = "platform", value = "当前登录的是哪个端 admin机关办公/ rddb代表/ voter选民 ", required = true)
})
@DynamicResponseParameters(properties = {
@DynamicParameter(value = "审议督政", name = "data", dataTypeClass = ReviewSuperviseDto.class)
})
@ApiOperation("列表 (被指定的人与创建人可见)")
@GetMapping
public void reviewSupervisePage(String subjectName,String type) {
public void reviewSupervisePage(String subjectName, String type, String platform) {
Assert.notNull(platform, "请填入当前端参数");
QueryWrapper<ReviewSupervise> qw = new QueryWrapper<ReviewSupervise>()
// .and(_qw -> _qw
// .eq("created_id", getApiUserId())
// .or()
// .inSql("id", "select review_supervise_id from t_review_supervise_user where user_id='" + getApiUserId() + "'")
// )
.like(StrUtil.isNotBlank(subjectName),"subject_name",subjectName)
.like(StrUtil.isNotBlank(type),"type",type)
.like(StrUtil.isNotBlank(subjectName), "subject_name", subjectName)
.like(StrUtil.isNotBlank(type), "type", type)
.orderByDesc("created_at");
if (Const.TYPE_RDDB.equals(platform)) {
qw.like("obj", platform);
} else if (Const.TYPE_VOTER.equals(platform)) {
qw.like("obj", platform);
}
IPage<ReviewSupervise> paged = reviewSuperviseService.page(new Page<>(getPageNum(), getPageSize()), qw);
render(Ret.ok().paged(ReviewSuperviseWrapper.build().pageVO(paged)));
}

10
src/main/java/com/ydool/boot/api/controller/ApiReviewWorkController.java
View File

@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
import com.github.xiaoymin.knife4j.annotations.DynamicResponseParameters;
import com.ydool.boot.common.result.Ret;
import com.ydool.boot.modules.rddb.entity.Const;
import com.ydool.boot.modules.rddb.entity.ReviewWork;
import com.ydool.boot.modules.rddb.entity.ReviewWorkComment;
import com.ydool.boot.modules.rddb.entity.dto.ReviewWorkDto;
@ -50,13 +51,15 @@ public class ApiReviewWorkController extends ApiBaseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "page", value = "当前页"),
@ApiImplicitParam(name = "size", value = "显示条数"),
@ApiImplicitParam(name = "platform", value = "当前登录的是哪个端 admin机关办公/ rddb代表/ voter选民 ", required = true)
})
@DynamicResponseParameters(properties = {
@DynamicParameter(value = "评议", name = "data", dataTypeClass = ReviewWorkDto.class)
})
@ApiOperation("评议列表 (被指定的人与创建人可见)")
@GetMapping
public void reviewPage() {
public void reviewPage(String platform) {
Assert.notNull(platform, "请填入当前端参数");
QueryWrapper<ReviewWork> qw = new QueryWrapper<ReviewWork>()
// .and(_qw -> _qw
// .eq("created_id", getApiUserId())
@ -65,6 +68,11 @@ public class ApiReviewWorkController extends ApiBaseController {
// .or()
// .inSql("id", "select review_id from t_review_work_audit where user_id='" + getApiUserId() + "'"))
.orderByDesc("created_at");
if (Const.TYPE_RDDB.equals(platform)) {
qw.like("obj", platform);
} else if (Const.TYPE_VOTER.equals(platform)) {
qw.like("obj", platform);
}
IPage<ReviewWork> paged = reviewWorkService.page(new Page<>(getPageNum(), getPageSize()), qw);
render(Ret.ok().paged(ReviewWorkWrapper.build().pageVO(paged)));
}

6
src/main/java/com/ydool/boot/modules/rddb/entity/ContactDb.java
View File

@ -169,4 +169,10 @@ public class ContactDb extends BaseEntity{
@ApiModelProperty(value = "当前环节 1-6")
private Integer state;
/**
* 测评对象
*/
@ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔")
private String obj;
}

6
src/main/java/com/ydool/boot/modules/rddb/entity/ReviewOfficer.java
View File

@ -147,6 +147,12 @@ public class ReviewOfficer extends BaseEntity {
@ApiModelProperty(value = " 当前环节 1-7")
private Integer state;
/**
* 测评对象
*/
@ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔")
private String obj;
public ReviewOfficer() {
//默认公开分数
this.checkScoreState=1;

6
src/main/java/com/ydool/boot/modules/rddb/entity/ReviewSubject.java
View File

@ -147,6 +147,12 @@ public class ReviewSubject extends BaseEntity {
@ApiModelProperty(value = " 当前环节 1-7")
private Integer state;
/**
* 测评对象
*/
@ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔")
private String obj;
public ReviewSubject() {
//默认公开分数
this.checkScoreState=1;

6
src/main/java/com/ydool/boot/modules/rddb/entity/ReviewSupervise.java
View File

@ -139,4 +139,10 @@ public class ReviewSupervise extends BaseEntity {
@ApiModelProperty(value = "当前环节 1-6")
private Integer state;
/**
* 测评对象
*/
@ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔")
private String obj;
}

6
src/main/java/com/ydool/boot/modules/rddb/entity/ReviewWork.java
View File

@ -135,6 +135,12 @@ public class ReviewWork extends BaseEntity {
@ApiModelProperty(value = " 审核状态 0审批中 1已通过 2已拒绝")
private Integer status;
/**
* 测评对象
*/
@ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔")
private String obj;
/**
* 当前环节
*/

6
src/main/java/com/ydool/boot/modules/rddb/entity/bo/ContactDbBo.java
View File

@ -1,6 +1,7 @@
package com.ydool.boot.modules.rddb.entity.bo;
import com.ydool.boot.modules.rddb.entity.ContactDb;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -18,4 +19,9 @@ public class ContactDbBo extends ContactDb {
String signUserIds;
String conferenceUserIds;
String evaluateUserIds;
/**
* 测评对象
*/
@ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔")
private String obj;
}

7
src/main/java/com/ydool/boot/modules/rddb/entity/bo/ReviewOfficerBo.java
View File

@ -1,6 +1,7 @@
package com.ydool.boot.modules.rddb.entity.bo;
import com.ydool.boot.modules.rddb.entity.ReviewOfficer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -24,4 +25,10 @@ public class ReviewOfficerBo extends ReviewOfficer {
String inReportAudit1Ids;
String inReportAudit2Ids;
String checkUserIds;
/**
* 测评对象
*/
@ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔")
private String obj;
}

6
src/main/java/com/ydool/boot/modules/rddb/entity/bo/ReviewSubjectBo.java
View File

@ -1,6 +1,7 @@
package com.ydool.boot.modules.rddb.entity.bo;
import com.ydool.boot.modules.rddb.entity.ReviewSubject;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -24,4 +25,9 @@ public class ReviewSubjectBo extends ReviewSubject {
String inReportAudit1Ids;
String inReportAudit2Ids;
String checkUserIds;
/**
* 测评对象
*/
@ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔")
private String obj;
}

1
src/main/java/com/ydool/boot/modules/rddb/entity/bo/ReviewSuperviseBo.java
View File

@ -16,4 +16,5 @@ public class ReviewSuperviseBo extends ReviewSupervise {
String evaluateAttachmentArrStr;
String evaluateUserIds;
String obj;
}

6
src/main/java/com/ydool/boot/modules/rddb/entity/bo/ReviewWorkBo.java
View File

@ -1,6 +1,7 @@
package com.ydool.boot.modules.rddb.entity.bo;
import com.ydool.boot.modules.rddb.entity.ReviewWork;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -24,4 +25,9 @@ public class ReviewWorkBo extends ReviewWork {
String inReportAudit1Ids;
String inReportAudit2Ids;
String checkUserIds;
/**
* 测评对象
*/
@ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔")
private String obj;
}

6
src/main/java/com/ydool/boot/modules/rddb/entity/request/contact_db/state/ContactDbEvaluateRequest.java
View File

@ -39,4 +39,10 @@ public class ContactDbEvaluateRequest {
@ApiModelProperty(value = "测评用户id 英文逗号间隔")
String evaluateUserIds;
/**
* 测评对象
*/
@ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔")
private String obj;
}

5
src/main/java/com/ydool/boot/modules/rddb/entity/request/review_officer/state/ReviewOfficerCheckStateRequest.java
View File

@ -39,4 +39,9 @@ public class ReviewOfficerCheckStateRequest {
String checkAttachmentPath;
@ApiModelProperty(value = "打分人员 英文逗号间隔")
String checkUserIds;
/**
* 测评对象
*/
@ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔")
private String obj;
}

5
src/main/java/com/ydool/boot/modules/rddb/entity/request/review_subject/state/ReviewSubjectCheckStateRequest.java
View File

@ -39,4 +39,9 @@ public class ReviewSubjectCheckStateRequest {
String checkAttachmentPath;
@ApiModelProperty(value = "打分人员 英文逗号间隔")
String checkUserIds;
/**
* 测评对象
*/
@ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔")
private String obj;
}

7
src/main/java/com/ydool/boot/modules/rddb/entity/request/review_supervise/state/ReviewSuperviseEvaluateRequest.java
View File

@ -2,6 +2,9 @@ package com.ydool.boot.modules.rddb.entity.request.review_supervise.state;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NonNull;
import javax.validation.constraints.NotBlank;
/**
* @author zhouyuan
@ -24,4 +27,8 @@ public class ReviewSuperviseEvaluateRequest {
@ApiModelProperty(value = "参会用户id 英文逗号间隔")
String evaluateUserIds;
@ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔")
@NotBlank(message = "请选择测评人员")
String obj;
}

5
src/main/java/com/ydool/boot/modules/rddb/entity/request/review_work/state/ReviewWorkCheckStateRequest.java
View File

@ -39,4 +39,9 @@ public class ReviewWorkCheckStateRequest {
String checkAttachmentPath;
@ApiModelProperty(value = "打分人员 英文逗号间隔")
String checkUserIds;
/**
* 测评对象
*/
@ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔")
private String obj;
}

3
src/main/resources/views/modules/rddb/contact_db/form.html
View File

@ -58,9 +58,10 @@
<act:input text="办理结果" name="dealResult" col="1" />
<act:input text="测评时间" as="date" format="yyyy-MM-dd HH:mm:ss" name="evaluateAt" col="1" />
<act:input text="测评备注" name="evaluateRemark" col="1" />
<act:person text="参与人员" router="contact_db_user" type="5" userType="admin,rddb"
id="${contactDb.id!}" name="evaluateUser" />
<act:input text="测评对象" name="obj" as="select" dictType="t_measurement_object" required="true" multiple="multiple" />
</div>

1
src/main/resources/views/modules/rddb/review_officer/form.html
View File

@ -32,6 +32,7 @@
<act:input text="上传时间" as="date" format="yyyy-MM-dd HH:mm:ss" name="checkUploadAt" col="1"/>
<act:input text="调查分数是否公开" name="checkScoreState" as="radio" dictType="sys_yes_no"/>
<act:mupload text="自查/调查报告" name="checkAttachment" listStr="${checkAttachmentListStr!}"/>
<act:input text="测评对象" name="obj" as="select" dictType="t_measurement_object" required="true" multiple="multiple" />
<act:person text="打分人员" router="review_officer_user" id="${reviewOfficer.id!}" name="checkUser"/>
<div class="form-unit">意见信息</div>

2
src/main/resources/views/modules/rddb/review_subject/form.html
View File

@ -28,12 +28,14 @@
<div class="form-unit">调查信息</div>
<act:title title="" fields="3"/>
<act:input text="测评对象" name="obj" as="select" dictType="t_measurement_object" required="true" multiple="multiple" />
<act:input text="备注" name="checkRemark" col="1"/>
<act:input text="上传时间" as="date" format="yyyy-MM-dd HH:mm:ss" name="checkUploadAt" col="1"/>
<act:input text="调查分数是否公开" name="checkScoreState" as="radio" dictType="sys_yes_no"/>
<act:mupload text="自查/调查报告" name="checkAttachment" listStr="${checkAttachmentListStr!}"/>
<act:person text="打分人员" router="review_subject_user" id="${reviewSubject.id!}" name="checkUser"/>
<div class="form-unit">意见信息</div>
<act:title title="" fields="2"/>
<act:input text="备注" name="opinionRemark" col="1"/>

1
src/main/resources/views/modules/rddb/review_supervise/form.html
View File

@ -42,6 +42,7 @@
<div class="form-unit">满意度测评信息</div>
<act:title title="" fields="1" />
<act:input text="测评对象" name="obj" as="select" dictType="t_measurement_object" required="true" multiple="multiple" />
<act:person text="参会人员" router="review_supervise_user" type="evaluate" userType="admin" id="${reviewSupervise.id!}" name="evaluateUser" />
<act:mupload text="审议跟踪报告" name="evaluateAttachment" listStr="${evaluateAttachmentListStr!}" />
<act:input text="备注" name="evaluateRemark" col="2" />

1
src/main/resources/views/modules/rddb/review_work/form.html
View File

@ -31,6 +31,7 @@
<act:input text="上传时间" as="date" format="yyyy-MM-dd HH:mm:ss" name="checkUploadAt" col="1"/>
<act:input text="调查分数是否公开" name="checkScoreState" as="radio" dictType="sys_yes_no"/>
<act:mupload text="自查/调查报告" name="checkAttachment" listStr="${checkAttachmentListStr!}"/>
<act:input text="测评对象" name="obj" as="select" dictType="t_measurement_object" required="true" multiple="multiple" />
<act:person text="打分人员" router="review_work_user" id="${reviewWork.id!}" name="checkUser"/>
<div class="form-unit">意见信息</div>