Yansen пре 2 година
родитељ
комит
82befbe8a5

+ 1
- 1
pom.xml Прегледај датотеку

@@ -10,7 +10,7 @@
10 10
 	</parent>
11 11
 	<groupId>com.yunzhi</groupId>
12 12
 	<artifactId>nanyang</artifactId>
13
-	<version>0.0.6</version>
13
+	<version>0.0.7</version>
14 14
 	<name>main-service</name>
15 15
 	<description>Demo project for Spring Boot</description>
16 16
 

+ 5
- 3
src/main/java/com/yunzhi/nanyang/controller/TaDeviceJobController.java Прегледај датотеку

@@ -84,6 +84,7 @@ public class TaDeviceJobController extends BaseController {
84 84
     @GetMapping("/device-job/by-org")
85 85
     public ResponseBean statis(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
86 86
                                @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
87
+                               @ApiParam("合作社ID") @RequestParam(value = "orgId", required = false) String orgId,
87 88
                                @ApiParam("合作社名称") @RequestParam(value = "orgName", required = false) String orgName,
88 89
                                @ApiParam("农机名称") @RequestParam(value = "machineryName", required = false) String machineryName,
89 90
                                @ApiParam("人员名称") @RequestParam(value = "userName", required = false) String userName,
@@ -96,8 +97,8 @@ public class TaDeviceJobController extends BaseController {
96 97
                                @ApiParam(value = "结束时间", example = "2022-10-31") @RequestParam(value = "endDate") String endDate) throws Exception {
97 98
 
98 99
         IPage<TaDeviceJob> pg = new Page<>(pageNum, pageSize);
99
-        IPage<TaDeviceJob> list = taDeviceJobService.statisOrgBy(pg, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
100
-        Double totalArea = taDeviceJobService.statisTotalArea(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
100
+        IPage<TaDeviceJob> list = taDeviceJobService.statisOrgBy(pg, orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
101
+        Double totalArea = taDeviceJobService.statisTotalArea(orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
101 102
 
102 103
         return ResponseBean.success(new HashMap<String, Object>(){{
103 104
             put("list", list);
@@ -119,6 +120,7 @@ public class TaDeviceJobController extends BaseController {
119 120
     @ApiOperation("设备作业统计-导出")
120 121
     @GetMapping("/device-job/by-org/export")
121 122
     public ResponseBean export(@ApiParam("合作社名称") @RequestParam(value = "orgName", required = false) String orgName,
123
+                               @ApiParam("合作社ID") @RequestParam(value = "orgId", required = false) String orgId,
122 124
                                @ApiParam("农机名称") @RequestParam(value = "machineryName", required = false) String machineryName,
123 125
                                @ApiParam("人员名称") @RequestParam(value = "userName", required = false) String userName,
124 126
                                @ApiParam("农机ID") @RequestParam(value = "machineryId", required = false) String machineryId,
@@ -130,7 +132,7 @@ public class TaDeviceJobController extends BaseController {
130 132
                                @ApiParam(value = "结束时间", example = "2022-10-31") @RequestParam(value = "endDate") String endDate,
131 133
                                HttpServletResponse response) throws Exception {
132 134
 
133
-        List<TaDeviceJob> list = taDeviceJobService.listOrgBy(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
135
+        List<TaDeviceJob> list = taDeviceJobService.listOrgBy(orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
134 136
 
135 137
         Double total = 0.0;
136 138
         if (list != null || list.size() > 0) {

+ 5
- 2
src/main/java/com/yunzhi/nanyang/mapper/TaDeviceJobMapper.java Прегледај датотеку

@@ -18,6 +18,7 @@ import java.util.List;
18 18
 public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
19 19
 
20 20
      IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg,
21
+                                    @Param("orgId") String orgId,
21 22
                                     @Param("orgName") String orgName,
22 23
                                     @Param("deviceKind") String deviceKind,
23 24
                                     @Param("deviceNo") String deviceNo,
@@ -29,7 +30,8 @@ public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
29 30
                                     @Param("machineryId") String machineryId,
30 31
                                     @Param("userId") String userId);
31 32
 
32
-     Double statisTotalArea(@Param("orgName") String orgName,
33
+     Double statisTotalArea(@Param("orgId") String orgId,
34
+                            @Param("orgName") String orgName,
33 35
                             @Param("deviceKind") String deviceKind,
34 36
                             @Param("deviceNo") String deviceNo,
35 37
                             @Param("startDate") String startDate,
@@ -40,7 +42,8 @@ public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
40 42
                             @Param("machineryId") String machineryId,
41 43
                             @Param("userId") String userId);
42 44
 
43
-     List<TaDeviceJob> listOrgBy(@Param("orgName") String orgName,
45
+     List<TaDeviceJob> listOrgBy(@Param("orgId") String orgId,
46
+                                 @Param("orgName") String orgName,
44 47
                                  @Param("deviceKind") String deviceKind,
45 48
                                  @Param("deviceNo") String deviceNo,
46 49
                                  @Param("startDate") String startDate,

+ 3
- 3
src/main/java/com/yunzhi/nanyang/service/TaDeviceJobService.java Прегледај датотеку

@@ -14,11 +14,11 @@ import java.util.List;
14 14
  */
15 15
 public interface TaDeviceJobService extends IBaseService<TaDeviceJob> {
16 16
 
17
-    IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId);
17
+    IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgId, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId);
18 18
 
19
-    Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId);
19
+    Double statisTotalArea(String orgId, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId);
20 20
 
21
-    List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId);
21
+    List<TaDeviceJob> listOrgBy(String orgId, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId);
22 22
 
23 23
     IPage<TaDeviceJob> getPageBy(IPage<TaDeviceJob> pg, String deviceKind, String deviceNo, String startDate, String endDate);
24 24
 

+ 6
- 6
src/main/java/com/yunzhi/nanyang/service/impl/TaDeviceJobServiceImpl.java Прегледај датотеку

@@ -19,18 +19,18 @@ import java.util.List;
19 19
 public class TaDeviceJobServiceImpl extends BaseServiceImpl<TaDeviceJobMapper, TaDeviceJob> implements TaDeviceJobService {
20 20
 
21 21
     @Override
22
-    public IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId) {
23
-        return baseMapper.statisOrgBy(pg, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
22
+    public IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgId, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId) {
23
+        return baseMapper.statisOrgBy(pg, orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
24 24
     }
25 25
 
26 26
     @Override
27
-    public Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId) {
28
-        return baseMapper.statisTotalArea(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
27
+    public Double statisTotalArea(String orgId, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId) {
28
+        return baseMapper.statisTotalArea(orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
29 29
     }
30 30
 
31 31
     @Override
32
-    public List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId) {
33
-        return baseMapper.listOrgBy(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
32
+    public List<TaDeviceJob> listOrgBy(String orgId, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId) {
33
+        return baseMapper.listOrgBy(orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
34 34
     }
35 35
 
36 36
     @Override

+ 3
- 0
src/main/resources/mapper/TaDeviceJobMapper.xml Прегледај датотеку

@@ -17,6 +17,9 @@
17 17
         <if test="deviceNo != null and deviceNo != ''">
18 18
             AND t.device_no = #{deviceNo}
19 19
         </if>
20
+        <if test="orgId != null and orgId != ''">
21
+            AND m.org_id = #{orgId}
22
+        </if>
20 23
         <if test="orgName != null and orgName != ''">
21 24
             AND m.`name` LIKE CONCAT( '%', #{orgName}, '%' )
22 25
         </if>