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

This commit is contained in:
黎润豪 2026-01-29 17:33:52 +08:00
parent eda9015eb3 52d9317cc4
commit 1016fc5d08
18 changed files with 309 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/BizSpeListController.java
View File

@ -1699,18 +1699,16 @@ public class BizSpeListController extends BaseController {
new com.alibaba.fastjson.TypeReference<HashSet<EBaseinfo>>() {});
List<TSBizSpeList> bizSpeList = new ArrayList<>();
TSTaskList taskListModel = new TSTaskList();
String specause = null;
//不需要固定列异原因
// String specause = null;
String type = null;
if (entertype.equals("individual")) {
specause = "1";
taskListModel.setBustype(BaseDataConstant.EXPTLIST_TYPE_INDIVIDUAL_TAG);
type = "个体户";
} else if (entertype.equals("farmer")) {
specause = "1";//农合
taskListModel.setBustype(BaseDataConstant.EXPTLIST_TYPE_FARMER_ADD);
type = "农合";
} else {
specause = "1";//企业异常名录
taskListModel.setBustype(BaseDataConstant.EXPTLIST_TYPE_ENTEREXCP);
type = "企业";
}
@ -1732,10 +1730,10 @@ public class BizSpeListController extends BaseController {
} else {
tsBizSpeListModel.setDom(eBaseinfo.getDom());
}
tsBizSpeListModel.setSpecause(specause);
tsBizSpeListModel.setAreaCode(code);
tsBizSpeListModel.setDecisionContent(tsBizSpeListService.getDecTempContent(tsBizSpeListModel.getSpecause(),
entertype, tsBizSpeListModel.getDecorg()));
//不固定列异原因也不生成文书内容
// tsBizSpeListModel.setDecisionContent(tsBizSpeListService.getDecTempContent(tsBizSpeListModel.getSpecause(),
// entertype, tsBizSpeListModel.getDecorg()));
bizSpeList.add(tsBizSpeListModel);
}
if (bizSpeList.size() == 0) throw new BusinessException("尚未查找到企业信息");

6
src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/TSBizRemListServiceImpl.java
View File

@ -212,7 +212,7 @@ public class TSBizRemListServiceImpl extends ServiceImpl<TSBizRemListMapper, TSB
Tswrittemplate tswrittemplate = tswrittemplateService.getOne(wrapper);
tsWritModel.setBizseq(tsBizRemListModel.getBizseq());
//获取用户所在部门辖区码值
if (tsBizRemListModel.getAreaCode() != null && !tsBizRemListModel.getAreaCode().equals("440400")) {
if (tsBizRemListModel.getAreaCode() != null && !tsBizRemListModel.getAreaCode().equals("150000")) {
tsWritModel.setAreaCode(tsBizRemListModel.getAreaCode());
} else {
tsBizRemListModel.setAreaCode(orgCode);
@ -1121,14 +1121,14 @@ public class TSBizRemListServiceImpl extends ServiceImpl<TSBizRemListMapper, TSB
*/
private AICUser findSmartProcessUser(String aicId) {
if (aicId == null) {
aicId = "440101";
aicId = "150000";
}
if (aicId.length() > 6) {
aicId = aicId.substring(0, 6);
}
String username = BaseDataConstant.SMART_PROCESS_USER_MAP.get(aicId);
if (username == null) {
aicId = "440101";
aicId = "150000";
username = BaseDataConstant.SMART_PROCESS_USER_MAP.get(aicId);
}
return aicorgService.queryUserByUserName(username);

8
src/main/java/com/chinaweal/aiccs/aiccs/inspect/service/impl/TSWorkNoServiceImpl.java
View File

@ -66,8 +66,10 @@ public class TSWorkNoServiceImpl extends BaseServiceImpl<TSWorkNoMapper, TSWorkN
workNo.setCurrentNo(1);
workNo.setYears(LocalDate.now().getYear());
workNo.setWorkNoType(workNoType);
workNo.setGenrule(tsWorkNoModelDB.getGenrule());
workNo.setTypecomment(tsWorkNoModelDB.getTypecomment());
workNo.setGenrule(tsWorkNoModelDB== null ? WorkNoUtil.getWorkNoGenrule(workNoType)
: tsWorkNoModelDB.getGenrule());
workNo.setTypecomment(tsWorkNoModelDB== null ? WorkNoUtil.getWorkNoTypeName(workNoType)
: tsWorkNoModelDB.getTypecomment());
workNo.setAreaCode(aicID.length() > 6 ? aicID.substring(0, 6) : aicID);
workNo.setLauptime(LocalDateTime.now());
int insert = baseMapper.insert(workNo);
@ -81,8 +83,10 @@ public class TSWorkNoServiceImpl extends BaseServiceImpl<TSWorkNoMapper, TSWorkN
int currentNo = tsWorkNoModels.getCurrentNo();
//{ShortName}监检字[{year}年]第{CurrentNo}号
genRule = genRule.replaceAll("\\u007BShortName\\u007D", shortName);
genRule = genRule.replaceAll("\\u007BshortName\\u007D", shortName);
genRule = genRule.replaceAll("\\u007Byear\\u007D", String.valueOf(a.get(Calendar.YEAR)));
genRule = genRule.replaceAll("\\u007BCurrentNo\\u007D", beforeZeroFill(currentNo, 4));// 填充4位
genRule = genRule.replaceAll("\\u007BcurrentNo\\u007D", beforeZeroFill(currentNo, 4));// 填充4位
paramModel.setCurrentNo(currentNo + 1);//文号下移
baseMapper.updateTSWorkNoByTypeComment(paramModel);

28
src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java
View File

@ -10,6 +10,8 @@ import com.chinaweal.aiccs.aiccs.abnormal.service.TSAttachmentService;
import com.chinaweal.aiccs.aiccs.business.entity.TSTaskList;
import com.chinaweal.aiccs.aiccs.business.service.TSTaskListService;
import com.chinaweal.aiccs.aiccs.fraudreg.dto.FraudInfoDto;
import com.chinaweal.aiccs.aiccs.writs.entity.Tswrittemplate;
import com.chinaweal.aiccs.aiccs.writs.service.TswrittemplateService;
import com.chinaweal.aiccs.common.base.controller.BaseController;
import com.chinaweal.aiccs.common.constant.Constant;
import com.chinaweal.aiccs.common.util.StringUtils;
@ -82,6 +84,8 @@ public class TBizRemPunishmentController extends BaseController {
private FileStorageService fileStorageService;
@Resource
private TSAttachmentService attachmentService;
@Resource
private TswrittemplateService tswrittemplateService;
@ApiOperation(value = "1.新增行政处罚修复业务表", position = 1)
@PostMapping("/save")
@ -161,19 +165,33 @@ public class TBizRemPunishmentController extends BaseController {
public RestResult<?> submitTask(@RequestBody TBizRemPunishment tBizRemPunishment) {
List<TSTaskList> listTask = taskListService.selectByBizSeqID(tBizRemPunishment.getBizSeq());
AssertUtils.isTrue(!listTask.isEmpty(), ResultCode.DATA_NONE);
if(StringUtils.isEmpty(tBizRemPunishment.getOpinion())
|| (!StringUtils.equals(tBizRemPunishment.getStatus(),"2")
&& !StringUtils.equals(tBizRemPunishment.getStatus(),"3"))){
//意见不能为空
if(StringUtils.isEmpty(tBizRemPunishment.getOpinion())){
return RestResult.error(ResultCode.PARAM_IS_BLANK);
}
//业务受理状态时，需要有下一步操作人
if(StringUtils.equals(tBizRemPunishment.getLinkType(),"1")
&& StringUtils.isEmpty(tBizRemPunishment.getNextPerformerids())){
if(StringUtils.equals(tBizRemPunishment.getStatus(),"2")){
//除非是不予受理
if(!StringUtils.equals(tBizRemPunishment.getIsAccept(),"0")){
return RestResult.error(ResultCode.PARAM_IS_BLANK);
}
}
iTBizRemPunishmentService.submitTask(tBizRemPunishment, listTask.get(0));
//判断文书模板是否有数据，除非是不予受理
Tswrittemplate tswrittemplate = null;
if(!StringUtils.equals(tBizRemPunishment.getIsAccept(),"0")){
List<Tswrittemplate> tswrittemplateList = tswrittemplateService.list(new LambdaQueryWrapper<Tswrittemplate>()
.eq(Tswrittemplate::getIsTemplate, "0")
.eq(Tswrittemplate::getBizseq, tBizRemPunishment.getBizSeq()));
if(tswrittemplateList.isEmpty()){
return RestResult.error(ResultCode.DATA_NONE);
}
tswrittemplate = tswrittemplateList.get(0);
}
iTBizRemPunishmentService.submitTask(tBizRemPunishment, listTask.get(0), tswrittemplate);
return RestResult.ok();
}

27
src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/TBizRemPunishment.java
View File

@ -114,6 +114,26 @@ public class TBizRemPunishment extends SuperEntity {
@TableField("repairOrgCn")
private String repairOrgCn;
/**
* 回退建议
*/
@ApiModelProperty(value = "回退建议")
@TableField("backProposal")
private String backProposal;
/**
* 信用修复申请是否受理,0否,1是
*/
@TableField("isAccept")
private String isAccept;
/**
*信用修复申请是否予以信用修复,0否,1是
*/
@TableField("isAgreeRepair")
private String isAgreeRepair;
@ApiModelProperty(value = "下一个处理人id")
@TableField(exist = false)
@ -123,11 +143,4 @@ public class TBizRemPunishment extends SuperEntity {
@TableField(exist = false)
String opinion;
/**
* 回退建议
*/
@TableField("backProposal")
private String backProposal;
}

7
src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/ITBizRemPunishmentService.java
View File

@ -3,9 +3,11 @@ package com.chinaweal.aiccs.aiccs.punishment.service;
import com.chinaweal.aiccs.aiccs.business.entity.TSTaskList;
import com.chinaweal.aiccs.aiccs.punishment.entity.TBizRemPunishment;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaweal.aiccs.aiccs.writs.entity.Tswrittemplate;
import com.chinaweal.youfool.framework.springboot.base.query.BaseQuery;
import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseService;
import java.util.List;
import java.util.Map;
/**
@ -36,5 +38,8 @@ public interface ITBizRemPunishmentService extends BaseService<TBizRemPunishment
Map<String, String> startTask(TBizRemPunishment tBizRemPunishment);
void submitTask(TBizRemPunishment tBizRemPunishment, TSTaskList tsTaskList);
void submitTask(TBizRemPunishment tBizRemPunishment, TSTaskList tsTaskList, Tswrittemplate tswrittemplate);
List<TBizRemPunishment> selectbizRembizseq(String bizseqid);
}

124
src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java
View File

@ -2,9 +2,13 @@ package com.chinaweal.aiccs.aiccs.punishment.service.impl;
import cn.hutool.core.util.IdUtil;
import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo;
import com.chinaweal.aiccs.aiccs.abnormal.entity.TSWrit;
import com.chinaweal.aiccs.aiccs.abnormal.service.CreatePdfService;
import com.chinaweal.aiccs.aiccs.abnormal.service.EBaseinfoService;
import com.chinaweal.aiccs.aiccs.abnormal.service.TSWritService;
import com.chinaweal.aiccs.aiccs.business.entity.TSTaskList;
import com.chinaweal.aiccs.aiccs.business.service.TSTaskListService;
import com.chinaweal.aiccs.aiccs.inspect.service.TSWorkNoService;
import com.chinaweal.aiccs.aiccs.punishment.entity.CaseCreInformation;
import com.chinaweal.aiccs.aiccs.punishment.entity.CasePubNbaseinfo;
import com.chinaweal.aiccs.aiccs.punishment.entity.TBizRemPunishment;
@ -12,15 +16,16 @@ import com.chinaweal.aiccs.aiccs.punishment.mapper.TBizRemPunishmentMapper;
import com.chinaweal.aiccs.aiccs.punishment.service.ICaseCreInformationService;
import com.chinaweal.aiccs.aiccs.punishment.service.ICasePubNbaseinfoService;
import com.chinaweal.aiccs.aiccs.punishment.service.ITBizRemPunishmentService;
import com.chinaweal.aiccs.aiccs.writs.entity.Tswrittemplate;
import com.chinaweal.aiccs.common.constant.BaseDataConstant;
import com.chinaweal.aiccs.common.util.FlowUtil;
import com.chinaweal.aiccs.common.util.HandleWorkFlowUtil;
import com.chinaweal.aiccs.common.util.StringUtils;
import com.chinaweal.aiccs.common.constant.Constant;
import com.chinaweal.aiccs.common.util.*;
import com.chinaweal.aiccs.crgs.punish.entity.TbIlcPunInfoQuery;
import com.chinaweal.aiccs.crgs.punish.service.TbIlcPunInfoQueryService;
import com.chinaweal.aicorg.model.AICUser;
import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseServiceImpl;
import com.chinaweal.youfool.framework.sso.util.SSOUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.chinaweal.youfool.framework.springboot.base.query.BaseQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -29,13 +34,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import javax.annotation.Resource;
import java.io.File;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import static com.chinaweal.aiccs.common.util.WorkNoUtil.WORKNOTYPE_65;
/**
* <p>
@ -58,6 +63,12 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
private ICaseCreInformationService caseCreInformationService;
@Resource
private ICasePubNbaseinfoService casePubNbaseinfoService;
@Autowired
private TSWorkNoService workNoService;
@Autowired
private CreatePdfService createPdfService;
@Autowired
private TSWritService tsWritService;
@Override
public TBizRemPunishment saveTBizRemPunishment(TBizRemPunishment tBizRemPunishment) {
@ -114,36 +125,48 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
}
@Override
public void submitTask(TBizRemPunishment tBizRemPunishment, TSTaskList tsTaskList) {
public void submitTask(TBizRemPunishment tBizRemPunishment, TSTaskList tsTaskList, Tswrittemplate tswrittemplate) {
AICUser loginUser = SSOUtil.getUser();
//当前环节
String linkType = tBizRemPunishment.getLinkType();
String nextNodeID = null;
String status = tBizRemPunishment.getStatus();
String isAccept = tBizRemPunishment.getIsAccept();
String isAgreeRepair = tBizRemPunishment.getIsAgreeRepair();
//外网申请的且不受理的情况下，意见值给到回退建议
if(StringUtils.equals(tsTaskList.getOrigin(),"1")
&& StringUtils.equals(tBizRemPunishment.getStatus(),"3")){
&& StringUtils.equals(isAccept,"0")){
tBizRemPunishment.setBackProposal(tBizRemPunishment.getOpinion());
}
//只有受理并予以修复，status才是2，其他都是3
if(StringUtils.equals(isAccept,"1")
&& StringUtils.equals(isAgreeRepair,"1")){
tBizRemPunishment.setStatus("2");
} else {
tBizRemPunishment.setStatus("3");
}
//根据当前环节判断
if(StringUtils.equals(linkType,"1")){ //受理状态，需要提交审批人或直接不予修复结束
if(StringUtils.equals(status,"3")){ //不予修复，直接结束流程
if(StringUtils.equals(linkType,"1")){ //受理状态，需要提交审批人或直接不予受理结束
if(StringUtils.equals(isAccept,"0")){ //不予受理，直接结束流程
nextNodeID = "disagreeRemPunish";
tBizRemPunishment.setLinkType("3"); //设置下一环节
} else { //准予修复，提交给审批人
} else { //受理，无论是修复还是不修复，都提交给审批人
nextNodeID = "approveRemPunish";
tBizRemPunishment.setLinkType("2"); //设置下一环节
}
} else if(StringUtils.equals(linkType,"2")){ //审批状态，需要结束流程
if(StringUtils.equals(status,"3")){ //不予修复
nextNodeID = "disagreeRemPunish";
//文书模板数据转为文书正式数据
this.handleTsWrit(tBizRemPunishment, tswrittemplate);
} else { //准予修复
nextNodeID = "endRemPunish";
//文书模板数据转为文书正式数据
this.handleTsWrit(tBizRemPunishment, tswrittemplate);
//行政处罚信用修复信息插入数据
insertCaseCreInformation(tBizRemPunishment);
}
nextNodeID = "endRemPunish";
tBizRemPunishment.setLinkType("3"); //设置下一环节
}
//修改业务表
@ -154,7 +177,10 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
nextNodeID, new String[]{ loginUser.getPrimaryKey() }, new String[]{ loginUser.getName() });
}
//行政处罚信用修复信息插入数据
/**
* 行政处罚信用修复信息插入数据
* @param tBizRemPunishment
*/
private void insertCaseCreInformation(TBizRemPunishment tBizRemPunishment) {
CaseCreInformation caseCreInformation = new CaseCreInformation();
EBaseinfo eBaseinfo = eBaseInfoService.getOneByPripid(tBizRemPunishment.getPripid());
@ -187,4 +213,72 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
caseCreInformationService.save(caseCreInformation);
}
@Override
public List<TBizRemPunishment> selectbizRembizseq(String bizseqid) {
return this.list(new LambdaQueryWrapper<TBizRemPunishment>()
.eq(TBizRemPunishment::getBizSeq, bizseqid));
}
private TBizRemPunishment handleTsWrit(TBizRemPunishment tBizRemPunishment, Tswrittemplate tswrittemplate){
TSWrit tsWritModel = new TSWrit();
String tswritId = UUID.randomUUID().toString();
tsWritModel.setWritsid(tswritId);
LambdaQueryWrapper<Tswrittemplate> wrapper = new LambdaQueryWrapper<>();
String writsType = tswrittemplate.getWritsType();
String bizSeq = tBizRemPunishment.getBizSeq();
wrapper.eq(Tswrittemplate::getBizseq, bizSeq)
.eq(Tswrittemplate::getIsTemplate, "0")
.eq(Tswrittemplate::getWritsType, writsType);
tsWritModel.setBizseq(bizSeq);
AICUser loginUser = SSOUtil.getUser();
//获取用户所在部门辖区码值
if (StringUtils.isNotEmpty(tBizRemPunishment.getRepairOrg())) {
tsWritModel.setAreaCode(tBizRemPunishment.getRepairOrg().substring(0, 6));
} else {
tBizRemPunishment.setRepairOrg(loginUser.getRegionID().substring(0, 6));
tsWritModel.setAreaCode(loginUser.getRegionID().substring(0, 6));
}
String workNoTypeSearch = WORKNOTYPE_65; //予以修复和不予修复的文书号都用同样的
tsWritModel.setWritsno(workNoService.getOperatingWrirsno(workNoTypeSearch, tsWritModel.getAreaCode())); //当前用户的regionID
tsWritModel.setWritstype(writsType);
tsWritModel.setPripid(tBizRemPunishment.getPripid());
tsWritModel.setWritsname(WorkNoUtil.getWorkNoTypeName(writsType));
tsWritModel.setCreatetime(LocalDateTime.now());
tsWritModel.setLauptime(LocalDateTime.now());
if (tswrittemplate != null) {
tsWritModel.setContent(tswrittemplate.getContent());
}
// 生成决定书附件
HashMap<String, Object> map = new HashMap<>();
String cityName = Constant.NM_REGION_CODE.get(tsWritModel.getAreaCode().substring(0, 4) + "00");
String locName = Constant.NM_LOC_REGION_CODE.get(tsWritModel.getAreaCode());
String areaName = cityName + locName;
areaName = StringUtils.equals(tsWritModel.getAreaCode(),"150000") ? "内蒙古自治区" : areaName;
map.put("areaName", areaName);
map.put("writsNo", tsWritModel.getWritsno());
map.put("htmlContent", tsWritModel.getContent());
String approveDate = DateUtils.localDateFormat(LocalDate.now(), "yyyy年MM月dd日");
map.put("approveDate", approveDate);
//生成PDF
String path = "";
if ("0".equals(tBizRemPunishment.getIsAgreeRepair())) {
path = "static" + File.separator + "template" + File.separator + "noRepairDec.docx";
} else if ("1".equals(tBizRemPunishment.getIsAgreeRepair())) {
path = "static" + File.separator + "template" + File.separator + "repairDec.docx";
}
String pdfPath = createPdfService.createPdfWithHtmlTemplate(bizSeq, path, map);
if (StringUtils.isNotBlank(pdfPath)) {
tsWritModel.setPath(pdfPath);
}
tsWritService.save(tsWritModel);
//将文书号赋值到业务表
tBizRemPunishment.setRepairNo(tsWritModel.getWritsno());
return tBizRemPunishment;
}
}

10
src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/RpeiExeInfoController.java
View File

@ -96,11 +96,11 @@ public class RpeiExeInfoController extends BaseController {
queryWrapper.eq(RpeiExeInfo::getRegAuth, user.getRegionID().substring(0, 6))
.eq(RpeiExeInfo::getExeState, "1"); //只查执行期间的
if (StringUtils.isNotEmpty(entity.getSearchUscc())) {
queryWrapper.eq(RpeiExeInfo::getUniscId, entity.getSearchUscc())
.or().eq(RpeiExeInfo::getRegNo, entity.getSearchUscc());
queryWrapper.eq(RpeiExeInfo::getUniscid, entity.getSearchUscc())
.or().eq(RpeiExeInfo::getRegno, entity.getSearchUscc());
}
if (StringUtils.isNotEmpty(entity.getEntName())) {
queryWrapper.like(RpeiExeInfo::getEntName, entity.getEntName());
queryWrapper.like(RpeiExeInfo::getEntname, entity.getEntName());
}
Page<RpeiExeInfo> page = new Page<>(query.getCurrent(), query.getSize());
IPage<RpeiExeInfo> data = rpeiExeInfoService.page(page, queryWrapper);
@ -122,7 +122,7 @@ public class RpeiExeInfoController extends BaseController {
//判断该企业还有没有没走完的流程
List<RpeiExeInfoTask> taskList = rpeiExeInfoTaskService.list(new LambdaQueryWrapper<RpeiExeInfoTask>()
.eq(RpeiExeInfoTask::getPripId, rpeiExeInfo.getPripId())
.eq(RpeiExeInfoTask::getPripId, rpeiExeInfo.getPripid())
.in(RpeiExeInfoTask::getStatus, "0", "1", "2"));//还没走完的流程
if (!taskList.isEmpty()) {
return RestResult.error(ResultCode.BUSINESS_LOGIC_ERROR, "该企业还有未完成的流程");
@ -131,7 +131,7 @@ public class RpeiExeInfoController extends BaseController {
//若是要新增执行流程，需要判断该企业的重整计划或者和解协议是否在执行
if ("add".equals(operType)) {
List<RpeiExeInfo> infoList = rpeiExeInfoService.list(new LambdaQueryWrapper<RpeiExeInfo>()
.eq(RpeiExeInfo::getPripId, rpeiExeInfo.getPripId())
.eq(RpeiExeInfo::getPripid, rpeiExeInfo.getPripid())
.eq(RpeiExeInfo::getExeState, "1"));//执行状态是1代表还在执行中
if (!infoList.isEmpty()) {
return RestResult.error(ResultCode.BUSINESS_LOGIC_ERROR, "该企业的重整计划或者和解协议尚在执行中");

8
src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/RpeiExeInfo.java
View File

@ -41,28 +41,28 @@ public class RpeiExeInfo extends SuperEntity implements Serializable {
*/
@ApiModelProperty(value = "企业（机构）名称")
@TableField("ENTNAME")
private String entName;
private String entname;
/**
* 主体身份代码
*/
@ApiModelProperty(value = "主体身份代码")
@TableField("PRIPID")
private String pripId;
private String pripid;
/**
* 统一社会信用代码
*/
@ApiModelProperty(value = "统一社会信用代码")
@TableField("UNISCID")
private String uniscId;
private String uniscid;
/**
* 注册号
*/
@ApiModelProperty(value = "注册号")
@TableField("REGNO")
private String regNo;
private String regno;
/**
* 登记机关

2
src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/RpeiExeInfoTaskServiceImpl.java
View File

@ -91,7 +91,7 @@ public class RpeiExeInfoTaskServiceImpl extends ServiceImpl<RpeiExeInfoTaskMappe
@Override
public XrTaskListVo saveIvdAcceptList(RpeiExeInfo rpeiExeInfo, String operType, AICUser user) {
EBaseinfo eBaseinfo = baseinfoService.getById(rpeiExeInfo.getPripId());
EBaseinfo eBaseinfo = baseinfoService.getById(rpeiExeInfo.getPripid());
if (eBaseinfo == null) {
throw new BusinessException("主体信息不存在");
}

12
src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/TSSerIllegalListServiceImpl.java
View File

@ -9,12 +9,15 @@ import com.chinaweal.aiccs.aiccs.abnormal.entity.dto.EntWritsDto;
import com.chinaweal.aiccs.aiccs.query.entity.TSEntBaseQuery;
import com.chinaweal.aiccs.aiccs.query.mapper.TSEntBaseQueryMapper;
import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSSerIllegalList;
import com.chinaweal.aiccs.aiccs.system.entity.TRBaseCode;
import com.chinaweal.aiccs.aiccs.system.service.TRBaseCodeService;
import com.chinaweal.aiccs.common.base.entity.dto.task.UniTaskListDto;
import com.chinaweal.aiccs.aiccs.seriousillegal.mapper.TSSerIllegalListMapper;
import com.chinaweal.aiccs.aiccs.seriousillegal.service.TSSerIllegalListService;
import com.chinaweal.aicorg.model.AICUser;
import com.chinaweal.youfool.framework.springboot.base.query.BaseQuery;
import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -36,6 +39,8 @@ public class TSSerIllegalListServiceImpl extends BaseServiceImpl<TSSerIllegalLis
@Resource
private TSEntBaseQueryMapper tsEntBaseQueryMapper;
@Autowired
private TRBaseCodeService baseCodeService;
@Override
public List<TSSerIllegalList> selectEntList(TSSerIllegalList serIllegalListModel) {
@ -171,7 +176,12 @@ public class TSSerIllegalListServiceImpl extends BaseServiceImpl<TSSerIllegalLis
.eq(TSSerIllegalList::getOperationStatus, "0")
.isNull(TSSerIllegalList::getRemdate));
//取企业的第一条严重违法信息
records.add(illegals.get(0));
TSSerIllegalList tsSerIllegalList = illegals.get(0);
// 列入原因
Map<String, TRBaseCode> serCodeMap = baseCodeService.getBaseCodeMapFormCache("CD73");
TRBaseCode reasonCode = serCodeMap.get(tsSerIllegalList.getSerillrea());
tsSerIllegalList.setSerillreaString(reasonCode.getName());
records.add(tsSerIllegalList);
});
xrSeriousIllegalListIPage.setRecords(records);

8
src/main/java/com/chinaweal/aiccs/aiccs/writs/controller/TswrittemplateController.java
View File

@ -323,5 +323,13 @@ public class TswrittemplateController extends BaseController {
return RestResult.ok(writtemplateBiz);
}
@ApiOperation("获取行政处罚文书模板内容")
@PostMapping("getRemPunishmentContentsWithBizseq")
public RestResult<?> getRemPunishmentContentsWithBizseq(@RequestBody WritTempEntInfoDto writTempEntInfoDto, HttpServletRequest request) {
AICUser user = getLoginUser(request);
AssertUtils.isNotBlank(writTempEntInfoDto.getBizseq(), writTempEntInfoDto.getWritsType());
return RestResult.ok(tswrittemplateService.generateRemPunishmentWrits(writTempEntInfoDto, user));
}
}

14
src/main/java/com/chinaweal/aiccs/aiccs/writs/entity/dto/WritTempEntInfoDto.java
View File

@ -1,9 +1,12 @@
package com.chinaweal.aiccs.aiccs.writs.entity.dto;
import com.chinaweal.aiccs.aiccs.writs.entity.Tswrittemplate;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* @author Lee
@ -64,4 +67,15 @@ public class WritTempEntInfoDto extends Tswrittemplate implements Serializable {
*/
private String needTemplate;
/**
* 行政处罚修复-主体申请修复日期
*/
private LocalDate applyDate;
/**
* 行政处罚修复-信用修复决定时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime repairDate;
}

3
src/main/java/com/chinaweal/aiccs/aiccs/writs/service/TswrittemplateService.java
View File

@ -2,6 +2,7 @@ package com.chinaweal.aiccs.aiccs.writs.service;
import com.chinaweal.aiccs.aiccs.seriousillegalPerson.entity.XrSeriousIllegalPersonRemList;
import com.chinaweal.aiccs.aiccs.writs.entity.Tswrittemplate;
import com.chinaweal.aiccs.aiccs.writs.entity.dto.WritTempEntInfoDto;
import com.chinaweal.aicorg.model.AICUser;
import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseService;
import com.chinaweal.youfool.framework.springboot.rest.RestResult;
@ -57,4 +58,6 @@ public interface TswrittemplateService extends BaseService<Tswrittemplate> {
void savePersonRemTemplates(XrSeriousIllegalPersonRemList xrSeriousIllegalPersonRemList);
Tswrittemplate generateRemPunishmentWrits(WritTempEntInfoDto writTempEntInfoDto, AICUser user);
}

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

@ -8,6 +8,8 @@ import com.chinaweal.aiccs.aiccs.abnormal.entity.TSBizRemList;
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.punishment.entity.TBizRemPunishment;
import com.chinaweal.aiccs.aiccs.punishment.service.ITBizRemPunishmentService;
import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSBizSerIllegalRem;
import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSSerIllegalList;
import com.chinaweal.aiccs.aiccs.seriousillegal.service.TSBizSerIllegalRemService;
@ -16,12 +18,15 @@ import com.chinaweal.aiccs.aiccs.seriousillegalPerson.entity.XrSeriousIllegalPer
import com.chinaweal.aiccs.aiccs.system.entity.TRBaseCode;
import com.chinaweal.aiccs.aiccs.system.service.TRBaseCodeService;
import com.chinaweal.aiccs.aiccs.writs.entity.Tswrittemplate;
import com.chinaweal.aiccs.aiccs.writs.entity.dto.WritTempEntInfoDto;
import com.chinaweal.aiccs.aiccs.writs.mapper.TswrittemplateMapper;
import com.chinaweal.aiccs.aiccs.writs.service.TswrittemplateService;
import com.chinaweal.aiccs.common.util.ConstantsUtil;
import com.chinaweal.aiccs.common.util.DateUtils;
import com.chinaweal.aiccs.common.util.StringUtils;
import com.chinaweal.aiccs.common.util.WorkNoUtil;
import com.chinaweal.aiccs.crgs.punish.entity.TbIlcPunInfoQuery;
import com.chinaweal.aiccs.crgs.punish.service.TbIlcPunInfoQueryService;
import com.chinaweal.aiccs.org.service.AicorgService;
import com.chinaweal.aicorg.model.AICUser;
import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseServiceImpl;
@ -114,7 +119,6 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl<TswrittemplateMap
@Override
public Tswrittemplate generateWrits(String writsType, String bizseq, String type, AICUser user) {
// 先查找业务中有没有编辑保存过的文书内容，有则返回
LambdaQueryWrapper<Tswrittemplate> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Tswrittemplate::getBizseq, bizseq)
@ -287,4 +291,77 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl<TswrittemplateMap
}
}
@Override
public Tswrittemplate generateRemPunishmentWrits(WritTempEntInfoDto writTempEntInfoDto, AICUser user) {
// 先查找业务中有没有编辑保存过的文书内容，有则返回
LambdaQueryWrapper<Tswrittemplate> wrapper = new LambdaQueryWrapper<>();
String bizseq = writTempEntInfoDto.getBizseq();
String writsType = writTempEntInfoDto.getWritsType();
wrapper.eq(Tswrittemplate::getBizseq, bizseq)
.eq(Tswrittemplate::getWritsType, writsType)
.eq(Tswrittemplate::getIsTemplate, "0");// 是否为模板 “0”否“1”是
Tswrittemplate writtemplateBiz = lambdaQuery().eq(Tswrittemplate::getBizseq, bizseq)
.eq(Tswrittemplate::getWritsType, writsType).eq(Tswrittemplate::getIsTemplate, "0").one();
EBaseinfoService eBaseinfoService = SpringUtil.getBean(EBaseinfoService.class);
if (writtemplateBiz == null) {// 没有则查找初始模板
// 获取所在行政区划的码值
String regionId = aicorgService.getRegionCodeByUser(user);
// 不同文书类型对模板内容有 不同处理
Tswrittemplate templateDB = lambdaQuery().eq(Tswrittemplate::getWritsType, writsType).eq(Tswrittemplate::getIsTemplate, "1").one();
if (templateDB != null) {
if (WorkNoUtil.WORKNOTYPE_65.equals(writsType) || WorkNoUtil.WORKNOTYPE_66.equals(writsType) ) { //行政处罚信用修复
ITBizRemPunishmentService bizRemPunishmentService = SpringUtil.getBean(ITBizRemPunishmentService.class);
TbIlcPunInfoQueryService tbIlcPunInfoQueryService = SpringUtil.getBean(TbIlcPunInfoQueryService.class);
List<TBizRemPunishment> tBizRemPunishments = bizRemPunishmentService.selectbizRembizseq(bizseq);
TBizRemPunishment tBizRemPunishment = tBizRemPunishments.get(0);
//查行政处罚信息
TbIlcPunInfoQuery tbIlcPunInfoQuery = tbIlcPunInfoQueryService.findById(tBizRemPunishment.getPunishmentId());
EBaseinfo eBaseinfo = eBaseinfoService.getOneByPripid(tBizRemPunishment.getPripid());
//处罚决定日期
LocalDateTime abntime = tbIlcPunInfoQuery.getCfjdsj();
String abntimeStr = DateUtils.localDateFormat(LocalDate.from(abntime), "yyyy年MM月dd日");
String content = templateDB.getContent();
//主体申请修复日期
LocalDate applyTime = writTempEntInfoDto.getApplyDate();
String applyTimeStr = DateUtils.localDateFormat(applyTime, "yyyy年MM月dd日");
//信用修复决定时间
LocalDate acceptTime = LocalDate.from(writTempEntInfoDto.getRepairDate());
String acceptTimeStr = DateUtils.localDateFormat(acceptTime, "yyyy年MM月dd日");
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 phoneDW = ConstantsUtil.getPhone(regionId);
String 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("{{abntime}}", StringUtils.isNotEmpty(abntimeStr) ? abntimeStr : StringUtils.EMPTY)
.replace("{{applyTime}}", StringUtils.isNotEmpty(applyTimeStr) ? applyTimeStr : StringUtils.EMPTY)
.replace("{{acceptTime}}", StringUtils.isNotEmpty(acceptTimeStr) ? acceptTimeStr : StringUtils.EMPTY)
.replace("{{reconsiderationOrg}}", StringUtils.isNotEmpty(areaName) ? areaName + "人民政府" : StringUtils.EMPTY)
.replace("{{government}}", StringUtils.isNotEmpty(areaName) ? areaName + "人民政府" : "内蒙古自治区人民政府");
// .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);
}
return templateDB;
}
}
return writtemplateBiz;
}
}

6
src/main/java/com/chinaweal/aiccs/common/util/WorkNoUtil.java
View File

@ -82,6 +82,8 @@ public class WorkNoUtil {
public static final String WORKNOTYPE_62 ="62"; // 企业农专-准予信用修复决定书--无印章版
public static final String WORKNOTYPE_63 ="63"; // 个体户-准予信用修复决定书--无印章版
public static final String WORKNOTYPE_64 ="64"; // 批量注销公告书
public static final String WORKNOTYPE_65 ="65"; // 行政处罚修复-准予信用修复决定书
public static final String WORKNOTYPE_66 ="66"; // 行政处罚修复-不予信用修复决定书
public static final String WORKNOTYPE_71 = "71"; // 拟强制注销公司登记公告
public static final String WORKNOTYPE_72 = "72"; // 强制注销公司登记决定书
@ -133,6 +135,8 @@ public class WorkNoUtil {
WorkNoType_MAP.put(WORKNOTYPE_44, "批量撤销设立登记决定书");
WorkNoType_MAP.put(WORKNOTYPE_64, "批量注销登记公告");
WorkNoType_MAP.put(WORKNOTYPE_65, "行政处罚修复公告");
WRITSNO_GENRULE_MAP.put(WORKNOTYPE_11,"{ShortName}市监列异[{year}]第{CurrentNo}号");
WRITSNO_GENRULE_MAP.put(WORKNOTYPE_12,"{ShortName}市监异议受理通字[{year}]第{CurrentNo}号");
WRITSNO_GENRULE_MAP.put(WORKNOTYPE_13,"{ShortName}市监异议不受通字[{year}]第{CurrentNo}号");
@ -146,6 +150,8 @@ public class WorkNoUtil {
WRITSNO_GENRULE_MAP.put(WORKNOTYPE_72, "{shortName}市监强注决字[{year}]第{currentNo}号");
WRITSNO_GENRULE_MAP.put(WORKNOTYPE_75, "{shortName}市监恢复决字[{year}]第{currentNo}号");
WRITSNO_GENRULE_MAP.put(WORKNOTYPE_76, "{shortName}市监不予恢复决字[{year}]第{currentNo}号");
WRITSNO_GENRULE_MAP.put(WORKNOTYPE_65, "{ShortName}市监信修字[{year}]第{CurrentNo}号");
}
public static String getWorkNoTypeName(String workNoType) {

6
src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml
View File

@ -375,7 +375,7 @@
</if>
</if>
and ( m.SIGNUSERID = #{customParamMap.userId}
or (m.currentNodeOrBizStatus = 'exptlistEnter' AND m.SIGNUSERID IS null
or (m.currentNodeOrBizStatus in ('exptlistEnter','startAccept') AND m.SIGNUSERID IS null
<choose>
<when test="customParamMap.checkChildUnit eq '0'.toString()">
AND m.area_code = #{customParamMap.areaCode}
@ -465,7 +465,7 @@
</if>
and ( m.SIGNUSERID = #{customParamMap.userId}
or (m.area_code = #{customParamMap.areaCode} AND m.currentNodeOrBizStatus = 'exptlistEnter' AND m.SIGNUSERID IS null)
or (m.area_code = #{customParamMap.areaCode} AND m.currentNodeOrBizStatus in ('exptlistEnter','startAccept') AND m.SIGNUSERID IS null)
or exists (select 1 from tsrefgroupanduser tg where tg.GROUPID = m.ACCEPTGROUPID and tg.USERID = #{customParamMap.userId}))
</where>
</select>
@ -1586,7 +1586,7 @@
) m
where m.BUSTYPE in ('33','7','12','14','27')
and ( m.SIGNUSERID = #{customParamMap.userId}
or (m.area_code = #{customParamMap.areaCode} AND m.currentNodeOrBizStatus = 'exptlistEnter' AND m.SIGNUSERID IS null)
or (m.area_code = #{customParamMap.areaCode} AND m.currentNodeOrBizStatus in ('exptlistEnter','startAccept') AND m.SIGNUSERID IS null)
or exists (select 1 from tsrefgroupanduser tg where tg.GROUPID = m.ACCEPTGROUPID and tg.USERID = #{customParamMap.userId}) )
</select>

8
src/main/resources/mybatis/mapper/aiccs/seriousillegal/TSSerIllegalListMapper.xml
View File

@ -532,14 +532,14 @@
b.ENTTYPE not in ('9500','9910','9100','9200')
and exists (select 1 from tsserillegallist s where s.PRIPID = b.PRIPID
and s.OPERATIONSTATUS = '0' and s.REMDATE is null)
<if test="entity.entName != null and entity.entName != ''">
and b.ENTNAME = #{entity.entName,jdbcType=VARCHAR}
<if test="entity.entname != null and entity.entname != ''">
and b.ENTNAME = #{entity.entname,jdbcType=VARCHAR}
</if>
<if test="entity.searchUscc != null and entity.searchUscc != ''">
and (b.UNISCID = #{entity.searchUscc} or b.REGNO = #{entity.searchUscc})
</if>
<if test="entity.uniscId != null and entity.uniscId != ''">
and (b.UNISCID = #{entity.uniscId} or b.REGNO = #{entity.uniscId})
<if test="entity.uniscid != null and entity.uniscid != ''">
and (b.UNISCID = #{entity.uniscid} or b.REGNO = #{entity.uniscid})
</if>
<if test="entity.regorg != null and entity.regorg != ''">
and b.REGORG = #{entity.regorg}