feats

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

@@ -12,6 +12,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.entity.TaMachinery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -36,17 +37,18 @@ public class TaDeviceJobController extends BaseController {
     @Autowired
     private TaDeviceJobService taDeviceJobService;
 
-//    /**
-//     * 通过ID查询单条数据
-//     *
-//     * @param jobId 主键
-//     * @return 实例对象
-//     */
-//    @ApiOperation("通过ID查询单条数据")
-//    @GetMapping("/device-job/{id}")
-//    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
-//        return ResponseBean.success(taDeviceJobService.getById(id));
-//    }
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param userId 用户ID
+     * @return 实例对象
+     */
+    @ApiOperation("获取用户作业农机列表")
+    @GetMapping("/device-job/user/{userId}/machinery")
+    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String userId) throws Exception {
+        List<TaMachinery> machineryList = taDeviceJobService.getMachineryListByUser(userId);
+        return ResponseBean.success(machineryList);
+    }
 
     /**
      * 设备作业列表
@@ -83,9 +85,9 @@ public class TaDeviceJobController extends BaseController {
     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 = "machineryName", required = false) String machineryName,
-                               @ApiParam("合作社名称") @RequestParam(value = "userName", required = false) String userName,
-                               @ApiParam("合作社名称") @RequestParam(value = "phone", required = false) String phone,
+                               @ApiParam("农机名称") @RequestParam(value = "machineryName", required = false) String machineryName,
+                               @ApiParam("人员名称") @RequestParam(value = "userName", required = false) String userName,
+                               @ApiParam("人员手机") @RequestParam(value = "phone", required = false) String phone,
                                @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") String startDate,
@@ -115,13 +117,16 @@ public class TaDeviceJobController extends BaseController {
     @ApiOperation("设备作业统计-导出")
     @GetMapping("/device-job/by-org/export")
     public ResponseBean export(@ApiParam("合作社名称") @RequestParam(value = "orgName", required = false) String orgName,
+                               @ApiParam("农机名称") @RequestParam(value = "machineryName", required = false) String machineryName,
+                               @ApiParam("人员名称") @RequestParam(value = "userName", required = false) String userName,
+                               @ApiParam("人员手机") @RequestParam(value = "phone", required = false) String phone,
                                @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") String startDate,
                                @ApiParam(value = "结束时间", example = "2022-10-31") @RequestParam(value = "endDate") String endDate,
                                HttpServletResponse response) throws Exception {
 
-        List<TaDeviceJob> list = taDeviceJobService.listOrgBy(orgName, deviceKind, deviceNo, startDate, endDate);
+        List<TaDeviceJob> list = taDeviceJobService.listOrgBy(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone);
 
         Double total = 0.0;
         if (list != null || list.size() > 0) {

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

@@ -73,6 +73,9 @@ public class TaMachinery implements Serializable {
     @ApiModelProperty(value = "机构ID")
     private String orgId;
 
+    @ApiModelProperty(value = "归属人")
+    private String ownerId;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "机构名称")
     private String orgName;

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

@@ -2,6 +2,7 @@ package com.yunzhi.nanyang.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.nanyang.entity.TaMachinery;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.yunzhi.nanyang.entity.TaDeviceJob;
@@ -39,11 +40,16 @@ public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
                                  @Param("deviceKind") String deviceKind,
                                  @Param("deviceNo") String deviceNo,
                                  @Param("startDate") String startDate,
-                                 @Param("endDate") String endDate);
+                                 @Param("endDate") String endDate,
+                                 @Param("machineryName") String machineryName,
+                                 @Param("userName") String userName,
+                                 @Param("phone") String phone);
 
     IPage<TaDeviceJob> getPageBy(IPage<TaDeviceJob> pg,
                                  @Param("deviceKind") String deviceKind,
                                  @Param("deviceNo") String deviceNo,
                                  @Param("startDate") String startDate,
                                  @Param("endDate") String endDate);
+
+    List<TaMachinery> getMachineryListByUser(@Param("userId") String userId);
 }

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

@@ -2,6 +2,7 @@ package com.yunzhi.nanyang.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaDeviceJob;
+import com.yunzhi.nanyang.entity.TaMachinery;
 
 import java.util.List;
 
@@ -16,7 +17,9 @@ public interface TaDeviceJobService extends IBaseService<TaDeviceJob> {
 
      Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone);
 
-     List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate);
+     List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone);
 
     IPage<TaDeviceJob> getPageBy(IPage<TaDeviceJob> pg, String deviceKind, String deviceNo, String startDate, String endDate);
+
+    List<TaMachinery> getMachineryListByUser(String userId);
 }

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

@@ -1,6 +1,7 @@
 package com.yunzhi.nanyang.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.nanyang.entity.TaMachinery;
 import org.springframework.stereotype.Service;
 import com.yunzhi.nanyang.entity.TaDeviceJob;
 import com.yunzhi.nanyang.mapper.TaDeviceJobMapper;
@@ -28,12 +29,17 @@ public class TaDeviceJobServiceImpl extends BaseServiceImpl<TaDeviceJobMapper, T
     }
 
     @Override
-    public List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate) {
-        return baseMapper.listOrgBy(orgName, deviceKind, deviceNo, startDate, endDate);
+    public List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone) {
+        return baseMapper.listOrgBy(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone);
     }
 
     @Override
     public IPage<TaDeviceJob> getPageBy(IPage<TaDeviceJob> pg, String deviceKind, String deviceNo, String startDate, String endDate) {
         return baseMapper.getPageBy(pg, deviceKind, deviceNo, startDate, endDate);
     }
+
+    @Override
+    public List<TaMachinery> getMachineryListByUser(String userId) {
+        return baseMapper.getMachineryListByUser(userId);
+    }
 }

src/main/resources/mapper/TaDeviceJobMapper.xml

@@ -81,4 +81,15 @@
         ORDER BY
             t.job_date DESC
     </select>
+    <select id="getMachineryListByUser" resultType="com.yunzhi.nanyang.entity.TaMachinery">
+        SELECT
+            *
+        FROM
+            ta_machinery t
+        WHERE
+                t.machinery_id IN ( SELECT a.machinery_id FROM ta_device_job a WHERE a.user_id = #{userId} )
+          AND t.`status` &gt; - 1
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>