基本信息

2021-12-20 14:01:49 +08:00
parent 0e8d1d2013
commit 2ced602491
6 changed files with 148 additions and 5 deletions
@@ -981,7 +981,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
    }

 //	 @RequiresPermissions("contact:search")
-	 @ApiOperation(value="联系人管理-分页列表查询", notes="联系人管理-分页列表查询")
+	 @ApiOperation(value="查询会员信息", notes="查询会员信息")
 	 @GetMapping(value = "/baseInfo")
 	 public Result<?> baseInfo() {
 		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -7,6 +7,10 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.service.IPayContactsManagementService;
+import com.jero.member.entity.TbCertificatePayment;
+import com.jero.member.entity.TbMemberProjectSubitem;
+import com.jero.member.service.ITbCertificatePaymentService;
+import com.jero.member.service.ITbMemberProjectSubitemService;
 import com.jero.payment.entity.PayPaymentRecordSub;
 import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.service.IPayPaymentCheckService;
@@ -34,10 +38,10 @@ public class PayPaymentCheckController extends JeroController<PayPaymentRecordSu
   private IPayPaymentCheckService payPaymentCheckService;
    @Autowired
    private IPayPaymentRecordService payPaymentRecordService;
-    @Resource
-    private IPayContactsManagementService payContactsManagementService;
-    @Resource
-    private IMemberInfoService memberInfoService;
+    @Autowired
+    private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
+    @Autowired
+    private ITbCertificatePaymentService tbCertificatePaymentService;

    /**
     *   来款列表
@@ -138,4 +142,36 @@ public class PayPaymentCheckController extends JeroController<PayPaymentRecordSu
   }


+    @ApiOperation(value="标协会员项目详情", notes="标协会员项目详情")
+    @GetMapping(value = "/getTbMemberProject")
+    public Result<?> getTbMemberProject(String projectId) {
+        TbMemberProjectSubitem tbMemberProject;
+        try{
+            tbMemberProject = tbMemberProjectSubitemService.getById(projectId);
+
+        }catch (Exception e){
+            log.error("操作异常",e);
+            return Result.error(e.getMessage());
+        }
+        return Result.OK(tbMemberProject);
+
+    }
+
+    @ApiOperation(value="标协证书项目详情", notes="标协证书项目详情")
+    @GetMapping(value = "/getTbCertificatePayment")
+    public Result<?> getTbCertificatePayment(String projectId) {
+        TbCertificatePayment tbCertificatePayment;
+        try{
+            tbCertificatePayment = tbCertificatePaymentService.getById(projectId);
+
+        }catch (Exception e){
+            log.error("操作异常",e);
+            return Result.error(e.getMessage());
+        }
+        return Result.OK(tbCertificatePayment);
+
+    }
+
+
+
 }
@@ -0,0 +1,90 @@
+package com.jero.standards.memberinfo.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import javax.persistence.Id;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 底部管理
+ * @Author: jeecg-boot
+ * @Date:   2021-01-07
+ * @Version: V1.0
+ */
+@Data
+@TableName("tb_contacts")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="tb_contacts对象", description="联系方式")
+public class TbContacts implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**地址*/
+	@Excel(name = "地址", width = 15)
+    @ApiModelProperty(value = "地址")
+    private String address;
+	/**邮编*/
+	@Excel(name = "邮编", width = 15)
+    @ApiModelProperty(value = "邮编")
+    private String postcode;
+	/**联系电话*/
+	@Excel(name = "联系电话", width = 15)
+    @ApiModelProperty(value = "联系电话")
+    private String telephone;
+	/**电子邮箱*/
+	@Excel(name = "电子邮箱", width = 15)
+    @ApiModelProperty(value = "电子邮箱")
+    private String email;
+	/**网址*/
+	@Excel(name = "网址", width = 15)
+    @ApiModelProperty(value = "网址")
+    private String webseit;
+	/**微信公众号*/
+	@Excel(name = "微信公众号", width = 15)
+    @ApiModelProperty(value = "微信公众号")
+    private String wxPic;
+
+    @Excel(name = "标协使命", width = 15)
+    @ApiModelProperty(value = "标协使命")
+    private String mission;
+
+    @Excel(name = "标协使命s", width = 15)
+    @ApiModelProperty(value = "标协使命s")
+    private String missions;
+
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+
+}
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.standards.memberinfo.entity.SysUser;
+import com.jero.standards.memberinfo.entity.TbContacts;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.jero.standards.memberinfo.entity.MemberInfo;
@@ -24,4 +25,10 @@ public interface MemberInfoMapper extends BaseMapper<MemberInfo> {
     * @return
     */
    SysUser getBXGLZ();
+
+    /**
+     * 得到标协底部管理
+     * @return
+     */
+    TbContacts getTbContacts();
 }
@@ -16,4 +16,10 @@
        left join tb_member_info tmi on su.id = tmi.id
        where username = 'BXGLZ'
    </select>
+
+    <!-- 得到标协底部管理 -->
+    <select id="getTbContacts" resultType="com.jero.standards.memberinfo.entity.TbContacts">
+        select *
+        from tb_contacts
+    </select>
 </mapper>
@@ -9,6 +9,7 @@ import com.jero.company.entity.PayContactsManagement;
 import com.jero.member.entity.PayMemberProject;
 import com.jero.standards.memberinfo.entity.MemberInfo;
 import com.jero.standards.memberinfo.entity.SysUser;
+import com.jero.standards.memberinfo.entity.TbContacts;
 import com.jero.standards.memberinfo.mapper.MemberInfoMapper;
 import com.jero.standards.memberinfo.service.IMemberInfoService;
 import org.apache.commons.lang3.StringUtils;
@@ -64,9 +65,12 @@ public class MemberInfoServiceImpl extends ServiceImpl<MemberInfoMapper, MemberI
        String email = PasswordUtil.decrypt(secretariat.getEmail(), PasswordUtil.ALGORITHM, PasswordUtil.Salt);
        secretariat.setEmail(email);

+        TbContacts tbContacts = memberInfoMapper.getTbContacts();
+
        Map<String,Object> map = new HashMap<>();
        map.put("memberInfo",memberInfo);
        map.put("secretariat",secretariat);
+        map.put("tbContacts",tbContacts);

        return map;
    }