员工信息-02

src/main/java/com/chinaitop/DatePermissionInterceptor.java

@@ -58,7 +58,18 @@ public class DatePermissionInterceptor implements Interceptor {
 		//sql是查询的才进行权限过滤
 	    if(mappedStatement.getSqlCommandType().toString().equals("select".toUpperCase())&&
 				!"com.chinaitop.depot.basic.mapper.BasicStorehouseMapper.selectByExampleNew".equals(mappedStatement.getId()) &&
-				!"com.chinaitop.depot.basic.mapper.BasicTankMapper.selectByExampleNew".equals(mappedStatement.getId())) {
+				!"com.chinaitop.depot.basic.mapper.BasicTankMapper.selectByExampleNew".equals(mappedStatement.getId()) &&
+				!"com.chinaitop.depot.basic.mapper.DRyxxsjyMapper.getPageList_COUNT".equals(mappedStatement.getId()) &&
+				!"com.chinaitop.depot.basic.mapper.DRyxxsjyMapper.getPageList".equals(mappedStatement.getId()) &&
+				!"com.chinaitop.depot.basic.mapper.DRyxxsjyMapper.getById".equals(mappedStatement.getId()) &&
+				!"com.chinaitop.depot.basic.mapper.DRyxxsjyMapper.getQuanById".equals(mappedStatement.getId()) &&
+				!"com.chinaitop.depot.basic.mapper.DRyxxsjyMapper.getFeiById".equals(mappedStatement.getId()) &&
+				!"com.chinaitop.depot.basic.mapper.DRyxxsjyMapper.getRotaterotateById".equals(mappedStatement.getId()) &&
+				!"com.chinaitop.depot.basic.mapper.DRyxxsjyMapper.getSkillListById".equals(mappedStatement.getId()) &&
+				!"com.chinaitop.depot.basic.mapper.DRyxxsjyMapper.getReportListById".equals(mappedStatement.getId()) &&
+				!"com.chinaitop.depot.basic.mapper.DRyxxsjyMapper.getCertificatesListById".equals(mappedStatement.getId()) &&
+				!"com.chinaitop.depot.basic.mapper.DRyxxsjyMapper.getZwlxbgjlListById".equals(mappedStatement.getId())
+				) {
 	    
 			//通过本地线程获取库id
 			Object threadLocalObj = DataPolicyEngine.get();

src/main/java/com/chinaitop/depot/basic/controller/DRyxxsjyController.java

@@ -6,6 +6,8 @@ import com.chinaitop.depot.basic.service.DRyxxsjyService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -29,6 +31,12 @@ public class DRyxxsjyController {
 
     @GetMapping("/getPageList")
     @ApiOperation(value="查询员工信息列表", notes = "支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "query"),
+            @ApiImplicitParam(name = "ryxm", value = "人员姓名", paramType = "query")
+    })
     public PageInfo<DRyxxsjyVO> getPageList(@Valid DRyxxsjyPageParam pageParam) {
         PageHelper.startPage(pageParam.getPageNum(), pageParam.getPageSize());
         return new PageInfo<>(dRyxxsjyService.getPageList(pageParam));

src/main/java/com/chinaitop/depot/basic/model/DRyxxsjyVO.java

@@ -334,5 +334,5 @@ public class DRyxxsjyVO {
 	@ApiModelProperty(value = "其它附件")
 	private List<Object> otherVoList;
 	@ApiModelProperty(value = "职务类型变更记录")
-	private List<ZwlxbgjlVO> ZwlxbgjlVOVOList;
+	private List<ZwlxbgjlVO> zwlxbgjlVOList;
 }

src/main/java/com/chinaitop/depot/basic/model/vo/RotaterotateVO.java

@@ -1,7 +1,10 @@
 package com.chinaitop.depot.basic.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author qingsong.han
  * @description:
@@ -13,7 +16,8 @@ public class RotaterotateVO {
     // 业务类型
     private String businessType;
     // 业务时间
-    private String businessTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date businessTime;
     // 文件编号
     private String serialNumber;
 }

src/main/java/com/chinaitop/depot/basic/service/impl/DRyxxsjyServiceImpl.java

@@ -68,7 +68,7 @@ public class DRyxxsjyServiceImpl implements DRyxxsjyService {
         // 职务类型变更记录
         List<ZwlxbgjlVO> zwlxbgjlVOList = dRyxxsjyMapper.getZwlxbgjlListById(dRyxxsjyVO.getSfzh());
         if (!CollectionUtils.isEmpty(zwlxbgjlVOList)) {
-            dRyxxsjyVO.setZwlxbgjlVOVOList(zwlxbgjlVOList);
+            dRyxxsjyVO.setZwlxbgjlVOList(zwlxbgjlVOList);
         }
         return dRyxxsjyVO;
     }