添加文件上传通用接口

pcbms/src/main/java/com/hssx/pcbms/controller/GoodsController.java

@@ -238,16 +238,16 @@ public class GoodsController {
     @ApiOperation(value = "处置资产操作记录", notes = "处置资产操作记录方法")
     @RequestMapping("/operateList")
     @ResponseBody
-    public HttpRespMsg operateList(Goods goods) {
-        HttpRespMsg msg = goodsService.operateList(goods);
+    public HttpRespMsg operateList(Goods goods,PageUtil page) {
+        HttpRespMsg msg = goodsService.operateList(goods,page);
         return msg;
     }
     /**
      * 维护资产
      * 参数：
      * goodId:资产id
-     * ids:编号对应id的字符串 如:"1,2,3"
-     *
+     * ids:编号对应id的字符串 如:"1,2,3", operator 维护人名字，operatorPhone 维护人联系方式
+     * company 维护公司名字,companyPhone 维护公司联系方式
      * @return
      */
     @ApiOperation(value = "维护资产", notes = "维护资产方法")
@@ -271,6 +271,20 @@ public class GoodsController {
         HttpRespMsg msg = goodsService.isMaintainList(goods);
         return msg;
     }
+    /**
+     * 维护资产记录
+     * 参数：
+     * id:资产id
+     *
+     * @return
+     */
+    @ApiOperation(value = "维护资产记录", notes = "维护资产记录方法")
+    @RequestMapping("/isMaintainRecord")
+    @ResponseBody
+    public HttpRespMsg isMaintainRecord(Goods goods,PageUtil page) {
+        HttpRespMsg msg = goodsService.isMaintainRecord(goods,page);
+        return msg;
+    }
 
 }
 

pcbms/src/main/java/com/hssx/pcbms/controller/MaintainRecordController.java

@@ -0,0 +1,21 @@
+package com.hssx.pcbms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-01
+ */
+@RestController
+@RequestMapping("/maintain-record")
+public class MaintainRecordController {
+
+}
+

pcbms/src/main/java/com/hssx/pcbms/entity/MaintainRecord.java

@@ -0,0 +1,156 @@
+package com.hssx.pcbms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-01
+ */
+public class MaintainRecord extends Model<MaintainRecord> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * goods外键
+     */
+    @TableField("goods_id")
+    private Integer goodsId;
+
+    /**
+     * goods_no外键
+     */
+    @TableField("goods_no_id")
+    private Integer goodsNoId;
+
+    /**
+     * 维护人姓名
+     */
+    @TableField("operator")
+    private String operator;
+
+    /**
+     * 维护人联系方式
+     */
+    @TableField("operator_phone")
+    private String operatorPhone;
+
+    /**
+     * 维护公司名字
+     */
+    @TableField("company")
+    private String company;
+
+    /**
+     * 维护公司联系方式
+     */
+    @TableField("company_phone")
+    private String companyPhone;
+
+    /**
+     * 维护日期
+     */
+    @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime indate;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(Integer goodsId) {
+        this.goodsId = goodsId;
+    }
+
+    public Integer getGoodsNoId() {
+        return goodsNoId;
+    }
+
+    public void setGoodsNoId(Integer goodsNoId) {
+        this.goodsNoId = goodsNoId;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getOperatorPhone() {
+        return operatorPhone;
+    }
+
+    public void setOperatorPhone(String operatorPhone) {
+        this.operatorPhone = operatorPhone;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getCompanyPhone() {
+        return companyPhone;
+    }
+
+    public void setCompanyPhone(String companyPhone) {
+        this.companyPhone = companyPhone;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "MaintainRecord{" +
+        "id=" + id +
+        ", goodsId=" + goodsId +
+        ", goodsNoId=" + goodsNoId +
+        ", operator=" + operator +
+        ", operatorPhone=" + operatorPhone +
+        ", company=" + company +
+        ", companyPhone=" + companyPhone +
+        ", indate=" + indate +
+        "}";
+    }
+}

pcbms/src/main/java/com/hssx/pcbms/entity/vo/MaintainRecordVO.java

@@ -12,4 +12,5 @@ import lombok.Data;
 @Data
 public class MaintainRecordVO extends MaintainRecord {
     private String ids;
+    private String modelNo;
 }

pcbms/src/main/java/com/hssx/pcbms/entity/vo/OperateRecordVO.java

@@ -12,4 +12,5 @@ import lombok.Data;
 @Data
 public class OperateRecordVO extends OperateRecord {
     private String ids;
+    private String modelNo;
 }

pcbms/src/main/java/com/hssx/pcbms/mapper/MaintainRecordMapper.java

@@ -0,0 +1,22 @@
+package com.hssx.pcbms.mapper;
+
+import com.hssx.pcbms.entity.Goods;
+import com.hssx.pcbms.entity.MaintainRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hssx.pcbms.entity.vo.MaintainRecordVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-01
+ */
+public interface MaintainRecordMapper extends BaseMapper<MaintainRecord> {
+
+    List<MaintainRecordVO> getRecordList(@Param("goods") Goods goods);
+}

pcbms/src/main/java/com/hssx/pcbms/mapper/OperateRecordMapper.java

@@ -4,6 +4,7 @@ import com.hssx.pcbms.entity.Goods;
 import com.hssx.pcbms.entity.OperateRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hssx.pcbms.entity.vo.GoodsNoVO;
+import com.hssx.pcbms.entity.vo.OperateRecordVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,5 +19,5 @@ import java.util.List;
  */
 public interface OperateRecordMapper extends BaseMapper<OperateRecord> {
 
-    List<GoodsNoVO> selectCondition(@Param("goods") Goods goods);
+    List<OperateRecordVO> selectCondition(@Param("goods") Goods goods);
 }

pcbms/src/main/java/com/hssx/pcbms/service/GoodsService.java

@@ -34,7 +34,7 @@ public interface GoodsService extends IService<Goods> {
 
     HttpRespMsg handle(GoodsNo goodsNo,Integer currentUserId);
 
-    HttpRespMsg operateList(Goods goods);
+    HttpRespMsg operateList(Goods goods,PageUtil page);
 
     HttpRespMsg goodsNoDetailById(GoodsNo goodsNo);
 
@@ -47,4 +47,6 @@ public interface GoodsService extends IService<Goods> {
     HttpRespMsg maintain(MaintainRecordVO maintainRecordVO);
 
     HttpRespMsg isMaintainList(Goods goods);
+
+    HttpRespMsg isMaintainRecord(Goods goods,PageUtil page);
 }

pcbms/src/main/java/com/hssx/pcbms/service/MaintainRecordService.java

@@ -0,0 +1,16 @@
+package com.hssx.pcbms.service;
+
+import com.hssx.pcbms.entity.MaintainRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-01
+ */
+public interface MaintainRecordService extends IService<MaintainRecord> {
+
+}

pcbms/src/main/java/com/hssx/pcbms/service/impl/GoodsServiceImpl.java

@@ -9,10 +9,7 @@ import com.hssx.pcbms.entity.vo.GoodsNoVO;
 import com.hssx.pcbms.entity.vo.GoodsVO;
 import com.hssx.pcbms.entity.vo.MaintainRecordVO;
 import com.hssx.pcbms.entity.vo.OperateRecordVO;
-import com.hssx.pcbms.mapper.GoodsMapper;
-import com.hssx.pcbms.mapper.GoodsNoMapper;
-import com.hssx.pcbms.mapper.OperateRecordMapper;
-import com.hssx.pcbms.mapper.UserMapper;
+import com.hssx.pcbms.mapper.*;
 import com.hssx.pcbms.service.GoodsNoService;
 import com.hssx.pcbms.service.GoodsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -58,6 +55,8 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     private OperateRecordService operateRecordService;
     @Resource
     private MaintainRecordService maintainRecordService;
+    @Resource
+    private MaintainRecordMapper maintainRecordMapper;
 
     @Override
     public HttpRespMsg add(GoodsVO goodsVO) {
@@ -173,10 +172,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
-    public HttpRespMsg operateList(Goods goods) {
+    public HttpRespMsg operateList(Goods goods,PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
-        List<GoodsNoVO> list = operateRecordMapper.selectCondition(goods);
-        msg.data = list;
+        PageHelper.startPage(page.getPageNum(),page.getPageSize());
+        List<OperateRecordVO> list = operateRecordMapper.selectCondition(goods);
+        PageInfo<OperateRecordVO> info = new PageInfo<>(list);
+        msg.data = info;
         return msg;
     }
 
@@ -276,6 +277,16 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         return msg;
     }
 
+    @Override
+    public HttpRespMsg isMaintainRecord(Goods goods,PageUtil page) {
+        HttpRespMsg msg = new HttpRespMsg();
+        PageHelper.startPage(page.getPageNum(),page.getPageSize());
+        List<MaintainRecordVO> list = maintainRecordMapper.getRecordList(goods);
+        PageInfo<MaintainRecordVO> info = new PageInfo<>(list);
+        msg.data = info;
+        return msg;
+    }
+
     public static void main(String[] args) {
 //        String format = String.format("%04d", 0);
 //        System.out.println(format);

pcbms/src/main/java/com/hssx/pcbms/service/impl/MaintainRecordServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.MaintainRecord;
+import com.hssx.pcbms.mapper.MaintainRecordMapper;
+import com.hssx.pcbms.service.MaintainRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-01
+ */
+@Service
+public class MaintainRecordServiceImpl extends ServiceImpl<MaintainRecordMapper, MaintainRecord> implements MaintainRecordService {
+
+}

pcbms/src/main/resources/mapper/MaintainRecordMapper.xml

@@ -0,0 +1,42 @@
+<?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.hssx.pcbms.mapper.MaintainRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.MaintainRecord">
+        <id column="id" property="id"/>
+        <result column="goods_id" property="goodsId"/>
+        <result column="goods_no_id" property="goodsNoId"/>
+        <result column="operator" property="operator"/>
+        <result column="operator_phone" property="operatorPhone"/>
+        <result column="company" property="company"/>
+        <result column="company_phone" property="companyPhone"/>
+        <result column="indate" property="indate"/>
+    </resultMap>
+    <resultMap id="BaseResultMapVO" type="com.hssx.pcbms.entity.vo.MaintainRecordVO">
+        <id column="id" property="id"/>
+        <result column="goods_id" property="goodsId"/>
+        <result column="model_no" property="modelNo"/>
+        <result column="goods_no_id" property="goodsNoId"/>
+        <result column="operator" property="operator"/>
+        <result column="operator_phone" property="operatorPhone"/>
+        <result column="company" property="company"/>
+        <result column="company_phone" property="companyPhone"/>
+        <result column="indate" property="indate"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, goods_id, goods_no_id, operator, operator_phone, company, company_phone, indate
+    </sql>
+
+    <select id="getRecordList" resultMap="BaseResultMapVO">
+        select
+            mr.id, mr.goods_id, mr.goods_no_id, mr.operator, mr.operator_phone, mr.company, mr.company_phone, mr.indate,gn.model_no
+        from
+            maintain_record mr
+        left join goods_no gn
+        on mr.goods_no_id = gn.id
+        where gn.goods_id = #{goods.id,jdbcType=INTEGER}
+    </select>
+</mapper>

pcbms/src/main/resources/mapper/OperateRecordMapper.xml

@@ -13,17 +13,8 @@
         <result column="good_no_id" property="goodNoId" />
         <result column="good_state" property="goodState" />
     </resultMap>
-    <resultMap id="BaseResultMapVO" type="com.hssx.pcbms.entity.vo.GoodsNoVO">
-        <id column="id" property="id" />
-        <result column="model_no" property="modelNo" />
-        <result column="division_code" property="divisionCode" />
-        <result column="suffix_code" property="suffixCode" />
-        <result column="state" property="state" />
-        <result column="indate" property="indate" />
-        <result column="goods_id" property="goodsId" />
-        <result column="user_id" property="userId" />
-        <result column="update_indate" property="updateIndate" />
-        <collection property="operateRecords" ofType="com.hssx.pcbms.entity.OperateRecord">
+    <resultMap id="BaseResultMapVO" type="com.hssx.pcbms.entity.vo.OperateRecordVO">
+            <result column="model_no" property="modelNo" />
             <result column="oid" property="id" />
             <result column="uid" property="userId" />
             <result column="user_name" property="userName" />
@@ -32,7 +23,6 @@
             <result column="good_id" property="goodId" />
             <result column="good_no_id" property="goodNoId" />
             <result column="good_state" property="goodState" />
-        </collection>
     </resultMap>
 
 
@@ -43,12 +33,13 @@
     </sql>
     <select id="selectCondition" resultMap="BaseResultMapVO">
         select
-            go.id, go.model_no, go.state, go.indate, go.goods_id, go.user_id, go.update_indate,
-            ore.id oid, ore.user_id uid, ore.user_name, ore.indate oindate, ore.content, ore.good_id, ore.good_no_id, ore.good_state
+            go.model_no, go.state,
+            ore.id oid, ore.user_id uid, ore.user_name, ore.indate oindate,
+            ore.content, ore.good_id, ore.good_no_id, ore.good_state
         from
-            goods_no go
-        left join
             operate_record ore
+        left join
+            goods_no go
         on ore.good_no_id = go.id
         where
             go.goods_id = #{goods.id}