需求

mall-server-api/src/main/java/com/gree/mall/manager/bean/policy/MailBoxSendRecordVo.java

@@ -0,0 +1,72 @@
+package com.gree.mall.manager.bean.policy;
+
+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 com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.plus.entity.MailboxSendRecord;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel
+@Data
+public class MailBoxSendRecordVo  {
+
+    @ZfireField(hide = true)
+    @TableId(value = "id", type = IdType.ID_WORKER_STR)
+    private String id;
+
+    @ApiModelProperty(value = "保险类型")
+    private String policyType;
+
+    @ApiModelProperty(value = "发送批次")
+    private String sendBatch;
+
+    @ApiModelProperty(value = "发送邮箱")
+    private String sendMailbox;
+
+    @ApiModelProperty(value = "接收邮箱")
+    private String receiveMailbox;
+
+    @ApiModelProperty(value = "发送状态  OK 成功 NO 失败")
+    private String sendStatus;
+
+    @ApiModelProperty(value = "发送时间")
+    private Date sendTime;
+
+    @ApiModelProperty(value = "回执状态 NO 未收到  YES 收到")
+    private String receiptStatus;
+
+    @ApiModelProperty(value = "回执收到时间")
+    private Date receiptTime;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "商户名")
+    private String companyWechatName;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "商户id")
+    private String companyWechatId;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/bean/policy/MailboxSendRecordPolicyVo.java

@@ -0,0 +1,73 @@
+package com.gree.mall.manager.bean.policy;
+
+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 com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.plus.entity.MailboxSendRecordPolicy;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel
+@Data
+public class MailboxSendRecordPolicyVo   {
+
+
+    @ZfireField(hide = true)
+    @TableId(value = "id", type = IdType.ID_WORKER_STR)
+    private String id;
+
+    @ApiModelProperty(value = "商户名")
+    private String companyWechatName;
+
+    @ApiModelProperty(value = "商户id")
+    private String companyWechatId;
+
+    @ApiModelProperty(value = "保单编号")
+    private String policyNumber;
+
+    @ApiModelProperty(value = "网点名称")
+    private String websitName;
+
+    @ApiModelProperty(value = "网点编号")
+    private String websitId;
+
+    @ApiModelProperty(value = "参保人")
+    private String policyName;
+
+    @ApiModelProperty(value = "参保人身份证")
+    private String policyIdcard;
+
+    @ApiModelProperty(value = "保单操作类型 新增 IN 雇主 替换 RE")
+    private String type;
+
+    @ApiModelProperty(value = "保险类型")
+    private String policyType;
+
+    @ApiModelProperty(value = "替换人")
+    private String replaceName;
+
+    @ApiModelProperty(value = "替换人身份证")
+    private String replaceIdcard;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/PolicyCMapper.java

@@ -3,6 +3,8 @@ package com.gree.mall.manager.commonmapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.policy.AgreementVo;
+import com.gree.mall.manager.bean.policy.MailBoxSendRecordVo;
+import com.gree.mall.manager.bean.policy.MailboxSendRecordPolicyVo;
 import com.gree.mall.manager.bean.policy.PolicyVo;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import org.apache.ibatis.annotations.Mapper;
@@ -16,4 +18,8 @@ public interface PolicyCMapper {
     IPage<PolicyVo> list(Page page, @Param("ex")ZfireParamBean zfireParam,@Param("adminCompanyIds") List<String> adminCompanyIds);
 
     IPage<AgreementVo> listAgreement(Page page,@Param("ex") ZfireParamBean zfireParam,@Param("adminCompanyIds") List<String> adminCompanyIds);
+
+    IPage<MailBoxSendRecordVo> listMailBoxRecord(Page page, @Param("ex")ZfireParamBean zfireParam, @Param("adminCompanyIds") List<String> adminCompanyIds);
+
+    IPage<MailboxSendRecordPolicyVo> listPolicy(Page page,@Param("ex") ZfireParamBean zfireParam,@Param("adminCompanyIds")  List<String> adminCompanyIds);
 }

mall-server-api/src/main/java/com/gree/mall/manager/controller/policy/AgreementController.java

@@ -39,7 +39,7 @@ public class AgreementController {
     ) throws RemoteServiceException {
         ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
         IPage<AgreementVo> increVOIPage = agreementLogic.list(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
-        return ResponseHelper.success(increVOIPage, new TypeReference<PolicyVo>() {});
+        return ResponseHelper.success(increVOIPage, new TypeReference<AgreementVo>() {});
     }
 
     @PostMapping("/list/export")

mall-server-api/src/main/java/com/gree/mall/manager/controller/policy/MailboxController.java

@@ -4,14 +4,13 @@ import cn.hutool.core.lang.TypeReference;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.policy.AgreementAddUp;
-import com.gree.mall.manager.bean.policy.AgreementDetail;
-import com.gree.mall.manager.bean.policy.AgreementVo;
-import com.gree.mall.manager.bean.policy.PolicyVo;
+import com.gree.mall.manager.bean.policy.*;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.helper.ResponseHelper;
 import com.gree.mall.manager.logic.policy.AgreementLogic;
 import com.gree.mall.manager.plus.entity.Mailbox;
+import com.gree.mall.manager.plus.entity.MailboxSendRecord;
+import com.gree.mall.manager.plus.entity.MailboxSendRecordPolicy;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
 import io.swagger.annotations.Api;
@@ -27,7 +26,7 @@ import java.text.ParseException;
 
 @Slf4j
 @RestController
-@Api(value = "邮箱配置", tags = {"邮箱配置"})
+@Api(value = "邮箱配置和邮箱记录", tags = {"邮箱配置和邮箱记录"})
 @RequestMapping(value = "/mailbox", produces = "application/json; charset=utf-8")
 public class MailboxController {
 
@@ -55,5 +54,67 @@ public class MailboxController {
     }
 
 
+    @ZfireList
+    @PostMapping("/list")
+    @ApiOperation(value = "已发邮箱记录列表")
+    public ResponseHelper<IPage<MailBoxSendRecordVo>> list(
+            @RequestBody ZfireParamBean zfireParamBean
+    ) throws RemoteServiceException {
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        IPage<MailBoxSendRecordVo> increVOIPage = agreementLogic.listMailBoxRecord(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        return ResponseHelper.success(increVOIPage, new TypeReference<MailBoxSendRecordVo>() {});
+    }
+
+    @PostMapping("/list/export")
+    @ApiOperation(value = "已发邮箱记录列表导出")
+    public void listExport(
+            @RequestBody ZfireParamBean zfireParamBean,
+            HttpServletRequest request,
+            HttpServletResponse response
+    ) throws Exception {
+        //1.组装查询条件
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        //2.查询要导出的内容
+        IPage<MailBoxSendRecordVo> increVOIPage = agreementLogic.listMailBoxRecord(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        //3.导出
+        FieldUtils.exportData(increVOIPage.getRecords(), zfireParam.getExportFields(), request, response);
+    }
+
+    @PostMapping("/detailRecord")
+    @ApiOperation("保险方案管理详情")
+    public ResponseHelper<MailboxSendRecord> detail(
+            @ApiParam(value = "id", required = true) @RequestParam String id,
+            HttpServletRequest request
+    ) throws ParseException {
+        MailboxSendRecord mailboxSendRecord = agreementLogic.detailRecord(id);
+        return ResponseHelper.success(mailboxSendRecord);
+    }
+
+
+    @ZfireList
+    @PostMapping("/listPolicy")
+    @ApiOperation(value = "保单信息列表")
+    public ResponseHelper<IPage<MailboxSendRecordPolicyVo>> listPolicy(
+            @RequestBody ZfireParamBean zfireParamBean
+    ) throws RemoteServiceException {
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        IPage<MailboxSendRecordPolicyVo> increVOIPage = agreementLogic.listPolicy(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        return ResponseHelper.success(increVOIPage, new TypeReference<MailboxSendRecordPolicyVo>() {});
+    }
+
+    @PostMapping("/listPolicy/export")
+    @ApiOperation(value = "保单信息列表导出")
+    public void listPolicyExport(
+            @RequestBody ZfireParamBean zfireParamBean,
+            HttpServletRequest request,
+            HttpServletResponse response
+    ) throws Exception {
+        //1.组装查询条件
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        //2.查询要导出的内容
+        IPage<MailboxSendRecordPolicyVo> increVOIPage = agreementLogic.listPolicy(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        //3.导出
+        FieldUtils.exportData(increVOIPage.getRecords(), zfireParam.getExportFields(), request, response);
+    }
 
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -4,20 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.policy.AgreementAddUp;
-import com.gree.mall.manager.bean.policy.AgreementDetail;
-import com.gree.mall.manager.bean.policy.AgreementVo;
-import com.gree.mall.manager.bean.policy.PolicyVo;
+import com.gree.mall.manager.bean.policy.*;
 import com.gree.mall.manager.commonmapper.PolicyCMapper;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.Agreement;
-import com.gree.mall.manager.plus.entity.AgreementPolicy;
-import com.gree.mall.manager.plus.entity.Mailbox;
-import com.gree.mall.manager.plus.entity.Policy;
-import com.gree.mall.manager.plus.service.AgreementPolicyService;
-import com.gree.mall.manager.plus.service.AgreementService;
-import com.gree.mall.manager.plus.service.MailboxService;
-import com.gree.mall.manager.plus.service.PolicyService;
+import com.gree.mall.manager.plus.entity.*;
+import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +40,9 @@ public class AgreementLogic {
     @Autowired
     MailboxService mailboxService;
 
+    @Autowired
+    MailboxSendRecordService mailboxSendRecordService;
+
 
 
     public IPage<AgreementVo> list(Page page, ZfireParamBean zfireParam) {
@@ -133,4 +127,33 @@ public class AgreementLogic {
         mailbox.updateById();
 
     }
+
+    public IPage<MailBoxSendRecordVo> listMailBoxRecord(Page page, ZfireParamBean zfireParam) {
+        //获取当前登录企业id
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+
+        List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
+        //1.组装查询条件
+        zfireParam = FieldUtils.supplyParam(zfireParam, MailBoxSendRecordVo.class);
+
+        IPage<MailBoxSendRecordVo> policyVoIPage = policyCMapper.listMailBoxRecord(page, zfireParam,adminCompanyIds);
+        return policyVoIPage;
+    }
+
+    public MailboxSendRecord detailRecord(String id) {
+        MailboxSendRecord mailboxSendRecord = mailboxSendRecordService.getById(id);
+        return mailboxSendRecord;
+    }
+
+    public IPage<MailboxSendRecordPolicyVo> listPolicy(Page page, ZfireParamBean zfireParam) {
+        //获取当前登录企业id
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+
+        List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
+        //1.组装查询条件
+        zfireParam = FieldUtils.supplyParam(zfireParam, MailboxSendRecordPolicyVo.class);
+
+        IPage<MailboxSendRecordPolicyVo> policyVoIPage = policyCMapper.listPolicy(page, zfireParam,adminCompanyIds);
+        return policyVoIPage;
+    }
 }

mall-server-api/src/main/resources/mapper/PolicyCMapper.xml

@@ -34,4 +34,36 @@
         </if>
         ${ex.orderBy}
     </select>
+    <select id="listMailBoxRecord" resultType="com.gree.mall.manager.bean.policy.MailBoxSendRecordVo">
+        SELECT
+        ${ex.selected}
+        FROM mailbox_send_record a
+        ${ex.query}
+        <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
+            AND a.company_wechat_id IN
+            <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="ex.orderBy == null or ex.orderBy ==''">
+            ORDER BY a.create_time DESC
+        </if>
+        ${ex.orderBy}
+    </select>
+    <select id="listPolicy" resultType="com.gree.mall.manager.bean.policy.MailboxSendRecordPolicyVo">
+        SELECT
+        ${ex.selected}
+        FROM mailbox_send_record_policy a
+        ${ex.query}
+        <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
+            AND a.company_wechat_id IN
+            <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="ex.orderBy == null or ex.orderBy ==''">
+            ORDER BY a.create_time DESC
+        </if>
+        ${ex.orderBy}
+    </select>
 </mapper>