diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java index 28404f4..e5fa053 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java @@ -47,6 +47,7 @@ import com.chinaweal.aiccs.org.service.TUsersService; import com.chinaweal.aicorg.model.AICUser; import com.chinaweal.solr.entity.EBaseInfoSolrBean; import com.chinaweal.solr.template.SolrSearchTemplate; +import com.chinaweal.youfool.framework.springboot.base.query.BaseQuery; import com.chinaweal.youfool.framework.springboot.exception.custom.BusinessException; import com.chinaweal.youfool.framework.springboot.mybatis.plus.page.PageRequestDto; import com.chinaweal.youfool.framework.springboot.rest.RestResult; @@ -1258,4 +1259,11 @@ public class EBaseinfoController extends BaseController { response.getWriter().write("导出失败：" + e.getMessage()); } } + + @ApiOperation(value = "5.分页查询市场主体基本信息", position = 5) + @PostMapping("/listEBaseinfo") + public RestResult> listEBaseinfo(@RequestBody BaseQuery query) { + IPage data = eBaseinfoService.listEBaseinfo(query); + return RestResult.ok(data); + } } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java index a12b673..1ca91d8 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java @@ -561,6 +561,11 @@ public class EBaseinfo extends Model { @TableField("regulatory_name_temp") private String regulatoryNameTemp; + + @ApiModelProperty("查询统一社会信用代码/注册码") + @TableField(exist = false) + private String searchUscc; + /** * 退认领id */ diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/EBaseinfoService.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/EBaseinfoService.java index 79ead20..69ebcee 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/EBaseinfoService.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/EBaseinfoService.java @@ -12,6 +12,7 @@ import com.chinaweal.aiccs.aiccs.market.entity.AreaSlice; import com.chinaweal.aiccs.crgs.moveinDetails.entity.EAlterRecoder; import com.chinaweal.aicorg.model.AICUser; import com.chinaweal.solr.entity.EBaseInfoSolrBean; +import com.chinaweal.youfool.framework.springboot.base.query.BaseQuery; import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseService; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -209,4 +210,7 @@ public interface EBaseinfoService extends BaseService { List exportQzzxEntList(Map paramMap); + + IPage listEBaseinfo(BaseQuery query); + } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java index 9e634bc..8876d00 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java @@ -53,6 +53,7 @@ import com.chinaweal.aicorg.model.AICUser; import com.chinaweal.aicorg.services.OrgUM; import com.chinaweal.solr.entity.EBaseInfoSolrBean; import com.chinaweal.solr.template.SolrSearchTemplate; +import com.chinaweal.youfool.framework.springboot.base.query.BaseQuery; import com.chinaweal.youfool.framework.springboot.exception.custom.BusinessException; import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseServiceImpl; import com.chinaweal.youfool.framework.springboot.rest.ResultCode; @@ -1589,4 +1590,46 @@ public class EBaseinfoServiceImpl extends BaseServiceImpl exportQzzxEntList(Map paramMap) { return baseMapper.exportQzzxEntList(paramMap); } + + @Override + public IPage listEBaseinfo(BaseQuery query) { + EBaseinfo entity = query.getEntity(EBaseinfo.class); + Page page = query.getPage(); + + String uniscId = entity.getUniscid(); + String entName = entity.getEntname(); + String searchUscc = entity.getSearchUscc(); + //输入了条件才会查询 + if(com.chinaweal.aiccs.common.util.StringUtils.isNotEmpty(uniscId) + || com.chinaweal.aiccs.common.util.StringUtils.isNotEmpty(entName) + || com.chinaweal.aiccs.common.util.StringUtils.isNotEmpty(searchUscc)){ + LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(); + if(com.chinaweal.aiccs.common.util.StringUtils.isNotEmpty(uniscId)) + lambdaQueryWrapper.eq(EBaseinfo::getUniscid, uniscId); + if(com.chinaweal.aiccs.common.util.StringUtils.isNotEmpty(entName)) + lambdaQueryWrapper.eq(EBaseinfo::getEntname, entName); + page = page(page, lambdaQueryWrapper); + if(com.chinaweal.aiccs.common.util.StringUtils.isNotEmpty(searchUscc)) + lambdaQueryWrapper.eq(EBaseinfo::getUniscid, searchUscc) + .or().eq(EBaseinfo::getRegno, searchUscc); + page = page(page, lambdaQueryWrapper); + +// page.getRecords().forEach(record -> { +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// //查属地机关中文 +// String supervisedeptid = record.getSupervisedeptid(); +// if(com.chinaweal.aiccs.common.util.StringUtils.isNotEmpty(supervisedeptid)){ +// queryWrapper.lambda().eq(TOrgUnits::getOrgNumber, supervisedeptid.length() == 6 ? supervisedeptid + "000" : supervisedeptid) +// .eq(TOrgUnits::getDeleted, '0'); +// List list = tOrgUnitsService.list(queryWrapper); +// if (list.size() > 0) { +// TOrgUnits tOrgunits = list.get(0); +// record.setLocaladmCn(tOrgunits.getOrgUnitName()); +// } +// } +// }); + } + + return page; + } } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java b/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java index 0ba89df..62d41f7 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java @@ -238,6 +238,9 @@ public class TaskController extends BaseController { // 信用修复 if (customParamMap != null && customParamMap.get("type") != null && "repair".equals(customParamMap.get("type"))) { + //处理年报申请过来的信用修复待办 + AICUser aicUser = getLoginUser(request); + customParamMap.put("areaCode", aicUser.getRegionID()); boolean isGzrNum = customParamMap.containsKey("gzrNumSwitch") && (boolean)customParamMap.get("gzrNumSwitch"); if (isGzrNum) { int gzrNum = (int) customParamMap.get("gzrNum"); diff --git a/src/main/java/com/chinaweal/aiccs/config/SafetyFilter.java b/src/main/java/com/chinaweal/aiccs/config/SafetyFilter.java index f3708c0..ec683ee 100644 --- a/src/main/java/com/chinaweal/aiccs/config/SafetyFilter.java +++ b/src/main/java/com/chinaweal/aiccs/config/SafetyFilter.java @@ -96,7 +96,7 @@ public class SafetyFilter implements Filter { String contextPath = request.getContextPath(); String url = requestUri.substring(contextPath.length()); String referer = request.getHeader("Referer"); - if (environment != null && StringUtils.equals(environment.getProperty("spring.profiles.active"), "prod129")) { + if (environment != null && StringUtils.equals(environment.getProperty("spring.profiles.active"), "prod73")) { chain.doFilter(request, response); return; } diff --git a/src/main/resources/application-prod129.yml b/src/main/resources/application-prod129.yml index 7939ef3..ad8ff4f 100644 --- a/src/main/resources/application-prod129.yml +++ b/src/main/resources/application-prod129.yml @@ -10,7 +10,7 @@ logging: spring: data: solr: - host: http://172.22.80.35:8983/solr + host: http://10.6.46.137:8983/solr kafka: bootstrap-servers: 10.201.62.2:9092 consumer: @@ -19,41 +19,41 @@ spring: missing-topics-fatal: false datasource: aiccs: - url: jdbc:dm://172.22.80.73:15236?schema=AICCS + url: jdbc:dm://10.6.46.135:5236?schema=AICCS username: SYSDBA - password: ChinaWeal2025 + password: Dameng@123 crgs: - url: jdbc:dm://172.22.80.73:15236?schema=CRGS + url: jdbc:dm://10.6.46.135:5236?schema=CRGS username: SYSDBA - password: ChinaWeal2025 + password: Dameng@123 aicorg: - url: jdbc:dm://172.22.80.73:15236?schema=CXAICORG + url: jdbc:dm://10.6.46.135:5236?schema=CXAICORG username: SYSDBA - password: ChinaWeal2025 + password: Dameng@123 youfool: - url: jdbc:dm://172.22.80.73:15236?schema=YOUFOOL + url: jdbc:dm://10.6.46.135:5236?schema=YOUFOOL username: SYSDBA - password: ChinaWeal2025 + password: Dameng@123 aiceps: - url: jdbc:dm://172.22.80.73:15236?schema=AICEPS + url: jdbc:dm://10.6.46.135:5236?schema=AICCS username: SYSDBA - password: ChinaWeal2025 + password: Dameng@123 aicris: - url: jdbc:dm://172.22.80.70:15236?schema=NMAICRIS + url: jdbc:dm://10.6.46.135:5236?schema=AICRIS username: SYSDBA - password: chinaweal + password: Dameng@123 aicbiz: - url: jdbc:dm://172.22.80.70:15236?schema=NMAICRI + url: jdbc:dm://10.6.46.135:5236?schema=AICRI username: SYSDBA - password: chinaweal + password: Dameng@123 aicbizqy: - url: jdbc:dm://172.22.80.70:15236?schema=NMAICRI + url: jdbc:dm://10.6.46.135:5236?schema=AICRI username: SYSDBA - password: chinaweal + password: Dameng@123 aicepsqy: - url: jdbc:dm://172.22.80.73:15236?schema=AICEPS + url: jdbc:dm://10.6.46.135:5236?schema=AICCS username: SYSDBA - password: ChinaWeal2025 + password: Dameng@123 forest: variables: @@ -116,7 +116,7 @@ devOps: # 是否启动定时任务 scheduling: - enable: false + enable: true # cron表达式统一配置 ps：'-'表示不执行 cron: autoClaimAI: '-' # 自动认领 @@ -155,14 +155,14 @@ scheduling: movein: '-' #总局迁入企业定时任务 threadCpu: '-' #收集系统运行的CPU情况 entAddressAnalysisSchedule: '-' #企业地址分析定时任务 - staticAbnSerSmsLogList: 0 30 18 * * ? #一键告知企业列严列异 + staticAbnSerSmsLogList: '-' #一键告知企业列严列异 autoIndividualArea: '-' #个体户智慧认领字段片区更新 - staticHqlcusers: 0 30 00 * * ? #定时获取浪潮用户 + staticHqlcusers: '-' #定时获取浪潮用户 autoEntArea: 0 30 03 * * ? #企业智慧认领字段片区更新 - lawEnforcementDataPush: 0 35 00 * * ? #执法数据推送 + lawEnforcementDataPush: '-' #执法数据推送 attachmentUpload: '0 14 20 * * ?' #附件上传定时任务 - moveOutData: '0 59 15 * * ?' #迁出省局数据定时任务 - moveInData: '0 31 00 * * ?' #迁入省局数据定时任务 + moveOutData: '-' #迁出省局数据定时任务 + moveInData: '-' #迁入省局数据定时任务 ot: bakCseDownloadPath: /ot/download/case @@ -186,10 +186,10 @@ storage: uploadDrive: / uploadPath: upload ftp: - ip: 172.22.80.35 + ip: 10.6.46.133 port: 21 - username: admin - password: chinaweal + username: amr + password: ChinaWeal_2025 geo: appKey: 66d2ec05d5e2c582abd6848b2366c1f4 @@ -200,11 +200,11 @@ zg: sso: redis: - host: 172.22.80.129 + host: 10.6.46.133 port: 6379 - password: + password: 'ChinaWeal_2025' cookie: - domain: 121.8.152.133 + domain: 219.148.175.145 app: key: aiccs jwt: @@ -217,6 +217,7 @@ punishment: api: host: 'https://demo.gdxinrong.com:9001' + excelTemplate: expelled: path: templates/expelled/ diff --git a/src/main/resources/application-prod73.yml b/src/main/resources/application-prod73.yml new file mode 100644 index 0000000..7939ef3 --- /dev/null +++ b/src/main/resources/application-prod73.yml @@ -0,0 +1,223 @@ +logging: + level: + dao: debug + root: info + youfool.dao: info + com.chinaweal.youfool.framework.springboot.log: debug + com.chinaweal.aiccs.*: info + org.springframework.data.solr: debug + filePath: ./logs/aiccs +spring: + data: + solr: + host: http://172.22.80.35:8983/solr + kafka: + bootstrap-servers: 10.201.62.2:9092 + consumer: + group-id: xyjg + listener: + missing-topics-fatal: false + datasource: + aiccs: + url: jdbc:dm://172.22.80.73:15236?schema=AICCS + username: SYSDBA + password: ChinaWeal2025 + crgs: + url: jdbc:dm://172.22.80.73:15236?schema=CRGS + username: SYSDBA + password: ChinaWeal2025 + aicorg: + url: jdbc:dm://172.22.80.73:15236?schema=CXAICORG + username: SYSDBA + password: ChinaWeal2025 + youfool: + url: jdbc:dm://172.22.80.73:15236?schema=YOUFOOL + username: SYSDBA + password: ChinaWeal2025 + aiceps: + url: jdbc:dm://172.22.80.73:15236?schema=AICEPS + username: SYSDBA + password: ChinaWeal2025 + aicris: + url: jdbc:dm://172.22.80.70:15236?schema=NMAICRIS + username: SYSDBA + password: chinaweal + aicbiz: + url: jdbc:dm://172.22.80.70:15236?schema=NMAICRI + username: SYSDBA + password: chinaweal + aicbizqy: + url: jdbc:dm://172.22.80.70:15236?schema=NMAICRI + username: SYSDBA + password: chinaweal + aicepsqy: + url: jdbc:dm://172.22.80.73:15236?schema=AICEPS + username: SYSDBA + password: ChinaWeal2025 + +forest: + variables: + changRuanGetToken: http://10.124.47.54/serverCenter/getToken # 获取长软接口令牌 + changRuanSOABaseUrl: http://10.124.47.55:9000/SOAService/V1 # 长软接口 + queryPriPersonURI: /specialSynUnifiedService/queryPriPerson #商事登记信息-主要人员信息 + queryEpbOperator: /specialSynUnifiedService/queryEpbOperator #商事登记信息-个体经营者基本信息 + queryEInvPersonURI: /specialSynUnifiedService/queryEInvPerson #商事登记信息-合伙人 + queryInvInvestmentURI: /specialSynUnifiedService/queryInvInvestment #商事登记信息-非自然人合伙 + MosBaseUrl: http://10.21.4.44:8090 # 玄武短信接口 + sendsmsURI: /cgi-bin/sendsms # 短信下行接口（支持群发） + tfBaseUrl: http://10.194.190.46:8081/aion-gateway-api #泰富接口 + tfTokensURI: /api/token #泰富获取token接口 + tfRevocationURI: /api/common #泰富推送吊销数据接口 + tfPunishmentBaseUrl: http://10.194.190.46:8081/aion-gateway-api + tfPunishmentTokenUrl: /api/token #获取泰富业户警告锁定服务接口token + tfPunishmentUrl: /api/common #锁定，解锁数据推送接口 + gzAicodsBaseUrl: http://192.168.100.48:8080/aicods_gz #广州双随机 + gzAicodsDownload: http://172.22.80.128:6888/aicrisFile/Test/downloadHttpclient.do #广州双随机附件下载地址 + gzAicodsClueReturnApi: /market/receiveRollback_app + moveinBaseUrl: http://10.1.1.65:18080/SOAService/specialSynUnifiedService #迁入企业数据下载 + moveinDownload: /DownloadTransferApi + doorBaseUrl: http://172.16.52.60 + xcDoorBaseUrl: http://10.201.62.2:6888 + # 第三方文件上传配置 + fileUpload: + testUrl: http://172.26.0.10:9987/test/moveservice/enterprise/uploadfile #测试地址 + prodUrl: http://172.26.0.10:9987/prod/moveservice/enterprise/uploadfile #正式地址 + testRecordUrl: http://172.26.0.10:9987/test/moveservice/enterprise/uploadDataRecordInfoMoveOut #测试对账地址 + prodRecordUrl: http://172.26.0.10:9987/prod/moveservice/enterprise/uploadDataRecordInfoMoveOut #正式对账地址 + testDownloadUrl: http://172.26.0.10:9987/test/moveservice/enterprise/downloadFile #测试下载地址 + prodDownloadUrl: http://172.26.0.10:9987/prod/moveservice/enterprise/downloadFile #正式下载地址 + testMoveInRecordUrl: http://172.26.0.10:9987/test/moveservice/enterprise/uploadDataRecordInfoMoveIn #测试迁入对账地址 + prodMoveInRecordUrl: http://172.26.0.10:9987/prod/moveservice/enterprise/uploadDataRecordInfoMoveIn #正式迁入对账地址 + testRegisterInfoUrl: http://172.26.0.10:9987/test/moveservice/enterprise/uploadRegisterInfo #测试企业上传路径接口 + prodRegisterInfoUrl: http://172.26.0.10:9987/prod/moveservice/enterprise/uploadRegisterInfo #正式企业上传路径接口 + testQueryRegisterInfoUrl: http://172.26.0.10:9987/test/moveservice/enterprise/queryRegisterInfo #测试获取迁移数据路径接口 + prodQueryRegisterInfoUrl: http://172.26.0.10:9987/prod/moveservice/enterprise/queryRegisterInfo #正式获取迁移数据路径接口 + testDownloadRecordInfoUrl: http://172.26.0.10:9987/test/moveservice/enterprise/downloadDataRecordInfo #测试下载对账接口 + prodDownloadRecordInfoUrl: http://172.26.0.10:9987/prod/moveservice/enterprise/downloadDataRecordInfo #正式下载对账接口 + appform: xtwb_tf #应用标识 + fileType: 1 #文件类型，固定为1 + env: test #环境：test-测试，prod-正式 + +tfApi: + appid: 2cc35f3016b6470684d67a0dcc85b223 + appsecret: istUFExQqyZLGzoquzUTIVnsUvZplfmK5sa2qOougPrV7jJKeZ+QJvRjOuUIRVqA0WwFMhSkO6AFE1w89iwXD9Ji/ZwH0tvsQq3ei6O1aWs6+E+IcGn1aqJzh/iC75iomcW5ZFWQ8WcuokP+0Z+vqj2v4NN0Vdm9hCGAKZrO+6O733YrmHxEI1O66EqOOZzPiYTqgWCkugo1P3jlryDRm3Nua0lUlMcuQ89wtsTBfkpnxDRVday1NqN9+oodXNlokI4ktihLWkpY1jFtAU9Q1BgluvPXBWh4e5z4N8kGgxT4Q2cK/LoxFEiI0cofcrS9HhZn3OP4sOE16Mh0tlloNg== + +sms: + ip: 10.21.4.44 + downPort: 8090 + upPort: 8088 + username: xyfljgxt + password: j35bEzJ5 + +devOps: + appKey: aiccs + appSecret: aiccs + loginUrl: http://localhost:8081/test-devops-api/user/generateToken + +# 是否启动定时任务 +scheduling: + enable: false + # cron表达式统一配置 ps：'-'表示不执行 + cron: + autoClaimAI: '-' # 自动认领 + repairAssignOwner: '-' # 市场所主体补认领 + autoClaimAIForAddressChange: '-' # 市场所主体地址变更重新认领 + autoClaimAIByAddress: '-' # 自动认领(根据用户输入的地址匹配) + analysisCompanyAddress: '-' # 分析企业地址，判断其所指街道所在街道 + task: '-' # 拟列严定时任务 + statisticsForAbnList: '-' # 经营异常统计表更新 + updateTolockentlist: '-' # 定时更新tolockentlist表 + caseDownload: '-' # 行政处罚下载 + permitDownload: '-' # 行政许可下载 + updateAbnList: '-' # 异常名录表定时更新 + updateIllegalTaskDeadline: '-' # 更新严重违法信用修复预警状态 + collectOutTimeAbnList: '-' # 统计已超3年列异的企业 + collectOutTimeIllegalList: '-' # 统计列严满3年、主体状态注销的企业（每日统计） 自动移出 + staticAllRegionTsabnlist: '-' #全市各区的经营异常主体情况 + staticAbnByYear: '-' #按年统计全市 + staticAbnByMonth: '-' #按月统计全市 + staticAbnByWeek: '-' #按周统计全市 + staticAbnByIn: '-' #经营异常列入统计全市 + staticAbnByOut: '-'#经营异常移出统计全市 + staticAllRegionTsserill: '-' #全市各区的严重违法主体情况 + staticTsserillByYear: '-' #按年统计严重违法主体情况 + staticTsserillByIn: '-' #按列入原因统计严重违法主体情况 + staticTsserillByOutRe: '-' #按移出原因和地区统计严重违法主体情况 + staticRevRegion: '-' #批量吊销主体分布 + staticRevYear: '-' #批量吊销增长分析(年) + staticLockRegion: '-' #联合惩戒主体分布 + staticLockType: '-' #联合惩戒来源分析 + staticFraudRegion: '-' #撤销登记主体分布 + staticFraudYear: '-' #撤销登记增长分析 + staticFraudType: '-' #撤销登记涉嫌登记类型分析 + staticTsusualinspectRegion: '-' #协同监管主体分布 + staticTsusualinspectType: '-' #协同监管结果分析 + movein: '-' #总局迁入企业定时任务 + threadCpu: '-' #收集系统运行的CPU情况 + entAddressAnalysisSchedule: '-' #企业地址分析定时任务 + staticAbnSerSmsLogList: 0 30 18 * * ? #一键告知企业列严列异 + autoIndividualArea: '-' #个体户智慧认领字段片区更新 + staticHqlcusers: 0 30 00 * * ? #定时获取浪潮用户 + autoEntArea: 0 30 03 * * ? #企业智慧认领字段片区更新 + lawEnforcementDataPush: 0 35 00 * * ? #执法数据推送 + attachmentUpload: '0 14 20 * * ?' #附件上传定时任务 + moveOutData: '0 59 15 * * ?' #迁出省局数据定时任务 + moveInData: '0 31 00 * * ?' #迁入省局数据定时任务 + +ot: + bakCseDownloadPath: /ot/download/case + bakPermitDownloadPath: /ot/download/permit + bakCseUploadPath: /ot/upload/case + bakPermitUploadPath: /ot/upload/permit + uploadPath: /usr/chinaweal/fileupload + downloadPath: /usr/chinaweal/download + eap_username: 1 + eap_password: 1 + uploadUrl: http://172.16.13.9/ws/dataCollection/creditInfoTransfer/upload/uploadWebservice?eap_username=%s&eap_password=%s + download: + caseUrl: http://172.16.13.9/ws/dataCollection/creditInfoTransfer/joggle/xzcfWs?eap_username=%s&eap_password=%s + permitUrl: http://172.16.13.9/ws/dataCollection/creditInfoTransfer/joggle/xzxkWs?eap_username=%s&eap_password=%s + +# 文件存储 +storage: + # 模式： normal-本地 ftp-顾名思义 + mode: ftp + path: + uploadDrive: / + uploadPath: upload + ftp: + ip: 172.22.80.35 + port: 21 + username: admin + password: chinaweal +geo: + appKey: 66d2ec05d5e2c582abd6848b2366c1f4 + +zg: + movein: + downLoadUrl: http://172.16.13.9/framework/ws/dataCollection/enterpriseMigration/webservice/downloadFile?eap_username=gd&eap_password=1 #总局下载迁入企业信息 + temporaryFilePath: /usr/temporary/ #临时文件存储路径 + +sso: + redis: + host: 172.22.80.129 + port: 6379 + password: + cookie: + domain: 121.8.152.133 + app: + key: aiccs + jwt: + key: token + expired: 10800 + token: + expired: 10800 + +punishment: + api: + host: 'https://demo.gdxinrong.com:9001' + +excelTemplate: + expelled: + path: templates/expelled/ + name: 市场主体拟除名名单批量导入模板.xlsx diff --git a/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml b/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml index dfb2794..918c2cf 100644 --- a/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml +++ b/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml @@ -374,8 +374,10 @@ - and ( m.SIGNUSERID = #{customParamMap.userId} or exists (select 1 from tsrefgroupanduser tg - where tg.GROUPID = m.ACCEPTGROUPID and tg.USERID = #{customParamMap.userId})) + and ( m.SIGNUSERID = #{customParamMap.userId} + or (m.area_code = #{customParamMap.areaCode} AND m.currentNodeOrBizStatus = 'exptlistEnter' AND m.SIGNUSERID IS null) + or exists (select 1 from tsrefgroupanduser tg + where tg.GROUPID = m.ACCEPTGROUPID and tg.USERID = #{customParamMap.userId}))