Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0

notes-job/src/main/java/com/zjty/tynotes/job/basic/controller/WorkController.java

@@ -66,7 +66,7 @@ public class WorkController {
         return ok(new JobResponse(workId));
     }
 
-    @PutMapping(value = "/")
+    @PutMapping(value = "/upDateSave")
     @ApiOperation(value = "把任务从未发布到进行中.", notes = "修改必须在数据中附带id.")
     public ResponseEntity<JobResponse> modify(@RequestBody WorkRo workRo) {
         String userId = workRo.getUserId();
@@ -102,7 +102,7 @@ public class WorkController {
         return ok(new JobResponse(updateCrew.getWorkId()));
     }
 
-    @PutMapping(value = "/")
+    @PutMapping(value = "/upDate/Workload")
     @ApiOperation(value = "修改任务的工作量、考评系数.")
     public ResponseEntity<JobResponse> updateWorkload(@RequestParam String workId,
                                                       @RequestParam String userId,

notes-job/src/main/java/com/zjty/tynotes/job/basic/entity/database/Work.java

@@ -37,7 +37,6 @@ public class Work {
     /**
      * 上级任务id
      */
-    @Id
     @ApiModelProperty(value = "上级任务id", example = "superiorId")
     private String superiorId;
     /**

notes-job/src/main/java/com/zjty/tynotes/job/status/controller/Read1Controller.java

@@ -23,7 +23,7 @@ import java.util.HashMap;
 @AutoDocument
 @RestController
 @RequestMapping("/read")
-@Api(tags = "阅读页面接口", value = "阅读页面数据")
+@Api(tags = "查看任务页面", value = "查看任务页面数据")
 public class Read1Controller {
     @Autowired
     WorkShowSeeService workShowSeeService;
@@ -36,7 +36,7 @@ public class Read1Controller {
      * @param id                人员id
      */
     @PostMapping("/selectMeWork")
-    @ApiOperation(value = "获取阅读页面待审核列表")
+    @ApiOperation(value = "获取我的任务列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name="id",value="人员id",dataType="string", paramType = "query",required = true),
             @ApiImplicitParam(name="page",value="页码",dataType="int", paramType = "query",example = "1"),
@@ -63,7 +63,7 @@ public class Read1Controller {
      * @param id                人员id
      */
     @PostMapping("/selectMeReceiv")
-    @ApiOperation(value = "获取阅读页面已提交列表")
+    @ApiOperation(value = "获取我的接收任务列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name="id",value="人员id",dataType="string", paramType = "query",required = true),
             @ApiImplicitParam(name="page",value="页码",dataType="int", paramType = "query",example = "1"),
@@ -142,7 +142,7 @@ public class Read1Controller {
      * @param id                人员id
      */
     @PostMapping("/titleSelect")
-    @ApiOperation(value = "获取阅读页面标题查询列表")
+    @ApiOperation(value = "获取根据标题查询列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name="id",value="人员id",dataType="string", paramType = "query",required = true),
             @ApiImplicitParam(name="page",value="页码",dataType="int", paramType = "query",example = "1"),

notes-pas/src/main/java/com/zjty/tynotes/pas/dao/PasUserDao.java

@@ -22,44 +22,44 @@ public interface PasUserDao extends MongoRepository<User, String> {
      */
     User findAllByUsernameEqualsAndStatusEquals(String username,Integer status);
 
-//    /**
-//     * 根据用户姓名查询用户对象
-//     * @param name 用户姓名
-//     * @param status 删除状态
-//     * @return User
-//     */
-//    List<User> findAllByNameEqualsAndStatusEquals(String name,Integer status);
-//
-//    /**
-//     * 根据用户名查询用户对象
-//     * @param status 状态
-//     * @return User
-//     */
-//    List<User> findAllByStatusEquals(Integer status);
+    /**
+     * 根据用户姓名查询用户对象
+     * @param name 用户姓名
+     * @param status 删除状态
+     * @return User
+     */
+    List<User> findAllByNameEqualsAndStatusEquals(String name,Integer status);
 
-//    /**
-//     * 根据id集合搜索用户
-//     * @param ids id集合
-//     * @param status 删除状态
-//     * @return list
-//     */
-//    List<User> findAllByIdInAndStatusEquals(List<String> ids,Integer status);
+    /**
+     * 根据用户名查询用户对象
+     * @param status 状态
+     * @return User
+     */
+    List<User> findAllByStatusEquals(Integer status);
 
-//    /**
-//     * 根据部门id查询用户
-//     * @param ids 部门id
-//     * @param status 删除状态
-//     * @return User
-//     */
-//    List<User> findAllByDepartIdInAndStatusEquals(List<String> ids,Integer status);
+    /**
+     * 根据id集合搜索用户
+     * @param ids id集合
+     * @param status 删除状态
+     * @return list
+     */
+    List<User> findAllByIdInAndStatusEquals(List<String> ids,Integer status);
 
-//    /**
-//     * 查询未删除的人员
-//     * @param id 用户id
-//     * @param status 删除状态
-//     * @return User
-//     */
-//    User findAllByIdEqualsAndStatusEquals(String id,Integer status);
+    /**
+     * 根据部门id查询用户
+     * @param ids 部门id
+     * @param status 删除状态
+     * @return User
+     */
+    List<User> findAllByDepartIdInAndStatusEquals(List<String> ids,Integer status);
+
+    /**
+     * 查询未删除的人员
+     * @param id 用户id
+     * @param status 删除状态
+     * @return User
+     */
+    User findAllByIdEqualsAndStatusEquals(String id,Integer status);
 
     /**
      * 根据id列表查询