feats

pom.xml

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

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

@@ -84,6 +84,7 @@ public class TaDeviceJobController extends BaseController {
     @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("合作社ID") @RequestParam(value = "orgId", required = false) String orgId,
                                @ApiParam("合作社名称") @RequestParam(value = "orgName", required = false) String orgName,
                                @ApiParam("农机名称") @RequestParam(value = "machineryName", required = false) String machineryName,
                                @ApiParam("人员名称") @RequestParam(value = "userName", required = false) String userName,
@@ -96,8 +97,8 @@ public class TaDeviceJobController extends BaseController {
                                @ApiParam(value = "结束时间", example = "2022-10-31") @RequestParam(value = "endDate") String endDate) throws Exception {
 
         IPage<TaDeviceJob> pg = new Page<>(pageNum, pageSize);
-        IPage<TaDeviceJob> list = taDeviceJobService.statisOrgBy(pg, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
-        Double totalArea = taDeviceJobService.statisTotalArea(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
+        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);
@@ -119,6 +120,7 @@ public class TaDeviceJobController extends BaseController {
     @ApiOperation("设备作业统计-导出")
     @GetMapping("/device-job/by-org/export")
     public ResponseBean export(@ApiParam("合作社名称") @RequestParam(value = "orgName", required = false) String orgName,
+                               @ApiParam("合作社ID") @RequestParam(value = "orgId", required = false) String orgId,
                                @ApiParam("农机名称") @RequestParam(value = "machineryName", required = false) String machineryName,
                                @ApiParam("人员名称") @RequestParam(value = "userName", required = false) String userName,
                                @ApiParam("农机ID") @RequestParam(value = "machineryId", required = false) String machineryId,
@@ -130,7 +132,7 @@ public class TaDeviceJobController extends BaseController {
                                @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, machineryName, userName, phone, machineryId, userId);
+        List<TaDeviceJob> list = taDeviceJobService.listOrgBy(orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
 
         Double total = 0.0;
         if (list != null || list.size() > 0) {

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

@@ -18,6 +18,7 @@ import java.util.List;
 public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
 
      IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg,
+                                    @Param("orgId") String orgId,
                                     @Param("orgName") String orgName,
                                     @Param("deviceKind") String deviceKind,
                                     @Param("deviceNo") String deviceNo,
@@ -29,7 +30,8 @@ public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
                                     @Param("machineryId") String machineryId,
                                     @Param("userId") String userId);
 
-     Double statisTotalArea(@Param("orgName") String orgName,
+     Double statisTotalArea(@Param("orgId") String orgId,
+                            @Param("orgName") String orgName,
                             @Param("deviceKind") String deviceKind,
                             @Param("deviceNo") String deviceNo,
                             @Param("startDate") String startDate,
@@ -40,7 +42,8 @@ public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
                             @Param("machineryId") String machineryId,
                             @Param("userId") String userId);
 
-     List<TaDeviceJob> listOrgBy(@Param("orgName") String orgName,
+     List<TaDeviceJob> listOrgBy(@Param("orgId") String orgId,
+                                 @Param("orgName") String orgName,
                                  @Param("deviceKind") String deviceKind,
                                  @Param("deviceNo") String deviceNo,
                                  @Param("startDate") String startDate,

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

@@ -14,11 +14,11 @@ import java.util.List;
  */
 public interface TaDeviceJobService extends IBaseService<TaDeviceJob> {
 
-    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);
+    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);
 
-    Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId);
+    Double statisTotalArea(String orgId, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId);
 
-    List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId);
+    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);
 
     IPage<TaDeviceJob> getPageBy(IPage<TaDeviceJob> pg, String deviceKind, String deviceNo, String startDate, String endDate);
 

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

@@ -19,18 +19,18 @@ import java.util.List;
 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, String machineryName, String userName, String phone, String machineryId, String userId) {
-        return baseMapper.statisOrgBy(pg, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
+    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) {
+        return baseMapper.statisOrgBy(pg, orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
     }
 
     @Override
-    public Double statisTotalArea(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId) {
-        return baseMapper.statisTotalArea(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
+    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) {
+        return baseMapper.statisTotalArea(orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
     }
 
     @Override
-    public List<TaDeviceJob> listOrgBy(String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId) {
-        return baseMapper.listOrgBy(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
+    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) {
+        return baseMapper.listOrgBy(orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
     }
 
     @Override

src/main/resources/mapper/TaDeviceJobMapper.xml

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