fix(jg):使用登记导出调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java

@@ -32,7 +32,8 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
                                           @Param("roleIds") List<String> roleIds,
                                           @Param("client") String client);
 
-    List<RegistrationVo> queryRegistrationInIds(@Param("dto") JgUseRegistrationDto dto);
+    List<RegistrationVo> queryRegistrationInIds(@Param("dto") JgUseRegistrationDto dto,
+                                                @Param("client") String client);
 
     Map<String, Object> getDetail(@Param("id") String id);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -269,8 +269,18 @@
                 AND auditPassDate BETWEEN #{dto.auditPassDateStart} AND #{dto.auditPassDateEnd}
             </if>
             <if test="dto.dataType == 'supervision' ">
-                AND (receive_company_code = #{dto.receiveCompanyCode} or transfer_to_user_ids LIKE concat ('%',
-                #{dto.currentUserId}, '%'))
+                <choose>
+                    <when test="client == 'jgAudit'">
+                        AND
+                        (
+                        receive_company_code = #{dto.receiveCompanyCode}
+                        OR transfer_to_user_ids LIKE concat ('%',#{dto.currentUserId}, '%')
+                        )
+                    </when>
+                    <otherwise>
+                        and supervision_org_code LIKE concat (#{dto.supervisionOrgCode}, '%')
+                    </otherwise>
+                </choose>
                 AND status  <![CDATA[<>]]>  '使用单位待提交'
             </if>
             <if test="dto.dataType == 'company' ">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgTableDataExportController.java

@@ -8,9 +8,11 @@ import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.IJgTableDataExportService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -94,7 +96,10 @@ public class JgTableDataExportController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/registration")
     @ApiOperation(httpMethod = "GET", value = "使用登记列表数据导出", notes = "使用登记列表数据导出")
-    public void registrationExport(HttpServletResponse response, JgUseRegistrationDto dto) {
+    public void registrationExport(HttpServletResponse response,
+                                   JgUseRegistrationDto dto,
+                                   @ApiParam(value = "客户端类型: jgAudit-监管审核;jgLook-监管查看")
+                                   @RequestParam(value = "client", required = false, defaultValue = "jgAudit") String client) {
         ReginParams info = getSelectedOrgInfo();
         dto.setCurrentUserId(info.getUserModel().getUserId());
         if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
@@ -105,7 +110,7 @@ public class JgTableDataExportController extends BaseController {
             dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
             dto.setReceiveCompanyCode(info.getCompany().getCompanyCode());
         }
-        iJgTableDataExportService.registration(response, dto);
+        iJgTableDataExportService.registration(response, dto, client);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IJgTableDataExportService.java

@@ -25,7 +25,7 @@ public interface IJgTableDataExportService {
 
     void transfer(HttpServletResponse response, List<String> ids);
 
-    void registration(HttpServletResponse response, JgUseRegistrationDto dto);
+    void registration(HttpServletResponse response, JgUseRegistrationDto dto, String client);
 
     void changeRegistrationUnit(HttpServletResponse response, List<String> ids);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgTableDataExportServiceImpl.java

@@ -233,7 +233,8 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
      * @param response 响应
      * @param dto 筛选面板数据
      */
-    public void registration(HttpServletResponse response, JgUseRegistrationDto dto) {
+    @Override
+    public void registration(HttpServletResponse response, JgUseRegistrationDto dto, String client) {
         if (dto.getAuditPassDateRange() != null && !dto.getAuditPassDateRange().isEmpty() && !dto.getAuditPassDateRange().equals("[, ]")) {
             String dateRangeStr = dto.getAuditPassDateRange();
             String[] dates = dateRangeStr.replace("[", "").replace("]", "").split(", ");
@@ -254,7 +255,7 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
             dto.setAuditPassDateStart(start);
             dto.setAuditPassDateEnd(end);
         }
-        List<RegistrationVo> exportData = registrationMapper.queryRegistrationInIds(dto);
+        List<RegistrationVo> exportData = registrationMapper.queryRegistrationInIds(dto, client);
         for (RegistrationVo vo : exportData) {
             if (vo.getRegType()== null) {
                 vo.setRegType("新增登记");