项目库-列表+详情页法规计划修改

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java

@@ -1,25 +1,26 @@
 package com.jero.modules.project.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import com.jero.common.api.vo.Result;
-import com.jero.common.system.query.QueryGenerator;
-import com.jero.modules.project.entity.ProjectTaskPlanning;
-import com.jero.modules.project.service.IProjectTaskPlanningService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.project.entity.ProjectTaskPlanning;
+import com.jero.modules.project.service.IProjectTaskPlanningService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
+
-import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletRequest;
-import com.jero.common.aspect.annotation.AutoLog;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
 
 
  /**
@@ -130,14 +131,14 @@ public class ProjectTaskPlanningController extends JeroController<ProjectTaskPla
 	/**
 	 * 通过id查询
 	 *
-	 * @param id
+	 * @param projectId
 	 * @return
 	 */
 	@AutoLog(value = "法规/认证任务计划 (各阶段确认进度) 表-通过id查询")
 	@ApiOperation(value="法规/认证任务计划 (各阶段确认进度) 表-通过id查询", notes="法规/认证任务计划 (各阶段确认进度) 表-通过id查询")
-	@GetMapping(value = "/queryById")
+	@GetMapping(value = "/queryByprojectId")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+	public Result<?> queryById(@RequestParam(name="id",required=true) String projectId) {
-		ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningService.queryById(id);
+		ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningService.queryByProjectId(projectId);
 		if(projectTaskPlanning==null) {
 			return Result.error("未找到对应数据");
 		}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java

@@ -31,10 +31,10 @@ public class ProjectRelatedPersonnel implements Serializable {
     private java.lang.String id;
 
     /**项目id*/
-    @Dict(dictTable = "project_library_base", dicText = "id", dicCode = "id")
     private java.lang.String projectId;
 
     /**责任领域*/
+    @Dict(dicCode = "duty_territory")
     private java.lang.String dutyTerritory;
 
     /**法规工程师*/

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jero.common.aspect.annotation.Dict;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -31,7 +30,6 @@ public class ProjectTaskPlanning implements Serializable {
     private String id;
 
     /**项目id*/
-    @Dict(dictTable = "project_library_base", dicText = "id", dicCode = "id")
     private String projectId;
 
     /**法规清单确认*/

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java

@@ -1,8 +1,10 @@
 package com.jero.modules.project.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.project.entity.ProjectRelatedPersonnel;
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 相关人员维护表
@@ -58,4 +60,6 @@ public interface IProjectRelatedPersonnelService extends IService<ProjectRelated
 	 * @return
 	 */
     List<ProjectRelatedPersonnel> queryList();
+
+	IPage<ProjectRelatedPersonnel> queryPageList(Map<String, Object> params);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java

@@ -45,14 +45,14 @@ public interface IProjectTaskPlanningService extends IService<ProjectTaskPlannin
     void deleteByIds(List<String> ids);
 
 	/**
-	 * 通过id查询
+	 * 通过项目id查询
 	 *
-	 * @param id
+	 * @param projectId
 	 * @return
 	 */
-    ProjectTaskPlanning queryById(String id);
+	ProjectTaskPlanning queryByProjectId(String projectId);
 
-    /**
+	/**
 	 * 列表查询
 	 *
 	 * @return

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java

@@ -3,9 +3,11 @@ package com.jero.modules.project.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.service.IProjectLibraryBaseService;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +36,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		Date now = new Date();
 		projectLibraryBase.setCreateTime(now);
 		projectLibraryBase.setUpdateTime(now);
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		projectLibraryBase.setCreateUserId(sysUser.getId());
+		projectLibraryBase.setUpdateUserId(sysUser.getId());
 		save(projectLibraryBase);
 	}
 
@@ -47,6 +52,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	public void editById(ProjectLibraryBase projectLibraryBase) {
 		Date now = new Date();
 		projectLibraryBase.setUpdateTime(now);
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		projectLibraryBase.setUpdateUserId(sysUser.getId());
 		saveOrUpdate(projectLibraryBase);
 	}
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java

@@ -64,14 +64,14 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
     }
 
 	/**
-	 * 通过id查询
+	 * 通过项目id查询
 	 *
-	 * @param id
+	 * @param projectId
 	 * @return
 	 */
 	@Override
-    public ProjectTaskPlanning queryById(String id) {
+    public ProjectTaskPlanning queryByProjectId(String projectId) {
-        return getById(id);
+        return getById(projectId);
     }
 
     /**