diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java index f28382ba..6f8153d4 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java @@ -1,14 +1,10 @@ package com.zdxt.enforcementcode.controller.app.enforcement; -import com.zdxt.enforcementcode.domain.bo.Xzcfajjbxx026705Bo; -import com.zdxt.enforcementcode.domain.bo.Xzjcjbxx025711Bo; -import com.zdxt.enforcementcode.domain.bo.Xzqzjbxx173774Bo; -import com.zdxt.enforcementcode.domain.vo.Xzcfajjbxx026705Vo; -import com.zdxt.enforcementcode.domain.vo.Xzjcjbxx025711Vo; -import com.zdxt.enforcementcode.domain.vo.Xzqzjbxx173774Vo; -import com.zdxt.enforcementcode.service.IXzcfajjbxx026705Service; -import com.zdxt.enforcementcode.service.IXzjcjbxx025711Service; -import com.zdxt.enforcementcode.service.IXzqzjbxx173774Service; +import cn.dev33.satoken.annotation.SaIgnore; +import com.zdxt.enforcementcode.domain.SxtXzqzjbxx173774; +import com.zdxt.enforcementcode.domain.bo.*; +import com.zdxt.enforcementcode.domain.vo.*; +import com.zdxt.enforcementcode.service.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; @@ -29,40 +25,43 @@ import java.util.List; public class AppEnfCaseInfoController { @Autowired - private IXzjcjbxx025711Service xzjcjbxx025711Service; + private ISxtJcdzb107522Service sxtJcdzb107522Service; @Autowired - private IXzqzjbxx173774Service xzqzjbxx173774Service; + private ISxtXzqzjbxx173774Service sxtXzqzjbxx173774Service; @Autowired - private IXzcfajjbxx026705Service xzcfajjbxx026705Service; + private ISxtXzcfajjbxx026705Service sxtXzcfajjbxx026705Service; /** * 查询【历史检查信息】列表 */ + @SaIgnore @GetMapping("/queryXzjcList") - public TableDataInfo queryXzjcList(Xzjcjbxx025711Bo bo, PageQuery pageQuery) + public TableDataInfo queryXzjcList(SxtJcdzb107522Bo bo, PageQuery pageQuery) { - TableDataInfo list = xzjcjbxx025711Service.selectXzjcHistoryList(bo, pageQuery); + TableDataInfo list = sxtJcdzb107522Service.selectXzjcHistoryList(bo, pageQuery); return list; } /** * 查询【历史强制案件】列表 */ + @SaIgnore @GetMapping("/queryXzqzList") - public TableDataInfo queryXzqzList(Xzqzjbxx173774Bo bo, PageQuery pageQuery) + public TableDataInfo queryXzqzList(SxtXzqzjbxx173774Bo bo, PageQuery pageQuery) { - TableDataInfo list = xzqzjbxx173774Service.selectXzQzHistoryList(bo, pageQuery); + TableDataInfo list = sxtXzqzjbxx173774Service.selectXzQzHistoryList(bo, pageQuery); return list; } /** * 查询【历史处罚案件】列表 */ + @SaIgnore @GetMapping("/queryXzcfList") - public TableDataInfo queryXzcfList(Xzcfajjbxx026705Bo bo, PageQuery pageQuery) + public TableDataInfo queryXzcfList(SxtXzcfajjbxx026705Bo bo, PageQuery pageQuery) { - TableDataInfo list = xzcfajjbxx026705Service.selectXzcfHistoryList(bo,pageQuery); + TableDataInfo list = sxtXzcfajjbxx026705Service.selectXzcfHistoryList(bo,pageQuery); return list; } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java index 762de972..27748cb3 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java @@ -1,6 +1,7 @@ package com.zdxt.enforcementcode.controller.app.enterprise; +import cn.dev33.satoken.annotation.SaIgnore; import com.zdxt.enforcementcode.domain.bo.enterprise.AppLawEnforcementCaseBo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppLawEnforcementCaseVo; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/SxtXzqzjbxx173774Vo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/SxtXzqzjbxx173774Vo.java index 23685555..5377f4d1 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/SxtXzqzjbxx173774Vo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/SxtXzqzjbxx173774Vo.java @@ -186,5 +186,22 @@ public class SxtXzqzjbxx173774Vo implements Serializable { @ExcelProperty(value = "备用字段2") private String beiyong2; + /** + * 行政轻质措施种类 + */ + private String c302002; + /** + * 批准日期 + */ + private String c302007; + /** + * 行政强制措施名称 + */ + private String c302001; + + /** + * 当事人证件号码 + */ + private String c301010; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtJcdzb107522Mapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtJcdzb107522Mapper.java index f5c1e5e0..8fbb4834 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtJcdzb107522Mapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtJcdzb107522Mapper.java @@ -1,9 +1,16 @@ package com.zdxt.enforcementcode.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.domain.SxtJcdzb107522; +import com.zdxt.enforcementcode.domain.bo.SxtJcdzb107522Bo; +import com.zdxt.enforcementcode.domain.bo.Xzjcjbxx025711Bo; import com.zdxt.enforcementcode.domain.vo.SxtJcdzb107522Vo; +import com.zdxt.enforcementcode.domain.vo.Xzjcjbxx025711Vo; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import java.util.List; + /** * 行政检查信息Mapper接口 * @@ -12,4 +19,5 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface SxtJcdzb107522Mapper extends BaseMapperPlus { + List selectXzjcHistoryList(@Param("bo") SxtJcdzb107522Bo bo, @Param("page") Page page); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtXzcfajjbxx026705Mapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtXzcfajjbxx026705Mapper.java index d533ce8b..5a640e9d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtXzcfajjbxx026705Mapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtXzcfajjbxx026705Mapper.java @@ -1,9 +1,16 @@ package com.zdxt.enforcementcode.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.domain.SxtXzcfajjbxx026705; +import com.zdxt.enforcementcode.domain.bo.SxtXzcfajjbxx026705Bo; +import com.zdxt.enforcementcode.domain.bo.Xzcfajjbxx026705Bo; import com.zdxt.enforcementcode.domain.vo.SxtXzcfajjbxx026705Vo; +import com.zdxt.enforcementcode.domain.vo.Xzcfajjbxx026705Vo; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import java.util.List; + /** * 行政处罚案件信息Mapper接口 * @@ -12,4 +19,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface SxtXzcfajjbxx026705Mapper extends BaseMapperPlus { + List selectXzcfHistoryList(@Param("bo") SxtXzcfajjbxx026705Bo bo, @Param("page") Page page); + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtXzqzjbxx173774Mapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtXzqzjbxx173774Mapper.java index db5444de..5801f999 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtXzqzjbxx173774Mapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtXzqzjbxx173774Mapper.java @@ -1,9 +1,16 @@ package com.zdxt.enforcementcode.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.domain.SxtXzqzjbxx173774; +import com.zdxt.enforcementcode.domain.bo.SxtXzqzjbxx173774Bo; +import com.zdxt.enforcementcode.domain.bo.Xzqzjbxx173774Bo; import com.zdxt.enforcementcode.domain.vo.SxtXzqzjbxx173774Vo; +import com.zdxt.enforcementcode.domain.vo.Xzqzjbxx173774Vo; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import java.util.List; + /** * 行政强制案件信息Mapper接口 * @@ -11,5 +18,5 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @date 2026-08-03 */ public interface SxtXzqzjbxx173774Mapper extends BaseMapperPlus { - + List selectXzQzHistoryList(@Param("bo") SxtXzqzjbxx173774Bo bo, @Param("page") Page page); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtJcdzb107522Service.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtJcdzb107522Service.java index 1a5b5cfa..54e8b12c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtJcdzb107522Service.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtJcdzb107522Service.java @@ -1,7 +1,9 @@ package com.zdxt.enforcementcode.service; +import com.zdxt.enforcementcode.domain.bo.Xzjcjbxx025711Bo; import com.zdxt.enforcementcode.domain.vo.SxtJcdzb107522Vo; import com.zdxt.enforcementcode.domain.bo.SxtJcdzb107522Bo; +import com.zdxt.enforcementcode.domain.vo.Xzjcjbxx025711Vo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -65,4 +67,6 @@ public interface ISxtJcdzb107522Service { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + TableDataInfo selectXzjcHistoryList(SxtJcdzb107522Bo bo, PageQuery pageQuery); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtXzcfajjbxx026705Service.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtXzcfajjbxx026705Service.java index d5e46c12..50dd25d3 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtXzcfajjbxx026705Service.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtXzcfajjbxx026705Service.java @@ -1,7 +1,9 @@ package com.zdxt.enforcementcode.service; +import com.zdxt.enforcementcode.domain.bo.Xzcfajjbxx026705Bo; import com.zdxt.enforcementcode.domain.vo.SxtXzcfajjbxx026705Vo; import com.zdxt.enforcementcode.domain.bo.SxtXzcfajjbxx026705Bo; +import com.zdxt.enforcementcode.domain.vo.Xzcfajjbxx026705Vo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -65,4 +67,6 @@ public interface ISxtXzcfajjbxx026705Service { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + TableDataInfo selectXzcfHistoryList(SxtXzcfajjbxx026705Bo bo, PageQuery pageQuery); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtXzqzjbxx173774Service.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtXzqzjbxx173774Service.java index 8e030e04..9c2b8500 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtXzqzjbxx173774Service.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtXzqzjbxx173774Service.java @@ -1,7 +1,9 @@ package com.zdxt.enforcementcode.service; +import com.zdxt.enforcementcode.domain.bo.Xzqzjbxx173774Bo; import com.zdxt.enforcementcode.domain.vo.SxtXzqzjbxx173774Vo; import com.zdxt.enforcementcode.domain.bo.SxtXzqzjbxx173774Bo; +import com.zdxt.enforcementcode.domain.vo.Xzqzjbxx173774Vo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -65,4 +67,6 @@ public interface ISxtXzqzjbxx173774Service { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + TableDataInfo selectXzQzHistoryList(SxtXzqzjbxx173774Bo bo, PageQuery pageQuery); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppLawEnforcementCaseServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppLawEnforcementCaseServiceImpl.java index 1d02771a..554d607d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppLawEnforcementCaseServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppLawEnforcementCaseServiceImpl.java @@ -46,9 +46,9 @@ public class AppLawEnforcementCaseServiceImpl implements IAppLawEnforcementCaseS */ @Override public TableDataInfo selectAppLawEnforcementCaseList(AppLawEnforcementCaseBo bo, PageQuery pageQuery) { - String deptId = LoginHelper.getDeptId();//企业ID + /* String deptId =LoginHelper.getDeptId();//企业ID EnterpriseInformationVo enterpriseInformationVo = enterpriseInformationService.queryById(deptId); - bo.setIdNumber(enterpriseInformationVo.getEnterpriseNumber()); + bo.setIdNumber(enterpriseInformationVo.getEnterpriseNumber());*/ Page page = pageQuery.build(); IPage result = appLawEnforcementCaseMapper.selectAppLawEnforcementCaseList(bo, page); return TableDataInfo.build(result); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtJcdzb107522ServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtJcdzb107522ServiceImpl.java index 65aa2a42..d3bb15d8 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtJcdzb107522ServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtJcdzb107522ServiceImpl.java @@ -1,5 +1,7 @@ package com.zdxt.enforcementcode.service.impl; +import com.zdxt.enforcementcode.domain.bo.Xzjcjbxx025711Bo; +import com.zdxt.enforcementcode.domain.vo.Xzjcjbxx025711Vo; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -175,4 +177,11 @@ public class SxtJcdzb107522ServiceImpl implements ISxtJcdzb107522Service { } return baseMapper.deleteByIds(ids) > 0; } + + @Override + public TableDataInfo selectXzjcHistoryList(SxtJcdzb107522Bo bo, PageQuery pageQuery) { + Page page = pageQuery.build(); + List list = baseMapper.selectXzjcHistoryList(bo, page); + return TableDataInfo.build(list); + } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtXzcfajjbxx026705ServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtXzcfajjbxx026705ServiceImpl.java index f3a40eb7..6127cf09 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtXzcfajjbxx026705ServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtXzcfajjbxx026705ServiceImpl.java @@ -1,5 +1,7 @@ package com.zdxt.enforcementcode.service.impl; +import com.zdxt.enforcementcode.domain.bo.Xzcfajjbxx026705Bo; +import com.zdxt.enforcementcode.domain.vo.Xzcfajjbxx026705Vo; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -168,4 +170,12 @@ public class SxtXzcfajjbxx026705ServiceImpl implements ISxtXzcfajjbxx026705Servi } return baseMapper.deleteByIds(ids) > 0; } + + @Override + public TableDataInfo selectXzcfHistoryList(SxtXzcfajjbxx026705Bo bo, PageQuery pageQuery) { + Page page = pageQuery.build(); + List list =baseMapper.selectXzcfHistoryList(bo, page); + return TableDataInfo.build(list); + + } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtXzqzjbxx173774ServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtXzqzjbxx173774ServiceImpl.java index 59abf717..f6b1e05a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtXzqzjbxx173774ServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtXzqzjbxx173774ServiceImpl.java @@ -1,5 +1,7 @@ package com.zdxt.enforcementcode.service.impl; +import com.zdxt.enforcementcode.domain.bo.Xzqzjbxx173774Bo; +import com.zdxt.enforcementcode.domain.vo.Xzqzjbxx173774Vo; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -153,4 +155,11 @@ public class SxtXzqzjbxx173774ServiceImpl implements ISxtXzqzjbxx173774Service { } return baseMapper.deleteByIds(ids) > 0; } + + @Override + public TableDataInfo selectXzQzHistoryList(SxtXzqzjbxx173774Bo bo, PageQuery pageQuery) { + Page page = pageQuery.build(); + List list = baseMapper.selectXzQzHistoryList(bo, page); + return TableDataInfo.build(list); + } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/AppLawenforcementCaseMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/AppLawenforcementCaseMapper.xml index d7d28f9d..f5a33bac 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/AppLawenforcementCaseMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/AppLawenforcementCaseMapper.xml @@ -7,17 +7,17 @@ select - t1.c601000 as id, - t1.c601001 as caseCode, - t1.c601002 as caseName, + t1.sign_id as id, + t1.case_code as caseCode, + t1.insp_action_name as caseName, t2.c601031 as partyType, - t1.c601013 as decisionDocumentName, - t1.c601012 as decisionDocumentNumber, - t1.c601010 as administrativeCheckType, + t1.decision_document_name as decisionDocumentName, + t1.decision_document_num as decisionDocumentNumber, + t1.insp_type as administrativeCheckType, t3.dict_label as administrativeCheckTypeName, - t1.C601005 as decisionDate, - t1.c601015_1 as content, - t1.c601015 as administrativeCheckResult, - t1.c601017 as administrativeCheckDecision, - t1.c601024 as lawEnforcementSubjectName, + t1.decision_date as decisionDate, + t1.admin_behavior_conment as content, + t1.is_inspection_pass as administrativeCheckResult, + t1.decision_reason as administrativeCheckDecision, + t1.sub_name as lawEnforcementSubjectName, '' as remark - from xzjcjbxx025711 t1 - left join XZJCDSRXX016987 t2 + from sxt_jcdzb107522 t1 + left join sxt_xzjcdsrxx016987 t2 on t1.c601000 =t2.c601000 left join sys_dict_data t3 on t1.c601010 = t3.dict_value and t3.dict_type ='check_category' @@ -114,10 +114,10 @@ t2.c302011 as decisionDate, '' as remark from - XZQZJBXX173774 t1 - left join XZQZCSXX274939 t2 on + sxt_xzqzjbxx173774 t1 + left join sxt_xzqzcsxx274939 t2 on t1.c301000 = t2.c301000 - left join XZQZDSRXX997874 t3 on + left join sxt_xzqzdsrxx997874 t3 on t1.c301000 = t3.c301000 @@ -145,10 +145,10 @@ t1.c201003 as lawEnforcementSubjectName, t2.c206025 as remark from - XZCFAJJBXX026705 t1 - left join xzcfajjdxx778518 t2 on + sxt_xzcfajjbxx026705 t1 + left join sxt_xzcfajjdxx778518 t2 on t1.c201000 = t2.c201000 - left join XZCFAJDSRXX594019 t3 on + left join sxt_xzcfajdsrxx594019 t3 on t1.c201000 = t3.c201000 diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtJcdzb107522Mapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtJcdzb107522Mapper.xml index dcb7ad61..ed4112da 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtJcdzb107522Mapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtJcdzb107522Mapper.xml @@ -3,4 +3,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtXzcfajjbxx026705Mapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtXzcfajjbxx026705Mapper.xml index 2c80a825..bb5a9935 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtXzcfajjbxx026705Mapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtXzcfajjbxx026705Mapper.xml @@ -3,4 +3,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtXzqzjbxx173774Mapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtXzqzjbxx173774Mapper.xml index c2c143d3..76c7cd1b 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtXzqzjbxx173774Mapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtXzqzjbxx173774Mapper.xml @@ -3,4 +3,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/Xzcfajjbxx026705Mapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/Xzcfajjbxx026705Mapper.xml index 47dffae3..457d4481 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/Xzcfajjbxx026705Mapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/Xzcfajjbxx026705Mapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select a.c201000, a.c201003, @@ -14,10 +14,10 @@ b.C206010, c.c201016 from - XZCFAJJBXX026705 a - left join xzcfajjdxx778518 b on + sxt_xzcfajjbxx026705 a + left join sxt_xzcfajjdxx778518 b on a.c201000 = b.c201000 - left join XZCFAJDSRXX594019 c on + left join sxt_xzcfajdsrxx594019 c on a.c201000 = c.c201000 where c.c201016 = diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/Xzjcjbxx025711Mapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/Xzjcjbxx025711Mapper.xml index 11d107c1..657501d7 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/Xzjcjbxx025711Mapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/Xzjcjbxx025711Mapper.xml @@ -4,16 +4,16 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select b.C601002, b.C601005, b.C601015, b.C601011 from - XZJCDSRXX016987 a - left join xzjcjbxx025711 b on - b.c601000 = a.c601000 + sxt_xzjcdsrxx016987 a + left join sxt_jcdzb107522 b on + b.sign_id = a.c601000 where a.c601034 = #{bo.c601034} order by b.C601005 desc diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/Xzqzjbxx173774Mapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/Xzqzjbxx173774Mapper.xml index 5af18ca6..c45eb5b0 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/Xzqzjbxx173774Mapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/Xzqzjbxx173774Mapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT a.c301002, a.c301001, @@ -13,9 +13,9 @@ b.c302007, c.c301010, b.c302001 - FROM XZQZJBXX173774 a - LEFT JOIN XZQZCSXX274939 b ON a.c301000 = b.c301000 - LEFT JOIN XZQZDSRXX997874 c ON a.c301000 = c.c301000 + FROM sxt_xzqzjbxx173774 a + LEFT JOIN sxt_xzqzcsxx274939 b ON a.c301000 = b.c301000 + LEFT JOIN sxt_xzqzdsrxx997874 c ON a.c301000 = c.c301000 WHERE c.c301010 = #{bo.c301010}