相关人员表-人员回显

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

@@ -23,12 +23,12 @@ import com.jero.common.aspect.annotation.AutoLog;
 
 
  /**
- * @Description: 相关人员维护表
+ * @Description: 项目库-相关人员维护表
  * @Author: jero-boot
  * @Date:   2022-04-11
  * @Version: V1.0
  */
-@Api(tags="相关人员维护表")
+@Api(tags="项目库-项目库-相关人员维护表")
 @RestController
 @RequestMapping("/project/projectRelatedPersonnel")
 @Slf4j
@@ -38,24 +38,14 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
 	
 	/**
 	 * 分页列表查询
-	 *
-	 * @param projectRelatedPersonnel
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "相关人员维护表-分页列表查询")
-	@ApiOperation(value="相关人员维护表-分页列表查询", notes="相关人员维护表-分页列表查询")
-	@GetMapping(value = "/page")
-	public Result<?> queryPageList(ProjectRelatedPersonnel projectRelatedPersonnel,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<ProjectRelatedPersonnel> queryWrapper = QueryGenerator.initQueryWrapper(projectRelatedPersonnel, req.getParameterMap());
-		Page<ProjectRelatedPersonnel> page = new Page<ProjectRelatedPersonnel>(pageNo, pageSize);
-		IPage<ProjectRelatedPersonnel> pageList = projectRelatedPersonnelService.page(page, queryWrapper);
-		return Result.OK(pageList);
+	@AutoLog(value = "项目库-相关人员维护表-分页列表查询")
+	@ApiOperation(value="项目库-相关人员维护表-分页列表查询", notes="项目库-相关人员维护表-分页列表查询")
+	@PostMapping(value = "/page")
+	public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
+		IPage<ProjectRelatedPersonnel> pageList= projectRelatedPersonnelService.queryPageList(params);
+		return Result.OK(params.get("cut").toString(),pageList);
 	}
 
     /**
@@ -63,8 +53,8 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
 	 *
 	 * @return
 	 */
-	@AutoLog(value = "相关人员维护表-列表查询")
-    @ApiOperation(value="相关人员维护表-列表查询", notes="相关人员维护表-列表查询")
+	@AutoLog(value = "项目库-相关人员维护表-列表查询")
+    @ApiOperation(value="项目库-相关人员维护表-列表查询", notes="项目库-相关人员维护表-列表查询")
 	@GetMapping(value = "/list")
 	public Result<List<ProjectRelatedPersonnel>> queryList() {
         List<ProjectRelatedPersonnel> list = projectRelatedPersonnelService.queryList();
@@ -77,8 +67,8 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
 	 * @param projectRelatedPersonnel
 	 * @return
 	 */
-	@AutoLog(value = "相关人员维护表-添加")
-	@ApiOperation(value="相关人员维护表-添加", notes="相关人员维护表-添加")
+	@AutoLog(value = "项目库-相关人员维护表-添加")
+	@ApiOperation(value="项目库-相关人员维护表-添加", notes="项目库-相关人员维护表-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@Validated @RequestBody ProjectRelatedPersonnel projectRelatedPersonnel) {
 		projectRelatedPersonnelService.add(projectRelatedPersonnel);
@@ -91,8 +81,8 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
 	 * @param projectRelatedPersonnel
 	 * @return
 	 */
-	@AutoLog(value = "相关人员维护表-编辑")
-	@ApiOperation(value="相关人员维护表-编辑", notes="相关人员维护表-编辑")
+	@AutoLog(value = "项目库-相关人员维护表-编辑")
+	@ApiOperation(value="项目库-相关人员维护表-编辑", notes="项目库-相关人员维护表-编辑")
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@Validated @RequestBody ProjectRelatedPersonnel projectRelatedPersonnel) {
 		projectRelatedPersonnelService.editById(projectRelatedPersonnel);
@@ -105,8 +95,8 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "相关人员维护表-通过id删除")
-	@ApiOperation(value="相关人员维护表-通过id删除", notes="相关人员维护表-通过id删除")
+	@AutoLog(value = "项目库-相关人员维护表-通过id删除")
+	@ApiOperation(value="项目库-相关人员维护表-通过id删除", notes="项目库-相关人员维护表-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		projectRelatedPersonnelService.deleteById(id);
@@ -119,8 +109,8 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "相关人员维护表-批量删除")
-	@ApiOperation(value="相关人员维护表-批量删除", notes="相关人员维护表-批量删除")
+	@AutoLog(value = "项目库-相关人员维护表-批量删除")
+	@ApiOperation(value="项目库-相关人员维护表-批量删除", notes="项目库-相关人员维护表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.projectRelatedPersonnelService.deleteByIds(Arrays.asList(ids.split(",")));
@@ -133,8 +123,8 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "相关人员维护表-通过id查询")
-	@ApiOperation(value="相关人员维护表-通过id查询", notes="相关人员维护表-通过id查询")
+	@AutoLog(value = "项目库-相关人员维护表-通过id查询")
+	@ApiOperation(value="项目库-相关人员维护表-通过id查询", notes="项目库-相关人员维护表-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
 		ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryById(id);
@@ -152,7 +142,7 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ProjectRelatedPersonnel projectRelatedPersonnel) {
-        return super.exportXls(request, projectRelatedPersonnel, ProjectRelatedPersonnel.class, "相关人员维护表");
+        return super.exportXls(request, projectRelatedPersonnel, ProjectRelatedPersonnel.class, "项目库-相关人员维护表");
     }
 
     /**

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

@@ -15,7 +15,7 @@ import java.io.Serializable;
 
 
 /**
- * @Description: 相关人员维护表
+ * @Description: 项目库-相关人员维护表
  * @Author: jero-boot
  * @Date:   2022-04-11
  * @Version: V1.0
@@ -40,12 +40,25 @@ public class ProjectRelatedPersonnel implements Serializable {
 
     /**法规工程师*/
     private java.lang.String lawEngineer;
+    @TableField(exist = false)
+    private java.lang.String lawEngineerName;
+    @TableField(exist = false)
+    private java.lang.String lawEngineerEnName;
+
 
     /**工程接口人*/
     private java.lang.String engineeringInterfacePerson;
+    @TableField(exist = false)
+    private java.lang.String engineeringInterfacePersonName;
+    @TableField(exist = false)
+    private java.lang.String engineeringInterfacePersonEnName;
 
     /**认证工程师*/
-    private java.lang.String attestationEngineer;
+    private java.lang.String certificationEngineer;
+    @TableField(exist = false)
+    private java.lang.String certificationEngineerName;
+    @TableField(exist = false)
+    private java.lang.String certificationEngineerEnName;
 
     /**备注*/
     private java.lang.String remark;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml

@@ -11,7 +11,7 @@
         <result column="duty_territory" property="dutyTerritory" />
         <result column="law_engineer" property="lawEngineer" />
         <result column="engineering_interface_person" property="engineeringInterfacePerson" />
-        <result column="attestation_engineer" property="attestationEngineer" />
+        <result column="certification_engineer" property="certificationEngineer" />
         <result column="remark" property="remark" />
     </resultMap>
 </mapper>

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

@@ -12,7 +12,7 @@ import java.util.Map;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
- * @Description: 相关人员维护表
+ * @Description: 项目库-相关人员维护表
  * @Author: jero-boot
  * @Date:   2022-04-11
  * @Version: V1.0