1.人员增加资质

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/BaseRelationEntity.java

+package com.yeejoin.amos.boot.biz.common.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 公共实体类
+ *
+ * @author DELL
+ */
+@Data
+public class BaseRelationEntity implements Serializable{
+	
+	private static final long serialVersionUID = 1L;
+
+	@TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
+	protected Long sequenceNbr;
+
+	@TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
+	protected Date recDate;
+
+	@TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
+	protected String recUserId;
+
+	@TableField(value = "rec_user_name", fill = FieldFill.INSERT_UPDATE)
+	protected String recUserName;
+
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGeneratorTzs.java

@@ -106,7 +106,7 @@ public class MyBatisPlusCodeGeneratorTzs {
         gc.setActiveRecord(false);
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:postgresql://36.46.137.116:5432/tzs_amos_tzs_biz_init?&serverTimezone=GMT%2B8");
+        dsc.setUrl("jdbc:postgresql://172.16.10.243:5432/tzs_amos_tzs_biz_init?&serverTimezone=GMT%2B8");
         dsc.setSchemaName("amos_tzs_biz");
         dsc.setDriverName("org.postgresql.Driver");
 //        dsc.setDriverName("cn.com.vastbase.Driver");
@@ -297,8 +297,7 @@ public class MyBatisPlusCodeGeneratorTzs {
         strategy.setTablePrefix();
         //去除表名前缀
         //去除表名前缀
-        strategy.setTablePrefix("t_", "tb_", "sys_","other_", "rpm_", "s_", "tcb_", "cb_", "tz_", "jc_", "jcb_",
-                "tzs_");
+        strategy.setTablePrefix("t_", "tb_", "sys_","other_", "rpm_", "s_", "tcb_", "cb_", "tz_", "jc_", "jcb_");
         // 设置父级Controller
         strategy.setSuperControllerClass("com.yeejoin.amos.boot.biz.common.controller.BaseController");
         autoGenerator.setStrategy(strategy);

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/TzsUserPermissionDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 用户资质信息表
+ *
+ * @author system_generator
+ * @date 2024-08-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="TzsUserPermissionDto", description="用户资质信息表")
+public class TzsUserPermissionDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主表主键")
+    private Long userSeq;
+
+    @ApiModelProperty(value = "检验专用-级别")
+    private String permissionLevel;
+
+    @ApiModelProperty(value = "检验专用-资质项目")
+    private String permissionItem;
+
+    @ApiModelProperty(value = "人员类型，前端用来分组展示使用")
+    private String permissionPost;
+
+    @ApiModelProperty(value = "证书编号")
+    private String certNo;
+
+    @ApiModelProperty(value = "有效期至")
+    private Date expiryDate;
+
+    @ApiModelProperty(value = "发证机关")
+    private String approvedOrgan;
+
+    @ApiModelProperty(value = "发证日期")
+    private Date issueDate;
+
+    @ApiModelProperty(value = "证书附件")
+    private String certAttachment;
+
+    @ApiModelProperty(value = "证书类型")
+    private String certType;
+
+    @ApiModelProperty(value = "作业项目")
+    private String jobItem;
+
+    @ApiModelProperty(value = "其他作业项目")
+    private String otherItem;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+}

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/TzsUserPermission.java

+package com.yeejoin.amos.boot.module.common.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.entity.BaseRelationEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 用户资质信息表
+ *
+ * @author system_generator
+ * @date 2024-08-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_user_permission")
+public class TzsUserPermission extends BaseRelationEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主表主键
+     */
+	@TableField("user_seq")
+    private Long userSeq;
+
+    /**
+     * 检验专用-级别
+     */
+	@TableField("permission_level")
+    private String permissionLevel;
+
+    /**
+     * 检验专用-资质项目
+     */
+	@TableField("permission_item")
+    private String permissionItem;
+
+    /**
+     * 人员类型，前端用来分组展示使用
+     */
+	@TableField("permission_post")
+    private String permissionPost;
+
+    /**
+     * 证书编号
+     */
+	@TableField("cert_no")
+    private String certNo;
+
+    /**
+     * 有效期至
+     */
+	@TableField("expiry_date")
+    private Date expiryDate;
+
+    /**
+     * 发证机关
+     */
+	@TableField("approved_organ")
+    private String approvedOrgan;
+
+    /**
+     * 发证日期
+     */
+	@TableField("issue_date")
+    private Date issueDate;
+
+    /**
+     * 证书附件
+     */
+	@TableField("cert_attachment")
+    private String certAttachment;
+
+    /**
+     * 证书类型
+     */
+	@TableField("cert_type")
+    private String certType;
+
+    /**
+     * 作业项目
+     */
+	@TableField("job_item")
+    private String jobItem;
+
+    /**
+     * 其他作业项目
+     */
+	@TableField("other_item")
+    private String otherItem;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/TzsUserPermissionMapper.java

+package com.yeejoin.amos.boot.module.tcm.api.mapper;
+
+import com.yeejoin.amos.boot.module.common.api.entity.TzsUserPermission;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 用户资质信息表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-08-27
+ */
+public interface TzsUserPermissionMapper extends BaseMapper<TzsUserPermission> {
+
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ITzsUserPermissionService.java

+package com.yeejoin.amos.boot.module.tcm.api.service;
+
+
+/**
+ * 用户资质信息表接口类
+ *
+ * @author system_generator
+ * @date 2024-08-27
+ */
+public interface ITzsUserPermissionService {
+
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserPermissionMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserPermissionMapper">
+
+</mapper>

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsUserPermissionController.java

+package com.yeejoin.amos.boot.module.tcm.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tcm.biz.service.impl.TzsUserPermissionServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.TzsUserPermissionDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 用户资质信息表
+ *
+ * @author system_generator
+ * @date 2024-08-27
+ */
+@RestController
+@Api(tags = "用户资质信息表Api")
+@RequestMapping(value = "/tzs-user-permission")
+public class TzsUserPermissionController extends BaseController {
+
+    @Autowired
+    TzsUserPermissionServiceImpl tzsUserPermissionServiceImpl;
+
+    /**
+     * 新增用户资质信息表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增用户资质信息表", notes = "新增用户资质信息表")
+	public ResponseModel<TzsUserPermissionDto> save(@RequestBody TzsUserPermissionDto model) {
+	    model = tzsUserPermissionServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新用户资质信息表", notes = "根据sequenceNbr更新用户资质信息表")
+	public ResponseModel<TzsUserPermissionDto> updateBySequenceNbrTzsUserPermission(@RequestBody TzsUserPermissionDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(tzsUserPermissionServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除用户资质信息表", notes = "根据sequenceNbr删除用户资质信息表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(tzsUserPermissionServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个用户资质信息表",  notes = "根据sequenceNbr查询单个用户资质信息表")
+	public ResponseModel<TzsUserPermissionDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(tzsUserPermissionServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "用户资质信息表分页查询",  notes = "用户资质信息表分页查询")
+	public ResponseModel<Page<TzsUserPermissionDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<TzsUserPermissionDto> page = new Page<TzsUserPermissionDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(tzsUserPermissionServiceImpl.queryForTzsUserPermissionPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "用户资质信息表列表全部数据查询",   notes = "用户资质信息表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<TzsUserPermissionDto>> selectForList() {
+	    return ResponseHelper.buildResponse(tzsUserPermissionServiceImpl.queryForTzsUserPermissionList());
+	}
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserPermissionServiceImpl.java

+package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.common.api.entity.TzsUserPermission;
+import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserPermissionMapper;
+import com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserPermissionService;
+import com.yeejoin.amos.boot.module.common.api.dto.TzsUserPermissionDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 用户资质信息表服务实现类
+ *
+ * @author system_generator
+ * @date 2024-08-27
+ */
+@Service
+public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionDto,TzsUserPermission,TzsUserPermissionMapper> implements ITzsUserPermissionService {
+    /**
+     * 分页查询
+     */
+    public Page<TzsUserPermissionDto> queryForTzsUserPermissionPage(Page<TzsUserPermissionDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<TzsUserPermissionDto> queryForTzsUserPermissionList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file