nm-project
/
aiccs-api
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.107.61.133:3000/nm-project/aiccs-api 

# Conflicts:
#	src/main/java/com/chinaweal/aiccs/org/controller/UserController.java
This commit is contained in:
lwd 2026-01-05 09:24:51 +08:00
parent eee81a8b2a 889d280394
commit 926d801c1d
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/com/chinaweal/aiccs/aiccs/writs/service/impl/TswrittemplateServiceImpl.java
View File

@ -1,9 +1,12 @@
package com.chinaweal.aiccs.aiccs.writs.service.impl; package com.chinaweal.aiccs.aiccs.writs.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo; import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo;
import com.chinaweal.aiccs.aiccs.abnormal.entity.Gzaiccode;
import com.chinaweal.aiccs.aiccs.abnormal.entity.TSBizRemList; import com.chinaweal.aiccs.aiccs.abnormal.entity.TSBizRemList;
import com.chinaweal.aiccs.aiccs.abnormal.service.EBaseinfoService; import com.chinaweal.aiccs.aiccs.abnormal.service.EBaseinfoService;
import com.chinaweal.aiccs.aiccs.abnormal.service.IGzaiccodeService;
import com.chinaweal.aiccs.aiccs.abnormal.service.TSBizRemListService; import com.chinaweal.aiccs.aiccs.abnormal.service.TSBizRemListService;
import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSBizSerIllegalRem; import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSBizSerIllegalRem;
import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSSerIllegalList; import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSSerIllegalList;
@ -30,8 +33,10 @@ import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element; import org.jsoup.nodes.Element;
import org.jsoup.select.Elements; import org.jsoup.select.Elements;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@ -53,6 +58,9 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl<TswrittemplateMap
private TRBaseCodeService baseCodeService; private TRBaseCodeService baseCodeService;
@Autowired @Autowired
private AicorgService aicorgService; private AicorgService aicorgService;
@Resource
@Lazy
private IGzaiccodeService iGzaiccodeService;
@Override @Override
public String contentFormatter(String content) { public String contentFormatter(String content) {
@ -145,7 +153,14 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl<TswrittemplateMap
applyTimeStr = DateUtils.localDateFormat(applyTime.toLocalDate(), "yyyy年MM月dd日"); applyTimeStr = DateUtils.localDateFormat(applyTime.toLocalDate(), "yyyy年MM月dd日");
} }
String acceptTimeStr = DateUtils.localDateFormat(acceptTime, "yyyy年MM月dd日"); String acceptTimeStr = DateUtils.localDateFormat(acceptTime, "yyyy年MM月dd日");
String areaName = ConstantsUtil.getAreaName(regionId);
// String areaName = ConstantsUtil.getAreaName(regionId);
LambdaQueryWrapper<Gzaiccode> lqw = Wrappers.lambdaQuery();
//查地市名称
lqw.eq(Gzaiccode::getScountrycode, regionId.substring(0, 4) + "00");
Gzaiccode gzaiccode = iGzaiccodeService.getOne(lqw);
String areaName = gzaiccode.getScountryextcode();
String addr = ConstantsUtil.getAddr(regionId); String addr = ConstantsUtil.getAddr(regionId);
String phoneDW = ConstantsUtil.getPhone(regionId); String phoneDW = ConstantsUtil.getPhone(regionId);
String replaceContent = content.replace("{{party}}", StringUtils.isNotEmpty(eBaseinfo.getEntname()) ? eBaseinfo.getEntname() : StringUtils.EMPTY) String replaceContent = content.replace("{{party}}", StringUtils.isNotEmpty(eBaseinfo.getEntname()) ? eBaseinfo.getEntname() : StringUtils.EMPTY)
@ -163,10 +178,8 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl<TswrittemplateMap
.replace("{{deadline1}}", "60日") .replace("{{deadline1}}", "60日")
.replace("{{deadline2}}", StringUtils.EMPTY) .replace("{{deadline2}}", StringUtils.EMPTY)
.replace("{{reconsiderationOrg}}", StringUtils.isNotEmpty(areaName) ? areaName + "人民政府" : StringUtils.EMPTY) .replace("{{reconsiderationOrg}}", StringUtils.isNotEmpty(areaName) ? areaName + "人民政府" : StringUtils.EMPTY)
.replace("{{government}}", StringUtils.isNotEmpty(areaName) ? areaName + "人民政府" : "广州市人民政府") .replace("{{government}}", StringUtils.isNotEmpty(areaName) ? areaName + "人民政府" : "内蒙古自治区人民政府");
.replace("{{address}}", StringUtils.isNotEmpty(addr) ? addr : "广州市越秀区小北路183号金和大厦2楼") // .replace("{{address}}", StringUtils.isNotEmpty(addr) ? addr : "广州市越秀区小北路183号金和大厦2楼");
//电话为空先判断是否为花都
.replace("{{shphone}}", StringUtils.isNotEmpty(phoneDW) ? phoneDW : regionId.equals("440114") || regionId.equals("440121") ? "" : "020-83555988");
templateDB.setContent(replaceContent); templateDB.setContent(replaceContent);
} else if (WorkNoUtil.WORKNOTYPE_55.equals(writsType) || WorkNoUtil.WORKNOTYPE_56.equals(writsType) || } else if (WorkNoUtil.WORKNOTYPE_55.equals(writsType) || WorkNoUtil.WORKNOTYPE_56.equals(writsType) ||
WorkNoUtil.WORKNOTYPE_58.equals(writsType) || WorkNoUtil.WORKNOTYPE_59.equals(writsType)) {//企业农专经营异常信用修复 WorkNoUtil.WORKNOTYPE_58.equals(writsType) || WorkNoUtil.WORKNOTYPE_59.equals(writsType)) {//企业农专经营异常信用修复
@ -213,7 +226,14 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl<TswrittemplateMap
applyTimeStr = DateUtils.localDateFormat(applyTime.toLocalDate(), "yyyy年MM月dd日"); applyTimeStr = DateUtils.localDateFormat(applyTime.toLocalDate(), "yyyy年MM月dd日");
} }
String acceptTimeStr = DateUtils.localDateFormat(acceptTime, "yyyy年MM月dd日"); String acceptTimeStr = DateUtils.localDateFormat(acceptTime, "yyyy年MM月dd日");
String areaName = ConstantsUtil.getAreaName(regionId);
// String areaName = ConstantsUtil.getAreaName(regionId);
LambdaQueryWrapper<Gzaiccode> lqw = Wrappers.lambdaQuery();
//查地市名称
lqw.eq(Gzaiccode::getScountrycode, regionId.substring(0, 4) + "00");
Gzaiccode gzaiccode = iGzaiccodeService.getOne(lqw);
String areaName = gzaiccode.getScountryextcode();
String addr = ConstantsUtil.getAddr(regionId); String addr = ConstantsUtil.getAddr(regionId);
String phoneDW = ConstantsUtil.getPhone(regionId); String phoneDW = ConstantsUtil.getPhone(regionId);
String replaceContent = content.replace("{{party}}", StringUtils.isNotEmpty(eBaseinfo.getEntname()) ? eBaseinfo.getEntname() : StringUtils.EMPTY) String replaceContent = content.replace("{{party}}", StringUtils.isNotEmpty(eBaseinfo.getEntname()) ? eBaseinfo.getEntname() : StringUtils.EMPTY)
@ -231,9 +251,9 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl<TswrittemplateMap
.replace("{{deadline1}}", "60日") .replace("{{deadline1}}", "60日")
.replace("{{deadline2}}", StringUtils.EMPTY) .replace("{{deadline2}}", StringUtils.EMPTY)
.replace("{{reconsiderationOrg}}", StringUtils.isNotEmpty(areaName) ? areaName + "人民政府" : StringUtils.EMPTY) .replace("{{reconsiderationOrg}}", StringUtils.isNotEmpty(areaName) ? areaName + "人民政府" : StringUtils.EMPTY)
.replace("{{government}}", StringUtils.isNotEmpty(areaName) ? areaName + "人民政府" : "广州市人民政府") .replace("{{government}}", StringUtils.isNotEmpty(areaName) ? areaName + "人民政府" : "内蒙古自治区人民政府");
.replace("{{address}}", StringUtils.isNotEmpty(addr) ? addr : "广州市越秀区小北路183号金和大厦2楼") // .replace("{{address}}", StringUtils.isNotEmpty(addr) ? addr : "广州市越秀区小北路183号金和大厦2楼")
.replace("{{shphone}}", StringUtils.isNotEmpty(phoneDW) ? phoneDW : regionId.equals("440114") || regionId.equals("440121") ? "" : "020-83555988"); // .replace("{{shphone}}", StringUtils.isNotEmpty(phoneDW) ? phoneDW : regionId.equals("440114") || regionId.equals("440121") ? "" : "020-83555988");
templateDB.setContent(replaceContent); templateDB.setContent(replaceContent);
} }
return templateDB; return templateDB;

11
src/main/java/com/chinaweal/aiccs/aiceps/annual/controller/AnModifyPermitController.java
View File

@ -1,8 +1,6 @@
package com.chinaweal.aiccs.aiceps.annual.controller; package com.chinaweal.aiccs.aiceps.annual.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaweal.aiccs.aiccs.abnormal.entity.Gzaiccode;
import com.chinaweal.aiccs.aiccs.market.entity.TSSueInspect;
import com.chinaweal.aiccs.aiceps.annual.entity.AnModifyPermit; import com.chinaweal.aiccs.aiceps.annual.entity.AnModifyPermit;
import com.chinaweal.aiccs.aiceps.annual.service.AnModifyPermitService; import com.chinaweal.aiccs.aiceps.annual.service.AnModifyPermitService;
import com.chinaweal.aiccs.common.base.controller.BaseController; import com.chinaweal.aiccs.common.base.controller.BaseController;
@ -55,7 +53,7 @@ public class AnModifyPermitController extends BaseController {
AnModifyPermit anModifyPermit = null; AnModifyPermit anModifyPermit = null;
anModifyPermit = anModifyPermitService.getById(id); anModifyPermit = anModifyPermitService.getById(id);
if(anModifyPermit != null){ if(anModifyPermit != null){
anModifyPermitService.updateById(anModifyPermit); anModifyPermitService.removeById(anModifyPermit);
} }
return RestResult.ok(); return RestResult.ok();
@ -65,7 +63,7 @@ public class AnModifyPermitController extends BaseController {
@PostMapping("/update") @PostMapping("/update")
public RestResult<String> updatePermit(@RequestBody @Valid AnModifyPermit anModifyPermit, BindingResult bindingResult) { public RestResult<String> updatePermit(@RequestBody @Valid AnModifyPermit anModifyPermit, BindingResult bindingResult) {
AssertUtils.isBndingValidit(bindingResult); AssertUtils.isBndingValidit(bindingResult);
anModifyPermitService.save(anModifyPermit); anModifyPermitService.updateById(anModifyPermit);
return RestResult.ok(); return RestResult.ok();
} }
@ -83,8 +81,9 @@ public class AnModifyPermitController extends BaseController {
Map<String, Object> customParamMap = pageRequestDto.getCustomParamMap(); Map<String, Object> customParamMap = pageRequestDto.getCustomParamMap();
if (customParamMap == null) return; if (customParamMap == null) return;
// 统一码 // 统一码
if (customParamMap.get("uniscid") != null) { String uniscid = StringUtils.tranObject(customParamMap.get("uniscid"));
queryWrapper.lambda().eq(AnModifyPermit::getUniscid, customParamMap.get("uniscid")); if (StringUtils.isNotBlank(uniscid)) {
queryWrapper.lambda().eq(AnModifyPermit::getUniscid, uniscid);
} }
}, null); }, null);
return RestResult.ok(data); return RestResult.ok(data);