diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java index bf38e48c..ae9013ab 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java @@ -2,7 +2,9 @@ package com.zdxt.enforcementcode.controller.app.enforcement; import cn.dev33.satoken.annotation.SaIgnore; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.zdxt.enforcementcode.common.util.CommonUtil; +import com.zdxt.enforcementcode.domain.EfcodeCpNotice; import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.bo.EnterpriseLawEnforcementBo; import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseComplaintBo; @@ -13,6 +15,7 @@ import com.zdxt.enforcementcode.domain.vo.EnterpriseLawEnforcementVo; import com.zdxt.enforcementcode.domain.vo.enterprise.UnionEnforcementGroupVo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnterpriseComplaintVo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppLawEnforcementCaseVo; +import com.zdxt.enforcementcode.mapper.EfcodeCpNoticeMapper; import com.zdxt.enforcementcode.service.IEnforcementRegistrationService; import com.zdxt.enforcementcode.service.IEnterpriseEvaluateService; import com.zdxt.enforcementcode.service.IEnterpriseLawEnforcementService; @@ -75,6 +78,7 @@ public class AppEnforcementRegistrationController extends BaseController { @Autowired private IAppLawEnforcementCaseService appLawEnforcementCaseService; + private final EfcodeCpNoticeMapper efcodeCpNoticeMapper; /** * 执法端-执法登记新增保存 @@ -216,11 +220,18 @@ public class AppEnforcementRegistrationController extends BaseController { bo.setId(null); } } - if (StringUtils.isNotEmpty(bo.getLawId())) { + /*if (StringUtils.isNotEmpty(bo.getLawId())) { EnterpriseLawEnforcementBo eleBo = new EnterpriseLawEnforcementBo(); eleBo.setId(bo.getLawId()); eleBo.setIsReg(1L); resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(eleBo); + }*/ + //更新联合预告状态 + if(bo.getNoticeId()!=null){ + UpdateWrapper wrapper = new UpdateWrapper(); + wrapper.eq("id",bo.getNoticeId()); + wrapper.set("status",3); + efcodeCpNoticeMapper.update(null,wrapper); } return toAjax(resNum); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnforcementRegistration.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnforcementRegistration.java index b11eaf25..386e9659 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnforcementRegistration.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnforcementRegistration.java @@ -323,4 +323,9 @@ public class EnforcementRegistration { */ private String otherReasons; + /** + * 预告ID + */ + private String noticeId; + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java index 94c8e62c..b6e11f42 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java @@ -334,4 +334,9 @@ public class EnforcementRegistrationBo extends BaseEntity { private String lawEnforceCategoryText; private String checkCategoryText; + + /** + * 预告id + */ + private String noticeId; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java index ff8b03a6..9d1500b7 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java @@ -414,4 +414,9 @@ public class EnforcementRegistrationVo implements Serializable { * 其他原因 */ private String otherReasons; + + /** + * 预告ID + */ + private String noticeId; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java index b898dd15..9dd4f690 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java @@ -90,7 +90,7 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService { Long userId = LoginHelper.getUserId(); lqw.eq(userId != null, EfcodeCpNotice::getCreateBy, userId); //企业统一信用代码不等于空的 - lqw.eq(StringUtils.isNotBlank(bo.getBureauDeptId()),EfcodeCpNotice::getEnterpriseNumber,bo.getEnterpriseNumber()); + lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseNumber()),EfcodeCpNotice::getEnterpriseNumber,bo.getEnterpriseNumber()); //状态不等于空的 lqw.eq(bo.getStatus() != null, EfcodeCpNotice::getStatus, bo.getStatus()); // 过滤已删除 diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java index 353da5c0..ada4ef96 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zdxt.enforcementcode.common.annotation.DataScope; import com.zdxt.enforcementcode.common.commonenum.PlatformTypeEnums; @@ -67,6 +68,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat private final SysDeptMapper sysDeptMapper; private final EnterpriseInformationMapper enterpriseInformationMapper; + /** * 查询企业端-执法登记记录 * @@ -713,6 +715,8 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat zdxtFileMapper.insertZdxtFile(zdxtFile); }); } + + return resNum; } @@ -1030,11 +1034,6 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat zdxtFileMapper.insertZdxtFile(zdxtFile); }); } - //判断数据修改成功且状态为1时同步推送至 - if(i > 0 && null != bo.getStatus() && bo.getStatus() == 1){ - //TODO 提交相对应的数据到后台管理,同时绑定对应的商户。相关的执法数据推送到其它平台 - - } return i; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml index b09fd879..019cb14c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml @@ -322,6 +322,7 @@ entrust_dept_id=#{entrustDeptId}, entrust_dept_name=#{entrustDeptName}, other_reasons = #{otherReasons}, + notice_id = #{noticeId}, where id = #{id} @@ -391,6 +392,7 @@ entrust_dept_id, entrust_dept_name, other_reasons, + notice_id, #{id}, @@ -446,6 +448,7 @@ #{entrustDeptId}, #{entrustDeptName}, #{otherReasons}, + #{noticeId},