1、学生评价调整

2、办事指南增加字段返回

src/main/java/com/xjrsoft/module/oa/controller/OfficialDocumentReceivedHandleController.java

@@ -56,18 +56,6 @@ public class OfficialDocumentReceivedHandleController {
         return RT.ok(pageOutput);
     }
 
-    @GetMapping(value = "/info")
-    @ApiOperation(value="根据id查询公文收文-承办表信息")
-    @SaCheckPermission("officialdocumentreceivedhandle:detail")
-    @XjrLog(value = "根据id查询公文收文-承办表信息")
-    public RT<OfficialDocumentReceivedHandleVo> info(@RequestParam Long id){
-        OfficialDocumentReceivedHandle officialDocumentReceivedHandle = officialDocumentReceivedHandleService.getById(id);
-        if (officialDocumentReceivedHandle == null) {
-           return RT.error("找不到此数据！");
-        }
-        return RT.ok(BeanUtil.toBean(officialDocumentReceivedHandle, OfficialDocumentReceivedHandleVo.class));
-    }
-
     @GetMapping(value = "last-alert-time")
     @ApiOperation(value = "新增公文收文-承办表-最新提醒时间")
     @SaCheckPermission("officialdocumentreceivedhandle:add")

src/main/java/com/xjrsoft/module/oa/service/impl/OfficialDocumentReceivedHandleServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
 * @title: 公文收文-承办表
@@ -34,6 +35,10 @@ public class OfficialDocumentReceivedHandleServiceImpl extends MPJBaseServiceImp
     @Override
     public Page<OfficialDocumentReceivedHandlePageVo> getPage(Page<OfficialDocumentReceivedHandlePageVo> page, OfficialDocumentReceivedHandlePageDto dto) {
         dto.setLoginUserId(StpUtil.getLoginIdAsLong());
+        List<String> roleList = StpUtil.getRoleList();
+        if(roleList.contains("undertaker")){
+            dto.setLoginUserId(null);
+        }
         return this.baseMapper.getPage(page, dto);
     }
 

src/main/java/com/xjrsoft/module/oa/vo/OfficialDocumentReceivedHandlePageVo.java

@@ -51,4 +51,6 @@ public class OfficialDocumentReceivedHandlePageVo {
     @ApiModelProperty("落实时间")
     private LocalDateTime handleTime;
 
+    @ApiModelProperty("是否转办(0:否 1:是)")
+    private Integer isTransfer;
 }

src/main/java/com/xjrsoft/module/organization/dto/AddRoleDto.java

@@ -24,7 +24,7 @@ public class AddRoleDto implements Serializable {
     private String name;
 
     @NotNull(message = "角色编码不能为空")
-    @Length(min = 1, max = 10, message = "编码最多20个字符！")
+    @Length(min = 1, max = 10, message = "编码最多10个字符！")
     @ApiModelProperty("编码")
     private String code;
 

src/main/resources/mapper/oa/OfficialDocumentReceivedHandleMapper.xml

@@ -10,7 +10,7 @@
         SELECT GROUP_CONCAT(c2.name) FROM official_document_received_handle c1
         INNER JOIN xjr_user c2 ON c1.receive_user_id = c2.id
         WHERE c1.delete_mark = 0 AND c1.official_document_received_id = t1.id and c1.is_transfer = 1
-        ),',', '>') AS receive_user_names,t1.is_handle,t4.name as handle_user_name,t1.handle_time FROM official_document_received t1
+        ),',', '>') AS receive_user_names,t1.is_handle,t4.name as handle_user_name,t1.handle_time,t5.is_transfer FROM official_document_received t1
         INNER JOIN xjr_workflow_form_relation t2 ON t1.id = CAST(t2.form_key_value AS SIGNED)
         LEFT JOIN xjr_user t3 ON t1.handle_duty_user_id = t3.id
         LEFT JOIN xjr_user t4 ON t1.handle_user_id = t4.id