修复外省行政处罚的文书问题；添加新表让数据中心抽数
This commit is contained in:
zhouxy
parent
ce9be17995
commit
102756a592
|
|
@ -43,4 +43,6 @@ public interface QgCasePubNbaseinfoMapper extends BaseMapper<QgCasePubNbaseinfo>
|
|||
* @return 更新行数
|
||||
*/
|
||||
int updateForRepair(@Param("caseid") String caseid, @Param("approvalDate") LocalDate approvalDate, @Param("now") LocalDateTime now);
|
||||
|
||||
int insertQgCasePubNbaseinfoData(@Param("caseid") String caseid);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,4 +43,6 @@ public interface IQgCasePubNbaseinfoService extends IService<QgCasePubNbaseinfo>
|
|||
* @return 是否成功
|
||||
*/
|
||||
boolean updateForRepair(String caseid, LocalDate approvalDate);
|
||||
|
||||
boolean insertQgCasePubNbaseinfoData(String caseid);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,4 +38,10 @@ public class IQgCasePubNbaseinfoServiceImpl extends ServiceImpl<QgCasePubNbasein
|
|||
int rows = this.baseMapper.updateForRepair(caseid, approvalDate, LocalDateTime.now());
|
||||
return rows > 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertQgCasePubNbaseinfoData(String caseid) {
|
||||
int rows = this.baseMapper.insertQgCasePubNbaseinfoData(caseid);
|
||||
return rows > 0;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,9 +105,9 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
|
|||
Map<String, String> resultMap = new HashMap<>();
|
||||
String entName = "";
|
||||
|
||||
// 先查本省表
|
||||
TbIlcPunInfoQuery tbIlcPunInfoQuery = tbIlcPunInfoQueryService.findById(tBizRemPunishment.getPunishmentId());
|
||||
if (tbIlcPunInfoQuery != null) {
|
||||
if (StringUtils.equals("本省",tbIlcPunInfoQuery.getSourceType())) {
|
||||
// 本省案件
|
||||
tBizRemPunishment.setSourceType("本省");
|
||||
EBaseinfo eBaseInfo = eBaseInfoService.lambdaQuery().eq(EBaseinfo::getUniscid, tbIlcPunInfoQuery.getUniscid()).one();
|
||||
|
|
@ -126,6 +126,9 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
|
|||
throw new RuntimeException("未找到对应的行政处罚记录");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
throw new RuntimeException("未找到对应的行政处罚记录");
|
||||
}
|
||||
|
||||
String bizSeq = IdUtil.simpleUUID();
|
||||
tBizRemPunishment.setId(bizSeq);
|
||||
|
|
@ -383,7 +386,9 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
|
|||
private void insertCrECase(TBizRemPunishment tBizRemPunishment) {
|
||||
// 1. 更新跨省处罚表：opflag='D', pubdeadline=审批日期, S_EXT_DATETIME=审批日期
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
qgCasePubNbaseinfoService.updateForRepair(tBizRemPunishment.getPunishmentId(), now.toLocalDate());
|
||||
// qgCasePubNbaseinfoService.updateForRepair(tBizRemPunishment.getPunishmentId(), now.toLocalDate());
|
||||
//插入表QG_CASE_PUB_NBASEINFO_DATA让数据中心定时抽数
|
||||
qgCasePubNbaseinfoService.insertQgCasePubNbaseinfoData(tBizRemPunishment.getPunishmentId());
|
||||
|
||||
// 2. 获取跨省处罚信息用于插入CR_E_CASE
|
||||
com.chinaweal.aiccs.aiccs.punishment.entity.QgCasePubNbaseinfo qgCasePubNbaseinfo =
|
||||
|
|
|
|||
|
|
@ -340,14 +340,27 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl<TswrittemplateMap
|
|||
|
||||
// String addr = ConstantsUtil.getAddr(regionId);
|
||||
// String phoneDW = ConstantsUtil.getPhone(regionId);
|
||||
String replaceContent = content.replace("{{party}}", StringUtils.isNotEmpty(eBaseinfo.getEntname()) ? eBaseinfo.getEntname() : StringUtils.EMPTY)
|
||||
|
||||
String replaceContent = "";
|
||||
if (eBaseinfo != null){
|
||||
replaceContent = content.replace("{{party}}", StringUtils.isNotEmpty(eBaseinfo.getEntname()) ? eBaseinfo.getEntname() : StringUtils.EMPTY)
|
||||
.replace("{{entCerName}}", StringUtils.isNotEmpty(eBaseinfo.getEntname()) ? eBaseinfo.getEntname() : StringUtils.EMPTY)
|
||||
.replace("{{uniscid}}", StringUtils.isNotEmpty(eBaseinfo.getUniscid()) ? eBaseinfo.getUniscid() : StringUtils.EMPTY)
|
||||
.replace("{{dom}}", StringUtils.isNotEmpty(eBaseinfo.getDom()) ? eBaseinfo.getDom() : StringUtils.EMPTY)
|
||||
.replace("{{lerepname}}", StringUtils.isNotEmpty(eBaseinfo.getName()) ? eBaseinfo.getName() : StringUtils.EMPTY)
|
||||
.replace("{{cerNo}}", StringUtils.isNotEmpty(eBaseinfo.getCerno()) ? eBaseinfo.getCerno() : StringUtils.EMPTY)
|
||||
.replace("{{phone}}", StringUtils.isNotEmpty(eBaseinfo.getPhone()) ? eBaseinfo.getPhone() : StringUtils.EMPTY)
|
||||
.replace("{{otherContact}}", StringUtils.EMPTY)
|
||||
.replace("{{phone}}", StringUtils.isNotEmpty(eBaseinfo.getPhone()) ? eBaseinfo.getPhone() : StringUtils.EMPTY);
|
||||
} else {
|
||||
replaceContent = content.replace("{{party}}", StringUtils.isNotEmpty(tbIlcPunInfoQuery.getDsrmc()) ? tbIlcPunInfoQuery.getDsrmc() : StringUtils.EMPTY)
|
||||
.replace("{{entCerName}}", StringUtils.isNotEmpty(tbIlcPunInfoQuery.getDsrmc()) ? tbIlcPunInfoQuery.getDsrmc() : StringUtils.EMPTY)
|
||||
.replace("{{uniscid}}", StringUtils.isNotEmpty(tbIlcPunInfoQuery.getUniscid()) ? tbIlcPunInfoQuery.getUniscid() : StringUtils.EMPTY)
|
||||
.replace("{{dom}}", StringUtils.EMPTY)
|
||||
.replace("{{lerepname}}", StringUtils.EMPTY)
|
||||
.replace("{{cerNo}}", StringUtils.EMPTY)
|
||||
.replace("{{phone}}", StringUtils.EMPTY);
|
||||
}
|
||||
|
||||
replaceContent = replaceContent.replace("{{otherContact}}", StringUtils.EMPTY)
|
||||
.replace("{{abntime}}", StringUtils.isNotEmpty(abntimeStr) ? abntimeStr : StringUtils.EMPTY)
|
||||
.replace("{{applyTime}}", StringUtils.isNotEmpty(applyTimeStr) ? applyTimeStr : StringUtils.EMPTY)
|
||||
.replace("{{acceptTime}}", StringUtils.isNotEmpty(acceptTimeStr) ? acceptTimeStr : StringUtils.EMPTY)
|
||||
|
|
|
|||
|
|
@ -96,4 +96,22 @@
|
|||
WHERE CASEID = #{caseid}
|
||||
</update>
|
||||
|
||||
<insert id="insertQgCasePubNbaseinfoData">
|
||||
INSERT INTO QG_CASE_PUB_NBASEINFO_DATA (
|
||||
CASEID, ACTYPE, PRIPID, ENTNAME, UNISCID, REGNO, INSCERCODE, SOCORGCODE, ORGCODE, TAXID,
|
||||
LEREP, CERTYPE, CERNO, NAME, AC_CERTYPE, AC_CERNO, PENDECNO, ILLEGACTTYPECODE, ILLEGACTTYPE,
|
||||
MAINILLEGFACT, PENBASIS, PENBASIS_CN, PENTYPE, PENTYPE_CN, PENAM, FORFAM, PENDECISSDATE,
|
||||
PENPERI, PENAUTH, PENAUTH_CN, PENAUTHUNISCID, PENCONTENT, REVLICNUM, PUBLICDATE, PUBDEADLINE,
|
||||
DATADEPT, DATADEPTUNISCID, REMARK, OPFLAG, S_EXT_DATETIME, LASTUPDATETIME
|
||||
)
|
||||
SELECT
|
||||
CASEID, ACTYPE, PRIPID, ENTNAME, UNISCID, REGNO, INSCERCODE, SOCORGCODE, ORGCODE, TAXID,
|
||||
LEREP, CERTYPE, CERNO, NAME, AC_CERTYPE, AC_CERNO, PENDECNO, ILLEGACTTYPECODE, ILLEGACTTYPE,
|
||||
MAINILLEGFACT, PENBASIS, PENBASIS_CN, PENTYPE, PENTYPE_CN, PENAM, FORFAM, PENDECISSDATE,
|
||||
PENPERI, PENAUTH, PENAUTH_CN, PENAUTHUNISCID, PENCONTENT, REVLICNUM, PUBLICDATE, SYSDATE(),
|
||||
DATADEPT, DATADEPTUNISCID, REMARK, 'D', SYSDATE(), LASTUPDATETIME
|
||||
FROM QG_CASE_PUB_NBASEINFO
|
||||
WHERE CASEID = #{caseid}
|
||||
</insert>
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue