feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>nanyang</artifactId>
-	<version>0.0.7</version>
+	<version>0.0.8</version>
 	<name>main-service</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -99,7 +99,6 @@ public class TaDeviceJobController extends BaseController {
         IPage<TaDeviceJob> pg = new Page<>(pageNum, pageSize);
         IPage<TaDeviceJob> list = taDeviceJobService.statisOrgBy(pg, orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
         Double totalArea = taDeviceJobService.statisTotalArea(orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
-
         return ResponseBean.success(new HashMap<String, Object>(){{
             put("list", list);
             put("totalArea", totalArea);
@@ -128,6 +127,7 @@ public class TaDeviceJobController extends BaseController {
                                @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("位置") @RequestParam(value = "address", required = false) String address,
                                @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 {

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

@@ -49,11 +49,9 @@ public class TaDeviceJob implements Serializable, Cloneable {
     private String userId;
 
     @ApiModelProperty(name = "人员名称", notes = "")
-    @TableField(exist = false)
     private String userName;
 
     @ApiModelProperty(name = "人员手机", notes = "")
-    @TableField(exist = false)
     private String phone;
     /**
      * 农机ID
@@ -106,6 +104,8 @@ public class TaDeviceJob implements Serializable, Cloneable {
     private String address;
 
     @ApiModelProperty(name = "合作社名称")
-    @TableField(exist = false)
     private String orgName;
+
+    @ApiModelProperty(name = "合作社ID")
+    private String orgId;
 }

src/main/resources/mapper/TaDeviceJobMapper.xml

@@ -7,8 +7,8 @@
         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
-            LEFT JOIN sys_user n ON t.user_id = n.user_id
+--             INNER JOIN ta_org m ON s.org_id = m.org_id
+--             LEFT JOIN sys_user n ON t.user_id = n.user_id
         WHERE
             1 = 1
         <if test="deviceKind != null and deviceKind != ''">
@@ -18,10 +18,10 @@
             AND t.device_no = #{deviceNo}
         </if>
         <if test="orgId != null and orgId != ''">
-            AND m.org_id = #{orgId}
+            AND t.org_id = #{orgId}
         </if>
         <if test="orgName != null and orgName != ''">
-            AND m.`name` LIKE CONCAT( '%', #{orgName}, '%' )
+            AND t.org_name LIKE CONCAT( '%', #{orgName}, '%' )
         </if>
         <if test="machineryId != null and machineryId != ''">
             AND s.machinery_id = #{machineryId}
@@ -33,25 +33,21 @@
             AND s.`name` LIKE CONCAT( '%', #{machineryName}, '%' )
         </if>
         <if test="userName != null and userName != ''">
-            AND n.user_name LIKE CONCAT( '%', #{userName}, '%' )
+            AND t.user_name LIKE CONCAT( '%', #{userName}, '%' )
         </if>
         <if test="phone != null and phone != ''">
-            AND n.phone LIKE CONCAT( '%', #{phone}, '%' )
+            AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
         </if>
         <if test="startDate != null and startDate != ''">
             AND t.job_date BETWEEN #{startDate} AND #{endDate}
         </if>
         AND s.`status` &gt; -1
         ORDER BY
-            t.job_date DESC
+            t.job_date DESC, t.job_time DESC
     </sql>
 
     <select id="statisOrgBy" resultType="com.yunzhi.nanyang.entity.TaDeviceJob">
         SELECT
-            m.`name` AS org_name,
-            n.user_id,
-            n.user_name,
-            n.phone,
             s.`name` AS machinery_name,
             t.*
         <include refid="statisOrg"></include>
@@ -62,10 +58,6 @@
     </select>
     <select id="listOrgBy" resultType="com.yunzhi.nanyang.entity.TaDeviceJob">
         SELECT
-            m.`name` AS org_name,
-            n.user_id,
-            n.user_name,
-            n.phone,
             s.`name` AS machinery_name,
             t.*
         <include refid="statisOrg"></include>