第二版

pom.xml

@@ -111,6 +111,7 @@
             <version>1.9.1</version>
         </dependency>
 
+
     </dependencies>
 
     <build>

src/main/java/com/chuanghai/h3c_reporting/bo/CloseReporting.java

@@ -0,0 +1,29 @@
+package com.chuanghai.h3c_reporting.bo;
+
+import lombok.Data;
+
+/**
+ * @Author 浮生
+ * @Date 2023/3/21 16:41
+ * @PackageName:com.chuanghai.h3c_reporting.bo
+ * @ClassName: CloseReporting
+ * @Description: TODO
+ * @Version 1.0
+ */
+@Data
+public class CloseReporting {
+    /**
+     * 调用者id（管理员 上传信息的人）
+     */
+    private Long id;
+
+    /**
+     * 调用者姓名（管理员 上传信息的人）
+     */
+    private String name;
+
+    /**
+     * 项目id
+     */
+    private Long itemId;
+}

src/main/java/com/chuanghai/h3c_reporting/controller/InformationReportingController.java

@@ -1,6 +1,8 @@
 package com.chuanghai.h3c_reporting.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.chuanghai.h3c_reporting.anno.AdminLoginCheck;
+import com.chuanghai.h3c_reporting.bo.CloseReporting;
 import com.chuanghai.h3c_reporting.bo.DeleteReporting;
 import com.chuanghai.h3c_reporting.common.utils.CommonResult;
 import com.chuanghai.h3c_reporting.common.utils.PageUtils;
@@ -60,11 +62,13 @@ public class InformationReportingController {
 //            throw new RRException(BizCodeEnume.PARAMETER_ERROR, "事件登记不能为空");
 //        }
 
+        staffEntity.setProduct(JSONObject.toJSONString(staffEntity.getBProduct()));
         InformationReporting reporting = new InformationReporting();
         BeanUtils.copyProperties(staffEntity, reporting);
         LocalDateTime localDateTime = LocalDateTime.now();
         reporting.setReportingTime(localDateTime);
         reporting.setStatus(1);
+        reporting.setDelStatus(1);
         boolean flag = informationReportingService.save(reporting);
         if (flag) {
             log.info("上传信息=========>>> 【{}】【微信绑定手机号：{}】成功上传了编号为【{}】的项目信息", reporting.getName(), reporting.getWxPhone(), reporting.getId());
@@ -87,7 +91,7 @@ public class InformationReportingController {
         idList.forEach(id -> {
             InformationReporting reporting1 = new InformationReporting();
             reporting1.setId(id);
-            reporting1.setStatus(0);
+            reporting1.setDelStatus(0);
             reportingList.add(reporting1);
         });
         boolean flag = informationReportingService.updateBatchById(reportingList);
@@ -101,6 +105,27 @@ public class InformationReportingController {
     }
 
     /**
+     * 关闭项目
+     */
+    @AdminLoginCheck
+    @DeleteMapping("/close")
+    public CommonResult<String> close(@RequestHeader("admin_token") String adminToken,
+                                       @RequestBody CloseReporting reporting) {
+
+        InformationReporting reporting1 = new InformationReporting();
+        reporting1.setId(reporting.getItemId());
+        reporting1.setStatus(0);
+        boolean flag = informationReportingService.updateById(reporting1);
+        if (flag) {
+            log.info("关闭项目=========>>> 管理员【{}】【id:{}】成功关闭了编号为【{}】的项目信息", reporting.getName(), reporting.getId(), reporting.getId());
+            return CommonResult.ok();
+        } else {
+            log.info("关闭项目失败=========>>> 管理员【{}】【id:{}】关闭编号为【{}】的项目信息失败", reporting.getName(), reporting.getId(), reporting.getId());
+            return CommonResult.fail();
+        }
+    }
+
+    /**
      * 项目列表
      */
     @AdminLoginCheck

src/main/java/com/chuanghai/h3c_reporting/controller/request/ReportQueryRequest.java

@@ -19,19 +19,28 @@ public class ReportQueryRequest {
     private String name;
 
     /**
-     * 电话号码
+     * 单位名称
      */
-    private String phone;
+    private String company;
 
     /**
-     * 单位名称
+     * 所属行业
      */
-    private String company;
+    private String trade;
+
+    /**
+     * 删除状态：0删除 1正常
+     */
+    private Integer delStatus;
+
+    /**
+     * 项目状态：0已关闭 1进行中
+     */
+    private Integer status;
 
     /**
      * 创建时间
      */
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String reportingTime;
 
     /**

src/main/java/com/chuanghai/h3c_reporting/dto/ReportingDownloadDTO.java

@@ -31,14 +31,19 @@ public class ReportingDownloadDTO implements Serializable {
     private String name;
 
     /**
-     * 电话号码
+     * 单位名称
      */
-    private String phone;
+    private String company;
 
     /**
-     * 所在公司
+     * 所属行业
      */
-    private String company;
+    private String trade;
+
+    /**
+     * 状态：0删除 1进行中 2已关闭
+     */
+    private Integer status;
 
     /**
      * 创建时间

src/main/java/com/chuanghai/h3c_reporting/entity/InformationReporting.java

@@ -56,15 +56,57 @@ public class InformationReporting implements Serializable {
     @ColumnWidth(15)
     private String company;
 
+    /**
+     * 客户名称
+     */
+    @ExcelProperty("客户名称")
+    @ColumnWidth(15)
+    private String customerName;
+
+    /**
+     * 项目名称
+     */
+    @ExcelProperty("项目名称")
+    @ColumnWidth(15)
+    private String entryName;
+
+    /**
+     * 项目金额
+     */
+    @ExcelProperty("项目金额")
+    @ColumnWidth(15)
+    private String projectAmount;
+
+    /**
+     * 预计投标时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "预计投标时间")
+    private String tenderTime;
 
     /**
-     * 事件登记
+     * 项目基本情况
      */
-    @ExcelProperty("事件登记")
+    @ExcelProperty("项目基本情况")
     @ColumnWidth(35)
     private String content;
 
     /**
+     * 所属行业
+     */
+    @ExcelProperty("所属行业")
+    @ColumnWidth(15)
+    private String trade;
+
+    /**
+     * 产品类型
+     */
+    @ExcelProperty("产品类型")
+    @ColumnWidth(20)
+    private String product;
+
+
+    /**
      * 提交时间
      */
     @ColumnWidth(20)
@@ -73,12 +115,19 @@ public class InformationReporting implements Serializable {
     private LocalDateTime reportingTime;
 
     /**
-     * 状态：0删除 1正常
+     * 删除状态：0删除 1正常
+     */
+    @ExcelIgnore
+    @Pattern(regexp = "[0-1]", message = "删除状态只能为0或1")
+    private Integer delStatus;
+
+    /**
+     * 项目状态：0已关闭 1进行中
      */
     @ExcelIgnore
     @ExcelProperty("状态")
     @ColumnWidth(15)
-    @Pattern(regexp = "[0-1]", message = "状态只能为0或1")
+    @Pattern(regexp = "[0-1]", message = "项目状态只能为0或1")
     private Integer status;
 
 }

src/main/java/com/chuanghai/h3c_reporting/service/impl/InformationReportingServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chuanghai.h3c_reporting.common.utils.MyQuery;
 import com.chuanghai.h3c_reporting.common.utils.PageParam;
@@ -43,10 +44,11 @@ public class InformationReportingServiceImpl extends ServiceImpl<InformationRepo
         QueryWrapper<InformationReporting> queryWrapper = new QueryWrapper<>();
         queryWrapper.and(
                 e -> e.like(StringUtils.hasText(request.getName()), "name", request.getName())
-                        .like(StringUtils.hasText(request.getPhone()), "phone", request.getPhone())
+                        .like(StringUtils.hasText(request.getTrade()), "trade", request.getTrade())
                         .like(StringUtils.hasText(request.getCompany()), "company", request.getCompany())
                         .like(StringUtils.hasText(request.getReportingTime()), "reporting_time", request.getReportingTime())
-                        .eq("status", 1)
+                        .eq(ObjectUtils.isNotEmpty(request.getStatus()), "status", request.getStatus())
+                        .eq("del_status", 1)
         );
         queryWrapper.orderByDesc("reporting_time");
         IPage<InformationReporting> page = this.page(
@@ -79,10 +81,11 @@ public class InformationReportingServiceImpl extends ServiceImpl<InformationRepo
                 QueryWrapper<InformationReporting> queryWrapper = new QueryWrapper<>();
                 queryWrapper
                         .like(StringUtils.hasText(request.getName()), "name", request.getName())
-                        .like(StringUtils.hasText(request.getPhone()), "phone", request.getPhone())
+                        .like(StringUtils.hasText(request.getTrade()), "trade", request.getTrade())
                         .like(StringUtils.hasText(request.getCompany()), "company", request.getCompany())
                         .like(StringUtils.hasText(request.getReportingTime()), "reporting_time", request.getReportingTime())
-                        .eq("status", 1);
+                        .eq(ObjectUtils.isNotEmpty(request.getStatus()), "status", request.getStatus())
+                        .eq("del_status", 1);
                 queryWrapper.orderByDesc("reporting_time");
                 list = this.list(queryWrapper);
             }
@@ -96,12 +99,12 @@ public class InformationReportingServiceImpl extends ServiceImpl<InformationRepo
             response.setContentType("application/vnd.ms-excel");
             response.setCharacterEncoding("utf-8");
             // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
-            String fileName = URLEncoder.encode("项目信息" + new Date().getTime(), "UTF-8");
+            String fileName = URLEncoder.encode("报备信息" + new Date().getTime(), "UTF-8");
             response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
 
             // 这里需要设置不关闭流
             EasyExcel.write(response.getOutputStream(), InformationReporting.class)
-                    .registerWriteHandler(horizontalCellStyleStrategy).sheet("项目信息")
+                    .registerWriteHandler(horizontalCellStyleStrategy).sheet("报备信息")
                     .doWrite(list);
         } catch (IOException e) {
             e.printStackTrace();

src/main/java/com/chuanghai/h3c_reporting/vo/InformationReportingVO.java

@@ -1,5 +1,7 @@
 package com.chuanghai.h3c_reporting.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
@@ -42,8 +44,48 @@ public class InformationReportingVO {
     private String company;
 
     /**
-     * 事件登记
+     * 客户名称
+     */
+    @NotNull(message = "客户名称不能为空")
+    private String customerName;
+
+    /**
+     * 项目名称
+     */
+    @NotNull(message = "项目名称不能为空")
+    private String entryName;
+
+    /**
+     * 项目金额
+     */
+    @NotNull(message = "项目金额不能为空")
+    private String projectAmount;
+
+    /**
+     * 预计投标时间
+     */
+    @NotNull(message = "预计投标时间不能为空")
+    private String tenderTime;
+
+    /**
+     * 项目基本情况
      */
-    @NotNull(message = "事件登记不能为空")
     private String content;
+
+    /**
+     * 所属行业
+     */
+    @NotNull(message = "所属行业不能为空")
+    private String trade;
+
+
+    private String product;
+
+    /**
+     * 产品类型
+     */
+    @NotNull(message = "产品类型不能为空")
+    @TableField(exist = false)
+    @JsonProperty(value ="bProduct")
+    private String[] bProduct;
 }

src/main/resources/mapper/InformationReportingMapper.xml

@@ -1,17 +1,17 @@
 <?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.chuanghai.h3c_reporting.mapper.InformationReportingMapper" >
-  <resultMap id="BaseResultMap" type="com.chuanghai.h3c_reporting.entity.InformationReporting" >
-    <!--
-      WARNING - @mbg.generated
-    -->
-    <id column="id" property="id"/>
-    <result column="name" property="name" jdbcType="VARCHAR" />
-    <result column="phone" property="phone" jdbcType="VARCHAR" />
-    <result column="wx_phone" property="wxPhone" jdbcType="VARCHAR" />
-    <result column="company" property="company" jdbcType="VARCHAR" />
-    <result column="content" property="content" jdbcType="VARCHAR" />
-    <result column="reporting_time" property="reportingTime" jdbcType="TIMESTAMP" />
-    <result column="status" property="status" jdbcType="INTEGER" />
-  </resultMap>
+<!--  <resultMap id="BaseResultMap" type="com.chuanghai.h3c_reporting.entity.InformationReporting" >-->
+<!--    &lt;!&ndash;-->
+<!--      WARNING - @mbg.generated-->
+<!--    &ndash;&gt;-->
+<!--    <id column="id" property="id"/>-->
+<!--    <result column="name" property="name" jdbcType="VARCHAR" />-->
+<!--    <result column="phone" property="phone" jdbcType="VARCHAR" />-->
+<!--    <result column="wx_phone" property="wxPhone" jdbcType="VARCHAR" />-->
+<!--    <result column="company" property="company" jdbcType="VARCHAR" />-->
+<!--    <result column="content" property="content" jdbcType="VARCHAR" />-->
+<!--    <result column="reporting_time" property="reportingTime" jdbcType="TIMESTAMP" />-->
+<!--    <result column="status" property="status" jdbcType="INTEGER" />-->
+<!--  </resultMap>-->
 </mapper>

src/main/resources/mapper/UserMapper.xml

@@ -1,16 +1,16 @@
 <?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.chuanghai.h3c_reporting.mapper.UserMapper" >
-  <resultMap id="BaseResultMap" type="com.chuanghai.h3c_reporting.entity.User" >
+<!--  <resultMap id="BaseResultMap" type="com.chuanghai.h3c_reporting.entity.User" >-->
     <!--
       WARNING - @mbg.generated
     -->
-    <id column="id" property="id"/>
-    <result column="user_name" property="userName" jdbcType="VARCHAR" />
-    <result column="name" property="name" jdbcType="VARCHAR" />
-    <result column="password" property="password" jdbcType="VARCHAR" />
-    <result column="admin_type" property="adminType" jdbcType="INTEGER" />
-    <result column="time" property="time" jdbcType="TIMESTAMP" />
-    <result column="status" property="status" jdbcType="INTEGER" />
-  </resultMap>
+<!--    <id column="id" property="id"/>-->
+<!--    <result column="user_name" property="userName" jdbcType="VARCHAR" />-->
+<!--    <result column="name" property="name" jdbcType="VARCHAR" />-->
+<!--    <result column="password" property="password" jdbcType="VARCHAR" />-->
+<!--    <result column="admin_type" property="adminType" jdbcType="INTEGER" />-->
+<!--    <result column="time" property="time" jdbcType="TIMESTAMP" />-->
+<!--    <result column="status" property="status" jdbcType="INTEGER" />-->
+<!--  </resultMap>-->
 </mapper>

src/main/resources/smart-doc.json

@@ -6,7 +6,7 @@
   "coverOld": true,
   "style": "zenburn",
   "createDebugPage": false,
-  "projectName": "H3C报备",
+  "projectName": "合作伙伴商机报备",
   "inlineEnum": true,
   "revisionLogs": [
     {

src/main/resources/static/doc/search.js

@@ -16,10 +16,14 @@ api[0].list.push({
 });
 api[0].list.push({
     order: '3',
-    desc: '项目列表',
+    desc: '关闭项目',
 });
 api[0].list.push({
     order: '4',
+    desc: '项目列表',
+});
+api[0].list.push({
+    order: '5',
     desc: '信息导出',
 });
 api.push({