feats

src/main/java/com/yunzhi/nanyang/controller/TaDeviceJobController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.nanyang.common.BaseController;
 import com.yunzhi.nanyang.common.ResponseBean;
 
+import java.util.HashMap;
 import java.util.List;
 
 import com.yunzhi.nanyang.common.StringUtils;
@@ -67,6 +68,34 @@ public class TaDeviceJobController extends BaseController {
         return ResponseBean.success(result);
     }
 
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @ApiOperation("设备作业列表")
+    @GetMapping("/device-job/by-org")
+    public ResponseBean statis(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                               @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                               @ApiParam("合作社名称") @RequestParam(value = "orgName", required = false) String orgName,
+                               @ApiParam("设备分类") @RequestParam(value = "deviceKind", required = false) String deviceKind,
+                               @ApiParam("设备编号") @RequestParam(value = "deviceNo", required = false) String deviceNo,
+                               @ApiParam(value = "开始时间", example = "2022-10-01") @RequestParam(value = "startDate", required = false) String startDate,
+                               @ApiParam(value = "结束时间", example = "2022-10-31") @RequestParam(value = "endDate", required = false) String endDate) throws Exception {
+
+        IPage<TaDeviceJob> pg = new Page<>(pageNum, pageSize);
+        IPage<TaDeviceJob> list = taDeviceJobService.statisOrgBy(pg, orgName, deviceKind, deviceNo, startDate, endDate);
+        Double totalArea = taDeviceJobService.statisTotalArea(orgName, deviceKind, deviceNo, startDate, endDate);
+
+        return ResponseBean.success(new HashMap<String, Object>(){{
+            put("list", list);
+            put("totalArea", totalArea);
+        }});
+    }
+
 //    /**
 //     * 新增数据
 //     *

src/main/java/com/yunzhi/nanyang/entity/TaDeviceJob.java

@@ -1,48 +1,64 @@
 package com.yunzhi.nanyang.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
- /**
+/**
  * 设备作业表;
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-11-3
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value = "设备作业表",description = "")
+@ApiModel(value = "设备作业表", description = "")
 @TableName("ta_device_job")
-public class TaDeviceJob implements Serializable,Cloneable{
-    /** 作业ID */
-    @ApiModelProperty(name = "作业ID",notes = "")
+public class TaDeviceJob implements Serializable, Cloneable {
+    /**
+     * 作业ID
+     */
+    @ApiModelProperty(name = "作业ID", notes = "")
     @TableId(value = "job_id", type = IdType.UUID)
-    private String jobId ;
-    /** 设备大类 */
-    @ApiModelProperty(name = "设备大类",notes = "")
-    private String deviceKind ;
-    /** 设备编号 */
-    @ApiModelProperty(name = "设备编号",notes = "")
-    private String deviceNo ;
-    /** 农机ID */
-    @ApiModelProperty(name = "农机ID",notes = "")
-    private String machineryId ;
-    /** 农机名称 */
-    @ApiModelProperty(name = "农机名称",notes = "")
-    private String machineryName ;
-    /** 作业面积 */
-    @ApiModelProperty(name = "作业面积",notes = "")
-    private Double jobArea ;
-    /** 作业时间 */
-    @ApiModelProperty(name = "作业时间",notes = "")
-    private String jobDate ;
+    private String jobId;
+    /**
+     * 设备大类
+     */
+    @ApiModelProperty(name = "设备大类", notes = "")
+    private String deviceKind;
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(name = "设备编号", notes = "")
+    private String deviceNo;
+    /**
+     * 农机ID
+     */
+    @ApiModelProperty(name = "农机ID", notes = "")
+    private String machineryId;
+    /**
+     * 作业面积
+     */
+    @ApiModelProperty(name = "作业面积", notes = "")
+    private Double jobArea;
+    /**
+     * 作业时间
+     */
+    @ApiModelProperty(name = "作业时间", notes = "")
+    private String jobDate;
 
+    @ApiModelProperty(name = "合作社名称")
+    @TableField(exist = false)
+    private String orgName;
 }

src/main/java/com/yunzhi/nanyang/mapper/TaDeviceJobMapper.java

@@ -1,6 +1,7 @@
 package com.yunzhi.nanyang.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.yunzhi.nanyang.entity.TaDeviceJob;
@@ -12,5 +13,17 @@ import com.yunzhi.nanyang.entity.TaDeviceJob;
  */
 @Mapper
 public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
-    
-}
+
+     IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg,
+                                    @Param("orgName") String orgName,
+                                    @Param("deviceKind") String deviceKind,
+                                    @Param("deviceNo") String deviceNo,
+                                    @Param("startDate") String startDate,
+                                    @Param("endDate") String endDate);
+
+     Double statisTotalArea(@Param("orgName") String orgName,
+                            @Param("deviceKind") String deviceKind,
+                            @Param("deviceNo") String deviceNo,
+                            @Param("startDate") String startDate,
+                            @Param("endDate") String endDate);
+ }

src/main/java/com/yunzhi/nanyang/service/TaDeviceJobService.java

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.nanyang.entity.TaDeviceJob;
 
@@ -9,5 +10,8 @@ import com.yunzhi.nanyang.entity.TaDeviceJob;
  * @date : 2022-11-3
  */
 public interface TaDeviceJobService extends IBaseService<TaDeviceJob> {
-    
-}
+
+     IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgName, String deviceKind, String deviceNo, String startDate, String endDate);
+
+     Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate);
+ }

src/main/java/com/yunzhi/nanyang/service/impl/TaDeviceJobServiceImpl.java

@@ -1,16 +1,28 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yunzhi.nanyang.entity.TaDeviceJob;
 import com.yunzhi.nanyang.mapper.TaDeviceJobMapper;
 import com.yunzhi.nanyang.service.TaDeviceJobService;
- /**
+
+/**
  * 设备作业表;(ta_device_job)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-11-3
  */
 @Service
 public class TaDeviceJobServiceImpl extends BaseServiceImpl<TaDeviceJobMapper, TaDeviceJob> implements TaDeviceJobService {
-    
+
+    @Override
+    public IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgName, String deviceKind, String deviceNo, String startDate, String endDate) {
+        return baseMapper.statisOrgBy(pg, orgName, deviceKind, deviceNo, startDate, endDate);
+    }
+
+    @Override
+    public Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate) {
+        return baseMapper.statisTotalArea(orgName, deviceKind, deviceNo, startDate, endDate);
+    }
 }

src/main/resources/mapper/TaDeviceJobMapper.xml

@@ -2,5 +2,39 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.yunzhi.nanyang.mapper.TaDeviceJobMapper">
-    
+
+    <sql id="statisOrg">
+        FROM
+            ta_device_job t
+            INNER JOIN ta_machinery s ON t.machinery_id = s.machinery_id
+            INNER JOIN ta_org m ON s.org_id = m.org_id
+        WHERE
+            1 = 1
+        <if test="deviceKind != null and deviceKind != ''">
+            AND t.device_kind = #{deviceKind}
+        </if>
+        <if test="deviceNo != null and deviceNo != ''">
+            AND t.device_no = #{deviceNo}
+        </if>
+        <if test="orgName != null and orgName != ''">
+            AND m.`name` LIKE CONCAT( '%', #{orgName}, '%' )
+        </if>
+        <if test="startDate != null and startDate != ''">
+            AND t.job_date BETWEEN #{startDate} AND #{endDate}
+        </if>
+        ORDER BY
+            t.job_date DESC
+    </sql>
+
+    <select id="statisOrgBy" resultType="com.yunzhi.nanyang.entity.TaDeviceJob">
+        SELECT
+            m.`name` AS org_name,
+            s.`name` AS machinery_name,
+            t.*
+        <include refid="statisOrg"></include>
+    </select>
+    <select id="statisTotalArea" resultType="java.lang.Double">
+        SELECT SUM(t.job_area)
+        <include refid="statisOrg"></include>
+    </select>
 </mapper>