Merge remote-tracking branch 'origin/dev0124' into dev0124

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/AcceptanceMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,6 +17,7 @@ public interface AcceptanceMapper extends BaseMapper<BaseEntity> {
      * @param acceptanceDto 查询参数
      * @return 分页结果
      */
+    @UserEmpower(field ={"ph.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
     List<AcceptanceDto> page(
 
             @Param("param") AcceptanceDto acceptanceDto

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/BasicGridAcceptanceMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
@@ -19,6 +20,6 @@ public interface BasicGridAcceptanceMapper extends BaseMapper<BasicGridAcceptanc
 
 
     PeasantHousehold getStationInfoById(@Param("id") Long id);
-
+    @UserEmpower(field ={"hph.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
     List<BasicGridAcceptanceDto> selectPageList(@Param("map") Map<String, Object> map);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/DealerReviewMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.DealerReview;
 
@@ -12,6 +13,6 @@ import java.util.List;
  * @createDate: 2023/8/1
  */
 public interface DealerReviewMapper extends BaseMapper<DealerReview> {
-
+    @UserEmpower(field ={"ph.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
     List<ReviewDto> queryForDealerReviewPage(ReviewDto reviewDto);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/MaintenanceMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.Maintenance;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -31,6 +32,7 @@ public interface MaintenanceMapper extends BaseMapper<Maintenance> {
     public Integer selectMaintenance(@Param("telephone")String telephone,@Param("adminLoginName")String adminLoginName);
 
     //列表
+    @UserEmpower(field ={"ph.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
     List<MaintenanceDto> Maintenancepage(@Param("name")String name, @Param("maintenanceTypeCode")String maintenanceTypeCode,
                                          @Param("lockStatus")String lockStatus, @Param("reviewStatus")String reviewStatus,
                                          @Param("regionalCompaniesSeq")Long regionalCompaniesSeq, @Param("dealerId") Long dealerId,@Param("maintenanceType")String maintenanceType,

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PreparationMoneyMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
 import org.apache.ibatis.annotations.Param;
@@ -18,5 +22,7 @@ public interface PreparationMoneyMapper extends BaseMapper<PreparationMoney> {
 
 
     List<PeasantHousehold> getPeasantHouseholdData(@Param("sequenceNbr")  Long sequenceNbr,@Param("ownersName")  String ownersName);
+    @UserEmpower(field ={"regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
+    IPage<PreparationMoney> selectPage(IPage<PreparationMoney> page, @Param(Constants.WRAPPER) Wrapper<PreparationMoney> queryWrapper);
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml

@@ -13,6 +13,7 @@
     </select>
 
     <select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto">
+
         SELECT
         hogaa.sequence_nbr fonGridId,
         hbga.sequence_nbr sequenceNbr,
@@ -26,14 +27,13 @@
         hph.developer_name as serviceAgent,
         hph.regional_companies_name AS regionalCompaniesName,
         hph.owners_name AS ownersName,
-            hph.peasant_household_no peasantHouseholdNo,
-            hph.project_address_name projectAddressName,
-            DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d %H:%i:%S') AS gridConnectionTime,
-            CASE WHEN hbga.grid_status = '1' THEN '待登记'
-                WHEN hbga.grid_status = '2' THEN '待审核'
-                WHEN hbga.grid_status = '3' THEN '已完成'
-                ELSE '未通过' END AS gridStatus
-
+        hph.peasant_household_no peasantHouseholdNo,
+        hph.project_address_name projectAddressName,
+        DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d %H:%i:%S') AS gridConnectionTime,
+        CASE WHEN hbga.grid_status = '1' THEN '待登记'
+        WHEN hbga.grid_status = '2' THEN '待审核'
+        WHEN hbga.grid_status = '3' THEN '已完成'
+        ELSE '未通过' END AS gridStatus
         FROM
             hygf_basic_grid_acceptance hbga
             LEFT JOIN hygf_peasant_household hph ON hph.sequence_nbr = hbga.peasant_household_id
@@ -70,5 +70,7 @@
         ORDER BY
         FIELD(hbga.grid_status, '1', '2', '4', '3'),
          hogaa.grid_connection_time desc
+
+
     </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/DealerReviewMapper.xml

@@ -33,7 +33,9 @@
         d.plan_instance_id planInstanceId,
         u.admin_user_id  adminUserId,
         (select GROUP_CONCAT(hygf_regional_companies.regional_companies_name) from hygf_regional_companies where hygf_regional_companies.unit_info_id=u.sequence_nbr ) regionalCompaniesName
-        from  hygf_commerce_info c  LEFT JOIN hygf_unit_info u on c.unit_seq=u.sequence_nbr LEFT JOIN hygf_dealer_review d on d.unit_info_id=u.sequence_nbr
+        from  hygf_commerce_info c
+        LEFT JOIN hygf_unit_info u on c.unit_seq=u.sequence_nbr
+        LEFT JOIN hygf_dealer_review d on d.unit_info_id=u.sequence_nbr
         <where>
             u.is_delete=0
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/AcceptanceController.java

@@ -38,11 +38,11 @@ public class AcceptanceController  extends BaseController {
             @RequestParam(value = "size", required = false, defaultValue = "20") Integer size,
             @RequestBody AcceptanceDto param
     ) {
-        UserUnitInformationDto userUnitInformationDto = personnelBusinessMapper.getUserUnitInformationDto(getUserInfo().getUserId());
-        if(userUnitInformationDto!=null){
-            param.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
-            param.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
-        }
+//        UserUnitInformationDto userUnitInformationDto = personnelBusinessMapper.getUserUnitInformationDto(getUserInfo().getUserId());
+//        if(userUnitInformationDto!=null){
+//            param.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
+//            param.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
+//        }
 
 
         return ResponseHelper.buildResponse( acceptanceService.page(current, size, param));

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/BasicGridAcceptanceController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
@@ -144,6 +145,7 @@ public class BasicGridAcceptanceController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/check/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+    @UserLimits
 	public ResponseModel<Page<BasicGridAcceptanceDto>> queryForCheckPage(@RequestParam(value = "current") int current,
 																	@RequestParam(value = "size") int size,
 																	@RequestParam(required = false,value = "projectAddress") String projectAddress,

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/MaintenanceController.java

@@ -113,6 +113,7 @@ public class MaintenanceController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET",value = "运维人员分页查询",  notes = "运维人员分页查询")
+    @UserLimits
     public ResponseModel<Page<MaintenanceDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
             (value = "size") int size,
                                                          @RequestParam(required = false) String name,

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PreparationMoneyController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationPageDto;
@@ -121,17 +122,18 @@ public class PreparationMoneyController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping (value = "/page")
 	@ApiOperation(httpMethod = "post",value = "发货单分页查询",  notes = "发货单分页查询")
+    @UserLimits
 	public ResponseModel<IPage<PreparationMoney>> queryForPage(@RequestBody  PreparationPageDto preparationPageDto
     ) {
 
 
         //获取用户所在经销商单位
-        AgencyUserModel userInfo = getUserInfo();
-        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(userInfo.getUserId());
-
-        if(userUnitInformationDto!=null&&userUnitInformationDto.getAmosDealerName()!=null){
-            preparationPageDto.setAmosUnitId(String.valueOf(userUnitInformationDto.getAmosUnitInfoId()));
-        }
+//        AgencyUserModel userInfo = getUserInfo();
+//        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(userInfo.getUserId());
+//
+//        if(userUnitInformationDto!=null&&userUnitInformationDto.getAmosDealerName()!=null){
+//            preparationPageDto.setAmosUnitId(String.valueOf(userUnitInformationDto.getAmosUnitInfoId()));
+//        }
 
 	    return ResponseHelper.buildResponse(preparationMoneyServiceImpl.queryForPreparationMoneyPage(preparationPageDto));
 	}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.hwsms.SendSmsCode;
@@ -181,6 +182,7 @@ public class UnitInfoController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/queryForDealerReviewPage")
     @ApiOperation(httpMethod = "GET",value = "经销商人员信息分页查询",  notes = "经销商人员信息分页查询")
+    @UserLimits
     public ResponseModel<Page<ReviewDto>> queryForDealerReviewPage(@RequestParam(value = "current") int current, @RequestParam
             (value = "size") int size,  ReviewDto reviewDto) {
         Page<ReviewDto> page=dealerReviewServiceImpl.queryForDealerReviewPage(current,size,reviewDto);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java

@@ -10,6 +10,8 @@ import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.DeliveryStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.PreparationEnum;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyLogDto;
@@ -77,6 +79,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
     /**
      * 分页查询
      */
+
     public IPage<PreparationMoney> queryForPreparationMoneyPage(PreparationPageDto  dto)   {
 
         //列表数据组装