77

science-admin/src/main/java/com/yiboshi/science/entity/ComExpert.java

@@ -18,6 +18,9 @@ public class ComExpert extends BaseEntity {
     /** 专家状态  1 启用  2 停用 */
     @ApiModelProperty(value = "专家状态  1 启用  2 停用", position = 7 )
     private Integer expertState;
+    /** 上报状态  1 未上报  2 已上报 */
+    @ApiModelProperty(value = "上报状态  1 未上报  2 已上报", position = 7 )
+    private Integer reportState;
     /** 备注 */
     @ApiModelProperty(value = "备注", position = 19 )
     @Length(max=200, message = "备注不能大于200")

science-admin/src/main/java/com/yiboshi/science/param/dto/ComExpertDTO.java

@@ -24,6 +24,9 @@ public class ComExpertDTO extends BaseDTO {
     /** 专家状态  1 启用  2 停用 */
     @ApiModelProperty(value = "专家状态  1 启用  2 停用", position = 3 )
     private Integer expertState;
+    /** 上报状态  1 未上报  2 已上报 */
+    @ApiModelProperty(value = "上报状态  1 未上报  2 已上报", position = 7 )
+    private Integer reportState;
     /** 备注 */
     @ApiModelProperty(value = "备注", position = 19 )
     @Length(max=200, message = "备注不能大于200")

science-admin/src/main/java/com/yiboshi/science/param/query/ComExpertQueryVO.java

@@ -25,16 +25,21 @@ public class ComExpertQueryVO extends PaginationVO {
     /** 专家状态  1 启用  2 停用 */
     @ApiModelProperty(value = "专家状态  1 启用  2 停用", position = 7 )
     private Integer expertState;
+    /** 上报状态  1 未上报  2 已上报 */
+    @ApiModelProperty(value = "上报状态  1 未上报  2 已上报", position = 7 )
+    private Integer reportState;
     /** 备注 */
     @ApiModelProperty(value = "备注", position = 19 )
     @Length(max=200, message = "备注不能大于200")
     private String remark;
 
 
-
     /** 专家状态  1 启用  2 停用 */
     @ApiModelProperty(value = "专家状态  1 启用  2 停用", position = 4 )
     private String expertStateName;
+    /** 上报状态  1 未上报  2 已上报 */
+    @ApiModelProperty(value = "上报状态  1 未上报  2 已上报", position = 7 )
+    private Integer reportStateName;
 
     /** 姓名 */
     @ExcelProperty("姓名")

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComExpertController.java

@@ -54,6 +54,8 @@ public class ComExpertController extends BaseController<ComExpertService, ComExp
         vo.setRoleId(CommonEnum.systemRole.expert.getCode().toString());
         if (SecurityUserHolder.getRoles().contains(CommonEnum.systemRole.unit.getCode().toString())) {
             vo.setUnitId(SecurityUserHolder.getUnitId());
+        }else{
+            vo.setReportState(2);
         }
         Pagination<ComExpertDTO> page = comExpertService.getListByPage(vo);
         if (null != page && null != page.getDataList() && page.getDataList().size() != 0) {

science-admin/src/main/java/com/yiboshi/science/service/impl/ComExpertServiceImpl.java

@@ -47,7 +47,10 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
     @Override
     protected void setCriteriaForQuery(ComExpertQueryVO vo, QueryWrapper<ComExpertQueryVO> criteria) {
         if (Objects.nonNull(vo.getUnitId())) {
-            criteria.eq("e.unit_id", vo.getUnitId());
+            criteria.eq("a.unit_id", vo.getUnitId());
+        }
+        if (Objects.nonNull(vo.getReportState())) {
+            criteria.eq("a.report_state", vo.getReportState());
         }
         if (Objects.nonNull(vo.getCertId())) {
             criteria.eq("e.cert_id", vo.getCertId());
@@ -107,6 +110,7 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
 
     @Transactional
     public String insert(ComExpertDTO dto) {
+        dto.setReportState(1);
         dto.setCertId(dto.getCertId().toLowerCase());
         ComPerson comPerson = comPersonService.getPersonByCertId(dto.getCertId());
         ComExpert comExpert = new ComExpert();