1.移转变更列表监管无数据bug

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

@@ -20,7 +20,7 @@ public interface JgChangeRegistrationTransferMapper extends BaseMapper<JgChangeR
 
     void updatePromoter(@Param ("id")Long id);
 
-    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationTransferDto dto , @Param("roleIds") List<String> roleIds, @Param("type") String type, @Param("currentUserId")String currentUserId);
+    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationTransferDto dto , @Param("type") String type, @Param("currentUserId")String currentUserId);
 
     @Select("select name from tz_equipment_category  where code=#{code}")
     String getEquiplistNameByEquiplist(String code);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationTransferService.java

@@ -9,7 +9,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationTransferDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransfer;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
 import java.util.List;
 import java.util.Map;
 
@@ -29,7 +28,7 @@ public interface IJgChangeRegistrationTransferService extends IService<JgChangeR
 
     Map<String, Map<String, Object>> getTransferDetail(String sequenceNbr, String equipId);
 
-    Page<Map<String, Object>> queryListForPage(Page<Map<String, Object>> page, JgChangeRegistrationTransferDto params, String type);
+    Page<Map<String, Object>> queryListForPage(Page<Map<String, Object>> page, JgChangeRegistrationTransferDto params, String companyTypeCode, String companyType);
 
     void flowExecute(Long sequenceNbr, String instanceId, String operate, String comment);
 

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

@@ -52,11 +52,6 @@
             <if test="dto.receiveOrgCode != null and dto.receiveOrgCode != ''">
                 and  crt.receive_company_code = #{dto.receiveOrgCode}
             </if>
-            <if test="roleIds != null and type == 'supervision'">
-                <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
-                    crt.execute_sequence like concat('%',#{role},'%')
-                </foreach>
-            </if>
             <if test="type == 'supervision'">
                 AND crt.receive_company_code = #{dto.unitCode}
             </if>

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

@@ -153,8 +153,15 @@ public class JgChangeRegistrationTransferController extends BaseController {
 																			 @RequestParam(value = "size") int size,
 																			 JgChangeRegistrationTransferDto params) {
 		Page<Map<String, Object>> page = new Page<>(current, size);
-		String type = (String) iJgInstallationNoticeService.getCompanyType().get("companyLevel");
-		return ResponseHelper.buildResponse(jgChangeRegistrationTransferService.queryListForPage(page,params, type));
+		ReginParams reginParams = getSelectedOrgInfo();
+		String companyTypeCode = "";
+		if(reginParams.getCompany().getLevel().equals(COMPANY_TYPE_COMPANY)){
+			companyTypeCode = COMPANY_TYPE_COMPANY;
+		} else {
+			companyTypeCode = COMPANY_TYPE_SUPERVISION;
+		}
+		params.setUnitCode(reginParams.getCompany().getCompanyCode());
+		return ResponseHelper.buildResponse(jgChangeRegistrationTransferService.queryListForPage(page,params, companyTypeCode, reginParams.getCompany().getCompanyType()));
 	}
 
 	/**

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/JgChangeRegistrationTransferServiceImpl.java

@@ -623,13 +623,13 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      *
      * @param page
      * @param params
+     * @param companyTypeCode
+     * @param companyType
      * @return
      */
-    public Page<Map<String, Object>> queryListForPage(Page<Map<String, Object>> page, JgChangeRegistrationTransferDto params, String type) {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String currentUserId = reginParams.getUserModel().getUserId();
-        String companyType = reginParams.getCompany().getCompanyType();
-        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, params, params.getRoleIds(), type, currentUserId);
+    @Override
+    public Page<Map<String, Object>> queryListForPage(Page<Map<String, Object>> page, JgChangeRegistrationTransferDto params, String companyTypeCode, String companyType) {
+        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, params, companyTypeCode, RequestContext.getExeUserId());
         listPage.getRecords().forEach(x-> x.put("companyType",companyType));
         return listPage;
     }

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/JgUseRegistrationServiceImpl.java

@@ -754,7 +754,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      */
     private void fillHistoryDataWithNewEquip(JSONObject jsonObject, JgUseRegistration jgUseRegistration, String record) {
         if(jgUseRegistration.getStatus().equals(WorkFlowStatusEnum.USE_SUBMIT.getReject())
-                || jgUseRegistration.getStatus().equals(WorkFlowStatusEnum.USE_SUBMIT.getRollBack())){
+                || jgUseRegistration.getStatus().equals(WorkFlowStatusEnum.USE_SUBMIT.getRollBack())
+                || jgUseRegistration.getStatus().equals(WorkFlowStatusEnum.USE_SUBMIT.getPass())
+        ){
             // 基本信息 + 制造信息
             Map<String, Object> detail = this.baseMapper.getDetail(record);
             // 设计信息